diff --git a/xstream-introduction/src/main/java/org/baeldung/initializer/SimpleXstreamInitializer.java b/xstream-introduction/src/main/java/org/baeldung/initializer/SimpleXstreamInitializer.java index c96392daf5..59912539ca 100644 --- a/xstream-introduction/src/main/java/org/baeldung/initializer/SimpleXstreamInitializer.java +++ b/xstream-introduction/src/main/java/org/baeldung/initializer/SimpleXstreamInitializer.java @@ -4,16 +4,16 @@ import com.thoughtworks.xstream.XStream; public class SimpleXstreamInitializer { - private static XStream xtreamInstance; + private static XStream xstreamInstance; public static XStream getXstreamInstance() { - if (xtreamInstance == null) { + if (xstreamInstance == null) { synchronized (SimpleXstreamInitializer.class) { - if (xtreamInstance == null) { - xtreamInstance = new XStream(); + if (xstreamInstance == null) { + xstreamInstance = new XStream(); } } } - return xtreamInstance; + return xstreamInstance; } } \ No newline at end of file diff --git a/xstream-introduction/src/main/java/org/baeldung/utility/SimpleDataGeneration.java b/xstream-introduction/src/main/java/org/baeldung/utility/SimpleDataGeneration.java index e6a97e5ea6..2b2a7a8bb8 100644 --- a/xstream-introduction/src/main/java/org/baeldung/utility/SimpleDataGeneration.java +++ b/xstream-introduction/src/main/java/org/baeldung/utility/SimpleDataGeneration.java @@ -14,7 +14,7 @@ public class SimpleDataGeneration { Calendar cal = Calendar.getInstance(); cal.set(1986 , 01 , 14); customer.setDob(cal.getTime()); - customer.setFirstName("Xstream"); + customer.setFirstName("XStream"); customer.setLastName("Java"); List contactDetailsList = new ArrayList(); diff --git a/xstream-introduction/src/test/java/org/baeldung/utility/XStreamSimpleXmlTest.java b/xstream-introduction/src/test/java/org/baeldung/utility/XStreamSimpleXmlTest.java index 489960d6ca..57d0bd2b55 100644 --- a/xstream-introduction/src/test/java/org/baeldung/utility/XStreamSimpleXmlTest.java +++ b/xstream-introduction/src/test/java/org/baeldung/utility/XStreamSimpleXmlTest.java @@ -14,21 +14,21 @@ public class XStreamSimpleXmlTest { private Customer customer = null; private String dataXml = null; - private XStream xtream = null; + private XStream xstream = null; @Before public void dataSetup() { customer = SimpleDataGeneration.generateData(); - xtream = SimpleXstreamInitializer.getXstreamInstance(); - xtream.processAnnotations(Customer.class); - xtream.processAnnotations(AddressDetails.class); - xtream.processAnnotations(ContactDetails.class); - xtream.omitField(Customer.class , "firstName"); - xtream.registerConverter(new MyDateConverter()); + xstream = SimpleXstreamInitializer.getXstreamInstance(); + xstream.processAnnotations(Customer.class); + xstream.processAnnotations(AddressDetails.class); + xstream.processAnnotations(ContactDetails.class); + xstream.omitField(Customer.class , "firstName"); + xstream.registerConverter(new MyDateConverter()); //xtream.registerConverter(new MySingleValueConverter()); - xtream.aliasField("fn", Customer.class, "firstName"); + xstream.aliasField("fn", Customer.class, "firstName"); - dataXml = xtream.toXML(customer); + dataXml = xstream.toXML(customer); System.out.println(dataXml); } @@ -39,7 +39,7 @@ public class XStreamSimpleXmlTest { @Test public void convertXmlToObject() { - customer = (Customer) xtream.fromXML(dataXml); + customer = (Customer) xstream.fromXML(dataXml); Assert.assertNotNull(customer); }