Fixed version compatibility issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/fb8e4862 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/fb8e4862 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/fb8e4862 Branch: refs/heads/master Commit: fb8e4862e5ff567b470ef0d200702bdf5d0384c0 Parents: c4a6d8d Author: Timothy Farkas <[email protected]> Authored: Fri Aug 28 18:54:35 2015 -0700 Committer: Timothy Farkas <[email protected]> Committed: Fri Aug 28 19:29:57 2015 -0700 ---------------------------------------------------------------------- .../com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java | 6 +++--- .../com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java | 6 +++--- .../java/com/datatorrent/lib/io/WebSocketInputOperator.java | 2 +- .../java/com/datatorrent/lib/io/WebSocketOutputOperator.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fb8e4862/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java ---------------------------------------------------------------------- diff --git a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java index 14a2d2b..1510155 100644 --- a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java +++ b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java @@ -54,7 +54,7 @@ public class PubSubWebSocketAppDataQuery extends PubSubWebSocketInputOperator<St @Override public void setup(OperatorContext context) { - this.uri = uriHelper(context, uri); + setUri(uriHelper(context, getUri())); logger.debug("Setting up:\nuri:{}\ntopic:{}",this.getUri(), this.getTopic()); super.setup(context); } @@ -86,7 +86,7 @@ public class PubSubWebSocketAppDataQuery extends PubSubWebSocketInputOperator<St @Override public URI getUri() { - return uri; + return super.getUri(); } /** @@ -98,7 +98,7 @@ public class PubSubWebSocketAppDataQuery extends PubSubWebSocketInputOperator<St @Override public void setUri(URI uri) { - this.uri = uri; + super.setUri(uri); } @Override http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fb8e4862/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java ---------------------------------------------------------------------- diff --git a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java index 5f0b947..cdae7b8 100644 --- a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java +++ b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java @@ -48,7 +48,7 @@ public class PubSubWebSocketAppDataResult extends PubSubWebSocketOutputOperator< @Override public void setup(OperatorContext context) { - this.uri = PubSubWebSocketAppDataQuery.uriHelper(context, uri); + setUri(PubSubWebSocketAppDataQuery.uriHelper(context, getUri())); logger.debug("Setting up:\nuri:{}\ntopic:{}",this.getUri(), this.getTopic()); super.setup(context); } @@ -67,7 +67,7 @@ public class PubSubWebSocketAppDataResult extends PubSubWebSocketOutputOperator< @Override public URI getUri() { - return uri; + return super.getUri(); } /** @@ -79,7 +79,7 @@ public class PubSubWebSocketAppDataResult extends PubSubWebSocketOutputOperator< @Override public void setUri(URI uri) { - this.uri = uri; + super.setUri(uri); } @Override http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fb8e4862/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java ---------------------------------------------------------------------- diff --git a/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java b/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java index 69ebfa3..02b9ef2 100644 --- a/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java +++ b/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java @@ -53,7 +53,7 @@ public class WebSocketInputOperator<T> extends SimpleSinglePortInputOperator<T> */ public int readTimeoutMillis = 0; //Do not make this @NotNull since null is a valid value for some child classes - protected URI uri; + private URI uri; private transient AsyncHttpClient client; private transient final JsonFactory jsonFactory = new JsonFactory(); protected transient final ObjectMapper mapper = new ObjectMapper(jsonFactory); http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/fb8e4862/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java ---------------------------------------------------------------------- diff --git a/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java b/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java index f46ccb8..a0cf465 100644 --- a/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java +++ b/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java @@ -49,7 +49,7 @@ public class WebSocketOutputOperator<T> extends BaseOperator { private static final Logger LOG = LoggerFactory.getLogger(WebSocketOutputOperator.class); //Do not make this @NotNull since null is a valid value for some child classes - protected URI uri; + private URI uri; private transient AsyncHttpClient client; private transient final JsonFactory jsonFactory = new JsonFactory(); protected transient final ObjectMapper mapper = new ObjectMapper(jsonFactory);
