This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 0e3806a85ad840da8dafc2f0c66768e791ef7c21 Author: Gary Gregory <[email protected]> AuthorDate: Fri Jun 23 23:48:12 2023 -0400 [juneau-utest] Use {} only when creating certain arrays --- .../test/java/org/apache/juneau/BeanConfigTest.java | 4 ++-- .../src/test/java/org/apache/juneau/BeanMapTest.java | 4 ++-- .../apache/juneau/SerializerPropertiesComboTest.java | 4 ++-- .../juneau/a/rttests/RoundTripToJsonMapsTest.java | 2 +- .../test/java/org/apache/juneau/html/Html_Test.java | 2 +- .../apache/juneau/http/remote/RrpcInterfaceTest.java | 18 +++++++++--------- .../test/java/org/apache/juneau/oapi/OpenApiTest.java | 12 ++++++------ .../apache/juneau/objecttools/ObjectSearcher_Test.java | 14 +++++++------- .../rest/client/RestClient_Config_Serializer_Test.java | 2 +- .../juneau/rest/client/RestClient_Paths_Test.java | 2 +- .../juneau/rest/client/RestClient_Query_Test.java | 2 +- .../java/org/apache/juneau/transforms/BeanMapTest.java | 2 +- .../org/apache/juneau/utils/ArrayBuilder_Test.java | 2 +- .../java/org/apache/juneau/utils/ArrayUtilsTest.java | 2 +- 14 files changed, 36 insertions(+), 36 deletions(-) diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java b/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java index 72a0a447e..242c4b963 100755 --- a/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java @@ -830,8 +830,8 @@ public class BeanConfigTest { public class D { public int[] f1; private int[] f2; - public int[] f3 = new int[]{1,2,3}; - private int[] f4 = new int[]{1,2,3}; + public int[] f3 = {1,2,3}; + private int[] f4 = {1,2,3}; public int[] getF2() {return f2;} public void setF2(int[] f2) {this.f2 = f2;} public int[] getF4() {return f4;} diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java b/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java index c153f2833..848d25108 100755 --- a/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java @@ -509,7 +509,7 @@ public class BeanMapTest { public List<D2> lb1; public List<D2> lb2 = new ArrayList<>(); public D2[] ab1; - public D2[] ab2 = new D2[0]; + public D2[] ab2 = {}; } @Bean(typeName="D2") @@ -566,7 +566,7 @@ public class BeanMapTest { public List<D2c> lb1; public List<D2c> lb2 = new ArrayList<>(); public D2c[] ab1; - public D2c[] ab2 = new D2c[0]; + public D2c[] ab2 = {}; } public static class D2c { diff --git a/juneau-utest/src/test/java/org/apache/juneau/SerializerPropertiesComboTest.java b/juneau-utest/src/test/java/org/apache/juneau/SerializerPropertiesComboTest.java index 229577324..a1df7dc56 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/SerializerPropertiesComboTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/SerializerPropertiesComboTest.java @@ -447,11 +447,11 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest { @Bean(typeName="T11") public static class T11 { - public T11a[] f = new T11a[]{new T11a()}; + public T11a[] f = {new T11a()}; } @Bean(typeName="T11a") public static class T11a { - public String[] f = new String[]{" foo "}; + public String[] f = {" foo "}; } } diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripToJsonMapsTest.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripToJsonMapsTest.java index 12a84b50e..9ad61ccaf 100755 --- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripToJsonMapsTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripToJsonMapsTest.java @@ -45,7 +45,7 @@ public class RoundTripToJsonMapsTest extends RoundTripTest { assertEquals("a", a.f1); assertEquals(2, a.f2); - A[] aa = new A[]{a}; + A[] aa = {a}; aa = roundTrip(aa, A[].class); assertEquals(1, aa.length); assertEquals("a", aa[0].f1); diff --git a/juneau-utest/src/test/java/org/apache/juneau/html/Html_Test.java b/juneau-utest/src/test/java/org/apache/juneau/html/Html_Test.java index 3aa11220d..4e8843eb8 100755 --- a/juneau-utest/src/test/java/org/apache/juneau/html/Html_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/html/Html_Test.java @@ -432,7 +432,7 @@ public class Html_Test { @Test public void e01_collectionOfBeansWithBpi() throws Exception { - E[] ee = new E[]{ + E[] ee = { new E(null, 2, 3), new E(4, 5, 6) }; diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/RrpcInterfaceTest.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/RrpcInterfaceTest.java index ce58c4739..6b5f8102b 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/RrpcInterfaceTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/RrpcInterfaceTest.java @@ -1566,7 +1566,7 @@ public class RrpcInterfaceTest { @Test public void m01_setMultiParamsInts() { int x1 = 1; - int[][][] x2 = new int[][][]{{{1,2},null},null}; + int[][][] x2 = {{{1,2},null},null}; int[][][] x2n = null; List<int[][][]> x3 = alist(x2,null); List<int[][][]> x3n = null; @@ -1577,7 +1577,7 @@ public class RrpcInterfaceTest { public void m02_setMultiParamsInteger() { Integer x1 = 1; Integer x1n = null; - Integer[][][] x2 = new Integer[][][]{{{1,null},null},null}; + Integer[][][] x2 = {{{1,null},null},null}; Integer[][][] x2n = null; List<Integer[][][]> x3 = alist(x2,null); List<Integer[][][]> x3n = null; @@ -1587,7 +1587,7 @@ public class RrpcInterfaceTest { @Test public void m03_setMultiParamsFloat() { float x1 = 1; - float[][][] x2 = new float[][][]{{{1,2},null},null}; + float[][][] x2 = {{{1,2},null},null}; float[][][] x2n = null; List<float[][][]> x3 = alist(x2,null); List<float[][][]> x3n = null; @@ -1598,7 +1598,7 @@ public class RrpcInterfaceTest { public void m04_setMultiParamsFloatObject() { Float x1 = 1f; Float x1n = null; - Float[][][] x2 = new Float[][][]{{{1f,null},null},null}; + Float[][][] x2 = {{{1f,null},null},null}; Float[][][] x2n = null; List<Float[][][]> x3 = alist(x2,null); List<Float[][][]> x3n = null; @@ -1608,7 +1608,7 @@ public class RrpcInterfaceTest { @Test public void m05_setMultiParamsString() { String x1 = "foo"; - String[][][] x2 = new String[][][]{{{"foo",null},null},null}; + String[][][] x2 = {{{"foo",null},null},null}; String[][][] x2n = null; List<String[][][]> x3 = alist(x2,null); List<String[][][]> x3n = null; @@ -1618,7 +1618,7 @@ public class RrpcInterfaceTest { @Test public void m06_setMultiParamsBean() { ABean x1 = ABean.get(); - ABean[][][] x2 = new ABean[][][]{{{ABean.get(),null},null},null}; + ABean[][][] x2 = {{{ABean.get(),null},null},null}; ABean[][][] x2n = null; List<ABean[][][]> x3 = alist(x2,null); List<ABean[][][]> x3n = null; @@ -1632,7 +1632,7 @@ public class RrpcInterfaceTest { @Test public void m07_setMultiParamsSwappedObject() { SwappedObject x1 = new SwappedObject(); - SwappedObject[][][] x2 = new SwappedObject[][][]{{{new SwappedObject(),null},null},null}; + SwappedObject[][][] x2 = {{{new SwappedObject(),null},null},null}; SwappedObject[][][] x2n = null; List<SwappedObject[][][]> x3 = alist(x2,null); List<SwappedObject[][][]> x3n = null; @@ -1646,7 +1646,7 @@ public class RrpcInterfaceTest { @Test public void m08_setMultiParamsImplicitSwappedObject() { ImplicitSwappedObject x1 = new ImplicitSwappedObject(); - ImplicitSwappedObject[][][] x2 = new ImplicitSwappedObject[][][]{{{new ImplicitSwappedObject(),null},null},null}; + ImplicitSwappedObject[][][] x2 = {{{new ImplicitSwappedObject(),null},null},null}; ImplicitSwappedObject[][][] x2n = null; List<ImplicitSwappedObject[][][]> x3 = alist(x2,null); List<ImplicitSwappedObject[][][]> x3n = null; @@ -1660,7 +1660,7 @@ public class RrpcInterfaceTest { @Test public void m09_setMultiParamsEnum() { TestEnum x1 = TestEnum.TWO; - TestEnum[][][] x2 = new TestEnum[][][]{{{TestEnum.TWO,null},null},null}; + TestEnum[][][] x2 = {{{TestEnum.TWO,null},null},null}; TestEnum[][][] x2n = null; List<TestEnum[][][]> x3 = alist(x2,null); List<TestEnum[][][]> x3n = null; diff --git a/juneau-utest/src/test/java/org/apache/juneau/oapi/OpenApiTest.java b/juneau-utest/src/test/java/org/apache/juneau/oapi/OpenApiTest.java index 7aec23d8f..4d756a8dc 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/oapi/OpenApiTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/oapi/OpenApiTest.java @@ -642,7 +642,7 @@ public class OpenApiTest { @Test public void f03a_tArray_IntArray() throws Exception { - int[] in = new int[]{123}; + int[] in = {123}; HttpPartSchema ps = T_ARRAY; String s = serialize(ps, in); assertEquals("123", s); @@ -708,7 +708,7 @@ public class OpenApiTest { @Test public void f05a_tArrayUon_IntArray() throws Exception { - int[] in = new int[]{123}; + int[] in = {123}; HttpPartSchema ps = T_ARRAY_UON; String s = serialize(ps, in); assertEquals("@(123)", s); @@ -741,7 +741,7 @@ public class OpenApiTest { @Test public void f06a_tArrayPipes_IntArray() throws Exception { - int[] in = new int[]{123}; + int[] in = {123}; HttpPartSchema ps = T_ARRAY_PIPES; String s = serialize(ps, in); assertEquals("123", s); @@ -774,7 +774,7 @@ public class OpenApiTest { @Test public void f07a_tArraySsv_IntArray() throws Exception { - int[] in = new int[]{123}; + int[] in = {123}; HttpPartSchema ps = T_ARRAY_SSV; String s = serialize(ps, in); assertEquals("123", s); @@ -807,7 +807,7 @@ public class OpenApiTest { @Test public void f08a_tArrayTsv_IntArray() throws Exception { - int[] in = new int[]{123}; + int[] in = {123}; HttpPartSchema ps = T_ARRAY_TSV; String s = serialize(ps, in); assertEquals("123", s); @@ -840,7 +840,7 @@ public class OpenApiTest { @Test public void f09a_tArrayCsv_IntArray() throws Exception { - int[] in = new int[]{123}; + int[] in = {123}; HttpPartSchema ps = T_ARRAY_CSV; String s = serialize(ps, in); assertEquals("123", s); diff --git a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectSearcher_Test.java b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectSearcher_Test.java index b3fd8a1b6..6202a469a 100755 --- a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectSearcher_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectSearcher_Test.java @@ -78,7 +78,7 @@ public class ObjectSearcher_Test { public static List<A> A_LIST = list(A.create("foo"), A.create("bar"), A.create("baz"), A.create("q ux"), A.create("qu'ux"), null, A.create(null)); public static Set<A> A_SET = set(A.create("foo"), A.create("bar"), A.create("baz"), A.create("q ux"), A.create("qu'ux"), null, A.create(null)); - public static A[] A_ARRAY = new A[]{A.create("foo"), A.create("bar"), A.create("baz"), A.create("q ux"), A.create("qu'ux"), null, A.create(null)}; + public static A[] A_ARRAY = {A.create("foo"), A.create("bar"), A.create("baz"), A.create("q ux"), A.create("qu'ux"), null, A.create(null)}; @Test public void a01_stringSearch_singleWord() throws Exception { @@ -259,7 +259,7 @@ public class ObjectSearcher_Test { } } - C[] INT_BEAN_ARRAY = new C[]{C.create(-2), C.create(-1), C.create(0), C.create(1), C.create(2), C.create(3)}; + C[] INT_BEAN_ARRAY = {C.create(-2), C.create(-1), C.create(0), C.create(1), C.create(2), C.create(3)}; @Test public void b01_intSearch_oneNumber() throws Exception { @@ -398,7 +398,7 @@ public class ObjectSearcher_Test { @Test public void b25_intSearch_badSearches() throws Exception { - String[] ss = new String[] { + String[] ss = { "f=x","(S01)", "f=>x","(S02)", "f=<x","(S03)", @@ -687,7 +687,7 @@ public class ObjectSearcher_Test { @Ignore /* TODO - Fix me */ public void c15_dateSearch_badSearches() throws Exception { B[] in = B.create("2000-12-31"); - String[] ss = new String[] { + String[] ss = { "f=X","(S01)", "f=>X","(S02)", "f=<X","(S03)", @@ -787,7 +787,7 @@ public class ObjectSearcher_Test { @Test public void d06_d2ArrayOfObjects() throws Exception { - Object[] in = new Object[]{ + Object[] in = { map("f","foo"), map("f","bar"), null, @@ -927,7 +927,7 @@ public class ObjectSearcher_Test { @Test public void d16_d3ArrayOfArrayOfObjects() throws Exception { - Object[][] in = new Object[][]{ + Object[][] in = { new Object[]{map("f","foo")}, new Object[]{map("f","bar")}, new Object[]{null}, @@ -985,7 +985,7 @@ public class ObjectSearcher_Test { @Test public void d20_d3ArrayOfArrayOfBeans() throws Exception { - A[][] in = new A[][]{ + A[][] in = { new A[]{A.create("foo")}, new A[]{A.create("bar")}, new A[]{null}, diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Serializer_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Serializer_Test.java index 8e24d9597..4ca68e5fe 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Serializer_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Serializer_Test.java @@ -120,7 +120,7 @@ public class RestClient_Config_Serializer_Test { @Test public void a07_sortCollections() throws Exception { - String[] x = new String[]{"c","a","b"}; + String[] x = {"c","a","b"}; client().sortCollections().build().post("/echoBody",x).run().assertContent("['a','b','c']"); } diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java index 78bf0ed20..3f1e0f4e4 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java @@ -76,7 +76,7 @@ public class RestClient_Paths_Test { @Test public void a05_path_String_Object_Schema() throws Exception { - String[] a = new String[]{"foo","bar"}; + String[] a = {"foo","bar"}; client().build().get("/echo/{x}").pathData(part("x",a,T_ARRAY_PIPES)).run().assertContent().isContains("GET /echo/foo%7Cbar HTTP/1.1"); } diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Query_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Query_Test.java index d558e7fd0..b570058b7 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Query_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Query_Test.java @@ -77,7 +77,7 @@ public class RestClient_Query_Test { @Test public void a07_query_String_Supplier_Schema() throws Exception { - String[] l1 = new String[]{"foo","bar"},l2 = new String[]{"bar","baz"}; + String[] l1 = {"foo","bar"},l2 = {"bar","baz"}; TestSupplier s = TestSupplier.of(l1); RestClient x = client().queryData(part("foo",s,T_ARRAY_PIPES)).build(); x.get("/query").queryData(part("bar",s,T_ARRAY_PIPES)).run().assertContent().asString().asUrlDecode().is("foo=foo|bar&bar=foo|bar"); diff --git a/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanMapTest.java b/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanMapTest.java index 24600ea81..ce304b064 100755 --- a/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanMapTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanMapTest.java @@ -41,7 +41,7 @@ public class BeanMapTest { } public static class A { - public byte[] f1 = new byte[]{1,2,3}; + public byte[] f1 = {1,2,3}; public byte[] f3 = null; } diff --git a/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayBuilder_Test.java b/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayBuilder_Test.java index b99aee558..bd472dcac 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayBuilder_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayBuilder_Test.java @@ -23,7 +23,7 @@ public class ArrayBuilder_Test { @Test public void a01_basic() { - String[] empty = new String[0]; + String[] empty = {}; ArrayBuilder<String> x = ArrayBuilder.of(String.class).filter(y -> y != null).size(2); assertObject(x.orElse(empty)).asJson().is("[]"); x.add(null); diff --git a/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayUtilsTest.java b/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayUtilsTest.java index deb7154f7..1f854ab23 100755 --- a/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayUtilsTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayUtilsTest.java @@ -69,7 +69,7 @@ public class ArrayUtilsTest { //==================================================================================================== @Test public void testCombine() throws Exception { - String[] s1 = new String[]{"a"}, s2 = new String[]{"b"}; + String[] s1 = {"a"}, s2 = {"b"}; assertObject(combine(s1, s2)).asJson().is("['a','b']"); assertObject(combine(s1)).asJson().is("['a']");
