diff --git a/pom.xml b/pom.xml index a0b77ca..e0435ae 100644 --- a/pom.xml +++ b/pom.xml @@ -7,9 +7,11 @@ jsonthingy 0.1-SNAPSHOT jar + + 1.8 + 1.8 UTF-8 - 1.8 @@ -44,7 +46,6 @@ - junit junit diff --git a/src/main/java/nl/jssl/sd/Deserializer.java b/src/main/java/nl/jssl/jsontoy/deserialize/Deserializer.java similarity index 71% rename from src/main/java/nl/jssl/sd/Deserializer.java rename to src/main/java/nl/jssl/jsontoy/deserialize/Deserializer.java index 85c0d62..f1d755e 100644 --- a/src/main/java/nl/jssl/sd/Deserializer.java +++ b/src/main/java/nl/jssl/jsontoy/deserialize/Deserializer.java @@ -1,4 +1,4 @@ -package nl.jssl.sd; +package nl.jssl.jsontoy.deserialize; public class Deserializer { @@ -6,7 +6,7 @@ public class Deserializer { if (json.equals("{}")) { return null; } else - return 1; + return "test"; } } diff --git a/src/main/java/nl/jssl/ss/JSONSerializer.java b/src/main/java/nl/jssl/jsontoy/serialize/JSONSerializer.java similarity index 94% rename from src/main/java/nl/jssl/ss/JSONSerializer.java rename to src/main/java/nl/jssl/jsontoy/serialize/JSONSerializer.java index b168f3a..6cc95b3 100644 --- a/src/main/java/nl/jssl/ss/JSONSerializer.java +++ b/src/main/java/nl/jssl/jsontoy/serialize/JSONSerializer.java @@ -1,4 +1,4 @@ -package nl.jssl.ss; +package nl.jssl.jsontoy.serialize; import java.util.Formatter; diff --git a/src/main/java/nl/jssl/ss/Serializer.java b/src/main/java/nl/jssl/jsontoy/serialize/Serializer.java similarity index 96% rename from src/main/java/nl/jssl/ss/Serializer.java rename to src/main/java/nl/jssl/jsontoy/serialize/Serializer.java index b983e76..831d2f9 100644 --- a/src/main/java/nl/jssl/ss/Serializer.java +++ b/src/main/java/nl/jssl/jsontoy/serialize/Serializer.java @@ -1,4 +1,4 @@ -package nl.jssl.ss; +package nl.jssl.jsontoy.serialize; public class Serializer { private static SerializerFactory instance = new SynthSerializerFactory(); diff --git a/src/main/java/nl/jssl/ss/SerializerCreationException.java b/src/main/java/nl/jssl/jsontoy/serialize/SerializerCreationException.java similarity index 83% rename from src/main/java/nl/jssl/ss/SerializerCreationException.java rename to src/main/java/nl/jssl/jsontoy/serialize/SerializerCreationException.java index 955adaf..3d9ec86 100644 --- a/src/main/java/nl/jssl/ss/SerializerCreationException.java +++ b/src/main/java/nl/jssl/jsontoy/serialize/SerializerCreationException.java @@ -1,4 +1,4 @@ -package nl.jssl.ss; +package nl.jssl.jsontoy.serialize; @SuppressWarnings("serial") public class SerializerCreationException extends RuntimeException { diff --git a/src/main/java/nl/jssl/ss/SerializerFactory.java b/src/main/java/nl/jssl/jsontoy/serialize/SerializerFactory.java similarity index 76% rename from src/main/java/nl/jssl/ss/SerializerFactory.java rename to src/main/java/nl/jssl/jsontoy/serialize/SerializerFactory.java index 49af73c..ba36b9b 100644 --- a/src/main/java/nl/jssl/ss/SerializerFactory.java +++ b/src/main/java/nl/jssl/jsontoy/serialize/SerializerFactory.java @@ -1,4 +1,4 @@ -package nl.jssl.ss; +package nl.jssl.jsontoy.serialize; public interface SerializerFactory { public JSONSerializer createSerializer(Class beanjavaClass); diff --git a/src/main/java/nl/jssl/ss/SynthSerializerFactory.java b/src/main/java/nl/jssl/jsontoy/serialize/SynthSerializerFactory.java similarity index 99% rename from src/main/java/nl/jssl/ss/SynthSerializerFactory.java rename to src/main/java/nl/jssl/jsontoy/serialize/SynthSerializerFactory.java index daba6ba..c57e5c3 100644 --- a/src/main/java/nl/jssl/ss/SynthSerializerFactory.java +++ b/src/main/java/nl/jssl/jsontoy/serialize/SynthSerializerFactory.java @@ -1,4 +1,4 @@ -package nl.jssl.ss; +package nl.jssl.jsontoy.serialize; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/test/java/nl/jssl/ss/StringPropertyTest.java b/src/test/java/nl/jssl/jsontoy/serialize/StringPropertyTest.java similarity index 97% rename from src/test/java/nl/jssl/ss/StringPropertyTest.java rename to src/test/java/nl/jssl/jsontoy/serialize/StringPropertyTest.java index d484ee2..47cb7b7 100644 --- a/src/test/java/nl/jssl/ss/StringPropertyTest.java +++ b/src/test/java/nl/jssl/jsontoy/serialize/StringPropertyTest.java @@ -1,4 +1,4 @@ -package nl.jssl.ss; +package nl.jssl.jsontoy.serialize; import static junit.framework.Assert.assertEquals; diff --git a/src/test/java/nl/jssl/ss/collections/ArrayTest.java b/src/test/java/nl/jssl/jsontoy/serialize/collections/ArrayTest.java similarity index 88% rename from src/test/java/nl/jssl/ss/collections/ArrayTest.java rename to src/test/java/nl/jssl/jsontoy/serialize/collections/ArrayTest.java index 3b311ed..f9a6669 100644 --- a/src/test/java/nl/jssl/ss/collections/ArrayTest.java +++ b/src/test/java/nl/jssl/jsontoy/serialize/collections/ArrayTest.java @@ -1,7 +1,7 @@ -package nl.jssl.ss.collections; +package nl.jssl.jsontoy.serialize.collections; import static junit.framework.Assert.assertEquals; -import nl.jssl.ss.Serializer; +import nl.jssl.jsontoy.serialize.Serializer; import org.junit.Test; diff --git a/src/test/java/nl/jssl/ss/collections/ListTest.java b/src/test/java/nl/jssl/jsontoy/serialize/collections/ListTest.java similarity index 90% rename from src/test/java/nl/jssl/ss/collections/ListTest.java rename to src/test/java/nl/jssl/jsontoy/serialize/collections/ListTest.java index 7e03552..2f18f2e 100644 --- a/src/test/java/nl/jssl/ss/collections/ListTest.java +++ b/src/test/java/nl/jssl/jsontoy/serialize/collections/ListTest.java @@ -1,11 +1,11 @@ -package nl.jssl.ss.collections; +package nl.jssl.jsontoy.serialize.collections; import static junit.framework.Assert.assertEquals; import java.util.ArrayList; import java.util.List; -import nl.jssl.ss.Serializer; +import nl.jssl.jsontoy.serialize.Serializer; import org.junit.Test; diff --git a/src/test/java/nl/jssl/ss/collections/MapTest.java b/src/test/java/nl/jssl/jsontoy/serialize/collections/MapTest.java similarity index 87% rename from src/test/java/nl/jssl/ss/collections/MapTest.java rename to src/test/java/nl/jssl/jsontoy/serialize/collections/MapTest.java index be4529b..cfd1ce8 100644 --- a/src/test/java/nl/jssl/ss/collections/MapTest.java +++ b/src/test/java/nl/jssl/jsontoy/serialize/collections/MapTest.java @@ -1,13 +1,13 @@ -package nl.jssl.ss.collections; +package nl.jssl.jsontoy.serialize.collections; import static junit.framework.Assert.assertTrue; import java.util.HashMap; import java.util.Map; -import nl.jssl.ss.SerializerCreationException; -import nl.jssl.ss.Serializer; -import nl.jssl.ss.SynthSerializerFactory; +import nl.jssl.jsontoy.serialize.SerializerCreationException; +import nl.jssl.jsontoy.serialize.Serializer; +import nl.jssl.jsontoy.serialize.SynthSerializerFactory; import org.junit.Test; diff --git a/src/test/java/nl/jssl/ss/collections/SetTest.java b/src/test/java/nl/jssl/jsontoy/serialize/collections/SetTest.java similarity index 92% rename from src/test/java/nl/jssl/ss/collections/SetTest.java rename to src/test/java/nl/jssl/jsontoy/serialize/collections/SetTest.java index b077c97..4f27072 100644 --- a/src/test/java/nl/jssl/ss/collections/SetTest.java +++ b/src/test/java/nl/jssl/jsontoy/serialize/collections/SetTest.java @@ -1,4 +1,4 @@ -package nl.jssl.ss.collections; +package nl.jssl.jsontoy.serialize.collections; import static junit.framework.Assert.assertTrue; @@ -6,7 +6,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import nl.jssl.ss.Serializer; +import nl.jssl.jsontoy.serialize.Serializer; import org.junit.Test; diff --git a/src/test/java/nl/jssl/ss/nested/Bean1.java b/src/test/java/nl/jssl/jsontoy/serialize/nested/Bean1.java similarity index 95% rename from src/test/java/nl/jssl/ss/nested/Bean1.java rename to src/test/java/nl/jssl/jsontoy/serialize/nested/Bean1.java index 68bdd81..cc5e5cf 100644 --- a/src/test/java/nl/jssl/ss/nested/Bean1.java +++ b/src/test/java/nl/jssl/jsontoy/serialize/nested/Bean1.java @@ -1,4 +1,4 @@ -package nl.jssl.ss.nested; +package nl.jssl.jsontoy.serialize.nested; public class Bean1 { private String data1; diff --git a/src/test/java/nl/jssl/ss/nested/Bean2.java b/src/test/java/nl/jssl/jsontoy/serialize/nested/Bean2.java similarity index 81% rename from src/test/java/nl/jssl/ss/nested/Bean2.java rename to src/test/java/nl/jssl/jsontoy/serialize/nested/Bean2.java index 53594d6..a894418 100644 --- a/src/test/java/nl/jssl/ss/nested/Bean2.java +++ b/src/test/java/nl/jssl/jsontoy/serialize/nested/Bean2.java @@ -1,4 +1,4 @@ -package nl.jssl.ss.nested; +package nl.jssl.jsontoy.serialize.nested; public class Bean2 { private String data2; diff --git a/src/test/java/nl/jssl/ss/nested/Bean2Child.java b/src/test/java/nl/jssl/jsontoy/serialize/nested/Bean2Child.java similarity index 83% rename from src/test/java/nl/jssl/ss/nested/Bean2Child.java rename to src/test/java/nl/jssl/jsontoy/serialize/nested/Bean2Child.java index 8071d75..e0d62b2 100644 --- a/src/test/java/nl/jssl/ss/nested/Bean2Child.java +++ b/src/test/java/nl/jssl/jsontoy/serialize/nested/Bean2Child.java @@ -1,4 +1,4 @@ -package nl.jssl.ss.nested; +package nl.jssl.jsontoy.serialize.nested; public class Bean2Child extends Bean2 { private String data3; diff --git a/src/test/java/nl/jssl/ss/nested/NestedBeanTest.java b/src/test/java/nl/jssl/jsontoy/serialize/nested/NestedBeanTest.java similarity index 93% rename from src/test/java/nl/jssl/ss/nested/NestedBeanTest.java rename to src/test/java/nl/jssl/jsontoy/serialize/nested/NestedBeanTest.java index 780ab39..febff28 100644 --- a/src/test/java/nl/jssl/ss/nested/NestedBeanTest.java +++ b/src/test/java/nl/jssl/jsontoy/serialize/nested/NestedBeanTest.java @@ -1,7 +1,7 @@ -package nl.jssl.ss.nested; +package nl.jssl.jsontoy.serialize.nested; import static junit.framework.Assert.assertEquals; -import nl.jssl.ss.Serializer; +import nl.jssl.jsontoy.serialize.Serializer; import org.junit.Test; diff --git a/src/test/java/nl/jssl/ss/performance/Jackson.java b/src/test/java/nl/jssl/jsontoy/serialize/performance/Jackson.java similarity index 91% rename from src/test/java/nl/jssl/ss/performance/Jackson.java rename to src/test/java/nl/jssl/jsontoy/serialize/performance/Jackson.java index 85f3cde..56a5336 100644 --- a/src/test/java/nl/jssl/ss/performance/Jackson.java +++ b/src/test/java/nl/jssl/jsontoy/serialize/performance/Jackson.java @@ -1,12 +1,12 @@ -package nl.jssl.ss.performance; +package nl.jssl.jsontoy.serialize.performance; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import nl.jssl.ss.Serializer; -import nl.jssl.ss.nested.Bean1; -import nl.jssl.ss.nested.Bean2; +import nl.jssl.jsontoy.serialize.Serializer; +import nl.jssl.jsontoy.serialize.nested.Bean1; +import nl.jssl.jsontoy.serialize.nested.Bean2; import org.junit.Test; diff --git a/src/test/java/nl/jssl/ss/primitives/BooleanPropertyTest.java b/src/test/java/nl/jssl/jsontoy/serialize/primitives/BooleanPropertyTest.java similarity index 89% rename from src/test/java/nl/jssl/ss/primitives/BooleanPropertyTest.java rename to src/test/java/nl/jssl/jsontoy/serialize/primitives/BooleanPropertyTest.java index 03921b7..e4ada75 100644 --- a/src/test/java/nl/jssl/ss/primitives/BooleanPropertyTest.java +++ b/src/test/java/nl/jssl/jsontoy/serialize/primitives/BooleanPropertyTest.java @@ -1,7 +1,7 @@ -package nl.jssl.ss.primitives; +package nl.jssl.jsontoy.serialize.primitives; import static junit.framework.Assert.assertEquals; -import nl.jssl.ss.Serializer; +import nl.jssl.jsontoy.serialize.Serializer; import org.junit.Test; diff --git a/src/test/java/nl/jssl/ss/primitives/BytePropertyTest.java b/src/test/java/nl/jssl/jsontoy/serialize/primitives/BytePropertyTest.java similarity index 89% rename from src/test/java/nl/jssl/ss/primitives/BytePropertyTest.java rename to src/test/java/nl/jssl/jsontoy/serialize/primitives/BytePropertyTest.java index adcf854..4ef7d17 100644 --- a/src/test/java/nl/jssl/ss/primitives/BytePropertyTest.java +++ b/src/test/java/nl/jssl/jsontoy/serialize/primitives/BytePropertyTest.java @@ -1,7 +1,7 @@ -package nl.jssl.ss.primitives; +package nl.jssl.jsontoy.serialize.primitives; import static junit.framework.Assert.assertEquals; -import nl.jssl.ss.Serializer; +import nl.jssl.jsontoy.serialize.Serializer; import org.junit.Test; diff --git a/src/test/java/nl/jssl/ss/primitives/CharPropertyTest.java b/src/test/java/nl/jssl/jsontoy/serialize/primitives/CharPropertyTest.java similarity index 88% rename from src/test/java/nl/jssl/ss/primitives/CharPropertyTest.java rename to src/test/java/nl/jssl/jsontoy/serialize/primitives/CharPropertyTest.java index 6598f82..32c1090 100644 --- a/src/test/java/nl/jssl/ss/primitives/CharPropertyTest.java +++ b/src/test/java/nl/jssl/jsontoy/serialize/primitives/CharPropertyTest.java @@ -1,7 +1,7 @@ -package nl.jssl.ss.primitives; +package nl.jssl.jsontoy.serialize.primitives; import static junit.framework.Assert.assertEquals; -import nl.jssl.ss.Serializer; +import nl.jssl.jsontoy.serialize.Serializer; import org.junit.Test; diff --git a/src/test/java/nl/jssl/ss/primitives/DoublePropertyTest.java b/src/test/java/nl/jssl/jsontoy/serialize/primitives/DoublePropertyTest.java similarity index 89% rename from src/test/java/nl/jssl/ss/primitives/DoublePropertyTest.java rename to src/test/java/nl/jssl/jsontoy/serialize/primitives/DoublePropertyTest.java index 629eb6d..889f9a3 100644 --- a/src/test/java/nl/jssl/ss/primitives/DoublePropertyTest.java +++ b/src/test/java/nl/jssl/jsontoy/serialize/primitives/DoublePropertyTest.java @@ -1,7 +1,7 @@ -package nl.jssl.ss.primitives; +package nl.jssl.jsontoy.serialize.primitives; import static junit.framework.Assert.assertEquals; -import nl.jssl.ss.Serializer; +import nl.jssl.jsontoy.serialize.Serializer; import org.junit.Test; diff --git a/src/test/java/nl/jssl/ss/primitives/FloatPropertyTest.java b/src/test/java/nl/jssl/jsontoy/serialize/primitives/FloatPropertyTest.java similarity index 89% rename from src/test/java/nl/jssl/ss/primitives/FloatPropertyTest.java rename to src/test/java/nl/jssl/jsontoy/serialize/primitives/FloatPropertyTest.java index e870589..9797c31 100644 --- a/src/test/java/nl/jssl/ss/primitives/FloatPropertyTest.java +++ b/src/test/java/nl/jssl/jsontoy/serialize/primitives/FloatPropertyTest.java @@ -1,7 +1,7 @@ -package nl.jssl.ss.primitives; +package nl.jssl.jsontoy.serialize.primitives; import static junit.framework.Assert.assertEquals; -import nl.jssl.ss.Serializer; +import nl.jssl.jsontoy.serialize.Serializer; import org.junit.Test; diff --git a/src/test/java/nl/jssl/ss/primitives/IntPropertyTest.java b/src/test/java/nl/jssl/jsontoy/serialize/primitives/IntPropertyTest.java similarity index 89% rename from src/test/java/nl/jssl/ss/primitives/IntPropertyTest.java rename to src/test/java/nl/jssl/jsontoy/serialize/primitives/IntPropertyTest.java index c0485c0..ffe60b8 100644 --- a/src/test/java/nl/jssl/ss/primitives/IntPropertyTest.java +++ b/src/test/java/nl/jssl/jsontoy/serialize/primitives/IntPropertyTest.java @@ -1,7 +1,7 @@ -package nl.jssl.ss.primitives; +package nl.jssl.jsontoy.serialize.primitives; import static junit.framework.Assert.assertEquals; -import nl.jssl.ss.Serializer; +import nl.jssl.jsontoy.serialize.Serializer; import org.junit.Test; diff --git a/src/test/java/nl/jssl/ss/primitives/LongPropertyTest.java b/src/test/java/nl/jssl/jsontoy/serialize/primitives/LongPropertyTest.java similarity index 88% rename from src/test/java/nl/jssl/ss/primitives/LongPropertyTest.java rename to src/test/java/nl/jssl/jsontoy/serialize/primitives/LongPropertyTest.java index 3f1ddc1..629fc00 100644 --- a/src/test/java/nl/jssl/ss/primitives/LongPropertyTest.java +++ b/src/test/java/nl/jssl/jsontoy/serialize/primitives/LongPropertyTest.java @@ -1,7 +1,7 @@ -package nl.jssl.ss.primitives; +package nl.jssl.jsontoy.serialize.primitives; import static junit.framework.Assert.assertEquals; -import nl.jssl.ss.Serializer; +import nl.jssl.jsontoy.serialize.Serializer; import org.junit.Test; diff --git a/src/test/java/nl/jssl/ss/primitives/NullPropertyTest.java b/src/test/java/nl/jssl/jsontoy/serialize/primitives/NullPropertyTest.java similarity index 86% rename from src/test/java/nl/jssl/ss/primitives/NullPropertyTest.java rename to src/test/java/nl/jssl/jsontoy/serialize/primitives/NullPropertyTest.java index f5a04ad..300a641 100644 --- a/src/test/java/nl/jssl/ss/primitives/NullPropertyTest.java +++ b/src/test/java/nl/jssl/jsontoy/serialize/primitives/NullPropertyTest.java @@ -1,7 +1,7 @@ -package nl.jssl.ss.primitives; +package nl.jssl.jsontoy.serialize.primitives; import static junit.framework.Assert.assertEquals; -import nl.jssl.ss.Serializer; +import nl.jssl.jsontoy.serialize.Serializer; import org.junit.Test; diff --git a/src/test/java/nl/jssl/ss/primitives/ShortPropertyTest.java b/src/test/java/nl/jssl/jsontoy/serialize/primitives/ShortPropertyTest.java similarity index 89% rename from src/test/java/nl/jssl/ss/primitives/ShortPropertyTest.java rename to src/test/java/nl/jssl/jsontoy/serialize/primitives/ShortPropertyTest.java index f87d022..aaefa72 100644 --- a/src/test/java/nl/jssl/ss/primitives/ShortPropertyTest.java +++ b/src/test/java/nl/jssl/jsontoy/serialize/primitives/ShortPropertyTest.java @@ -1,7 +1,7 @@ -package nl.jssl.ss.primitives; +package nl.jssl.jsontoy.serialize.primitives; import static junit.framework.Assert.assertEquals; -import nl.jssl.ss.Serializer; +import nl.jssl.jsontoy.serialize.Serializer; import org.junit.Test; diff --git a/src/test/java/nl/jssl/sd/EmptyTest.java b/src/test/java/nl/jssl/sd/EmptyTest.java deleted file mode 100644 index 2da0762..0000000 --- a/src/test/java/nl/jssl/sd/EmptyTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package nl.jssl.sd; - -import static junit.framework.Assert.assertEquals; - -import org.junit.Test; - -public class EmptyTest { - @Test - public void null_shouldReturnEmpty() { - assertEquals(null, Deserializer.deserialize("{}")); - } -} diff --git a/src/test/java/nl/jssl/sd/IntegerTest.java b/src/test/java/nl/jssl/sd/IntegerTest.java deleted file mode 100644 index 42fe1f7..0000000 --- a/src/test/java/nl/jssl/sd/IntegerTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package nl.jssl.sd; - -import static junit.framework.Assert.assertEquals; - -import org.junit.Test; - -public class IntegerTest { - - @Test - public void testPrimitive() { - assertEquals(1, Deserializer.deserialize("1")); - } -} diff --git a/src/test/java/nl/jssl/sd/StringTest.java b/src/test/java/nl/jssl/sd/StringTest.java deleted file mode 100644 index 3646aa6..0000000 --- a/src/test/java/nl/jssl/sd/StringTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package nl.jssl.sd; - -import static junit.framework.Assert.assertEquals; - -import org.junit.Test; - -public class StringTest { - @Test - public void shouldReturnStringvalue() { - assertEquals("test", Deserializer.deserialize("\"test\"")); - } -}