diff --git a/xstream-xmlToObject/src/main/java/com/baeldung/annotation/pojo/Customer.java b/xstream-introduction/src/main/java/com/baeldung/annotation/pojo/Customer.java similarity index 100% rename from xstream-xmlToObject/src/main/java/com/baeldung/annotation/pojo/Customer.java rename to xstream-introduction/src/main/java/com/baeldung/annotation/pojo/Customer.java diff --git a/xstream-xmlToObject/src/main/java/com/baeldung/annotation/pojo/CustomerOmitField.java b/xstream-introduction/src/main/java/com/baeldung/annotation/pojo/CustomerOmitField.java similarity index 100% rename from xstream-xmlToObject/src/main/java/com/baeldung/annotation/pojo/CustomerOmitField.java rename to xstream-introduction/src/main/java/com/baeldung/annotation/pojo/CustomerOmitField.java diff --git a/xstream-xmlToObject/src/main/java/com/baeldung/complex/pojo/ContactDetails.java b/xstream-introduction/src/main/java/com/baeldung/complex/pojo/ContactDetails.java similarity index 100% rename from xstream-xmlToObject/src/main/java/com/baeldung/complex/pojo/ContactDetails.java rename to xstream-introduction/src/main/java/com/baeldung/complex/pojo/ContactDetails.java diff --git a/xstream-xmlToObject/src/main/java/com/baeldung/complex/pojo/Customer.java b/xstream-introduction/src/main/java/com/baeldung/complex/pojo/Customer.java similarity index 100% rename from xstream-xmlToObject/src/main/java/com/baeldung/complex/pojo/Customer.java rename to xstream-introduction/src/main/java/com/baeldung/complex/pojo/Customer.java diff --git a/xstream-xmlToObject/src/main/java/com/baeldung/implicit/collection/pojo/ContactDetails.java b/xstream-introduction/src/main/java/com/baeldung/implicit/collection/pojo/ContactDetails.java similarity index 100% rename from xstream-xmlToObject/src/main/java/com/baeldung/implicit/collection/pojo/ContactDetails.java rename to xstream-introduction/src/main/java/com/baeldung/implicit/collection/pojo/ContactDetails.java diff --git a/xstream-xmlToObject/src/main/java/com/baeldung/implicit/collection/pojo/Customer.java b/xstream-introduction/src/main/java/com/baeldung/implicit/collection/pojo/Customer.java similarity index 100% rename from xstream-xmlToObject/src/main/java/com/baeldung/implicit/collection/pojo/Customer.java rename to xstream-introduction/src/main/java/com/baeldung/implicit/collection/pojo/Customer.java diff --git a/xstream-introduction/src/main/java/com/baeldung/initializer/SimpleXstreamInitializer.java b/xstream-introduction/src/main/java/com/baeldung/initializer/SimpleXstreamInitializer.java index 618df877b9..d7dc3f7a81 100644 --- a/xstream-introduction/src/main/java/com/baeldung/initializer/SimpleXstreamInitializer.java +++ b/xstream-introduction/src/main/java/com/baeldung/initializer/SimpleXstreamInitializer.java @@ -4,16 +4,16 @@ import com.thoughtworks.xstream.XStream; public class SimpleXstreamInitializer { - private static XStream xstreamInstance; + private XStream xtreamInstance; - public static XStream getXstreamInstance() { - if (xstreamInstance == null) { + public XStream getXstreamInstance() { + if (xtreamInstance == null) { synchronized (SimpleXstreamInitializer.class) { - if (xstreamInstance == null) { - xstreamInstance = new XStream(); + if (xtreamInstance == null) { + xtreamInstance = new XStream(); } } } - return xstreamInstance; + return xtreamInstance; } } \ No newline at end of file diff --git a/xstream-introduction/src/main/java/com/baeldung/pojo/Customer.java b/xstream-introduction/src/main/java/com/baeldung/pojo/Customer.java index 2ed11dcdab..9bed3394ef 100644 --- a/xstream-introduction/src/main/java/com/baeldung/pojo/Customer.java +++ b/xstream-introduction/src/main/java/com/baeldung/pojo/Customer.java @@ -5,12 +5,10 @@ import java.util.List; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; -import com.thoughtworks.xstream.annotations.XStreamOmitField; @XStreamAlias("customer") public class Customer { - //@XStreamOmitField private String firstName; private String lastName; @@ -52,4 +50,8 @@ public class Customer { this.contactDetailsList = contactDetailsList; } + @Override + public String toString() { + return "Customer [firstName=" + firstName + ", lastName=" + lastName + ", dob=" + dob + "]"; + } } diff --git a/xstream-xmlToObject/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAnnotationTest.java b/xstream-introduction/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAnnotationTest.java similarity index 100% rename from xstream-xmlToObject/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAnnotationTest.java rename to xstream-introduction/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAnnotationTest.java diff --git a/xstream-xmlToObject/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAttributeCollectionTest.java b/xstream-introduction/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAttributeCollectionTest.java similarity index 100% rename from xstream-xmlToObject/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAttributeCollectionTest.java rename to xstream-introduction/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAttributeCollectionTest.java diff --git a/xstream-xmlToObject/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectCollectionTest.java b/xstream-introduction/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectCollectionTest.java similarity index 96% rename from xstream-xmlToObject/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectCollectionTest.java rename to xstream-introduction/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectCollectionTest.java index 1656d2f230..d701fc153b 100644 --- a/xstream-xmlToObject/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectCollectionTest.java +++ b/xstream-introduction/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectCollectionTest.java @@ -30,7 +30,7 @@ public class ComplexXmlToObjectCollectionTest { Customer customer = (Customer) xstream.fromXML(reader); Assert.assertNotNull(customer); Assert.assertNotNull(customer.getContactDetailsList()); - System.out.println(customer); + //System.out.println(customer); } catch (IOException e) { e.printStackTrace(); diff --git a/xstream-xmlToObject/src/test/java/com/baeldung/pojo/test/XmlToObjectAliasTest.java b/xstream-introduction/src/test/java/com/baeldung/pojo/test/XmlToObjectAliasTest.java similarity index 100% rename from xstream-xmlToObject/src/test/java/com/baeldung/pojo/test/XmlToObjectAliasTest.java rename to xstream-introduction/src/test/java/com/baeldung/pojo/test/XmlToObjectAliasTest.java diff --git a/xstream-xmlToObject/src/test/java/com/baeldung/pojo/test/XmlToObjectAnnotationTest.java b/xstream-introduction/src/test/java/com/baeldung/pojo/test/XmlToObjectAnnotationTest.java similarity index 100% rename from xstream-xmlToObject/src/test/java/com/baeldung/pojo/test/XmlToObjectAnnotationTest.java rename to xstream-introduction/src/test/java/com/baeldung/pojo/test/XmlToObjectAnnotationTest.java diff --git a/xstream-xmlToObject/src/test/java/com/baeldung/pojo/test/XmlToObjectFieldAliasTest.java b/xstream-introduction/src/test/java/com/baeldung/pojo/test/XmlToObjectFieldAliasTest.java similarity index 100% rename from xstream-xmlToObject/src/test/java/com/baeldung/pojo/test/XmlToObjectFieldAliasTest.java rename to xstream-introduction/src/test/java/com/baeldung/pojo/test/XmlToObjectFieldAliasTest.java diff --git a/xstream-xmlToObject/src/test/java/com/baeldung/pojo/test/XmlToObjectIgnoreFieldsTest.java b/xstream-introduction/src/test/java/com/baeldung/pojo/test/XmlToObjectIgnoreFieldsTest.java similarity index 96% rename from xstream-xmlToObject/src/test/java/com/baeldung/pojo/test/XmlToObjectIgnoreFieldsTest.java rename to xstream-introduction/src/test/java/com/baeldung/pojo/test/XmlToObjectIgnoreFieldsTest.java index ca31a22b94..cb13bb9570 100644 --- a/xstream-xmlToObject/src/test/java/com/baeldung/pojo/test/XmlToObjectIgnoreFieldsTest.java +++ b/xstream-introduction/src/test/java/com/baeldung/pojo/test/XmlToObjectIgnoreFieldsTest.java @@ -30,7 +30,7 @@ public class XmlToObjectIgnoreFieldsTest { FileReader reader = new FileReader(classLoader.getResource("data-file-ignore-field.xml").getFile()); Customer customer = (Customer) xstream.fromXML(reader); Assert.assertNotNull(customer); - System.out.println(customer); + //System.out.println(customer); } catch (IOException e) { e.printStackTrace(); } diff --git a/xstream-xmlToObject/src/test/java/com/baeldung/pojo/test/XmlToObjectTest.java b/xstream-introduction/src/test/java/com/baeldung/pojo/test/XmlToObjectTest.java similarity index 100% rename from xstream-xmlToObject/src/test/java/com/baeldung/pojo/test/XmlToObjectTest.java rename to xstream-introduction/src/test/java/com/baeldung/pojo/test/XmlToObjectTest.java diff --git a/xstream-introduction/src/test/java/com/baeldung/utility/XStreamSimpleXmlTest.java b/xstream-introduction/src/test/java/com/baeldung/utility/XStreamSimpleXmlTest.java index 50d02528bd..ea60e68743 100644 --- a/xstream-introduction/src/test/java/com/baeldung/utility/XStreamSimpleXmlTest.java +++ b/xstream-introduction/src/test/java/com/baeldung/utility/XStreamSimpleXmlTest.java @@ -22,7 +22,8 @@ public class XStreamSimpleXmlTest { @Before public void dataSetup() { customer = SimpleDataGeneration.generateData(); - xstream = SimpleXstreamInitializer.getXstreamInstance(); + SimpleXstreamInitializer simpleXstreamInitializer = new SimpleXstreamInitializer(); + xstream = simpleXstreamInitializer.getXstreamInstance(); xstream.processAnnotations(Customer.class); xstream.processAnnotations(AddressDetails.class); xstream.processAnnotations(ContactDetails.class); @@ -30,9 +31,7 @@ public class XStreamSimpleXmlTest { xstream.registerConverter(new MyDateConverter()); // xstream.registerConverter(new MySingleValueConverter()); xstream.aliasField("fn" , Customer.class , "firstName"); - dataXml = xstream.toXML(customer); - System.out.println(dataXml); } @Test diff --git a/xstream-xmlToObject/src/test/resources/data-file-alias-field-complex.xml b/xstream-introduction/src/test/resources/data-file-alias-field-complex.xml similarity index 100% rename from xstream-xmlToObject/src/test/resources/data-file-alias-field-complex.xml rename to xstream-introduction/src/test/resources/data-file-alias-field-complex.xml diff --git a/xstream-xmlToObject/src/test/resources/data-file-alias-field.xml b/xstream-introduction/src/test/resources/data-file-alias-field.xml similarity index 100% rename from xstream-xmlToObject/src/test/resources/data-file-alias-field.xml rename to xstream-introduction/src/test/resources/data-file-alias-field.xml diff --git a/xstream-xmlToObject/src/test/resources/data-file-alias-implicit-collection.xml b/xstream-introduction/src/test/resources/data-file-alias-implicit-collection.xml similarity index 100% rename from xstream-xmlToObject/src/test/resources/data-file-alias-implicit-collection.xml rename to xstream-introduction/src/test/resources/data-file-alias-implicit-collection.xml diff --git a/xstream-xmlToObject/src/test/resources/data-file-alias.xml b/xstream-introduction/src/test/resources/data-file-alias.xml similarity index 100% rename from xstream-xmlToObject/src/test/resources/data-file-alias.xml rename to xstream-introduction/src/test/resources/data-file-alias.xml diff --git a/xstream-xmlToObject/src/test/resources/data-file-ignore-field.xml b/xstream-introduction/src/test/resources/data-file-ignore-field.xml similarity index 100% rename from xstream-xmlToObject/src/test/resources/data-file-ignore-field.xml rename to xstream-introduction/src/test/resources/data-file-ignore-field.xml diff --git a/xstream-xmlToObject/src/test/resources/data-file.xml b/xstream-introduction/src/test/resources/data-file.xml similarity index 100% rename from xstream-xmlToObject/src/test/resources/data-file.xml rename to xstream-introduction/src/test/resources/data-file.xml diff --git a/xstream-xmlToObject/.project b/xstream-xmlToObject/.project deleted file mode 100644 index 4e1a3f6e92..0000000000 --- a/xstream-xmlToObject/.project +++ /dev/null @@ -1,14 +0,0 @@ - - - xstream-xmlToObject - NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - org.eclipse.jdt.core.javabuilder - - - - org.eclipse.jdt.core.javanature - - \ No newline at end of file diff --git a/xstream-xmlToObject/pom.xml b/xstream-xmlToObject/pom.xml deleted file mode 100644 index 4828ccb569..0000000000 --- a/xstream-xmlToObject/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - 4.0.0 - - com.baeldung - xstream-xmlToObject - 0.0.1-SNAPSHOT - jar - - xstream-xmlToObject - http://maven.apache.org - - - UTF-8 - - - - - com.thoughtworks.xstream - xstream - 1.4.5 - - - - junit - junit - 4.12 - - - - log4j - log4j - 1.2.17 - - - diff --git a/xstream-xmlToObject/src/main/java/com/baeldung/initializer/SimpleXstreamInitializer.java b/xstream-xmlToObject/src/main/java/com/baeldung/initializer/SimpleXstreamInitializer.java deleted file mode 100644 index d7dc3f7a81..0000000000 --- a/xstream-xmlToObject/src/main/java/com/baeldung/initializer/SimpleXstreamInitializer.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baeldung.initializer; - -import com.thoughtworks.xstream.XStream; - -public class SimpleXstreamInitializer { - - private XStream xtreamInstance; - - public XStream getXstreamInstance() { - if (xtreamInstance == null) { - synchronized (SimpleXstreamInitializer.class) { - if (xtreamInstance == null) { - xtreamInstance = new XStream(); - } - } - } - return xtreamInstance; - } -} \ No newline at end of file diff --git a/xstream-xmlToObject/src/main/java/com/baeldung/pojo/Customer.java b/xstream-xmlToObject/src/main/java/com/baeldung/pojo/Customer.java deleted file mode 100644 index affed65fff..0000000000 --- a/xstream-xmlToObject/src/main/java/com/baeldung/pojo/Customer.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.baeldung.pojo; - -import java.util.Date; - -public class Customer { - - private String firstName; - - private String lastName; - - private Date dob; - - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - - public Date getDob() { - return dob; - } - - public void setDob(Date dob) { - this.dob = dob; - } - - @Override - public String toString() { - return "Customer [firstName=" + firstName + ", lastName=" + lastName - + ", dob=" + dob + "]"; - } -} diff --git a/xstream-xmlToObject/src/main/java/com/baeldung/utility/SimpleDataGeneration.java b/xstream-xmlToObject/src/main/java/com/baeldung/utility/SimpleDataGeneration.java deleted file mode 100644 index 14ca25952f..0000000000 --- a/xstream-xmlToObject/src/main/java/com/baeldung/utility/SimpleDataGeneration.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baeldung.utility; - -import java.util.Calendar; - -import com.baeldung.pojo.Customer; - -public class SimpleDataGeneration { - - public static Customer generateData() { - Customer customer = new Customer(); - Calendar cal = Calendar.getInstance(); - cal.set(1986 , 01 , 14); - customer.setDob(cal.getTime()); - customer.setFirstName("Xstream"); - customer.setLastName("Java"); - - return customer; - } -} diff --git a/xstream-xmlToObject/src/main/resources/log4j.properties b/xstream-xmlToObject/src/main/resources/log4j.properties deleted file mode 100644 index 9cdafc6bdb..0000000000 --- a/xstream-xmlToObject/src/main/resources/log4j.properties +++ /dev/null @@ -1,16 +0,0 @@ -# Root logger option -log4j.rootLogger=DEBUG, file - -# Redirect log messages to console -# log4j.appender.stdout=org.apache.log4j.ConsoleAppender -# log4j.appender.stdout.Target=System.out -# log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -# log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n - -# Redirect log messages to a log file, support file rolling. -log4j.appender.file=org.apache.log4j.RollingFileAppender -log4j.appender.file.File=D:\\Test\\xstream-application.log -log4j.appender.file.MaxFileSize=5MB -log4j.appender.file.MaxBackupIndex=10 -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n \ No newline at end of file