This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new f487a3139 Modernize tests
f487a3139 is described below
commit f487a313902251e029821c490fab4d07dfd8e445
Author: James Bognar <[email protected]>
AuthorDate: Sat Aug 23 00:23:22 2025 -0400
Modernize tests
---
.../java/org/apache/juneau/Annotations_Test.java | 8 +-
.../java/org/apache/juneau/BasicBeans_Test.java | 2 +-
.../java/org/apache/juneau/BeanMapErrorsTest.java | 4 +-
.../test/java/org/apache/juneau/BeanMapTest.java | 92 ++--
.../src/test/java/org/apache/juneau/a/A1.java | 40 +-
.../juneau/a/rttests/Enum_RoundTripTest.java | 502 ++++++++++-----------
.../juneau/a/rttests/RoundTripBeanMaps_Test.java | 2 +-
.../a/rttests/RoundTripTransformBeans_Test.java | 2 +-
.../java/org/apache/juneau/html/Common_Test.java | 6 +-
.../java/org/apache/juneau/json/CommonTest.java | 6 +-
.../juneau/objecttools/ObjectMerger_Test.java | 2 +-
.../client/RestClient_Config_BeanContext_Test.java | 22 +-
.../org/apache/juneau/testutils/pojos/XBeans.java | 40 +-
.../java/org/apache/juneau/urlencoding/DTOs.java | 20 +-
.../java/org/apache/juneau/urlencoding/DTOs2.java | 20 +-
.../java/org/apache/juneau/xml/BasicXml_Test.java | 2 +-
.../org/apache/juneau/xml/XmlCollapsedTest.java | 8 +-
.../apache/juneau/xml/XmlIgnoreComments_Test.java | 2 +-
.../test/java/org/apache/juneau/xml/XmlTest.java | 2 +-
.../test/java/org/apache/juneau/xml/xml1a/T1.java | 4 +-
.../test/java/org/apache/juneau/xml/xml1a/T2.java | 4 +-
.../test/java/org/apache/juneau/xml/xml1b/T3.java | 4 +-
.../test/java/org/apache/juneau/xml/xml1b/T4.java | 4 +-
.../test/java/org/apache/juneau/xml/xml1b/T5.java | 4 +-
.../test/java/org/apache/juneau/xml/xml1b/T6.java | 4 +-
.../test/java/org/apache/juneau/xml/xml1b/T7.java | 4 +-
26 files changed, 405 insertions(+), 405 deletions(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/Annotations_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/Annotations_Test.java
index c96a230bd..9f51ac7c2 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/Annotations_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/Annotations_Test.java
@@ -45,7 +45,7 @@ class Annotations_Test extends SimpleTestBase {
private String name;
public String getName() { return name; }
- public void setName(String v) { this.name = v; }
+ public void setName(String v) { name = v; }
}
@Test void testBeanWithExplicitProperties2() throws Exception {
@@ -71,7 +71,7 @@ class Annotations_Test extends SimpleTestBase {
private String name;
public String getName() { return name; }
- public void setName(String v) { this.name = v; }
+ public void setName(String v) { name = v; }
}
@Test void testBeanWithExplicitProperties3() throws Exception {
@@ -97,7 +97,7 @@ class Annotations_Test extends SimpleTestBase {
private String name;
public String getName() { return name; }
- public void setName(String v) { this.name = v; }
+ public void setName(String v) { name = v; }
}
@Test void testBeanWithExplicitProperties_usingConfig() throws
Exception {
@@ -122,7 +122,7 @@ class Annotations_Test extends SimpleTestBase {
private String name;
public String getName() { return name; }
- public void setName(String v) { this.name = v; }
+ public void setName(String v) { name = v; }
}
@Bean(on="Person4",properties="age,name")
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BasicBeans_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/BasicBeans_Test.java
index 4339e0756..cb5b6e170 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/BasicBeans_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BasicBeans_Test.java
@@ -58,7 +58,7 @@ class BasicBeans_Test extends SimpleTestBase {
public int f1;
private int f2;
- public void setF2(int v) { this.f2 = v; }
+ public void setF2(int v) { f2 = v; }
@Transient public int getF2() { return f2; }
public static A2 create() {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java
b/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java
index 6aca3139f..386ff54d6 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java
@@ -44,7 +44,7 @@ class BeanMapErrorsTest extends SimpleTestBase {
private int f2 = -1;
@Beanp("f2") public int f2() { return f2; }
- public void setF2(int v) { this.f2 = v; }
+ public void setF2(int v) { f2 = v; }
}
@Test void beanPropertyMethodNotInBeanProperties_usingConfig() {
@@ -70,7 +70,7 @@ class BeanMapErrorsTest extends SimpleTestBase {
private int f2 = -1;
@Beanp("f2") public int f2() { return f2; }
- public void setF2(int v) { this.f2 = v; }
+ public void setF2(int v) { f2 = v; }
}
//-----------------------------------------------------------------------------------------------------------------
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 36994bcfe..1c0fed21a 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
@@ -211,34 +211,34 @@ class BeanMapTest extends SimpleTestBase {
private Boolean b2;
public int getI1() {return i1;}
- public void setI1(int v) {this.i1 = v;}
+ public void setI1(int v) {i1 = v;}
public Integer getI2() {return i2;}
- public void setI2(Integer v) {this.i2 = v;}
+ public void setI2(Integer v) {i2 = v;}
public short getS1() {return s1;}
- public void setS1(short v) {this.s1 = v;}
+ public void setS1(short v) {s1 = v;}
public Short getS2() {return s2;}
- public void setS2(Short v) {this.s2 = v;}
+ public void setS2(Short v) {s2 = v;}
public long getL1() {return l1;}
- public void setL1(long v) {this.l1 = v;}
+ public void setL1(long v) {l1 = v;}
public Long getL2() {return l2;}
- public void setL2(Long v) {this.l2 = v;}
+ public void setL2(Long v) {l2 = v;}
public double getD1() {return d1;}
- public void setD1(double v) {this.d1 = v;}
+ public void setD1(double v) {d1 = v;}
public Double getD2() {return d2;}
- public void setD2(Double v) {this.d2 = v;}
+ public void setD2(Double v) {d2 = v;}
public float getF1() {return f1;}
- public void setF1(float v) {this.f1 = v;}
+ public void setF1(float v) {f1 = v;}
public Float getF2() {return f2;}
- public void setF2(Float v) {this.f2 = v;}
+ public void setF2(Float v) {f2 = v;}
public boolean getB1() {return b1;}
- public void setB1(boolean v) {this.b1 = v;}
+ public void setB1(boolean v) {b1 = v;}
public Boolean getB2() {return b2;}
- public void setB2(Boolean v) {this.b2 = v;}
+ public void setB2(Boolean v) {b2 = v;}
}
//====================================================================================================
@@ -383,75 +383,75 @@ class BeanMapTest extends SimpleTestBase {
public static class D {
private List l1;
public List getL1() {return l1;}
- public void setL1(List v) {this.l1 = v;}
+ public void setL1(List v) {l1 = v;}
private ArrayList al1;
public ArrayList getAl1() {return al1;}
- public void setAl1(ArrayList v) {this.al1 = v;}
+ public void setAl1(ArrayList v) {al1 = v;}
private LinkedList ll1;
public LinkedList getLl1() {return ll1;}
- public void setLl1(LinkedList v) {this.ll1 = v;}
+ public void setLl1(LinkedList v) {ll1 = v;}
private Collection c1;
public Collection getC1() {return c1;}
- public void setC1(Collection v) {this.c1 = v;}
+ public void setC1(Collection v) {c1 = v;}
private Map m1;
public Map getM1() {return m1;}
- public void setM1(Map v) {this.m1 = v;}
+ public void setM1(Map v) {m1 = v;}
private HashMap hm1;
public HashMap getHm1() {return hm1;}
- public void setHm1(HashMap v) {this.hm1 = v;}
+ public void setHm1(HashMap v) {hm1 = v;}
private JsonMap jm1;
public JsonMap getJm1() {return jm1;}
- public void setJm1(JsonMap v) {this.jm1 = v;}
+ public void setJm1(JsonMap v) {jm1 = v;}
private TreeMap tm1;
public TreeMap getTm1() {return tm1;}
- public void setTm1(TreeMap v) {this.tm1 = v;}
+ public void setTm1(TreeMap v) {tm1 = v;}
private JsonList jl1;
public JsonList getJl1() {return jl1;}
- public void setJl1(JsonList v) {this.jl1 = v;}
+ public void setJl1(JsonList v) {jl1 = v;}
private List l2 = new ArrayList();
public List getL2() {return l2;}
- public void setL2(List v) {this.l2 = v;}
+ public void setL2(List v) {l2 = v;}
private ArrayList al2 = new ArrayList();
public ArrayList getAl2() {return al2;}
- public void setAl2(ArrayList v) {this.al2 = v;}
+ public void setAl2(ArrayList v) {al2 = v;}
private LinkedList ll2 = new LinkedList();
public LinkedList getLl2() {return ll2;}
- public void setLl2(LinkedList v) {this.ll2 = v;}
+ public void setLl2(LinkedList v) {ll2 = v;}
private Collection c2 = new ArrayList();
public Collection getC2() {return c2;}
- public void setC2(Collection v) {this.c2 = v;}
+ public void setC2(Collection v) {c2 = v;}
private Map m2 = new HashMap();
public Map getM2() {return m2;}
- public void setM2(Map v) {this.m2 = v;}
+ public void setM2(Map v) {m2 = v;}
private HashMap hm2 = new HashMap();
public HashMap getHm2() {return hm2;}
- public void setHm2(HashMap v) {this.hm2 = v;}
+ public void setHm2(HashMap v) {hm2 = v;}
private TreeMap tm2 = new TreeMap();
public TreeMap getTm2() {return tm2;}
- public void setTm2(TreeMap v) {this.tm2 = v;}
+ public void setTm2(TreeMap v) {tm2 = v;}
private JsonMap jm2 = new JsonMap();
public JsonMap getJm2() {return jm2;}
- public void setJm2(JsonMap v) {this.jm2 = v;}
+ public void setJm2(JsonMap v) {jm2 = v;}
private JsonList jl2 = new JsonList();
public JsonList getJl2() {return jl2;}
- public void setJl2(JsonList v) {this.jl2 = v;}
+ public void setJl2(JsonList v) {jl2 = v;}
}
//====================================================================================================
@@ -662,26 +662,26 @@ class BeanMapTest extends SimpleTestBase {
private List<G> m1;
public List<G> getM1() { return m1; }
- public void setM1(List<G> v) { this.m1 = v; }
+ public void setM1(List<G> v) { m1 = v; }
private List<G> m2 = new LinkedList<>();
public List<G> getM2() { return m2; }
- public void setM2(List<G> v) { this.m2 = v; }
+ public void setM2(List<G> v) { m2 = v; }
private List<G> m3;
@Beanp(type=List.class,params={G.class})
public List<G> getM3() { return m3; }
- public void setM3(List<G> v) { this.m3 = v; }
+ public void setM3(List<G> v) { m3 = v; }
private List<G> m4;
@Beanp(type=LinkedList.class,params={G.class})
public List<G> getM4() { return m4; }
- public void setM4(List<G> v) { this.m4 = v; }
+ public void setM4(List<G> v) { m4 = v; }
@Beanp(type=LinkedList.class,params={G.class})
private List<G> m5;
public List<G> getM5() { return m5; }
- public void setM5(List<G> v) { this.m5 = v; }
+ public void setM5(List<G> v) { m5 = v; }
}
//====================================================================================================
@@ -724,7 +724,7 @@ class BeanMapTest extends SimpleTestBase {
private HEnum enum2;
public HEnum getEnum2() { return enum2; }
- public void setEnum2(HEnum v) { this.enum2 = v; }
+ public void setEnum2(HEnum v) { enum2 = v; }
}
//====================================================================================================
@@ -944,7 +944,7 @@ class BeanMapTest extends SimpleTestBase {
public static class N1<T> {
private T x;
- public void setX(T v) { this.x = v; }
+ public void setX(T v) { x = v; }
public T getX() { return x; }
}
@@ -1100,13 +1100,13 @@ class BeanMapTest extends SimpleTestBase {
return fooBar;
}
public void setFooBar(int v) {
- this.fooBar = v;
+ fooBar = v;
}
public int getBazBING() {
return bazBING;
}
public void setBazBING(int v) {
- this.bazBING = v;
+ bazBING = v;
}
}
@@ -1740,7 +1740,7 @@ class BeanMapTest extends SimpleTestBase {
}
public void setA(String v) {
- this.a = v;
+ a = v;
}
@BeanIgnore
@@ -1795,8 +1795,8 @@ class BeanMapTest extends SimpleTestBase {
return a;
}
- public void setA(String a) {
- this.a = a;
+ public void setA(String a) {
+ this.a = a;
}
@BeanIgnore
@@ -1804,7 +1804,7 @@ class BeanMapTest extends SimpleTestBase {
return b;
}
- public void setB(String b) {
+ public void setB(String b) {
this.b = b+"(setter)";
}
@@ -1928,7 +1928,7 @@ class BeanMapTest extends SimpleTestBase {
}
public void setF2(Object v) {
- this.f2 = v;
+ f2 = v;
}
}
@@ -1949,7 +1949,7 @@ class BeanMapTest extends SimpleTestBase {
}
public void setF2(Integer v) {
- this.f2 = v;
+ f2 = v;
}
}
@@ -1983,7 +1983,7 @@ class BeanMapTest extends SimpleTestBase {
return Collections.emptyList();
}
public void setA(List<String> v) {
- this.a = v;
+ a = v;
}
}
}
\ No newline at end of file
diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/A1.java
b/juneau-utest/src/test/java/org/apache/juneau/a/A1.java
index e4a07e28f..a9d09114f 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/a/A1.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/a/A1.java
@@ -26,13 +26,13 @@ public class A1 {
private int f5, f6, f7, f8;
public int getF5() { return f5; }
- public void setF5(int v) { this.f5 = v; }
+ public void setF5(int v) { f5 = v; }
protected int getF6() { return f6; }
- protected void setF6(int v) { this.f6 = v; }
+ protected void setF6(int v) { f6 = v; }
int getF7() { return f7; }
- void setF7(int v) { this.f7 = v; }
+ void setF7(int v) { f7 = v; }
private int getF8() { return f8; }
- private void setF8(int v) { this.f8 = v; }
+ private void setF8(int v) { f8 = v; }
public A2 g2;
public A3 g3;
@@ -98,13 +98,13 @@ public class A1 {
private int f5, f6, f7, f8;
public int getF5() { return f5; }
- public void setF5(int v) { this.f5 = v; }
+ public void setF5(int v) { f5 = v; }
protected int getF6() { return f6; }
- protected void setF6(int v) { this.f6 = v; }
+ protected void setF6(int v) { f6 = v; }
int getF7() { return f7; }
- void setF7(int v) { this.f7 = v; }
+ void setF7(int v) { f7 = v; }
private int getF8() { return f8; }
- private void setF8(int v) { this.f8 = v; }
+ private void setF8(int v) { f8 = v; }
@Override /* Object */
public String toString() {
@@ -122,13 +122,13 @@ public class A1 {
private int f5, f6, f7, f8;
public int getF5() { return f5; }
- public void setF5(int v) { this.f5 = v; }
+ public void setF5(int v) { f5 = v; }
protected int getF6() { return f6; }
- protected void setF6(int v) { this.f6 = v; }
+ protected void setF6(int v) { f6 = v; }
int getF7() { return f7; }
- void setF7(int v) { this.f7 = v; }
+ void setF7(int v) { f7 = v; }
private int getF8() { return f8; }
- private void setF8(int v) { this.f8 = v; }
+ private void setF8(int v) { f8 = v; }
@Override /* Object */
public String toString() {
@@ -146,13 +146,13 @@ public class A1 {
private int f5, f6, f7, f8;
public int getF5() { return f5; }
- public void setF5(int v) { this.f5 = v; }
+ public void setF5(int v) { f5 = v; }
protected int getF6() { return f6; }
- protected void setF6(int v) { this.f6 = v; }
+ protected void setF6(int v) { f6 = v; }
int getF7() { return f7; }
- void setF7(int v) { this.f7 = v; }
+ void setF7(int v) { f7 = v; }
private int getF8() { return f8; }
- private void setF8(int v) { this.f8 = v; }
+ private void setF8(int v) { f8 = v; }
@Override /* Object */
public String toString() {
@@ -170,13 +170,13 @@ public class A1 {
private int f5, f6, f7, f8;
public int getF5() { return f5; }
- public void setF5(int v) { this.f5 = v; }
+ public void setF5(int v) { f5 = v; }
protected int getF6() { return f6; }
- protected void setF6(int v) { this.f6 = v; }
+ protected void setF6(int v) { f6 = v; }
int getF7() { return f7; }
- void setF7(int v) { this.f7 = v; }
+ void setF7(int v) { f7 = v; }
private int getF8() { return f8; }
- private void setF8(int v) { this.f8 = v; }
+ private void setF8(int v) { f8 = v; }
@Override /* Object */
public String toString() {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/Enum_RoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/Enum_RoundTripTest.java
index 5e0585e9f..6f26b1356 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/Enum_RoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/Enum_RoundTripTest.java
@@ -1,252 +1,252 @@
-//
***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file *
-// * distributed with this work for additional information regarding copyright
ownership. The ASF licenses this file *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance *
-// * with the License. You may obtain a copy of the License at
*
-// *
*
-// * http://www.apache.org/licenses/LICENSE-2.0
*
-// *
*
-// * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
-// * specific language governing permissions and limitations under the
License. *
-//
***************************************************************************************************************************
-package org.apache.juneau.a.rttests;
-
-import static org.apache.juneau.internal.CollectionUtils.*;
-import static org.junit.Assert.*;
-
-import java.util.*;
-
-import org.apache.juneau.json.*;
-import org.junit.jupiter.params.*;
-import org.junit.jupiter.params.provider.*;
-
-/**
- * Tests designed to serialize and parse objects to make sure we end up
- * with the same objects for all serializers and parsers.
- */
-class Enum_RoundTripTest extends RoundTripTest_Base {
-
-
//====================================================================================================
- // Enum object
-
//====================================================================================================
-
- @ParameterizedTest
- @MethodSource("testers")
- void a01_enumA(RoundTripTester t) throws Exception {
- var x = AEnum.FOO;
- assertJson(x, "'FOO'");
- x = t.roundTrip(x, AEnum.class);
- assertEquals(AEnum.FOO, x);
- }
-
- @ParameterizedTest
- @MethodSource("testers")
- void a02_enumB(RoundTripTester t) throws Exception {
- var s = JsonSerializer.create().json5().build();
- var x = BEnum.FOO;
- assertEquals("'xfoo'", s.serialize(x));
- x = t.roundTrip(x, BEnum.class);
- assertEquals(BEnum.FOO, x);
- }
-
-
//====================================================================================================
- // Enum[] object
-
//====================================================================================================
-
- @ParameterizedTest
- @MethodSource("testers")
- void a03_enumArrayA(RoundTripTester t) throws Exception {
- var x = new AEnum[]{AEnum.FOO,AEnum.BAR,null};
- assertJson(x, "['FOO','BAR',null]");
- x = t.roundTrip(x, AEnum[].class);
- assertEquals(AEnum.FOO, x[0]);
- assertEquals(AEnum.BAR, x[1]);
- assertNull(x[2]);
- }
-
- @ParameterizedTest
- @MethodSource("testers")
- void a04_enumArrayB(RoundTripTester t) throws Exception {
- var x = new BEnum[]{BEnum.FOO,BEnum.BAR,null};
- assertJson(x, "['xfoo','xbar',null]");
- x = t.roundTrip(x, BEnum[].class);
- assertEquals(BEnum.FOO, x[0]);
- assertEquals(BEnum.BAR, x[1]);
- assertNull(x[2]);
- }
-
-
//====================================================================================================
- // Enum[][] object
-
//====================================================================================================
-
- @ParameterizedTest
- @MethodSource("testers")
- void a05_enum2dArrayA(RoundTripTester t) throws Exception {
- var x = new AEnum[][]{{AEnum.FOO,AEnum.BAR,null},null};
- assertJson(x, "[['FOO','BAR',null],null]");
- x = t.roundTrip(x, AEnum[][].class);
- assertEquals(AEnum.FOO, x[0][0]);
- assertEquals(AEnum.BAR, x[0][1]);
- assertNull(x[0][2]);
- assertNull(x[1]);
- }
-
- @ParameterizedTest
- @MethodSource("testers")
- void a06_enum2dArrayB(RoundTripTester t) throws Exception {
- var x = new BEnum[][]{{BEnum.FOO,BEnum.BAR,null},null};
- assertJson(x, "[['xfoo','xbar',null],null]");
- x = t.roundTrip(x, BEnum[][].class);
- assertEquals(BEnum.FOO, x[0][0]);
- assertEquals(BEnum.BAR, x[0][1]);
- assertNull(x[0][2]);
- assertNull(x[1]);
- }
-
-
//====================================================================================================
- // Bean with Enum fields
-
//====================================================================================================
-
- @ParameterizedTest
- @MethodSource("testers")
- void a07_beansWithEnumA(RoundTripTester t) throws Exception {
- var x1 = new A().init();
- var x2 = t.roundTrip(x1, A.class);
- assertEquals(json(x1), json(x2));
- assertEquals(AEnum.FOO, x2.f3[0]);
- assertNull(x2.f3[1]);
- assertEquals(AEnum.FOO, x2.f4[0][0]);
- assertNull(x2.f4[0][1]);
- assertNull(x2.f4[1]);
- }
-
- @ParameterizedTest
- @MethodSource("testers")
- void a08_beansWithEnumB(RoundTripTester t) throws Exception {
- var x1 = new B().init();
- var x2 = t.roundTrip(x1, B.class);
- assertEquals(json(x1), json(x2));
- assertEquals(BEnum.FOO, x2.f3[0]);
- assertNull(x2.f3[1]);
- assertEquals(BEnum.FOO, x2.f4[0][0]);
- assertNull(x2.f4[0][1]);
- assertNull(x2.f4[1]);
- }
-
-
- /** Normal Enum */
- public enum AEnum {
- FOO,BAR,BAZ
- }
-
- /** Enum with custom serialized values */
- public enum BEnum {
- FOO("xfoo"), BAR("xbar"), BAZ("xbaz");
-
- private String val;
-
- BEnum(String val) {
- this.val = val;
- }
-
- @Override /* Object */
- public String toString() {
- return val;
- }
-
- public static BEnum fromString(String val) {
- if (val.equals("xfoo"))
- return FOO;
- if (val.equals("xbar"))
- return BAR;
- if (val.equals("xbaz"))
- return BAZ;
- return null;
- }
- }
-
- public static class A {
-
- // Should have 'enum' attribute.
- public AEnum f1;
-
- private AEnum f2;
- public AEnum getF2() { return f2; }
- public void setF2(AEnum v) { f2 = v; }
-
- public AEnum[] f3;
- public AEnum[][] f4;
-
- // Should not have 'uniqueSet' attribute.
- public List<AEnum> f5 = new LinkedList<>();
-
- private List<AEnum> f6 = new LinkedList<>();
- public List<AEnum> getF6() { return f6; }
- public void setF6(List<AEnum> v) { f6 = v; }
-
- // Should have 'uniqueSet' attribute.
- public Set<AEnum> f7 = new HashSet<>();
-
- private Set<AEnum> f8 = new HashSet<>();
- public Set<AEnum> getF8() { return f8; }
- public void setF8(Set<AEnum> v) { f8 = v; }
-
- public Map<AEnum,AEnum> f9 = new LinkedHashMap<>();
-
- public A init() {
- f1 = AEnum.FOO;
- f2 = AEnum.BAR;
- f3 = new AEnum[]{AEnum.FOO,null};
- f4 = new AEnum[][]{{AEnum.FOO,null},null};
- f5 = alist(AEnum.FOO);
- f6 = alist(AEnum.FOO);
- f7 = set(AEnum.FOO);
- f8 = set(AEnum.FOO);
-
- return this;
- }
- }
-
- public static class B {
-
- // Should have 'enum' attribute.
- public BEnum f1;
-
- private BEnum f2;
- public BEnum getF2() { return f2; }
- public void setF2(BEnum v) { this.f2 = v; }
-
- public BEnum[] f3;
- public BEnum[][] f4;
-
- // Should not have 'uniqueSet' attribute.
- public List<BEnum> f5 = new LinkedList<>();
-
- private List<BEnum> f6 = new LinkedList<>();
- public List<BEnum> getF6() { return f6; }
- public void setF6(List<BEnum> v) { f6 = v; }
-
- // Should have 'uniqueSet' attribute.
- public Set<BEnum> f7 = new HashSet<>();
-
- private Set<BEnum> f8 = new HashSet<>();
- public Set<BEnum> getF8() { return f8; }
- public void setF8(Set<BEnum> v) { f8 = v; }
-
- public Map<BEnum,BEnum> f9 = new LinkedHashMap<>();
-
- public B init() {
- f1 = BEnum.FOO;
- f2 = BEnum.BAR;
- f3 = new BEnum[]{BEnum.FOO,null};
- f4 = new BEnum[][]{{BEnum.FOO,null},null};
- f5 = alist(BEnum.FOO);
- f6 = alist(BEnum.FOO);
- f7 = set(BEnum.FOO);
- f8 = set(BEnum.FOO);
-
- return this;
- }
- }
+//
***************************************************************************************************************************
+// * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file *
+// * distributed with this work for additional information regarding copyright
ownership. The ASF licenses this file *
+// * to you under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance *
+// * with the License. You may obtain a copy of the License at
*
+// *
*
+// * http://www.apache.org/licenses/LICENSE-2.0
*
+// *
*
+// * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an *
+// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
+// * specific language governing permissions and limitations under the
License. *
+//
***************************************************************************************************************************
+package org.apache.juneau.a.rttests;
+
+import static org.apache.juneau.internal.CollectionUtils.*;
+import static org.junit.Assert.*;
+
+import java.util.*;
+
+import org.apache.juneau.json.*;
+import org.junit.jupiter.params.*;
+import org.junit.jupiter.params.provider.*;
+
+/**
+ * Tests designed to serialize and parse objects to make sure we end up
+ * with the same objects for all serializers and parsers.
+ */
+class Enum_RoundTripTest extends RoundTripTest_Base {
+
+
//====================================================================================================
+ // Enum object
+
//====================================================================================================
+
+ @ParameterizedTest
+ @MethodSource("testers")
+ void a01_enumA(RoundTripTester t) throws Exception {
+ var x = AEnum.FOO;
+ assertJson(x, "'FOO'");
+ x = t.roundTrip(x, AEnum.class);
+ assertEquals(AEnum.FOO, x);
+ }
+
+ @ParameterizedTest
+ @MethodSource("testers")
+ void a02_enumB(RoundTripTester t) throws Exception {
+ var s = JsonSerializer.create().json5().build();
+ var x = BEnum.FOO;
+ assertEquals("'xfoo'", s.serialize(x));
+ x = t.roundTrip(x, BEnum.class);
+ assertEquals(BEnum.FOO, x);
+ }
+
+
//====================================================================================================
+ // Enum[] object
+
//====================================================================================================
+
+ @ParameterizedTest
+ @MethodSource("testers")
+ void a03_enumArrayA(RoundTripTester t) throws Exception {
+ var x = new AEnum[]{AEnum.FOO,AEnum.BAR,null};
+ assertJson(x, "['FOO','BAR',null]");
+ x = t.roundTrip(x, AEnum[].class);
+ assertEquals(AEnum.FOO, x[0]);
+ assertEquals(AEnum.BAR, x[1]);
+ assertNull(x[2]);
+ }
+
+ @ParameterizedTest
+ @MethodSource("testers")
+ void a04_enumArrayB(RoundTripTester t) throws Exception {
+ var x = new BEnum[]{BEnum.FOO,BEnum.BAR,null};
+ assertJson(x, "['xfoo','xbar',null]");
+ x = t.roundTrip(x, BEnum[].class);
+ assertEquals(BEnum.FOO, x[0]);
+ assertEquals(BEnum.BAR, x[1]);
+ assertNull(x[2]);
+ }
+
+
//====================================================================================================
+ // Enum[][] object
+
//====================================================================================================
+
+ @ParameterizedTest
+ @MethodSource("testers")
+ void a05_enum2dArrayA(RoundTripTester t) throws Exception {
+ var x = new AEnum[][]{{AEnum.FOO,AEnum.BAR,null},null};
+ assertJson(x, "[['FOO','BAR',null],null]");
+ x = t.roundTrip(x, AEnum[][].class);
+ assertEquals(AEnum.FOO, x[0][0]);
+ assertEquals(AEnum.BAR, x[0][1]);
+ assertNull(x[0][2]);
+ assertNull(x[1]);
+ }
+
+ @ParameterizedTest
+ @MethodSource("testers")
+ void a06_enum2dArrayB(RoundTripTester t) throws Exception {
+ var x = new BEnum[][]{{BEnum.FOO,BEnum.BAR,null},null};
+ assertJson(x, "[['xfoo','xbar',null],null]");
+ x = t.roundTrip(x, BEnum[][].class);
+ assertEquals(BEnum.FOO, x[0][0]);
+ assertEquals(BEnum.BAR, x[0][1]);
+ assertNull(x[0][2]);
+ assertNull(x[1]);
+ }
+
+
//====================================================================================================
+ // Bean with Enum fields
+
//====================================================================================================
+
+ @ParameterizedTest
+ @MethodSource("testers")
+ void a07_beansWithEnumA(RoundTripTester t) throws Exception {
+ var x1 = new A().init();
+ var x2 = t.roundTrip(x1, A.class);
+ assertEquals(json(x1), json(x2));
+ assertEquals(AEnum.FOO, x2.f3[0]);
+ assertNull(x2.f3[1]);
+ assertEquals(AEnum.FOO, x2.f4[0][0]);
+ assertNull(x2.f4[0][1]);
+ assertNull(x2.f4[1]);
+ }
+
+ @ParameterizedTest
+ @MethodSource("testers")
+ void a08_beansWithEnumB(RoundTripTester t) throws Exception {
+ var x1 = new B().init();
+ var x2 = t.roundTrip(x1, B.class);
+ assertEquals(json(x1), json(x2));
+ assertEquals(BEnum.FOO, x2.f3[0]);
+ assertNull(x2.f3[1]);
+ assertEquals(BEnum.FOO, x2.f4[0][0]);
+ assertNull(x2.f4[0][1]);
+ assertNull(x2.f4[1]);
+ }
+
+
+ /** Normal Enum */
+ public enum AEnum {
+ FOO,BAR,BAZ
+ }
+
+ /** Enum with custom serialized values */
+ public enum BEnum {
+ FOO("xfoo"), BAR("xbar"), BAZ("xbaz");
+
+ private String val;
+
+ BEnum(String val) {
+ this.val = val;
+ }
+
+ @Override /* Object */
+ public String toString() {
+ return val;
+ }
+
+ public static BEnum fromString(String val) {
+ if (val.equals("xfoo"))
+ return FOO;
+ if (val.equals("xbar"))
+ return BAR;
+ if (val.equals("xbaz"))
+ return BAZ;
+ return null;
+ }
+ }
+
+ public static class A {
+
+ // Should have 'enum' attribute.
+ public AEnum f1;
+
+ private AEnum f2;
+ public AEnum getF2() { return f2; }
+ public void setF2(AEnum v) { f2 = v; }
+
+ public AEnum[] f3;
+ public AEnum[][] f4;
+
+ // Should not have 'uniqueSet' attribute.
+ public List<AEnum> f5 = new LinkedList<>();
+
+ private List<AEnum> f6 = new LinkedList<>();
+ public List<AEnum> getF6() { return f6; }
+ public void setF6(List<AEnum> v) { f6 = v; }
+
+ // Should have 'uniqueSet' attribute.
+ public Set<AEnum> f7 = new HashSet<>();
+
+ private Set<AEnum> f8 = new HashSet<>();
+ public Set<AEnum> getF8() { return f8; }
+ public void setF8(Set<AEnum> v) { f8 = v; }
+
+ public Map<AEnum,AEnum> f9 = new LinkedHashMap<>();
+
+ public A init() {
+ f1 = AEnum.FOO;
+ f2 = AEnum.BAR;
+ f3 = new AEnum[]{AEnum.FOO,null};
+ f4 = new AEnum[][]{{AEnum.FOO,null},null};
+ f5 = alist(AEnum.FOO);
+ f6 = alist(AEnum.FOO);
+ f7 = set(AEnum.FOO);
+ f8 = set(AEnum.FOO);
+
+ return this;
+ }
+ }
+
+ public static class B {
+
+ // Should have 'enum' attribute.
+ public BEnum f1;
+
+ private BEnum f2;
+ public BEnum getF2() { return f2; }
+ public void setF2(BEnum v) { f2 = v; }
+
+ public BEnum[] f3;
+ public BEnum[][] f4;
+
+ // Should not have 'uniqueSet' attribute.
+ public List<BEnum> f5 = new LinkedList<>();
+
+ private List<BEnum> f6 = new LinkedList<>();
+ public List<BEnum> getF6() { return f6; }
+ public void setF6(List<BEnum> v) { f6 = v; }
+
+ // Should have 'uniqueSet' attribute.
+ public Set<BEnum> f7 = new HashSet<>();
+
+ private Set<BEnum> f8 = new HashSet<>();
+ public Set<BEnum> getF8() { return f8; }
+ public void setF8(Set<BEnum> v) { f8 = v; }
+
+ public Map<BEnum,BEnum> f9 = new LinkedHashMap<>();
+
+ public B init() {
+ f1 = BEnum.FOO;
+ f2 = BEnum.BAR;
+ f3 = new BEnum[]{BEnum.FOO,null};
+ f4 = new BEnum[][]{{BEnum.FOO,null},null};
+ f5 = alist(BEnum.FOO);
+ f6 = alist(BEnum.FOO);
+ f7 = set(BEnum.FOO);
+ f8 = set(BEnum.FOO);
+
+ return this;
+ }
+ }
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMaps_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMaps_Test.java
index d307b707e..c944e2aab 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMaps_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMaps_Test.java
@@ -914,7 +914,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
// property because it doesn't match the getter return
type above.
throw new IllegalCallerException("Should not be
called!");
}
- public void setA(String v) { this.a = KEnum.valueOf(v); }
+ public void setA(String v) { a = KEnum.valueOf(v); }
public KEnum getB() { return b; }
public void setB(String v) { throw new
IllegalCallerException("Should not be called!"); }
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeans_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeans_Test.java
index 33d9a609d..880dcbf69 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeans_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeans_Test.java
@@ -652,7 +652,7 @@ class RoundTripTransformBeans_Test extends SimpleTestBase {
public static class F2c extends F2ac {
public void setC(Calendar v) {
- this.c = v;
+ c = v;
}
public Calendar getC() {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/html/Common_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/html/Common_Test.java
index 4acfe57e8..4c600c196 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/html/Common_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/html/Common_Test.java
@@ -409,7 +409,7 @@ class Common_Test extends SimpleTestBase {
}
public void setF1(String v) {
- this.f1 = v;
+ f1 = v;
}
public int getF2() {
@@ -417,7 +417,7 @@ class Common_Test extends SimpleTestBase {
}
public void setF2(int v) {
- this.f2 = v;
+ f2 = v;
}
public boolean isF3() {
@@ -425,7 +425,7 @@ class Common_Test extends SimpleTestBase {
}
public void setF3(boolean v) {
- this.f3 = v;
+ f3 = v;
}
@Override /* Object */
diff --git a/juneau-utest/src/test/java/org/apache/juneau/json/CommonTest.java
b/juneau-utest/src/test/java/org/apache/juneau/json/CommonTest.java
index 487cbbb8d..cafc23f44 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/json/CommonTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/json/CommonTest.java
@@ -287,7 +287,7 @@ class CommonTest extends SimpleTestBase{
}
public void setF1(String v) {
- this.f1 = v;
+ f1 = v;
}
public int getF2() {
@@ -295,7 +295,7 @@ class CommonTest extends SimpleTestBase{
}
public void setF2(int v) {
- this.f2 = v;
+ f2 = v;
}
public boolean isF3() {
@@ -303,7 +303,7 @@ class CommonTest extends SimpleTestBase{
}
public void setF3(boolean v) {
- this.f3 = v;
+ f3 = v;
}
@Override /* Object */
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 5d4a8dff3..310c950a1 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
@@ -79,7 +79,7 @@ class ObjectMerger_Test extends SimpleTestBase {
@Override
public void setA(String v) {
- this.a = v;
+ a = v;
}
}
}
\ No newline at end of file
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 cb57879cf..04101a399 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
@@ -149,7 +149,7 @@ class RestClient_Config_BeanContext_Test extends
SimpleTestBase {
}
@Override
public void setF3(int v) {
- this.f3 = v;
+ f3 = v;
}
static A4b get() {
A4b x = new A4b();
@@ -233,7 +233,7 @@ class RestClient_Config_BeanContext_Test extends
SimpleTestBase {
return f1;
}
public void setF1(int v) {
- this.f1 = v;
+ f1 = v;
}
protected int getF2() {
return f2;
@@ -326,7 +326,7 @@ class RestClient_Config_BeanContext_Test extends
SimpleTestBase {
return f1;
}
public void setF1(int v) {
- this.f1 = v;
+ f1 = v;
}
public int getF2() {
return f2;
@@ -644,7 +644,7 @@ class RestClient_Config_BeanContext_Test extends
SimpleTestBase {
return foo;
}
public void setFoo(String v) {
- this.foo = v;
+ foo = v;
}
public String getBar() {
throw new RuntimeException("xxx");
@@ -669,7 +669,7 @@ class RestClient_Config_BeanContext_Test extends
SimpleTestBase {
return foo;
}
public void setFoo(String v) {
- this.foo = v;
+ foo = v;
}
public String getBar() {
return bar;
@@ -714,7 +714,7 @@ class RestClient_Config_BeanContext_Test extends
SimpleTestBase {
}
@Override
public void setFoo(int v) {
- this.foo = v;
+ foo = v;
}
}
@@ -738,9 +738,9 @@ class RestClient_Config_BeanContext_Test extends
SimpleTestBase {
@Override
public int getFoo() { return foo; }
@Override
- public void setFoo(int v) { this.foo = v; }
+ public void setFoo(int v) { foo = v; }
public int getBar() { return bar; } // Not executed
- public void setBar(int v) { this.bar = v; } // Not executed
+ public void setBar(int v) { bar = v; } // Not executed
static A25b get() {
A25b x = new A25b();
@@ -807,7 +807,7 @@ class RestClient_Config_BeanContext_Test extends
SimpleTestBase {
public static class A30a {
private String foo;
public String getFoo() { return foo; }
- public void setFoo(String v) { this.foo = v; }
+ public void setFoo(String v) { foo = v; }
static A30a get() {
A30a x = new A30a();
x.foo = "foo";
@@ -839,7 +839,7 @@ class RestClient_Config_BeanContext_Test extends
SimpleTestBase {
public static class A31 {
private String fooBar;
public String getFooBar() { return fooBar; }
- public void setFooBar(String v) { this.fooBar = v; }
+ public void setFooBar(String v) { fooBar = v; }
static A31 get() {
A31 x = new A31();
x.fooBar = "fooBar";
@@ -981,7 +981,7 @@ class RestClient_Config_BeanContext_Test extends
SimpleTestBase {
return foo;
}
public void setFoo(int v) {
- this.foo = v;
+ foo = v;
}
static A39 get() {
A39 x = new A39();
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/testutils/pojos/XBeans.java
b/juneau-utest/src/test/java/org/apache/juneau/testutils/pojos/XBeans.java
index 86c3adece..44eb6c000 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/testutils/pojos/XBeans.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/testutils/pojos/XBeans.java
@@ -74,16 +74,16 @@ public class XBeans {
public XA[][] getF19() { return f19; }
public List<List<XA>> getF20() { return f20; }
- public void setF11(String[] v) { this.f11 = v; }
- public void setF12(List<String> v) { this.f12 = v; }
- public void setF13(int[] v) { this.f13 = v; }
- public void setF14(List<Integer> v) { this.f14 = v; }
- public void setF15(String[][] v) { this.f15 = v; }
- public void setF16(List<String[]> v) { this.f16 = v; }
- public void setF17(XA[] v) { this.f17 = v; }
- public void setF18(List<XA> v) { this.f18 = v; }
- public void setF19(XA[][] v) { this.f19 = v; }
- public void setF20(List<List<XA>> v) { this.f20 = v; }
+ public void setF11(String[] v) { f11 = v; }
+ public void setF12(List<String> v) { f12 = v; }
+ public void setF13(int[] v) { f13 = v; }
+ public void setF14(List<Integer> v) { f14 = v; }
+ public void setF15(String[][] v) { f15 = v; }
+ public void setF16(List<String[]> v) { f16 = v; }
+ public void setF17(XA[] v) { f17 = v; }
+ public void setF18(List<XA> v) { f18 = v; }
+ public void setF19(XA[][] v) { f19 = v; }
+ public void setF20(List<List<XA>> v) { f20 = v; }
public static XB get() {
var t = new XB();
@@ -196,16 +196,16 @@ public class XBeans {
public XD[][] getF19() { return f19; }
public List<List<XD>> getF20() { return f20; }
- public void setF11(String[] v) { this.f11 = v; }
- public void setF12(List<String> v) { this.f12 = v; }
- public void setF13(int[] v) { this.f13 = v; }
- public void setF14(List<Integer> v) { this.f14 = v; }
- public void setF15(String[][] v) { this.f15 = v; }
- public void setF16(List<String[]> v) { this.f16 = v; }
- public void setF17(XD[] v) { this.f17 = v; }
- public void setF18(List<XD> v) { this.f18 = v; }
- public void setF19(XD[][] v) { this.f19 = v; }
- public void setF20(List<List<XD>> v) { this.f20 = v; }
+ public void setF11(String[] v) { f11 = v; }
+ public void setF12(List<String> v) { f12 = v; }
+ public void setF13(int[] v) { f13 = v; }
+ public void setF14(List<Integer> v) { f14 = v; }
+ public void setF15(String[][] v) { f15 = v; }
+ public void setF16(List<String[]> v) { f16 = v; }
+ public void setF17(XD[] v) { f17 = v; }
+ public void setF18(List<XD> v) { f18 = v; }
+ public void setF19(XD[][] v) { f19 = v; }
+ public void setF20(List<List<XD>> v) { f20 = v; }
public static XE get() {
var t = new XE();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/DTOs.java
b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/DTOs.java
index f28c95471..38f2e03c7 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/DTOs.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/DTOs.java
@@ -72,16 +72,16 @@ public class DTOs {
public A[][] getF19() { return f19; }
public List<List<A>> getF20() { return f20; }
- public void setF11(String[] v) { this.f11 = v; }
- public void setF12(List<String> v) { this.f12 = v; }
- public void setF13(int[] v) { this.f13 = v; }
- public void setF14(List<Integer> v) { this.f14 = v; }
- public void setF15(String[][] v) { this.f15 = v; }
- public void setF16(List<String[]> v) { this.f16 = v; }
- public void setF17(A[] v) { this.f17 = v; }
- public void setF18(List<A> v) { this.f18 = v; }
- public void setF19(A[][] v) { this.f19 = v; }
- public void setF20(List<List<A>> v) { this.f20 = v; }
+ public void setF11(String[] v) { f11 = v; }
+ public void setF12(List<String> v) { f12 = v; }
+ public void setF13(int[] v) { f13 = v; }
+ public void setF14(List<Integer> v) { f14 = v; }
+ public void setF15(String[][] v) { f15 = v; }
+ public void setF16(List<String[]> v) { f16 = v; }
+ public void setF17(A[] v) { f17 = v; }
+ public void setF18(List<A> v) { f18 = v; }
+ public void setF19(A[][] v) { f19 = v; }
+ public void setF20(List<List<A>> v) { f20 = v; }
static B create() {
B t = new B();
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/DTOs2.java
b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/DTOs2.java
index dfd70e1fa..4dbac30aa 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/DTOs2.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/DTOs2.java
@@ -78,16 +78,16 @@ public class DTOs2 {
public A[][] getF19() { return f19; }
public List<List<A>> getF20() { return f20; }
- public void setF11(String[] v) { this.f11 = v; }
- public void setF12(List<String> v) { this.f12 = v; }
- public void setF13(int[] v) { this.f13 = v; }
- public void setF14(List<Integer> v) { this.f14 = v; }
- public void setF15(String[][] v) { this.f15 = v; }
- public void setF16(List<String[]> v) { this.f16 = v; }
- public void setF17(A[] v) { this.f17 = v; }
- public void setF18(List<A> v) { this.f18 = v; }
- public void setF19(A[][] v) { this.f19 = v; }
- public void setF20(List<List<A>> v) { this.f20 = v; }
+ public void setF11(String[] v) { f11 = v; }
+ public void setF12(List<String> v) { f12 = v; }
+ public void setF13(int[] v) { f13 = v; }
+ public void setF14(List<Integer> v) { f14 = v; }
+ public void setF15(String[][] v) { f15 = v; }
+ public void setF16(List<String[]> v) { f16 = v; }
+ public void setF17(A[] v) { f17 = v; }
+ public void setF18(List<A> v) { f18 = v; }
+ public void setF19(A[][] v) { f19 = v; }
+ public void setF20(List<List<A>> v) { f20 = v; }
static B create() {
B t = new B();
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/xml/BasicXml_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/xml/BasicXml_Test.java
index 30118977d..958eae161 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/BasicXml_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/BasicXml_Test.java
@@ -1718,7 +1718,7 @@ class BasicXml_Test extends SimpleTestBase {
private String a;
@Override public String getA() { return a; }
- @Override public void setA(String v) { this.a = v; }
+ @Override public void setA(String v) { a = v; }
A init() {
this.a = "foo";
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlCollapsedTest.java
b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlCollapsedTest.java
index c2feec5af..f79ac8445 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlCollapsedTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlCollapsedTest.java
@@ -193,7 +193,7 @@ class XmlCollapsedTest extends SimpleTestBase {
return f2;
}
public void setF2(String[] v) {
- this.f2 = v;
+ f2 = v;
}
@Xml(format=COLLAPSED,childName="xf3")
@@ -206,7 +206,7 @@ class XmlCollapsedTest extends SimpleTestBase {
return f4;
}
public void setF4(String[] v) {
- this.f4 = v;
+ f4 = v;
}
}
@@ -242,7 +242,7 @@ class XmlCollapsedTest extends SimpleTestBase {
return f1;
}
public void setF1(ArrayList<String> v) {
- this.f1 = v;
+ f1 = v;
}
@Xml(format=COLLAPSED,childName="xf2")
@@ -250,7 +250,7 @@ class XmlCollapsedTest extends SimpleTestBase {
return f2;
}
public void setF2(ArrayList<String> v) {
- this.f2 = v;
+ f2 = v;
}
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlIgnoreComments_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlIgnoreComments_Test.java
index cb7ad3819..5be83abae 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlIgnoreComments_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlIgnoreComments_Test.java
@@ -1187,7 +1187,7 @@ class XmlIgnoreComments_Test extends SimpleTestBase {
@Override
public void setA(String v) {
- this.a = v;
+ a = v;
}
A init() {
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 4a3dede40..f7c50cb90 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
@@ -171,7 +171,7 @@ class XmlTest extends SimpleTestBase {
return name;
}
public void setName(String v) {
- this.name = v;
+ name = v;
}
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/xml/xml1a/T1.java
b/juneau-utest/src/test/java/org/apache/juneau/xml/xml1a/T1.java
index 3d1603dcc..64ec61f78 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/xml1a/T1.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/xml1a/T1.java
@@ -25,11 +25,11 @@ public class T1 {
private int f3 = 3;
public int getF3() { return f3;}
- public void setF3(int v) { this.f3 = v;}
+ public void setF3(int v) { f3 = v;}
private int f4 = 4;
@Xml(prefix="baz",namespace="http://baz";) public int getF4() { return
f4; }
- public void setF4(int v) { this.f4 = v;}
+ public void setF4(int v) { f4 = v;}
public boolean equals(T1 x) {
return x.f1 == f1 && x.f2 == f2 && x.f3 == f3 && x.f4 == f4;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/xml/xml1a/T2.java
b/juneau-utest/src/test/java/org/apache/juneau/xml/xml1a/T2.java
index d1c73866f..6206f0324 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/xml1a/T2.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/xml1a/T2.java
@@ -25,11 +25,11 @@ public class T2 {
private int f3 = 3;
public int getF3() { return f3;}
- public void setF3(int v) { this.f3 = v;}
+ public void setF3(int v) { f3 = v;}
private int f4 = 4;
@Xml(prefix="baz",namespace="http://baz";) public int getF4() { return
f4; }
- public void setF4(int v) { this.f4 = v;}
+ public void setF4(int v) { f4 = v;}
public boolean equals(T2 x) {
return x.f1 == f1 && x.f2 == f2 && x.f3 == f3 && x.f4 == f4;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/xml/xml1b/T3.java
b/juneau-utest/src/test/java/org/apache/juneau/xml/xml1b/T3.java
index 8c5f1ad2f..330e60919 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/xml1b/T3.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/xml1b/T3.java
@@ -24,11 +24,11 @@ public class T3 {
private int f3 = 3;
public int getF3() { return f3; }
- public void setF3(int v) { this.f3 = v; }
+ public void setF3(int v) { f3 = v; }
private int f4 = 4;
@Xml(prefix="baz",namespace="http://baz";) public int getF4() { return
f4; }
- public void setF4(int v) { this.f4 = v; }
+ public void setF4(int v) { f4 = v; }
public boolean equals(T3 x) {
return x.f1 == f1 && x.f2 == f2 && x.f3 == f3 && x.f4 == f4;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/xml/xml1b/T4.java
b/juneau-utest/src/test/java/org/apache/juneau/xml/xml1b/T4.java
index c7344b1c9..e4d13d26b 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/xml1b/T4.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/xml1b/T4.java
@@ -24,11 +24,11 @@ public class T4 {
private int f3 = 3;
public int getF3() { return f3; }
- public void setF3(int v) { this.f3 = v; }
+ public void setF3(int v) { f3 = v; }
private int f4 = 4;
@Xml(prefix="baz",namespace="http://baz";) public int getF4() { return
f4;}
- public void setF4(int v) { this.f4 = v; }
+ public void setF4(int v) { f4 = v; }
public boolean equals(T4 x) {
return x.f1 == f1 && x.f2 == f2 && x.f3 == f3 && x.f4 == f4;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/xml/xml1b/T5.java
b/juneau-utest/src/test/java/org/apache/juneau/xml/xml1b/T5.java
index 78c58aded..1d2afb497 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/xml1b/T5.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/xml1b/T5.java
@@ -25,11 +25,11 @@ public class T5 {
private int f3 = 3;
public int getF3() { return f3; }
- public void setF3(int v) { this.f3 = v; }
+ public void setF3(int v) { f3 = v; }
private int f4 = 4;
@Xml(prefix="baz",namespace="http://baz";) public int getF4() { return
f4; }
- public void setF4(int v) { this.f4 = v; }
+ public void setF4(int v) { f4 = v; }
public boolean equals(T5 x) {
return x.f1 == f1 && x.f2 == f2 && x.f3 == f3 && x.f4 == f4;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/xml/xml1b/T6.java
b/juneau-utest/src/test/java/org/apache/juneau/xml/xml1b/T6.java
index 42ae90790..52ea5a575 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/xml1b/T6.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/xml1b/T6.java
@@ -25,11 +25,11 @@ public class T6 {
private int f3 = 3;
public int getF3() { return f3; }
- public void setF3(int v) { this.f3 = v; }
+ public void setF3(int v) { f3 = v; }
private int f4 = 4;
@Xml(prefix="baz",namespace="http://baz";) public int getF4() { return
f4; }
- public void setF4(int v) { this.f4 = v; }
+ public void setF4(int v) { f4 = v; }
public boolean equals(T6 x) {
return x.f1 == f1 && x.f2 == f2 && x.f3 == f3 && x.f4 == f4;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/xml/xml1b/T7.java
b/juneau-utest/src/test/java/org/apache/juneau/xml/xml1b/T7.java
index bd942c554..8b95bdce0 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/xml1b/T7.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/xml1b/T7.java
@@ -24,11 +24,11 @@ public class T7 {
private int f3 = 3;
@Beanp(name="g3") public int getF3() { return f3; }
- @Beanp(name="g3") public void setF3(int v) { this.f3 = v; }
+ @Beanp(name="g3") public void setF3(int v) { f3 = v; }
private int f4 = 4;
@Beanp(name="g4") @Xml(prefix="baz",namespace="http://baz";) public int
getF4() { return f4; }
- @Beanp(name="g4") public void setF4(int v) { this.f4 = v; }
+ @Beanp(name="g4") public void setF4(int v) { f4 = v; }
public boolean equals(T7 x) {
return x.f1 == f1 && x.f2 == f2 && x.f3 == f3 && x.f4 == f4;
