Merge pull request #50 from IBMStreams/fixes

Fixes
IBMStreams · Mar 24, 2021 · 0bb5e7f · 0bb5e7f
2 parents 100c4d1 + 297e85f
commit 0bb5e7f
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 31 deletions.
diff --git 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/...bm.streamsx.inetserver/impl/java/src/com/ibm/streamsx/inet/rest/servlets/InjectTuple.java b/...bm.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:

diff --git 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.
 
     </description>
-    <version>4.3.3</version>
+    <version>4.3.4</version>
     <requiredProductVersion>4.0.1.0</requiredProductVersion>
   </identity>
   <dependencies/>

diff --git a/com.ibm.streamsx.inetserver/pom.xml b/com.ibm.streamsx.inetserver/pom.xml
@@ -12,12 +12,11 @@
     <groupId>com.ibm.streamsx.inetserver</groupId>
     <artifactId>streamsx.inetserver</artifactId>
     <packaging>jar</packaging>
-    <version>4.3.3</version>
+    <version>4.3.4</version>
     <name>com.ibm.streamsx.inetserver</name>
     <properties>
         <!-- Adapt this to a version found on http://central.maven.org/maven2/org/eclipse/jetty/ -->
-        <!-- <jettyVersion>9.4.12.v20180830</jettyVersion> -->
-        <jettyVersion>9.4.35.v20201120</jettyVersion>
+        <jettyVersion>9.4.38.v20210224</jettyVersion>
     </properties>
     <dependencies>
         <dependency>