You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/02/09 17:31:35 UTC
[13/14] incubator-juneau git commit: Add convenience property setters
to serializers and parsers.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/BeanConfigTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/BeanConfigTest.java b/juneau-core-test/src/test/java/org/apache/juneau/BeanConfigTest.java
index 24fe4a1..3757598 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/BeanConfigTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/BeanConfigTest.java
@@ -12,7 +12,6 @@
// ***************************************************************************************************************************
package org.apache.juneau;
-import static org.apache.juneau.BeanContext.*;
import static org.junit.Assert.*;
import java.io.*;
@@ -458,7 +457,7 @@ public class BeanConfigTest {
//====================================================================================================
@Test
public void testProxyHandler() throws Exception {
- BeanSession session = ContextFactory.create().setClassLoader(A.class.getClassLoader()).getBeanContext().createSession();
+ BeanSession session = ContextFactory.create().getBeanContext().createSession();
A f1 = (A) Proxy.newProxyInstance(this.getClass()
.getClassLoader(), new Class[] { A.class },
@@ -571,152 +570,152 @@ public class BeanConfigTest {
p2 = new JsonParser();
assertSameCache(p1, p2);
- p1.setProperty(BEAN_beansRequireDefaultConstructor, true);
+ p1.setBeansRequireDefaultConstructor(true);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_beansRequireDefaultConstructor, true);
+ p2.setBeansRequireDefaultConstructor(true);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_beansRequireSerializable, true);
+ p1.setBeansRequireSerializable(true);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_beansRequireSerializable, true);
+ p2.setBeansRequireSerializable(true);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_beansRequireSettersForGetters, true);
+ p1.setBeansRequireSettersForGetters(true);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_beansRequireSettersForGetters, true);
+ p2.setBeansRequireSettersForGetters(true);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_beansRequireSomeProperties, false);
+ p1.setBeansRequireSomeProperties(false);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_beansRequireSomeProperties, false);
+ p2.setBeansRequireSomeProperties(false);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_beanMapPutReturnsOldValue, true);
+ p1.setBeanMapPutReturnsOldValue(true);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_beanMapPutReturnsOldValue, true);
+ p2.setBeanMapPutReturnsOldValue(true);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_beanConstructorVisibility, Visibility.DEFAULT);
+ p1.setBeanConstructorVisibility(Visibility.DEFAULT);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_beanConstructorVisibility, Visibility.DEFAULT);
+ p2.setBeanConstructorVisibility(Visibility.DEFAULT);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_beanConstructorVisibility, Visibility.NONE);
+ p1.setBeanConstructorVisibility(Visibility.NONE);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_beanConstructorVisibility, Visibility.NONE);
+ p2.setBeanConstructorVisibility(Visibility.NONE);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_beanConstructorVisibility, Visibility.PRIVATE);
+ p1.setBeanConstructorVisibility(Visibility.PRIVATE);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_beanConstructorVisibility, Visibility.PRIVATE);
+ p2.setBeanConstructorVisibility(Visibility.PRIVATE);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_beanConstructorVisibility, Visibility.PROTECTED);
+ p1.setBeanConstructorVisibility(Visibility.PROTECTED);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_beanConstructorVisibility, Visibility.PROTECTED);
+ p2.setBeanConstructorVisibility(Visibility.PROTECTED);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_beanClassVisibility, Visibility.DEFAULT);
+ p1.setBeanClassVisibility(Visibility.DEFAULT);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_beanClassVisibility, Visibility.DEFAULT);
+ p2.setBeanClassVisibility(Visibility.DEFAULT);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_beanClassVisibility, Visibility.NONE);
+ p1.setBeanClassVisibility(Visibility.NONE);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_beanClassVisibility, Visibility.NONE);
+ p2.setBeanClassVisibility(Visibility.NONE);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_beanClassVisibility, Visibility.PRIVATE);
+ p1.setBeanClassVisibility(Visibility.PRIVATE);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_beanClassVisibility, Visibility.PRIVATE);
+ p2.setBeanClassVisibility(Visibility.PRIVATE);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_beanClassVisibility, Visibility.PROTECTED);
+ p1.setBeanClassVisibility(Visibility.PROTECTED);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_beanClassVisibility, Visibility.PROTECTED);
+ p2.setBeanClassVisibility(Visibility.PROTECTED);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_beanFieldVisibility, Visibility.DEFAULT);
+ p1.setBeanFieldVisibility(Visibility.DEFAULT);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_beanFieldVisibility, Visibility.DEFAULT);
+ p2.setBeanFieldVisibility(Visibility.DEFAULT);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_beanFieldVisibility, Visibility.NONE);
+ p1.setBeanFieldVisibility(Visibility.NONE);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_beanFieldVisibility, Visibility.NONE);
+ p2.setBeanFieldVisibility(Visibility.NONE);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_beanFieldVisibility, Visibility.PRIVATE);
+ p1.setBeanFieldVisibility(Visibility.PRIVATE);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_beanFieldVisibility, Visibility.PRIVATE);
+ p2.setBeanFieldVisibility(Visibility.PRIVATE);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_beanFieldVisibility, Visibility.PROTECTED);
+ p1.setBeanFieldVisibility(Visibility.PROTECTED);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_beanFieldVisibility, Visibility.PROTECTED);
+ p2.setBeanFieldVisibility(Visibility.PROTECTED);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_methodVisibility, Visibility.DEFAULT);
+ p1.setMethodVisibility(Visibility.DEFAULT);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_methodVisibility, Visibility.DEFAULT);
+ p2.setMethodVisibility(Visibility.DEFAULT);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_methodVisibility, Visibility.NONE);
+ p1.setMethodVisibility(Visibility.NONE);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_methodVisibility, Visibility.NONE);
+ p2.setMethodVisibility(Visibility.NONE);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_methodVisibility, Visibility.PRIVATE);
+ p1.setMethodVisibility(Visibility.PRIVATE);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_methodVisibility, Visibility.PRIVATE);
+ p2.setMethodVisibility(Visibility.PRIVATE);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_methodVisibility, Visibility.PROTECTED);
+ p1.setMethodVisibility(Visibility.PROTECTED);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_methodVisibility, Visibility.PROTECTED);
+ p2.setMethodVisibility(Visibility.PROTECTED);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_useJavaBeanIntrospector, true);
+ p1.setUseJavaBeanIntrospector(true);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_useJavaBeanIntrospector, true);
+ p2.setUseJavaBeanIntrospector(true);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_useInterfaceProxies, false);
+ p1.setUseInterfaceProxies(false);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_useInterfaceProxies, false);
+ p2.setUseInterfaceProxies(false);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_ignoreUnknownBeanProperties, true);
+ p1.setIgnoreUnknownBeanProperties(true);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_ignoreUnknownBeanProperties, true);
+ p2.setIgnoreUnknownBeanProperties(true);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_ignoreUnknownNullBeanProperties, false);
+ p1.setIgnoreUnknownNullBeanProperties(false);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_ignoreUnknownNullBeanProperties, false);
+ p2.setIgnoreUnknownNullBeanProperties(false);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_ignorePropertiesWithoutSetters, false);
+ p1.setIgnorePropertiesWithoutSetters(false);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_ignorePropertiesWithoutSetters, false);
+ p2.setIgnorePropertiesWithoutSetters(false);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_ignoreInvocationExceptionsOnGetters, true);
+ p1.setIgnoreInvocationExceptionsOnGetters(true);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_ignoreInvocationExceptionsOnGetters, true);
+ p2.setIgnoreInvocationExceptionsOnGetters(true);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_ignoreInvocationExceptionsOnSetters, true);
+ p1.setIgnoreInvocationExceptionsOnSetters(true);
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_ignoreInvocationExceptionsOnSetters, true);
+ p2.setIgnoreInvocationExceptionsOnSetters(true);
assertSameCache(p1, p2);
- p1.setProperty(BEAN_notBeanPackages_add, "foo");
+ p1.addNotBeanPackages("foo");
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_notBeanPackages_add, "foo");
+ p2.addNotBeanPackages("foo");
assertSameCache(p1, p2);
- p1.setProperty(BEAN_notBeanPackages_add, "bar");
+ p1.addNotBeanPackages("bar");
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_notBeanPackages_add, "bar");
+ p2.addNotBeanPackages("bar");
assertSameCache(p1, p2);
- p1.setProperty(BEAN_notBeanPackages_add, "baz");
- p1.setProperty(BEAN_notBeanPackages_add, "bing");
+ p1.addNotBeanPackages("baz");
+ p1.addNotBeanPackages("bing");
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_notBeanPackages_add, "bing");
- p2.setProperty(BEAN_notBeanPackages_add, "baz");
+ p2.addNotBeanPackages("bing");
+ p2.addNotBeanPackages("baz");
assertSameCache(p1, p2);
- p1.setProperty(BEAN_notBeanPackages_remove, "bar");
+ p1.removeNotBeanPackages("bar");
assertDifferentCache(p1, p2);
- p2.setProperty(BEAN_notBeanPackages_remove, "bar");
+ p2.removeNotBeanPackages("bar");
assertSameCache(p1, p2);
p1.addPojoSwaps(DummyPojoSwapA.class);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/BeanMapTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/BeanMapTest.java b/juneau-core-test/src/test/java/org/apache/juneau/BeanMapTest.java
index 17dfc5e..3343a6d 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/BeanMapTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/BeanMapTest.java
@@ -12,7 +12,6 @@
// ***************************************************************************************************************************
package org.apache.juneau;
-import static org.apache.juneau.BeanContext.*;
import static org.apache.juneau.TestUtils.*;
import static org.junit.Assert.*;
@@ -31,11 +30,10 @@ import org.junit.*;
@SuppressWarnings({"unchecked","rawtypes","serial","javadoc"})
public class BeanMapTest {
- JsonSerializer serializer = JsonSerializer.DEFAULT_LAX.clone().setClassLoader(BeanMapTest.class.getClassLoader());
+ JsonSerializer serializer = JsonSerializer.DEFAULT_LAX.clone();
BeanContext bc = ContextFactory.create()
- .setClassLoader(this.getClass().getClassLoader())
- .addToDictionary(MyBeanDictionaryMap.class)
+ .addToBeanDictionary(MyBeanDictionaryMap.class)
.addPojoSwaps(CalendarSwap.ISO8601DTZ.class)
.getBeanContext();
BeanSession session = bc.createSession();
@@ -480,7 +478,7 @@ public class BeanMapTest {
m.put("b", new D2());
assertEquals("default", t.b.s);
- JsonParser p = new JsonParser().setClassLoader(BeanMapTest.class.getClassLoader()).addToDictionary(D2.class);
+ JsonParser p = new JsonParser().addToBeanDictionary(D2.class);
m.put("lb1", new ObjectList("[{_type:'D2',s:'foobar'}]", p));
assertEquals(ObjectList.class.getName(), t.lb1.getClass().getName());
assertEquals(D2.class.getName(), t.lb1.get(0).getClass().getName());
@@ -666,7 +664,7 @@ public class BeanMapTest {
assertEquals(HEnum.THREE, t7.getEnum2());
// Create instance directly from JSON.
- JsonParser p = new JsonParser().setClassLoader(BeanMapTest.class.getClassLoader()).addToDictionary(H.class);
+ JsonParser p = new JsonParser().addToBeanDictionary(H.class);
t7 = (H)p.parse("{_type:'H',enum1:'THREE',enum2:'ONE'}", Object.class);
assertEquals("{enum1:'THREE',enum2:'ONE'}", serializer.serialize(t7));
assertEquals(HEnum.THREE, t7.enum1);
@@ -958,7 +956,7 @@ public class BeanMapTest {
// JSON
String json = "{baz:789,foo:123,bar:456}";
- p = new JsonParser().setProperty(BEAN_ignoreUnknownBeanProperties, true);
+ p = new JsonParser().setIgnoreUnknownBeanProperties(true);
t = p.parse(json, O.class);
assertEquals(123, t.foo);
@@ -972,7 +970,7 @@ public class BeanMapTest {
// XML
String xml = "<object><baz type='number'>789</baz><foo type='number'>123</foo><bar type='number'>456</bar></object>";
- p = new XmlParser().setProperty(BEAN_ignoreUnknownBeanProperties, true);
+ p = new XmlParser().setIgnoreUnknownBeanProperties(true);
t = p.parse(xml, O.class);
assertEquals(123, t.foo);
@@ -986,7 +984,7 @@ public class BeanMapTest {
// HTML
String html = "<table _type='object'><tr><th><string>key</string></th><th><string>value</string></th></tr><tr><td><string>baz</string></td><td><number>789</number></td></tr><tr><td><string>foo</string></td><td><number>123</number></td></tr><tr><td><string>bar</string></td><td><number>456</number></td></tr></table>";
- p = new HtmlParser().setProperty(BEAN_ignoreUnknownBeanProperties, true);
+ p = new HtmlParser().setIgnoreUnknownBeanProperties(true);
t = p.parse(html, O.class);
assertEquals(123, t.foo);
@@ -1000,7 +998,7 @@ public class BeanMapTest {
// UON
String uon = "(baz=789,foo=123,bar=456)";
- p = new UonParser().setProperty(BEAN_ignoreUnknownBeanProperties, true);
+ p = new UonParser().setIgnoreUnknownBeanProperties(true);
t = p.parse(uon, O.class);
assertEquals(123, t.foo);
@@ -1014,7 +1012,7 @@ public class BeanMapTest {
// URL-Encoding
String urlencoding = "baz=789&foo=123&bar=456";
- p = new UrlEncodingParser().setProperty(BEAN_ignoreUnknownBeanProperties, true);
+ p = new UrlEncodingParser().setIgnoreUnknownBeanProperties(true);
t = p.parse(urlencoding, O.class);
assertEquals(123, t.foo);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/IgnoredClassesTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/IgnoredClassesTest.java b/juneau-core-test/src/test/java/org/apache/juneau/IgnoredClassesTest.java
index b363231..28674f3 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/IgnoredClassesTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/IgnoredClassesTest.java
@@ -12,7 +12,6 @@
// ***************************************************************************************************************************
package org.apache.juneau;
-import static org.apache.juneau.BeanContext.*;
import static org.apache.juneau.TestUtils.*;
import static org.junit.Assert.*;
import static org.junit.Assume.*;
@@ -44,21 +43,21 @@ public class IgnoredClassesTest {
A a = new A();
JsonSerializer s = new JsonSerializer.Simple();
assertEquals("{f1:'isBean'}", s.serialize(a));
- s.setProperty(BEAN_notBeanPackages_add, "org.apache.juneau");
+ s.addNotBeanPackages("org.apache.juneau");
assertEquals("'isNotBean'", s.serialize(a));
- s.setProperty(BEAN_notBeanPackages_remove, "org.apache.juneau");
+ s.removeNotBeanPackages("org.apache.juneau");
assertEquals("{f1:'isBean'}", s.serialize(a));
- s.setProperty(BEAN_notBeanPackages_add, "org.apache.juneau.*");
+ s.addNotBeanPackages("org.apache.juneau.*");
assertEquals("'isNotBean'", s.serialize(a));
- s.setProperty(BEAN_notBeanPackages_remove, "org.apache.juneau.*");
+ s.removeNotBeanPackages("org.apache.juneau.*");
assertEquals("{f1:'isBean'}", s.serialize(a));
- s.setProperty(BEAN_notBeanPackages_add, "org.apache.juneau.*");
+ s.addNotBeanPackages("org.apache.juneau.*");
assertEquals("'isNotBean'", s.serialize(a));
- s.setProperty(BEAN_notBeanPackages_remove, "org.apache.juneau.*");
+ s.removeNotBeanPackages("org.apache.juneau.*");
assertEquals("{f1:'isBean'}", s.serialize(a));
- s.setProperty(BEAN_notBeanPackages_add, "org.apache.juneau");
+ s.addNotBeanPackages("org.apache.juneau");
assertEquals("'isNotBean'", s.serialize(a));
- s.setProperty(BEAN_notBeanPackages_add, "org.apache.juneau.x");
+ s.addNotBeanPackages("org.apache.juneau.x");
assertEquals("'isNotBean'", s.serialize(a));
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/TestUtils.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/TestUtils.java b/juneau-core-test/src/test/java/org/apache/juneau/TestUtils.java
index bdf0a77..1e278b5 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/TestUtils.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/TestUtils.java
@@ -12,9 +12,6 @@
// ***************************************************************************************************************************
package org.apache.juneau;
-import static org.apache.juneau.BeanContext.*;
-import static org.apache.juneau.serializer.SerializerContext.*;
-import static org.apache.juneau.xml.XmlSerializerContext.*;
import static org.junit.Assert.*;
import java.io.*;
@@ -43,12 +40,12 @@ import org.xml.sax.*;
public class TestUtils {
private static JsonSerializer js = new JsonSerializer.Simple()
- .setProperty(SERIALIZER_trimNullProperties, false);
+ .setTrimNullProperties(false);
private static JsonSerializer jsSorted = new JsonSerializer.Simple()
- .setProperty(SERIALIZER_sortCollections, true)
- .setProperty(SERIALIZER_sortMaps, true)
- .setProperty(SERIALIZER_trimNullProperties, false);
+ .setSortCollections(true)
+ .setSortMaps(true)
+ .setTrimNullProperties(false);
private static JsonSerializer js2 = new JsonSerializer.Simple()
@@ -56,7 +53,7 @@ public class TestUtils {
private static JsonSerializer js3 = new JsonSerializer.Simple()
.addPojoSwaps(IteratorSwap.class, EnumerationSwap.class)
- .setProperty(BEAN_sortProperties, true);
+ .setSortProperties(true);
/**
* Verifies that two objects are equivalent.
@@ -224,7 +221,7 @@ public class TestUtils {
* Test whitespace and generated schema.
*/
public static void validateXml(Object o, XmlSerializer s) throws Exception {
- s = s.clone().setProperty(SERIALIZER_useIndentation, true).setProperty(XML_enableNamespaces, true).setProperty(XML_addNamespaceUrisToRoot, true);
+ s = s.clone().setUseIndentation(true).setEnableNamespaces(true).setAddNamespaceUrisToRoot(true);
String xml = s.serialize(o);
String xmlSchema = null;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/VisibilityTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/VisibilityTest.java b/juneau-core-test/src/test/java/org/apache/juneau/VisibilityTest.java
index 953dd45..cff0fcb 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/VisibilityTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/VisibilityTest.java
@@ -12,7 +12,6 @@
// ***************************************************************************************************************************
package org.apache.juneau;
-import static org.apache.juneau.BeanContext.*;
import static org.apache.juneau.Visibility.*;
import static org.junit.Assert.*;
@@ -28,18 +27,18 @@ public class VisibilityTest {
//====================================================================================================
@Test
public void testClassDefault() throws Exception {
- JsonSerializer s1 = JsonSerializer.DEFAULT_LAX.clone().setProperty(BEAN_beansRequireSomeProperties, "false");
- JsonSerializer s2 = JsonSerializer.DEFAULT_LAX.clone().setProperty(BEAN_beansRequireSomeProperties, "false").setProperty(BEAN_beanClassVisibility, PROTECTED);
- JsonSerializer s3 = JsonSerializer.DEFAULT_LAX.clone().setProperty(BEAN_beansRequireSomeProperties, "false").setProperty(BEAN_beanClassVisibility, Visibility.DEFAULT);
- JsonSerializer s4 = JsonSerializer.DEFAULT_LAX.clone().setProperty(BEAN_beansRequireSomeProperties, "false").setProperty(BEAN_beanClassVisibility, PRIVATE);
+ JsonSerializer s1 = JsonSerializer.DEFAULT_LAX.clone().setBeansRequireSomeProperties(false);
+ JsonSerializer s2 = JsonSerializer.DEFAULT_LAX.clone().setBeansRequireSomeProperties(false).setBeanClassVisibility(PROTECTED);
+ JsonSerializer s3 = JsonSerializer.DEFAULT_LAX.clone().setBeansRequireSomeProperties(false).setBeanClassVisibility(Visibility.DEFAULT);
+ JsonSerializer s4 = JsonSerializer.DEFAULT_LAX.clone().setBeansRequireSomeProperties(false).setBeanClassVisibility(PRIVATE);
A1 a1 = A1.create();
String r;
- s1.setProperty(BEAN_beanFieldVisibility, NONE);
- s2.setProperty(BEAN_beanFieldVisibility, NONE);
- s3.setProperty(BEAN_beanFieldVisibility, NONE);
- s4.setProperty(BEAN_beanFieldVisibility, NONE);
+ s1.setBeanFieldVisibility(NONE);
+ s2.setBeanFieldVisibility(NONE);
+ s3.setBeanFieldVisibility(NONE);
+ s4.setBeanFieldVisibility(NONE);
r = s1.serialize(a1);
assertEquals("{f5:5}", r);
@@ -53,10 +52,10 @@ public class VisibilityTest {
r = s4.serialize(a1);
assertEquals("{f5:5}", r);
- s1.setProperty(BEAN_beanFieldVisibility, PUBLIC);
- s2.setProperty(BEAN_beanFieldVisibility, PUBLIC);
- s3.setProperty(BEAN_beanFieldVisibility, PUBLIC);
- s4.setProperty(BEAN_beanFieldVisibility, PUBLIC);
+ s1.setBeanFieldVisibility(PUBLIC);
+ s2.setBeanFieldVisibility(PUBLIC);
+ s3.setBeanFieldVisibility(PUBLIC);
+ s4.setBeanFieldVisibility(PUBLIC);
r = s1.serialize(a1);
assertEquals("{f1:1,f5:5,g2:{f1:1,f5:5},g3:'A3',g4:'A4',g5:'A5'}", r);
@@ -70,10 +69,10 @@ public class VisibilityTest {
r = s4.serialize(a1);
assertEquals("{f1:1,f5:5,g2:{f1:1,f5:5},g3:{f1:1,f5:5},g4:{f1:1,f5:5},g5:{f1:1,f5:5}}", r);
- s1.setProperty(BEAN_beanFieldVisibility, PROTECTED);
- s2.setProperty(BEAN_beanFieldVisibility, PROTECTED);
- s3.setProperty(BEAN_beanFieldVisibility, PROTECTED);
- s4.setProperty(BEAN_beanFieldVisibility, PROTECTED);
+ s1.setBeanFieldVisibility(PROTECTED);
+ s2.setBeanFieldVisibility(PROTECTED);
+ s3.setBeanFieldVisibility(PROTECTED);
+ s4.setBeanFieldVisibility(PROTECTED);
r = s1.serialize(a1);
assertEquals("{f1:1,f2:2,f5:5,g2:{f1:1,f2:2,f5:5},g3:'A3',g4:'A4',g5:'A5'}", r);
@@ -87,10 +86,10 @@ public class VisibilityTest {
r = s4.serialize(a1);
assertEquals("{f1:1,f2:2,f5:5,g2:{f1:1,f2:2,f5:5},g3:{f1:1,f2:2,f5:5},g4:{f1:1,f2:2,f5:5},g5:{f1:1,f2:2,f5:5}}", r);
- s1.setProperty(BEAN_beanFieldVisibility, Visibility.DEFAULT);
- s2.setProperty(BEAN_beanFieldVisibility, Visibility.DEFAULT);
- s3.setProperty(BEAN_beanFieldVisibility, Visibility.DEFAULT);
- s4.setProperty(BEAN_beanFieldVisibility, Visibility.DEFAULT);
+ s1.setBeanFieldVisibility(Visibility.DEFAULT);
+ s2.setBeanFieldVisibility(Visibility.DEFAULT);
+ s3.setBeanFieldVisibility(Visibility.DEFAULT);
+ s4.setBeanFieldVisibility(Visibility.DEFAULT);
r = s1.serialize(a1);
assertEquals("{f1:1,f2:2,f3:3,f5:5,g2:{f1:1,f2:2,f3:3,f5:5},g3:'A3',g4:'A4',g5:'A5'}", r);
@@ -104,10 +103,10 @@ public class VisibilityTest {
r = s4.serialize(a1);
assertEquals("{f1:1,f2:2,f3:3,f5:5,g2:{f1:1,f2:2,f3:3,f5:5},g3:{f1:1,f2:2,f3:3,f5:5},g4:{f1:1,f2:2,f3:3,f5:5},g5:{f1:1,f2:2,f3:3,f5:5}}", r);
- s1.setProperty(BEAN_beanFieldVisibility, PRIVATE);
- s2.setProperty(BEAN_beanFieldVisibility, PRIVATE);
- s3.setProperty(BEAN_beanFieldVisibility, PRIVATE);
- s4.setProperty(BEAN_beanFieldVisibility, PRIVATE);
+ s1.setBeanFieldVisibility(PRIVATE);
+ s2.setBeanFieldVisibility(PRIVATE);
+ s3.setBeanFieldVisibility(PRIVATE);
+ s4.setBeanFieldVisibility(PRIVATE);
r = s1.serialize(a1);
assertEquals("{f1:1,f2:2,f3:3,f4:4,f5:5,g2:{f1:1,f2:2,f3:3,f4:4,f5:5},g3:'A3',g4:'A4',g5:'A5'}", r);
@@ -121,10 +120,10 @@ public class VisibilityTest {
r = s4.serialize(a1);
assertEquals("{f1:1,f2:2,f3:3,f4:4,f5:5,g2:{f1:1,f2:2,f3:3,f4:4,f5:5},g3:{f1:1,f2:2,f3:3,f4:4,f5:5},g4:{f1:1,f2:2,f3:3,f4:4,f5:5},g5:{f1:1,f2:2,f3:3,f4:4,f5:5}}", r);
- s1.setProperty(BEAN_methodVisibility, NONE);
- s2.setProperty(BEAN_methodVisibility, NONE);
- s3.setProperty(BEAN_methodVisibility, NONE);
- s4.setProperty(BEAN_methodVisibility, NONE);
+ s1.setMethodVisibility(NONE);
+ s2.setMethodVisibility(NONE);
+ s3.setMethodVisibility(NONE);
+ s4.setMethodVisibility(NONE);
r = s1.serialize(a1);
assertEquals("{f1:1,f2:2,f3:3,f4:4,g2:{f1:1,f2:2,f3:3,f4:4},g3:'A3',g4:'A4',g5:'A5'}", r);
@@ -138,10 +137,10 @@ public class VisibilityTest {
r = s4.serialize(a1);
assertEquals("{f1:1,f2:2,f3:3,f4:4,g2:{f1:1,f2:2,f3:3,f4:4},g3:{f1:1,f2:2,f3:3,f4:4},g4:{f1:1,f2:2,f3:3,f4:4},g5:{f1:1,f2:2,f3:3,f4:4}}", r);
- s1.setProperty(BEAN_methodVisibility, PROTECTED);
- s2.setProperty(BEAN_methodVisibility, PROTECTED);
- s3.setProperty(BEAN_methodVisibility, PROTECTED);
- s4.setProperty(BEAN_methodVisibility, PROTECTED);
+ s1.setMethodVisibility(PROTECTED);
+ s2.setMethodVisibility(PROTECTED);
+ s3.setMethodVisibility(PROTECTED);
+ s4.setMethodVisibility(PROTECTED);
r = s1.serialize(a1);
assertEquals("{f1:1,f2:2,f3:3,f4:4,f5:5,f6:6,g2:{f1:1,f2:2,f3:3,f4:4,f5:5,f6:6},g3:'A3',g4:'A4',g5:'A5'}", r);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java b/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java
index 1a7fb26..cbf7630 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java
@@ -12,9 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.a.rttests;
-import static org.apache.juneau.BeanContext.*;
import static org.apache.juneau.a.rttests.RoundTripTest.Flags.*;
-import static org.apache.juneau.serializer.SerializerContext.*;
import static org.junit.Assert.*;
import java.util.*;
@@ -43,62 +41,62 @@ public class RoundTripAddClassAttrsTest extends RoundTripTest {
return Arrays.asList(new Object[][] {
{ /* 0 */
"JsonSerializer.DEFAULT/JsonParser.DEFAULT",
- new JsonSerializer().setProperty(SERIALIZER_addBeanTypeProperties, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()),
- new JsonParser().setProperty(BEAN_useInterfaceProxies, false).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()),
+ new JsonSerializer().setAddBeanTypeProperties(true),
+ new JsonParser().setUseInterfaceProxies(false),
0
},
{ /* 1 */
"JsonSerializer.DEFAULT_LAX/JsonParser.DEFAULT",
- new JsonSerializer.Simple().setProperty(SERIALIZER_addBeanTypeProperties, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()),
- new JsonParser().setProperty(BEAN_useInterfaceProxies, false).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()),
+ new JsonSerializer.Simple().setAddBeanTypeProperties(true),
+ new JsonParser().setUseInterfaceProxies(false),
0
},
{ /* 2 */
"JsonSerializer.DEFAULT_SQ/JsonParser.DEFAULT",
- new JsonSerializer.Simple().setProperty(SERIALIZER_addBeanTypeProperties, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()),
- new JsonParser().setProperty(BEAN_useInterfaceProxies, false).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()),
+ new JsonSerializer.Simple().setAddBeanTypeProperties(true),
+ new JsonParser().setUseInterfaceProxies(false),
0
},
{ /* 3 */
"XmlSerializer.DEFAULT/XmlParser.DEFAULT",
- new XmlSerializer().setProperty(SERIALIZER_addBeanTypeProperties, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()),
- new XmlParser().setProperty(BEAN_useInterfaceProxies, false).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()),
+ new XmlSerializer().setAddBeanTypeProperties(true),
+ new XmlParser().setUseInterfaceProxies(false),
CHECK_XML_WHITESPACE | VALIDATE_XML
},
{ /* 4 */
"HtmlSerializer.DEFAULT/HtmlParser.DEFAULT",
- new HtmlSerializer().setProperty(SERIALIZER_addBeanTypeProperties, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()),
- new HtmlParser().setProperty(BEAN_useInterfaceProxies, false).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()),
+ new HtmlSerializer().setAddBeanTypeProperties(true),
+ new HtmlParser().setUseInterfaceProxies(false),
CHECK_XML_WHITESPACE
},
{ /* 5 */
"UonSerializer.DEFAULT_ENCODING/UonParser.DEFAULT_DECODING",
- new UonSerializer.Encoding().setProperty(SERIALIZER_addBeanTypeProperties, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()),
- new UonParser.Decoding().setProperty(BEAN_useInterfaceProxies, false).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()),
+ new UonSerializer.Encoding().setAddBeanTypeProperties(true),
+ new UonParser.Decoding().setUseInterfaceProxies(false),
0
},
{ /* 6 */
"UonSerializer.DEFAULT/UonParser.DEFAULT",
- new UonSerializer().setProperty(SERIALIZER_addBeanTypeProperties, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()),
- new UonParser().setProperty(BEAN_useInterfaceProxies, false).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()),
+ new UonSerializer().setAddBeanTypeProperties(true),
+ new UonParser().setUseInterfaceProxies(false),
0
},
{ /* 7 */
"UrlEncodingSerializer.DEFAULT/UrlEncodingParser.DEFAULT",
- new UrlEncodingSerializer().setProperty(SERIALIZER_addBeanTypeProperties, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()),
- new UrlEncodingParser().setProperty(BEAN_useInterfaceProxies, false).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()),
+ new UrlEncodingSerializer().setAddBeanTypeProperties(true),
+ new UrlEncodingParser().setUseInterfaceProxies(false),
0
},
{ /* 8 */
"RdfSerializer.Xml/RdfParser.Xml",
- new RdfSerializer.Xml().setProperty(SERIALIZER_addBeanTypeProperties, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()),
- new RdfParser.Xml().setProperty(BEAN_useInterfaceProxies, false).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()),
+ new RdfSerializer.Xml().setAddBeanTypeProperties(true),
+ new RdfParser.Xml().setUseInterfaceProxies(false),
0
},
{ /* 9 */
"MsgPackSerializer.DEFAULT/MsgPackParser.DEFAULT",
- new MsgPackSerializer().setProperty(SERIALIZER_addBeanTypeProperties, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()),
- new MsgPackParser().setProperty(BEAN_useInterfaceProxies, false).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()),
+ new MsgPackSerializer().setAddBeanTypeProperties(true),
+ new MsgPackParser().setUseInterfaceProxies(false),
0
}
});
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjectsTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjectsTest.java b/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjectsTest.java
index 47d56ed..33b6886 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjectsTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjectsTest.java
@@ -13,9 +13,6 @@
package org.apache.juneau.a.rttests;
import static org.apache.juneau.a.rttests.RoundTripTest.Flags.*;
-import static org.apache.juneau.serializer.SerializerContext.*;
-import static org.apache.juneau.urlencoding.UonSerializerContext.*;
-import static org.apache.juneau.xml.XmlSerializerContext.*;
import java.text.*;
import java.util.*;
@@ -51,85 +48,85 @@ public class RoundTripLargeObjectsTest extends RoundTripTest {
// Full round-trip testing
{ /* 0 */
"Json DEFAULT",
- new JsonSerializer().setProperty(SERIALIZER_trimNullProperties, false),
+ new JsonSerializer().setTrimNullProperties(false),
JsonParser.DEFAULT,
0
},
{ /* 1 */
"Json DEFAULT_LAX",
- new JsonSerializer.Simple().setProperty(SERIALIZER_trimNullProperties, false),
+ new JsonSerializer.Simple().setTrimNullProperties(false),
JsonParser.DEFAULT,
0
},
{ /* 2 */
"Json DEFAULT_SQ",
- new JsonSerializer.Simple().setProperty(SERIALIZER_trimNullProperties, false),
+ new JsonSerializer.Simple().setTrimNullProperties(false),
JsonParser.DEFAULT,
0
},
{ /* 3 */
"Xml DEFAULT w/namespaces,validation",
- new XmlSerializer.NsSq().setProperty(SERIALIZER_trimNullProperties, false).setProperty(XML_addNamespaceUrisToRoot, true).setProperty(SERIALIZER_useIndentation, true),
+ new XmlSerializer.NsSq().setTrimNullProperties(false).setAddNamespaceUrisToRoot(true).setUseIndentation(true),
XmlParser.DEFAULT,
CHECK_XML_WHITESPACE | VALIDATE_XML
},
{ /* 4 */
"Xml DEFAULT wo/namespaces,validation",
- new XmlSerializer.Sq().setProperty(SERIALIZER_trimNullProperties, false),
+ new XmlSerializer.Sq().setTrimNullProperties(false),
XmlParser.DEFAULT,
CHECK_XML_WHITESPACE
},
{ /* 5 */
"Html",
- new HtmlSerializer().setProperty(SERIALIZER_trimNullProperties, false),
+ new HtmlSerializer().setTrimNullProperties(false),
HtmlParser.DEFAULT,
CHECK_XML_WHITESPACE
},
{ /* 6 */
"UrlEncoding",
- new UrlEncodingSerializer().setProperty(SERIALIZER_trimNullProperties, false).setProperty(UON_simpleMode, false),
+ new UrlEncodingSerializer().setTrimNullProperties(false).setSimpleMode(false),
UrlEncodingParser.DEFAULT,
0
},
{ /* 7 */
"Uon",
- new UonSerializer().setProperty(SERIALIZER_trimNullProperties, false).setProperty(UON_simpleMode, false),
+ new UonSerializer().setTrimNullProperties(false).setSimpleMode(false),
UonParser.DEFAULT,
0
},
{ /* 8 */
"MsgPack",
- new MsgPackSerializer().setProperty(SERIALIZER_trimNullProperties, false).setProperty(UON_simpleMode, false),
+ new MsgPackSerializer().setTrimNullProperties(false),
MsgPackParser.DEFAULT,
0
},
// { /* 9 */
// "Rdf.Xml",
-// new RdfSerializer.Xml().setProperty(SERIALIZER_trimNullProperties, false).setProperty(RDF_addLiteralTypes, true),
+// new RdfSerializer.Xml().setTrimNullProperties(false).setAddLiteralTypes(true),
// RdfParser.DEFAULT_XML,
// 0
// },
// { /* 10 */
// "Rdf.XmlAbbrev",
-// new RdfSerializer.XmlAbbrev().setProperty(SERIALIZER_trimNullProperties, false).setProperty(RDF_addLiteralTypes, true),
+// new RdfSerializer.XmlAbbrev().setTrimNullProperties(false).setAddLiteralTypes(true),
// RdfParser.DEFAULT_XML,
// 0
// },
// { /* 11 */
// "Rdf.Turtle",
-// new RdfSerializer.Turtle().setProperty(SERIALIZER_trimNullProperties, false).setProperty(RDF_addLiteralTypes, true),
+// new RdfSerializer.Turtle().setTrimNullProperties(false).setAddLiteralTypes(true),
// RdfParser.DEFAULT_TURTLE,
// 0
// },
// { /* 12 */
// "Rdf.NTriple",
-// new RdfSerializer.NTriple().setProperty(SERIALIZER_trimNullProperties, false).setProperty(RDF_addLiteralTypes, true),
+// new RdfSerializer.NTriple().setTrimNullProperties(false).setAddLiteralTypes(true),
// RdfParser.DEFAULT_NTRIPLE,
// 0
// },
// { /* 13 */
// "Rdf.N3",
-// new RdfSerializer.N3().setProperty(SERIALIZER_trimNullProperties, false).setProperty(RDF_addLiteralTypes, true),
+// new RdfSerializer.N3().setTrimNullProperties(false).setAddLiteralTypes(true),
// RdfParser.DEFAULT_N3,
// 0
// },
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripMapsTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripMapsTest.java b/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripMapsTest.java
index 41a3475..a644e85 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripMapsTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripMapsTest.java
@@ -12,8 +12,6 @@
// ***************************************************************************************************************************
package org.apache.juneau.a.rttests;
-import static org.apache.juneau.serializer.SerializerContext.*;
-import static org.apache.juneau.html.HtmlSerializerContext.*;
import static org.junit.Assert.*;
import java.util.*;
@@ -107,27 +105,27 @@ public class RoundTripMapsTest extends RoundTripTest {
t.put(new byte[]{4,5,6}, null);
t.put(null, "b");
- s = new JsonSerializer.Simple().addPojoSwaps(getPojoSwaps()).setProperty(SERIALIZER_trimNullProperties, false);
+ s = new JsonSerializer.Simple().addPojoSwaps(getPojoSwaps()).setTrimNullProperties(false);
e = "{AQID:'a',BAUG:null,null:'b'}";
r = s.serialize(t);
assertEquals(e, r);
- s = new XmlSerializer.NsSq().addPojoSwaps(getPojoSwaps()).setProperty(SERIALIZER_trimNullProperties, false);
+ s = new XmlSerializer.NsSq().addPojoSwaps(getPojoSwaps()).setTrimNullProperties(false);
e = "<object><AQID>a</AQID><BAUG _type='null'/><_x0000_>b</_x0000_></object>";
r = s.serialize(t);
assertEquals(e, r);
- s = new HtmlSerializer.Sq().addPojoSwaps(getPojoSwaps()).setProperty(SERIALIZER_trimNullProperties, false).setProperty(HTML_addKeyValueTableHeaders, true);
+ s = new HtmlSerializer.Sq().addPojoSwaps(getPojoSwaps()).setTrimNullProperties(false).setAddKeyValueTableHeaders(true);
e = "<table><tr><th>key</th><th>value</th></tr><tr><td>AQID</td><td>a</td></tr><tr><td>BAUG</td><td><null/></td></tr><tr><td><null/></td><td>b</td></tr></table>";
r = s.serialize(t);
assertEquals(e, r);
- s = new UonSerializer.Encoding().addPojoSwaps(getPojoSwaps()).setProperty(SERIALIZER_trimNullProperties, false);
+ s = new UonSerializer.Encoding().addPojoSwaps(getPojoSwaps()).setTrimNullProperties(false);
e = "$o(AQID=a,BAUG=%00,%00=b)";
r = s.serialize(t);
assertEquals(e, r);
- s = new UrlEncodingSerializer().addPojoSwaps(getPojoSwaps()).setProperty(SERIALIZER_trimNullProperties, false);
+ s = new UrlEncodingSerializer().addPojoSwaps(getPojoSwaps()).setTrimNullProperties(false);
e = "AQID=a&BAUG=%00&%00=b";
r = s.serialize(t);
assertEquals(e, r);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java b/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
index c0e8070..1912417 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
@@ -13,11 +13,6 @@
package org.apache.juneau.a.rttests;
import static org.apache.juneau.a.rttests.RoundTripTest.Flags.*;
-import static org.apache.juneau.jena.RdfSerializerContext.*;
-import static org.apache.juneau.urlencoding.UonSerializerContext.*;
-import static org.apache.juneau.urlencoding.UrlEncodingContext.*;
-import static org.apache.juneau.xml.XmlSerializerContext.*;
-import static org.apache.juneau.html.HtmlSerializerContext.*;
import java.lang.reflect.Type;
import java.util.*;
@@ -53,121 +48,121 @@ public abstract class RoundTripTest {
// Full round-trip testing
{ /* 0 */
"Json - default",
- new JsonSerializer().setProperty(SERIALIZER_trimNullProperties, false),
+ new JsonSerializer().setTrimNullProperties(false),
JsonParser.DEFAULT,
0
},
{ /* 1 */
"Json - lax",
- new JsonSerializer.Simple().setProperty(SERIALIZER_trimNullProperties, false),
+ new JsonSerializer.Simple().setTrimNullProperties(false),
JsonParser.DEFAULT,
0
},
{ /* 2 */
"Json - lax, readable",
- new JsonSerializer.SimpleReadable().setProperty(SERIALIZER_trimNullProperties, false),
+ new JsonSerializer.SimpleReadable().setTrimNullProperties(false),
JsonParser.DEFAULT,
0
},
{ /* 3 */
"Xml - namespaces, validation, readable",
- new XmlSerializer.NsSq().setProperty(SERIALIZER_trimNullProperties, false).setProperty(XML_addNamespaceUrisToRoot, true).setProperty(SERIALIZER_useIndentation, true),
+ new XmlSerializer.NsSq().setTrimNullProperties(false).setAddNamespaceUrisToRoot(true).setUseIndentation(true),
XmlParser.DEFAULT,
CHECK_XML_WHITESPACE | VALIDATE_XML
},
{ /* 4 */
"Xml - no namespaces, validation",
- new XmlSerializer.Sq().setProperty(SERIALIZER_trimNullProperties, false),
+ new XmlSerializer.Sq().setTrimNullProperties(false),
XmlParser.DEFAULT,
CHECK_XML_WHITESPACE
},
{ /* 5 */
"Html - default",
- new HtmlSerializer().setProperty(SERIALIZER_trimNullProperties, false),
+ new HtmlSerializer().setTrimNullProperties(false),
HtmlParser.DEFAULT,
CHECK_XML_WHITESPACE
},
{ /* 6 */
"Html - readable",
- new HtmlSerializer.SqReadable().setProperty(SERIALIZER_trimNullProperties, false),
+ new HtmlSerializer.SqReadable().setTrimNullProperties(false),
HtmlParser.DEFAULT,
CHECK_XML_WHITESPACE
},
{ /* 7 */
"Html - with key/value headers",
- new HtmlSerializer().setProperty(HTML_addKeyValueTableHeaders, true),
+ new HtmlSerializer().setAddKeyValueTableHeaders(true),
HtmlParser.DEFAULT,
CHECK_XML_WHITESPACE
},
{ /* 8 */
"Uon - default",
- new UonSerializer().setProperty(SERIALIZER_trimNullProperties, false).setProperty(UON_simpleMode, false),
+ new UonSerializer().setTrimNullProperties(false).setSimpleMode(false),
UonParser.DEFAULT,
0
},
{ /* 9 */
"Uon - readable",
- new UonSerializer.Readable().setProperty(SERIALIZER_trimNullProperties, false).setProperty(UON_simpleMode, false),
+ new UonSerializer.Readable().setTrimNullProperties(false).setSimpleMode(false),
UonParser.DEFAULT_WS_AWARE,
0
},
{ /* 10 */
"Uon - encoded",
- new UonSerializer.Encoding().setProperty(SERIALIZER_trimNullProperties, false).setProperty(UON_simpleMode, false),
+ new UonSerializer.Encoding().setTrimNullProperties(false).setSimpleMode(false),
UonParser.DEFAULT_DECODING,
0
},
{ /* 11 */
"UrlEncoding - default",
- new UrlEncodingSerializer().setProperty(SERIALIZER_trimNullProperties, false).setProperty(UON_simpleMode, false),
+ new UrlEncodingSerializer().setTrimNullProperties(false).setSimpleMode(false),
UrlEncodingParser.DEFAULT,
0
},
{ /* 12 */
"UrlEncoding - readable",
- new UrlEncodingSerializer.Readable().setProperty(SERIALIZER_trimNullProperties, false).setProperty(UON_simpleMode, false),
+ new UrlEncodingSerializer.Readable().setTrimNullProperties(false).setSimpleMode(false),
UrlEncodingParser.DEFAULT_WS_AWARE,
0
},
{ /* 13 */
"UrlEncoding - expanded params",
- new UrlEncodingSerializer().setProperty(URLENC_expandedParams, true).setProperty(UON_simpleMode, false),
- new UrlEncodingParser().setProperty(URLENC_expandedParams, true),
+ new UrlEncodingSerializer().setExpandedParams(true).setSimpleMode(false),
+ new UrlEncodingParser().setExpandedParams(true),
0
},
{ /* 14 */
"Rdf.Xml",
- new RdfSerializer.Xml().setProperty(SERIALIZER_trimNullProperties, false).setProperty(RDF_addLiteralTypes, true),
+ new RdfSerializer.Xml().setTrimNullProperties(false).setAddLiteralTypes(true),
RdfParser.DEFAULT_XML,
0
},
{ /* 15 */
"Rdf.XmlAbbrev",
- new RdfSerializer.XmlAbbrev().setProperty(SERIALIZER_trimNullProperties, false).setProperty(RDF_addLiteralTypes, true),
+ new RdfSerializer.XmlAbbrev().setTrimNullProperties(false).setAddLiteralTypes(true),
RdfParser.DEFAULT_XML,
0
},
{ /* 16 */
"Rdf.Turtle",
- new RdfSerializer.Turtle().setProperty(SERIALIZER_trimNullProperties, false).setProperty(RDF_addLiteralTypes, true),
+ new RdfSerializer.Turtle().setTrimNullProperties(false).setAddLiteralTypes(true),
RdfParser.DEFAULT_TURTLE,
0
},
{ /* 17 */
"Rdf.NTriple",
- new RdfSerializer.NTriple().setProperty(SERIALIZER_trimNullProperties, false).setProperty(RDF_addLiteralTypes, true),
+ new RdfSerializer.NTriple().setTrimNullProperties(false).setAddLiteralTypes(true),
RdfParser.DEFAULT_NTRIPLE,
0
},
{ /* 18 */
"Rdf.N3",
- new RdfSerializer.N3().setProperty(SERIALIZER_trimNullProperties, false).setProperty(RDF_addLiteralTypes, true),
+ new RdfSerializer.N3().setTrimNullProperties(false).setAddLiteralTypes(true),
RdfParser.DEFAULT_N3,
0
},
{ /* 19 */
"MsgPack",
- new MsgPackSerializer().setProperty(SERIALIZER_trimNullProperties, false).setProperty(RDF_addLiteralTypes, true),
+ new MsgPackSerializer().setTrimNullProperties(false),
MsgPackParser.DEFAULT,
0
},
@@ -175,13 +170,13 @@ public abstract class RoundTripTest {
// Validation testing only
{ /* 20 */
"Json schema",
- new JsonSchemaSerializer().setProperty(SERIALIZER_trimNullProperties, false),
+ new JsonSchemaSerializer().setTrimNullProperties(false),
null,
RETURN_ORIGINAL_OBJECT
},
{ /* 21 */
"Xml schema",
- new XmlSchemaSerializer().setProperty(SERIALIZER_trimNullProperties, false),
+ new XmlSchemaSerializer().setTrimNullProperties(false),
new XmlValidatorParser(),
RETURN_ORIGINAL_OBJECT | CHECK_XML_WHITESPACE
},
@@ -197,8 +192,8 @@ public abstract class RoundTripTest {
public boolean debug = false;
public RoundTripTest(String label, Serializer s, Parser p, int flags) throws Exception {
- this.s = s.clone().addBeanFilters(getBeanFilters()).addPojoSwaps(getPojoSwaps()).addToDictionary(getDictionary());
- this.p = p == null ? null : p.clone().addBeanFilters(getBeanFilters()).addPojoSwaps(getPojoSwaps()).addToDictionary(getDictionary());
+ this.s = s.clone().addBeanFilters(getBeanFilters()).addPojoSwaps(getPojoSwaps()).addToBeanDictionary(getDictionary());
+ this.p = p == null ? null : p.clone().addBeanFilters(getBeanFilters()).addPojoSwaps(getPojoSwaps()).addToBeanDictionary(getDictionary());
this.label = label;
Map<Class<Object>, Class<? extends Object>> m = getImplClasses();
@@ -271,10 +266,10 @@ public abstract class RoundTripTest {
p.addPojoSwaps(c);
}
- protected void addToDictionary(Class<?>...c) {
- s.addToDictionary(c);
+ protected void addToBeanDictionary(Class<?>...c) {
+ s.addToBeanDictionary(c);
if (p != null)
- p.addToDictionary(c);
+ p.addToBeanDictionary(c);
}
public boolean isValidationOnly() {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTrimStringsTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTrimStringsTest.java b/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTrimStringsTest.java
index 1801f88..37c1d10 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTrimStringsTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTrimStringsTest.java
@@ -40,8 +40,8 @@ public class RoundTripTrimStringsTest extends RoundTripTest {
Parser p = getParser();
Object in, a, e;
- Serializer s2 = s.clone().setProperty(SerializerContext.SERIALIZER_trimStrings, true);
- Parser p2 = p.clone().setProperty(ParserContext.PARSER_trimStrings, true);
+ Serializer s2 = s.clone().setTrimStrings(true);
+ Parser p2 = p.clone().setTrimStrings(true);
in = " foo bar ";
e = "foo bar";
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/dto/atom/AtomTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/dto/atom/AtomTest.java b/juneau-core-test/src/test/java/org/apache/juneau/dto/atom/AtomTest.java
index aadc082..362aa8a 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/dto/atom/AtomTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/dto/atom/AtomTest.java
@@ -12,9 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.dto.atom;
-import static org.apache.juneau.BeanContext.*;
import static org.apache.juneau.TestUtils.*;
-import static org.apache.juneau.xml.XmlSerializerContext.*;
import static org.junit.Assert.*;
import static org.apache.juneau.dto.atom.AtomBuilder.*;
@@ -100,7 +98,7 @@ public class AtomTest {
+" <updated>2016-12-31T01:02:03-04:00</updated>\n"
+"</feed>\n";
- s = new XmlSerializer.SqReadable().setProperty(XML_enableNamespaces, false).setProperty(BEAN_sortProperties, true);
+ s = new XmlSerializer.SqReadable().setEnableNamespaces(false).setSortProperties(true);
r = s.serialize(f);
assertEquals(expected, r);
f2 = p.parse(r, Feed.class);
@@ -146,7 +144,7 @@ public class AtomTest {
+" <atom:updated>2016-12-31T01:02:03-04:00</atom:updated>\n"
+"</atom:feed>\n";
- s = new XmlSerializer.SqReadable().setProperty(XML_enableNamespaces, true).setProperty(XML_addNamespaceUrisToRoot, true).setProperty(BEAN_sortProperties, true);
+ s = new XmlSerializer.SqReadable().setEnableNamespaces(true).setAddNamespaceUrisToRoot(true).setSortProperties(true);
r = s.serialize(f);
assertEquals(expected, r);
f2 = p.parse(r, Feed.class);
@@ -192,7 +190,7 @@ public class AtomTest {
+" <updated>2016-12-31T01:02:03-04:00</updated>\n"
+"</feed>\n";
- s = new XmlSerializer.SqReadable().setProperty(XML_defaultNamespace, "atom").setProperty(XML_enableNamespaces, true).setProperty(XML_addNamespaceUrisToRoot, true).setProperty(BEAN_sortProperties, true);
+ s = new XmlSerializer.SqReadable().setDefaultNamespace("atom").setEnableNamespaces(true).setAddNamespaceUrisToRoot(true).setSortProperties(true);
r = s.serialize(f);
assertEquals(expected, r);
f2 = p.parse(r, Feed.class);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/dto/cognos/CognosXmlTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/dto/cognos/CognosXmlTest.java b/juneau-core-test/src/test/java/org/apache/juneau/dto/cognos/CognosXmlTest.java
index 90db605..bd98a6d 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/dto/cognos/CognosXmlTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/dto/cognos/CognosXmlTest.java
@@ -13,8 +13,6 @@
package org.apache.juneau.dto.cognos;
import static org.apache.juneau.TestUtils.*;
-import static org.apache.juneau.serializer.SerializerContext.*;
-import static org.apache.juneau.xml.XmlSerializerContext.*;
import static org.junit.Assert.*;
import java.util.*;
@@ -75,11 +73,11 @@ public class CognosXmlTest {
};
XmlSerializer s = new XmlSerializer()
- .setProperty(SERIALIZER_useIndentation, true)
- .setProperty(SERIALIZER_quoteChar, '\'')
- .setProperty(XML_defaultNamespace, "cognos")
- .setProperty(XML_enableNamespaces, true)
- .setProperty(XML_addNamespaceUrisToRoot, true);
+ .setUseIndentation(true)
+ .setQuoteChar('\'')
+ .setDefaultNamespace("cognos")
+ .setEnableNamespaces(true)
+ .setAddNamespaceUrisToRoot(true);
DataSet ds = new DataSet(c, rows, BeanContext.DEFAULT.createSession());
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/html/CommonParserTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/html/CommonParserTest.java b/juneau-core-test/src/test/java/org/apache/juneau/html/CommonParserTest.java
index abc948f..b03bd57 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/html/CommonParserTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/html/CommonParserTest.java
@@ -12,8 +12,6 @@
// ***************************************************************************************************************************
package org.apache.juneau.html;
-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 = HtmlParser.DEFAULT.clone().setClassLoader(getClass().getClassLoader()).addToDictionary(A1.class);
+ ReaderParser p = HtmlParser.DEFAULT.clone().addToBeanDictionary(A1.class);
Map m = null;
String in;
@@ -65,7 +63,7 @@ public class CommonParserTest {
t2.add(new A3("name0","value0"));
t2.add(new A3("name1","value1"));
t1.list = t2;
- in = new HtmlSerializer().setProperty(SERIALIZER_addBeanTypeProperties, true).serialize(t1);
+ in = new HtmlSerializer().setAddBeanTypeProperties(true).serialize(t1);
t1 = (A1)p.parse(in, Object.class);
assertEquals("value1", t1.list.get(1).value);
@@ -96,7 +94,7 @@ public class CommonParserTest {
//====================================================================================================
@Test
public void testCorrectHandlingOfUnknownProperties() throws Exception {
- ReaderParser p = new HtmlParser().setProperty(BEAN_ignoreUnknownBeanProperties, true);
+ ReaderParser p = new HtmlParser().setIgnoreUnknownBeanProperties(true);
B t;
String in = "<table _type='object'><tr><th><string>key</string></th><th><string>value</string></th></tr><tr><td><string>a</string></td><td><number>1</number></td></tr><tr><td><string>unknown</string></td><td><number>1</number></td></tr><tr><td><string>b</string></td><td><number>2</number></td></tr></table>";
@@ -145,7 +143,7 @@ public class CommonParserTest {
@Test
public void testParserListeners() throws Exception {
final List<String> events = new LinkedList<String>();
- HtmlParser p = new HtmlParser().setProperty(BEAN_ignoreUnknownBeanProperties, true);
+ HtmlParser p = new HtmlParser().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/html/CommonTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/html/CommonTest.java b/juneau-core-test/src/test/java/org/apache/juneau/html/CommonTest.java
index e5f316d..0109e44 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/html/CommonTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/html/CommonTest.java
@@ -12,7 +12,6 @@
// ***************************************************************************************************************************
package org.apache.juneau.html;
-import static org.apache.juneau.BeanContext.*;
import static org.apache.juneau.TestUtils.*;
import static org.apache.juneau.html.HtmlSerializerContext.*;
import static org.junit.Assert.*;
@@ -25,7 +24,6 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.testbeans.*;
-import org.apache.juneau.xml.*;
import org.junit.*;
@SuppressWarnings({"serial","javadoc"})
@@ -36,17 +34,17 @@ public class CommonTest {
//====================================================================================================
@Test
public void testTrimNullsFromBeans() throws Exception {
- HtmlSerializer s = new HtmlSerializer.Sq().setProperty(HTML_addKeyValueTableHeaders, true);
+ HtmlSerializer s = new HtmlSerializer.Sq().setAddKeyValueTableHeaders(true);
HtmlParser p = HtmlParser.DEFAULT;
A t1 = A.create(), t2;
- s.setProperty(SERIALIZER_trimNullProperties, false);
+ s.setTrimNullProperties(false);
String r = s.serialize(t1);
assertEquals("<table><tr><th>key</th><th>value</th></tr><tr><td>s1</td><td><null/></td></tr><tr><td>s2</td><td>s2</td></tr></table>", r);
t2 = p.parse(r, A.class);
assertEqualObjects(t1, t2);
- s.setProperty(SERIALIZER_trimNullProperties, true);
+ s.setTrimNullProperties(true);
r = s.serialize(t1);
assertEquals("<table><tr><th>key</th><th>value</th></tr><tr><td>s2</td><td>s2</td></tr></table>", r);
t2 = p.parse(r, A.class);
@@ -68,18 +66,18 @@ public class CommonTest {
//====================================================================================================
@Test
public void testTrimEmptyMaps() throws Exception {
- HtmlSerializer s = new HtmlSerializer.Sq().setProperty(HTML_addKeyValueTableHeaders, true);
+ HtmlSerializer s = new HtmlSerializer.Sq().setAddKeyValueTableHeaders(true);
HtmlParser p = HtmlParser.DEFAULT;
B t1 = B.create(), t2;
String r;
- s.setProperty(SERIALIZER_trimEmptyMaps, false);
+ s.setTrimEmptyMaps(false);
r = s.serialize(t1);
assertEquals("<table><tr><th>key</th><th>value</th></tr><tr><td>f1</td><td><table><tr><th>key</th><th>value</th></tr></table></td></tr><tr><td>f2</td><td><table><tr><th>key</th><th>value</th></tr><tr><td>f2a</td><td><null/></td></tr><tr><td>f2b</td><td><table><tr><th>key</th><th>value</th></tr><tr><td>s2</td><td>s2</td></tr></table></td></tr></table></td></tr></table>", r);
t2 = p.parse(r, B.class);
assertEqualObjects(t1, t2);
- s.setProperty(SERIALIZER_trimEmptyMaps, true);
+ s.setTrimEmptyMaps(true);
r = s.serialize(t1);
assertEquals("<table><tr><th>key</th><th>value</th></tr><tr><td>f2</td><td><table><tr><th>key</th><th>value</th></tr><tr><td>f2a</td><td><null/></td></tr><tr><td>f2b</td><td><table><tr><th>key</th><th>value</th></tr><tr><td>s2</td><td>s2</td></tr></table></td></tr></table></td></tr></table>", r);
t2 = p.parse(r, B.class);
@@ -102,18 +100,18 @@ public class CommonTest {
//====================================================================================================
@Test
public void testTrimEmptyLists() throws Exception {
- HtmlSerializer s = new HtmlSerializer.Sq().setProperty(HTML_addKeyValueTableHeaders, true);
+ HtmlSerializer s = new HtmlSerializer.Sq().setAddKeyValueTableHeaders(true);
HtmlParser p = HtmlParser.DEFAULT;
C t1 = C.create(), t2;
String r;
- s.setProperty(SERIALIZER_trimEmptyCollections, false);
+ s.setTrimEmptyCollections(false);
r = s.serialize(t1);
assertEquals("<table><tr><th>key</th><th>value</th></tr><tr><td>f1</td><td><ul></ul></td></tr><tr><td>f2</td><td><table _type='array'><tr><th>s2</th></tr><tr><null/></tr><tr><td>s2</td></tr></table></td></tr></table>", r);
t2 = p.parse(r, C.class);
assertEqualObjects(t1, t2);
- s.setProperty(SERIALIZER_trimEmptyCollections, true);
+ s.setTrimEmptyCollections(true);
r = s.serialize(t1);
assertEquals("<table><tr><th>key</th><th>value</th></tr><tr><td>f2</td><td><table _type='array'><tr><th>s2</th></tr><tr><null/></tr><tr><td>s2</td></tr></table></td></tr></table>", r);
t2 = p.parse(r, C.class);
@@ -136,12 +134,12 @@ public class CommonTest {
//====================================================================================================
@Test
public void testTrimEmptyArrays() throws Exception {
- HtmlSerializer s = new HtmlSerializer.Sq().setProperty(HTML_addKeyValueTableHeaders, true);
+ HtmlSerializer s = new HtmlSerializer.Sq().setAddKeyValueTableHeaders(true);
HtmlParser p = HtmlParser.DEFAULT;
D t1 = D.create(), t2;
String r;
- s.setProperty(SERIALIZER_trimEmptyCollections, false);
+ s.setTrimEmptyCollections(false);
r = s.serialize(t1);
assertEquals(
"<table>"
@@ -165,7 +163,7 @@ public class CommonTest {
t2 = p.parse(r, D.class);
assertEqualObjects(t1, t2);
- s.setProperty(SERIALIZER_trimEmptyCollections, true);
+ s.setTrimEmptyCollections(true);
r = s.serialize(t1);
assertEquals(
"<table>"
@@ -202,7 +200,7 @@ public class CommonTest {
//====================================================================================================
@Test
public void testBeanPropertyProperties() throws Exception {
- HtmlSerializer s = HtmlSerializer.DEFAULT_SQ.clone().setProperty(HTML_addKeyValueTableHeaders, true);
+ HtmlSerializer s = HtmlSerializer.DEFAULT_SQ.clone().setAddKeyValueTableHeaders(true);
E1 t = new E1();
String r;
@@ -355,12 +353,12 @@ public class CommonTest {
//====================================================================================================
@Test
public void testUris() throws Exception {
- HtmlSerializer s = new HtmlSerializer.Sq().setProperty(HTML_uriAnchorText, PROPERTY_NAME).setProperty(SERIALIZER_useIndentation, false).setProperty(HTML_addKeyValueTableHeaders, true);
+ HtmlSerializer s = new HtmlSerializer.Sq().setUriAnchorText(PROPERTY_NAME).setUseIndentation(false).setAddKeyValueTableHeaders(true);
TestURI t = new TestURI();
String r;
String expected;
- s.setProperty(SERIALIZER_relativeUriBase, null);
+ s.setRelativeUriBase(null);
r = strip(s.serialize(t));
expected = ""
+"\n[f0]=<a href='f0/x0'>f0</a>"
@@ -381,7 +379,7 @@ public class CommonTest {
;
assertEquals(expected, r);
- s.setProperty(SERIALIZER_relativeUriBase, ""); // Same as null.
+ s.setRelativeUriBase(""); // Same as null.
r = strip(s.serialize(t));
expected = ""
+"\n[f0]=<a href='f0/x0'>f0</a>"
@@ -402,7 +400,7 @@ public class CommonTest {
;
assertEquals(expected, r);
- s.setProperty(SERIALIZER_relativeUriBase, "/cr");
+ s.setRelativeUriBase("/cr");
r = strip(s.serialize(t));
expected = ""
+"\n[f0]=<a href='/cr/f0/x0'>f0</a>"
@@ -423,7 +421,7 @@ public class CommonTest {
;
assertEquals(expected, r);
- s.setProperty(SERIALIZER_relativeUriBase, "/cr/"); // Same as above
+ s.setRelativeUriBase("/cr/"); // Same as above
r = strip(s.serialize(t));
expected = ""
+"\n[f0]=<a href='/cr/f0/x0'>f0</a>"
@@ -444,7 +442,7 @@ public class CommonTest {
;
assertEquals(expected, r);
- s.setProperty(SERIALIZER_relativeUriBase, "/");
+ s.setRelativeUriBase("/");
r = strip(s.serialize(t));
expected = ""
+"\n[f0]=<a href='/f0/x0'>f0</a>"
@@ -465,9 +463,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 = strip(s.serialize(t));
expected = ""
+"\n[f0]=<a href='f0/x0'>f0</a>"
@@ -488,7 +486,7 @@ public class CommonTest {
;
assertEquals(expected, r);
- s.setProperty(SERIALIZER_absolutePathUriBase, "http://foo/");
+ s.setAbsolutePathUriBase("http://foo/");
r = strip(s.serialize(t));
expected = ""
+"\n[f0]=<a href='f0/x0'>f0</a>"
@@ -509,7 +507,7 @@ public class CommonTest {
;
assertEquals(expected, r);
- s.setProperty(SERIALIZER_absolutePathUriBase, ""); // Same as null.
+ s.setAbsolutePathUriBase(""); // Same as null.
r = strip(s.serialize(t));
expected = ""
+"\n[f0]=<a href='f0/x0'>f0</a>"
@@ -547,15 +545,15 @@ public class CommonTest {
public void testLockedSerializer() throws Exception {
HtmlSerializer s = new HtmlSerializer().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) {}
}
@@ -565,7 +563,7 @@ public class CommonTest {
//====================================================================================================
@Test
public void testRecursion() throws Exception {
- HtmlSerializer s = new HtmlSerializer.Sq().setProperty(HTML_addKeyValueTableHeaders, true);
+ HtmlSerializer s = new HtmlSerializer.Sq().setAddKeyValueTableHeaders(true);
R1 r1 = new R1();
R2 r2 = new R2();
@@ -584,7 +582,7 @@ public class CommonTest {
}
// Recursion detection, no ignore
- s.setProperty(SERIALIZER_detectRecursions, true);
+ s.setDetectRecursions(true);
try {
s.serialize(r1);
fail("Exception expected!");
@@ -596,7 +594,7 @@ public class CommonTest {
assertTrue(msg.contains("->[3]r1:org.apache.juneau.html.CommonTest$R1"));
}
- s.setProperty(SERIALIZER_ignoreRecursions, true);
+ s.setIgnoreRecursions(true);
assertEquals("<table><tr><th>key</th><th>value</th></tr><tr><td>name</td><td>foo</td></tr><tr><td>r2</td><td><table><tr><th>key</th><th>value</th></tr><tr><td>name</td><td>bar</td></tr><tr><td>r3</td><td><table><tr><th>key</th><th>value</th></tr><tr><td>name</td><td>baz</td></tr></table></td></tr></table></td></tr></table>",
s.serialize(r1));
@@ -622,7 +620,7 @@ public class CommonTest {
//====================================================================================================
@Test
public void testBasicBean() throws Exception {
- WriterSerializer s = new HtmlSerializer.Sq().setProperty(SERIALIZER_trimNullProperties, false).setProperty(BEAN_sortProperties, true).setProperty(HTML_addKeyValueTableHeaders, true);
+ WriterSerializer s = new HtmlSerializer.Sq().setTrimNullProperties(false).setSortProperties(true).setAddKeyValueTableHeaders(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/html/HtmlTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/html/HtmlTest.java b/juneau-core-test/src/test/java/org/apache/juneau/html/HtmlTest.java
index 435f85f..2025430 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/html/HtmlTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/html/HtmlTest.java
@@ -49,12 +49,12 @@ public class HtmlTest {
//====================================================================================================
@Test
public void testAnchorTextOptions() throws Exception {
- HtmlSerializer s = new HtmlSerializer.Sq().setProperty(HTML_addKeyValueTableHeaders, true);
+ HtmlSerializer s = new HtmlSerializer.Sq().setAddKeyValueTableHeaders(true);
TestURI t = new TestURI();
String r;
String expected = null;
- s.setProperty(HTML_uriAnchorText, TO_STRING);
+ s.setUriAnchorText(TO_STRING);
r = strip(s.serialize(t));
expected = ""
+"\n[f0]=<a href='f0/x0'>f0/x0</a>"
@@ -74,9 +74,9 @@ public class HtmlTest {
+"\n[fe]=<a href='http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'>http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL</a>";
assertEquals(expected, r);
- s.setProperty(SERIALIZER_absolutePathUriBase, "http://myhost");
- s.setProperty(SERIALIZER_relativeUriBase, "/cr");
- s.setProperty(HTML_uriAnchorText, TO_STRING);
+ s.setAbsolutePathUriBase("http://myhost");
+ s.setRelativeUriBase("/cr");
+ s.setUriAnchorText(TO_STRING);
r = strip(s.serialize(t));
expected = ""
+"\n[f0]=<a href='/cr/f0/x0'>f0/x0</a>"
@@ -96,7 +96,7 @@ public class HtmlTest {
+"\n[fe]=<a href='http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'>http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL</a>";
assertEquals(expected, r);
- s.setProperty(HTML_uriAnchorText, URI);
+ s.setUriAnchorText(URI);
r = strip(s.serialize(t));
expected = ""
+"\n[f0]=<a href='/cr/f0/x0'>/cr/f0/x0</a>"
@@ -116,7 +116,7 @@ public class HtmlTest {
+"\n[fe]=<a href='http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'>http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL</a>";
assertEquals(expected, r);
- s.setProperty(HTML_uriAnchorText, LAST_TOKEN);
+ s.setUriAnchorText(LAST_TOKEN);
r = strip(s.serialize(t));
expected = ""
+"\n[f0]=<a href='/cr/f0/x0'>x0</a>"
@@ -136,7 +136,7 @@ public class HtmlTest {
+"\n[fe]=<a href='http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'>xe</a>";
assertEquals(expected, r);
- s.setProperty(HTML_uriAnchorText, URI_ANCHOR);
+ s.setUriAnchorText(URI_ANCHOR);
r = strip(s.serialize(t));
expected = ""
+"\n[f0]=<a href='/cr/f0/x0'>f0/x0</a>"
@@ -156,7 +156,7 @@ public class HtmlTest {
+"\n[fe]=<a href='http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'>http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL</a>";
assertEquals(expected, r);
- s.setProperty(HTML_labelParameter, "label2");
+ s.setLabelParameter("label2");
r = strip(s.serialize(t));
expected = ""
+"\n[f0]=<a href='/cr/f0/x0'>f0/x0</a>"
@@ -176,7 +176,7 @@ public class HtmlTest {
+"\n[fe]=<a href='http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'>MY_LABEL</a>";
assertEquals(expected, r);
- s.setProperty(HTML_detectLinksInStrings, false);
+ s.setDetectLinksInStrings(false);
r = strip(s.serialize(t));
expected = ""
+"\n[f0]=<a href='/cr/f0/x0'>f0/x0</a>"
@@ -196,8 +196,8 @@ public class HtmlTest {
+"\n[fe]=http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL";
assertEquals(expected, r);
- s.setProperty(HTML_detectLinksInStrings, true);
- s.setProperty(HTML_lookForLabelParameters, false);
+ s.setDetectLinksInStrings(true);
+ s.setLookForLabelParameters(false);
r = strip(s.serialize(t));
expected = ""
+"\n[f0]=<a href='/cr/f0/x0'>f0/x0</a>"
@@ -232,7 +232,7 @@ public class HtmlTest {
//====================================================================================================
@Test
public void testHtmlAnnotationAsPlainText() throws Exception {
- HtmlSerializer s = new HtmlSerializer.Sq().setProperty(HTML_addKeyValueTableHeaders, true);
+ HtmlSerializer s = new HtmlSerializer.Sq().setAddKeyValueTableHeaders(true);
Object o = null;
String r;
@@ -264,7 +264,7 @@ public class HtmlTest {
//====================================================================================================
@Test
public void testHtmlAnnotationAsXml() throws Exception {
- HtmlSerializer s = new HtmlSerializer.Sq().setProperty(HTML_addKeyValueTableHeaders, true);
+ HtmlSerializer s = new HtmlSerializer.Sq().setAddKeyValueTableHeaders(true);
Object o = null;
String r;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonParserTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonParserTest.java b/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonParserTest.java
index 5bd851f..7d034cd 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonParserTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonParserTest.java
@@ -12,9 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.jena;
-import static org.apache.juneau.BeanContext.*;
import static org.apache.juneau.jena.RdfCommonContext.*;
-import static org.apache.juneau.jena.RdfSerializerContext.*;
import static org.junit.Assert.*;
import java.util.*;
@@ -44,9 +42,9 @@ public class CommonParserTest {
private RdfSerializer getBasicSerializer() {
return new RdfSerializer()
- .setProperty(SERIALIZER_quoteChar, '\'')
- .setProperty(RDF_addLiteralTypes, true)
- .setProperty(SERIALIZER_useIndentation, false)
+ .setQuoteChar('\'')
+ .setAddLiteralTypes(true)
+ .setUseIndentation(false)
.setProperty(RDF_rdfxml_allowBadUris, true)
.setProperty(RDF_rdfxml_showDoctypeDeclaration, false)
.setProperty(RDF_rdfxml_showXmlDeclaration, false);
@@ -58,7 +56,7 @@ public class CommonParserTest {
@Test
public void testFromSerializer() throws Exception {
WriterSerializer s = getBasicSerializer();
- ReaderParser p = new RdfParser.Xml().setProperty(RdfParserContext.RDF_trimWhitespace, true).setClassLoader(getClass().getClassLoader());
+ ReaderParser p = new RdfParser.Xml().setTrimWhitespace(true);
Map m = null;
String in;
Integer one = Integer.valueOf(1);
@@ -111,7 +109,7 @@ public class CommonParserTest {
t2.add(new A3("name1","value1"));
t1.list = t2;
- s.setProperty(SERIALIZER_addBeanTypeProperties, true);
+ s.setAddBeanTypeProperties(true);
in = strip(s.serialize(t1));
assertEquals("<rdf:Description><j:_type>A1</j:_type><jp:list><rdf:Seq><rdf:li rdf:parseType='Resource'><jp:name>name0</jp:name><jp:value>value0</jp:value></rdf:li><rdf:li rdf:parseType='Resource'><jp:name>name1</jp:name><jp:value>value1</jp:value></rdf:li></rdf:Seq></jp:list></rdf:Description>", in);
in = wrap(in);
@@ -141,7 +139,7 @@ public class CommonParserTest {
//====================================================================================================
@Test
public void testCorrectHandlingOfUnknownProperties() throws Exception {
- ReaderParser p = new RdfParser.Xml().setProperty(BEAN_ignoreUnknownBeanProperties, true);
+ ReaderParser p = new RdfParser.Xml().setIgnoreUnknownBeanProperties(true);
B t;
String in = wrap("<rdf:Description><jp:a rdf:datatype='http://www.w3.org/2001/XMLSchema#int'>1</jp:a><jp:unknownProperty>foo</jp:unknownProperty><jp:b rdf:datatype='http://www.w3.org/2001/XMLSchema#int'>2</jp:b></rdf:Description>");
@@ -189,7 +187,7 @@ public class CommonParserTest {
@Test
public void testParserListeners() throws Exception {
final List<String> events = new LinkedList<String>();
- RdfParser p = new RdfParser.Xml().setProperty(BEAN_ignoreUnknownBeanProperties, true);
+ RdfParser p = new RdfParser.Xml().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/jena/CommonTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonTest.java b/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonTest.java
index 1e8daff..1c603ae 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonTest.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.serializer.SerializerContext.*;
import static org.junit.Assert.*;
import java.net.*;
@@ -27,7 +26,6 @@ import org.apache.juneau.internal.*;
import org.apache.juneau.jena.annotation.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.testbeans.*;
-import org.apache.juneau.xml.*;
import org.junit.*;
@SuppressWarnings({"serial","javadoc"})
@@ -35,8 +33,8 @@ public class CommonTest {
private RdfSerializer getBasicSerializer() {
return new RdfSerializer()
- .setProperty(SERIALIZER_quoteChar, '\'')
- .setProperty(SERIALIZER_useIndentation, false)
+ .setQuoteChar('\'')
+ .setUseIndentation(false)
.setProperty(RDF_rdfxml_allowBadUris, true)
.setProperty(RDF_rdfxml_showDoctypeDeclaration, false)
.setProperty(RDF_rdfxml_showXmlDeclaration, false);
@@ -55,13 +53,13 @@ public class CommonTest {
RdfParser p = RdfParser.DEFAULT_XML;
A t1 = A.create(), t2;
- s.setProperty(SERIALIZER_trimNullProperties, false);
+ s.setTrimNullProperties(false);
String r = s.serialize(t1);
assertEquals("<rdf:Description><jp:s1 rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/><jp:s2>s2</jp:s2></rdf:Description>", strip(r));
t2 = p.parse(r, A.class);
assertEqualObjects(t1, t2);
- s.setProperty(SERIALIZER_trimNullProperties, true);
+ s.setTrimNullProperties(true);
r = s.serialize(t1);
assertEquals("<rdf:Description><jp:s2>s2</jp:s2></rdf:Description>", strip(r));
t2 = p.parse(r, A.class);
@@ -88,13 +86,13 @@ public class CommonTest {
B t1 = B.create(), t2;
String r;
- s.setProperty(SERIALIZER_trimEmptyMaps, false);
+ s.setTrimEmptyMaps(false);
r = s.serialize(t1);
assertEquals("<rdf:Description><jp:f1 rdf:parseType='Resource'></jp:f1><jp:f2 rdf:parseType='Resource'><jp:f2a rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/><jp:f2b rdf:parseType='Resource'><jp:s2>s2</jp:s2></jp:f2b></jp:f2></rdf:Description>", strip(r));
t2 = p.parse(r, B.class);
assertEqualObjects(t1, t2);
- s.setProperty(SERIALIZER_trimEmptyMaps, true);
+ s.setTrimEmptyMaps(true);
r = s.serialize(t1);
assertEquals("<rdf:Description><jp:f2 rdf:parseType='Resource'><jp:f2a rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/><jp:f2b rdf:parseType='Resource'><jp:s2>s2</jp:s2></jp:f2b></jp:f2></rdf:Description>", strip(r));
t2 = p.parse(r, B.class);
@@ -122,13 +120,13 @@ public class CommonTest {
C t1 = C.create(), t2;
String r;
- s.setProperty(SERIALIZER_trimEmptyCollections, false);
+ s.setTrimEmptyCollections(false);
r = s.serialize(t1);
assertEquals("<rdf:Description><jp:f1><rdf:Seq/></jp:f1><jp:f2><rdf:Seq><rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/><rdf:li rdf:parseType='Resource'><jp:s2>s2</jp:s2></rdf:li></rdf:Seq></jp:f2></rdf:Description>", strip(r));
t2 = p.parse(r, C.class);
assertEqualObjects(t1, t2);
- s.setProperty(SERIALIZER_trimEmptyCollections, true);
+ s.setTrimEmptyCollections(true);
r = s.serialize(t1);
assertEquals("<rdf:Description><jp:f2><rdf:Seq><rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/><rdf:li rdf:parseType='Resource'><jp:s2>s2</jp:s2></rdf:li></rdf:Seq></jp:f2></rdf:Description>", strip(r));
t2 = p.parse(r, C.class);
@@ -157,13 +155,13 @@ public class CommonTest {
D t1 = D.create(), t2;
String r;
- s.setProperty(SERIALIZER_trimEmptyCollections, false);
+ s.setTrimEmptyCollections(false);
r = s.serialize(t1);
assertEquals("<rdf:Description><jp:f1><rdf:Seq/></jp:f1><jp:f2><rdf:Seq><rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/><rdf:li rdf:parseType='Resource'><jp:s2>s2</jp:s2></rdf:li></rdf:Seq></jp:f2></rdf:Description>", strip(r));
t2 = p.parse(r, D.class);
assertEqualObjects(t1, t2);
- s.setProperty(SERIALIZER_trimEmptyCollections, true);
+ s.setTrimEmptyCollections(true);
r = s.serialize(t1);
assertEquals("<rdf:Description><jp:f2><rdf:Seq><rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/><rdf:li rdf:parseType='Resource'><jp:s2>s2</jp:s2></rdf:li></rdf:Seq></jp:f2></rdf:Description>", strip(r));
t2 = p.parse(r, D.class);
@@ -288,7 +286,7 @@ public class CommonTest {
String r;
String expected = "";
- s.setProperty(SERIALIZER_relativeUriBase, null);
+ s.setRelativeUriBase(null);
r = stripAndSort(s.serialize(t));
expected = ""
+"</rdf:Description>>"
@@ -310,11 +308,11 @@ public class CommonTest {
;
assertEquals(expected, r);
- s.setProperty(SERIALIZER_relativeUriBase, ""); // Same as null.
+ s.setRelativeUriBase(""); // Same as null.
r = stripAndSort(s.serialize(t));
assertEquals(expected, r);
- s.setProperty(SERIALIZER_relativeUriBase, "/cr");
+ s.setRelativeUriBase("/cr");
r = stripAndSort(s.serialize(t));
expected = ""
+"</rdf:Description>>"
@@ -336,11 +334,11 @@ public class CommonTest {
;
assertEquals(expected, r);
- s.setProperty(SERIALIZER_relativeUriBase, "/cr/"); // Same as above
+ s.setRelativeUriBase("/cr/"); // Same as above
r = stripAndSort(s.serialize(t));
assertEquals(expected, r);
- s.setProperty(SERIALIZER_relativeUriBase, "/");
+ s.setRelativeUriBase("/");
r = stripAndSort(s.serialize(t));
expected = ""
+"</rdf:Description>>"
@@ -362,9 +360,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 = stripAndSort(s.serialize(t));
expected = ""
+"</rdf:Description>>"
@@ -386,11 +384,11 @@ public class CommonTest {
;
assertEquals(expected, r);
- s.setProperty(SERIALIZER_absolutePathUriBase, "http://foo/");
+ s.setAbsolutePathUriBase("http://foo/");
r = stripAndSort(s.serialize(t));
assertEquals(expected, r);
- s.setProperty(SERIALIZER_absolutePathUriBase, ""); // Same as null.
+ s.setAbsolutePathUriBase(""); // Same as null.
r = stripAndSort(s.serialize(t));
expected = ""
+"</rdf:Description>>"
@@ -428,15 +426,11 @@ public class CommonTest {
public void testLockedSerializer() throws Exception {
RdfSerializer s = getBasicSerializer().lock();
try {
- s.setProperty(XmlSerializerContext.XML_enableNamespaces, true);
+ s.setAddBeanTypeProperties(true);
fail("Locked exception not thrown");
} catch (LockedException e) {}
try {
- s.setProperty(SerializerContext.SERIALIZER_addBeanTypeProperties, 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) {}
}
@@ -446,7 +440,7 @@ public class CommonTest {
//====================================================================================================
@Test
public void testRecursion() throws Exception {
- WriterSerializer s = new RdfSerializer.XmlAbbrev().setProperty(SERIALIZER_quoteChar, '\'');
+ WriterSerializer s = new RdfSerializer.XmlAbbrev().setQuoteChar('\'');
R1 r1 = new R1();
R2 r2 = new R2();
@@ -465,7 +459,7 @@ public class CommonTest {
}
// Recursion detection, no ignore
- s.setProperty(SERIALIZER_detectRecursions, true);
+ s.setDetectRecursions(true);
try {
s.serialize(r1);
fail("Exception expected!");
@@ -477,7 +471,7 @@ public class CommonTest {
assertTrue(msg.contains("->[3]r1:org.apache.juneau.jena.CommonTest$R1"));
}
- s.setProperty(SERIALIZER_ignoreRecursions, true);
+ s.setIgnoreRecursions(true);
String r = s.serialize(r1).replace("\r", "");
// Note...the order of the namespaces is not always the same depending on the JVM.
// The Jena libraries appear to use a hashmap for these.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonXmlTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonXmlTest.java b/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonXmlTest.java
index 90c9966..81e43cb 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonXmlTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonXmlTest.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.serializer.SerializerContext.*;
import static org.junit.Assert.*;
import java.net.*;
@@ -28,8 +27,8 @@ public class CommonXmlTest {
private RdfSerializer getBasicSerializer() {
return new RdfSerializer()
- .setProperty(SERIALIZER_quoteChar, '\'')
- .setProperty(SERIALIZER_useIndentation, false)
+ .setQuoteChar('\'')
+ .setUseIndentation(false)
.setProperty(RDF_rdfxml_allowBadUris, true)
.setProperty(RDF_rdfxml_showDoctypeDeclaration, false)
.setProperty(RDF_rdfxml_showXmlDeclaration, false);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/68dffad1/juneau-core-test/src/test/java/org/apache/juneau/jena/RdfParserTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/jena/RdfParserTest.java b/juneau-core-test/src/test/java/org/apache/juneau/jena/RdfParserTest.java
index 8eaef41..404c3e9 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/jena/RdfParserTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/jena/RdfParserTest.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 static org.junit.Assert.*;
import java.net.URI;
@@ -48,8 +47,8 @@ public class RdfParserTest {
// Create a new serializer with readable output.
RdfSerializer s = new RdfSerializer.XmlAbbrev()
.setProperty(RDF_rdfxml_tab, 3)
- .setProperty(SERIALIZER_quoteChar, '\'')
- .setProperty(RDF_addRootProperty, true);
+ .setQuoteChar('\'')
+ .setAddRootProperty(true);
String expected =
"<rdf:RDF a='http://ns/' a1='http://ns2/' j='http://www.apache.org/juneau/' jp='http://www.apache.org/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>"