diff --git a/libraries/.gitignore b/libraries/.gitignore index ac45fafa62..e594daf27a 100644 --- a/libraries/.gitignore +++ b/libraries/.gitignore @@ -6,3 +6,4 @@ # Packaged files # *.jar +/bin/ diff --git a/libraries/pom.xml b/libraries/pom.xml index 163f5872ce..a9b8f45c52 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -771,6 +771,12 @@ ${hamcrest-all.version} test + + org.yaml + snakeyaml + ${snakeyaml.version} + + @@ -909,6 +915,7 @@ + 1.21 1.23.0 0.1.0 0.7.0 diff --git a/snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Address.java b/libraries/src/main/java/com/baeldung/snakeyaml/Address.java similarity index 94% rename from snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Address.java rename to libraries/src/main/java/com/baeldung/snakeyaml/Address.java index 1e0174df56..83c327a4ed 100644 --- a/snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Address.java +++ b/libraries/src/main/java/com/baeldung/snakeyaml/Address.java @@ -1,4 +1,4 @@ -package com.baeldung.snakeyaml.model; +package com.baeldung.snakeyaml; public class Address { private String line; diff --git a/snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Contact.java b/libraries/src/main/java/com/baeldung/snakeyaml/Contact.java similarity index 90% rename from snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Contact.java rename to libraries/src/main/java/com/baeldung/snakeyaml/Contact.java index 063564cf43..5559c2c339 100644 --- a/snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Contact.java +++ b/libraries/src/main/java/com/baeldung/snakeyaml/Contact.java @@ -1,4 +1,4 @@ -package com.baeldung.snakeyaml.model; +package com.baeldung.snakeyaml; public class Contact { diff --git a/snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Customer.java b/libraries/src/main/java/com/baeldung/snakeyaml/Customer.java similarity index 79% rename from snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Customer.java rename to libraries/src/main/java/com/baeldung/snakeyaml/Customer.java index 6ebd70508e..da35976d37 100644 --- a/snakeyaml/src/main/java/com/baeldung/snakeyaml/model/Customer.java +++ b/libraries/src/main/java/com/baeldung/snakeyaml/Customer.java @@ -1,4 +1,4 @@ -package com.baeldung.snakeyaml.model; +package com.baeldung.snakeyaml; import java.util.List; @@ -9,7 +9,6 @@ public class Customer { private Integer age; private List contactDetails; private Address homeAddress; - private Address officeAddress; public String getFirstName() { return firstName; @@ -49,14 +48,6 @@ public class Customer { public void setHomeAddress(Address homeAddress) { this.homeAddress = homeAddress; - } - - public Address getOfficeAddress() { - return officeAddress; - } - - public void setOfficeAddress(Address officeAddress) { - this.officeAddress = officeAddress; - } + } } diff --git a/snakeyaml/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java b/libraries/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java similarity index 66% rename from snakeyaml/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java rename to libraries/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java index be1e19fd51..c1b6c80353 100644 --- a/snakeyaml/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java +++ b/libraries/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java @@ -1,5 +1,7 @@ package com.baeldung.snakeyaml; +import static org.junit.Assert.assertEquals; + import java.io.StringWriter; import java.util.LinkedHashMap; import java.util.Map; @@ -8,7 +10,7 @@ import org.junit.Test; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.nodes.Tag; -import com.baeldung.snakeyaml.model.Customer; +import com.baeldung.snakeyaml.Customer; public class JavaToYAMLSerializationUnitTest { @@ -22,7 +24,8 @@ public class JavaToYAMLSerializationUnitTest { StringWriter writer = new StringWriter(); yaml.dump(data, writer); System.out.println(writer.toString()); - + String expectedYaml = "name: Silenthand Olleander\nrace: Human\ntraits: [ONE_HAND, ONE_EYE]\n"; + assertEquals(expectedYaml, writer.toString()); } @Test @@ -33,8 +36,9 @@ public class JavaToYAMLSerializationUnitTest { customer.setLastName("McDowell"); Yaml yaml = new Yaml(); StringWriter writer = new StringWriter(); - yaml.dump(customer, writer); - System.out.println(writer.toString()); + yaml.dump(customer, writer); + String expectedYaml = "!!com.baeldung.snakeyaml.Customer {age: 45, contactDetails: null, firstName: Greg,\n homeAddress: null, lastName: McDowell}\n"; + assertEquals(expectedYaml, writer.toString()); } @Test @@ -44,8 +48,9 @@ public class JavaToYAMLSerializationUnitTest { customer.setFirstName("Greg"); customer.setLastName("McDowell"); Yaml yaml = new Yaml(); - yaml.dumpAs(customer, Tag.MAP, null); System.out.println(yaml.dumpAs(customer, Tag.MAP, null)); + String expectedYaml = "{age: 45, contactDetails: null, firstName: Greg, homeAddress: null, lastName: McDowell}\n"; + assertEquals(expectedYaml, yaml.dumpAs(customer, Tag.MAP, null)); } } diff --git a/snakeyaml/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java b/libraries/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java similarity index 88% rename from snakeyaml/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java rename to libraries/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java index 14016f0cca..0b9cd860f9 100644 --- a/snakeyaml/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java +++ b/libraries/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java @@ -13,8 +13,8 @@ import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.Constructor; -import com.baeldung.snakeyaml.model.Contact; -import com.baeldung.snakeyaml.model.Customer; +import com.baeldung.snakeyaml.Contact; +import com.baeldung.snakeyaml.Customer; public class YAMLToJavaDeserialisationUnitTest { @@ -23,7 +23,7 @@ public class YAMLToJavaDeserialisationUnitTest { Yaml yaml = new Yaml(); InputStream inputStream = this.getClass() .getClassLoader() - .getResourceAsStream("customer.yaml"); + .getResourceAsStream("yaml/customer.yaml"); Map obj = yaml.load(inputStream); System.out.println(obj); } @@ -33,7 +33,7 @@ public class YAMLToJavaDeserialisationUnitTest { Yaml yaml = new Yaml(new Constructor(Customer.class)); InputStream inputStream = this.getClass() .getClassLoader() - .getResourceAsStream("customer.yaml"); + .getResourceAsStream("yaml/customer.yaml"); Customer customer = yaml.load(inputStream); System.out.println(customer); } @@ -43,7 +43,7 @@ public class YAMLToJavaDeserialisationUnitTest { Yaml yaml = new Yaml(); InputStream inputStream = this.getClass() .getClassLoader() - .getResourceAsStream("customer_with_type.yaml"); + .getResourceAsStream("yaml/customer_with_type.yaml"); Customer customer = yaml.load(inputStream); System.out.println(customer); } @@ -63,7 +63,7 @@ public class YAMLToJavaDeserialisationUnitTest { Yaml yaml = new Yaml(new Constructor(Customer.class)); InputStream inputStream = this.getClass() .getClassLoader() - .getResourceAsStream("customer_with_contact_details_and_address.yaml"); + .getResourceAsStream("yaml/customer_with_contact_details_and_address.yaml"); Customer customer = yaml.load(inputStream); assertNotNull(customer); assertEquals("John", customer.getFirstName()); @@ -87,9 +87,6 @@ public class YAMLToJavaDeserialisationUnitTest { assertNotNull(customer.getHomeAddress()); assertEquals("Xyz, DEF Street", customer.getHomeAddress() .getLine()); - assertNotNull(customer.getHomeAddress()); - assertEquals("Xyz, Office Street", customer.getOfficeAddress() - .getLine()); } @Test @@ -101,7 +98,7 @@ public class YAMLToJavaDeserialisationUnitTest { Yaml yaml = new Yaml(constructor); InputStream inputStream = this.getClass() .getClassLoader() - .getResourceAsStream("customer_with_contact_details.yaml"); + .getResourceAsStream("yaml/customer_with_contact_details.yaml"); Customer customer = yaml.load(inputStream); assertNotNull(customer); assertEquals("John", customer.getFirstName()); @@ -123,7 +120,7 @@ public class YAMLToJavaDeserialisationUnitTest { Yaml yaml = new Yaml(new Constructor(Customer.class)); InputStream inputStream = this.getClass() .getClassLoader() - .getResourceAsStream("customers.yaml"); + .getResourceAsStream("yaml/customers.yaml"); int count = 0; for (Object object : yaml.loadAll(inputStream)) { count++; diff --git a/snakeyaml/src/test/resources/customer.yaml b/libraries/src/test/resources/yaml/customer.yaml similarity index 100% rename from snakeyaml/src/test/resources/customer.yaml rename to libraries/src/test/resources/yaml/customer.yaml diff --git a/snakeyaml/src/test/resources/customer_with_contact_details.yaml b/libraries/src/test/resources/yaml/customer_with_contact_details.yaml similarity index 100% rename from snakeyaml/src/test/resources/customer_with_contact_details.yaml rename to libraries/src/test/resources/yaml/customer_with_contact_details.yaml diff --git a/snakeyaml/src/test/resources/customer_with_contact_details_and_address.yaml b/libraries/src/test/resources/yaml/customer_with_contact_details_and_address.yaml similarity index 70% rename from snakeyaml/src/test/resources/customer_with_contact_details_and_address.yaml rename to libraries/src/test/resources/yaml/customer_with_contact_details_and_address.yaml index bc73654389..664afe8594 100644 --- a/snakeyaml/src/test/resources/customer_with_contact_details_and_address.yaml +++ b/libraries/src/test/resources/yaml/customer_with_contact_details_and_address.yaml @@ -11,8 +11,3 @@ homeAddress: city: "City Y" state: "State Y" zip: 345657 -officeAddress: - line: "Xyz, Office Street" - city: "City Y" - state: "State Y" - zip: 345657 diff --git a/snakeyaml/src/test/resources/customer_with_contact_details_and_tags.yaml b/libraries/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml similarity index 100% rename from snakeyaml/src/test/resources/customer_with_contact_details_and_tags.yaml rename to libraries/src/test/resources/yaml/customer_with_contact_details_and_tags.yaml diff --git a/libraries/src/test/resources/yaml/customer_with_type.yaml b/libraries/src/test/resources/yaml/customer_with_type.yaml new file mode 100644 index 0000000000..6e13c26cea --- /dev/null +++ b/libraries/src/test/resources/yaml/customer_with_type.yaml @@ -0,0 +1,4 @@ +!!com.baeldung.snakeyaml.Customer +firstName: "John" +lastName: "Doe" +age: 20 \ No newline at end of file diff --git a/snakeyaml/src/test/resources/customers.yaml b/libraries/src/test/resources/yaml/customers.yaml similarity index 100% rename from snakeyaml/src/test/resources/customers.yaml rename to libraries/src/test/resources/yaml/customers.yaml diff --git a/pom.xml b/pom.xml index 4aad8d43d6..986119b87f 100644 --- a/pom.xml +++ b/pom.xml @@ -549,8 +549,7 @@ apache-meecrowave spring-reactive-kotlin jnosql - testing-modules/junit-abstract - snakeyaml + testing-modules/junit-abstract @@ -670,8 +669,7 @@ spring-amqp-simple spring-apache-camel spring-batch - testing-modules/junit-abstract - snakeyaml + testing-modules/junit-abstract @@ -1077,8 +1075,7 @@ antlr maven-archetype apache-meecrowave - testing-modules/junit-abstract - snakeyaml + testing-modules/junit-abstract