This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 612b03e Fixing few remaining type declaration issues
612b03e is described below
commit 612b03ea00b8a9e747411dbfa9a4eb1c6ff4b529
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Fri Nov 16 12:16:59 2018 +0000
Fixing few remaining type declaration issues
---
.../cxf/systest/type_test/AbstractTypeTestClient.java | 12 ++++++------
.../cxf/testutils/header_test/rpc/TestRPCHeaderTest.java | 4 ++--
.../org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java | 14 +++++++-------
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
index 51abc1c..8ba463f 100644
---
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
+++
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
@@ -193,7 +193,7 @@ public abstract class AbstractTypeTestClient
if (!shouldRunTest("Short")) {
return;
}
- short valueSets[][] = {{0, 1}, {-1, 0}, {Short.MIN_VALUE,
Short.MAX_VALUE}};
+ short[][] valueSets = {{0, 1}, {-1, 0}, {Short.MIN_VALUE,
Short.MAX_VALUE}};
for (int i = 0; i < valueSets.length; i++) {
short x = valueSets[i][0];
@@ -378,7 +378,7 @@ public abstract class AbstractTypeTestClient
return;
}
float delta = 0.0f;
- float valueSets[][] = getTestFloatData();
+ float[][] valueSets = getTestFloatData();
for (int i = 0; i < valueSets.length; i++) {
float x = valueSets[i][0];
@@ -430,7 +430,7 @@ public abstract class AbstractTypeTestClient
return;
}
double delta = 0.0d;
- double valueSets[][] = getTestDoubleData();
+ double[][] valueSets = getTestDoubleData();
for (int i = 0; i < valueSets.length; i++) {
double x = valueSets[i][0];
Holder<Double> yOrig = new Holder<>(valueSets[i][1]);
@@ -476,7 +476,7 @@ public abstract class AbstractTypeTestClient
if (!shouldRunTest("UnsignedByte")) {
return;
}
- short valueSets[][] = {{0, 1}, {1, 0}, {0, Byte.MAX_VALUE * 2 + 1}};
+ short[][] valueSets = {{0, 1}, {1, 0}, {0, Byte.MAX_VALUE * 2 + 1}};
for (int i = 0; i < valueSets.length; i++) {
short x = valueSets[i][0];
@@ -506,7 +506,7 @@ public abstract class AbstractTypeTestClient
if (!shouldRunTest("Boolean")) {
return;
}
- boolean valueSets[][] = {{true, false}, {true, true}, {false, true},
{false, false}};
+ boolean[][] valueSets = {{true, false}, {true, true}, {false, true},
{false, false}};
for (int i = 0; i < valueSets.length; i++) {
boolean x = valueSets[i][0];
@@ -1111,7 +1111,7 @@ public abstract class AbstractTypeTestClient
if (!shouldRunTest("Decimal")) {
return;
}
- BigDecimal valueSets[][] = {{new BigDecimal("-1234567890.000000"),
+ BigDecimal[][] valueSets = {{new BigDecimal("-1234567890.000000"),
new BigDecimal("1234567890.000000")},
{new BigDecimal("-" +
String.valueOf(Long.MAX_VALUE * Long.MAX_VALUE)
+ ".000000"),
diff --git
a/testutils/src/test/java/org/apache/cxf/testutils/header_test/rpc/TestRPCHeaderTest.java
b/testutils/src/test/java/org/apache/cxf/testutils/header_test/rpc/TestRPCHeaderTest.java
index 4619849..3ca4418 100644
---
a/testutils/src/test/java/org/apache/cxf/testutils/header_test/rpc/TestRPCHeaderTest.java
+++
b/testutils/src/test/java/org/apache/cxf/testutils/header_test/rpc/TestRPCHeaderTest.java
@@ -37,7 +37,7 @@ public class TestRPCHeaderTest extends Assert {
Method[] meths = cls.getMethods();
for (Method m : meths) {
if ("testHeader1".equals(m.getName())) {
- Annotation annotations[][] = m.getParameterAnnotations();
+ Annotation[][] annotations = m.getParameterAnnotations();
assertEquals(2, annotations.length);
assertEquals(1, annotations[0].length);
assertTrue(annotations[0][0] instanceof WebParam);
@@ -56,7 +56,7 @@ public class TestRPCHeaderTest extends Assert {
Method[] meths = cls.getMethods();
for (Method m : meths) {
if ("testInOutHeader".equals(m.getName())) {
- Annotation annotations[][] = m.getParameterAnnotations();
+ Annotation[][] annotations = m.getParameterAnnotations();
assertEquals(2, annotations.length);
assertEquals(1, annotations[1].length);
assertTrue(annotations[1][0] instanceof WebParam);
diff --git
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
index 0c1516e..8866ee3 100644
---
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
+++
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
@@ -72,7 +72,7 @@ public class CodeGenTest extends AbstractCodeGenTest {
Method[] meths = clz.getMethods();
for (Method m : meths) {
if ("orderPizzaBroken".equals(m.getName())) {
- Annotation annotations[][] = m.getParameterAnnotations();
+ Annotation[][] annotations = m.getParameterAnnotations();
assertEquals(2, annotations.length);
for (int i = 0; i < 2; i++) {
assertTrue(annotations[i][0] instanceof WebParam);
@@ -93,7 +93,7 @@ public class CodeGenTest extends AbstractCodeGenTest {
}
if ("orderPizza".equals(m.getName())) {
- Annotation annotations[][] = m.getParameterAnnotations();
+ Annotation[][] annotations = m.getParameterAnnotations();
assertEquals(2, annotations.length);
for (int i = 0; i < 2; i++) {
assertTrue(annotations[i][0] instanceof WebParam);
@@ -132,7 +132,7 @@ public class CodeGenTest extends AbstractCodeGenTest {
Method[] meths = clz.getMethods();
for (Method m : meths) {
if ("orderPizzaBroken".equals(m.getName())) {
- Annotation annotations[][] = m.getParameterAnnotations();
+ Annotation[][] annotations = m.getParameterAnnotations();
assertEquals(1, annotations.length);
for (int i = 0; i < 1; i++) {
assertTrue(annotations[i][0] instanceof WebParam);
@@ -166,7 +166,7 @@ public class CodeGenTest extends AbstractCodeGenTest {
Method[] meths = clz.getMethods();
for (Method m : meths) {
if ("orderPizzaBroken".equals(m.getName())) {
- Annotation annotations[][] = m.getParameterAnnotations();
+ Annotation[][] annotations = m.getParameterAnnotations();
assertEquals(1, annotations.length);
for (int i = 0; i < 1; i++) {
assertTrue(annotations[i][0] instanceof WebParam);
@@ -201,7 +201,7 @@ public class CodeGenTest extends AbstractCodeGenTest {
Method[] meths = clz.getMethods();
for (Method m : meths) {
if ("orderPizza".equals(m.getName())) {
- Annotation annotations[][] = m.getParameterAnnotations();
+ Annotation[][] annotations = m.getParameterAnnotations();
assertEquals(2, annotations.length);
for (int i = 0; i < 2; i++) {
assertTrue(annotations[i][0] instanceof WebParam);
@@ -1177,7 +1177,7 @@ public class CodeGenTest extends AbstractCodeGenTest {
Method[] meths = cls.getMethods();
for (Method m : meths) {
if ("testHeader1".equals(m.getName())) {
- Annotation annotations[][] = m.getParameterAnnotations();
+ Annotation[][] annotations = m.getParameterAnnotations();
assertEquals(2, annotations.length);
assertEquals(1, annotations[1].length);
assertTrue(annotations[1][0] instanceof WebParam);
@@ -1191,7 +1191,7 @@ public class CodeGenTest extends AbstractCodeGenTest {
for (Method m : meths) {
if ("testInOutHeader".equals(m.getName())) {
- Annotation annotations[][] = m.getParameterAnnotations();
+ Annotation[][] annotations = m.getParameterAnnotations();
assertEquals(2, annotations.length);
assertEquals(1, annotations[1].length);
assertTrue(annotations[1][0] instanceof WebParam);
