Skip to content

Commit 7a8c36c

Browse files
anourianouri
authored
Merge pull request #124 from IBMStreams/develop
Merge develop to master branch
2 parents 9f189f9 + 83df976 commit 7a8c36c

File tree

7 files changed

+45
-44
lines changed

7 files changed

+45
-44
lines changed

‎com.ibm.streamsx.hbase/.classpath

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,34 @@
33
<classpathentry kind="src" output="impl/java/bin" path="impl/java/src"/>
44
<classpathentry exported="true" kind="con" path="com.ibm.streams.java/com.ibm.streams.operator"/>
55
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
6-
<classpathentry kind="lib" path="opt/downloaded/commons-cli-1.2.jar"/>
7-
<classpathentry kind="lib" path="opt/downloaded/commons-codec-1.9.jar"/>
6+
<classpathentry kind="lib" path="opt/downloaded/commons-cli-1.4.jar"/>
7+
<classpathentry kind="lib" path="opt/downloaded/commons-codec-1.12.jar"/>
88
<classpathentry kind="lib" path="opt/downloaded/commons-collections-3.2.2.jar"/>
9-
<classpathentry kind="lib" path="opt/downloaded/commons-configuration-1.6.jar"/>
10-
<classpathentry kind="lib" path="opt/downloaded/commons-io-2.4.jar"/>
9+
<classpathentry kind="lib" path="opt/downloaded/commons-configuration2-2.5.jar"/>
10+
<classpathentry kind="lib" path="opt/downloaded/commons-io-2.6.jar"/>
1111
<classpathentry kind="lib" path="opt/downloaded/commons-lang-2.6.jar"/>
12-
<classpathentry kind="lib" path="opt/downloaded/commons-logging-1.1.3.jar"/>
13-
<classpathentry kind="lib" path="opt/downloaded/guava-11.0.2.jar"/>
14-
<classpathentry kind="lib" path="opt/downloaded/hadoop-annotations-2.8.5.jar"/>
15-
<classpathentry kind="lib" path="opt/downloaded/hadoop-auth-2.8.5.jar"/>
16-
<classpathentry kind="lib" path="opt/downloaded/hadoop-common-2.8.5.jar"/>
17-
<classpathentry kind="lib" path="opt/downloaded/hbase-annotations-1.4.9.jar"/>
18-
<classpathentry kind="lib" path="opt/downloaded/hbase-client-1.4.9.jar"/>
19-
<classpathentry kind="lib" path="opt/downloaded/hbase-common-1.4.9.jar"/>
20-
<classpathentry kind="lib" path="opt/downloaded/hbase-protocol-1.4.9.jar"/>
21-
<classpathentry kind="lib" path="opt/downloaded/htrace-core-3.1.0-incubating.jar"/>
12+
<classpathentry kind="lib" path="opt/downloaded/commons-logging-1.2.jar"/>
13+
<classpathentry kind="lib" path="opt/downloaded/guava-13.0.1.jar"/>
14+
<classpathentry kind="lib" path="opt/downloaded/hadoop-annotations-3.1.0.jar"/>
15+
<classpathentry kind="lib" path="opt/downloaded/hadoop-auth-3.1.0.jar"/>
16+
<classpathentry kind="lib" path="opt/downloaded/hadoop-common-3.1.0.jar"/>
17+
<classpathentry kind="lib" path="opt/downloaded/hbase-annotations-1.4.10.jar"/>
18+
<classpathentry kind="lib" path="opt/downloaded/hbase-client-1.4.10.jar"/>
19+
<classpathentry kind="lib" path="opt/downloaded/hbase-common-1.4.10.jar"/>
20+
<classpathentry kind="lib" path="opt/downloaded/hbase-protocol-1.4.10.jar"/>
21+
<classpathentry kind="lib" path="opt/downloaded/htrace-core-3.2.0-incubating.jar"/>
2222
<classpathentry kind="lib" path="opt/downloaded/htrace-core4-4.2.0-incubating.jar"/>
2323
<classpathentry kind="lib" path="opt/downloaded/jackson-core-asl-1.9.13.jar"/>
2424
<classpathentry kind="lib" path="opt/downloaded/jackson-mapper-asl-1.9.13.jar"/>
2525
<classpathentry kind="lib" path="opt/downloaded/javaee-api-7.0.jar"/>
26-
<classpathentry kind="lib" path="opt/downloaded/log4j-1.2.15.jar"/>
2726
<classpathentry kind="lib" path="opt/downloaded/metrics-core-2.2.0.jar"/>
28-
<classpathentry kind="lib" path="opt/downloaded/netty-all-4.0.52.Final.jar"/>
27+
<classpathentry kind="lib" path="opt/downloaded/netty-all-4.1.42.Final.jar"/>
2928
<classpathentry kind="lib" path="opt/downloaded/protobuf-java-2.5.0.jar"/>
3029
<classpathentry kind="lib" path="opt/downloaded/servlet-api-2.5.jar"/>
31-
<classpathentry kind="lib" path="opt/downloaded/slf4j-api-1.7.10.jar"/>
32-
<classpathentry kind="lib" path="opt/downloaded/slf4j-log4j12-1.7.10.jar"/>
33-
<classpathentry kind="lib" path="opt/downloaded/zookeeper-3.4.6.jar"/>
30+
<classpathentry kind="lib" path="opt/downloaded/slf4j-api-1.7.30.jar"/>
31+
<classpathentry kind="lib" path="opt/downloaded/slf4j-log4j12-1.7.30.jar"/>
32+
<classpathentry kind="lib" path="opt/downloaded/stax2-api-4.2.jar"/>
33+
<classpathentry kind="lib" path="opt/downloaded/woodstox-core-5.0.3.jar"/>
34+
<classpathentry kind="lib" path="opt/downloaded/zookeeper-3.4.14.jar"/>
3435
<classpathentry kind="output" path="bin"/>
3536
</classpath>

‎com.ibm.streamsx.hbase/impl/java/src/com/ibm/streamsx/hbase/HBASEOperator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,22 +192,22 @@ public static void runtimeHBaseOperatorChecks(OperatorContextChecker checker) {
192192

193193
if ((!context.getParameterNames().contains(TABLE_PARAM_NAME))
194194
&& (!context.getParameterNames().contains(TABLE_NAME_ATTRIBUTE))) {
195-
checker.setInvalidContext("One of these parameters must be set in opeartor: '" + TABLE_PARAM_NAME + "' or '" + TABLE_NAME_ATTRIBUTE +"'", null);
195+
checker.setInvalidContext(Messages.getString("HBASE_FAILED_ONE_OF_TWO_PARAMS", TABLE_PARAM_NAME, TABLE_NAME_ATTRIBUTE), null);
196196
}
197197

198198
if (context.getNumberOfStreamingOutputs() == 2) {
199199
StreamingOutput<OutputTuple> errorOutputPort = context.getStreamingOutputs().get(1);
200200
// The first attribute of optional error output port must be a string.
201201
if (errorOutputPort.getStreamSchema().getAttribute(0).getType().getMetaType() != Type.MetaType.RSTRING) {
202-
checker.setInvalidContext("The first attribute in the optional error output port must be a rstring", null);
202+
checker.setInvalidContext(Messages.getString("HBASE_INVALID_ATTR_RSTRING"), null);
203203
}
204204

205205
// The second attribute of error output port is optional.
206206
if (errorOutputPort.getStreamSchema().getAttributeCount() > 1){
207207
// The second attribute of optional error output port must be a Tuple.
208208
if (errorOutputPort.getStreamSchema().getAttribute(1) !=null){
209209
if (errorOutputPort.getStreamSchema().getAttribute(1).getType().getMetaType() != Type.MetaType.TUPLE) {
210-
checker.setInvalidContext("The second attribute in the optional error output port must be a TUPLE", null);
210+
checker.setInvalidContext(Messages.getString("HBASE_INVALID_ATTR_TUPLE"), null);
211211
}
212212

213213
}

‎com.ibm.streamsx.hbase/impl/java/src/com/ibm/streamsx/hbase/HBASEPut.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,13 @@ public static void checkForBatchSizeParam(OperatorContextChecker checker) {
194194
OperatorContext context = checker.getOperatorContext();
195195
// The hbase site must either be specified by a parameter, or we must look it up relative to an environment variable.
196196

197-
if ((!checker.checkExcludedParameters(BATCHSIZE_NAME,BUFFER_PARAM))){
198-
checker.setInvalidContext("The " + BATCHSIZE_NAME + " has been deprecated and should not be used. Use the " +BUFFER_PARAM + " parameter instead.", null);
197+
if ((!checker.checkExcludedParameters(BATCHSIZE_NAME, BUFFER_PARAM))){
198+
checker.setInvalidContext("The " + BATCHSIZE_NAME + " has been deprecated and should not be used. Use the " + BUFFER_PARAM + " parameter instead.", null);
199199
} else if (context.getParameterNames().contains(BATCHSIZE_NAME)) {
200-
System.err.println("The " + BATCHSIZE_NAME + " has been deprecated and should not be used. Use the " +BUFFER_PARAM + " parameter instead.");
200+
System.err.println("The " + BATCHSIZE_NAME + " has been deprecated and should not be used. Use the " + BUFFER_PARAM + " parameter instead.");
201201
}
202-
if ((!checker.checkExcludedParameters(TIMESTAMP,TIMESTAMP_ATTR))){
203-
checker.setInvalidContext("The " + TIMESTAMP + " can not be used with " + TIMESTAMP_ATTR , null);
202+
if ((!checker.checkExcludedParameters(TIMESTAMP, TIMESTAMP_ATTR))){
203+
checker.setInvalidContext(Messages.getString("HBASE_PUT_DEL_INVALID_PARAM", TIMESTAMP, TIMESTAMP_ATTR), null);
204204
}
205205
}
206206

‎com.ibm.streamsx.hbase/impl/java/src/com/ibm/streamsx/hbase/messages/messages.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,9 @@ HBASE_SCAN_LIVING_RESET=CDIST2957I Leaving reset.
7070
HBASE_SCAN_RESET=CDIST2958I Reset to initial state.
7171
HBASE_SCAN_LEAVING_RESET_INIT=CDIST2959I Leaving resetToInitial.
7272

73+
HBASE_FAILED_ONE_OF_TWO_PARAMS=CDIST2960E One of these parameters must be set in operator: ''{0}'' or ''{1}''.
74+
HBASE_INVALID_ATTR_RSTRING=CDIST2961E The first attribute in the optional error output port must be a rstring .
75+
HBASE_INVALID_ATTR_TUPLE=CDIST2962E The second attribute in the optional error output port must be a tuple .
76+
77+
7378

‎com.ibm.streamsx.hbase/impl/java/src/com/ibm/streamsx/hbase/messages/messages_en_US.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,7 @@ HBASE_SCAN_LIVING_RESET=CDIST2957I Leaving reset.
7070
HBASE_SCAN_RESET=CDIST2958I Reset to initial state.
7171
HBASE_SCAN_LEAVING_RESET_INIT=CDIST2959I Leaving resetToInitial.
7272

73+
HBASE_FAILED_ONE_OF_TWO_PARAMS=CDIST2960E One of these parameters must be set in operator: ''{0}'' or ''{1}''.
74+
HBASE_INVALID_ATTR_RSTRING=CDIST2961E The first attribute in the optional error output port must be a rstring .
75+
HBASE_INVALID_ATTR_TUPLE=CDIST2962E The second attribute in the optional error output port must be a tuple .
7376

‎com.ibm.streamsx.hbase/info.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,13 @@ The jar library zookeeper-3.4.13.jar has been replaced with **zookeeper-3.4.6.ja
203203

204204
* The jar library **netty-all-4.0.52.Final.jar** has been upgraded to **netty-all-4.1.42.Final.jar** .
205205

206+
++ What is new in version 3.8.2
207+
208+
* New error messages for globalization.
209+
* pom.xml updated to log4j-1.2.17.jar
210+
206211
</info:description>
207-
<info:version>3.8.1</info:version>
212+
<info:version>3.8.2</info:version>
208213
<info:requiredProductVersion>4.0.0.0</info:requiredProductVersion>
209214
</info:identity>
210215
<info:dependencies/>

‎com.ibm.streamsx.hbase/pom.xml

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<groupId>com.ibm.streamsx.hbase</groupId>
1212
<artifactId>streamsx.hbase</artifactId>
1313
<packaging>jar</packaging>
14-
<version>3.8.1</version>
14+
<version>3.8.2</version>
1515
<name>com.ibm.streamsx.hbase</name>
1616
<repositories>
1717
<repository>
@@ -130,23 +130,10 @@
130130
</exclusions>
131131
</dependency>
132132

133-
<dependency>
134-
<groupId>log4j</groupId>
135-
<artifactId>log4j</artifactId>
136-
<version>1.2.15</version>
137-
138-
<exclusions>
139-
<exclusion>
140-
<groupId>*</groupId>
141-
<artifactId>*</artifactId>
142-
</exclusion>
143-
</exclusions>
144-
</dependency>
145-
146133
<dependency>
147134
<groupId>org.slf4j</groupId>
148135
<artifactId>slf4j-api</artifactId>
149-
<version>1.7.10</version>
136+
<version>1.7.30</version>
150137
<exclusions>
151138
<exclusion>
152139
<groupId>*</groupId>
@@ -158,7 +145,7 @@
158145
<dependency>
159146
<groupId>org.slf4j</groupId>
160147
<artifactId>slf4j-log4j12</artifactId>
161-
<version>1.7.10</version>
148+
<version>1.7.30</version>
162149
<exclusions>
163150
<exclusion>
164151
<groupId>*</groupId>

0 commit comments

Comments
 (0)