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 c9d9bdd46b159ed868227478b9478edf5537ab9a Author: Gary Gregory <[email protected]> AuthorDate: Fri Jun 23 23:37:12 2023 -0400 [juneau-utest] Remove redundant modifiers --- .../java/org/apache/juneau/BeanConfigTest.java | 2 +- .../java/org/apache/juneau/BeanContextTest.java | 6 +- .../test/java/org/apache/juneau/BeanMapTest.java | 4 +- .../test/java/org/apache/juneau/ClassMetaTest.java | 8 +- .../test/java/org/apache/juneau/ProxyBeanTest.java | 2 +- .../a/rttests/RoundTripAddClassAttrsTest.java | 6 +- .../juneau/a/rttests/RoundTripBeanMapsTest.java | 8 +- .../apache/juneau/a/rttests/RoundTripEnumTest.java | 2 +- .../a/rttests/RoundTripObjectsAsStringsTest.java | 4 +- .../a/rttests/RoundTripTransformBeansTest.java | 2 +- .../apache/juneau/config/ConfigInterfaceTest.java | 190 ++++++++++----------- .../java/org/apache/juneau/config/ConfigTest.java | 2 +- .../org/apache/juneau/html/BasicHtml_Test.java | 6 +- .../juneau/html/HtmlSchemaSerializerTest.java | 2 +- .../http/remote/Remote_CommonInterfaces_Test.java | 22 +-- .../http/remote/Remote_ContentAnnotation_Test.java | 6 +- .../remote/Remote_FormDataAnnotation_Test.java | 32 ++-- .../http/remote/Remote_HeaderAnnotation_Test.java | 28 +-- .../http/remote/Remote_PathAnnotation_Test.java | 24 +-- .../http/remote/Remote_QueryAnnotation_Test.java | 34 ++-- .../remote/Remote_RemoteOpAnnotation_Test.java | 12 +- .../http/remote/Remote_RequestAnnotation_Test.java | 10 +- .../remote/Remote_ResponseAnnotation_Test.java | 6 +- .../org/apache/juneau/http/remote/Remote_Test.java | 50 +++--- .../juneau/http/remote/RrpcInterfaceTest.java | 2 +- .../juneau/objecttools/ObjectMerger_Test.java | 2 +- .../org/apache/juneau/reflect/ClassInfoTest.java | 32 ++-- .../apache/juneau/reflect/ExecutableInfoTest.java | 2 +- .../org/apache/juneau/reflect/MethodInfoTest.java | 12 +- .../org/apache/juneau/reflect/ParamInfoTest.java | 18 +- .../Rest_AnnotationInheritance_Test.java | 11 +- .../client/RestClient_Config_BeanContext_Test.java | 14 +- .../rest/test/client/ThirdPartyProxyTest.java | 34 ++-- .../apache/juneau/svl/ResolvingJsonMapTest.java | 2 +- .../juneau/transforms/BeanDictionaryComboTest.java | 4 +- .../apache/juneau/transforms/BeanFilterTest.java | 8 +- .../java/org/apache/juneau/xml/BasicXmlTest.java | 6 +- .../apache/juneau/xml/XmlIgnoreCommentsTest.java | 6 +- .../test/java/org/apache/juneau/xml/XmlTest.java | 2 +- 39 files changed, 310 insertions(+), 313 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 f3a2c4f43..72a0a447e 100755 --- a/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/BeanConfigTest.java @@ -540,7 +540,7 @@ public class BeanConfigTest { fail("Failed reverse equality test of dynamic proxies beans: " + bm1 + " / " + bm2); } - public static interface A { + public interface A { String getA(); void setA(String a); diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanContextTest.java b/juneau-utest/src/test/java/org/apache/juneau/BeanContextTest.java index 67714b109..6ec3e4c2c 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/BeanContextTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/BeanContextTest.java @@ -27,9 +27,9 @@ public class BeanContextTest { BeanContext bc = BeanContext.DEFAULT; BeanSession bs = BeanContext.DEFAULT_SESSION; - public static interface A1 { - public int getF1(); - public void setF1(int f1); + public interface A1 { + int getF1(); + void setF1(int f1); } @Test 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 ea8303023..c153f2833 100755 --- a/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java @@ -735,7 +735,7 @@ public class BeanMapTest { assertEquals(HEnum.ONE, t7.getEnum2()); } - public static enum HEnum { + public enum HEnum { ONE, TWO, THREE } @@ -1356,7 +1356,7 @@ public class BeanMapTest { assertEquals("ONE", m2.get("1")); } - public static enum TEnum { + public enum TEnum { ONE, TWO, THREE; } diff --git a/juneau-utest/src/test/java/org/apache/juneau/ClassMetaTest.java b/juneau-utest/src/test/java/org/apache/juneau/ClassMetaTest.java index d382d1685..1e39491c8 100755 --- a/juneau-utest/src/test/java/org/apache/juneau/ClassMetaTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/ClassMetaTest.java @@ -283,10 +283,10 @@ public class ClassMetaTest { // Annotations //----------------------------------------------------------------------------------------------------------------- - @A(1) static interface CI1 {} - @A(2) static interface CI2 extends CI1 {} - @A(3) static interface CI3 {} - @A(4) static interface CI4 {} + @A(1) interface CI1 {} + @A(2) interface CI2 extends CI1 {} + @A(3) interface CI3 {} + @A(4) interface CI4 {} @A(5) static class C1 implements CI1, CI2 {} @A(6) static class C2 extends C1 implements CI3 {} @A(7) static class C3 extends C2 {} diff --git a/juneau-utest/src/test/java/org/apache/juneau/ProxyBeanTest.java b/juneau-utest/src/test/java/org/apache/juneau/ProxyBeanTest.java index 944a2ade2..e2c28dc1e 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/ProxyBeanTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/ProxyBeanTest.java @@ -31,7 +31,7 @@ public class ProxyBeanTest { // testBasic //==================================================================================================== - public static interface A { + public interface A { void setFoo(int foo); int getFoo(); } diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java index 7ad777a17..1aa1b87f7 100755 --- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java @@ -128,9 +128,9 @@ public class RoundTripAddClassAttrsTest extends RoundTripTest { assertEquals("foo", t.getF1()); } - public static interface IA { - public String getF1(); - public void setF1(String f1); + public interface IA { + String getF1(); + void setF1(String f1); } public static abstract class AA implements IA { diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java index 8db38c31e..e5d239fe8 100755 --- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java @@ -146,9 +146,9 @@ public class RoundTripBeanMapsTest extends RoundTripTest { assertEquals(1, b.getF6()); } - public static interface IBean { - public String getF1(); - public void setF1(String f1); + public interface IBean { + String getF1(); + void setF1(String f1); } public static abstract class ABean implements IBean { @@ -802,7 +802,7 @@ public class RoundTripBeanMapsTest extends RoundTripTest { K t = K.create(); t = roundTrip(t, K.class); } - public static enum KEnum { FOO, BAR, BAZ } + public enum KEnum { FOO, BAR, BAZ } public static class K { private KEnum a, b, c; diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripEnumTest.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripEnumTest.java index c6b86b0d2..c4d6b555c 100755 --- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripEnumTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripEnumTest.java @@ -142,7 +142,7 @@ public class RoundTripEnumTest extends RoundTripTest { private String val; - private BEnum(String val) { + BEnum(String val) { this.val = val; } diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripObjectsAsStringsTest.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripObjectsAsStringsTest.java index f6c78bfbe..f535bbfaf 100755 --- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripObjectsAsStringsTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripObjectsAsStringsTest.java @@ -141,7 +141,7 @@ public class RoundTripObjectsAsStringsTest extends RoundTripTest { } - public static enum B1 { + public enum B1 { X1(1), X2(2), X3(3); @@ -152,7 +152,7 @@ public class RoundTripObjectsAsStringsTest extends RoundTripTest { } } - public static enum B2 { + public enum B2 { X1(1), X2(2), X3(3); diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java index e7bf6513e..92956fe40 100755 --- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java @@ -295,7 +295,7 @@ public class RoundTripTransformBeansTest extends RoundTripTest { @Bean(dictionary={C3.class}) - public static interface C1<T> extends Serializable { + public interface C1<T> extends Serializable { void setF1(T f1); T getF1(); } diff --git a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigInterfaceTest.java b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigInterfaceTest.java index 926f45a48..315e897f5 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigInterfaceTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigInterfaceTest.java @@ -426,159 +426,159 @@ public class ConfigInterfaceTest { assertObject(proxy.getEnum1d3dListMap().values().iterator().next().get(0)[0][0][0]).isType(TestEnum.class); } - public static interface ConfigInterface { + public interface ConfigInterface { // Various primitives - public String getString(); - public void setString(String x); + String getString(); + void setString(String x); - public int getInt(); - public void setInt(int x); + int getInt(); + void setInt(int x); - public Integer getInteger(); - public void setInteger(Integer x); + Integer getInteger(); + void setInteger(Integer x); - public boolean isBoolean(); - public void setBoolean(boolean x); + boolean isBoolean(); + void setBoolean(boolean x); - public Boolean getBooleanObject(); - public void setBooleanObject(Boolean x); + Boolean getBooleanObject(); + void setBooleanObject(Boolean x); - public float getFloat(); - public void setFloat(float x); + float getFloat(); + void setFloat(float x); - public Float getFloatObject(); - public void setFloatObject(Float x); + Float getFloatObject(); + void setFloatObject(Float x); - public int[][][] getInt3dArray(); - public void setInt3dArray(int[][][] x); + int[][][] getInt3dArray(); + void setInt3dArray(int[][][] x); - public Integer[][][] getInteger3dArray(); - public void setInteger3dArray(Integer[][][] x); + Integer[][][] getInteger3dArray(); + void setInteger3dArray(Integer[][][] x); - public String[][][] getString3dArray(); - public void setString3dArray(String[][][] x); + String[][][] getString3dArray(); + void setString3dArray(String[][][] x); - public List<Integer> getIntegerList(); - public void setIntegerList(List<Integer> x); + List<Integer> getIntegerList(); + void setIntegerList(List<Integer> x); - public List<List<List<Integer>>> getInteger3dList(); - public void setInteger3dList(List<List<List<Integer>>> x); + List<List<List<Integer>>> getInteger3dList(); + void setInteger3dList(List<List<List<Integer>>> x); - public List<Integer[][][]> getInteger1d3dList(); - public void setInteger1d3dList(List<Integer[][][]> x); + List<Integer[][][]> getInteger1d3dList(); + void setInteger1d3dList(List<Integer[][][]> x); - public List<int[][][]> getInt1d3dList(); - public void setInt1d3dList(List<int[][][]> x); + List<int[][][]> getInt1d3dList(); + void setInt1d3dList(List<int[][][]> x); - public List<String> getStringList(); - public void setStringList(List<String> x); + List<String> getStringList(); + void setStringList(List<String> x); // Beans - public ABean getBean(); - public void setBean(ABean x); + ABean getBean(); + void setBean(ABean x); - public ABean[][][] getBean3dArray(); - public void setBean3dArray(ABean[][][] x); + ABean[][][] getBean3dArray(); + void setBean3dArray(ABean[][][] x); - public List<ABean> getBeanList(); - public void setBeanList(List<ABean> x); + List<ABean> getBeanList(); + void setBeanList(List<ABean> x); - public List<ABean[][][]> getBean1d3dList(); - public void setBean1d3dList(List<ABean[][][]> x); + List<ABean[][][]> getBean1d3dList(); + void setBean1d3dList(List<ABean[][][]> x); - public Map<String,ABean> getBeanMap(); - public void setBeanMap(Map<String,ABean> x); + Map<String,ABean> getBeanMap(); + void setBeanMap(Map<String,ABean> x); - public Map<String,List<ABean>> getBeanListMap(); - public void setBeanListMap(Map<String,List<ABean>> x); + Map<String,List<ABean>> getBeanListMap(); + void setBeanListMap(Map<String,List<ABean>> x); - public Map<String,List<ABean[][][]>> getBean1d3dListMap(); - public void setBean1d3dListMap(Map<String,List<ABean[][][]>> x); + Map<String,List<ABean[][][]>> getBean1d3dListMap(); + void setBean1d3dListMap(Map<String,List<ABean[][][]>> x); - public Map<Integer,List<ABean>> getBeanListMapIntegerKeys(); - public void setBeanListMapIntegerKeys(Map<Integer,List<ABean>> x); + Map<Integer,List<ABean>> getBeanListMapIntegerKeys(); + void setBeanListMapIntegerKeys(Map<Integer,List<ABean>> x); // Typed beans - public TypedBean getTypedBean(); - public void setTypedBean(TypedBean x); + TypedBean getTypedBean(); + void setTypedBean(TypedBean x); - public TypedBean[][][] getTypedBean3dArray(); - public void setTypedBean3dArray(TypedBean[][][] x); + TypedBean[][][] getTypedBean3dArray(); + void setTypedBean3dArray(TypedBean[][][] x); - public List<TypedBean> getTypedBeanList(); - public void setTypedBeanList(List<TypedBean> x); + List<TypedBean> getTypedBeanList(); + void setTypedBeanList(List<TypedBean> x); - public List<TypedBean[][][]> getTypedBean1d3dList(); - public void setTypedBean1d3dList(List<TypedBean[][][]> x); + List<TypedBean[][][]> getTypedBean1d3dList(); + void setTypedBean1d3dList(List<TypedBean[][][]> x); - public Map<String,TypedBean> getTypedBeanMap(); - public void setTypedBeanMap(Map<String,TypedBean> x); + Map<String,TypedBean> getTypedBeanMap(); + void setTypedBeanMap(Map<String,TypedBean> x); - public Map<String,List<TypedBean>> getTypedBeanListMap(); - public void setTypedBeanListMap(Map<String,List<TypedBean>> x); + Map<String,List<TypedBean>> getTypedBeanListMap(); + void setTypedBeanListMap(Map<String,List<TypedBean>> x); - public Map<String,List<TypedBean[][][]>> getTypedBean1d3dListMap(); - public void setTypedBean1d3dListMap(Map<String,List<TypedBean[][][]>> x); + Map<String,List<TypedBean[][][]>> getTypedBean1d3dListMap(); + void setTypedBean1d3dListMap(Map<String,List<TypedBean[][][]>> x); - public Map<Integer,List<TypedBean>> getTypedBeanListMapIntegerKeys(); - public void setTypedBeanListMapIntegerKeys(Map<Integer,List<TypedBean>> x); + Map<Integer,List<TypedBean>> getTypedBeanListMapIntegerKeys(); + void setTypedBeanListMapIntegerKeys(Map<Integer,List<TypedBean>> x); // Swapped POJOs - public SwappedObject getSwappedObject(); - public void setSwappedObject(SwappedObject x); + SwappedObject getSwappedObject(); + void setSwappedObject(SwappedObject x); - public SwappedObject[][][] getSwappedObject3dArray(); - public void setSwappedObject3dArray(SwappedObject[][][] x); + SwappedObject[][][] getSwappedObject3dArray(); + void setSwappedObject3dArray(SwappedObject[][][] x); - public Map<SwappedObject,SwappedObject> getSwappedObjectMap(); - public void setSwappedObjectMap(Map<SwappedObject,SwappedObject> x); + Map<SwappedObject,SwappedObject> getSwappedObjectMap(); + void setSwappedObjectMap(Map<SwappedObject,SwappedObject> x); - public Map<SwappedObject,SwappedObject[][][]> getSwappedObject3dMap(); - public void setSwappedObject3dMap(Map<SwappedObject,SwappedObject[][][]> x); + Map<SwappedObject,SwappedObject[][][]> getSwappedObject3dMap(); + void setSwappedObject3dMap(Map<SwappedObject,SwappedObject[][][]> x); // Implicit swapped POJOs - public ImplicitSwappedObject getImplicitSwappedObject(); - public void setImplicitSwappedObject(ImplicitSwappedObject x); + ImplicitSwappedObject getImplicitSwappedObject(); + void setImplicitSwappedObject(ImplicitSwappedObject x); - public ImplicitSwappedObject[][][] getImplicitSwappedObject3dArray(); - public void setImplicitSwappedObject3dArray(ImplicitSwappedObject[][][] x); + ImplicitSwappedObject[][][] getImplicitSwappedObject3dArray(); + void setImplicitSwappedObject3dArray(ImplicitSwappedObject[][][] x); - public Map<ImplicitSwappedObject,ImplicitSwappedObject> getImplicitSwappedObjectMap(); - public void setImplicitSwappedObjectMap(Map<ImplicitSwappedObject,ImplicitSwappedObject> x); + Map<ImplicitSwappedObject,ImplicitSwappedObject> getImplicitSwappedObjectMap(); + void setImplicitSwappedObjectMap(Map<ImplicitSwappedObject,ImplicitSwappedObject> x); - public Map<ImplicitSwappedObject,ImplicitSwappedObject[][][]> getImplicitSwappedObject3dMap(); - public void setImplicitSwappedObject3dMap(Map<ImplicitSwappedObject,ImplicitSwappedObject[][][]> x); + Map<ImplicitSwappedObject,ImplicitSwappedObject[][][]> getImplicitSwappedObject3dMap(); + void setImplicitSwappedObject3dMap(Map<ImplicitSwappedObject,ImplicitSwappedObject[][][]> x); // Enums - public TestEnum getEnum(); - public void setEnum(TestEnum x); + TestEnum getEnum(); + void setEnum(TestEnum x); - public TestEnum[][][] getEnum3d(); - public void setEnum3d(TestEnum[][][] x); + TestEnum[][][] getEnum3d(); + void setEnum3d(TestEnum[][][] x); - public List<TestEnum> getEnumList(); - public void setEnumList(List<TestEnum> x); + List<TestEnum> getEnumList(); + void setEnumList(List<TestEnum> x); - public List<List<List<TestEnum>>> getEnum3dList(); - public void setEnum3dList(List<List<List<TestEnum>>> x); + List<List<List<TestEnum>>> getEnum3dList(); + void setEnum3dList(List<List<List<TestEnum>>> x); - public List<TestEnum[][][]> getEnum1d3dList(); - public void setEnum1d3dList(List<TestEnum[][][]> x); + List<TestEnum[][][]> getEnum1d3dList(); + void setEnum1d3dList(List<TestEnum[][][]> x); - public Map<TestEnum,TestEnum> getEnumMap(); - public void setEnumMap(Map<TestEnum,TestEnum> x); + Map<TestEnum,TestEnum> getEnumMap(); + void setEnumMap(Map<TestEnum,TestEnum> x); - public Map<TestEnum,TestEnum[][][]> getEnum3dArrayMap(); - public void setEnum3dArrayMap(Map<TestEnum,TestEnum[][][]> x); + Map<TestEnum,TestEnum[][][]> getEnum3dArrayMap(); + void setEnum3dArrayMap(Map<TestEnum,TestEnum[][][]> x); - public Map<TestEnum,List<TestEnum[][][]>> getEnum1d3dListMap(); - public void setEnum1d3dListMap(Map<TestEnum,List<TestEnum[][][]>> x); + Map<TestEnum,List<TestEnum[][][]>> getEnum1d3dListMap(); + void setEnum1d3dListMap(Map<TestEnum,List<TestEnum[][][]>> x); } } \ No newline at end of file diff --git a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java index e7130c3d2..6dea8c468 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java @@ -921,7 +921,7 @@ public class ConfigTest { assertThrown(()->c.getSection("T").asInterface(ABean.class).get()).asMessage().is("Class 'org.apache.juneau.config.ConfigTest$ABean' passed to toInterface() is not an interface."); } - public static interface AInterface { + public interface AInterface { String getFoo(); } diff --git a/juneau-utest/src/test/java/org/apache/juneau/html/BasicHtml_Test.java b/juneau-utest/src/test/java/org/apache/juneau/html/BasicHtml_Test.java index c6ddc1257..ecff429dd 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/html/BasicHtml_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/html/BasicHtml_Test.java @@ -3486,9 +3486,9 @@ public class BasicHtml_Test { } } - public static interface IA { - public String getA(); - public void setA(String a); + public interface IA { + String getA(); + void setA(String a); } public static abstract class AA implements IA {} diff --git a/juneau-utest/src/test/java/org/apache/juneau/html/HtmlSchemaSerializerTest.java b/juneau-utest/src/test/java/org/apache/juneau/html/HtmlSchemaSerializerTest.java index ca77de8cc..063685617 100755 --- a/juneau-utest/src/test/java/org/apache/juneau/html/HtmlSchemaSerializerTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/html/HtmlSchemaSerializerTest.java @@ -70,7 +70,7 @@ public class HtmlSchemaSerializerTest { public boolean isCurrent; } - public static enum StateEnum { + public enum StateEnum { AL,PA,NC } diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java index 2f1833eaa..ee3822434 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java @@ -42,10 +42,10 @@ public class Remote_CommonInterfaces_Test { //----------------------------------------------------------------------------------------------------------------- @Remote - public static interface A { - public String putX1(@Content String b); - public String getX2(@Query("foo") String b); - public String getX3(@Header("foo") String b); + public interface A { + String putX1(@Content String b); + String getX2(@Query("foo") String b); + String getX3(@Header("foo") String b); } @Rest @@ -81,7 +81,7 @@ public class Remote_CommonInterfaces_Test { @Remote @Rest - public static interface B extends BasicJson5Config { + public interface B extends BasicJson5Config { String putX1(@Content String b); String getX2(@Query("foo") String b); String getX3(@Header("foo") String b); @@ -116,7 +116,7 @@ public class Remote_CommonInterfaces_Test { @Remote @Rest - public static interface C extends BasicJson5Config { + public interface C extends BasicJson5Config { Ok ok(); Accepted accepted(); AlreadyReported alreadyReported(); @@ -198,7 +198,7 @@ public class Remote_CommonInterfaces_Test { @Remote @Rest - public static interface D extends BasicJson5Config { + public interface D extends BasicJson5Config { BasicResource httpResource() throws IOException ; } @@ -225,7 +225,7 @@ public class Remote_CommonInterfaces_Test { @Remote @Rest - public static interface E extends BasicJson5Config { + public interface E extends BasicJson5Config { void badRequest() throws BadRequest; void conflict() throws Conflict; void expectationFailed() throws ExpectationFailed; @@ -613,7 +613,7 @@ public class Remote_CommonInterfaces_Test { @Remote @Rest - public static interface F extends BasicJson5Config { + public interface F extends BasicJson5Config { BadRequest badRequest(); Conflict conflict(); ExpectationFailed expectationFailed(); @@ -828,7 +828,7 @@ public class Remote_CommonInterfaces_Test { @Remote @Rest - public static interface G extends BasicJson5Config { + public interface G extends BasicJson5Config { Reader reader(); InputStream inputStream(); } @@ -857,7 +857,7 @@ public class Remote_CommonInterfaces_Test { @Remote @Rest - public static interface IH extends BasicJson5Config { + public interface IH extends BasicJson5Config { SeeOtherRoot seeOtherRoot(); } diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ContentAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ContentAnnotation_Test.java index 90334b14b..22341386d 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ContentAnnotation_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ContentAnnotation_Test.java @@ -127,7 +127,7 @@ public class Remote_ContentAnnotation_Test { } @Remote - public static interface A1 { + public interface A1 { String postX1(@Content int b); String postX2(@Content float b); String postX3(@Content Bean b); @@ -222,7 +222,7 @@ public class Remote_ContentAnnotation_Test { } } @Remote - public static interface B1 { + public interface B1 { String postX1(@Content int b); String postX2(@Content float b); String postX3(@Content Bean b); @@ -303,7 +303,7 @@ public class Remote_ContentAnnotation_Test { } } @Remote - public static interface C1 { + public interface C1 { String postX1(@Content int b); String postX2(@Content float b); String postX3(@Content Bean b); diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java index 3fedad0a6..c0914416d 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java @@ -78,7 +78,7 @@ public class Remote_FormDataAnnotation_Test { } @Remote - public static interface A1 { + public interface A1 { @RemotePost(path="a") String x1(@FormData("x") int b); @RemotePost(path="a") String x2(@FormData("x") float b); @RemotePost(path="a") String x3(@FormData("x") Bean b); @@ -152,7 +152,7 @@ public class Remote_FormDataAnnotation_Test { } @Remote - public static interface B1 { + public interface B1 { @RemoteOp(path="/") String postX1(@FormData("x") @Schema(df="foo") String b); @RemoteOp(path="/") String postX2(@FormData("x") @Schema(df="foo",aev=true) String b); @RemoteOp(path="/") String postX3(@FormData("x") @Schema(df="") String b); @@ -189,7 +189,7 @@ public class Remote_FormDataAnnotation_Test { } @Remote - public static interface C1 { + public interface C1 { @RemoteOp(path="/a") String postX1(@FormData("x") String...b); @RemoteOp(path="/b") String postX2(@FormData("x") String...b); @RemoteOp(path="/a") String postX3(@FormData("x") @Schema(cf="csv") String...b); @@ -238,7 +238,7 @@ public class Remote_FormDataAnnotation_Test { } @Remote - public static interface D1 { + public interface D1 { @RemoteOp(path="/") String postX1(@FormData("x") @Schema(min="1",max="10") int b); @RemoteOp(path="/") String postX2(@FormData("x") @Schema(min="1",max="10",emin=false,emax=false) int b); @RemoteOp(path="/") String postX3(@FormData("x") @Schema(min="1",max="10",emin=true,emax=true) int b); @@ -488,7 +488,7 @@ public class Remote_FormDataAnnotation_Test { } @Remote - public static interface E1 { + public interface E1 { @RemoteOp(path="/") String postX1(@FormData("x") @Schema(cf="pipes", mini=1,maxi=2) String...b); @RemoteOp(path="/") String postX2(@FormData("x") @Schema(items=@Items(cf="pipes", mini=1,maxi=2)) String[]...b); @RemoteOp(path="/") String postX3(@FormData("x") @Schema(cf="pipes",ui=false) String...b); @@ -531,7 +531,7 @@ public class Remote_FormDataAnnotation_Test { } @Remote - public static interface F1 { + public interface F1 { @RemoteOp(path="/") String postX1(@FormData("x") @Schema(minl=2,maxl=3) String b); @RemoteOp(path="/") String postX2(@FormData("x") @Schema(cf="pipes",items=@Items(minl=2,maxl=3)) String...b); @RemoteOp(path="/") String postX3(@FormData("x") @Schema(e={"foo"}) String b); @@ -580,7 +580,7 @@ public class Remote_FormDataAnnotation_Test { } @Remote - public static interface G1 { + public interface G1 { @RemoteOp(path="/") String postX1(@FormData("x") @Schema(mo="2") int b); @RemoteOp(path="/") String postX2(@FormData("x") @Schema(mo="2") short b); @RemoteOp(path="/") String postX3(@FormData("x") @Schema(mo="2") long b); @@ -643,7 +643,7 @@ public class Remote_FormDataAnnotation_Test { } @Remote - public static interface H1 { + public interface H1 { @RemoteOp(path="/") String postX1(@FormData("x") String b); @RemoteOp(path="/") String postX2(@FormData("x") @Schema(r=false) String b); @RemoteOp(path="/") String postX3(@FormData("x") @Schema(r=true) String b); @@ -671,7 +671,7 @@ public class Remote_FormDataAnnotation_Test { } @Remote - public static interface I1 { + public interface I1 { @RemoteOp(path="/") String postX1(@FormData("x") @Schema(aev=true) String b); @RemoteOp(path="/") String postX2(@FormData("x") @Schema(aev=true,sie=false) String b); @RemoteOp(path="/") String postX3(@FormData("x") @Schema(sie=true) String b); @@ -698,7 +698,7 @@ public class Remote_FormDataAnnotation_Test { } @Remote - public static interface J1 { + public interface J1 { @RemoteOp(path="/") String postX1(@FormData(name="x",serializer=MockWriterSerializer.X.class) String b); } @@ -725,7 +725,7 @@ public class Remote_FormDataAnnotation_Test { //----------------------------------------------------------------------------------------------------------------- @Remote(path="/") - public static interface K1 { + public interface K1 { @RemoteOp(path="/") String postX1(@Request K1a rb); @RemoteOp(path="/") String postX2(@Request(serializer=MockWriterSerializer.X.class) K1a rb); } @@ -787,7 +787,7 @@ public class Remote_FormDataAnnotation_Test { //----------------------------------------------------------------------------------------------------------------- @Remote(path="/") - public static interface K2 { + public interface K2 { @RemoteOp(path="/") String postX1(@Request K2a rb); @RemoteOp(path="/") String postX2(@Request(serializer=MockWriterSerializer.X.class) K2a rb); } @@ -825,7 +825,7 @@ public class Remote_FormDataAnnotation_Test { //----------------------------------------------------------------------------------------------------------------- @Remote(path="/") - public static interface K3 { + public interface K3 { @RemoteOp(path="/") String postX1(@Request K3a rb); @RemoteOp(path="/") String postX2(@Request(serializer=MockWriterSerializer.X.class) K3a rb); } @@ -867,7 +867,7 @@ public class Remote_FormDataAnnotation_Test { //----------------------------------------------------------------------------------------------------------------- @Remote(path="/") - public static interface K4 { + public interface K4 { String post(@Request C04_Bean rb); } @@ -889,7 +889,7 @@ public class Remote_FormDataAnnotation_Test { //----------------------------------------------------------------------------------------------------------------- @Remote(path="/") - public static interface K5 { + public interface K5 { String post(@Request K5a rb); } @@ -911,7 +911,7 @@ public class Remote_FormDataAnnotation_Test { //----------------------------------------------------------------------------------------------------------------- @Remote(path="/") - public static interface K6 { + public interface K6 { @RemoteOp(path="/") String postX1(@Request K6a rb); @RemoteOp(path="/") String postX2(@Request(serializer=MockWriterSerializer.X.class) K6a rb); } diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java index a0f371dfd..60bc0e071 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java @@ -63,7 +63,7 @@ public class Remote_HeaderAnnotation_Test { } @Remote - public static interface A1 { + public interface A1 { @RemoteOp(path="a") String getX1(@Header("x") int b); @RemoteOp(path="a") String getX2(@Header("x") float b); @RemoteOp(path="a") String getX3(@Header("x") Bean b); @@ -126,7 +126,7 @@ public class Remote_HeaderAnnotation_Test { } @Remote - public static interface B1 { + public interface B1 { @RemoteOp(path="/") String getX1(@Header("x") @Schema(df="foo") String b); @RemoteOp(path="/") String getX2(@Header("x") @Schema(df="foo",aev=true) String b); @RemoteOp(path="/") String getX3(@Header("x") @Schema(df="") String b); @@ -160,7 +160,7 @@ public class Remote_HeaderAnnotation_Test { } @Remote - public static interface C1 { + public interface C1 { @RemoteOp(path="/a") String getX1(@Header("x") String...b); @RemoteOp(path="/a") String getX2(@Header("x") @Schema(cf="csv") String...b); @RemoteOp(path="/a") String getX3(@Header("x") @Schema(cf="ssv") String...b); @@ -196,7 +196,7 @@ public class Remote_HeaderAnnotation_Test { } @Remote - public static interface D1 { + public interface D1 { @RemoteOp(path="/") String getX1(@Header("x") @Schema(min="1",max="10") int b); @RemoteOp(path="/") String getX2(@Header("x") @Schema(min="1",max="10",emin=false,emax=false) int b); @RemoteOp(path="/") String getX3(@Header("x") @Schema(min="1",max="10",emin=true,emax=true) int b); @@ -446,7 +446,7 @@ public class Remote_HeaderAnnotation_Test { } @Remote - public static interface E1 { + public interface E1 { @RemoteOp(path="/") String getX1(@Header("x") @Schema(cf="pipes",mini=1,maxi=2) String...b); @RemoteOp(path="/") String getX2(@Header("x") @Schema(items=@Items(cf="pipes",mini=1,maxi=2)) String[]...b); @RemoteOp(path="/") String getX3(@Header("x") @Schema(cf="pipes",ui=false) String...b); @@ -490,7 +490,7 @@ public class Remote_HeaderAnnotation_Test { } @Remote - public static interface F1 { + public interface F1 { @RemoteOp(path="/") String getX1(@Header("x") @Schema(minl=2,maxl=3) String b); @RemoteOp(path="/") String getX2(@Header("x") @Schema(cf="pipes",items=@Items(minl=2,maxl=3)) String...b); @RemoteOp(path="/") String getX3(@Header("x") @Schema(e={"foo"}) String b); @@ -540,7 +540,7 @@ public class Remote_HeaderAnnotation_Test { } @Remote - public static interface G1 { + public interface G1 { @RemoteOp(path="/") String getX1(@Header("x") @Schema(mo="2") int b); @RemoteOp(path="/") String getX2(@Header("x") @Schema(mo="2") short b); @RemoteOp(path="/") String getX3(@Header("x") @Schema(mo="2") long b); @@ -604,7 +604,7 @@ public class Remote_HeaderAnnotation_Test { } @Remote - public static interface H1 { + public interface H1 { @RemoteOp(path="/") String getX1(@Header("x") String b); @RemoteOp(path="/") String getX2(@Header("x") @Schema(r=false) String b); @RemoteOp(path="/") String getX3(@Header("x") @Schema(r=true) String b); @@ -633,7 +633,7 @@ public class Remote_HeaderAnnotation_Test { } @Remote - public static interface I1 { + public interface I1 { @RemoteOp(path="/") String getX1(@Header("x") @Schema(aev=true) String b); @RemoteOp(path="/") String getX2(@Header("x") @Schema(aev=true,sie=false) String b); @RemoteOp(path="/") String getX3(@Header("x") @Schema(sie=true) String b); @@ -661,7 +661,7 @@ public class Remote_HeaderAnnotation_Test { } @Remote - public static interface J1 { + public interface J1 { @RemoteOp(path="/") String getX1(@Header(name="x",serializer=MockWriterSerializer.X.class) String b); } @@ -688,7 +688,7 @@ public class Remote_HeaderAnnotation_Test { //----------------------------------------------------------------------------------------------------------------- @Remote(path="/") - public static interface K1 { + public interface K1 { @RemoteOp(path="/") String getX1(@Request K1a rb); @RemoteOp(path="/") String getX2(@Request(serializer=MockWriterSerializer.X.class) K1a rb); } @@ -750,7 +750,7 @@ public class Remote_HeaderAnnotation_Test { //----------------------------------------------------------------------------------------------------------------- @Remote(path="/") - public static interface K2 { + public interface K2 { @RemoteOp(path="/") String getX1(@Request K2a rb); @RemoteOp(path="/") String getX2(@Request(serializer=MockWriterSerializer.X.class) K2a rb); } @@ -788,7 +788,7 @@ public class Remote_HeaderAnnotation_Test { //----------------------------------------------------------------------------------------------------------------- @Remote(path="/") - public static interface K3 { + public interface K3 { @RemoteOp(path="/") String getX1(@Request K3a rb); @RemoteOp(path="/") String getX2(@Request(serializer=MockWriterSerializer.X.class) K3a rb); } @@ -834,7 +834,7 @@ public class Remote_HeaderAnnotation_Test { //----------------------------------------------------------------------------------------------------------------- @Remote(path="/") - public static interface K4 { + public interface K4 { @RemoteOp(path="/") String getX1(@Request K4a rb); @RemoteOp(path="/") String getX2(@Request(serializer=MockWriterSerializer.X.class) K4a rb); } diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java index 2958d1d1f..0252df464 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java @@ -63,7 +63,7 @@ public class Remote_PathAnnotation_Test { } @Remote - public static interface A1 { + public interface A1 { @RemoteOp(path="a/{x}") String getX1(@Path("x") int b); @RemoteOp(path="a/{x}") String getX2(@Path("x") float b); @RemoteOp(path="a/{x}") String getX3(@Path("x") Bean b); @@ -129,7 +129,7 @@ public class Remote_PathAnnotation_Test { } @Remote - public static interface B1 { + public interface B1 { @RemoteOp(path="/a/{x}") String getX1(@Path("x") String...b); @RemoteOp(path="/a/{x}") String getX2(@Path("x") @Schema(cf="csv") String...b); @RemoteOp(path="/a/{x}") String getX3(@Path("x") @Schema(cf="ssv") String...b); @@ -165,7 +165,7 @@ public class Remote_PathAnnotation_Test { } @Remote - public static interface C1 { + public interface C1 { @RemoteOp(path="/a/{x}") String getX1(@Path("x") @Schema(min="1",max="10") int b); @RemoteOp(path="/a/{x}") String getX2(@Path("x") @Schema(min="1",max="10",emin=false,emax=false) int b); @RemoteOp(path="/a/{x}") String getX3(@Path("x") @Schema(min="1",max="10",emin=true,emax=true) int b); @@ -397,7 +397,7 @@ public class Remote_PathAnnotation_Test { } @Remote - public static interface D1 { + public interface D1 { @RemoteOp(path="/{x}") String getX1(@Path("x") @Schema(cf="pipes",mini=1,maxi=2) String...b); @RemoteOp(path="/{x}") String getX2(@Path("x") @Schema(items=@Items(cf="pipes",mini=1,maxi=2)) String[]...b); @RemoteOp(path="/{x}") String getX3(@Path("x") @Schema(cf="pipes",ui=false) String...b); @@ -441,7 +441,7 @@ public class Remote_PathAnnotation_Test { } @Remote - public static interface E1 { + public interface E1 { @RemoteOp(path="/{x}") String getX1(@Path("x") @Schema(minl=2,maxl=3) String b); @RemoteOp(path="/{x}") String getX2(@Path("x") @Schema(cf="pipes",items=@Items(minl=2,maxl=3)) String...b); @RemoteOp(path="/{x}") String getX3(@Path("x") @Schema(e={"foo"}) String b); @@ -488,7 +488,7 @@ public class Remote_PathAnnotation_Test { } @Remote - public static interface F1 { + public interface F1 { @RemoteOp(path="/{x}") String getX1(@Path("x") @Schema(mo="2") int b); @RemoteOp(path="/{x}") String getX2(@Path("x") @Schema(mo="2") short b); @RemoteOp(path="/{x}") String getX3(@Path("x") @Schema(mo="2") long b); @@ -547,7 +547,7 @@ public class Remote_PathAnnotation_Test { } @Remote - public static interface G1 { + public interface G1 { @RemoteOp(path="/{x}") String getX1(@Path("x") String b); } @@ -571,7 +571,7 @@ public class Remote_PathAnnotation_Test { } @Remote - public static interface H1 { + public interface H1 { @RemoteOp(path="/{x}") String getX1(@Path(name="x",serializer=MockWriterSerializer.X.class) String b); } @@ -598,7 +598,7 @@ public class Remote_PathAnnotation_Test { //----------------------------------------------------------------------------------------------------------------- @Remote(path="/") - public static interface K1 { + public interface K1 { @RemoteOp(path="/{a}/{b}/{c}/{e}/{g}/{h}") String getX1(@Request K1a rb); @RemoteOp(path="/{a}/{b}/{c}/{e}/{g}/{h}") String getX2(@Request(serializer=MockWriterSerializer.X.class) K1a rb); } @@ -644,7 +644,7 @@ public class Remote_PathAnnotation_Test { //----------------------------------------------------------------------------------------------------------------- @Remote(path="/") - public static interface K2 { + public interface K2 { @RemoteOp(path="/{a1}/{a2}/{a3}/{a4}/{b1}/{b2}/{b3}/{c1}/{c2}/{c3}/{c4}") String getX1(@Request K2a rb); @RemoteOp(path="/{a1}/{a2}/{a3}/{a4}/{b1}/{b2}/{b3}/{c1}/{c2}/{c3}/{c4}") String getX2(@Request(serializer=MockWriterSerializer.X.class) K2a rb); } @@ -682,7 +682,7 @@ public class Remote_PathAnnotation_Test { //----------------------------------------------------------------------------------------------------------------- @Remote(path="/") - public static interface K3 { + public interface K3 { @RemoteOp(path="/{a1}/{a2}/{a3}/{a4}/{b1}/{b2}/{b3}/{c1}/{c2}/{c3}/{c4}/{e1}/{e2}/{e3}/{e4}") String getX1(@Request K3a rb); @RemoteOp(path="/{a1}/{a2}/{a3}/{a4}/{b1}/{b2}/{b3}/{c1}/{c2}/{c3}/{c4}/{e1}/{e2}/{e3}/{e4}") String getX2(@Request(serializer=MockWriterSerializer.X.class) K3a rb); } @@ -724,7 +724,7 @@ public class Remote_PathAnnotation_Test { //----------------------------------------------------------------------------------------------------------------- @Remote(path="/") - public static interface K4 { + public interface K4 { @RemoteOp(path="/{a}/{b}/{c}/{d}/{f}/{g}/{h}") String getX1(@Request K4a rb); @RemoteOp(path="/{a}/{b}/{c}/{d}/{f}/{g}/{h}") String getX2(@Request(serializer=MockWriterSerializer.X.class) K4a rb); } diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java index 33214c50a..5c62bf2d4 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java @@ -65,7 +65,7 @@ public class Remote_QueryAnnotation_Test { } @Remote - public static interface A1 { + public interface A1 { @RemoteOp(path="a") String getX1(@Query("x") int b); @RemoteOp(path="a") String getX2(@Query("x") float b); @RemoteOp(path="a") String getX3(@Query("x") Bean b); @@ -135,7 +135,7 @@ public class Remote_QueryAnnotation_Test { } @Remote - public static interface B1 { + public interface B1 { @RemoteOp(path="/") String getX1(@Query("x") @Schema(df="foo") String b); @RemoteOp(path="/") String getX2(@Query("x") @Schema(df="foo",aev=true) String b); @RemoteOp(path="/") String getX3(@Query("x") @Schema(df="") String b); @@ -172,7 +172,7 @@ public class Remote_QueryAnnotation_Test { } @Remote - public static interface C1 { + public interface C1 { @RemoteOp(path="/a") String getX1(@Query("x") String...b); @RemoteOp(path="/b") String getX2(@Query("x") String...b); @RemoteOp(path="/a") String getX3(@Query("x") @Schema(cf="csv") String...b); @@ -221,7 +221,7 @@ public class Remote_QueryAnnotation_Test { } @Remote - public static interface D1 { + public interface D1 { @RemoteOp(path="/") String getX1(@Query("x") @Schema(min="1",max="10") int b); @RemoteOp(path="/") String getX2(@Query("x") @Schema(min="1",max="10",emin=false,emax=false) int b); @RemoteOp(path="/") String getX3(@Query("x") @Schema(min="1",max="10",emin=true,emax=true) int b); @@ -470,7 +470,7 @@ public class Remote_QueryAnnotation_Test { } @Remote - public static interface E1 { + public interface E1 { @RemoteOp(path="/") String getX1(@Query("x") @Schema(cf="pipes",mini=1,maxi=2) String...b); @RemoteOp(path="/") String getX2(@Query("x") @Schema(items=@Items(cf="pipes",mini=1,maxi=2)) String[]...b); @RemoteOp(path="/") String getX3(@Query("x") @Schema(cf="pipes",ui=false) String...b); @@ -513,7 +513,7 @@ public class Remote_QueryAnnotation_Test { } @Remote - public static interface F1 { + public interface F1 { @RemoteOp(path="/") String getX1(@Query("x") @Schema(minl=2,maxl=3) String b); @RemoteOp(path="/") String getX2(@Query("x") @Schema(cf="pipes",items=@Items(minl=2,maxl=3)) String...b); @RemoteOp(path="/") String getX3(@Query("x") @Schema(e={"foo"}) String b); @@ -562,7 +562,7 @@ public class Remote_QueryAnnotation_Test { } @Remote - public static interface G1 { + public interface G1 { @RemoteOp(path="/") String getX1(@Query("x") @Schema(mo="2") int b); @RemoteOp(path="/") String getX2(@Query("x") @Schema(mo="2") short b); @RemoteOp(path="/") String getX3(@Query("x") @Schema(mo="2") long b); @@ -625,7 +625,7 @@ public class Remote_QueryAnnotation_Test { } @Remote - public static interface H1 { + public interface H1 { @RemoteOp(path="/") String getX1(@Query("x") String b); @RemoteOp(path="/") String getX2(@Query("x") @Schema(r=false) String b); @RemoteOp(path="/") String getX3(@Query("x") @Schema(r=true) String b); @@ -653,7 +653,7 @@ public class Remote_QueryAnnotation_Test { } @Remote - public static interface I1 { + public interface I1 { @RemoteOp(path="/") String getX1(@Query("x") @Schema(aev=true) String b); @RemoteOp(path="/") String getX2(@Query("x") @Schema(aev=true,sie=false) String b); @RemoteOp(path="/") String getX3(@Query("x") @Schema(sie=true) String b); @@ -680,7 +680,7 @@ public class Remote_QueryAnnotation_Test { } @Remote - public static interface J1 { + public interface J1 { @RemoteOp(path="/") String getX1(@Query(name="x",serializer=MockWriterSerializer.X.class) String b); } @@ -707,12 +707,12 @@ public class Remote_QueryAnnotation_Test { //----------------------------------------------------------------------------------------------------------------- @Remote(path="/") - public static interface K1 { + public interface K1 { @RemoteOp(path="/") String getX1(@Request K1b rb); @RemoteOp(path="/") String getX2(@Request(serializer=MockWriterSerializer.X.class) K1b rb); } - public static interface K1a { + public interface K1a { @Query String getA(); @Query("b") String getX1(); @Query("c") String getX2(); @@ -752,7 +752,7 @@ public class Remote_QueryAnnotation_Test { //----------------------------------------------------------------------------------------------------------------- @Remote(path="/") - public static interface K2 { + public interface K2 { @RemoteOp(path="/") String getX1(@Request K2a rb); @RemoteOp(path="/") String getX2(@Request(serializer=MockWriterSerializer.X.class) K2a rb); } @@ -790,7 +790,7 @@ public class Remote_QueryAnnotation_Test { //----------------------------------------------------------------------------------------------------------------- @Remote(path="/") - public static interface K3 { + public interface K3 { @RemoteOp(path="/") String getX1(@Request K3a rb); @RemoteOp(path="/") String getX2(@Request(serializer=MockWriterSerializer.X.class) K3a rb); } @@ -831,7 +831,7 @@ public class Remote_QueryAnnotation_Test { //----------------------------------------------------------------------------------------------------------------- @Remote(path="/") - public static interface K4 { + public interface K4 { String get(@Request K4a rb); } @@ -853,7 +853,7 @@ public class Remote_QueryAnnotation_Test { //----------------------------------------------------------------------------------------------------------------- @Remote(path="/") - public static interface K5 { + public interface K5 { String get(@Request K5a rb); } @@ -875,7 +875,7 @@ public class Remote_QueryAnnotation_Test { //----------------------------------------------------------------------------------------------------------------- @Remote(path="/") - public static interface K6 { + public interface K6 { @RemoteOp(path="/") String getX1(@Request K6a rb); @RemoteOp(path="/") String getX2(@Request(serializer=MockWriterSerializer.X.class) K6a rb); } diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RemoteOpAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RemoteOpAnnotation_Test.java index a68ca3ed4..30e6ce45c 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RemoteOpAnnotation_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RemoteOpAnnotation_Test.java @@ -55,7 +55,7 @@ public class Remote_RemoteOpAnnotation_Test { } @Remote - public static interface A1 { + public interface A1 { String doGet(); String doGET(); String doFoo(); @@ -74,7 +74,7 @@ public class Remote_RemoteOpAnnotation_Test { } @Remote - public static interface A2 { + public interface A2 { Future<String> doGet(); Future<String> doGET(); Future<String> doFoo(); @@ -93,7 +93,7 @@ public class Remote_RemoteOpAnnotation_Test { } @Remote - public static interface A3 { + public interface A3 { CompletableFuture<String> doGet(); CompletableFuture<String> doGET(); CompletableFuture<String> doFoo(); @@ -124,7 +124,7 @@ public class Remote_RemoteOpAnnotation_Test { } @Remote - public static interface B1 { + public interface B1 { void x1(); String x2(); HttpResponse x3(); @@ -175,7 +175,7 @@ public class Remote_RemoteOpAnnotation_Test { } @Remote - public static interface C1 { + public interface C1 { String postX1(@Content String foo); HttpResponse postX2(@Content String foo); Reader postX3(@Content String foo); @@ -220,7 +220,7 @@ public class Remote_RemoteOpAnnotation_Test { } @Remote - public static interface D1 { + public interface D1 { String postX1(@Content String foo); HttpResponse postX2(@Content String foo); Reader postX3(@Content String foo); diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RequestAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RequestAnnotation_Test.java index 1463f4af6..1e6eaacd4 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RequestAnnotation_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_RequestAnnotation_Test.java @@ -70,7 +70,7 @@ public class Remote_RequestAnnotation_Test { } @Remote - public static interface A2 { + public interface A2 { @RemoteOp(path="/{x}") String post(A1 req); } @@ -126,7 +126,7 @@ public class Remote_RequestAnnotation_Test { } @Remote - public static interface B3 { + public interface B3 { @RemoteOp(path="/{x}") String post(B1 req); } @@ -182,7 +182,7 @@ public class Remote_RequestAnnotation_Test { } @Remote - public static interface C3 { + public interface C3 { @RemoteOp(path="/{x}") String post(C1 req); } @@ -230,7 +230,7 @@ public class Remote_RequestAnnotation_Test { } @Remote - public static interface D2 { + public interface D2 { @RemoteOp(path="/{x}") String post(@Request D1 req); } @@ -279,7 +279,7 @@ public class Remote_RequestAnnotation_Test { } @Remote - public static interface E2 { + public interface E2 { @RemoteOp(path="/{x}") String post(E1 req); } diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ResponseAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ResponseAnnotation_Test.java index 97851a2a9..4c0902e31 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ResponseAnnotation_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_ResponseAnnotation_Test.java @@ -68,7 +68,7 @@ public class Remote_ResponseAnnotation_Test { } @Remote - public static interface A1b { + public interface A1b { @RemoteOp A1a get(); } @@ -86,7 +86,7 @@ public class Remote_ResponseAnnotation_Test { } @Remote - public static interface A2b { + public interface A2b { @RemoteOp A2a get(); } @@ -110,7 +110,7 @@ public class Remote_ResponseAnnotation_Test { } @Remote - public static interface A3b { + public interface A3b { @RemoteOp A3a get(); } diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java index 1d968c0f1..18d167123 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java @@ -57,7 +57,7 @@ public class Remote_Test { } @Remote - public static interface A1 { + public interface A1 { String x1(); @RemoteOp(path="x1") String x1a(); @RemoteOp(path="/x1/") String x1b(); @@ -72,7 +72,7 @@ public class Remote_Test { } @Remote(path="A") - public static interface A2 { + public interface A2 { String x2(); @RemoteOp(path="x2") String x2a(); @RemoteOp(path="/x2/") String x2b(); @@ -87,7 +87,7 @@ public class Remote_Test { } @Remote(path="/A/") - public static interface A3 { + public interface A3 { String x2(); @RemoteOp(path="x2") String x2a(); @RemoteOp(path="/x2/") String x2b(); @@ -102,7 +102,7 @@ public class Remote_Test { } @Remote - public static interface A4 { + public interface A4 { String x2(); @RemoteOp(path="x2") String x2a(); @RemoteOp(path="/x2/") String x2b(); @@ -117,7 +117,7 @@ public class Remote_Test { } @Remote(path="A/A") - public static interface A5 { + public interface A5 { String x3(); @RemoteOp(path="x3") String x3a(); @RemoteOp(path="/x3/") String x3b(); @@ -132,7 +132,7 @@ public class Remote_Test { } @Remote(path="/A/A/") - public static interface A6 { + public interface A6 { String x3(); @RemoteOp(path="x3") String x3a(); @RemoteOp(path="/x3/") String x3b(); @@ -147,7 +147,7 @@ public class Remote_Test { } @Remote(path="A") - public static interface A7 { + public interface A7 { String x3(); @RemoteOp(path="x3") String x3a(); @RemoteOp(path="/x3/") String x3b(); @@ -162,7 +162,7 @@ public class Remote_Test { } @Remote(path="/A/") - public static interface A8 { + public interface A8 { String x3(); @RemoteOp(path="x3") String x3a(); @RemoteOp(path="/x3/") String x3b(); @@ -189,7 +189,7 @@ public class Remote_Test { } @Remote - public static interface B1 { + public interface B1 { String x1(); @RemoteOp(path="x1") String x1a(); @RemoteOp(path="/x1/") String x1b(); @@ -204,7 +204,7 @@ public class Remote_Test { } @Remote(path="http://localhost/B";) - public static interface B2 { + public interface B2 { String x1(); @RemoteOp(path="x1") String x1a(); @RemoteOp(path="/x1/") String x1b(); @@ -219,7 +219,7 @@ public class Remote_Test { } @Remote - public static interface B3 { + public interface B3 { String x1(); @RemoteOp(path="http://localhost/B/x1";) String x1a(); @RemoteOp(path="http://localhost/B/x1/";) String x1b(); @@ -262,7 +262,7 @@ public class Remote_Test { } @Remote(path="/") - public static interface C1 { + public interface C1 { String x1(); @RemoteOp("GET") String x2(); @RemoteOp("GET /x3") String x3x(); @@ -301,7 +301,7 @@ public class Remote_Test { } @Remote(path="/") - public static interface C3b { + public interface C3b { String x1(); String getX2(); String x3(); @@ -346,7 +346,7 @@ public class Remote_Test { } @Remote - public static interface C4b { + public interface C4b { String x1() throws C4c; @RemoteOp(path="x1") Future<String> x1a() throws C4c; @RemoteOp(path="x1") CompletableFuture<String> x1b() throws C4c; @@ -398,17 +398,17 @@ public class Remote_Test { } @Remote - public static interface D1a { + public interface D1a { @RemoteOp(path="/r202",returns=RemoteReturn.STATUS) int x1() throws AssertionError; @RemoteOp(path="/r202",returns=RemoteReturn.STATUS) Integer x2() throws AssertionError; @RemoteOp(path="/r202",returns=RemoteReturn.STATUS) boolean x3() throws AssertionError; @RemoteOp(path="/r202",returns=RemoteReturn.STATUS) Boolean x4() throws AssertionError; @RemoteOp(path="/r202",returns=RemoteReturn.STATUS) String x5() throws AssertionError; - @RemoteOp(path="/r400",returns=RemoteReturn.STATUS) public int x6() throws AssertionError; - @RemoteOp(path="/r400",returns=RemoteReturn.STATUS) public Integer x7() throws AssertionError; - @RemoteOp(path="/r400",returns=RemoteReturn.STATUS) public boolean x8() throws AssertionError; - @RemoteOp(path="/r400",returns=RemoteReturn.STATUS) public Boolean x9() throws AssertionError; - @RemoteOp(path="/r400",returns=RemoteReturn.STATUS) public String x10() throws AssertionError; + @RemoteOp(path="/r400",returns=RemoteReturn.STATUS) int x6() throws AssertionError; + @RemoteOp(path="/r400",returns=RemoteReturn.STATUS) Integer x7() throws AssertionError; + @RemoteOp(path="/r400",returns=RemoteReturn.STATUS) boolean x8() throws AssertionError; + @RemoteOp(path="/r400",returns=RemoteReturn.STATUS) Boolean x9() throws AssertionError; + @RemoteOp(path="/r400",returns=RemoteReturn.STATUS) String x10() throws AssertionError; } @Test @@ -439,7 +439,7 @@ public class Remote_Test { } @Remote - public static interface D2a { + public interface D2a { int x1() throws AssertionError; int x2() throws AssertionError; @RemoteOp(path="x1") Integer x1a() throws AssertionError; @@ -554,7 +554,7 @@ public class Remote_Test { } @Remote(headers="Foo:bar",headerList=F1b.class,version="1.2.3") - public static interface F1a { + public interface F1a { String[] getHeaders(); } @@ -578,7 +578,7 @@ public class Remote_Test { } @Remote(headerList=F2b.class) - public static interface F2a { + public interface F2a { String[] getHeaders(); } @@ -602,7 +602,7 @@ public class Remote_Test { public static class G extends BasicRestObject {} @Remote - public static interface G1 { + public interface G1 { @RemoteOp(method="FOO") String[] getHeaders(); } @@ -626,7 +626,7 @@ public class Remote_Test { } @Remote - public static interface H1 { + public interface H1 { @RemoteOp(method="get") String a1(); @RemoteOp(method="put") String a2(); @RemoteOp(method="post") String a3(); 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 b26738691..ce58c4739 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 @@ -60,7 +60,7 @@ public class RrpcInterfaceTest { public interface InterfaceProxy { - public static final String SWAP = "swap-~!@#$%^&*()_+`-={}[]|:;\"<,>.?/"; + String SWAP = "swap-~!@#$%^&*()_+`-={}[]|:;\"<,>.?/"; //------------------------------------------------------------------------------------------------------------- // Test return types. diff --git a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectMerger_Test.java b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectMerger_Test.java index f41679ebc..0ce8cc6ed 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectMerger_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectMerger_Test.java @@ -63,7 +63,7 @@ public class ObjectMerger_Test { assertEquals("2", am.getA()); } - public static interface IA { + public interface IA { String getA(); void setA(String a); } diff --git a/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java b/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java index 0347fcc9a..be4feaa9b 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java @@ -198,10 +198,10 @@ public class ClassInfoTest { // Parent classes and interfaces. //----------------------------------------------------------------------------------------------------------------- - static interface BI1 {} - static interface BI2 extends BI1 {} - static interface BI3 {} - static interface BI4 {} + interface BI1 {} + interface BI2 extends BI1 {} + interface BI3 {} + interface BI4 {} static class BC1 implements BI1, BI2 {} static class BC2 extends BC1 implements BI3 {} static class BC3 extends BC2 {} @@ -288,16 +288,16 @@ public class ClassInfoTest { // Methods //----------------------------------------------------------------------------------------------------------------- - static interface CI1 { + interface CI1 { void i1a(); void i1b(); } - static interface CI2 extends CI1 { + interface CI2 extends CI1 { void i2b(); void i2a(); } - static interface CI3 {} - static interface CI4 {} + interface CI3 {} + interface CI4 {} static abstract class CC1 implements CI1, CI2 { @Override public void i1a() {} @@ -575,10 +575,10 @@ public class ClassInfoTest { // Annotations //----------------------------------------------------------------------------------------------------------------- - @A(1) static interface GI1 {} - @A(2) static interface GI2 extends GI1 {} - @A(3) static interface GI3 {} - @A(4) static interface GI4 {} + @A(1) interface GI1 {} + @A(2) interface GI2 extends GI1 {} + @A(3) interface GI3 {} + @A(4) interface GI4 {} @A(5) static class G1 implements GI1, GI2 {} @A(6) static class G2 extends G1 implements GI3 {} @A(7) static class G3 extends G2 {} @@ -683,10 +683,10 @@ public class ClassInfoTest { check("@PA(10),@A(3)", g5.getAnnotationList()); } - @A(1) @AConfig(1) static interface GBI1 {} - @A(2) @AConfig(2) static interface GBI2 extends GBI1 {} - @A(3) @AConfig(3) static interface GBI3 {} - @A(4) @AConfig(4) static interface GBI4 {} + @A(1) @AConfig(1) interface GBI1 {} + @A(2) @AConfig(2) interface GBI2 extends GBI1 {} + @A(3) @AConfig(3) interface GBI3 {} + @A(4) @AConfig(4) interface GBI4 {} @A(5) @AConfig(5) static class GB1 implements GBI1, GBI2 {} @A(6) @AConfig(6) static class GB2 extends GB1 implements GBI3 {} @A(7) @AConfig(7) static class GB3 extends GB2 {} diff --git a/juneau-utest/src/test/java/org/apache/juneau/reflect/ExecutableInfoTest.java b/juneau-utest/src/test/java/org/apache/juneau/reflect/ExecutableInfoTest.java index 1271a6c7f..80c13da78 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/reflect/ExecutableInfoTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/ExecutableInfoTest.java @@ -188,7 +188,7 @@ public class ExecutableInfoTest { check("", b_c1.getParamTypes()); } - static enum B1 { + enum B1 { FOO; } diff --git a/juneau-utest/src/test/java/org/apache/juneau/reflect/MethodInfoTest.java b/juneau-utest/src/test/java/org/apache/juneau/reflect/MethodInfoTest.java index 342cd2bb8..d302b412b 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/reflect/MethodInfoTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/MethodInfoTest.java @@ -141,10 +141,10 @@ public class MethodInfoTest { // Matching methods. //----------------------------------------------------------------------------------------------------------------- - public static interface B1 { - public int foo(int x); - public int foo(String x); - public int foo(); + public interface B1 { + int foo(int x); + int foo(String x); + int foo(); } public static class B2 { public int foo(int x) { return 0; } @@ -174,7 +174,7 @@ public class MethodInfoTest { //----------------------------------------------------------------------------------------------------------------- @A("C1") - public static interface C1 { + public interface C1 { @A("a1") void a1(); @A("a2a") void a2(); @A("a3") void a3(CharSequence foo); @@ -259,7 +259,7 @@ public class MethodInfoTest { } @A("C1") @AConfig("C1") - public static interface CB1 { + public interface CB1 { @A("a1") @AConfig("a1") void a1(); @A("a2a") @AConfig("a2a") void a2(); @A("a3") @AConfig("a3") void a3(CharSequence foo); diff --git a/juneau-utest/src/test/java/org/apache/juneau/reflect/ParamInfoTest.java b/juneau-utest/src/test/java/org/apache/juneau/reflect/ParamInfoTest.java index 9b88deac8..2a3f6acb1 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/reflect/ParamInfoTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/ParamInfoTest.java @@ -154,12 +154,12 @@ public class ParamInfoTest { } @CA("1") public static class C1 extends C2 {} @CA("2") public static class C2 implements C3, C4 {} - @CA("3") public static interface C3 {} - @CA("4") public static interface C4 {} + @CA("3") public interface C3 {} + @CA("4") public interface C4 {} - public static interface CB { - public void a1(@CA("5") C1 x); - public void a2(@CA("5") C1 x); + public interface CB { + void a1(@CA("5") C1 x); + void a2(@CA("5") C1 x); } public static class CC implements CB { public CC(@CA("9") C1 x) {} @@ -311,11 +311,11 @@ public class ParamInfoTest { } @DA("1") public static class D1 extends D2 {} @DA("2") public static class D2 implements D3, D4 {} - @DA("3") public static interface D3 {} - @DA("4") public static interface D4 {} + @DA("3") public interface D3 {} + @DA("4") public interface D4 {} - public static interface DB { - public void a1(@DA("0") D1 x); + public interface DB { + void a1(@DA("0") D1 x); } public static class DC implements DB { @Override diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java index 77513d9e1..0fc1f5e2a 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java @@ -30,13 +30,10 @@ public class Rest_AnnotationInheritance_Test { //------------------------------------------------------------------------------------------------------------------ @Rest(serializers=Json5Serializer.class, parsers=JsonParser.class, defaultAccept="text/json") - public static interface IA { - @RestPut - public String a(@Content String b); - @RestGet - public String b(@Query("foo") String b); - @RestGet - public String c(@Header("foo") String b); + public interface IA { + @RestPut String a(@Content String b); + @RestGet String b(@Query("foo") String b); + @RestGet String c(@Header("foo") String b); } public static class A implements IA { diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_BeanContext_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_BeanContext_Test.java index 3710d8ca1..8565ca9d1 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_BeanContext_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_BeanContext_Test.java @@ -143,7 +143,7 @@ public class RestClient_Config_BeanContext_Test { assertEquals(2,x.getHeader("X").as(A3.class).get().f2); } - public static interface A4a { + public interface A4a { int getF3(); void setF3(int f3); } @@ -631,9 +631,9 @@ public class RestClient_Config_BeanContext_Test { assertThrown(()->client().disableIgnoreUnknownNullBeanProperties().build().post("/echoBody",reader("{foo:'1',bar:null}")).run().cacheContent().assertContent().isContains("{foo:'1',bar:null}").getContent().as(A18.class)).asMessages().isAny(contains("Unknown property 'bar'")); } - public static interface A19 { - public String getFoo(); - public void setFoo(String foo); + public interface A19 { + String getFoo(); + void setFoo(String foo); } @Test @@ -730,7 +730,7 @@ public class RestClient_Config_BeanContext_Test { assertEquals("1",x.foo); } - public static interface A24a { + public interface A24a { void setFoo(int foo); int getFoo(); } @@ -758,7 +758,7 @@ public class RestClient_Config_BeanContext_Test { assertTrue(x instanceof A24b); } - public static interface A25a { + public interface A25a { void setFoo(int foo); int getFoo(); } @@ -991,7 +991,7 @@ public class RestClient_Config_BeanContext_Test { assertEquals(1,x.foo); } - public static enum A38a { + public enum A38a { ONE(1),TWO(2); private int value; A38a(int value) { diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java b/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java index c653d2881..b3c768275 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java @@ -1432,7 +1432,7 @@ public class ThirdPartyProxyTest { //----------------------------------------------------------------------------------------------------------------- @Remote - public static interface ThirdPartyProxy { + public interface ThirdPartyProxy { //------------------------------------------------------------------------------------------------------------- // Header tests @@ -1767,7 +1767,7 @@ public class ThirdPartyProxyTest { @Request ReqBeanPath1 rb ); - public static interface ReqBeanPath1 { + public interface ReqBeanPath1 { @Path int getA(); @@ -1809,7 +1809,7 @@ public class ThirdPartyProxyTest { @Request ReqBeanPath3 rb ); - public static interface ReqBeanPath3 { + public interface ReqBeanPath3 { @Path("a") int getX(); @@ -1822,7 +1822,7 @@ public class ThirdPartyProxyTest { @Request ReqBeanPath6 rb ); - public static interface ReqBeanPath6 { + public interface ReqBeanPath6 { @Path("*") Map<String,Object> getX(); } @@ -1832,7 +1832,7 @@ public class ThirdPartyProxyTest { @Request ReqBeanPath7 rb ); - public static interface ReqBeanPath7 { + public interface ReqBeanPath7 { @Path("*") ABean getX(); } @@ -1846,7 +1846,7 @@ public class ThirdPartyProxyTest { @Request ReqBeanQuery1 rb ); - public static interface ReqBeanQuery1 { + public interface ReqBeanQuery1 { @Query int getA(); @@ -1888,7 +1888,7 @@ public class ThirdPartyProxyTest { @Request ReqBeanQuery3 rb ); - public static interface ReqBeanQuery3 { + public interface ReqBeanQuery3 { @Query("a") int getX(); @@ -1901,7 +1901,7 @@ public class ThirdPartyProxyTest { @Request ReqBeanQuery6 rb ); - public static interface ReqBeanQuery6 { + public interface ReqBeanQuery6 { @Query("*") Map<String,Object> getX(); } @@ -1911,7 +1911,7 @@ public class ThirdPartyProxyTest { @Request ReqBeanQuery7 rb ); - public static interface ReqBeanQuery7 { + public interface ReqBeanQuery7 { @Query("*") ABean getX(); } @@ -1925,7 +1925,7 @@ public class ThirdPartyProxyTest { @Request ReqBeanFormData1 rb ); - public static interface ReqBeanFormData1 { + public interface ReqBeanFormData1 { @FormData int getA(); @@ -1967,7 +1967,7 @@ public class ThirdPartyProxyTest { @Request ReqBeanFormData3 rb ); - public static interface ReqBeanFormData3 { + public interface ReqBeanFormData3 { @FormData("a") int getX(); @@ -1980,7 +1980,7 @@ public class ThirdPartyProxyTest { @Request ReqBeanFormData6 rb ); - public static interface ReqBeanFormData6 { + public interface ReqBeanFormData6 { @FormData("*") Map<String,Object> getX(); } @@ -1990,7 +1990,7 @@ public class ThirdPartyProxyTest { @Request ReqBeanFormData7 rb ); - public static interface ReqBeanFormData7 { + public interface ReqBeanFormData7 { @FormData("*") ABean getX(); } @@ -2004,7 +2004,7 @@ public class ThirdPartyProxyTest { @Request ReqBeanHeader1 rb ); - public static interface ReqBeanHeader1 { + public interface ReqBeanHeader1 { @Header int getA(); @@ -2046,7 +2046,7 @@ public class ThirdPartyProxyTest { @Request ReqBeanHeader3 rb ); - public static interface ReqBeanHeader3 { + public interface ReqBeanHeader3 { @Header("a") int getX(); @@ -2059,7 +2059,7 @@ public class ThirdPartyProxyTest { @Request ReqBeanHeader6 rb ); - public static interface ReqBeanHeader6 { + public interface ReqBeanHeader6 { @Header("*") Map<String,Object> getX(); } @@ -2069,7 +2069,7 @@ public class ThirdPartyProxyTest { @Request ReqBeanHeader7 rb ); - public static interface ReqBeanHeader7 { + public interface ReqBeanHeader7 { @Header("*") ABean getX(); } diff --git a/juneau-utest/src/test/java/org/apache/juneau/svl/ResolvingJsonMapTest.java b/juneau-utest/src/test/java/org/apache/juneau/svl/ResolvingJsonMapTest.java index 103c4130e..704dd83d0 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/svl/ResolvingJsonMapTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/svl/ResolvingJsonMapTest.java @@ -92,7 +92,7 @@ public class ResolvingJsonMapTest { assertObject(m.get("foo")).asJson().is("{ONE:'ONE'}"); } - public static enum FooEnum { + public enum FooEnum { ONE } diff --git a/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java b/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java index 7af724a9f..c8293faae 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java @@ -746,7 +746,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest { } @Bean(dictionary={A.class}) - public static interface IA {} + public interface IA {} @Bean(typeName="A") public static class A implements IA { @@ -759,7 +759,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest { } @Bean(dictionary={B.class}, typePropertyName="z") - public static interface IB {} + public interface IB {} @Bean(typeName="B") public static class B implements IB { diff --git a/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanFilterTest.java b/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanFilterTest.java index 659dcf994..7f07327e9 100755 --- a/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanFilterTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanFilterTest.java @@ -44,12 +44,12 @@ public class BeanFilterTest { assertNull(bm.get("f3")); } - public static interface A1 { - public String getF1(); + public interface A1 { + String getF1(); } - public static interface A2 extends A1 { - public String getF2(); + public interface A2 extends A1 { + String getF2(); } public static class A3 implements A2 { diff --git a/juneau-utest/src/test/java/org/apache/juneau/xml/BasicXmlTest.java b/juneau-utest/src/test/java/org/apache/juneau/xml/BasicXmlTest.java index c0683a3db..70ac3a24f 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/xml/BasicXmlTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/xml/BasicXmlTest.java @@ -1635,9 +1635,9 @@ public class BasicXmlTest { } } - public static interface IA { - public String getA(); - public void setA(String a); + public interface IA { + String getA(); + void setA(String a); } public static abstract class AA implements IA {} diff --git a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlIgnoreCommentsTest.java b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlIgnoreCommentsTest.java index 2856c5cfd..15df3be80 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlIgnoreCommentsTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlIgnoreCommentsTest.java @@ -1187,9 +1187,9 @@ public class XmlIgnoreCommentsTest { } } - public static interface IA { - public String getA(); - public void setA(String a); + public interface IA { + String getA(); + void setA(String a); } public static abstract class AA implements IA {} diff --git a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlTest.java b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlTest.java index 3d1551afe..452348036 100755 --- a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlTest.java @@ -234,7 +234,7 @@ public class XmlTest { } @Bean(typeName="foo") - public static interface C1 {} + public interface C1 {} public static class C2 implements C1 {} public static class C3 extends C2 { public int f1 = 1;
