From 4a9afacb90e5c4ae16246861755c52bc0d6f540e Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Tue, 16 Jul 2019 15:51:12 +0200 Subject: [PATCH] refactor from org.oggio88 to net.woggioni --- build.sbt | 6 ++--- .../worth/buffer/CircularBuffer.java | 2 +- .../worth/buffer/LookAheadInputStream.java | 2 +- .../buffer/LookAheadTextInputStream.java | 2 +- .../worth/exception/IOException.java | 2 +- .../exception/NotImplementedException.java | 2 +- .../worth/exception/ParseException.java | 2 +- .../worth/exception/TypeException.java | 2 +- .../worth/exception/WorthException.java | 2 +- .../worth/serialization/ValueDumper.java | 12 ++++----- .../worth/serialization/ValueParser.java | 12 ++++----- .../serialization/binary/BinaryMarker.java | 2 +- .../serialization/binary/JBONDumper.java | 27 +++++++++---------- .../serialization/binary/JBONParser.java | 16 +++++------ .../worth/serialization/json/JSONDumper.java | 25 +++++++++-------- .../worth/serialization/json/JSONParser.java | 18 ++++++------- .../woggioni}/worth/utils/Leb128.java | 2 +- .../woggioni}/worth/utils/ValueWalker.java | 4 +-- .../woggioni}/worth/utils/WorthUtils.java | 5 ++-- .../woggioni}/worth/value/ArrayValue.java | 5 ++-- .../woggioni}/worth/value/BooleanValue.java | 4 +-- .../woggioni}/worth/value/FloatValue.java | 4 +-- .../woggioni}/worth/value/IntegerValue.java | 4 +-- .../woggioni}/worth/value/NullValue.java | 4 +-- .../woggioni}/worth/value/ObjectValue.java | 4 +-- .../woggioni}/worth/value/StringValue.java | 4 +-- .../woggioni}/worth/xface/Dumper.java | 2 +- .../woggioni}/worth/xface/Parser.java | 2 +- .../woggioni}/worth/xface/Value.java | 7 +++-- .../worth/antlr/JSONListenerImpl.java | 6 ++--- .../woggioni}/worth/antlr/ParseTest.java | 7 +++-- .../worth/buffer/CircularBufferTest.java | 2 +- .../worth/serialization/binary/JBONTest.java | 15 +++++------ .../worth/serialization/json/JSONTest.java | 16 +++++------ .../serialization/json/PerformanceTest.java | 17 +++++------- .../woggioni}/worth/utils/Leb128Test.java | 3 +-- .../worth/utils/ValueWalkerTest.java | 8 +++--- 37 files changed, 122 insertions(+), 137 deletions(-) rename src/main/java/{org/oggio88 => net/woggioni}/worth/buffer/CircularBuffer.java (96%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/buffer/LookAheadInputStream.java (93%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/buffer/LookAheadTextInputStream.java (93%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/exception/IOException.java (75%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/exception/NotImplementedException.java (78%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/exception/ParseException.java (76%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/exception/TypeException.java (75%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/exception/WorthException.java (76%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/serialization/ValueDumper.java (90%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/serialization/ValueParser.java (92%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/serialization/binary/BinaryMarker.java (87%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/serialization/binary/JBONDumper.java (84%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/serialization/binary/JBONParser.java (92%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/serialization/json/JSONDumper.java (85%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/serialization/json/JSONParser.java (94%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/utils/Leb128.java (98%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/utils/ValueWalker.java (94%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/utils/WorthUtils.java (97%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/value/ArrayValue.java (93%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/value/BooleanValue.java (83%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/value/FloatValue.java (82%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/value/IntegerValue.java (82%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/value/NullValue.java (69%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/value/ObjectValue.java (98%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/value/StringValue.java (83%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/xface/Dumper.java (88%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/xface/Parser.java (87%) rename src/main/java/{org/oggio88 => net/woggioni}/worth/xface/Value.java (92%) rename src/test/java/{org/oggio88 => net/woggioni}/worth/antlr/JSONListenerImpl.java (94%) rename src/test/java/{org/oggio88 => net/woggioni}/worth/antlr/ParseTest.java (78%) rename src/test/java/{org/oggio88 => net/woggioni}/worth/buffer/CircularBufferTest.java (96%) rename src/test/java/{org/oggio88 => net/woggioni}/worth/serialization/binary/JBONTest.java (87%) rename src/test/java/{org/oggio88 => net/woggioni}/worth/serialization/json/JSONTest.java (96%) rename src/test/java/{org/oggio88 => net/woggioni}/worth/serialization/json/PerformanceTest.java (88%) rename src/test/java/{org/oggio88 => net/woggioni}/worth/utils/Leb128Test.java (96%) rename src/test/java/{org/oggio88 => net/woggioni}/worth/utils/ValueWalkerTest.java (81%) diff --git a/build.sbt b/build.sbt index b7945f9..2b9db2a 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ name := "worth" -organization := "org.oggio88" +organization := "net.woggioni" version := "1.0" resolvers += Resolver.mavenLocal @@ -16,7 +16,7 @@ scalacOptions ++= Seq( git.useGitDescribe := true fork := true -//javaOptions in Test += "-Dorg.oggio88.worth.value.ObjectValue.listBasedImplementation=true" +//javaOptions in Test += "-Dnet.woggioni.worth.value.ObjectValue.listBasedImplementation=true" //javaOptions in Test += "-Xmx14G" //scalafmtOnCompile := true libraryDependencies += "org.projectlombok" % "lombok" % "1.18.2" @@ -33,4 +33,4 @@ artifactName := { (sv: ScalaVersion, module: ModuleID, artifact: Artifact) => enablePlugins(Antlr4Plugin) antlr4Version in Antlr4 := "4.7.1" -antlr4PackageName in Antlr4 := Some("org.oggio88.worth.antlr") \ No newline at end of file +antlr4PackageName in Antlr4 := Some("net.woggioni.worth.antlr") \ No newline at end of file diff --git a/src/main/java/org/oggio88/worth/buffer/CircularBuffer.java b/src/main/java/net/woggioni/worth/buffer/CircularBuffer.java similarity index 96% rename from src/main/java/org/oggio88/worth/buffer/CircularBuffer.java rename to src/main/java/net/woggioni/worth/buffer/CircularBuffer.java index bab82db..bec6ed4 100644 --- a/src/main/java/org/oggio88/worth/buffer/CircularBuffer.java +++ b/src/main/java/net/woggioni/worth/buffer/CircularBuffer.java @@ -1,4 +1,4 @@ -package org.oggio88.worth.buffer; +package net.woggioni.worth.buffer; import lombok.SneakyThrows; diff --git a/src/main/java/org/oggio88/worth/buffer/LookAheadInputStream.java b/src/main/java/net/woggioni/worth/buffer/LookAheadInputStream.java similarity index 93% rename from src/main/java/org/oggio88/worth/buffer/LookAheadInputStream.java rename to src/main/java/net/woggioni/worth/buffer/LookAheadInputStream.java index 241d0a3..6bf9342 100644 --- a/src/main/java/org/oggio88/worth/buffer/LookAheadInputStream.java +++ b/src/main/java/net/woggioni/worth/buffer/LookAheadInputStream.java @@ -1,4 +1,4 @@ -package org.oggio88.worth.buffer; +package net.woggioni.worth.buffer; import lombok.SneakyThrows; diff --git a/src/main/java/org/oggio88/worth/buffer/LookAheadTextInputStream.java b/src/main/java/net/woggioni/worth/buffer/LookAheadTextInputStream.java similarity index 93% rename from src/main/java/org/oggio88/worth/buffer/LookAheadTextInputStream.java rename to src/main/java/net/woggioni/worth/buffer/LookAheadTextInputStream.java index d4a4ba0..3637cc5 100644 --- a/src/main/java/org/oggio88/worth/buffer/LookAheadTextInputStream.java +++ b/src/main/java/net/woggioni/worth/buffer/LookAheadTextInputStream.java @@ -1,4 +1,4 @@ -package org.oggio88.worth.buffer; +package net.woggioni.worth.buffer; import lombok.SneakyThrows; diff --git a/src/main/java/org/oggio88/worth/exception/IOException.java b/src/main/java/net/woggioni/worth/exception/IOException.java similarity index 75% rename from src/main/java/org/oggio88/worth/exception/IOException.java rename to src/main/java/net/woggioni/worth/exception/IOException.java index 1603183..8fa2ef6 100644 --- a/src/main/java/org/oggio88/worth/exception/IOException.java +++ b/src/main/java/net/woggioni/worth/exception/IOException.java @@ -1,4 +1,4 @@ -package org.oggio88.worth.exception; +package net.woggioni.worth.exception; public class IOException extends WorthException { public IOException(String msg) { diff --git a/src/main/java/org/oggio88/worth/exception/NotImplementedException.java b/src/main/java/net/woggioni/worth/exception/NotImplementedException.java similarity index 78% rename from src/main/java/org/oggio88/worth/exception/NotImplementedException.java rename to src/main/java/net/woggioni/worth/exception/NotImplementedException.java index 66f889b..4f67268 100644 --- a/src/main/java/org/oggio88/worth/exception/NotImplementedException.java +++ b/src/main/java/net/woggioni/worth/exception/NotImplementedException.java @@ -1,4 +1,4 @@ -package org.oggio88.worth.exception; +package net.woggioni.worth.exception; public class NotImplementedException extends WorthException { public NotImplementedException(String msg) { diff --git a/src/main/java/org/oggio88/worth/exception/ParseException.java b/src/main/java/net/woggioni/worth/exception/ParseException.java similarity index 76% rename from src/main/java/org/oggio88/worth/exception/ParseException.java rename to src/main/java/net/woggioni/worth/exception/ParseException.java index 8a1275e..468978f 100644 --- a/src/main/java/org/oggio88/worth/exception/ParseException.java +++ b/src/main/java/net/woggioni/worth/exception/ParseException.java @@ -1,4 +1,4 @@ -package org.oggio88.worth.exception; +package net.woggioni.worth.exception; public class ParseException extends WorthException { public ParseException(String msg) { diff --git a/src/main/java/org/oggio88/worth/exception/TypeException.java b/src/main/java/net/woggioni/worth/exception/TypeException.java similarity index 75% rename from src/main/java/org/oggio88/worth/exception/TypeException.java rename to src/main/java/net/woggioni/worth/exception/TypeException.java index b3cdfe2..28a0fda 100644 --- a/src/main/java/org/oggio88/worth/exception/TypeException.java +++ b/src/main/java/net/woggioni/worth/exception/TypeException.java @@ -1,4 +1,4 @@ -package org.oggio88.worth.exception; +package net.woggioni.worth.exception; public class TypeException extends WorthException { public TypeException(String msg) { diff --git a/src/main/java/org/oggio88/worth/exception/WorthException.java b/src/main/java/net/woggioni/worth/exception/WorthException.java similarity index 76% rename from src/main/java/org/oggio88/worth/exception/WorthException.java rename to src/main/java/net/woggioni/worth/exception/WorthException.java index 23c6eef..8216868 100644 --- a/src/main/java/org/oggio88/worth/exception/WorthException.java +++ b/src/main/java/net/woggioni/worth/exception/WorthException.java @@ -1,4 +1,4 @@ -package org.oggio88.worth.exception; +package net.woggioni.worth.exception; public class WorthException extends RuntimeException { public WorthException(String msg) { diff --git a/src/main/java/org/oggio88/worth/serialization/ValueDumper.java b/src/main/java/net/woggioni/worth/serialization/ValueDumper.java similarity index 90% rename from src/main/java/org/oggio88/worth/serialization/ValueDumper.java rename to src/main/java/net/woggioni/worth/serialization/ValueDumper.java index e5519a8..56fb397 100644 --- a/src/main/java/org/oggio88/worth/serialization/ValueDumper.java +++ b/src/main/java/net/woggioni/worth/serialization/ValueDumper.java @@ -1,11 +1,11 @@ -package org.oggio88.worth.serialization; +package net.woggioni.worth.serialization; import lombok.RequiredArgsConstructor; -import org.oggio88.worth.exception.NotImplementedException; -import org.oggio88.worth.value.ArrayValue; -import org.oggio88.worth.value.ObjectValue; -import org.oggio88.worth.xface.Dumper; -import org.oggio88.worth.xface.Value; +import net.woggioni.worth.exception.NotImplementedException; +import net.woggioni.worth.value.ArrayValue; +import net.woggioni.worth.value.ObjectValue; +import net.woggioni.worth.xface.Dumper; +import net.woggioni.worth.xface.Value; import java.io.OutputStream; import java.io.OutputStreamWriter; diff --git a/src/main/java/org/oggio88/worth/serialization/ValueParser.java b/src/main/java/net/woggioni/worth/serialization/ValueParser.java similarity index 92% rename from src/main/java/org/oggio88/worth/serialization/ValueParser.java rename to src/main/java/net/woggioni/worth/serialization/ValueParser.java index aa0e7ad..0f20f2c 100644 --- a/src/main/java/org/oggio88/worth/serialization/ValueParser.java +++ b/src/main/java/net/woggioni/worth/serialization/ValueParser.java @@ -1,11 +1,11 @@ -package org.oggio88.worth.serialization; +package net.woggioni.worth.serialization; import lombok.RequiredArgsConstructor; -import org.oggio88.worth.exception.NotImplementedException; -import org.oggio88.worth.utils.WorthUtils; -import org.oggio88.worth.value.*; -import org.oggio88.worth.xface.Parser; -import org.oggio88.worth.xface.Value; +import net.woggioni.worth.exception.NotImplementedException; +import net.woggioni.worth.utils.WorthUtils; +import net.woggioni.worth.value.*; +import net.woggioni.worth.xface.Value; +import net.woggioni.worth.xface.Parser; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/src/main/java/org/oggio88/worth/serialization/binary/BinaryMarker.java b/src/main/java/net/woggioni/worth/serialization/binary/BinaryMarker.java similarity index 87% rename from src/main/java/org/oggio88/worth/serialization/binary/BinaryMarker.java rename to src/main/java/net/woggioni/worth/serialization/binary/BinaryMarker.java index 95ae56d..147b35a 100644 --- a/src/main/java/org/oggio88/worth/serialization/binary/BinaryMarker.java +++ b/src/main/java/net/woggioni/worth/serialization/binary/BinaryMarker.java @@ -1,4 +1,4 @@ -package org.oggio88.worth.serialization.binary; +package net.woggioni.worth.serialization.binary; public enum BinaryMarker { Float(0x0), diff --git a/src/main/java/org/oggio88/worth/serialization/binary/JBONDumper.java b/src/main/java/net/woggioni/worth/serialization/binary/JBONDumper.java similarity index 84% rename from src/main/java/org/oggio88/worth/serialization/binary/JBONDumper.java rename to src/main/java/net/woggioni/worth/serialization/binary/JBONDumper.java index 88dbcb6..50f8730 100644 --- a/src/main/java/org/oggio88/worth/serialization/binary/JBONDumper.java +++ b/src/main/java/net/woggioni/worth/serialization/binary/JBONDumper.java @@ -1,21 +1,20 @@ -package org.oggio88.worth.serialization.binary; +package net.woggioni.worth.serialization.binary; import lombok.SneakyThrows; -import org.oggio88.worth.exception.NotImplementedException; -import org.oggio88.worth.serialization.ValueDumper; -import org.oggio88.worth.utils.Leb128; -import org.oggio88.worth.value.ArrayValue; -import org.oggio88.worth.value.ObjectValue; -import org.oggio88.worth.xface.Dumper; -import org.oggio88.worth.xface.Value; +import net.woggioni.worth.exception.NotImplementedException; +import net.woggioni.worth.utils.Leb128; +import net.woggioni.worth.utils.WorthUtils; +import net.woggioni.worth.value.ArrayValue; +import net.woggioni.worth.value.ObjectValue; +import net.woggioni.worth.xface.Value; +import net.woggioni.worth.serialization.ValueDumper; +import net.woggioni.worth.xface.Dumper; import java.io.OutputStream; import java.io.Writer; import java.util.Map; import java.util.function.Consumer; -import static org.oggio88.worth.utils.WorthUtils.dynamicCast; - public class JBONDumper extends ValueDumper { public static Dumper newInstance() { @@ -51,12 +50,12 @@ public class JBONDumper extends ValueDumper { stringValue(v.asString()); break; case ARRAY: - ArrayValue arrayValue = dynamicCast(v, ArrayValue.class); + ArrayValue arrayValue = WorthUtils.dynamicCast(v, ArrayValue.class); stack.push(new ArrayStackLevel(arrayValue)); beginArray(arrayValue.size()); break; case OBJECT: - ObjectValue objectValue = dynamicCast(v, ObjectValue.class); + ObjectValue objectValue = WorthUtils.dynamicCast(v, ObjectValue.class); stack.push(new ObjectStackLevel(objectValue)); beginObject(objectValue.size()); break; @@ -68,14 +67,14 @@ public class JBONDumper extends ValueDumper { StackLevel last = stack.getFirst(); ArrayStackLevel arrayStackLevel; ObjectStackLevel objectStackLevel; - if ((arrayStackLevel = dynamicCast(last, ArrayStackLevel.class)) != null) { + if ((arrayStackLevel = WorthUtils.dynamicCast(last, ArrayStackLevel.class)) != null) { if (arrayStackLevel.hasNext()) { handle_value.accept(arrayStackLevel.next()); } else { endArray(); stack.pop(); } - } else if ((objectStackLevel = dynamicCast(last, ObjectStackLevel.class)) != null) { + } else if ((objectStackLevel = WorthUtils.dynamicCast(last, ObjectStackLevel.class)) != null) { if (objectStackLevel.hasNext()) { Map.Entry entry = objectStackLevel.next(); objectKey(entry.getKey()); diff --git a/src/main/java/org/oggio88/worth/serialization/binary/JBONParser.java b/src/main/java/net/woggioni/worth/serialization/binary/JBONParser.java similarity index 92% rename from src/main/java/org/oggio88/worth/serialization/binary/JBONParser.java rename to src/main/java/net/woggioni/worth/serialization/binary/JBONParser.java index 4147f46..3c02c99 100644 --- a/src/main/java/org/oggio88/worth/serialization/binary/JBONParser.java +++ b/src/main/java/net/woggioni/worth/serialization/binary/JBONParser.java @@ -1,13 +1,13 @@ -package org.oggio88.worth.serialization.binary; +package net.woggioni.worth.serialization.binary; import lombok.SneakyThrows; -import org.oggio88.worth.buffer.LookAheadInputStream; -import org.oggio88.worth.exception.ParseException; -import org.oggio88.worth.serialization.ValueParser; -import org.oggio88.worth.utils.Leb128; -import org.oggio88.worth.utils.WorthUtils; -import org.oggio88.worth.xface.Parser; -import org.oggio88.worth.xface.Value; +import net.woggioni.worth.utils.Leb128; +import net.woggioni.worth.utils.WorthUtils; +import net.woggioni.worth.xface.Value; +import net.woggioni.worth.buffer.LookAheadInputStream; +import net.woggioni.worth.exception.ParseException; +import net.woggioni.worth.serialization.ValueParser; +import net.woggioni.worth.xface.Parser; import java.io.InputStream; import java.util.function.Function; diff --git a/src/main/java/org/oggio88/worth/serialization/json/JSONDumper.java b/src/main/java/net/woggioni/worth/serialization/json/JSONDumper.java similarity index 85% rename from src/main/java/org/oggio88/worth/serialization/json/JSONDumper.java rename to src/main/java/net/woggioni/worth/serialization/json/JSONDumper.java index 5c3d9b9..17f08cb 100644 --- a/src/main/java/org/oggio88/worth/serialization/json/JSONDumper.java +++ b/src/main/java/net/woggioni/worth/serialization/json/JSONDumper.java @@ -1,11 +1,12 @@ -package org.oggio88.worth.serialization.json; +package net.woggioni.worth.serialization.json; import lombok.SneakyThrows; -import org.oggio88.worth.serialization.ValueDumper; -import org.oggio88.worth.value.ArrayValue; -import org.oggio88.worth.value.ObjectValue; -import org.oggio88.worth.xface.Dumper; -import org.oggio88.worth.xface.Value; +import net.woggioni.worth.utils.WorthUtils; +import net.woggioni.worth.value.ArrayValue; +import net.woggioni.worth.value.ObjectValue; +import net.woggioni.worth.xface.Value; +import net.woggioni.worth.serialization.ValueDumper; +import net.woggioni.worth.xface.Dumper; import java.io.OutputStream; import java.io.OutputStreamWriter; @@ -13,8 +14,6 @@ import java.io.Writer; import java.util.Map; import java.util.function.Consumer; -import static org.oggio88.worth.utils.WorthUtils.dynamicCast; - public class JSONDumper extends ValueDumper { public static Dumper newInstance() { @@ -81,13 +80,13 @@ public class JSONDumper extends ValueDumper { stringValue(v.asString()); break; case ARRAY: - ArrayValue arrayValue = dynamicCast(v, ArrayValue.class); + ArrayValue arrayValue = WorthUtils.dynamicCast(v, ArrayValue.class); stack.push(new ArrayStackLevel(arrayValue)); beginArray(arrayValue.size()); break; case OBJECT: - ObjectValue objectValue = dynamicCast(v, ObjectValue.class); - stack.push(new ObjectStackLevel(dynamicCast(v, ObjectValue.class))); + ObjectValue objectValue = WorthUtils.dynamicCast(v, ObjectValue.class); + stack.push(new ObjectStackLevel(WorthUtils.dynamicCast(v, ObjectValue.class))); beginObject(objectValue.size()); break; } @@ -98,7 +97,7 @@ public class JSONDumper extends ValueDumper { StackLevel last = stack.getFirst(); ArrayStackLevel arrayStackLevel; ObjectStackLevel objectStackLevel; - if ((arrayStackLevel = dynamicCast(last, ArrayStackLevel.class)) != null) { + if ((arrayStackLevel = WorthUtils.dynamicCast(last, ArrayStackLevel.class)) != null) { if (arrayStackLevel.hasNext()) { if (arrayStackLevel.index > 0) { writer.write(","); @@ -108,7 +107,7 @@ public class JSONDumper extends ValueDumper { endArray(); stack.pop(); } - } else if ((objectStackLevel = dynamicCast(last, ObjectStackLevel.class)) != null) { + } else if ((objectStackLevel = WorthUtils.dynamicCast(last, ObjectStackLevel.class)) != null) { if (objectStackLevel.hasNext()) { if (objectStackLevel.index > 0) { writer.write(","); diff --git a/src/main/java/org/oggio88/worth/serialization/json/JSONParser.java b/src/main/java/net/woggioni/worth/serialization/json/JSONParser.java similarity index 94% rename from src/main/java/org/oggio88/worth/serialization/json/JSONParser.java rename to src/main/java/net/woggioni/worth/serialization/json/JSONParser.java index eef3a7a..c4df6e8 100644 --- a/src/main/java/org/oggio88/worth/serialization/json/JSONParser.java +++ b/src/main/java/net/woggioni/worth/serialization/json/JSONParser.java @@ -1,14 +1,14 @@ -package org.oggio88.worth.serialization.json; +package net.woggioni.worth.serialization.json; import lombok.SneakyThrows; -import org.oggio88.worth.buffer.LookAheadTextInputStream; -import org.oggio88.worth.exception.IOException; -import org.oggio88.worth.exception.NotImplementedException; -import org.oggio88.worth.exception.ParseException; -import org.oggio88.worth.serialization.ValueParser; -import org.oggio88.worth.utils.WorthUtils; -import org.oggio88.worth.xface.Parser; -import org.oggio88.worth.xface.Value; +import net.woggioni.worth.xface.Value; +import net.woggioni.worth.buffer.LookAheadTextInputStream; +import net.woggioni.worth.exception.IOException; +import net.woggioni.worth.exception.NotImplementedException; +import net.woggioni.worth.exception.ParseException; +import net.woggioni.worth.serialization.ValueParser; +import net.woggioni.worth.utils.WorthUtils; +import net.woggioni.worth.xface.Parser; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/src/main/java/org/oggio88/worth/utils/Leb128.java b/src/main/java/net/woggioni/worth/utils/Leb128.java similarity index 98% rename from src/main/java/org/oggio88/worth/utils/Leb128.java rename to src/main/java/net/woggioni/worth/utils/Leb128.java index c6378b2..ecd5e79 100644 --- a/src/main/java/org/oggio88/worth/utils/Leb128.java +++ b/src/main/java/net/woggioni/worth/utils/Leb128.java @@ -1,4 +1,4 @@ -package org.oggio88.worth.utils; +package net.woggioni.worth.utils; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/org/oggio88/worth/utils/ValueWalker.java b/src/main/java/net/woggioni/worth/utils/ValueWalker.java similarity index 94% rename from src/main/java/org/oggio88/worth/utils/ValueWalker.java rename to src/main/java/net/woggioni/worth/utils/ValueWalker.java index ef9843b..26b42fa 100644 --- a/src/main/java/org/oggio88/worth/utils/ValueWalker.java +++ b/src/main/java/net/woggioni/worth/utils/ValueWalker.java @@ -1,6 +1,6 @@ -package org.oggio88.worth.utils; +package net.woggioni.worth.utils; -import org.oggio88.worth.xface.Value; +import net.woggioni.worth.xface.Value; import java.util.Optional; import java.util.function.Function; diff --git a/src/main/java/org/oggio88/worth/utils/WorthUtils.java b/src/main/java/net/woggioni/worth/utils/WorthUtils.java similarity index 97% rename from src/main/java/org/oggio88/worth/utils/WorthUtils.java rename to src/main/java/net/woggioni/worth/utils/WorthUtils.java index fead2ce..a005007 100644 --- a/src/main/java/org/oggio88/worth/utils/WorthUtils.java +++ b/src/main/java/net/woggioni/worth/utils/WorthUtils.java @@ -1,12 +1,11 @@ -package org.oggio88.worth.utils; +package net.woggioni.worth.utils; import lombok.SneakyThrows; -import org.oggio88.worth.xface.Value; +import net.woggioni.worth.xface.Value; import java.io.*; import java.lang.reflect.Constructor; import java.util.Optional; -import java.util.concurrent.Callable; import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; diff --git a/src/main/java/org/oggio88/worth/value/ArrayValue.java b/src/main/java/net/woggioni/worth/value/ArrayValue.java similarity index 93% rename from src/main/java/org/oggio88/worth/value/ArrayValue.java rename to src/main/java/net/woggioni/worth/value/ArrayValue.java index 3528ffc..ddbffdd 100644 --- a/src/main/java/org/oggio88/worth/value/ArrayValue.java +++ b/src/main/java/net/woggioni/worth/value/ArrayValue.java @@ -1,12 +1,11 @@ -package org.oggio88.worth.value; +package net.woggioni.worth.value; import lombok.EqualsAndHashCode; -import org.oggio88.worth.xface.Value; +import net.woggioni.worth.xface.Value; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.Optional; @EqualsAndHashCode public class ArrayValue implements Value, Iterable { diff --git a/src/main/java/org/oggio88/worth/value/BooleanValue.java b/src/main/java/net/woggioni/worth/value/BooleanValue.java similarity index 83% rename from src/main/java/org/oggio88/worth/value/BooleanValue.java rename to src/main/java/net/woggioni/worth/value/BooleanValue.java index d2af235..d7c20e7 100644 --- a/src/main/java/org/oggio88/worth/value/BooleanValue.java +++ b/src/main/java/net/woggioni/worth/value/BooleanValue.java @@ -1,7 +1,7 @@ -package org.oggio88.worth.value; +package net.woggioni.worth.value; import lombok.EqualsAndHashCode; -import org.oggio88.worth.xface.Value; +import net.woggioni.worth.xface.Value; @EqualsAndHashCode public class BooleanValue implements Value { diff --git a/src/main/java/org/oggio88/worth/value/FloatValue.java b/src/main/java/net/woggioni/worth/value/FloatValue.java similarity index 82% rename from src/main/java/org/oggio88/worth/value/FloatValue.java rename to src/main/java/net/woggioni/worth/value/FloatValue.java index 84a5425..ca723b7 100644 --- a/src/main/java/org/oggio88/worth/value/FloatValue.java +++ b/src/main/java/net/woggioni/worth/value/FloatValue.java @@ -1,7 +1,7 @@ -package org.oggio88.worth.value; +package net.woggioni.worth.value; import lombok.EqualsAndHashCode; -import org.oggio88.worth.xface.Value; +import net.woggioni.worth.xface.Value; @EqualsAndHashCode public class FloatValue implements Value { diff --git a/src/main/java/org/oggio88/worth/value/IntegerValue.java b/src/main/java/net/woggioni/worth/value/IntegerValue.java similarity index 82% rename from src/main/java/org/oggio88/worth/value/IntegerValue.java rename to src/main/java/net/woggioni/worth/value/IntegerValue.java index 366a609..5f5b0cc 100644 --- a/src/main/java/org/oggio88/worth/value/IntegerValue.java +++ b/src/main/java/net/woggioni/worth/value/IntegerValue.java @@ -1,7 +1,7 @@ -package org.oggio88.worth.value; +package net.woggioni.worth.value; import lombok.EqualsAndHashCode; -import org.oggio88.worth.xface.Value; +import net.woggioni.worth.xface.Value; @EqualsAndHashCode public class IntegerValue implements Value { diff --git a/src/main/java/org/oggio88/worth/value/NullValue.java b/src/main/java/net/woggioni/worth/value/NullValue.java similarity index 69% rename from src/main/java/org/oggio88/worth/value/NullValue.java rename to src/main/java/net/woggioni/worth/value/NullValue.java index b947676..d4c8cb7 100644 --- a/src/main/java/org/oggio88/worth/value/NullValue.java +++ b/src/main/java/net/woggioni/worth/value/NullValue.java @@ -1,7 +1,7 @@ -package org.oggio88.worth.value; +package net.woggioni.worth.value; import lombok.EqualsAndHashCode; -import org.oggio88.worth.xface.Value; +import net.woggioni.worth.xface.Value; @EqualsAndHashCode public class NullValue implements Value { diff --git a/src/main/java/org/oggio88/worth/value/ObjectValue.java b/src/main/java/net/woggioni/worth/value/ObjectValue.java similarity index 98% rename from src/main/java/org/oggio88/worth/value/ObjectValue.java rename to src/main/java/net/woggioni/worth/value/ObjectValue.java index 1e293d7..380ec64 100644 --- a/src/main/java/org/oggio88/worth/value/ObjectValue.java +++ b/src/main/java/net/woggioni/worth/value/ObjectValue.java @@ -1,8 +1,8 @@ -package org.oggio88.worth.value; +package net.woggioni.worth.value; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.oggio88.worth.xface.Value; +import net.woggioni.worth.xface.Value; import java.util.*; diff --git a/src/main/java/org/oggio88/worth/value/StringValue.java b/src/main/java/net/woggioni/worth/value/StringValue.java similarity index 83% rename from src/main/java/org/oggio88/worth/value/StringValue.java rename to src/main/java/net/woggioni/worth/value/StringValue.java index 8f98e0f..5fc0df9 100644 --- a/src/main/java/org/oggio88/worth/value/StringValue.java +++ b/src/main/java/net/woggioni/worth/value/StringValue.java @@ -1,7 +1,7 @@ -package org.oggio88.worth.value; +package net.woggioni.worth.value; import lombok.EqualsAndHashCode; -import org.oggio88.worth.xface.Value; +import net.woggioni.worth.xface.Value; @EqualsAndHashCode public class StringValue implements Value { diff --git a/src/main/java/org/oggio88/worth/xface/Dumper.java b/src/main/java/net/woggioni/worth/xface/Dumper.java similarity index 88% rename from src/main/java/org/oggio88/worth/xface/Dumper.java rename to src/main/java/net/woggioni/worth/xface/Dumper.java index 073b562..85c7072 100644 --- a/src/main/java/org/oggio88/worth/xface/Dumper.java +++ b/src/main/java/net/woggioni/worth/xface/Dumper.java @@ -1,4 +1,4 @@ -package org.oggio88.worth.xface; +package net.woggioni.worth.xface; import java.io.OutputStream; import java.io.Writer; diff --git a/src/main/java/org/oggio88/worth/xface/Parser.java b/src/main/java/net/woggioni/worth/xface/Parser.java similarity index 87% rename from src/main/java/org/oggio88/worth/xface/Parser.java rename to src/main/java/net/woggioni/worth/xface/Parser.java index 3aff1ee..b3ffa8d 100644 --- a/src/main/java/org/oggio88/worth/xface/Parser.java +++ b/src/main/java/net/woggioni/worth/xface/Parser.java @@ -1,4 +1,4 @@ -package org.oggio88.worth.xface; +package net.woggioni.worth.xface; import java.io.InputStream; import java.io.Reader; diff --git a/src/main/java/org/oggio88/worth/xface/Value.java b/src/main/java/net/woggioni/worth/xface/Value.java similarity index 92% rename from src/main/java/org/oggio88/worth/xface/Value.java rename to src/main/java/net/woggioni/worth/xface/Value.java index ba19bfd..2b5d9df 100644 --- a/src/main/java/org/oggio88/worth/xface/Value.java +++ b/src/main/java/net/woggioni/worth/xface/Value.java @@ -1,11 +1,10 @@ -package org.oggio88.worth.xface; +package net.woggioni.worth.xface; -import org.oggio88.worth.exception.TypeException; -import org.oggio88.worth.value.NullValue; +import net.woggioni.worth.exception.TypeException; +import net.woggioni.worth.value.NullValue; import java.util.List; import java.util.Map; -import java.util.Optional; public interface Value { diff --git a/src/test/java/org/oggio88/worth/antlr/JSONListenerImpl.java b/src/test/java/net/woggioni/worth/antlr/JSONListenerImpl.java similarity index 94% rename from src/test/java/org/oggio88/worth/antlr/JSONListenerImpl.java rename to src/test/java/net/woggioni/worth/antlr/JSONListenerImpl.java index c068dde..76494ea 100644 --- a/src/test/java/org/oggio88/worth/antlr/JSONListenerImpl.java +++ b/src/test/java/net/woggioni/worth/antlr/JSONListenerImpl.java @@ -1,10 +1,10 @@ -package org.oggio88.worth.antlr; +package net.woggioni.worth.antlr; import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.tree.ErrorNode; import org.antlr.v4.runtime.tree.TerminalNode; -import org.oggio88.worth.serialization.ValueParser; -import org.oggio88.worth.xface.Value; +import net.woggioni.worth.serialization.ValueParser; +import net.woggioni.worth.xface.Value; public class JSONListenerImpl extends ValueParser implements JSONListener { diff --git a/src/test/java/org/oggio88/worth/antlr/ParseTest.java b/src/test/java/net/woggioni/worth/antlr/ParseTest.java similarity index 78% rename from src/test/java/org/oggio88/worth/antlr/ParseTest.java rename to src/test/java/net/woggioni/worth/antlr/ParseTest.java index 4cad6eb..3071863 100644 --- a/src/test/java/org/oggio88/worth/antlr/ParseTest.java +++ b/src/test/java/net/woggioni/worth/antlr/ParseTest.java @@ -1,13 +1,13 @@ -package org.oggio88.worth.antlr; +package net.woggioni.worth.antlr; import lombok.SneakyThrows; +import net.woggioni.worth.xface.Value; import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CodePointCharStream; import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.tree.ParseTreeWalker; import org.junit.Test; -import org.oggio88.worth.serialization.json.JSONDumper; -import org.oggio88.worth.xface.Value; +import net.woggioni.worth.serialization.json.JSONDumper; import java.io.InputStreamReader; @@ -26,6 +26,5 @@ public class ParseTest { walker.walk(listener, parser.json()); Value result = listener.result; new JSONDumper().dump(result, System.out); -// TestRig.main(new String[] {"org.oggio88.worth.antlr.JSON", "json", "-ps", "tree.ps", "src/test/resources/test.json"}); } } diff --git a/src/test/java/org/oggio88/worth/buffer/CircularBufferTest.java b/src/test/java/net/woggioni/worth/buffer/CircularBufferTest.java similarity index 96% rename from src/test/java/org/oggio88/worth/buffer/CircularBufferTest.java rename to src/test/java/net/woggioni/worth/buffer/CircularBufferTest.java index 48bf6aa..0d24217 100644 --- a/src/test/java/org/oggio88/worth/buffer/CircularBufferTest.java +++ b/src/test/java/net/woggioni/worth/buffer/CircularBufferTest.java @@ -1,4 +1,4 @@ -package org.oggio88.worth.buffer; +package net.woggioni.worth.buffer; import lombok.SneakyThrows; import org.junit.Assert; diff --git a/src/test/java/org/oggio88/worth/serialization/binary/JBONTest.java b/src/test/java/net/woggioni/worth/serialization/binary/JBONTest.java similarity index 87% rename from src/test/java/org/oggio88/worth/serialization/binary/JBONTest.java rename to src/test/java/net/woggioni/worth/serialization/binary/JBONTest.java index a5d1685..a121dcf 100644 --- a/src/test/java/org/oggio88/worth/serialization/binary/JBONTest.java +++ b/src/test/java/net/woggioni/worth/serialization/binary/JBONTest.java @@ -1,16 +1,13 @@ -package org.oggio88.worth.serialization.binary; +package net.woggioni.worth.serialization.binary; import lombok.SneakyThrows; import org.junit.Assert; import org.junit.Test; -import org.oggio88.worth.buffer.LookAheadTextInputStream; -import org.oggio88.worth.serialization.binary.JBONDumper; -import org.oggio88.worth.serialization.binary.JBONParser; -import org.oggio88.worth.serialization.json.JSONParser; -import org.oggio88.worth.value.NullValue; -import org.oggio88.worth.value.ObjectValue; -import org.oggio88.worth.xface.Parser; -import org.oggio88.worth.xface.Value; +import net.woggioni.worth.buffer.LookAheadTextInputStream; +import net.woggioni.worth.serialization.json.JSONParser; +import net.woggioni.worth.value.ObjectValue; +import net.woggioni.worth.xface.Parser; +import net.woggioni.worth.xface.Value; import java.io.*; import java.lang.reflect.Method; diff --git a/src/test/java/org/oggio88/worth/serialization/json/JSONTest.java b/src/test/java/net/woggioni/worth/serialization/json/JSONTest.java similarity index 96% rename from src/test/java/org/oggio88/worth/serialization/json/JSONTest.java rename to src/test/java/net/woggioni/worth/serialization/json/JSONTest.java index 1104844..0ee438e 100644 --- a/src/test/java/org/oggio88/worth/serialization/json/JSONTest.java +++ b/src/test/java/net/woggioni/worth/serialization/json/JSONTest.java @@ -1,4 +1,4 @@ -package org.oggio88.worth.serialization.json; +package net.woggioni.worth.serialization.json; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -6,13 +6,13 @@ import com.fasterxml.jackson.databind.node.JsonNodeType; import lombok.SneakyThrows; import org.junit.Assert; import org.junit.Test; -import org.oggio88.worth.buffer.LookAheadTextInputStream; -import org.oggio88.worth.exception.NotImplementedException; -import org.oggio88.worth.utils.WorthUtils; -import org.oggio88.worth.value.ArrayValue; -import org.oggio88.worth.value.ObjectValue; -import org.oggio88.worth.xface.Parser; -import org.oggio88.worth.xface.Value; +import net.woggioni.worth.buffer.LookAheadTextInputStream; +import net.woggioni.worth.exception.NotImplementedException; +import net.woggioni.worth.utils.WorthUtils; +import net.woggioni.worth.value.ArrayValue; +import net.woggioni.worth.value.ObjectValue; +import net.woggioni.worth.xface.Parser; +import net.woggioni.worth.xface.Value; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/test/java/org/oggio88/worth/serialization/json/PerformanceTest.java b/src/test/java/net/woggioni/worth/serialization/json/PerformanceTest.java similarity index 88% rename from src/test/java/org/oggio88/worth/serialization/json/PerformanceTest.java rename to src/test/java/net/woggioni/worth/serialization/json/PerformanceTest.java index 3bde86d..3141a43 100644 --- a/src/test/java/org/oggio88/worth/serialization/json/PerformanceTest.java +++ b/src/test/java/net/woggioni/worth/serialization/json/PerformanceTest.java @@ -1,25 +1,20 @@ -package org.oggio88.worth.serialization.json; +package net.woggioni.worth.serialization.json; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.SneakyThrows; -import org.antlr.v4.runtime.ANTLRInputStream; +import net.woggioni.worth.antlr.JSONListenerImpl; import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.tree.ParseTreeWalker; import org.junit.Ignore; import org.junit.Test; -import org.oggio88.worth.antlr.JSONLexer; -import org.oggio88.worth.antlr.JSONListenerImpl; -import org.oggio88.worth.serialization.binary.JBONDumper; -import org.oggio88.worth.value.ObjectValue; -import org.oggio88.worth.xface.Dumper; -import org.oggio88.worth.xface.Value; +import net.woggioni.worth.antlr.JSONLexer; +import net.woggioni.worth.xface.Value; import org.tukaani.xz.XZInputStream; import java.io.*; -import java.nio.file.Paths; class Chronometer { @@ -99,7 +94,7 @@ public class PerformanceTest { new InputStreamReader(getClass().getResourceAsStream("/wordpress.json"))); JSONLexer lexer = new JSONLexer(inputStream); CommonTokenStream commonTokenStream = new CommonTokenStream(lexer); - org.oggio88.worth.antlr.JSONParser parser = new org.oggio88.worth.antlr.JSONParser(commonTokenStream); + net.woggioni.worth.antlr.JSONParser parser = new net.woggioni.worth.antlr.JSONParser(commonTokenStream); JSONListenerImpl listener = new JSONListenerImpl(); ParseTreeWalker walker = new ParseTreeWalker(); walker.walk(listener, parser.json()); @@ -133,7 +128,7 @@ public class PerformanceTest { CharStream inputStream = CharStreams.fromReader(new InputStreamReader(is)); JSONLexer lexer = new JSONLexer(inputStream); CommonTokenStream commonTokenStream = new CommonTokenStream(lexer); - org.oggio88.worth.antlr.JSONParser parser = new org.oggio88.worth.antlr.JSONParser(commonTokenStream); + net.woggioni.worth.antlr.JSONParser parser = new net.woggioni.worth.antlr.JSONParser(commonTokenStream); JSONListenerImpl listener = new JSONListenerImpl(); ParseTreeWalker walker = new ParseTreeWalker(); walker.walk(listener, parser.json()); diff --git a/src/test/java/org/oggio88/worth/utils/Leb128Test.java b/src/test/java/net/woggioni/worth/utils/Leb128Test.java similarity index 96% rename from src/test/java/org/oggio88/worth/utils/Leb128Test.java rename to src/test/java/net/woggioni/worth/utils/Leb128Test.java index 00ea938..382c42f 100644 --- a/src/test/java/org/oggio88/worth/utils/Leb128Test.java +++ b/src/test/java/net/woggioni/worth/utils/Leb128Test.java @@ -1,4 +1,4 @@ -package org.oggio88.worth.utils; +package net.woggioni.worth.utils; import lombok.SneakyThrows; import org.junit.Assert; @@ -6,7 +6,6 @@ import org.junit.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.OutputStream; import java.util.Arrays; import java.util.List; diff --git a/src/test/java/org/oggio88/worth/utils/ValueWalkerTest.java b/src/test/java/net/woggioni/worth/utils/ValueWalkerTest.java similarity index 81% rename from src/test/java/org/oggio88/worth/utils/ValueWalkerTest.java rename to src/test/java/net/woggioni/worth/utils/ValueWalkerTest.java index 6ea7c19..37019fd 100644 --- a/src/test/java/org/oggio88/worth/utils/ValueWalkerTest.java +++ b/src/test/java/net/woggioni/worth/utils/ValueWalkerTest.java @@ -1,11 +1,11 @@ -package org.oggio88.worth.utils; +package net.woggioni.worth.utils; import lombok.SneakyThrows; +import net.woggioni.worth.serialization.json.JSONParser; +import net.woggioni.worth.xface.Parser; +import net.woggioni.worth.xface.Value; import org.junit.Assert; import org.junit.Test; -import org.oggio88.worth.serialization.json.JSONParser; -import org.oggio88.worth.xface.Parser; -import org.oggio88.worth.xface.Value; import java.io.BufferedInputStream; import java.io.InputStream;