clean up code

This commit is contained in:
fjy 2013-11-07 15:03:14 -08:00
parent 913ff3a082
commit e2e10fae1f

View File

@ -63,9 +63,6 @@ public class EventReceiverFirehoseFactory implements FirehoseFactory
private final MapInputRowParser parser; private final MapInputRowParser parser;
private final Optional<ChatHandlerProvider> chatHandlerProvider; private final Optional<ChatHandlerProvider> chatHandlerProvider;
@Deprecated
private final String firehoseId;
@JsonCreator @JsonCreator
public EventReceiverFirehoseFactory( public EventReceiverFirehoseFactory(
@JsonProperty("serviceName") String serviceName, @JsonProperty("serviceName") String serviceName,
@ -82,9 +79,6 @@ public class EventReceiverFirehoseFactory implements FirehoseFactory
config.getFirehoseIdPrefix(), config.getFirehoseIdPrefix(),
Preconditions.checkNotNull(firehoseId, "firehoseId") Preconditions.checkNotNull(firehoseId, "firehoseId")
); );
this.firehoseId = serviceName;
} else {
this.firehoseId = null;
} }
this.serviceName = Preconditions.checkNotNull(serviceName, "serviceName"); this.serviceName = Preconditions.checkNotNull(serviceName, "serviceName");
@ -118,14 +112,6 @@ public class EventReceiverFirehoseFactory implements FirehoseFactory
return serviceName; return serviceName;
} }
// Backward compatible
@Deprecated
@JsonProperty
public String getFirehoseId()
{
return firehoseId;
}
@JsonProperty @JsonProperty
public int getBufferSize() public int getBufferSize()
{ {