http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/jena/RdfTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/jena/RdfTest.java b/juneau-core-test/src/test/java/org/apache/juneau/jena/RdfTest.java index d84ca86..678520f 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/jena/RdfTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/jena/RdfTest.java @@ -14,7 +14,6 @@ package org.apache.juneau.jena; import static org.apache.juneau.TestUtils.*; import static org.apache.juneau.jena.RdfCommonContext.*; -import static org.apache.juneau.jena.RdfSerializerContext.*; import java.net.URI; import java.util.*; @@ -35,8 +34,8 @@ public class RdfTest { RdfSerializer s = new RdfSerializer.XmlAbbrev() .setProperty(RDF_rdfxml_tab, 3) - .setProperty(SERIALIZER_quoteChar, '\'') - .setProperty(RDF_addRootProperty, true); + .setQuoteChar('\'') + .setAddRootProperty(true); RdfParser p = RdfParser.DEFAULT_XML.clone(); //-------------------------------------------------------------------------------- @@ -69,7 +68,7 @@ public class RdfTest { //-------------------------------------------------------------------------------- // Explicit sequence //-------------------------------------------------------------------------------- - s.setProperty(RDF_collectionFormat, RdfCollectionFormat.SEQ); + s.setCollectionFormat(RdfCollectionFormat.SEQ); expected = "<rdf:RDF a='http://ns/' j='http://www.apache.org/juneau/' jp='http://www.apache.org/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "\n <rdf:Description about='http://test/a'>" @@ -97,7 +96,7 @@ public class RdfTest { //-------------------------------------------------------------------------------- // Bag //-------------------------------------------------------------------------------- - s.setProperty(RDF_collectionFormat, RdfCollectionFormat.BAG); + s.setCollectionFormat(RdfCollectionFormat.BAG); expected = "<rdf:RDF a='http://ns/' j='http://www.apache.org/juneau/' jp='http://www.apache.org/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "\n <rdf:Description about='http://test/a'>" @@ -125,7 +124,7 @@ public class RdfTest { //-------------------------------------------------------------------------------- // List //-------------------------------------------------------------------------------- - s.setProperty(RDF_collectionFormat, RdfCollectionFormat.LIST); + s.setCollectionFormat(RdfCollectionFormat.LIST); expected = "<rdf:RDF a='http://ns/' j='http://www.apache.org/juneau/' jp='http://www.apache.org/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "\n <rdf:Description about='http://test/a'>" @@ -155,7 +154,7 @@ public class RdfTest { //-------------------------------------------------------------------------------- // Multi-properties //-------------------------------------------------------------------------------- - s.setProperty(RDF_collectionFormat, RdfCollectionFormat.MULTI_VALUED); + s.setCollectionFormat(RdfCollectionFormat.MULTI_VALUED); expected = "<rdf:RDF a='http://ns/' j='http://www.apache.org/juneau/' jp='http://www.apache.org/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "\n <rdf:Description about='http://test/a'>" @@ -170,7 +169,7 @@ public class RdfTest { assertXmlEquals(expected, rdfXml); // Note - Must specify collection format on parser for it to be able to understand this layout. - p.setProperty(RDF_collectionFormat, RdfCollectionFormat.MULTI_VALUED); + p.setCollectionFormat(RdfCollectionFormat.MULTI_VALUED); a2 = p.parse(rdfXml, A.class); assertEqualObjects(a, a2); } @@ -195,8 +194,8 @@ public class RdfTest { String rdfXml, expected; RdfSerializer s = new RdfSerializer.XmlAbbrev() .setProperty(RDF_rdfxml_tab, 3) - .setProperty(SERIALIZER_quoteChar, '\'') - .setProperty(RDF_addRootProperty, true); + .setQuoteChar('\'') + .setAddRootProperty(true); RdfParser p = RdfParser.DEFAULT_XML.clone(); //-------------------------------------------------------------------------------- @@ -272,7 +271,7 @@ public class RdfTest { //-------------------------------------------------------------------------------- // Default is Bag - Should only affect DEFAULT properties. //-------------------------------------------------------------------------------- - s.setProperty(RDF_collectionFormat, RdfCollectionFormat.BAG); + s.setCollectionFormat(RdfCollectionFormat.BAG); expected = "<rdf:RDF b='http://ns/' j='http://www.apache.org/juneau/' jp='http://www.apache.org/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "\n <rdf:Description about='http://test/b'>" @@ -428,14 +427,14 @@ public class RdfTest { String rdfXml, expected; RdfSerializer s = new RdfSerializer.XmlAbbrev() .setProperty(RDF_rdfxml_tab, 3) - .setProperty(SERIALIZER_quoteChar, '\'') - .setProperty(RDF_addRootProperty, true); + .setQuoteChar('\'') + .setAddRootProperty(true); RdfParser p = RdfParser.DEFAULT_XML.clone(); //-------------------------------------------------------------------------------- // Default on class is Bag - Should only affect DEFAULT properties. //-------------------------------------------------------------------------------- - s.setProperty(RDF_collectionFormat, RdfCollectionFormat.BAG); + s.setCollectionFormat(RdfCollectionFormat.BAG); expected = "<rdf:RDF b='http://ns/' j='http://www.apache.org/juneau/' jp='http://www.apache.org/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "\n <rdf:Description about='http://test/b'>" @@ -525,8 +524,8 @@ public class RdfTest { @Test public void testLooseCollectionsOfBeans() throws Exception { - WriterSerializer s = new RdfSerializer.XmlAbbrev().setProperty(RDF_looseCollections, true); - ReaderParser p = new RdfParser.Xml().setProperty(RDF_looseCollections, true); + WriterSerializer s = new RdfSerializer.XmlAbbrev().setLooseCollections(true); + ReaderParser p = new RdfParser.Xml().setLooseCollections(true); String rdfXml, expected; List<D> l = new LinkedList<D>();
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/json/CommonParserTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/json/CommonParserTest.java b/juneau-core-test/src/test/java/org/apache/juneau/json/CommonParserTest.java index f621811..04d067d 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/json/CommonParserTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/json/CommonParserTest.java @@ -12,8 +12,6 @@ // *************************************************************************************************************************** package org.apache.juneau.json; -import static org.apache.juneau.BeanContext.*; -import static org.apache.juneau.serializer.SerializerContext.*; import static org.junit.Assert.*; import java.util.*; @@ -31,7 +29,7 @@ public class CommonParserTest { //==================================================================================================== @Test public void testFromSerializer() throws Exception { - ReaderParser p = JsonParser.DEFAULT.clone().setClassLoader(getClass().getClassLoader()).addToDictionary(A1.class); + ReaderParser p = JsonParser.DEFAULT.clone().addToBeanDictionary(A1.class); Map m = null; m = (Map)p.parse("{a:1}", Object.class); @@ -85,7 +83,7 @@ public class CommonParserTest { tl.add(new A3("name0","value0")); tl.add(new A3("name1","value1")); b.list = tl; - String json = new JsonSerializer().setProperty(SERIALIZER_addBeanTypeProperties, true).addToDictionary(A1.class).serialize(b); + String json = new JsonSerializer().setAddBeanTypeProperties(true).addToBeanDictionary(A1.class).serialize(b); b = (A1)p.parse(json, Object.class); assertEquals("value1", b.list.get(1).value); @@ -116,7 +114,7 @@ public class CommonParserTest { //==================================================================================================== @Test public void testCorrectHandlingOfUnknownProperties() throws Exception { - ReaderParser p = new JsonParser().setProperty(BEAN_ignoreUnknownBeanProperties, true); + ReaderParser p = new JsonParser().setIgnoreUnknownBeanProperties(true); B b; String in = "{a:1,unknown:3,b:2}"; @@ -164,7 +162,7 @@ public class CommonParserTest { @Test public void testParserListeners() throws Exception { final List<String> events = new LinkedList<String>(); - JsonParser p = new JsonParser().setProperty(BEAN_ignoreUnknownBeanProperties, true); + JsonParser p = new JsonParser().setIgnoreUnknownBeanProperties(true); p.addListener( new ParserListener() { @Override /* ParserListener */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/json/CommonTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/json/CommonTest.java b/juneau-core-test/src/test/java/org/apache/juneau/json/CommonTest.java index c443e31..460ec61 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/json/CommonTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/json/CommonTest.java @@ -12,9 +12,7 @@ // *************************************************************************************************************************** package org.apache.juneau.json; -import static org.apache.juneau.BeanContext.*; import static org.apache.juneau.TestUtils.*; -import static org.apache.juneau.serializer.SerializerContext.*; import static org.junit.Assert.*; import java.net.*; @@ -39,13 +37,13 @@ public class CommonTest { JsonParser p = JsonParser.DEFAULT; A t1 = A.create(), t2; - s.setProperty(SERIALIZER_trimNullProperties, false); + s.setTrimNullProperties(false); String r = s.serialize(t1); assertEquals("{s1:null,s2:'s2'}", r); t2 = p.parse(r, A.class); assertEqualObjects(t1, t2); - s.setProperty(SERIALIZER_trimNullProperties, true); + s.setTrimNullProperties(true); r = s.serialize(t1); assertEquals("{s2:'s2'}", r); t2 = p.parse(r, A.class); @@ -72,13 +70,13 @@ public class CommonTest { B t1 = B.create(), t2; String r; - s.setProperty(SERIALIZER_trimEmptyMaps, false); + s.setTrimEmptyMaps(false); r = s.serialize(t1); assertEquals("{f1:{},f2:{f2a:null,f2b:{s2:'s2'}}}", r); t2 = p.parse(r, B.class); assertEqualObjects(t1, t2); - s.setProperty(SERIALIZER_trimEmptyMaps, true); + s.setTrimEmptyMaps(true); r = s.serialize(t1); assertEquals("{f2:{f2a:null,f2b:{s2:'s2'}}}", r); t2 = p.parse(r, B.class); @@ -106,13 +104,13 @@ public class CommonTest { C t1 = C.create(), t2; String r; - s.setProperty(SERIALIZER_trimEmptyCollections, false); + s.setTrimEmptyCollections(false); r = s.serialize(t1); assertEquals("{f1:[],f2:[null,{s2:'s2'}]}", r); t2 = p.parse(r, C.class); assertEqualObjects(t1, t2); - s.setProperty(SERIALIZER_trimEmptyCollections, true); + s.setTrimEmptyCollections(true); r = s.serialize(t1); assertEquals("{f2:[null,{s2:'s2'}]}", r); t2 = p.parse(r, C.class); @@ -140,13 +138,13 @@ public class CommonTest { D t1 = D.create(), t2; String r; - s.setProperty(SERIALIZER_trimEmptyCollections, false); + s.setTrimEmptyCollections(false); r = s.serialize(t1); assertEquals("{f1:[],f2:[null,{s2:'s2'}]}", r); t2 = p.parse(r, D.class); assertEqualObjects(t1, t2); - s.setProperty(SERIALIZER_trimEmptyCollections, true); + s.setTrimEmptyCollections(true); r = s.serialize(t1); assertEquals("{f2:[null,{s2:'s2'}]}", r); t2 = p.parse(r, D.class); @@ -254,7 +252,7 @@ public class CommonTest { String r; String expected = ""; - s.setProperty(SERIALIZER_relativeUriBase, null); + s.setRelativeUriBase(null); r = s.serialize(t); expected = "{" +"f0:'f0/x0'," @@ -275,11 +273,11 @@ public class CommonTest { +"}"; assertEquals(expected, r); - s.setProperty(SERIALIZER_relativeUriBase, ""); // Same as null. + s.setRelativeUriBase(""); // Same as null. r = s.serialize(t); assertEquals(expected, r); - s.setProperty(SERIALIZER_relativeUriBase, "/cr"); + s.setRelativeUriBase("/cr"); r = s.serialize(t); expected = "{" +"f0:'/cr/f0/x0'," @@ -300,11 +298,11 @@ public class CommonTest { +"}"; assertEquals(expected, r); - s.setProperty(SERIALIZER_relativeUriBase, "/cr/"); // Same as above + s.setRelativeUriBase("/cr/"); // Same as above r = s.serialize(t); assertEquals(expected, r); - s.setProperty(SERIALIZER_relativeUriBase, "/"); + s.setRelativeUriBase("/"); r = s.serialize(t); expected = "{" +"f0:'/f0/x0'," @@ -325,9 +323,9 @@ public class CommonTest { +"}"; assertEquals(expected, r); - s.setProperty(SERIALIZER_relativeUriBase, null); + s.setRelativeUriBase(null); - s.setProperty(SERIALIZER_absolutePathUriBase, "http://foo";); + s.setAbsolutePathUriBase("http://foo";); r = s.serialize(t); expected = "{" +"f0:'f0/x0'," @@ -348,11 +346,11 @@ public class CommonTest { +"}"; assertEquals(expected, r); - s.setProperty(SERIALIZER_absolutePathUriBase, "http://foo/";); + s.setAbsolutePathUriBase("http://foo/";); r = s.serialize(t); assertEquals(expected, r); - s.setProperty(SERIALIZER_absolutePathUriBase, ""); // Same as null. + s.setAbsolutePathUriBase(""); // Same as null. r = s.serialize(t); expected = "{" +"f0:'f0/x0'," @@ -381,15 +379,15 @@ public class CommonTest { public void testLockedSerializer() throws Exception { JsonSerializer s = new JsonSerializer().lock(); try { - s.setProperty(JsonSerializerContext.JSON_simpleMode, true); + s.setSimpleMode(true); fail("Locked exception not thrown"); } catch (LockedException e) {} try { - s.setProperty(SerializerContext.SERIALIZER_addBeanTypeProperties, true); + s.setAddBeanTypeProperties(true); fail("Locked exception not thrown"); } catch (LockedException e) {} try { - s.setProperty(BeanContext.BEAN_beanMapPutReturnsOldValue, true); + s.setBeanMapPutReturnsOldValue(true); fail("Locked exception not thrown"); } catch (LockedException e) {} } @@ -418,7 +416,7 @@ public class CommonTest { } // Recursion detection, no ignore - s.setProperty(SERIALIZER_detectRecursions, true); + s.setDetectRecursions(true); try { s.serialize(r1); fail("Exception expected!"); @@ -430,7 +428,7 @@ public class CommonTest { assertTrue(msg.contains("->[3]r1:org.apache.juneau.json.CommonTest$R1")); } - s.setProperty(SERIALIZER_ignoreRecursions, true); + s.setIgnoreRecursions(true); assertEquals("{name:'foo',r2:{name:'bar',r3:{name:'baz'}}}", s.serialize(r1)); // Make sure this doesn't blow up. @@ -455,7 +453,7 @@ public class CommonTest { //==================================================================================================== @Test public void testBasicBean() throws Exception { - JsonSerializer s = new JsonSerializer.Simple().setProperty(SERIALIZER_trimNullProperties, false).setProperty(BEAN_sortProperties, true); + JsonSerializer s = new JsonSerializer.Simple().setTrimNullProperties(false).setSortProperties(true); J a = new J(); a.setF1("J"); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/json/JsonParserEdgeCasesTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/json/JsonParserEdgeCasesTest.java b/juneau-core-test/src/test/java/org/apache/juneau/json/JsonParserEdgeCasesTest.java index a293831..574b906 100644 --- a/juneau-core-test/src/test/java/org/apache/juneau/json/JsonParserEdgeCasesTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/json/JsonParserEdgeCasesTest.java @@ -368,9 +368,9 @@ public class JsonParserEdgeCasesTest { public void testStrict() throws Exception { Parser p = JsonParser.DEFAULT_STRICT; if (name.contains("utf16LE")) - p = p.clone().setProperty(ParserContext.PARSER_inputStreamCharset, "UTF-16LE"); + p = p.clone().setInputStreamCharset("UTF-16LE"); else if (name.contains("utf16BE")) - p = p.clone().setProperty(ParserContext.PARSER_inputStreamCharset, "UTF-16BE"); + p = p.clone().setInputStreamCharset("UTF-16BE"); // 'y' tests should always succeed. if (expected == 'y') { @@ -407,9 +407,9 @@ public class JsonParserEdgeCasesTest { public void testLax() throws Exception { Parser p = JsonParser.DEFAULT; if (name.contains("utf16LE")) - p = p.clone().setProperty(ParserContext.PARSER_inputStreamCharset, "UTF-16LE"); + p = p.clone().setInputStreamCharset("UTF-16LE"); else if (name.contains("utf16BE")) - p = p.clone().setProperty(ParserContext.PARSER_inputStreamCharset, "UTF-16BE"); + p = p.clone().setInputStreamCharset("UTF-16BE"); // 'y' tests should always succeed. if (expected == 'y') { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/json/JsonTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/json/JsonTest.java b/juneau-core-test/src/test/java/org/apache/juneau/json/JsonTest.java index cfe4096..85e09f0 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/json/JsonTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/json/JsonTest.java @@ -13,7 +13,6 @@ package org.apache.juneau.json; import static org.apache.juneau.TestUtils.*; -import static org.apache.juneau.json.JsonSerializerContext.*; import static org.junit.Assert.*; import java.util.*; @@ -34,8 +33,8 @@ public class JsonTest { Map<String,Object> m = new LinkedHashMap<String,Object>(); List<Object> l = new LinkedList<Object>(); - WriterSerializer s1 = new JsonSerializer.Simple().setProperty(SERIALIZER_trimNullProperties, false); - WriterSerializer s2 = new JsonSerializer.Simple().setProperty(SERIALIZER_trimNullProperties, false).setProperty(SERIALIZER_quoteChar, '"'); + WriterSerializer s1 = new JsonSerializer.Simple().setTrimNullProperties(false); + WriterSerializer s2 = new JsonSerializer.Simple().setTrimNullProperties(false).setQuoteChar('"'); String r; // Null keys and values @@ -110,7 +109,7 @@ public class JsonTest { //==================================================================================================== @Test public void testBackslashesInStrings() throws Exception { - JsonSerializer s = new JsonSerializer.Simple().setProperty(SERIALIZER_trimNullProperties, false).setProperty(SERIALIZER_quoteChar, '"'); + JsonSerializer s = new JsonSerializer.Simple().setTrimNullProperties(false).setQuoteChar('"'); String r, r2; // [\\] @@ -290,13 +289,13 @@ public class JsonTest { //==================================================================================================== @Test public void testEscapeSolidus() throws Exception { - JsonSerializer s = new JsonSerializer().setProperty(JSON_escapeSolidus, false); + JsonSerializer s = new JsonSerializer().setEscapeSolidus(false); String r = s.serialize("foo/bar"); assertEquals("\"foo/bar\"", r); r = JsonParser.DEFAULT.parse(r, String.class); assertEquals("foo/bar", r); - s = new JsonSerializer().setProperty(JSON_escapeSolidus, true); + s = new JsonSerializer().setEscapeSolidus(true); r = s.serialize("foo/bar"); assertEquals("\"foo\\/bar\"", r); r = JsonParser.DEFAULT.parse(r, String.class); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapTest.java b/juneau-core-test/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapTest.java index a7d593e..ab8004b 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapTest.java @@ -12,7 +12,6 @@ // *************************************************************************************************************************** package org.apache.juneau.transforms; -import static org.apache.juneau.serializer.SerializerContext.*; import static org.junit.Assert.*; import java.util.*; @@ -42,7 +41,7 @@ public class ByteArrayBase64SwapTest extends RoundTripTest { //==================================================================================================== @Test public void testPrimitiveArrays() throws Exception { - WriterSerializer s = new JsonSerializer.Simple().addPojoSwaps(ByteArrayBase64Swap.class).setProperty(SERIALIZER_trimNullProperties, false); + WriterSerializer s = new JsonSerializer.Simple().addPojoSwaps(ByteArrayBase64Swap.class).setTrimNullProperties(false); byte[] a1 = {1,2,3}; assertEquals("'AQID'", s.serialize(a1)); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/transforms/CalendarSwapTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/transforms/CalendarSwapTest.java b/juneau-core-test/src/test/java/org/apache/juneau/transforms/CalendarSwapTest.java index 16a79c8..fa1bdfb 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/transforms/CalendarSwapTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/transforms/CalendarSwapTest.java @@ -12,8 +12,6 @@ // *************************************************************************************************************************** package org.apache.juneau.transforms; -import static org.apache.juneau.html.HtmlSerializerContext.*; -import static org.apache.juneau.jena.RdfCommonContext.*; import static org.junit.Assert.*; import java.net.*; @@ -55,11 +53,11 @@ public class CalendarSwapTest { private RdfSerializer getRdfSerializer() { return new RdfSerializer() - .setProperty(SERIALIZER_quoteChar, '\'') - .setProperty(SERIALIZER_useIndentation, false) - .setProperty(RDF_rdfxml_allowBadUris, true) - .setProperty(RDF_rdfxml_showDoctypeDeclaration, false) - .setProperty(RDF_rdfxml_showXmlDeclaration, false); + .setQuoteChar('\'') + .setUseIndentation(false) + .setProperty(RdfCommonContext.RDF_rdfxml_allowBadUris, true) + .setProperty(RdfCommonContext.RDF_rdfxml_showDoctypeDeclaration, false) + .setProperty(RdfCommonContext.RDF_rdfxml_showXmlDeclaration, false); } private String stripRdf(String s) { @@ -440,7 +438,7 @@ public class CalendarSwapTest { @Test public void testDefaultMapHtml() throws Exception { Class<?> f = CalendarMapSwap.class; - WriterSerializer s = new HtmlSerializer.Sq().addPojoSwaps(f).setProperty(HTML_addKeyValueTableHeaders, true); + WriterSerializer s = new HtmlSerializer.Sq().addPojoSwaps(f).setAddKeyValueTableHeaders(true); ReaderParser p = new HtmlParser().addPojoSwaps(f); doTest(s, p, true, "<table><tr><th>key</th><th>value</th></tr><tr><td>time</td><td><number>-2172116928000</number></td></tr><tr><td>timeZone</td><td>PST</td></tr></table>"); } @@ -585,7 +583,7 @@ public class CalendarSwapTest { //==================================================================================================== @Test public void testBeanProperyFilterHtml() throws Exception { - WriterSerializer s = HtmlSerializer.DEFAULT_SQ.clone().setProperty(HTML_addKeyValueTableHeaders, true); + WriterSerializer s = HtmlSerializer.DEFAULT_SQ.clone().setAddKeyValueTableHeaders(true); ReaderParser p = HtmlParser.DEFAULT; Calendar c = testDate; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/CommonParser_UonTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/CommonParser_UonTest.java b/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/CommonParser_UonTest.java index 64f3d8a..9b51a35 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/CommonParser_UonTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/CommonParser_UonTest.java @@ -12,8 +12,6 @@ // *************************************************************************************************************************** package org.apache.juneau.urlencoding; -import static org.apache.juneau.BeanContext.*; -import static org.apache.juneau.serializer.SerializerContext.*; import static org.junit.Assert.*; import java.util.*; @@ -26,8 +24,8 @@ import org.junit.*; @SuppressWarnings({"rawtypes","serial","javadoc"}) public class CommonParser_UonTest { - ReaderParser p = UonParser.DEFAULT.clone().setClassLoader(getClass().getClassLoader()).addToDictionary(A1.class); - ReaderParser pe = UonParser.DEFAULT_DECODING.clone().setClassLoader(getClass().getClassLoader()); + ReaderParser p = UonParser.DEFAULT.clone().addToBeanDictionary(A1.class); + ReaderParser pe = UonParser.DEFAULT_DECODING.clone(); //==================================================================================================== // testFromSerializer @@ -71,7 +69,7 @@ public class CommonParser_UonTest { tl.add(new A3("name1","value1")); b.list = tl; - in = new UonSerializer().setProperty(SERIALIZER_addBeanTypeProperties, true).serialize(b); + in = new UonSerializer().setAddBeanTypeProperties(true).serialize(b); b = (A1)p.parse(in, Object.class); assertEquals("value1", b.list.get(1).value); @@ -102,7 +100,7 @@ public class CommonParser_UonTest { //==================================================================================================== @Test public void testCorrectHandlingOfUnknownProperties() throws Exception { - ReaderParser p = new UonParser().setProperty(BEAN_ignoreUnknownBeanProperties, true); + ReaderParser p = new UonParser().setIgnoreUnknownBeanProperties(true); B t; String in = "(a=1,unknown=3,b=2)"; @@ -152,7 +150,7 @@ public class CommonParser_UonTest { @Test public void testParserListeners() throws Exception { final List<String> events = new LinkedList<String>(); - UonParser p = new UonParser().setProperty(BEAN_ignoreUnknownBeanProperties, true); + UonParser p = new UonParser().setIgnoreUnknownBeanProperties(true); p.addListener( new ParserListener() { @Override /* ParserListener */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java b/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java index 5739068..2690017 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java @@ -12,9 +12,7 @@ // *************************************************************************************************************************** package org.apache.juneau.urlencoding; -import static org.apache.juneau.BeanContext.*; import static org.apache.juneau.TestUtils.*; -import static org.apache.juneau.serializer.SerializerContext.*; import static org.junit.Assert.*; import java.util.*; @@ -28,7 +26,7 @@ import org.junit.*; @SuppressWarnings({"rawtypes","serial","javadoc"}) public class CommonParser_UrlEncodingTest { - ReaderParser p = UrlEncodingParser.DEFAULT.clone().setClassLoader(getClass().getClassLoader()).addToDictionary(A1.class); + ReaderParser p = UrlEncodingParser.DEFAULT.clone().addToBeanDictionary(A1.class); //==================================================================================================== // testFromSerializer @@ -73,7 +71,7 @@ public class CommonParser_UrlEncodingTest { tl.add(new A3("name1","value1")); b.list = tl; - in = new UrlEncodingSerializer().setProperty(SERIALIZER_addBeanTypeProperties, true).serialize(b); + in = new UrlEncodingSerializer().setAddBeanTypeProperties(true).serialize(b); b = (A1)p.parse(in, Object.class); assertEquals("value1", b.list.get(1).value); @@ -104,7 +102,7 @@ public class CommonParser_UrlEncodingTest { //==================================================================================================== @Test public void testCorrectHandlingOfUnknownProperties() throws Exception { - ReaderParser p = new UrlEncodingParser().setProperty(BEAN_ignoreUnknownBeanProperties, true); + ReaderParser p = new UrlEncodingParser().setIgnoreUnknownBeanProperties(true); B t; String in = "a=1&unknown=3&b=2"; @@ -154,7 +152,7 @@ public class CommonParser_UrlEncodingTest { @Test public void testParserListeners() throws Exception { final List<String> events = new LinkedList<String>(); - UonParser p = new UrlEncodingParser().setProperty(BEAN_ignoreUnknownBeanProperties, true); + UonParser p = new UrlEncodingParser().setIgnoreUnknownBeanProperties(true); p.addListener( new ParserListener() { @Override /* ParserListener */ @@ -172,7 +170,7 @@ public class CommonParser_UrlEncodingTest { @Test public void testCollections() throws Exception { - WriterSerializer s = new UrlEncodingSerializer().setProperty(UonSerializerContext.UON_simpleMode, true); + WriterSerializer s = new UrlEncodingSerializer().setSimpleMode(true); ReaderParser p = new UrlEncodingParser(); List l = new ObjectList("foo","bar"); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/Common_UonTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/Common_UonTest.java b/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/Common_UonTest.java index 768eaec..3a819ee 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/Common_UonTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/Common_UonTest.java @@ -13,7 +13,6 @@ package org.apache.juneau.urlencoding; import static org.apache.juneau.TestUtils.*; -import static org.apache.juneau.serializer.SerializerContext.*; import static org.junit.Assert.*; import java.net.*; @@ -22,7 +21,6 @@ import java.util.*; import org.apache.juneau.*; import org.apache.juneau.annotation.*; -import org.apache.juneau.json.*; import org.apache.juneau.serializer.*; import org.apache.juneau.testbeans.*; import org.junit.*; @@ -40,13 +38,13 @@ public class Common_UonTest { UonSerializer s = new UonSerializer.Encoding(); A t1 = A.create(), t2; - s.setProperty(SERIALIZER_trimNullProperties, false); + s.setTrimNullProperties(false); String r = s.serialize(t1); assertEquals("$o(s1=%00,s2=s2)", r); t2 = pe.parse(r, A.class); assertEqualObjects(t1, t2); - s.setProperty(SERIALIZER_trimNullProperties, true); + s.setTrimNullProperties(true); r = s.serialize(t1); assertEquals("$o(s2=s2)", r); t2 = p.parse(r, A.class); @@ -72,13 +70,13 @@ public class Common_UonTest { B t1 = B.create(), t2; String r; - s.setProperty(SERIALIZER_trimEmptyMaps, false); + s.setTrimEmptyMaps(false); r = s.serialize(t1); assertEquals("(f1=(),f2=(f2a=%00,f2b=(s2=s2)))", r); t2 = pe.parse(r, B.class); assertEqualObjects(t1, t2); - s.setProperty(SERIALIZER_trimEmptyMaps, true); + s.setTrimEmptyMaps(true); r = s.serialize(t1); assertEquals("(f2=(f2a=%00,f2b=(s2=s2)))", r); t2 = pe.parse(r, B.class); @@ -105,13 +103,13 @@ public class Common_UonTest { C t1 = C.create(), t2; String r; - s.setProperty(SERIALIZER_trimEmptyCollections, false); + s.setTrimEmptyCollections(false); r = s.serialize(t1); assertEquals("$o(f1=$a(),f2=$a(%00,$o(s2=s2)))", r); t2 = pe.parse(r, C.class); assertEqualObjects(t1, t2); - s.setProperty(SERIALIZER_trimEmptyCollections, true); + s.setTrimEmptyCollections(true); r = s.serialize(t1); assertEquals("$o(f2=$a(%00,$o(s2=s2)))", r); t2 = pe.parse(r, C.class); @@ -138,13 +136,13 @@ public class Common_UonTest { D t1 = D.create(), t2; String r; - s.setProperty(SERIALIZER_trimEmptyCollections, false); + s.setTrimEmptyCollections(false); r = s.serialize(t1); assertEquals("$o(f1=$a(),f2=$a(%00,$o(s2=s2)))", r); t2 = pe.parse(r, D.class); assertEqualObjects(t1, t2); - s.setProperty(SERIALIZER_trimEmptyCollections, true); + s.setTrimEmptyCollections(true); r = s.serialize(t1); assertEquals("$o(f2=$a(%00,$o(s2=s2)))", r); t2 = pe.parse(r, D.class); @@ -250,7 +248,7 @@ public class Common_UonTest { String r; String expected; - s.setProperty(SERIALIZER_relativeUriBase, null); + s.setRelativeUriBase(null); r = s.serialize(t); expected = "" +"$o(" @@ -272,11 +270,11 @@ public class Common_UonTest { +")"; assertEquals(expected, r); - s.setProperty(SERIALIZER_relativeUriBase, ""); // Same as null. + s.setRelativeUriBase(""); // Same as null. r = s.serialize(t); assertEquals(expected, r); - s.setProperty(SERIALIZER_relativeUriBase, "/cr"); + s.setRelativeUriBase("/cr"); r = s.serialize(t); expected = "" +"$o(" @@ -298,11 +296,11 @@ public class Common_UonTest { +")"; assertEquals(expected, r); - s.setProperty(SERIALIZER_relativeUriBase, "/cr/"); // Same as above + s.setRelativeUriBase("/cr/"); // Same as above r = s.serialize(t); assertEquals(expected, r); - s.setProperty(SERIALIZER_relativeUriBase, "/"); + s.setRelativeUriBase("/"); r = s.serialize(t); expected = "" +"$o(" @@ -324,9 +322,9 @@ public class Common_UonTest { +")"; assertEquals(expected, r); - s.setProperty(SERIALIZER_relativeUriBase, null); + s.setRelativeUriBase(null); - s.setProperty(SERIALIZER_absolutePathUriBase, "http://foo";); + s.setAbsolutePathUriBase("http://foo";); r = s.serialize(t); expected = "" +"$o(" @@ -348,11 +346,11 @@ public class Common_UonTest { +")"; assertEquals(expected, r); - s.setProperty(SERIALIZER_absolutePathUriBase, "http://foo/";); + s.setAbsolutePathUriBase("http://foo/";); r = s.serialize(t); assertEquals(expected, r); - s.setProperty(SERIALIZER_absolutePathUriBase, ""); // Same as null. + s.setAbsolutePathUriBase(""); // Same as null. r = s.serialize(t); expected = "" +"$o(" @@ -382,15 +380,15 @@ public class Common_UonTest { public void testLockedSerializer() throws Exception { UonSerializer s = new UonSerializer().lock(); try { - s.setProperty(JsonSerializerContext.JSON_simpleMode, true); + s.setSimpleMode(true); fail("Locked exception not thrown"); } catch (LockedException e) {} try { - s.setProperty(SerializerContext.SERIALIZER_addBeanTypeProperties, true); + s.setAddBeanTypeProperties(true); fail("Locked exception not thrown"); } catch (LockedException e) {} try { - s.setProperty(BeanContext.BEAN_beanMapPutReturnsOldValue, true); + s.setBeanMapPutReturnsOldValue(true); fail("Locked exception not thrown"); } catch (LockedException e) {} } @@ -419,7 +417,7 @@ public class Common_UonTest { } // Recursion detection, no ignore - s.setProperty(SERIALIZER_detectRecursions, true); + s.setDetectRecursions(true); try { s.serialize(r1); fail("Exception expected!"); @@ -431,7 +429,7 @@ public class Common_UonTest { assertTrue(msg.contains("->[3]r1:org.apache.juneau.urlencoding.Common_UonTest$R1")); } - s.setProperty(SERIALIZER_ignoreRecursions, true); + s.setIgnoreRecursions(true); assertEquals("$o(name=foo,r2=$o(name=bar,r3=$o(name=baz)))", s.serialize(r1)); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/Common_UrlEncodingTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/Common_UrlEncodingTest.java b/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/Common_UrlEncodingTest.java index 0f0a30f..efd9e93 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/Common_UrlEncodingTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/Common_UrlEncodingTest.java @@ -13,7 +13,6 @@ package org.apache.juneau.urlencoding; import static org.apache.juneau.TestUtils.*; -import static org.apache.juneau.serializer.SerializerContext.*; import static org.junit.Assert.*; import java.net.*; @@ -22,7 +21,6 @@ import java.util.*; import org.apache.juneau.*; import org.apache.juneau.annotation.*; -import org.apache.juneau.json.*; import org.apache.juneau.serializer.*; import org.apache.juneau.testbeans.*; import org.junit.*; @@ -39,13 +37,13 @@ public class Common_UrlEncodingTest { UrlEncodingSerializer s = new UrlEncodingSerializer(); A t1 = A.create(), t2; - s.setProperty(SERIALIZER_trimNullProperties, false); + s.setTrimNullProperties(false); String r = s.serialize(t1); assertEquals("s1=%00&s2=s2", r); t2 = p.parse(r, A.class); assertEqualObjects(t1, t2); - s.setProperty(SERIALIZER_trimNullProperties, true); + s.setTrimNullProperties(true); r = s.serialize(t1); assertEquals("s2=s2", r); t2 = p.parse(r, A.class); @@ -71,13 +69,13 @@ public class Common_UrlEncodingTest { B t1 = B.create(), t2; String r; - s.setProperty(SERIALIZER_trimEmptyMaps, false); + s.setTrimEmptyMaps(false); r = s.serialize(t1); assertEquals("f1=()&f2=(f2a=%00,f2b=(s2=s2))", r); t2 = p.parse(r, B.class); assertEqualObjects(t1, t2); - s.setProperty(SERIALIZER_trimEmptyMaps, true); + s.setTrimEmptyMaps(true); r = s.serialize(t1); assertEquals("f2=(f2a=%00,f2b=(s2=s2))", r); t2 = p.parse(r, B.class); @@ -104,13 +102,13 @@ public class Common_UrlEncodingTest { C t1 = C.create(), t2; String r; - s.setProperty(SERIALIZER_trimEmptyCollections, false); + s.setTrimEmptyCollections(false); r = s.serialize(t1); assertEquals("f1=$a()&f2=$a(%00,$o(s2=s2))", r); t2 = p.parse(r, C.class); assertEqualObjects(t1, t2); - s.setProperty(SERIALIZER_trimEmptyCollections, true); + s.setTrimEmptyCollections(true); r = s.serialize(t1); assertEquals("f2=$a(%00,$o(s2=s2))", r); t2 = p.parse(r, C.class); @@ -137,13 +135,13 @@ public class Common_UrlEncodingTest { D t1 = D.create(), t2; String r; - s.setProperty(SERIALIZER_trimEmptyCollections, false); + s.setTrimEmptyCollections(false); r = s.serialize(t1); assertEquals("f1=$a()&f2=$a(%00,$o(s2=s2))", r); t2 = p.parse(r, D.class); assertEqualObjects(t1, t2); - s.setProperty(SERIALIZER_trimEmptyCollections, true); + s.setTrimEmptyCollections(true); r = s.serialize(t1); assertEquals("f2=$a(%00,$o(s2=s2))", r); t2 = p.parse(r, D.class); @@ -252,7 +250,7 @@ public class Common_UrlEncodingTest { String r; String expected = ""; - s.setProperty(SERIALIZER_relativeUriBase, null); + s.setRelativeUriBase(null); r = s.serialize(t); expected = "" +"f0=f0/x0" @@ -272,11 +270,11 @@ public class Common_UrlEncodingTest { +"&fe=http://www.apache.org/fe/xe?foo=bar%26label2=MY_LABEL";; assertEquals(expected, r); - s.setProperty(SERIALIZER_relativeUriBase, ""); // Same as null. + s.setRelativeUriBase(""); // Same as null. r = s.serialize(t); assertEquals(expected, r); - s.setProperty(SERIALIZER_relativeUriBase, "/cr"); + s.setRelativeUriBase("/cr"); r = s.serialize(t); expected = "" +"f0=/cr/f0/x0" @@ -296,11 +294,11 @@ public class Common_UrlEncodingTest { +"&fe=http://www.apache.org/fe/xe?foo=bar%26label2=MY_LABEL";; assertEquals(expected, r); - s.setProperty(SERIALIZER_relativeUriBase, "/cr/"); // Same as above + s.setRelativeUriBase("/cr/"); // Same as above r = s.serialize(t); assertEquals(expected, r); - s.setProperty(SERIALIZER_relativeUriBase, "/"); + s.setRelativeUriBase("/"); r = s.serialize(t); expected = "" +"f0=/f0/x0" @@ -320,9 +318,9 @@ public class Common_UrlEncodingTest { +"&fe=http://www.apache.org/fe/xe?foo=bar%26label2=MY_LABEL";; assertEquals(expected, r); - s.setProperty(SERIALIZER_relativeUriBase, null); + s.setRelativeUriBase(null); - s.setProperty(SERIALIZER_absolutePathUriBase, "http://foo";); + s.setAbsolutePathUriBase("http://foo";); r = s.serialize(t); expected = "" +"f0=f0/x0" @@ -342,11 +340,11 @@ public class Common_UrlEncodingTest { +"&fe=http://www.apache.org/fe/xe?foo=bar%26label2=MY_LABEL";; assertEquals(expected, r); - s.setProperty(SERIALIZER_absolutePathUriBase, "http://foo/";); + s.setAbsolutePathUriBase("http://foo/";); r = s.serialize(t); assertEquals(expected, r); - s.setProperty(SERIALIZER_absolutePathUriBase, ""); // Same as null. + s.setAbsolutePathUriBase(""); // Same as null. r = s.serialize(t); expected = "" +"f0=f0/x0" @@ -374,15 +372,15 @@ public class Common_UrlEncodingTest { public void testLockedSerializer() throws Exception { UrlEncodingSerializer s = new UrlEncodingSerializer().lock(); try { - s.setProperty(JsonSerializerContext.JSON_simpleMode, true); + s.setSimpleMode(true); fail("Locked exception not thrown"); } catch (LockedException e) {} try { - s.setProperty(SerializerContext.SERIALIZER_addBeanTypeProperties, true); + s.setAddBeanTypeProperties(true); fail("Locked exception not thrown"); } catch (LockedException e) {} try { - s.setProperty(BeanContext.BEAN_beanMapPutReturnsOldValue, true); + s.setBeanMapPutReturnsOldValue(true); fail("Locked exception not thrown"); } catch (LockedException e) {} } @@ -411,7 +409,7 @@ public class Common_UrlEncodingTest { } // Recursion detection, no ignore - s.setProperty(SERIALIZER_detectRecursions, true); + s.setDetectRecursions(true); try { s.serialize(r1); fail("Exception expected!"); @@ -423,7 +421,7 @@ public class Common_UrlEncodingTest { assertTrue(msg.contains("->[3]r1:org.apache.juneau.urlencoding.Common_UrlEncodingTest$R1")); } - s.setProperty(SERIALIZER_ignoreRecursions, true); + s.setIgnoreRecursions(true); assertEquals("name=foo&r2=$o(name=bar,r3=$o(name=baz))", s.serialize(r1)); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java b/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java index 911bf22..30ab795 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java @@ -893,7 +893,7 @@ public class UrlEncodingParserTest { UrlEncodingParser p; String in; - p = UrlEncodingParser.DEFAULT.clone().setProperty(UrlEncodingContext.URLENC_expandedParams, true); + p = UrlEncodingParser.DEFAULT.clone().setExpandedParams(true); in = "" + "f01=a&f01=b" + "&f02=c&f02=d" http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingSerializerTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingSerializerTest.java b/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingSerializerTest.java index 8bcb6ce..3366856 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingSerializerTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingSerializerTest.java @@ -391,7 +391,7 @@ public class UrlEncodingSerializerTest { + "&f20=(((a=a,b=1,c=true)),((a=a,b=1,c=true)))"; assertEquals(e, r); - s = UrlEncodingSerializer.DEFAULT_SIMPLE.clone().setProperty(UrlEncodingContext.URLENC_expandedParams, true); + s = UrlEncodingSerializer.DEFAULT_SIMPLE.clone().setExpandedParams(true); r = s.serialize(t); e = "" + "f01=a&f01=b" @@ -452,7 +452,7 @@ public class UrlEncodingSerializerTest { + "&f20=((a=a,b=1,c=true))&f20=((a=a,b=1,c=true))"; assertEquals(e, r); - s = UrlEncodingSerializer.DEFAULT_SIMPLE.clone().setProperty(UrlEncodingContext.URLENC_expandedParams, true); + s = UrlEncodingSerializer.DEFAULT_SIMPLE.clone().setExpandedParams(true); r = s.serialize(t); e = "" + "f01=a&f01=b" http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoRestTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoRestTest.java b/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoRestTest.java index 8661c71..5450e2d 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoRestTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoRestTest.java @@ -12,7 +12,6 @@ // *************************************************************************************************************************** package org.apache.juneau.utils; -import static org.apache.juneau.serializer.SerializerContext.*; import static org.junit.Assert.*; import java.util.*; @@ -83,7 +82,7 @@ public class PojoRestTest { Address a3 = (Address)model.get("/person1/addresses/1"); assertEquals("city B", a3.city); - serializer = new JsonSerializer.Simple().setProperty(SERIALIZER_addBeanTypeProperties, true); + serializer = new JsonSerializer.Simple().setAddBeanTypeProperties(true); p = new Person("some name", 123, new Address("street A", "city A", "state A", 12345, true), new Address("street B", "city B", "state B", 12345, false) @@ -95,7 +94,7 @@ public class PojoRestTest { assertEquals(expectedValue, s); // Parse it back to Java objects. - p = (Person)JsonParser.DEFAULT.clone().setClassLoader(getClass().getClassLoader()).addToDictionary(Person.class).parse(s, Object.class); + p = (Person)JsonParser.DEFAULT.clone().addToBeanDictionary(Person.class).parse(s, Object.class); expectedValue = "city B"; s = p.addresses[1].city; assertEquals(expectedValue, s); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/utils/StringUtilsTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/utils/StringUtilsTest.java b/juneau-core-test/src/test/java/org/apache/juneau/utils/StringUtilsTest.java index 71ccc49..5adc446 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/utils/StringUtilsTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/utils/StringUtilsTest.java @@ -15,7 +15,6 @@ package org.apache.juneau.utils; import static org.apache.juneau.TestUtils.*; import static org.apache.juneau.internal.StringUtils.*; import static org.junit.Assert.*; -import static org.apache.juneau.BeanContext.*; import java.math.*; import java.util.*; @@ -639,7 +638,7 @@ public class StringUtilsTest { //==================================================================================================== @Test public void testParseISO8601Date() throws Exception { - WriterSerializer s = new JsonSerializer.Simple().addPojoSwaps(DateSwap.ISO8601DTPZ.class).setProperty(BEAN_timeZone, "GMT"); + WriterSerializer s = new JsonSerializer.Simple().addPojoSwaps(DateSwap.ISO8601DTPZ.class).setTimeZone(TimeZone.getTimeZone("GMT")); assertNull(parseISO8601Date(null)); assertNull(parseISO8601Date("")); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonParserTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonParserTest.java b/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonParserTest.java index 481cfb7..68265db 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonParserTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonParserTest.java @@ -12,7 +12,6 @@ // *************************************************************************************************************************** package org.apache.juneau.xml; -import static org.apache.juneau.BeanContext.*; import static org.junit.Assert.*; import java.util.*; @@ -104,7 +103,7 @@ public class CommonParserTest { //==================================================================================================== @Test public void testCorrectHandlingOfUnknownProperties() throws Exception { - ReaderParser p = new XmlParser().setProperty(BEAN_ignoreUnknownBeanProperties, true); + ReaderParser p = new XmlParser().setIgnoreUnknownBeanProperties(true); B t; String in = "<object><a>1</a><unknown>foo</unknown><b>2</b></object>"; @@ -160,7 +159,7 @@ public class CommonParserTest { @Test public void testParserListeners() throws Exception { final List<String> events = new LinkedList<String>(); - XmlParser p = new XmlParser().setProperty(BEAN_ignoreUnknownBeanProperties, true); + XmlParser p = new XmlParser().setIgnoreUnknownBeanProperties(true); p.addListener( new ParserListener() { @Override /* ParserListener */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonTest.java b/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonTest.java index 7ef01fd..764847a 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonTest.java @@ -13,8 +13,6 @@ package org.apache.juneau.xml; import static org.apache.juneau.TestUtils.*; -import static org.apache.juneau.serializer.SerializerContext.*; -import static org.apache.juneau.xml.XmlSerializerContext.*; import static org.apache.juneau.xml.annotation.XmlFormat.*; import static org.junit.Assert.*; @@ -42,13 +40,13 @@ public class CommonTest { XmlParser p = new XmlParser(); A t1 = A.create(), t2; - s.setProperty(SERIALIZER_trimNullProperties, false); + s.setTrimNullProperties(false); String r = s.serialize(t1); assertEquals("<object><s1 _type='null'/><s2>s2</s2></object>", r); t2 = p.parse(r, A.class); assertEqualObjects(t1, t2); - s.setProperty(SERIALIZER_trimNullProperties, true); + s.setTrimNullProperties(true); r = s.serialize(t1); assertEquals("<object><s2>s2</s2></object>", r); t2 = p.parse(r, A.class); @@ -75,13 +73,13 @@ public class CommonTest { B t1 = B.create(), t2; String r; - s.setProperty(SERIALIZER_trimEmptyMaps, false); + s.setTrimEmptyMaps(false); r = s.serialize(t1); assertEquals("<object><f1/><f2><f2a _type='null'/><f2b><s2>s2</s2></f2b></f2></object>", r); t2 = p.parse(r, B.class); assertEqualObjects(t1, t2); - s.setProperty(SERIALIZER_trimEmptyMaps, true); + s.setTrimEmptyMaps(true); r = s.serialize(t1); assertEquals("<object><f2><f2a _type='null'/><f2b><s2>s2</s2></f2b></f2></object>", r); t2 = p.parse(r, B.class); @@ -109,13 +107,13 @@ public class CommonTest { C t1 = C.create(), t2; String r; - s.setProperty(SERIALIZER_trimEmptyCollections, false); + s.setTrimEmptyCollections(false); r = s.serialize(t1); assertEquals("<object><f1></f1><f2><null/><object><s2>s2</s2></object></f2></object>", r); t2 = p.parse(r, C.class); assertEqualObjects(t1, t2); - s.setProperty(SERIALIZER_trimEmptyCollections, true); + s.setTrimEmptyCollections(true); r = s.serialize(t1); assertEquals("<object><f2><null/><object><s2>s2</s2></object></f2></object>", r); t2 = p.parse(r, C.class); @@ -143,13 +141,13 @@ public class CommonTest { D t1 = D.create(), t2; String r; - s.setProperty(SERIALIZER_trimEmptyCollections, false); + s.setTrimEmptyCollections(false); r = s.serialize(t1); assertEquals("<object><f1></f1><f2><null/><object><s2>s2</s2></object></f2></object>", r); t2 = p.parse(r, D.class); assertEqualObjects(t1, t2); - s.setProperty(SERIALIZER_trimEmptyCollections, true); + s.setTrimEmptyCollections(true); r = s.serialize(t1); assertEquals("<object><f2><null/><object><s2>s2</s2></object></f2></object>", r); t2 = p.parse(r, D.class); @@ -265,7 +263,7 @@ public class CommonTest { String r; String expected; - s.setProperty(SERIALIZER_relativeUriBase, null); + s.setRelativeUriBase(null); r = s.serialize(t); expected = "" +"<object f0='f0/x0'>" @@ -286,11 +284,11 @@ public class CommonTest { +"</object>"; assertEquals(expected, r); - s.setProperty(SERIALIZER_relativeUriBase, ""); // Same as null. + s.setRelativeUriBase(""); // Same as null. r = s.serialize(t); assertEquals(expected, r); - s.setProperty(SERIALIZER_relativeUriBase, "/cr"); + s.setRelativeUriBase("/cr"); r = s.serialize(t); expected = "" +"<object f0='/cr/f0/x0'>" @@ -311,11 +309,11 @@ public class CommonTest { +"</object>"; assertEquals(expected, r); - s.setProperty(SERIALIZER_relativeUriBase, "/cr/"); // Same as above + s.setRelativeUriBase("/cr/"); // Same as above r = s.serialize(t); assertEquals(expected, r); - s.setProperty(SERIALIZER_relativeUriBase, "/"); + s.setRelativeUriBase("/"); r = s.serialize(t); expected = "" +"<object f0='/f0/x0'>" @@ -336,9 +334,9 @@ public class CommonTest { +"</object>"; assertEquals(expected, r); - s.setProperty(SERIALIZER_relativeUriBase, null); + s.setRelativeUriBase(null); - s.setProperty(SERIALIZER_absolutePathUriBase, "http://foo";); + s.setAbsolutePathUriBase("http://foo";); r = s.serialize(t); expected = "" +"<object f0='f0/x0'>" @@ -359,11 +357,11 @@ public class CommonTest { +"</object>"; assertEquals(expected, r); - s.setProperty(SERIALIZER_absolutePathUriBase, "http://foo/";); + s.setAbsolutePathUriBase("http://foo/";); r = s.serialize(t); assertEquals(expected, r); - s.setProperty(SERIALIZER_absolutePathUriBase, ""); // Same as null. + s.setAbsolutePathUriBase(""); // Same as null. r = s.serialize(t); expected = "" +"<object f0='f0/x0'>" @@ -392,15 +390,15 @@ public class CommonTest { public void testLockedSerializer() throws Exception { XmlSerializer s = new XmlSerializer().lock(); try { - s.setProperty(XmlSerializerContext.XML_enableNamespaces, true); + s.setEnableNamespaces(true); fail("Locked exception not thrown"); } catch (LockedException e) {} try { - s.setProperty(SerializerContext.SERIALIZER_addBeanTypeProperties, true); + s.setAddBeanTypeProperties(true); fail("Locked exception not thrown"); } catch (LockedException e) {} try { - s.setProperty(BeanContext.BEAN_beanMapPutReturnsOldValue, true); + s.setBeanMapPutReturnsOldValue(true); fail("Locked exception not thrown"); } catch (LockedException e) {} } @@ -410,7 +408,7 @@ public class CommonTest { //==================================================================================================== @Test public void testRecursion() throws Exception { - XmlSerializer s = new XmlSerializer().setProperty(XML_enableNamespaces, false); + XmlSerializer s = new XmlSerializer().setEnableNamespaces(false); R1 r1 = new R1(); R2 r2 = new R2(); @@ -429,7 +427,7 @@ public class CommonTest { } // Recursion detection, no ignore - s.setProperty(SERIALIZER_detectRecursions, true); + s.setDetectRecursions(true); try { s.serialize(r1); fail("Exception expected!"); @@ -441,7 +439,7 @@ public class CommonTest { assertTrue(msg.contains("->[3]r1:org.apache.juneau.xml.CommonTest$R1")); } - s.setProperty(SERIALIZER_ignoreRecursions, true); + s.setIgnoreRecursions(true); assertEquals("<object><name>foo</name><r2><name>bar</name><r3><name>baz</name></r3></r2></object>", s.serialize(r1)); // Make sure this doesn't blow up. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonXmlTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonXmlTest.java b/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonXmlTest.java index e2fd383..996a6cf 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonXmlTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonXmlTest.java @@ -13,7 +13,6 @@ package org.apache.juneau.xml; import static org.apache.juneau.TestUtils.*; -import static org.apache.juneau.xml.XmlSerializerContext.*; import static org.apache.juneau.xml.annotation.XmlFormat.*; import static org.junit.Assert.*; @@ -62,7 +61,7 @@ public class CommonXmlTest { //==================================================================================================== @Test public void testBeanUriAnnotationOnlyUriProperty() throws Exception { - XmlSerializer s = new XmlSerializer.Sq().setProperty(XML_addNamespaceUrisToRoot, false); + XmlSerializer s = new XmlSerializer.Sq().setAddNamespaceUrisToRoot(false); B t = new B("http://foo";); String xml = s.serialize(t); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlContentTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlContentTest.java b/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlContentTest.java index 6872723..d695969 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlContentTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlContentTest.java @@ -14,7 +14,6 @@ package org.apache.juneau.xml; import static org.apache.juneau.TestUtils.*; import static org.apache.juneau.serializer.SerializerContext.*; -import static org.apache.juneau.xml.XmlSerializerContext.*; import static org.apache.juneau.xml.annotation.XmlFormat.*; import static org.junit.Assert.*; @@ -35,7 +34,7 @@ public class XmlContentTest { public void testContentFormat() throws Exception { A t = A.newInstance(), t2; XmlSerializer s1 = XmlSerializer.DEFAULT_SQ, - s2 = new XmlSerializer().setProperty(SERIALIZER_quoteChar, '\'').setProperty(SERIALIZER_useIndentation, true).setProperty(XML_enableNamespaces, false); + s2 = new XmlSerializer().setQuoteChar('\'').setUseIndentation(true).setEnableNamespaces(false); XmlParser p = XmlParser.DEFAULT; XmlSerializerSession session; String r; @@ -143,7 +142,7 @@ public class XmlContentTest { public void testXmlMixed() throws Exception { B t = B.newInstance(), t2; XmlSerializer s1 = XmlSerializer.DEFAULT_SQ, - s2 = new XmlSerializer().setProperty(SERIALIZER_quoteChar, '\'').setProperty(SERIALIZER_useIndentation, true).setProperty(XML_enableNamespaces, false); + s2 = new XmlSerializer().setQuoteChar('\'').setUseIndentation(true).setEnableNamespaces(false); XmlParser p = XmlParser.DEFAULT; XmlSerializerSession session; String r; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlParserTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlParserTest.java b/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlParserTest.java index 3606118..64ca1c3 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlParserTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlParserTest.java @@ -12,7 +12,6 @@ // *************************************************************************************************************************** package org.apache.juneau.xml; -import static org.apache.juneau.xml.XmlParserContext.*; import static org.junit.Assert.*; import org.apache.juneau.*; @@ -83,7 +82,7 @@ public class XmlParserTest { public void testPreserveRootElement() throws Exception { String xml; ObjectMap m; - ReaderParser p = new XmlParser().setProperty(XML_preserveRootElement, true); + ReaderParser p = new XmlParser().setPreserveRootElement(true); xml = "<A><B><C>c</C></B></A>"; m = p.parse(xml, ObjectMap.class);
