JUNEAU-127 Clean up usage of PojoSwaps in ClassMeta
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanMapTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanMapTest.java
index 709b260..3b5c789 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanMapTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanMapTest.java
@@ -21,7 +21,6 @@
import org.apache.juneau.html.*;
import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
-import org.apache.juneau.transforms.*;
import org.apache.juneau.uon.*;
import org.apache.juneau.urlencoding.*;
import org.apache.juneau.utils.*;
@@ -35,7 +34,6 @@
BeanContext bc = BeanContext.create()
.beanDictionary(MyBeanDictionaryMap.class)
- .pojoSwaps(TemporalCalendarSwap.IsoInstant.class)
.build();
BeanSession session = bc.createSession();
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/DataConversionTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/DataConversionTest.java
index 253ff9e..97760e3 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/DataConversionTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/DataConversionTest.java
@@ -17,7 +17,6 @@
import java.util.*;
import org.apache.juneau.testutils.*;
-import org.apache.juneau.transforms.*;
import org.junit.*;
@SuppressWarnings({"unchecked","rawtypes"})
@@ -145,7 +144,7 @@
@Test
public void testObjectSwaps() throws Exception {
String s = "2001-12-21T12:34:56Z";
- BeanSession session = BeanContext.create().pojoSwaps(TemporalCalendarSwap.IsoInstant.class).build().createSession();
+ BeanSession session = BeanContext.create().build().createSession();
Calendar c = session.convertToType(s, GregorianCalendar.class);
assertEquals(2001, c.get(Calendar.YEAR));
c = session.convertToType(s, Calendar.class);
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
index cbf1007..6f40311 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
@@ -26,7 +26,6 @@
import org.apache.juneau.parser.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.transform.*;
-import org.apache.juneau.transforms.*;
import org.apache.juneau.utils.*;
import org.junit.*;
@@ -216,14 +215,14 @@
//====================================================================================================
@Test
public void testSubTypesUsingAnnotation() throws Exception {
- JsonSerializer js = JsonSerializer.create().ssq().pojoSwaps(XMLGregorianCalendarSwap.class).addBeanTypes().addRootType().build();
+ JsonSerializer js = JsonSerializer.create().ssq().addBeanTypes().addRootType().build();
// Skip validation-only tests
if (isValidationOnly())
return;
- Serializer s = getSerializer().builder().pojoSwaps(XMLGregorianCalendarSwap.class).build();
- Parser p = getParser().builder().pojoSwaps(XMLGregorianCalendarSwap.class).build();
+ Serializer s = getSerializer();
+ Parser p = getParser();
B1 b1 = B1.create();
Object r = s.serialize(b1);
@@ -289,14 +288,14 @@
//====================================================================================================
@Test
public void testSubTypesUsingBeanFilter() throws Exception {
- JsonSerializer js = JsonSerializer.create().ssq().pojoSwaps(XMLGregorianCalendarSwap.class).build();
+ JsonSerializer js = JsonSerializer.create().ssq().build();
// Skip validation-only tests
if (isValidationOnly())
return;
- Serializer s = getSerializer().builder().beanFilters(CFilter.class).pojoSwaps(XMLGregorianCalendarSwap.class).build();
- Parser p = getParser().builder().beanFilters(CFilter.class).pojoSwaps(XMLGregorianCalendarSwap.class).build();
+ Serializer s = getSerializer().builder().beanFilters(CFilter.class).build();
+ Parser p = getParser().builder().beanFilters(CFilter.class).build();
C1 c1 = C1.create();
Object r = s.serialize(c1);
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
index 90ad05c..8347ec4 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
@@ -253,8 +253,8 @@
GregorianCalendar gc = new GregorianCalendar();
XMLGregorianCalendar c = DatatypeFactory.newInstance().newXMLGregorianCalendar(gc);
- Serializer s = getSerializer().builder().pojoSwaps(XMLGregorianCalendarSwap.class).build();
- Parser p = getParser().builder().pojoSwaps(XMLGregorianCalendarSwap.class).build();
+ Serializer s = getSerializer();
+ Parser p = getParser();
Object r = s.serialize(c);
XMLGregorianCalendar c2 = p.parse(r, XMLGregorianCalendar.class);
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfParserTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfParserTest.java
index 1d12127..bc23d8d 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfParserTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfParserTest.java
@@ -17,15 +17,14 @@
import static org.junit.Assert.*;
import java.net.URI;
-import java.text.*;
+import java.time.*;
+import java.time.format.*;
import java.util.*;
import org.apache.juneau.*;
-import org.apache.juneau.annotation.*;
import org.apache.juneau.jena.annotation.*;
import org.apache.juneau.json.*;
import org.apache.juneau.testutils.*;
-import org.apache.juneau.transforms.*;
import org.junit.*;
public class RdfParserTest {
@@ -116,7 +115,7 @@
public String f2;
@Rdf(beanUri=true) public URI f3;
public URI f4a, f4b;
- @Swap(TemporalCalendarSwap.IsoInstant.class) public Calendar f5;
+ public Calendar f5;
public LinkedList<A1> f6 = new LinkedList<>();
public A init() throws Exception {
@@ -125,10 +124,7 @@
f3 = new URI("http://test/a"); // Bean URI.
f4a = new URI("http://test/a"); // Points to itself.
f4b = new URI("http://test/external");
- f5 = new GregorianCalendar();
- DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM);
- df.setTimeZone(TimeZone.getTimeZone("GMT"));
- f5.setTime(df.parse("Jan 1, 1999"));
+ f5 = GregorianCalendar.from(ZonedDateTime.from(DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse("1999-01-01T00:00:00Z")));
f6 = new LinkedList<>();
f6.add(new A1().init());
return this;
@@ -141,7 +137,7 @@
public String f2;
@Rdf(beanUri=true) public URI f3;
public URI f4a, f4b;
- @Swap(TemporalCalendarSwap.IsoInstant.class) public Calendar f5;
+ public Calendar f5;
public A1 init() throws Exception {
f1 = 1;
@@ -149,10 +145,7 @@
f3 = new URI("http://test/a/a1");
f4a = new URI("http://test/a");
f4b = new URI("http://test/external");
- f5 = new GregorianCalendar();
- DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM);
- df.setTimeZone(TimeZone.getTimeZone("GMT"));
- f5.setTime(df.parse("Jan 1, 1999"));
+ f5 = GregorianCalendar.from(ZonedDateTime.from(DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse("1999-01-01T00:00:00Z")));
return this;
}
}
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java
index dd0b6b8..2a8ee28 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java
@@ -24,9 +24,6 @@
import org.junit.runner.*;
import org.junit.runners.*;
-/**
- * Exhaustive serialization tests for the CalendarSwap class.
- */
@RunWith(Parameterized.class)
@SuppressWarnings({})
public class BeanDictionaryComboTest extends ComboRoundTripTest {
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BuilderComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BuilderComboTest.java
index 6651e7f..c63027b 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BuilderComboTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BuilderComboTest.java
@@ -24,9 +24,6 @@
import org.junit.runner.*;
import org.junit.runners.*;
-/**
- * Exhaustive serialization tests for the CalendarSwap class.
- */
@RunWith(Parameterized.class)
@SuppressWarnings({})
public class BuilderComboTest extends ComboRoundTripTest {
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapComboTest.java
index 200fd9a..1320518 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapComboTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapComboTest.java
@@ -23,9 +23,6 @@
import org.junit.runner.*;
import org.junit.runners.*;
-/**
- * Exhaustive serialization tests for the CalendarSwap class.
- */
@RunWith(Parameterized.class)
@SuppressWarnings({})
public class ByteArrayBase64SwapComboTest extends ComboRoundTripTest {
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java
index 7d33e6a..ea2bf3b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java
@@ -18,7 +18,6 @@
import java.util.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.transforms.*;
import org.apache.juneau.xml.annotation.*;
/**
@@ -261,7 +260,6 @@
*
* @return The update timestamp of this object.
*/
- @Swap(TemporalCalendarSwap.IsoInstant.class)
public Calendar getUpdated() {
return updated;
}
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Entry.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Entry.java
index b452da3..1e4c3ae 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Entry.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Entry.java
@@ -17,7 +17,6 @@
import java.util.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.transforms.*;
/**
* Represents an <c>atomEntry</c> construct in the RFC4287 specification.
@@ -113,7 +112,6 @@
*
* @return The publish timestamp of this entry.
*/
- @Swap(TemporalCalendarSwap.IsoInstant.class)
public Calendar getPublished() {
return published;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanProperty.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanProperty.java
index 42cf6b6..2a29c26 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanProperty.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanProperty.java
@@ -131,7 +131,7 @@
* <jc>// A swapped value.</jc>
* <jk>public class</jk> BeanWithDynaFieldWithSwappedValues {
*
- * <ja>@BeanProperty</ja>(name=<js>"*"</js>, swap=CalendarSwap.<jsf>ISO8601DTZ</jsf>.<jk>class</jk>)
+ * <ja>@BeanProperty</ja>(name=<js>"*"</js>, swap=TemporalCalendarSwap.IsoLocalDateTime.<jk>class</jk>)
* <jk>public</jk> Map<String,Calendar> getMyExtraStuff() {
* ...
* }
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java
index ce34318..5ed717d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java
@@ -60,7 +60,7 @@
*
* <jc>// Change settings on parsers simultaneously</jc>
* b.set(BeanContext.<jsf>BEAN_beansRequireSerializable</jsf>, <jk>true</jk>)
- * .pojoSwaps(CalendarSwap.ISO8601DT.<jk>class</jk>);
+ * .pojoSwaps(TemporalCalendarSwap.IsoLocalDateTime.<jk>class</jk>);
*
* ParserGroup g = b.build();
*
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroup.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroup.java
index 24a596a..6f4721e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroup.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroup.java
@@ -53,7 +53,7 @@
* <jc>// Construct a new serializer group</jc>
* SerializerGroup g = SerializerGroup.<jsm>create</jsm>();
* .append(JsonSerializer.<jk>class</jk>, XmlSerializer.<jk>class</jk>); <jc>// Add some serializers to it</jc>
- * .ws().pojoSwaps(CalendarSwap.ISO8601DT.<jk>class</jk>) <jc>// Change settings for all serializers in the group.</jc>
+ * .ws().pojoSwaps(TemporalCalendarSwap.IsoLocalDateTime.<jk>class</jk>) <jc>// Change settings for all serializers in the group.</jc>
* .build();
*
* <jc>// Find the appropriate serializer by Accept type</jc>
diff --git a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
index 233c49c..f86c2dc 100755
--- a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
+++ b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
@@ -30,7 +30,6 @@
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.exception.*;
import org.apache.juneau.rest.helper.*;
-import org.apache.juneau.transforms.*;
import org.apache.juneau.utils.*;
/**
diff --git a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
index 2ba4917..ca5e545 100755
--- a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
+++ b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
@@ -32,7 +32,6 @@
import org.apache.juneau.rest.converters.*;
import org.apache.juneau.rest.exception.*;
import org.apache.juneau.rest.helper.*;
-import org.apache.juneau.transforms.*;
/**
* REST resource for viewing and accessing log files.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
index a5f5eb1..f3f9687 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
@@ -68,7 +68,7 @@
* <jc>// Option #1 - Pass in through constructor.</jc>
* <jk>public</jk> MyResource(RestContextBuilder builder) {
* builder
- * .pojoSwaps(CalendarSwap.<jsf>RFC2822DTZ</jsf>.<jk>class</jk>)
+ * .pojoSwaps(TemporalCalendarSwap.IsoLocalDateTime.<jk>class</jk>)
* .set(<jsf>PARSER_debug</jsf>, <jk>true</jk>);
* }
*
@@ -76,7 +76,7 @@
* <ja>@RestHook</ja>(<jsf>INIT</jsf>)
* <jk>public void</jk> init(RestContextBuilder builder) <jk>throws</jk> Exception {
* builder
- * .pojoSwaps(CalendarSwap.<jsf>RFC2822DTZ</jsf>.<jk>class</jk>)
+ * .pojoSwaps(TemporalCalendarSwap.IsoLocalDateTime.<jk>class</jk>)
* .set(<jsf>PARSER_debug</jsf>, <jk>true</jk>);
* }
* </p>
