MLHR-1830 Fixed backwards compatibility errors.
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/54586f4a Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/54586f4a Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/54586f4a Branch: refs/heads/feature-AppData Commit: 54586f4acb4b55b7418b5e1aeb7181bae2c1d293 Parents: 36e8ae3 Author: Timothy Farkas <[email protected]> Authored: Fri Aug 28 15:47:52 2015 -0700 Committer: David Yan <[email protected]> Committed: Fri Aug 28 18:50:03 2015 -0700 ---------------------------------------------------------------------- demos/pom.xml | 2 +- .../query/serde/DataQuerySnapshotValidator.java | 2 +- .../lib/appdata/schemas/DataQuerySnapshot.java | 7 ++++- .../lib/appdata/schemas/SchemaUtils.java | 27 ++++++++++++++++++++ .../lib/io/PubSubWebSocketAppDataQuery.java | 8 +++--- .../lib/io/PubSubWebSocketAppDataResult.java | 6 ++--- .../lib/io/WebSocketInputOperator.java | 2 +- .../lib/io/WebSocketOutputOperator.java | 2 +- pom.xml | 4 +-- 9 files changed, 46 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/54586f4a/demos/pom.xml ---------------------------------------------------------------------- diff --git a/demos/pom.xml b/demos/pom.xml index 7976aa0..2ef2fa9 100644 --- a/demos/pom.xml +++ b/demos/pom.xml @@ -28,7 +28,7 @@ </modules> <properties> - <datatorrent.version>3.1.0-SNAPSHOT</datatorrent.version> + <datatorrent.version>3.2.0-SNAPSHOT</datatorrent.version> <datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath> <semver.plugin.skip>true</semver.plugin.skip> </properties> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/54586f4a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataQuerySnapshotValidator.java ---------------------------------------------------------------------- diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataQuerySnapshotValidator.java b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataQuerySnapshotValidator.java index d2b7ef0..2eb788d 100644 --- a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataQuerySnapshotValidator.java +++ b/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataQuerySnapshotValidator.java @@ -55,7 +55,7 @@ public class DataQuerySnapshotValidator implements CustomMessageValidator } if (gdqt.getFields().getFields().isEmpty()) { - gdqt.setFields(new Fields(fields)); + gdqt.setFieldsVal(new Fields(fields)); } return true; http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/54586f4a/library/src/main/java/com/datatorrent/lib/appdata/schemas/DataQuerySnapshot.java ---------------------------------------------------------------------- diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/DataQuerySnapshot.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/DataQuerySnapshot.java index 5714597..8e68380 100644 --- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/DataQuerySnapshot.java +++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/DataQuerySnapshot.java @@ -136,12 +136,17 @@ public class DataQuerySnapshot extends Query * Sets the fields of the query. * @param fields The fields of the query. */ - public final void setFields(Fields fields) + private void setFields(Fields fields) { Preconditions.checkNotNull(fields); this.fields = fields; } + public void setFieldsVal(Fields fields) + { + setFields(fields); + } + /** * Gets the fields of the query. * @return The fields of the query. http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/54586f4a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaUtils.java ---------------------------------------------------------------------- diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaUtils.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaUtils.java index ce68c7f..de3c013 100644 --- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaUtils.java +++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaUtils.java @@ -21,6 +21,7 @@ import java.io.StringWriter; import java.util.Collection; import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.Set; @@ -137,6 +138,13 @@ public class SchemaUtils public static boolean checkValidKeys(JSONObject jo, Collection<Fields> fieldsCollection) { + return checkValidKeysHelper(jo, + fieldsCollection); + } + + private static boolean checkValidKeysHelper(JSONObject jo, + Collection<Fields> fieldsCollection) + { for (Fields fields: fieldsCollection) { LOG.debug("Checking keys: {}", fields); if (checkValidKeys(jo, fields)) { @@ -151,6 +159,12 @@ public class SchemaUtils return false; } + public static boolean checkValidKeys(JSONObject jo, List<Fields> fieldsCollection) + { + return checkValidKeysHelper(jo, + fieldsCollection); + } + /** * This is a utility method to check that the given JSONObject has the given keys. * It throws an {@link IllegalArgumentException} if it doesn't contain all the given keys. @@ -161,6 +175,13 @@ public class SchemaUtils public static boolean checkValidKeysEx(JSONObject jo, Collection<Fields> fieldsCollection) { + return checkValidKeysExHelper(jo, + fieldsCollection); + } + + public static boolean checkValidKeysExHelper(JSONObject jo, + Collection<Fields> fieldsCollection) + { for (Fields fields: fieldsCollection) { if (checkValidKeys(jo, fields)) { return true; @@ -175,6 +196,12 @@ public class SchemaUtils fieldsCollection); } + public static boolean checkValidKeysEx(JSONObject jo, List<Fields> fieldsCollection) + { + return checkValidKeysExHelper(jo, + fieldsCollection); + } + public static Set<String> getSetOfJSONKeys(JSONObject jo) { @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/54586f4a/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 031befd..889a4d3 100644 --- a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java +++ b/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java @@ -68,7 +68,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); @@ -83,7 +83,7 @@ public class PubSubWebSocketAppDataQuery extends PubSubWebSocketInputOperator<St public void beginWindow(long windowId) { super.beginWindow(windowId); - + if (windowBoundedService != null) { windowBoundedService.beginWindow(windowId); } @@ -136,7 +136,7 @@ public class PubSubWebSocketAppDataQuery extends PubSubWebSocketInputOperator<St @Override public URI getUri() { - return uri; + return super.getUri(); } /** @@ -148,7 +148,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/54586f4a/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/54586f4a/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/54586f4a/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); http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/54586f4a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e9dbcd6..1468163 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>com.datatorrent</groupId> <artifactId>dt-framework</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>3.2.0-SNAPSHOT</version> </parent> <artifactId>malhar</artifactId> @@ -38,7 +38,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <netbeans.hint.license>malhar-inc</netbeans.hint.license> <maven.deploy.skip>false</maven.deploy.skip> - <dt.framework.version>3.1.0-SNAPSHOT</dt.framework.version> + <dt.framework.version>3.2.0-SNAPSHOT</dt.framework.version> <!-- the following properties match the properties defined in core/pom.xml --> <jackson.version>1.9.2</jackson.version> <jersey.version>1.9</jersey.version>
