From 80e37a9d5453b677f4a1e092008d92b883e54e27 Mon Sep 17 00:00:00 2001 From: joergboe Date: Wed, 24 Mar 2021 12:54:49 +0100 Subject: [PATCH 1/3] Fix Dependabot alert: jetty version --- com.ibm.streamsx.inetserver/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/com.ibm.streamsx.inetserver/pom.xml b/com.ibm.streamsx.inetserver/pom.xml index a958448..23be72f 100644 --- a/com.ibm.streamsx.inetserver/pom.xml +++ b/com.ibm.streamsx.inetserver/pom.xml @@ -16,8 +16,7 @@ com.ibm.streamsx.inetserver - - 9.4.35.v20201120 + 9.4.38.v20210224 From f8add9353a41e463604eb03f7bf89fd0c3acb2b2 Mon Sep 17 00:00:00 2001 From: joergboe Date: Wed, 24 Mar 2021 14:04:27 +0100 Subject: [PATCH 2/3] Fix: HTTPTupleInject operator fails when attribute type is unsigned integer. Resolves #46 --- .../src/com/ibm/streamsx/inet/rest/servlets/InjectTuple.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/com.ibm.streamsx.inetserver/impl/java/src/com/ibm/streamsx/inet/rest/servlets/InjectTuple.java b/com.ibm.streamsx.inetserver/impl/java/src/com/ibm/streamsx/inet/rest/servlets/InjectTuple.java index d0c4102..8c65c35 100644 --- a/com.ibm.streamsx.inetserver/impl/java/src/com/ibm/streamsx/inet/rest/servlets/InjectTuple.java +++ b/com.ibm.streamsx.inetserver/impl/java/src/com/ibm/streamsx/inet/rest/servlets/InjectTuple.java @@ -57,15 +57,19 @@ public static void populateTupleFromRequest(HttpServletRequest request, final int ai = attr.getIndex(); switch (attr.getType().getMetaType()) { case INT8: + case UINT8: tuple.setByte(ai, Byte.parseByte(value)); break; case INT16: + case UINT16: tuple.setShort(ai, Short.parseShort(value)); break; case INT32: + case UINT32: tuple.setInt(ai, Integer.parseInt(value)); break; case INT64: + case UINT64: tuple.setLong(ai, Long.parseLong(value)); break; case FLOAT32: From 297e85fbb85e12aa42e64a0c3e5b7047742f7db8 Mon Sep 17 00:00:00 2001 From: joergboe Date: Wed, 24 Mar 2021 15:04:11 +0100 Subject: [PATCH 3/3] Bump version and changelog --- com.ibm.streamsx.inetserver/CHANGELOG.md | 58 +++++++++++++----------- com.ibm.streamsx.inetserver/info.xml | 2 +- com.ibm.streamsx.inetserver/pom.xml | 2 +- 3 files changed, 33 insertions(+), 29 deletions(-) diff --git a/com.ibm.streamsx.inetserver/CHANGELOG.md b/com.ibm.streamsx.inetserver/CHANGELOG.md index ff8391c..a231ad3 100644 --- a/com.ibm.streamsx.inetserver/CHANGELOG.md +++ b/com.ibm.streamsx.inetserver/CHANGELOG.md @@ -1,10 +1,33 @@ # Changes -## v2.9.5: -* Enhancement #324: HTTPTupleView Windowing does not support multiple partition keys in a comma-delimited string +## v4.3.4 +* Bump jettyVersion 9.4.38.v20210224 +* Fix: HTTPTupleInject operator fails when attribute type is unsigned integer. (Issue #46) -## v3.0.0: -* Initial version forked from [streams.inet v2.9.6](https://github.com/IBMStreams/streamsx.inet/tree/v2.9.6) +## v4.3.3 +* Bump jettyVersion from 9.4.18.v20190429 to 9.4.35.v20201120 + +## v4.3.2 +* Globalization support + +## v4.3.1 +* Fix: Use relative path in all sample index.html files to be able to be used behind proxy +* Fix: Correct timing issue in junit tests + +## v4.3.0 +* Enhancement: New parameter 'sslAppConfigName' to get the SSL server key/certificate and the client trust material from Streams application configuration with this name + +## v4.2.0 +* Fixed: Operators can not load trustStore file if path is not an absolute one +* Enhancemement: Parameter contextResourceBase is now independent from parameter context +* Enhancemement in description for generation of client certitficate which can be used in a brower + +## v4.1.0 +* Enhancement in operator HTTPTupleView: Flexible partition query +* Enhancement in operator HTTPTupleView: new parameter 'partitionBy' +* Enhancement in Servlet Operator: new Parameter 'host' +* Enhancement in operator HTTPTupleInjection: insert the default values +* Correction in operator HTTPTupleView: selection of partition fails if attribute has type boolean ## v4.0.0 * Remove target 'setcommitversion' from build.xml - we have now a build.info @@ -29,28 +52,9 @@ * Simplified sample RequestProcessTuple * Removed puzzeling RequestProcessTuple Json Sample -## v4.1.0 -* Enhancement in operator HTTPTupleView: Flexible partition query -* Enhancement in operator HTTPTupleView: new parameter 'partitionBy' -* Enhancement in Servlet Operator: new Parameter 'host' -* Enhancement in operator HTTPTupleInjection: insert the default values -* Correction in operator HTTPTupleView: selection of partition fails if attribute has type boolean - -## v4.2.0 -* Fixed: Operators can not load trustStore file if path is not an absolute one -* Enhancemement: Parameter contextResourceBase is now independent from parameter context -* Enhancemement in description for generation of client certitficate which can be used in a brower - -## v4.3.0 -* Enhancement: New parameter 'sslAppConfigName' to get the SSL server key/certificate and the client trust material from Streams application configuration with this name - -## v4.3.1 -* Fix: Use relative path in all sample index.html files to be able to be used behind proxy -* Fix: Correct timing issue in junit tests - -## v4.3.2 -* Globalization support +## v3.0.0: +* Initial version forked from [streams.inet v2.9.6](https://github.com/IBMStreams/streamsx.inet/tree/v2.9.6) -## v4.3.3 -* Bump jettyVersion from 9.4.18.v20190429 to 9.4.35.v20201120 +## v2.9.5: +* Enhancement #324: HTTPTupleView Windowing does not support multiple partition keys in a comma-delimited string diff --git a/com.ibm.streamsx.inetserver/info.xml b/com.ibm.streamsx.inetserver/info.xml index 342975e..9eb6e93 100644 --- a/com.ibm.streamsx.inetserver/info.xml +++ b/com.ibm.streamsx.inetserver/info.xml @@ -14,7 +14,7 @@ This toolkit separates its functionality into a number of namespaces: * [namespace:com.ibm.streamsx.inet.wsserver|com.ibm.streamsx.inet.wsserver]: Operators that embed a (jetty) WebSocket server to expose streaming data as WebSocket messages. - 4.3.3 + 4.3.4 4.0.1.0 diff --git a/com.ibm.streamsx.inetserver/pom.xml b/com.ibm.streamsx.inetserver/pom.xml index 23be72f..fb39c4e 100644 --- a/com.ibm.streamsx.inetserver/pom.xml +++ b/com.ibm.streamsx.inetserver/pom.xml @@ -12,7 +12,7 @@ com.ibm.streamsx.inetserver streamsx.inetserver jar - 4.3.3 + 4.3.4 com.ibm.streamsx.inetserver