Skip to content

Commit dd61036

Browse files
codethinker09codethinker09
committed
XStream-Introduction
Merging changes for Article XML - to Object
1 parent b55bc62 commit dd61036

29 files changed

Lines changed: 14 additions & 159 deletions

xstream-xmlToObject/src/main/java/com/baeldung/annotation/pojo/Customer.java renamed to xstream-introduction/src/main/java/com/baeldung/annotation/pojo/Customer.java

File renamed without changes.

xstream-xmlToObject/src/main/java/com/baeldung/annotation/pojo/CustomerOmitField.java renamed to xstream-introduction/src/main/java/com/baeldung/annotation/pojo/CustomerOmitField.java

File renamed without changes.

xstream-xmlToObject/src/main/java/com/baeldung/complex/pojo/ContactDetails.java renamed to xstream-introduction/src/main/java/com/baeldung/complex/pojo/ContactDetails.java

File renamed without changes.

xstream-xmlToObject/src/main/java/com/baeldung/complex/pojo/Customer.java renamed to xstream-introduction/src/main/java/com/baeldung/complex/pojo/Customer.java

File renamed without changes.

xstream-xmlToObject/src/main/java/com/baeldung/implicit/collection/pojo/ContactDetails.java renamed to xstream-introduction/src/main/java/com/baeldung/implicit/collection/pojo/ContactDetails.java

File renamed without changes.

xstream-xmlToObject/src/main/java/com/baeldung/implicit/collection/pojo/Customer.java renamed to xstream-introduction/src/main/java/com/baeldung/implicit/collection/pojo/Customer.java

File renamed without changes.

‎xstream-introduction/src/main/java/com/baeldung/initializer/SimpleXstreamInitializer.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
public class SimpleXstreamInitializer {
66

7-
private static XStream xstreamInstance;
7+
private XStream xtreamInstance;
88

9-
public static XStream getXstreamInstance() {
10-
if (xstreamInstance == null) {
9+
public XStream getXstreamInstance() {
10+
if (xtreamInstance == null) {
1111
synchronized (SimpleXstreamInitializer.class) {
12-
if (xstreamInstance == null) {
13-
xstreamInstance = new XStream();
12+
if (xtreamInstance == null) {
13+
xtreamInstance = new XStream();
1414
}
1515
}
1616
}
17-
return xstreamInstance;
17+
return xtreamInstance;
1818
}
1919
}

‎xstream-introduction/src/main/java/com/baeldung/pojo/Customer.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@
55

66
import com.thoughtworks.xstream.annotations.XStreamAlias;
77
import com.thoughtworks.xstream.annotations.XStreamImplicit;
8-
import com.thoughtworks.xstream.annotations.XStreamOmitField;
98

109
@XStreamAlias("customer")
1110
public class Customer {
1211

13-
//@XStreamOmitField
1412
private String firstName;
1513

1614
private String lastName;
@@ -52,4 +50,8 @@ public void setContactDetailsList(List<ContactDetails> contactDetailsList) {
5250
this.contactDetailsList = contactDetailsList;
5351
}
5452

53+
@Override
54+
public String toString() {
55+
return "Customer [firstName=" + firstName + ", lastName=" + lastName + ", dob=" + dob + "]";
56+
}
5557
}

xstream-xmlToObject/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAnnotationTest.java renamed to xstream-introduction/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAnnotationTest.java

File renamed without changes.

xstream-xmlToObject/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAttributeCollectionTest.java renamed to xstream-introduction/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAttributeCollectionTest.java

File renamed without changes.

0 commit comments

Comments
 (0)