From 6eeb37149951fbfc5bb6eb96e1ce03b911dfed03 Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Wed, 27 Dec 2023 13:02:04 +0100 Subject: [PATCH 01/31] init --- .factorypath | 6 + .gitignore | 40 ++++ pom.xml | 69 +++++++ src/examples/Bar.java | 85 +++++++++ src/examples/Foo.java | 142 ++++++++++++++ src/examples/MemberInvokeOperator.java | 48 +++++ src/examples/Message.java | 62 ++++++ src/examples/TryParser.java | 35 ++++ .../AdvancedParsersExample.java | 43 +++++ .../implementations/GeneralExample.java | 133 +++++++++++++ .../ReadingJsonFromInternet.java | 34 ++++ .../implementations/SerializingWithJson.java | 70 +++++++ .../implementations/SimpleCalculator.java | 66 +++++++ .../implementations/SimpleQuerying.java | 148 +++++++++++++++ .../implementations/commentedExample.juss | 146 +++++++++++++++ src/examples/implementations/messages.json | 14 ++ .../implementations/simpleScript.juss | 21 +++ src/examples/implementations/test.json | 10 + src/examples/implementations/test.juss | 31 +++ src/tests/n/benchmarks/Benchmarks.java | 176 ++++++++++++++++++ src/tests/n/benchmarks/SimpleBench.java | 63 +++++++ src/tests/n/benchmarks/Testing.java | 33 ++++ src/tst/srlx/head/Main.java | 121 ++++++++++++ src/tst/srlx/head/kop/KoP.java | 61 ++++++ src/tst/srlx/head/kop/Osoba.java | 63 +++++++ .../head/kop/converters/OsobaConverter.java | 78 ++++++++ .../head/kop/protocols/OsobaProtocol.java | 65 +++++++ 27 files changed, 1863 insertions(+) create mode 100644 .factorypath create mode 100644 .gitignore create mode 100644 pom.xml create mode 100644 src/examples/Bar.java create mode 100644 src/examples/Foo.java create mode 100644 src/examples/MemberInvokeOperator.java create mode 100644 src/examples/Message.java create mode 100644 src/examples/TryParser.java create mode 100644 src/examples/implementations/AdvancedParsersExample.java create mode 100644 src/examples/implementations/GeneralExample.java create mode 100644 src/examples/implementations/ReadingJsonFromInternet.java create mode 100644 src/examples/implementations/SerializingWithJson.java create mode 100644 src/examples/implementations/SimpleCalculator.java create mode 100644 src/examples/implementations/SimpleQuerying.java create mode 100644 src/examples/implementations/commentedExample.juss create mode 100644 src/examples/implementations/messages.json create mode 100644 src/examples/implementations/simpleScript.juss create mode 100644 src/examples/implementations/test.json create mode 100644 src/examples/implementations/test.juss create mode 100644 src/tests/n/benchmarks/Benchmarks.java create mode 100644 src/tests/n/benchmarks/SimpleBench.java create mode 100644 src/tests/n/benchmarks/Testing.java create mode 100644 src/tst/srlx/head/Main.java create mode 100644 src/tst/srlx/head/kop/KoP.java create mode 100644 src/tst/srlx/head/kop/Osoba.java create mode 100644 src/tst/srlx/head/kop/converters/OsobaConverter.java create mode 100644 src/tst/srlx/head/kop/protocols/OsobaProtocol.java diff --git a/.factorypath b/.factorypath new file mode 100644 index 0000000..1c63f23 --- /dev/null +++ b/.factorypath @@ -0,0 +1,6 @@ + + + + + + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2957f58 --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +# Specifies intentionally untracked files to ignore when using Git +# http://git-scm.com/docs/gitignore + +*~ +*.sw[mnpcod] +.tmp +*.tmp +*.tmp.* +*.sublime-project +*.sublime-workspace +.DS_Store +Thumbs.db +UserInterfaceState.xcuserstate +$RECYCLE.BIN/ + +*.log +log.txt +npm-debug.log* + +/.idea +/.ionic +/.sass-cache +/.sourcemaps +/.versions +/.vscode +/coverage +/dist +/node_modules +/platforms +/plugins +/www + +bin/ +tmp/ +.metadata +.classpath +.settings +.project + +target/ diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..a515c1a --- /dev/null +++ b/pom.xml @@ -0,0 +1,69 @@ + + 4.0.0 + SerialXTest + SerialXTest + 0.0.1-SNAPSHOT + SerualX-test + Used for testing + + + + org.ugp.serialx + json + 1.3.7 + + + org.ugp.serialx + devtools + 1.3.7 + + + org.ugp.serialx + operators + 1.3.7 + + + + org.openjdk.jmh + jmh-core + 1.36 + + + org.openjdk.jmh + jmh-generator-annprocess + 1.36 + + + + + src + + + src + + **/*.java + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-surefire-plugin + + always + true + + + + + \ No newline at end of file diff --git a/src/examples/Bar.java b/src/examples/Bar.java new file mode 100644 index 0000000..c317b67 --- /dev/null +++ b/src/examples/Bar.java @@ -0,0 +1,85 @@ +package examples; + +import java.util.List; + +public final class Bar extends Foo //Sample object that inheres +{ + byte by0 = (byte) 142; + short s0 = 555; + double d2 = 5; + Object sampleParent; + + @Override + public String toString() + { + return "Bar[" + a + " " + b + " " + c + " " + d + " " + f + " " + ch + " " + s + " " + nah + " " + l + " " + by0 + " " + s0 + " " + sampleParent+"]"; + } + + public static class BarProtocol extends FooProtocol //Protocol to serialize Bar + { + @Override + public Object[] serialize(Foo object) + { + return new Object[] {object.a, object.b, object.c, object.d, object.f, object.ch, object.s, object.nah, object.l, ((Bar) object).by0, ((Bar) object).s0, "${$parent}" /*If serialized with JussSerializer this will try to get value of parent property from certain scope!*/}; + } + + @SuppressWarnings("unchecked") + @Override + public Foo unserialize(Class objectClass, Object... args) + { + Bar f = new Bar(); + f.a = (int) args[0]; + f.b = (int) args[1]; + f.c = (int) args[2]; + f.d = (double) args[3]; + f.f = (float) args[4]; + f.ch = (char) args[5]; + f.s = (String) args[6]; + f.nah = (boolean) args[7]; + f.l = (List) args[8]; + f.by0 = (byte) args[9]; + f.s0 = (short) args[10]; + f.sampleParent = args[11]; + + return f; + } + + @Override + public Class applicableFor() + { + return Bar.class; + } + } + + public byte getBy0() { + return by0; + } + + public void setBy0(byte by0) { + this.by0 = by0; + } + + public short getS0() { + return s0; + } + + public void setS0(short s0) { + this.s0 = s0; + } + + public double getD2() { + return d2; + } + + public void setD2(double d2) { + this.d2 = d2; + } + + public Object getSampleParent() { + return sampleParent; + } + + public void setSampleParent(Object sampleParent) { + this.sampleParent = sampleParent; + } +} diff --git a/src/examples/Foo.java b/src/examples/Foo.java new file mode 100644 index 0000000..99a6559 --- /dev/null +++ b/src/examples/Foo.java @@ -0,0 +1,142 @@ +package examples; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Random; +import java.util.concurrent.CopyOnWriteArrayList; + +import org.ugp.serialx.protocols.SerializationProtocol; + +public class Foo //Sample object to be serialized using its protocol! +{ + int a = 8, b = 1, c = 456; + double d = 5; + float f = 1453.364564564132454654511324f; + char ch = 'l'; + String s = "a"; + boolean nah = false; + List l = new CopyOnWriteArrayList(Arrays.asList(6, 45, 464654, 9.9, 56f)); + + public Foo() + { + l.add(6); + l.add(9); + l.add(13); + l.add(new Random()); + l.add(new ArrayList<>(Arrays.asList(4, 5, 6d, new ArrayList<>(), "hi"))); + } + + @Override + public String toString() + { + return "Foo[" + a + " " + b + " " + c + " " + d + " " + f + " " + ch + " " + s + " " + nah + " " + l + "]"; + } + + public static class FooProtocol extends SerializationProtocol //Protocol to serialize Foo + { + @Override + public Object[] serialize(Foo object) + { + return new Object[] {object.a, object.b, object.c, object.d, object.f, object.ch, object.s, object.nah, object.l}; + } + + @SuppressWarnings("unchecked") + @Override + public Foo unserialize(Class objectClass, Object... args) + { + Foo f = new Foo(); + f.a = (int) args[0]; + f.b = (int) args[1]; + f.c = (int) args[2]; + f.d = (double) args[3]; + f.f = (float) args[4]; + f.ch = (char) args[5]; + f.s = (String) args[6]; + f.nah = (boolean) args[7]; + f.l = (List) args[8]; + + return f; + } + + @Override + public Class applicableFor() + { + return Foo.class; + } + } + + public int getA() { + return a; + } + + public void setA(int a) { + this.a = a; + } + + public int getB() { + return b; + } + + public void setB(int b) { + this.b = b; + } + + public int getC() { + return c; + } + + public void setC(int c) { + this.c = c; + } + + public double getD() { + return d; + } + + public void setD(double d) { + this.d = d; + } + + public float getF() { + return f; + } + + public void setF(float f) { + this.f = f; + } + + public char getCh() { + return ch; + } + + public void setCh(char ch) { + this.ch = ch; + } + + public String getS() { + return s; + } + + public void setS(String s) { + this.s = s; + } + + public boolean isNah() { + return nah; + } + + public void setNah(boolean nah) { + this.nah = nah; + } + + public List getL() { + return l; + } + + public void setL(List l) { + this.l = l; + }; + + public static void a() {}; +} diff --git a/src/examples/MemberInvokeOperator.java b/src/examples/MemberInvokeOperator.java new file mode 100644 index 0000000..a204e80 --- /dev/null +++ b/src/examples/MemberInvokeOperator.java @@ -0,0 +1,48 @@ +package examples; + +import static org.ugp.serialx.Utils.InvokeFunc; +import static org.ugp.serialx.Utils.indexOfNotInObj; +import static org.ugp.serialx.Utils.splitValues; + +import java.lang.reflect.InvocationTargetException; + +import org.ugp.serialx.converters.DataParser; +import org.ugp.serialx.converters.ProtocolConverter; +import org.ugp.serialx.juss.JussSerializer; + +/** + * This is example of more advanced parser! It can be used for calling non-static methods from objects via "->" operator!
+ * For example with this parser registered with {@link JussSerializer#JUSS_PARSERS} you can print out hello world in JUSS like System::out->println "Hello world"
+ * Note: This is only for demonstration purposes and not a real feature so its not fully compatible with JUSS syntax so you will have to use () quiet often depending on where you put this parser! + * + * @author PETO + * + * @serial 1.3.5 + */ +public class MemberInvokeOperator implements DataParser +{ + @Override + public Object parse(ParserRegistry myHomeRegistry, String str, Object... args) + { + int index; + if ((index = indexOfNotInObj(str, "->", false)) > 0) + { + Object obj = myHomeRegistry.parse(str.substring(0, index).trim(), args); + String[] funcArgs = splitValues(str.substring(index+2).trim(), ' '); + + try + { + return InvokeFunc(obj, funcArgs[0], ProtocolConverter.parseAll(myHomeRegistry, funcArgs, 1, true, args)); + } + catch (InvocationTargetException e) + { + throw new RuntimeException(e); + } + catch (Exception e2) + { + return null; + } + } + return CONTINUE; + } +} diff --git a/src/examples/Message.java b/src/examples/Message.java new file mode 100644 index 0000000..e94654d --- /dev/null +++ b/src/examples/Message.java @@ -0,0 +1,62 @@ +package examples; + +import org.ugp.serialx.protocols.SelfSerializable; + +/** + * Example of self-serializable object! + * SelfSerializable objects can be serialized directly without necessity of having any {@link SerializationDebugger}, all you need to do is implement {@link SelfSerializable} interface and override {@link SelfSerializable#serialize()} method accordingly! + * + * @author PETO + * + * @see SelfSerializable + * + * @since 1.3.2 + */ +public class Message implements SelfSerializable +{ + protected String str; + protected long date; + + public Message(String str, int date) + { + this.str = str; + this.date = date; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + Message other = (Message) obj; + return date == other.date && str.equals(other.str); + } + + @Override + public String toString() { + return "Message["+str+", "+date+"]"; + } + + public String getStr() { + return str; + } + + public void setStr(String str) { + this.str = str; + } + + public long getDate() { + return date; + } + + public void setDate(long date) { + this.date = date; + } + + @Override + public Object[] serialize() + { + return new Object[] {str, date}; + } +} diff --git a/src/examples/TryParser.java b/src/examples/TryParser.java new file mode 100644 index 0000000..15beb08 --- /dev/null +++ b/src/examples/TryParser.java @@ -0,0 +1,35 @@ +package examples; + +import static org.ugp.serialx.Utils.indexOfNotInObj; + +import org.ugp.serialx.converters.DataParser; + +/** + * This is another example of more "advanced" parser. This one allow you to use "try" keyword and catching exceptions! + * Note: This is only for demonstration purposes and not a real feature so its not fully compatible with JUSS syntax so you will have to use () quiet often depending on where you put this parser! + * + * @author PETO + * + * @since 1.3.5 + * + * @see MemberInvokeOperator + */ +public class TryParser implements DataParser +{ + @Override + public Object parse(ParserRegistry myHomeRegistry, String str, Object... args) + { + if (indexOfNotInObj(str = str.trim(), "try") == 0) + { + try + { + return myHomeRegistry.parse(str.substring(3).trim(), false, new Class[] {getClass()}, args); + } + catch (Exception e) + { + return e; + } + } + return CONTINUE; + } +} diff --git a/src/examples/implementations/AdvancedParsersExample.java b/src/examples/implementations/AdvancedParsersExample.java new file mode 100644 index 0000000..a070b0b --- /dev/null +++ b/src/examples/implementations/AdvancedParsersExample.java @@ -0,0 +1,43 @@ +package examples.implementations; + +import java.io.File; + +import org.ugp.serialx.LogProvider; +import org.ugp.serialx.juss.JussSerializer; +import org.ugp.serialx.juss.converters.VariableConverter; + +import examples.MemberInvokeOperator; +import examples.TryParser; + +/** + * In this example we will create our very own simple scripting language by using {@link MemberInvokeOperator} and {@link TryParser} + * together with {@link JussSerializer#JUSS_PARSERS_AND_OPERATORS}! + * As you can see with SerialX capable of far more than parsing some JSON... + * Note: This is primarily for demonstrational purposes and might not be suitable for production... + * + * @author PETO + * + * @see TryParser + * @see MemberInvokeOperator + * + * @since 1.3.5 + */ +public class AdvancedParsersExample +{ + public static void main(String[] args) throws Exception + { + //In this case JussSerializer acts as an interpreter for our custom scripting language. + JussSerializer interpreter = new JussSerializer(); + + interpreter.setParsers(JussSerializer.JUSS_PARSERS_AND_OPERATORS); //Allowing usage of operators in our script! + interpreter.getParsers().addAllAfter(VariableConverter.class, new TryParser(), new MemberInvokeOperator()); //Allowing method calls and try expressions in our script! + + LogProvider.instance.setReThrowException(true); //This allows us to implement custom exception handling! + + interpreter.LoadFrom(new File("src/examples/implementations/simpleScript.juss")); //Running our script from simpleScript.juss file! + + //Printing the results of our script... + //System.out.println(interpreter); //This is not necessary in this case! + + } +} diff --git a/src/examples/implementations/GeneralExample.java b/src/examples/implementations/GeneralExample.java new file mode 100644 index 0000000..cf631b6 --- /dev/null +++ b/src/examples/implementations/GeneralExample.java @@ -0,0 +1,133 @@ +package examples.implementations; + +import java.io.File; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Random; +import java.util.concurrent.atomic.AtomicLong; + +import org.junit.Test; +import org.ugp.serialx.GenericScope; +import org.ugp.serialx.Scope; +import org.ugp.serialx.devtools.SerializationDebugger; +import org.ugp.serialx.juss.JussSerializer; +import org.ugp.serialx.protocols.SerializationProtocol; + +import examples.Bar; +import examples.Foo; + +/** + * This example is overview of general SerialX API functionalities! + * We will look at how to serialize and deserialize objects using file. We will also create protocols for our objects as well as for already existing ones! + * This example is also for benchmarking! + * + * @author PETO + * + * @since 1.0.0 + */ +public class GeneralExample +{ + @Test + public void test() throws Exception { + GeneralExample.main(new String[0]); + } + + public static void main(String[] args) throws Exception + { + //------------------------------------------- Custom protocol registration ------------------------------------------- + + SerializationProtocol.REGISTRY.addAll(new Bar.BarProtocol(), new Foo.FooProtocol(), new SerializationProtocol() //Sample custom protocol to serialized Random. + { //Random will be serialized also without protocol via classic Java Base64 because it implements java.io.Serializable! + @Override + public Object[] serialize(Random object) + { + try + { + Field f = Random.class.getDeclaredField("seed"); + f.setAccessible(true); + return new Object[] {((AtomicLong) f.get(object)).get()}; + } + catch (Exception e) + { + e.printStackTrace(); + return new Object[] {-1}; + } + } + + @Override + public Random unserialize(Class objectClass, Object... args) + { + return new Random(((Number) args[0]).longValue()); + } + + @Override + public Class applicableFor() + { + return Random.class; + } + }); + + File f = new File("src/examples/implementations/test.juss"); //File to write and read from! + + //------------------------------------------- Generating mock data ------------------------------------------- + + Random r = new Random(); + List list = new ArrayList<>(); + for (int i = 0; i < 8; i++) + list.add(r.nextBoolean() ? r.nextInt(i+1) : r.nextBoolean()); + + HashMap vars = new HashMap<>(); //Variables to serialize + vars.put("yourMom", "is heavier than sun... //lol"); + vars.put("num", 6); + + int[][] ints = {{1, 2, 3}, {4, 5, 4}, {3, 2, 1}}; + + + //------------------------------------------- Serializing ------------------------------------------- + + JussSerializer serializer = new JussSerializer(vars); //Creating an instance of Serializer that will serialize objects using Juss! Serializer is instance of scope so it behaves like so! + //Adding independent values Invokation of static members of this class (calling method "println" and obtaining "hello" field as argument! + serializer.addAll("some string", r, list, serializer.Comment("Size of array"), serializer.Var("arrSize", list.size()), new Bar(), 1, 2.2, 3, 'A', true, false, null, ints, serializer.Code("$num"), new Scope(), serializer.StaticMember(GeneralExample.class, "println", serializer.StaticMember(GeneralExample.class, "hello"))); + //This will insert an comment Another way to add variable except Map $ is used to obtain value from variable + serializer.setGenerateComments(true); //Enabling comment generation + + serializer.getParsers().resetCache(); //Enabling cache, this can improve performance when serializing a lot of data (not case of this example)! + + double t0 = System.nanoTime(); + serializer.SerializeTo(f); //Saving content of serializer to file (serializing) + double t = System.nanoTime(); + System.out.println("Write: " + (t-t0)/1000000 + " ms"); //Write benchmark + + //------------------------------------------- Deserializing ------------------------------------------- + SerializationProtocol.REGISTRY.setActivityForAll(true); //Enabling all protocols, just in case... + + JussSerializer deserializer = new JussSerializer(); //Creating instance of Serializer that will deserialize objects serialized in Juss (same class is responsible for serializing and deserializing)! + deserializer.setParsers(JussSerializer.JUSS_PARSERS_AND_OPERATORS); //Doing this will allow us to use operators from org.ugp.serialx.converters.operators while deserializing! + deserializer.put("parent", "father"); //Setting global variables + + deserializer.getParsers().resetCache(); //Enabling cache, this can improve performance when serializing a lot of data (not case of this example)! + + deserializer = SerializationDebugger.debug(deserializer); //Enabling debugging for deserialization! + + t0 = System.nanoTime(); + deserializer.LoadFrom(f); //Loading content of file in to deserializer! + t = System.nanoTime(); + System.out.println("Read: " + (t-t0)/1000000 + " ms"); //Read benchmark + + deserializer = (JussSerializer) deserializer.filter(obj -> obj != null); //This will filter away every null value and variable! + + //Printing values and variables of scope! + System.out.println(deserializer.variables()); + System.out.println(deserializer.values()); + } + + //We can invoke static members in JUSS! + public static String hello = "Hello world!"; + + public static void println(String str) + { + System.out.println(str); + } +} \ No newline at end of file diff --git a/src/examples/implementations/ReadingJsonFromInternet.java b/src/examples/implementations/ReadingJsonFromInternet.java new file mode 100644 index 0000000..38282f1 --- /dev/null +++ b/src/examples/implementations/ReadingJsonFromInternet.java @@ -0,0 +1,34 @@ +package examples.implementations; + +import java.io.IOException; + +import org.ugp.serialx.json.JsonSerializer; + +/** + * In this example we can see how to perform json reading from remote web url! + * Note: Internet connection is required for this example to work! + * + * @author PETO + * + * @since 1.3.2 + */ +public class ReadingJsonFromInternet +{ + public static void main(String[] args) throws IOException, Exception + { + /* + //---------------------- Before SerialX 1.3.5 ---------------------- + //Creating JsonSerializer that can parse json! + JsonSerializer reader = new JsonSerializer(); + + InputStream urlInput = new URL("https://jsonplaceholder.typicode.com/users").openStream(); //Establishing connection with https://jsonplaceholder.typicode.com/users and getting stream of received data! + reader.LoadFrom(urlInput); //Parsing url stream content into json! + */ + + JsonSerializer reader = JsonSerializer.from("https://jsonplaceholder.typicode.com/users"); //Getting and deserializing data from remote web address! + + String user = "Glenna Reichert"; //User we want to get (Glenna Reichert)! + String glennasCompany = reader.getScopesWith("name", user).getScope(0).getString("name"); //Obtaining first scope that contains variable with users name and getting name of his company as string from it! + System.out.println(user + " is working for " + glennasCompany); //Printing results! + } +} diff --git a/src/examples/implementations/SerializingWithJson.java b/src/examples/implementations/SerializingWithJson.java new file mode 100644 index 0000000..cfe8d4a --- /dev/null +++ b/src/examples/implementations/SerializingWithJson.java @@ -0,0 +1,70 @@ +package examples.implementations; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import org.ugp.serialx.Scope; +import org.ugp.serialx.Serializer; +import org.ugp.serialx.json.JsonSerializer; +import org.ugp.serialx.protocols.AutoProtocol; +import org.ugp.serialx.protocols.SerializationProtocol; + +import examples.Message; + +/** + * This example demonstrating SerialX Json capabilities... + * + * @author PETO + * + * @since 1.3.7 + */ +public class SerializingWithJson { + + public static void main(String[] args) throws Exception + { + /* + * Registering AutoProtocol for Mesasge class and setting it to serialize it as Scope! + * + * Note: You can see that we are getting "ProtocolRegistry: Protocol applicable for "examples.Message" is already registered!" this is because Message already implements SelfSerializable which means it can be already serialized via SelfSerializableProtocol. + * Registering additional Serialization protocol is therefore not necessary, we are doing this only to enforce the Scope format. + */ + SerializationProtocol.REGISTRY.add(new AutoProtocol<>(Message.class, true)); + + File medium = new File("src/examples/implementations/messages.json"); // Json file to use... + + // Content to serialzie (list of Messages) + List messages = new ArrayList<>(); + messages.add(new Message("Hi!", 1)); + messages.add(new Message("My name is Json.", 2)); + messages.add(new Message("And I am data format!", 3)); + + /* + * Creating new JsonSerializer object and putting out Messages into it. + */ + Serializer serializer = new JsonSerializer(null, messages); + serializer.SerializeTo(medium); // Serializing to given file. + + System.out.println("-------- Serialized sucessfully! --------"); + + /* + * Deserializing our Messages from given file. + */ + Serializer deserializer = JsonSerializer.from(medium); + + // Mapping deserialized Scopes, or "json objects" in this case, back into our original messages! + List deserializedMessages = deserializer.map(jsonObj -> { + try { + return ((Scope) jsonObj).toObject(Message.class); + } + catch (Exception e) { + e.printStackTrace(); + return null; + } + }); + + System.out.println("-------- Deserialized sucessfully! --------"); + + System.out.println(messages.equals(deserializedMessages)); // True means that original content was successfully serialized as well as deserialized! + } +} diff --git a/src/examples/implementations/SimpleCalculator.java b/src/examples/implementations/SimpleCalculator.java new file mode 100644 index 0000000..d2ab26f --- /dev/null +++ b/src/examples/implementations/SimpleCalculator.java @@ -0,0 +1,66 @@ +package examples.implementations; + +import java.util.Scanner; + +import org.ugp.serialx.converters.DataParser; +import org.ugp.serialx.converters.DataParser.ParserRegistry; +import org.ugp.serialx.converters.NumberConverter; +import org.ugp.serialx.converters.operators.ArithmeticOperators; +import org.ugp.serialx.juss.converters.OperationGroups; + +/** + * This example will show you simple implementation of SerialX latest feature the recursive data parser! + * In this example we will be creating simple evaluator of mathematical expressions! + * + * @author PETO + * + * @since 1.3.0 + */ +public class SimpleCalculator +{ + static Scanner scIn = new Scanner(System.in); + + public static void main(String[] args) + { + /* + * We could easily just use DataParser.REGISTRY but there is tone of stuff we do not need and it will just slow it down! + */ + ParserRegistry parsersRequiredToEvaluateMath = new ParserRegistry(new OperationGroups(), new ArithmeticOperators(), new NumberConverter());; + + /* + * This is an example of simple custom parser this one will allow us to reuse answers of out previous evaluations! + * We will access this old answer using 'ans' word! + * Old ans must be provided as first one of args! + */ + DataParser ansParser = new DataParser() + { + @Override + public Object parse(ParserRegistry myHomeRegistry, String str, Object... args) + { + if (str.equalsIgnoreCase("ans")) + { + if (args.length > 0) + return args[0]; //First arg is old answer! + return null; + } + return CONTINUE; + } + }; + parsersRequiredToEvaluateMath.add(ansParser); + + Object oldAns = null; + while (true) + { + System.out.print("Please insert your math problem: "); //Ask for input! + String input = scIn.nextLine() ;//Read console input + if (!(input = input.trim()).isEmpty()) //Avoiding empty input! + { + double t0 = System.nanoTime(); //Performing simple benchmark + oldAns = parsersRequiredToEvaluateMath.parse(input, oldAns); //Notice that we are inserting oldAns as compiler arguments for parseObj which are then picked up by our ansParser as well as every other registered DataParser. + double t = System.nanoTime(); + + System.out.println(input + " = " + oldAns +"\n" + (t-t0)/1000000 + "ms \n"); //Parsing input! + } + } + } +} diff --git a/src/examples/implementations/SimpleQuerying.java b/src/examples/implementations/SimpleQuerying.java new file mode 100644 index 0000000..6d127a0 --- /dev/null +++ b/src/examples/implementations/SimpleQuerying.java @@ -0,0 +1,148 @@ +package examples.implementations; + +import java.util.List; + +import org.ugp.serialx.Scope; +import org.ugp.serialx.converters.DataParser; +import org.ugp.serialx.juss.JussSerializer; + +/** + * This example contains brief example of querying and obtaining real data from deserialized content! + * + * @author PETO + * + * @since 1.3.5 + */ +public class SimpleQuerying +{ + public static void main(String[] args) throws Exception + { + //Loading complex juss file "commentedExample.juss"! + JussSerializer content = JussSerializer.from("src/examples/implementations/commentedExample.juss"); //Since 1.3.5 we can use "from/into API" to load content of scope by just typing its path into "from" method! + + //Printing loaded data! + System.out.println("Used content:\n" + content + "\n"); + + /* + * Scope#getScope method is capable of getting scopes that are direct sub-scopes of scope but also it will automatically search for required scope + * through every sub-scope in content! Thats why we can get sub-scope stored by "serialx" variable even though it is neasted in 3 parent scopes, Scope#getScope method will + * search for it automatically without necessity of chaining multiple of them. In case of there being more than one "serialx" we can specify the specific path like + * content.getScope("dependencies", "something", "serialx")! But in case of there being only one, like we have, this is not really necessary. + */ + String serialx = content.getScope("serialx").getString(0); //Getting first independent value of scope stored by variable "serialx"! + System.out.println("SerialX " + serialx.toLowerCase()); //Printing result! + + /** + * We often times have scopes where there are data with repetitive structure. In this case in scope stored by "ppl" there are always sub-scopes that have name, age and residence! + * We can use Scope#getAllStoredBy to get values of all variables from this sub-scopes. + * In this example we will take all age of all people, sum it up and than print average age of them! + */ + List ages = content.getScope("ppl").getAllStoredBy("age"); //Getting all age variables of sub-scopes from "ppl" scope! \ + //Suming them and printing avg age! + double sum = 0; + for (Number number : ages) + sum += number.doubleValue(); + System.out.println("Avarage age of people is: " + (sum / ages.size())); + + /** + * Sometimes we do not need to get only values of variables inside of a scope, sometimes we need actual scopes with variables meeting certain criterias, + * this is case where method Scope#getScopesWith comes in handy! This method will return sub-scope containing all sub-scopes found that contains variable that meats + * a certain condition! + * With this we can for example get all people that live in a certain country! + */ + String residence = "germany"; //Country of residence! + Scope residents = content.getScope("ppl").getScopesWith("residence", residanceValue -> ((String) residanceValue).equalsIgnoreCase(residence)); //Getting all people sub-scopes that whose have "residence" variable equal to required residence! + System.out.println("People liveing in " + residence + " are: " + residents.getAllStoredBy("name")); //Printing names of those who live in Germany! + + /** + * Perhaps the most powerful querying method is GenericScope#filter that allow you to filter away both independent values as well as variables with values that + * does not meet your condition! + * In this particular example we are writing pretty simple condition that will filter away everything that is not a scope and has no independent values inside! + */ + Scope filtered = (Scope) content.getScope("dataStorage").filter(obj -> ((Scope) obj).valuesCount() > 0); //Filtering + System.out.println(filtered.variables()); //Printing variables of filtered sub-scope! + + /** + * One also very powerful method is GenericScope#map that will remap independent values of the scope based on rule you write! + * In this case we are taking all values of sub-scope stored by "arr" variable and multiplying them by 2 if they are bigger than 3! + * Notice that by returning DataParser#VOID we can filter away the certain values! + * + * Honorable mention is also GenericScope#transform that will transform entire scope including values of variables not only independent values like map! + */ + List remappedValues = content.getScope("arr").map(obj -> ((Number) obj).doubleValue() > 3 ? ((Number) obj).doubleValue() * 2 : DataParser.VOID); //Remapping independent values of scope stored by "arr" by multiplying them by 2 if they are bigger than 3! + System.out.println("Mapped number values: " + remappedValues); //Printing remapped independent values of "arr"! + + /** + * We can use GenericScope#map in combination with Scope#toObject and Scope#into methods to remap scopes into real java objects! + * For instance we can remap all all scopes representing residents of Germany into real Java sample Person objects! + */ + List realResidents = residents.map(obj -> { + try + { + return ((Scope) obj).into(Person.class); //Turning scopes into real Java objects! + } + catch (Exception e) + { + return DataParser.VOID; //We already know that this will filter away the object! + } + }); + System.out.println("Real \"Java\" residents of " + residence + " are: " + realResidents); //Printing results + } + + /** + * Dummy class, part of SerialX {@link SimpleQuerying} example!
+ * Note: In order for {@link Scope#toObject} and {@link Scope#into} and methods to work, object must have valid getters and setters! + * + * @author PETO + * + * @since 1.3.5 + */ + public static class Person + { + protected String name, residance; + protected double age; + + public Person(String name, String residance, double age) + { + this.name = name; + this.residance = residance; + this.age = age; + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public String getResidance() + { + return residance; + } + + public void setResidance(String residance) + { + this.residance = residance; + } + + public double getAge() + { + return age; + } + + public void setAge(double age) + { + this.age = age; + } + + @Override + public String toString() + { + return "Person[name=" + name + ", residance=" + residance + ", age=" + age + "]"; + } + } +} diff --git a/src/examples/implementations/commentedExample.juss b/src/examples/implementations/commentedExample.juss new file mode 100644 index 0000000..4060ca5 --- /dev/null +++ b/src/examples/implementations/commentedExample.juss @@ -0,0 +1,146 @@ +/* THIS IS HOW RESULT OF SERIALX (Juss) REAL LIFE IMPLEMENTATION MIGHT LOOK LIKE */ +import org.ugp.serialx.JsonSerializer => Json; //Importing JsonSerializer and aliasing it as Json! + +name = "app"; + +dependencies = +{ + //This is scope, the Juss representation of ugp.org.SerialX.Scope! + //Each scope can have its own variables with values and independant values! + + //Every scope can read and write parent scopes variables however by changing them, it will only affect local one and not parents one! + $name; //"app" ($ obtains value from variable, in this case "app") + $name = "no longer app lol!"; + + composition-api = "1.0.0 (beta)", //This is one of the variables of this scope... + bootstrap = "4.5.3", + version = "2.3.4", + something = + { + dataStorage = + { + //This is "dataStorage" (stored by variable "dataStorage") sub-scope aka nested skope of its parent scope "something" which is subscope of "dependencies", + xml = + { + version = "2.8.0" + }, + yaml = + { + version = "1.10.5" + }, + josn = + { + version = "4.0.0" + }, + serialx = + { + version = "The best version!"; + "Is the best!" + } + totalVersion = "9.9.9" + }, + ppl = + { + //This is "ppl" (stored by variable "ppl") sub-scope aka nested skope of its parent scope "something" which is subscope of "dependencies". + //All of these scopes are sub-scopes of "ppl", there can be infinite number of variables and independent values together in one Scope! + { + name: "Vladimir"; + age = 37; + residence = "russia"; + }, + { + name: "Ivan"; + age = 19; + residence = "russia"; + }, + { + name: "Firippu"; + age = 103; + residence = "japan"; + }, + { + name: "Peter"; + age = 17; + residence = "slovak"; + }, + { + name: "Lukas"; + age = 23; + residence = "usa"; + }, + { + name: "Hans"; + age = 51; + residence = "germany"; + }, + { + name: "Yeager"; + age = 17; + residence = "germany"; + }, + { + name: "Pierre"; + age = 44; + residence = "france"; + } + } + }, + "lololoolollool"; //This is independent value of this scope. +}, +$dependencies.something.dataStorage.serialx.version; //Obtaining value of "serialx" variable in "dependencies" sub-scopes! + +devDependencies = +{ + //Variables in this scope have nothing to do with variables from "dependencies" because they are in diffrent scope! + $name = "absolutely not app!"; + + composition-api = "1.0.0 (alpha)", + bootstrap = "2.2.3", + version = "1.2.3", + something = + { + dataStorage = {}, + ppl = {} + } +}; +//Setting variable of scope from outer world (possible since 1.3.2) +devDependencies.something.ppl.ludvig = +{ + age = 60; + residence = "russia"; +}; + +//Since 1.2.5 Serializer fully supports Json and JavaScript object! +jsonCrossover = Json { + "hello" : "Hello world I am Javascript object notation!", + "jsObject": { + name: "John", + age: 31, + city: "New York" + }, + "jsonArray": [ + 1, + 2, + 3, + 4 + ] +}, + +//Since SerialX 1.3.5 we can use "from/into API" to load files from external locations! +alienFruit = Json::from "src/examples/implementations/test.json"; //Loading content of external file by using JsonSerializer! +alienPost = Json::from "https://jsonplaceholder.typicode.com/posts/1"; //We can even load files from remote urls (internet connection is required for this)! + +//$bullshit <-- No this is not possible, variable "bullshit" cannot be accessed here because it was not initialized yet! +bullshit = +{ + //This scope cant access variable that is stored by (bullshit), because variable is always created after its value (Scope in this case) is constructed! + server = "service server", + build = "service build", + sql = "service sql"; +}, +$bullshit; //Now we can access variable "bullshit" + +$name; //"name" is still "app" in this scope! + +arr = {1, 2, 3, 4, 5}; //This is scope with only values! So lets call it... array I guess! +superArr = {$arr, $arr, $arr, $arr::new /*creates clone of arr*/, {1, 2, 3, 4, 5}}; //Yes... this is completely normal and possible in Juss but keep in mind that first, second and third element will refere to same instance in this case! diff --git a/src/examples/implementations/messages.json b/src/examples/implementations/messages.json new file mode 100644 index 0000000..ba8aa7a --- /dev/null +++ b/src/examples/implementations/messages.json @@ -0,0 +1,14 @@ +[ + { + "str" : "Hi!", + "date" : 1 + }, + { + "str" : "My name is Json.", + "date" : 2 + }, + { + "str" : "And I am data format!", + "date" : 3 + } +] \ No newline at end of file diff --git a/src/examples/implementations/simpleScript.juss b/src/examples/implementations/simpleScript.juss new file mode 100644 index 0000000..078595c --- /dev/null +++ b/src/examples/implementations/simpleScript.juss @@ -0,0 +1,21 @@ +/* THIS EXAMPLE IS DEMONSTRATING CAPABILITIES OF SERIALX AS A DOMAIN SPECIFIC LANGUAGE TOOLKIT BY CREATING AN SIMPLE SCRIPT */ +/* In this case, we are writing a simple script that will print "Hello world!" and then analyze your age category from the age given! */ + +System::out->println "Hello world!"; //Saying the famous "Hello world" in our custom script by calling java methods! + +//Handling possible errors! +result = try { //Convenient usage of JUSS scope as a code block... + System::out->print "Enter your age: "; //Asking for input! + + input = java.util.Scanner System::in; //Declaring input scanner object! + age = double ($input->nextLine); //Reading input from console as number! + + //Printing age message + System::out->println ($age >= 18 ? "You are an adult!" : $age <= 0 ? "Well, you are not yet..." : "You are sill a child!"); +} + +//Printing adequate error message... +$result instanceof java.lang.RuntimeException ? (System::err->println "Age must be a number you dummy..."); + +//Voidification of used variables that are not needed! This is not really a necessity but it nice to know about it... +result = void; //Voidification will remove the variable from this scope releasing some memory! diff --git a/src/examples/implementations/test.json b/src/examples/implementations/test.json new file mode 100644 index 0000000..4a4419c --- /dev/null +++ b/src/examples/implementations/test.json @@ -0,0 +1,10 @@ +{ + "fruit": "Apple", + "size": "Large", + "color": "Red", + "variants": [ + 1, + 2, + 3 + ] +} \ No newline at end of file diff --git a/src/examples/implementations/test.juss b/src/examples/implementations/test.juss new file mode 100644 index 0000000..eca70ff --- /dev/null +++ b/src/examples/implementations/test.juss @@ -0,0 +1,31 @@ +//java.util.Collections => _22; +// +//_22::emptyList; +//{ ArrayList 11 22 33 { ArrayList 41 42 43 +// } 555 } +//ArrayList; +//java.util.Collections::unmodifiableCollection {ArrayList {java.util.Collections::unmodifiableCollection {ArrayList 125 {100, 200}}}}; +// +//{5111} +//{ } +//var = 59; +//{$var; $var::class} + + + +//Tt 5 5; +//List 1 2 3; +//List 1 2 3 {List 5 5 5} 4; +//{1} + + +hi = "hellp", +hah = t; + +a: { + lol : { + kkt = { + a = 55555; + } + } +} \ No newline at end of file diff --git a/src/tests/n/benchmarks/Benchmarks.java b/src/tests/n/benchmarks/Benchmarks.java new file mode 100644 index 0000000..9fe1684 --- /dev/null +++ b/src/tests/n/benchmarks/Benchmarks.java @@ -0,0 +1,176 @@ +package tests.n.benchmarks; + +import static org.openjdk.jmh.annotations.Scope.Benchmark; + +import java.util.concurrent.TimeUnit; + +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.runner.options.OptionsBuilder; +import org.openjdk.jmh.runner.options.TimeValue; + +@State(Benchmark) +@OutputTimeUnit(TimeUnit.MICROSECONDS) +@Warmup(iterations = 0) +@Measurement(iterations = 15) +@BenchmarkMode( +// Mode.SingleShotTime + Mode.Throughput +) +@Fork(1) +public class Benchmarks { + +// @Param({"0", "12345", "-14445", "0xff", "0b11111111", "011", "15.222", "16.8888", "1234567891011"}) +// String value; + +// @Param({"java.util.ArrayList 5 5 5", "java.util.concurrent.TimeUnit 1 2 3", "5hjdhjsakhdjsakhdjsahdjhdjak {} 59", "{hjdhjsakhdjsakhdjsahdjhdjak T T T"}) +// String str; + + @Param({"a", "{", "["}) + char ch; + +// DataConverter benchSubject = new NumberConverter() { +// public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args) { +// if (arg.length() > 0) +// { +// char ch = arg.charAt(0); +// if (ch == '+' || ch == '-' || ch == '.' || (ch >= '0' && ch <= '9')) +// return decode(arg, 10, 0); +// } +// return CONTINUE; +// }; +// }; +// DataConverter benchSubjectOld = new NumberConverter(); + +// @Setup() +// public void setup() { +// +// } + + @Benchmark + public Object benchNew() throws ClassNotFoundException { + return (ch | ' ') == '{'; + } + + @Benchmark + public Object benchOld() { + return ch == '{' || ch == '['; + } +// + public static void main(String[] args) throws Exception { + OptionsBuilder ob = new OptionsBuilder(); + ob.measurementTime(TimeValue.milliseconds(100)); + +// ParserRegistry reg = Operators.install(new ParserRegistry(new OperationGroups(), new VariableConverter(), new StringConverter(), new ObjectConverter(), new ArrayConverter(), new NumberConverter(), new BooleanConverter(), new CharacterConverter(), new NullConverter(), new SerializableBase64Converter())); +// +// JussSerializer srl = new JussSerializer(); +// srl.setParsers(reg); +// System.out.println(reg.parse("-1 + 1")); +// System.out.println(reg.parse("10 * 2 + 5")); +// System.out.println(reg.parse("2 ** 4 - 6")); +// System.out.println(reg.parse("18 ++ 20 -+ 8")); +// System.out.println(reg.parse("--5 --9")); +// +// ob.verbosity(VerboseMode.SILENT); +// new Runner(ob).run(); + +// Scope s = new Scope(); +// s.add(new Scope("hi".equalsIgnoreCase(null), 123)); +// Scope i = s.get(0, Scope.class); +// System.out.println(i); +// +// String str = "0xff"; +// Object num = numberOf(str, 10, 0); +// System.out.println(num + " | " + num.getClass().getSimpleName()); + } + + public static boolean equalsLowerCase(CharSequence str, CharSequence lowerCaseOther, int from, int to) + { + for (; from < to; from++) + if ((str.charAt(from) | ' ') != lowerCaseOther.charAt(from)) + return false; + return true; + } + + public static Number numberOf(CharSequence str, int base, int type) + { + char ch0 = str.charAt(0); + int len = str.length(), start = 0, end = len - 1; + + if (ch0 == '#') //Determine base + { + base = 16; + start++; + } + else if (ch0 == '0' && len > 1) + { + int ch1 = str.charAt(1) | ' '; + if (ch1 == 'b') + { + base = 2; + start++; + } + else if (ch1 == 'x') + { + base = 16; + start++; + } + else + base = 8; + + start++; + } + + double result = 0; + int chEnd = str.charAt(end--) | ' '; //Determine data type + if (base == 10 ? chEnd >= 'd' : chEnd >= 'l') + type = chEnd; + else if (chEnd == '.') + type = 'd'; + else + result = chEnd > '9' ? chEnd - 'a' + 10 : chEnd - '0'; + + double baseCof = base; + for (int ch; end >= start; end--) //Parsing + { + if ((ch = str.charAt(end)) == '-') + result = -result; + else if (ch == '.') + { + result /= baseCof; + baseCof = 1; + if (type == 0) + type = 'd'; + } + else if (base == 10 && (ch | ' ') == 'e') + { + baseCof = Math.pow(base, result); + result = 0; + } + else if (ch != '_' && ch != '+') + { + result += (ch > '9' ? (ch | ' ') - 'a' + 10 : ch - '0') * baseCof; + baseCof *= base; + } + } + + if (type == 'd') + return result; + if (type == 'f') + return (float) result; + if (type == 'l' || result > 0x7fffffff || result < 0x80000000) + return (long) result; + if (type == 's') + return (short) result; + if (type == 'y') + return (byte) result; + return (int) result; + } +} diff --git a/src/tests/n/benchmarks/SimpleBench.java b/src/tests/n/benchmarks/SimpleBench.java new file mode 100644 index 0000000..75ce9b7 --- /dev/null +++ b/src/tests/n/benchmarks/SimpleBench.java @@ -0,0 +1,63 @@ +package tests.n.benchmarks; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import java.util.TreeMap; +import java.util.concurrent.Callable; +import java.util.function.Function; + +import org.ugp.serialx.converters.DataConverter; +import org.ugp.serialx.converters.DataParser; +import org.ugp.serialx.converters.DataParser.ParserRegistry; +import org.ugp.serialx.converters.NumberConverter; + +public class SimpleBench { + + + @SuppressWarnings("unchecked") + public static RESULT[] benchmark(Callable benchDataGenerator, Function action, int count) throws Exception { + Object[] results = new Object[count]; + + double total = 0; + for (int i = 0; i < count; i++) { + DATA benchmarkDataData = benchDataGenerator.call(); + + double t0 = System.nanoTime(); + + results[i] = action.apply(benchmarkDataData); + + double t = System.nanoTime(); + + total += t-t0; + } + + System.out.println("Avarage time " + String.format("%.5f", total/count/1000000) + "ms"); + + return (RESULT[]) results; + } + + static Random rand = new Random(12345); + public static void main(String[] args) throws Exception { + Callable data = () -> rand.nextBoolean() ? rand.nextInt(100000) : rand.nextBoolean(); + + ParserRegistry reg = DataParser.REGISTRY; + DataConverter benchSubject = new NumberConverter(); + + List lol = new ArrayList<>(); + + + double t0 = System.nanoTime(); + for (int i = 0; i < 1_000_000; i++) { + lol.add(i); + } + double t = System.nanoTime(); + System.out.println((t-t0)/1000000); + + +// Object[] results = benchmark(data, state -> { +// return reg.toString(state); +// }, 10); +// System.out.println(results[5].toString()); + } +} \ No newline at end of file diff --git a/src/tests/n/benchmarks/Testing.java b/src/tests/n/benchmarks/Testing.java new file mode 100644 index 0000000..771f18b --- /dev/null +++ b/src/tests/n/benchmarks/Testing.java @@ -0,0 +1,33 @@ +package tests.n.benchmarks; + +import java.awt.List; +import java.io.File; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; + +import org.ugp.serialx.Utils; +import org.ugp.serialx.juss.JussSerializer; + +/** + * Testing random algorithms... + */ +public class Testing { + + public static void main(String[] args) throws Exception { + + File file = new File("src/examples/implementations/test.juss"); + + JussSerializer deserializer = new JussSerializer(); + deserializer.LoadFrom(file); + + System.out.println(deserializer); + System.out.println(deserializer.get(new String[] { "kkt", "a" })); + + for (int i = 0; i < 12; i++) { + + System.out.println(deserializer.getParent(i)); + } + + } +} diff --git a/src/tst/srlx/head/Main.java b/src/tst/srlx/head/Main.java new file mode 100644 index 0000000..68dcb89 --- /dev/null +++ b/src/tst/srlx/head/Main.java @@ -0,0 +1,121 @@ +package tst.srlx.head; + +import java.io.File; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Random; +import java.util.concurrent.atomic.AtomicLong; + +import org.ugp.serialx.Scope; +import org.ugp.serialx.juss.JussSerializer; +import org.ugp.serialx.protocols.SerializationProtocol; + +import examples.Bar; +import examples.Foo; + +/** + * This example is overview of general SerialX API functionalities! + * We will look at how to serialize and deserialize objects using file. We will also create protocols for our objects as well as for already existing ones! + * This example is also for benchmarking! + * + * @author PETO + * + * @since 1.0.0 + */ +public class Main +{ + public static void main(String[] args) throws Exception + { + //Protocol registration + SerializationProtocol.REGISTRY.addAll(new Bar.BarProtocol(), new Foo.FooProtocol(), new SerializationProtocol() //Sample custom protocol to serialized Random. + { //Random will be serialized also without protocol via classic Java Base64 because it implements java.io.Serializable! + @Override + public Object[] serialize(Random object) + { + try + { + Field f = Random.class.getDeclaredField("seed"); + f.setAccessible(true); + return new Object[] {((AtomicLong) f.get(object)).get()}; + } + catch (Exception e) + { + e.printStackTrace(); + return new Object[] {-1}; + } + } + + @Override + public Random unserialize(Class objectClass, Object... args) + { + return new Random(((Number) args[0]).longValue()); + } + + @Override + public Class applicableFor() + { + return Random.class; + } + }); + + File f = new File("test.juss"); //File to write and read from! + + //Sample objects + Random r = new Random(); + List list = new ArrayList<>(); + for (int i = 1; i <= 8000000; i++) + list.add( r.nextInt(i)); + + HashMap vars = new HashMap<>(); //Variables to serialize + vars.put("yourMom", "is heavier than sun..."); + vars.put("num", 6); + + int[][] ints = {{1, 2, 3}, {4, 5, 4}, {3, 2, 1}}; + + //-------------------------------------------Serializing------------------------------------------- + + JussSerializer serializer = new JussSerializer(vars); //Creating an instance of Serializer that will serialize objects using Juss! Serializer is instance of scope so it behaves like so! + //Adding independent values Invokation of static members of this class (calling method "println" and obtaining "hello" field as argument! + serializer.addAll(list /*serializer.Comment("Size of array"), serializer.Var("arrSize", list.size()), new Bar(), 1, 2.2, 3, 'A', true, false, null, ints, serializer.Code("$num"), new Scope(), serializer.StaticMember(Main.class, "println", serializer.StaticMember(Main.class, "hello"))*/); + //This will insert an comment Another way to add variable except Map $ is used to obtain value from variable +// serializer.setGenerateComments(true); //Enabling comment generation + +// serializer.getParsers().resetCache(); + + double t0 = System.nanoTime(); +// serializer.SerializeTo(f); //Saving content of serializer to file (serializing) + double t = System.nanoTime(); + System.out.println("Write: " + (t-t0)/1000000 + " ms"); //Write benchmark + + //-------------------------------------------Deserializing------------------------------------------- + + SerializationProtocol.REGISTRY.setActivityForAll(true); //Enabling all protocols, just in case... + + JussSerializer deserializer = new JussSerializer(); //Creating instance of Serializer that will deserialize objects serialized in Juss (same class is responsible for serializing and deserializing)! + deserializer.setParsers(JussSerializer.JUSS_PARSERS_AND_OPERATORS); + deserializer.put("parent", "father"); //Setting global variables + +// deserializer.getParsers().resetCache(); + + t0 = System.nanoTime(); + deserializer.LoadFrom(f); //Loading content of file in to deserializer! + t = System.nanoTime(); + System.out.println("Read: " + (t-t0)/1000000 + " ms"); //Read benchmark + + //deserializer = (JussSerializer) deserializer.filter(obj -> obj != null); //This will filter away every null value and variable! + + //Printing values and variables of scope! + System.out.println(deserializer.variables()); + System.out.println(deserializer.values()); + } + + //We can invoke static members in JUSS! + public static String hello = "Hello world!"; + + public static void println(String str) + { + System.out.println(str); + } +} \ No newline at end of file diff --git a/src/tst/srlx/head/kop/KoP.java b/src/tst/srlx/head/kop/KoP.java new file mode 100644 index 0000000..8934289 --- /dev/null +++ b/src/tst/srlx/head/kop/KoP.java @@ -0,0 +1,61 @@ +package tst.srlx.head.kop; + +import java.io.File; + +import org.ugp.serialx.converters.DataParser; +import org.ugp.serialx.juss.JussSerializer; +import org.ugp.serialx.protocols.SerializationProtocol; + +import tst.srlx.head.kop.converters.OsobaConverter; +import tst.srlx.head.kop.protocols.OsobaProtocol; + +public class KoP { + + public static void main(String[] args) throws Exception { + + // Registracia nasho OsobaProtocolu + SerializationProtocol.REGISTRY.add(0, new OsobaProtocol()); + + // Registracia nasho OsobaParseru. + // Ak chcete aby bol na serializaciu pouzity parser tak odkomentujte tento kod a zakomentujte ten nad tym. + //DataParser.REGISTRY.add(0, new OsobaConverter()); + + /* Serializacia */ + ukazkaSerializacie(); + + System.out.println("\n---- Po serializaci ----\n"); + + /* Deserializacia */ + //ukazkaDeserializacie(); + } + + /* Serializacia */ + static void ukazkaSerializacie() throws Exception + { + // Deklaracia premennej typu Osoba a nasledne vytvorenie osoby Jozko Mrkvicku. + Osoba osoba = new Osoba("Jozko Mrkvicka", 16, 165); + + // Vytvorenie noveho Serializera (JussSerializer) pre serializaciu do JUSS + JussSerializer serializer = new JussSerializer(); + + // Pridanie objektov ktore chceme serializovat + serializer.add(osoba); + + // Serializovanie do urceneho suboru. + serializer.into(new File("./test.juss")); + } + + /* Deserializacia */ + static void ukazkaDeserializacie() throws Exception + { + // Deserializovanie pomocou pomocou Serializeru (JussSerializer) pre formatu JUSS z urceneho suboru. + JussSerializer deserializer = JussSerializer.from(new File("./test.juss")); + + /* + * Overenie korektnosi deserializovanych objektov. + */ + + Osoba deserializovanaOsoba = deserializer.get(0); + deserializovanaOsoba.predstavSaPubliku(); + } +} diff --git a/src/tst/srlx/head/kop/Osoba.java b/src/tst/srlx/head/kop/Osoba.java new file mode 100644 index 0000000..e20d6c9 --- /dev/null +++ b/src/tst/srlx/head/kop/Osoba.java @@ -0,0 +1,63 @@ +package tst.srlx.head.kop; + + /* + * Deklaracia triedy Osoba + */ + public class Osoba + { + private int vek; + private float vyska; + private String meno; + + /* + * Toto je konstruktor, specialna metoda ktora nam vrati novu instanciu objektu s prislusnymi parametrami ktore mu vlozime. + */ + public Osoba(String meno, int vek, float vyska) + { + setMeno(meno); + setVyska(vyska); + setVek(vek); + } + + /* + * Verejna metoda ktora pracuje s premennymi objektu. + * V tomto konkretnom pripade nam "predstavi" danu osobu! + */ + public void predstavSaPubliku() { + System.out.println("Zdravim! Moje meno je " + meno + ", mam " + vek + " rokov a meriam " + vyska + "cm."); + System.out.println("Rad vas vsetkych spoznavam!"); + } + + /* + * Verejne pristupove metody, sluziace na pristup k premennym z vonka triedy, a osetrenie nechcenych stavov. + */ + + public int getVek() { + return vek; + } + + public void setVek(int vek) { + this.vek = vek < 0 ? 0 : vek; + } + + public float getVyska() { + return vyska; + } + + public void setVyska(float vyska) { + this.vyska = vyska < 0 ? 0 : vyska; + } + + public String getMeno() { + return meno; + } + + public void setMeno(String meno) { + this.meno = meno; + } + } + + + + + diff --git a/src/tst/srlx/head/kop/converters/OsobaConverter.java b/src/tst/srlx/head/kop/converters/OsobaConverter.java new file mode 100644 index 0000000..1cf74e4 --- /dev/null +++ b/src/tst/srlx/head/kop/converters/OsobaConverter.java @@ -0,0 +1,78 @@ +package tst.srlx.head.kop.converters; + +import org.ugp.serialx.Utils; +import org.ugp.serialx.converters.DataConverter; + +import tst.srlx.head.kop.Osoba; + + + /* + * DataConverter urceny na konvertovanie objektov triedy Osoba na string a spat. + * Format: @"menoOsoby" jejVek jejVyska + */ + public class OsobaConverter implements DataConverter { + + @Override + public Object parse(ParserRegistry mojRegister, String objektAkoString, Object... args) { + + /* + * Podmienka ktora zaruci ze dany string z objektom naozaj reprezentuje nasu objekt osoby. + * To sa docielime tak ze zistime ci nie je prazdny a ci sa zacina '@'. + */ + objektAkoString = objektAkoString.trim(); + if (!objektAkoString.isEmpty() && objektAkoString.charAt(0) == '@') + { + objektAkoString = objektAkoString.substring(1); // Odstranenie zavinacu z nasho stringu. + + /* + * Tymto rozdelmi string na jednotlive tokeny (slova) s ktorymi budeme nasledne pracovat. + */ + String[] tokeny = Utils.splitValues(objektAkoString, ' '); + + /* + * Vytvarame prazdny objekt osoby ktorej hodnoty nastavime podla nasich tokenov. + */ + Osoba osoba = new Osoba(null, -1, -1); + + /* + * Nastavenie clenskych premennych osoby na ich povodne hodnoty ziskane. + * Vieme ze tokeny obsahuju hodnoy mena, veku a vysky v takomto poradi. + * Vsimnime si ze jednotlive tokeny je najprv tiez nutne parsnut rekurzivnym volanim parserov. + */ + osoba.setMeno(REGISTRY.parse(tokeny[0], true, null, args).toString()); + osoba.setVek(((Number) REGISTRY.parse(tokeny[1], args)).intValue()); + osoba.setVyska(((Number) REGISTRY.parse(tokeny[2], args)).floatValue()); + + return osoba; // Vraciame novoytvorenu parsnutu osobu. + } + + return CONTINUE; // Nesmieme zabudnut vratit CONTINUE ked uz vieme ze sa nejedna o objekt triedy Osoba. + } + + @Override + public CharSequence toString(ParserRegistry mojRegister, Object objekt, Object... args) { + + /* + * Podmienka ktorou zistime ci sa jedna o objekt triedy Osoba + */ + if (objekt instanceof Osoba) + { + Osoba objektAkoString = (Osoba) objekt; + + /* + * Konvertovanie objektu osoba na string serialovej podoby. + * Opat za postupneho recurzivneho konvertovanie vsetkych jeho clensky premennych na string. + * + */ + StringBuilder serialovaForma = new StringBuilder("@"); + serialovaForma.append(mojRegister.toString(objektAkoString.getMeno(), args)).append(' '); + serialovaForma.append(mojRegister.toString(objektAkoString.getVek(), args)).append(' '); + return serialovaForma.append(mojRegister.toString(objektAkoString.getVyska(), args)); + } + + return CONTINUE; // Ani tu nesmieme zabudnut vratit CONTINUE ked uz vieme ze sa nejedna o objekt triedy Osoba. + } + + } + + diff --git a/src/tst/srlx/head/kop/protocols/OsobaProtocol.java b/src/tst/srlx/head/kop/protocols/OsobaProtocol.java new file mode 100644 index 0000000..16ce4e8 --- /dev/null +++ b/src/tst/srlx/head/kop/protocols/OsobaProtocol.java @@ -0,0 +1,65 @@ +package tst.srlx.head.kop.protocols; + +import org.ugp.serialx.protocols.SerializationProtocol; + +import tst.srlx.head.kop.Osoba; + + /* + * Protokol urceny na specifikovanie postupu serializacie a deserializacie triedy Osoba. + */ + public class OsobaProtocol extends SerializationProtocol { + + + @Override + public Object[] serialize(Osoba osoba) { + + // Toto je pole reprezentujuce elementarne cleny objektu ako samostane objekty. + // V tomto pripade chceme serializovat vsetky cleny jheo triedy takze jeho dlzka bude 3. + Object[] polePrvkovObjektu = new Object[3]; + + /* + * Ulozenie clenskych premennych osoby do nasho pola. + * Osoba reprezentuje danu instanciu osoby ktora sa ma serializovat. + * Pametajme ze ich poradie je meno, vek, vyska. + */ + polePrvkovObjektu[0] = osoba.getMeno(); + polePrvkovObjektu[1] = osoba.getVek(); + polePrvkovObjektu[2] = osoba.getVyska(); + + return polePrvkovObjektu; // Vratenie pola prvkou reprezentujucu nasu osobu ktore bude serializovane. + } + + @Override + public Osoba unserialize(Class triedaSerializovanehoObjektu, Object... polePrvkovObjektu) throws Exception { + + + /* + * Vytvorenie prazdneho objektu osoby ktorej hodnoty nastavime na ich povodny stav z pred serializacie. + * Takto ziskame osobu totoznu z osobou serializovanou. + */ + Osoba osoba = new Osoba(null, -1, -1); + + /* + * Nastavenie clenskych premennych osoby na ich povodne hodnoty ziskane deserializovanim. + * Vieme ze ich poradie je rovnake ako pri serializaci a to meno, vek, vyska takze ich v takom poradi mozme z pola vyberat. + */ + osoba.setMeno((String) polePrvkovObjektu[0]); + osoba.setVek((int) polePrvkovObjektu[1]); + osoba.setVyska((float) polePrvkovObjektu[2]); + + return osoba; // Navratenie deserializovanej osoby totoznej s osobou serializovanov. + } + + + @Override + public Class applicableFor() { + /* + * Vratenim referencie na triedu Osoba specifikujeme ze tento protokol sa ma pouzivat pre tuto triedu + * po pripade triedy z nej odvodene. + */ + return Osoba.class; + } + } + + + From 7852312e256262f963ed7d31bc44fa581d9ce97b Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Wed, 27 Dec 2023 13:32:52 +0100 Subject: [PATCH 02/31] init 2 --- .gitignore | 2 + src/tst/srlx/head/kop/KoP.java | 61 --------------- src/tst/srlx/head/kop/Osoba.java | 63 --------------- .../head/kop/converters/OsobaConverter.java | 78 ------------------- .../head/kop/protocols/OsobaProtocol.java | 65 ---------------- 5 files changed, 2 insertions(+), 267 deletions(-) delete mode 100644 src/tst/srlx/head/kop/KoP.java delete mode 100644 src/tst/srlx/head/kop/Osoba.java delete mode 100644 src/tst/srlx/head/kop/converters/OsobaConverter.java delete mode 100644 src/tst/srlx/head/kop/protocols/OsobaProtocol.java diff --git a/.gitignore b/.gitignore index 2957f58..0cc8a41 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ tmp/ .project target/ + +src/kop/ \ No newline at end of file diff --git a/src/tst/srlx/head/kop/KoP.java b/src/tst/srlx/head/kop/KoP.java deleted file mode 100644 index 8934289..0000000 --- a/src/tst/srlx/head/kop/KoP.java +++ /dev/null @@ -1,61 +0,0 @@ -package tst.srlx.head.kop; - -import java.io.File; - -import org.ugp.serialx.converters.DataParser; -import org.ugp.serialx.juss.JussSerializer; -import org.ugp.serialx.protocols.SerializationProtocol; - -import tst.srlx.head.kop.converters.OsobaConverter; -import tst.srlx.head.kop.protocols.OsobaProtocol; - -public class KoP { - - public static void main(String[] args) throws Exception { - - // Registracia nasho OsobaProtocolu - SerializationProtocol.REGISTRY.add(0, new OsobaProtocol()); - - // Registracia nasho OsobaParseru. - // Ak chcete aby bol na serializaciu pouzity parser tak odkomentujte tento kod a zakomentujte ten nad tym. - //DataParser.REGISTRY.add(0, new OsobaConverter()); - - /* Serializacia */ - ukazkaSerializacie(); - - System.out.println("\n---- Po serializaci ----\n"); - - /* Deserializacia */ - //ukazkaDeserializacie(); - } - - /* Serializacia */ - static void ukazkaSerializacie() throws Exception - { - // Deklaracia premennej typu Osoba a nasledne vytvorenie osoby Jozko Mrkvicku. - Osoba osoba = new Osoba("Jozko Mrkvicka", 16, 165); - - // Vytvorenie noveho Serializera (JussSerializer) pre serializaciu do JUSS - JussSerializer serializer = new JussSerializer(); - - // Pridanie objektov ktore chceme serializovat - serializer.add(osoba); - - // Serializovanie do urceneho suboru. - serializer.into(new File("./test.juss")); - } - - /* Deserializacia */ - static void ukazkaDeserializacie() throws Exception - { - // Deserializovanie pomocou pomocou Serializeru (JussSerializer) pre formatu JUSS z urceneho suboru. - JussSerializer deserializer = JussSerializer.from(new File("./test.juss")); - - /* - * Overenie korektnosi deserializovanych objektov. - */ - - Osoba deserializovanaOsoba = deserializer.get(0); - deserializovanaOsoba.predstavSaPubliku(); - } -} diff --git a/src/tst/srlx/head/kop/Osoba.java b/src/tst/srlx/head/kop/Osoba.java deleted file mode 100644 index e20d6c9..0000000 --- a/src/tst/srlx/head/kop/Osoba.java +++ /dev/null @@ -1,63 +0,0 @@ -package tst.srlx.head.kop; - - /* - * Deklaracia triedy Osoba - */ - public class Osoba - { - private int vek; - private float vyska; - private String meno; - - /* - * Toto je konstruktor, specialna metoda ktora nam vrati novu instanciu objektu s prislusnymi parametrami ktore mu vlozime. - */ - public Osoba(String meno, int vek, float vyska) - { - setMeno(meno); - setVyska(vyska); - setVek(vek); - } - - /* - * Verejna metoda ktora pracuje s premennymi objektu. - * V tomto konkretnom pripade nam "predstavi" danu osobu! - */ - public void predstavSaPubliku() { - System.out.println("Zdravim! Moje meno je " + meno + ", mam " + vek + " rokov a meriam " + vyska + "cm."); - System.out.println("Rad vas vsetkych spoznavam!"); - } - - /* - * Verejne pristupove metody, sluziace na pristup k premennym z vonka triedy, a osetrenie nechcenych stavov. - */ - - public int getVek() { - return vek; - } - - public void setVek(int vek) { - this.vek = vek < 0 ? 0 : vek; - } - - public float getVyska() { - return vyska; - } - - public void setVyska(float vyska) { - this.vyska = vyska < 0 ? 0 : vyska; - } - - public String getMeno() { - return meno; - } - - public void setMeno(String meno) { - this.meno = meno; - } - } - - - - - diff --git a/src/tst/srlx/head/kop/converters/OsobaConverter.java b/src/tst/srlx/head/kop/converters/OsobaConverter.java deleted file mode 100644 index 1cf74e4..0000000 --- a/src/tst/srlx/head/kop/converters/OsobaConverter.java +++ /dev/null @@ -1,78 +0,0 @@ -package tst.srlx.head.kop.converters; - -import org.ugp.serialx.Utils; -import org.ugp.serialx.converters.DataConverter; - -import tst.srlx.head.kop.Osoba; - - - /* - * DataConverter urceny na konvertovanie objektov triedy Osoba na string a spat. - * Format: @"menoOsoby" jejVek jejVyska - */ - public class OsobaConverter implements DataConverter { - - @Override - public Object parse(ParserRegistry mojRegister, String objektAkoString, Object... args) { - - /* - * Podmienka ktora zaruci ze dany string z objektom naozaj reprezentuje nasu objekt osoby. - * To sa docielime tak ze zistime ci nie je prazdny a ci sa zacina '@'. - */ - objektAkoString = objektAkoString.trim(); - if (!objektAkoString.isEmpty() && objektAkoString.charAt(0) == '@') - { - objektAkoString = objektAkoString.substring(1); // Odstranenie zavinacu z nasho stringu. - - /* - * Tymto rozdelmi string na jednotlive tokeny (slova) s ktorymi budeme nasledne pracovat. - */ - String[] tokeny = Utils.splitValues(objektAkoString, ' '); - - /* - * Vytvarame prazdny objekt osoby ktorej hodnoty nastavime podla nasich tokenov. - */ - Osoba osoba = new Osoba(null, -1, -1); - - /* - * Nastavenie clenskych premennych osoby na ich povodne hodnoty ziskane. - * Vieme ze tokeny obsahuju hodnoy mena, veku a vysky v takomto poradi. - * Vsimnime si ze jednotlive tokeny je najprv tiez nutne parsnut rekurzivnym volanim parserov. - */ - osoba.setMeno(REGISTRY.parse(tokeny[0], true, null, args).toString()); - osoba.setVek(((Number) REGISTRY.parse(tokeny[1], args)).intValue()); - osoba.setVyska(((Number) REGISTRY.parse(tokeny[2], args)).floatValue()); - - return osoba; // Vraciame novoytvorenu parsnutu osobu. - } - - return CONTINUE; // Nesmieme zabudnut vratit CONTINUE ked uz vieme ze sa nejedna o objekt triedy Osoba. - } - - @Override - public CharSequence toString(ParserRegistry mojRegister, Object objekt, Object... args) { - - /* - * Podmienka ktorou zistime ci sa jedna o objekt triedy Osoba - */ - if (objekt instanceof Osoba) - { - Osoba objektAkoString = (Osoba) objekt; - - /* - * Konvertovanie objektu osoba na string serialovej podoby. - * Opat za postupneho recurzivneho konvertovanie vsetkych jeho clensky premennych na string. - * - */ - StringBuilder serialovaForma = new StringBuilder("@"); - serialovaForma.append(mojRegister.toString(objektAkoString.getMeno(), args)).append(' '); - serialovaForma.append(mojRegister.toString(objektAkoString.getVek(), args)).append(' '); - return serialovaForma.append(mojRegister.toString(objektAkoString.getVyska(), args)); - } - - return CONTINUE; // Ani tu nesmieme zabudnut vratit CONTINUE ked uz vieme ze sa nejedna o objekt triedy Osoba. - } - - } - - diff --git a/src/tst/srlx/head/kop/protocols/OsobaProtocol.java b/src/tst/srlx/head/kop/protocols/OsobaProtocol.java deleted file mode 100644 index 16ce4e8..0000000 --- a/src/tst/srlx/head/kop/protocols/OsobaProtocol.java +++ /dev/null @@ -1,65 +0,0 @@ -package tst.srlx.head.kop.protocols; - -import org.ugp.serialx.protocols.SerializationProtocol; - -import tst.srlx.head.kop.Osoba; - - /* - * Protokol urceny na specifikovanie postupu serializacie a deserializacie triedy Osoba. - */ - public class OsobaProtocol extends SerializationProtocol { - - - @Override - public Object[] serialize(Osoba osoba) { - - // Toto je pole reprezentujuce elementarne cleny objektu ako samostane objekty. - // V tomto pripade chceme serializovat vsetky cleny jheo triedy takze jeho dlzka bude 3. - Object[] polePrvkovObjektu = new Object[3]; - - /* - * Ulozenie clenskych premennych osoby do nasho pola. - * Osoba reprezentuje danu instanciu osoby ktora sa ma serializovat. - * Pametajme ze ich poradie je meno, vek, vyska. - */ - polePrvkovObjektu[0] = osoba.getMeno(); - polePrvkovObjektu[1] = osoba.getVek(); - polePrvkovObjektu[2] = osoba.getVyska(); - - return polePrvkovObjektu; // Vratenie pola prvkou reprezentujucu nasu osobu ktore bude serializovane. - } - - @Override - public Osoba unserialize(Class triedaSerializovanehoObjektu, Object... polePrvkovObjektu) throws Exception { - - - /* - * Vytvorenie prazdneho objektu osoby ktorej hodnoty nastavime na ich povodny stav z pred serializacie. - * Takto ziskame osobu totoznu z osobou serializovanou. - */ - Osoba osoba = new Osoba(null, -1, -1); - - /* - * Nastavenie clenskych premennych osoby na ich povodne hodnoty ziskane deserializovanim. - * Vieme ze ich poradie je rovnake ako pri serializaci a to meno, vek, vyska takze ich v takom poradi mozme z pola vyberat. - */ - osoba.setMeno((String) polePrvkovObjektu[0]); - osoba.setVek((int) polePrvkovObjektu[1]); - osoba.setVyska((float) polePrvkovObjektu[2]); - - return osoba; // Navratenie deserializovanej osoby totoznej s osobou serializovanov. - } - - - @Override - public Class applicableFor() { - /* - * Vratenim referencie na triedu Osoba specifikujeme ze tento protokol sa ma pouzivat pre tuto triedu - * po pripade triedy z nej odvodene. - */ - return Osoba.class; - } - } - - - From 1d8af94d646a80cbb24185e08a93540e8d7d21bd Mon Sep 17 00:00:00 2001 From: Programmer001 <39063786+SimplyProgrammer@users.noreply.github.com> Date: Wed, 27 Dec 2023 13:35:11 +0100 Subject: [PATCH 03/31] Create README.md --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..69624bc --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +This branch is for purely development purposes such as testing, prototyping or benchmarking and should not be used otherwise... From bcc6b2362ead5cc67faf08634769715717188bb2 Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Tue, 20 Feb 2024 17:23:30 +0100 Subject: [PATCH 04/31] testing... --- src/examples/Bar.java | 22 ++++- src/examples/Foo.java | 16 +++- .../AdvancedParsersExample.java | 5 +- .../implementations/GeneralExample.java | 62 +++++++++++--- .../implementations/simpleScript.juss | 2 +- src/examples/implementations/test.juss | 81 +++++++++++++------ src/tests/n/benchmarks/Benchmarks.java | 8 +- src/tests/n/benchmarks/SimpleBench.java | 24 ++++-- src/tests/n/benchmarks/Testing.java | 3 + 9 files changed, 167 insertions(+), 56 deletions(-) diff --git a/src/examples/Bar.java b/src/examples/Bar.java index c317b67..c50dfa6 100644 --- a/src/examples/Bar.java +++ b/src/examples/Bar.java @@ -1,11 +1,12 @@ package examples; import java.util.List; +import java.util.Objects; public final class Bar extends Foo //Sample object that inheres { byte by0 = (byte) 142; - short s0 = 555; + short s0 = 515; double d2 = 5; Object sampleParent; @@ -15,19 +16,32 @@ public String toString() return "Bar[" + a + " " + b + " " + c + " " + d + " " + f + " " + ch + " " + s + " " + nah + " " + l + " " + by0 + " " + s0 + " " + sampleParent+"]"; } - public static class BarProtocol extends FooProtocol //Protocol to serialize Bar + public Bar(Object parent) + { + this.sampleParent = parent; + } + + @Override + public boolean equals(Object obj) + { + Bar other = (Bar) obj; + return super.equals(obj) && by0 == other.by0 && Double.doubleToLongBits(d2) == Double.doubleToLongBits(other.d2) && s0 == other.s0 + && Objects.equals(sampleParent, other.sampleParent); + } + + public static class BarProtocol extends FooProtocol //Protocol to serialize Bar (and Foo) { @Override public Object[] serialize(Foo object) { - return new Object[] {object.a, object.b, object.c, object.d, object.f, object.ch, object.s, object.nah, object.l, ((Bar) object).by0, ((Bar) object).s0, "${$parent}" /*If serialized with JussSerializer this will try to get value of parent property from certain scope!*/}; + return new Object[] {object.a, object.b, object.c, object.d, object.f, object.ch, object.s, object.nah, object.l, ((Bar) object).by0, ((Bar) object).s0, ((Bar) object).sampleParent}; } @SuppressWarnings("unchecked") @Override public Foo unserialize(Class objectClass, Object... args) { - Bar f = new Bar(); + Bar f = new Bar(null); f.a = (int) args[0]; f.b = (int) args[1]; f.c = (int) args[2]; diff --git a/src/examples/Foo.java b/src/examples/Foo.java index 99a6559..04374a8 100644 --- a/src/examples/Foo.java +++ b/src/examples/Foo.java @@ -2,7 +2,9 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import java.util.Objects; import java.util.Random; import java.util.concurrent.CopyOnWriteArrayList; @@ -16,14 +18,14 @@ public class Foo //Sample object to be serialized using its protocol! char ch = 'l'; String s = "a"; boolean nah = false; - List l = new CopyOnWriteArrayList(Arrays.asList(6, 45, 464654, 9.9, 56f)); + List l = new CopyOnWriteArrayList(); public Foo() { l.add(6); l.add(9); l.add(13); - l.add(new Random()); + l.add(new HashMap<>()); l.add(new ArrayList<>(Arrays.asList(4, 5, 6d, new ArrayList<>(), "hi"))); } @@ -33,6 +35,16 @@ public String toString() return "Foo[" + a + " " + b + " " + c + " " + d + " " + f + " " + ch + " " + s + " " + nah + " " + l + "]"; } + + @Override + public boolean equals(Object obj) { + Foo other = (Foo) obj; + return a == other.a && b == other.b && c == other.c && ch == other.ch + && Double.doubleToLongBits(d) == Double.doubleToLongBits(other.d) + && Float.floatToIntBits(f) == Float.floatToIntBits(other.f) && l.equals(other.l) + && nah == other.nah && s.equals(other.s); + } + public static class FooProtocol extends SerializationProtocol //Protocol to serialize Foo { @Override diff --git a/src/examples/implementations/AdvancedParsersExample.java b/src/examples/implementations/AdvancedParsersExample.java index a070b0b..a30b512 100644 --- a/src/examples/implementations/AdvancedParsersExample.java +++ b/src/examples/implementations/AdvancedParsersExample.java @@ -4,6 +4,7 @@ import org.ugp.serialx.LogProvider; import org.ugp.serialx.juss.JussSerializer; +import org.ugp.serialx.juss.converters.ObjectConverter; import org.ugp.serialx.juss.converters.VariableConverter; import examples.MemberInvokeOperator; @@ -26,6 +27,8 @@ public class AdvancedParsersExample { public static void main(String[] args) throws Exception { + JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); //This is necessary since 1.3.7 + //In this case JussSerializer acts as an interpreter for our custom scripting language. JussSerializer interpreter = new JussSerializer(); @@ -37,7 +40,7 @@ public static void main(String[] args) throws Exception interpreter.LoadFrom(new File("src/examples/implementations/simpleScript.juss")); //Running our script from simpleScript.juss file! //Printing the results of our script... - //System.out.println(interpreter); //This is not necessary in this case! + System.out.println(interpreter); //This is not necessary in this case! } } diff --git a/src/examples/implementations/GeneralExample.java b/src/examples/implementations/GeneralExample.java index cf631b6..322b603 100644 --- a/src/examples/implementations/GeneralExample.java +++ b/src/examples/implementations/GeneralExample.java @@ -1,18 +1,25 @@ package examples.implementations; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.io.File; import java.lang.reflect.Field; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Random; import java.util.concurrent.atomic.AtomicLong; import org.junit.Test; -import org.ugp.serialx.GenericScope; import org.ugp.serialx.Scope; +import org.ugp.serialx.converters.StringConverter; import org.ugp.serialx.devtools.SerializationDebugger; import org.ugp.serialx.juss.JussSerializer; +import org.ugp.serialx.juss.converters.ObjectConverter; import org.ugp.serialx.protocols.SerializationProtocol; import examples.Bar; @@ -21,7 +28,7 @@ /** * This example is overview of general SerialX API functionalities! * We will look at how to serialize and deserialize objects using file. We will also create protocols for our objects as well as for already existing ones! - * This example is also for benchmarking! + * This example is also for testing and benchmarking! * * @author PETO * @@ -29,6 +36,14 @@ */ public class GeneralExample { + //Test constants... + public static final String TEST_1 = "father"; + public static final String TEST_2 = "has an event horizon... //lol"; + + public static final String TEST_3 = "some string"; + public static double TEST_4 = 5; + public static Scope TEST_5 = new Scope(); + @Test public void test() throws Exception { GeneralExample.main(new String[0]); @@ -73,30 +88,39 @@ public Class applicableFor() //------------------------------------------- Generating mock data ------------------------------------------- - Random r = new Random(); + Random r = new Random(123); List list = new ArrayList<>(); - for (int i = 0; i < 8; i++) + for (int i = 0; i < 10; i++) list.add(r.nextBoolean() ? r.nextInt(i+1) : r.nextBoolean()); + list.add(new LinkedList<>(list)); HashMap vars = new HashMap<>(); //Variables to serialize - vars.put("yourMom", "is heavier than sun... //lol"); + vars.put("yourMom", TEST_2); vars.put("num", 6); int[][] ints = {{1, 2, 3}, {4, 5, 4}, {3, 2, 1}}; + Scope someScope = new Scope(111, 222, new Scope(new ArrayList<>(Arrays.asList("some", "elements", "...", new Scope('c', TEST_5))))); + Scope neastedScope1 = new Scope(), neastedScope2 = new Scope(); + neastedScope2.put("tst4", TEST_4); + neastedScope2.add(StringConverter.DirectCode("$num")); + neastedScope1.put("neastedTest", neastedScope2); + someScope.put("test", neastedScope1); //------------------------------------------- Serializing ------------------------------------------- + JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); //This is necessary since 1.3.7 + JussSerializer serializer = new JussSerializer(vars); //Creating an instance of Serializer that will serialize objects using Juss! Serializer is instance of scope so it behaves like so! - //Adding independent values Invokation of static members of this class (calling method "println" and obtaining "hello" field as argument! - serializer.addAll("some string", r, list, serializer.Comment("Size of array"), serializer.Var("arrSize", list.size()), new Bar(), 1, 2.2, 3, 'A', true, false, null, ints, serializer.Code("$num"), new Scope(), serializer.StaticMember(GeneralExample.class, "println", serializer.StaticMember(GeneralExample.class, "hello"))); - //This will insert an comment Another way to add variable except Map $ is used to obtain value from variable + //Adding independent values Invokation of static members of this class (calling method "println" and obtaining "hello" field as argument! + serializer.addAll(TEST_3, r, list, ints, someScope, serializer.Comment("Size of array"), serializer.Var("arrSize", list.size()), new Bar(serializer.Code("$parent")), 1, 2.2, 3, 'A', true, false, null, serializer.Code("$num"), serializer.StaticMember(GeneralExample.class, "println", serializer.StaticMember(GeneralExample.class, "hello"))); + //This will insert an comment Another way to add variable except put method $ is used to obtain value from variable serializer.setGenerateComments(true); //Enabling comment generation serializer.getParsers().resetCache(); //Enabling cache, this can improve performance when serializing a lot of data (not case of this example)! double t0 = System.nanoTime(); - serializer.SerializeTo(f); //Saving content of serializer to file (serializing) +// serializer.SerializeTo(f); //Saving content of serializer to file (serializing) double t = System.nanoTime(); System.out.println("Write: " + (t-t0)/1000000 + " ms"); //Write benchmark @@ -105,7 +129,7 @@ public Class applicableFor() JussSerializer deserializer = new JussSerializer(); //Creating instance of Serializer that will deserialize objects serialized in Juss (same class is responsible for serializing and deserializing)! deserializer.setParsers(JussSerializer.JUSS_PARSERS_AND_OPERATORS); //Doing this will allow us to use operators from org.ugp.serialx.converters.operators while deserializing! - deserializer.put("parent", "father"); //Setting global variables + deserializer.put("parent", TEST_1); //Setting global variables deserializer.getParsers().resetCache(); //Enabling cache, this can improve performance when serializing a lot of data (not case of this example)! @@ -119,8 +143,22 @@ public Class applicableFor() deserializer = (JussSerializer) deserializer.filter(obj -> obj != null); //This will filter away every null value and variable! //Printing values and variables of scope! - System.out.println(deserializer.variables()); - System.out.println(deserializer.values()); + System.out.println(deserializer.getSubScope(0).getScope("neastedTest").get(new String[] {"num", "num"})); + + //Performing test + assertEquals(deserializer.getString("parent"), TEST_1); + assertEquals(deserializer.getString("yourMom"), TEST_2); + assertEquals(deserializer.getInt("arrSize"), list.size()); + + assertEquals(deserializer.getScope(4).getScope("neastedTest").getDouble("tst4"), TEST_4, 0); + assertEquals(deserializer.getScope(4).getScope("test", "neastedTest").getParent(2), deserializer.getScope(4)); + assertEquals(((Scope) deserializer.getScope(4).getSubScope(0).>get(0).get(3)).getSubScope(0).totalSize(), TEST_5.totalSize()); + assertTrue(deserializer.filter(obj -> obj.equals(true)).get(0)); + + assertEquals(deserializer.get(0), TEST_3); + assertEquals(deserializer.get(2), list); + assertEquals(deserializer.get(5), new Bar(TEST_1)); + assertArrayEquals(deserializer.get(3), ints); } //We can invoke static members in JUSS! diff --git a/src/examples/implementations/simpleScript.juss b/src/examples/implementations/simpleScript.juss index 078595c..28c700d 100644 --- a/src/examples/implementations/simpleScript.juss +++ b/src/examples/implementations/simpleScript.juss @@ -18,4 +18,4 @@ result = try { //Convenient usage of JUSS scope as a code block... $result instanceof java.lang.RuntimeException ? (System::err->println "Age must be a number you dummy..."); //Voidification of used variables that are not needed! This is not really a necessity but it nice to know about it... -result = void; //Voidification will remove the variable from this scope releasing some memory! +//result = void; //Voidification will remove the variable from this scope releasing some memory! diff --git a/src/examples/implementations/test.juss b/src/examples/implementations/test.juss index eca70ff..0285c62 100644 --- a/src/examples/implementations/test.juss +++ b/src/examples/implementations/test.juss @@ -1,31 +1,62 @@ -//java.util.Collections => _22; -// -//_22::emptyList; -//{ ArrayList 11 22 33 { ArrayList 41 42 43 -// } 555 } -//ArrayList; -//java.util.Collections::unmodifiableCollection {ArrayList {java.util.Collections::unmodifiableCollection {ArrayList 125 {100, 200}}}}; -// -//{5111} -//{ } -//var = 59; -//{$var; $var::class} +//Date created: 02-11-2024 at 16:01:23 CET +//Scope serialization summary: +//2 variables! +//17 values! +num = {num:6}; //Primitive data type: "6" the integer value! Stored by "num" variable! +yourMom = "has an event horizon... //lol"; //Object of java.lang.String: "has an event horizon... //lol"! Stored by "yourMom" variable! +"some string"; //Object of java.lang.String: "some string"! +java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@17d10166" serialized using examples.implementations.GeneralExample$1[java.util.Random]! +ArrayList 0 0 T 1 3 0 5 T 5 6 {java.util.LinkedList 0 0 T 1 3 0 5 T 5 6}; //Object of java.util.ArrayList: "[0, 0, true, 1, 3, 0, 5, true, 5, 6, [0, 0, true, 1, 3, 0, 5, true, 5, 6]]" serialized using org.ugp.serialx.protocols.ListProtocol[java.util.Collection]! +(1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@1b9e1916 converted by org.ugp.serialx.juss.converters.ArrayConverter +{ + //Scope serialization summary: + //1 variables! + //3 values! -//Tt 5 5; -//List 1 2 3; -//List 1 2 3 {List 5 5 5} 4; -//{1} + test = + { + //Scope serialization summary: + //1 variables! + neastedTest = + { + num = 3; + //Scope serialization summary: + //1 variables! + //1 values! - -hi = "hellp", -hah = t; - -a: { - lol : { - kkt = { - a = 55555; + tst4 = 5.0; //Primitive data type: "5.0" the double value! Stored by "tst4" variable! + $num.num; //Manually inserted code! } + }; + 111; //Primitive data type: "111" the integer value! + 222; //Primitive data type: "222" the integer value! + { + //Scope serialization summary: + //1 values! + kokot = { + + hahahaah = $test.neastedTest.tst4; + } + ArrayList "some" "elements" "..." { + //Scope serialization summary: + //2 values! + + '99'; //Primitive data type: "c" the character value! + {} //Empty scope! + }; //Object of java.util.ArrayList: "[some, elements, ..., Scope[c, Scope[]]]" serialized using org.ugp.serialx.protocols.ListProtocol[java.util.Collection]! } -} \ No newline at end of file +}; +//Size of array +arrSize = 11; //Manually inserted code! +examples.Bar 8 1 456 5.0 1453.3646F '108' "a" F {java.util.concurrent.CopyOnWriteArrayList 6 9 13 java.util.HashMap {ArrayList 4 5 6.0 ArrayList "hi"}} -114Y 515S $parent; //Object of examples.Bar: "Bar[8 1 456 5.0 1453.3646 l a false [6, 9, 13, {}, [4, 5, 6.0, [], hi]] -114 515 ${$parent}]" serialized using examples.Bar$BarProtocol[examples.Bar]! +1; //Primitive data type: "1" the integer value! +2.2; //Primitive data type: "2.2" the double value! +3; //Primitive data type: "3" the integer value! +'65'; //Primitive data type: "A" the character value! +T; //Primitive data type: "true" the boolean value! +F; //Primitive data type: "false" the boolean value! +null; //Null, the nothing! +$num; //Manually inserted code! +{examples.implementations.GeneralExample::println examples.implementations.GeneralExample::hello}; //Manually inserted code! \ No newline at end of file diff --git a/src/tests/n/benchmarks/Benchmarks.java b/src/tests/n/benchmarks/Benchmarks.java index 9fe1684..10a3ebc 100644 --- a/src/tests/n/benchmarks/Benchmarks.java +++ b/src/tests/n/benchmarks/Benchmarks.java @@ -140,21 +140,21 @@ else if (chEnd == '.') double baseCof = base; for (int ch; end >= start; end--) //Parsing { - if ((ch = str.charAt(end)) == '-') + if ((ch = str.charAt(end)) == '-') // Neg result = -result; - else if (ch == '.') + else if (ch == '.') //Decimal { result /= baseCof; baseCof = 1; if (type == 0) type = 'd'; } - else if (base == 10 && (ch | ' ') == 'e') + else if (base == 10 && (ch | ' ') == 'e') //Handle E-notation { baseCof = Math.pow(base, result); result = 0; } - else if (ch != '_' && ch != '+') + else if (ch != '_' && ch != '+') { result += (ch > '9' ? (ch | ' ') - 'a' + 10 : ch - '0') * baseCof; baseCof *= base; diff --git a/src/tests/n/benchmarks/SimpleBench.java b/src/tests/n/benchmarks/SimpleBench.java index 75ce9b7..e5d3f1c 100644 --- a/src/tests/n/benchmarks/SimpleBench.java +++ b/src/tests/n/benchmarks/SimpleBench.java @@ -1,12 +1,12 @@ package tests.n.benchmarks; -import java.util.ArrayList; -import java.util.List; +import java.util.HashMap; +import java.util.Map; import java.util.Random; -import java.util.TreeMap; import java.util.concurrent.Callable; import java.util.function.Function; +import org.ugp.serialx.GenericScope; import org.ugp.serialx.converters.DataConverter; import org.ugp.serialx.converters.DataParser; import org.ugp.serialx.converters.DataParser.ParserRegistry; @@ -37,6 +37,8 @@ public static RESULT[] benchmark(Callable benchDataGenerato return (RESULT[]) results; } + + static Random rand = new Random(12345); public static void main(String[] args) throws Exception { Callable data = () -> rand.nextBoolean() ? rand.nextInt(100000) : rand.nextBoolean(); @@ -44,13 +46,20 @@ public static void main(String[] args) throws Exception { ParserRegistry reg = DataParser.REGISTRY; DataConverter benchSubject = new NumberConverter(); - List lol = new ArrayList<>(); + GenericScope hashMap = new GenericScope<>(); + + for (int i = 0; i < 1000; i++) { + String key = "Key" + i; + Object value = i; + hashMap.put(key, value); + } + + hashMap.put("hii", null); + double t0 = System.nanoTime(); - for (int i = 0; i < 1_000_000; i++) { - lol.add(i); - } + System.out.println( hashMap.variables().getOrDefault("hiii", DataParser.VOID) ); double t = System.nanoTime(); System.out.println((t-t0)/1000000); @@ -60,4 +69,5 @@ public static void main(String[] args) throws Exception { // }, 10); // System.out.println(results[5].toString()); } + } \ No newline at end of file diff --git a/src/tests/n/benchmarks/Testing.java b/src/tests/n/benchmarks/Testing.java index 771f18b..222773b 100644 --- a/src/tests/n/benchmarks/Testing.java +++ b/src/tests/n/benchmarks/Testing.java @@ -8,6 +8,7 @@ import org.ugp.serialx.Utils; import org.ugp.serialx.juss.JussSerializer; +import org.ugp.serialx.juss.converters.ObjectConverter; /** * Testing random algorithms... @@ -16,6 +17,8 @@ public class Testing { public static void main(String[] args) throws Exception { + JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); + File file = new File("src/examples/implementations/test.juss"); JussSerializer deserializer = new JussSerializer(); From 9b892cde950fd8932380fb2ec308633217aa4513 Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Sat, 2 Mar 2024 20:00:45 +0100 Subject: [PATCH 05/31] testing VariableConverte/Parser --- .../implementations/GeneralExample.java | 3 +- src/examples/implementations/test.juss | 30 +++++++++++++------ src/tests/n/benchmarks/Testing.java | 29 +++++++++++------- 3 files changed, 41 insertions(+), 21 deletions(-) diff --git a/src/examples/implementations/GeneralExample.java b/src/examples/implementations/GeneralExample.java index 322b603..cfa576d 100644 --- a/src/examples/implementations/GeneralExample.java +++ b/src/examples/implementations/GeneralExample.java @@ -143,7 +143,8 @@ public Class applicableFor() deserializer = (JussSerializer) deserializer.filter(obj -> obj != null); //This will filter away every null value and variable! //Printing values and variables of scope! - System.out.println(deserializer.getSubScope(0).getScope("neastedTest").get(new String[] {"num", "num"})); + System.out.println(deserializer.variables()); + System.out.println(deserializer.values()); //Performing test assertEquals(deserializer.getString("parent"), TEST_1); diff --git a/src/examples/implementations/test.juss b/src/examples/implementations/test.juss index 0285c62..f646340 100644 --- a/src/examples/implementations/test.juss +++ b/src/examples/implementations/test.juss @@ -4,12 +4,26 @@ //2 variables! //17 values! -num = {num:6}; //Primitive data type: "6" the integer value! Stored by "num" variable! +num = 6; //Primitive data type: "6" the integer value! Stored by "num" variable! yourMom = "has an event horizon... //lol"; //Object of java.lang.String: "has an event horizon... //lol"! Stored by "yourMom" variable! "some string"; //Object of java.lang.String: "some string"! java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@17d10166" serialized using examples.implementations.GeneralExample$1[java.util.Random]! ArrayList 0 0 T 1 3 0 5 T 5 6 {java.util.LinkedList 0 0 T 1 3 0 5 T 5 6}; //Object of java.util.ArrayList: "[0, 0, true, 1, 3, 0, 5, true, 5, 6, [0, 0, true, 1, 3, 0, 5, true, 5, 6]]" serialized using org.ugp.serialx.protocols.ListProtocol[java.util.Collection]! (1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@1b9e1916 converted by org.ugp.serialx.juss.converters.ArrayConverter +test2 = +{ + //Scope serialization summary: + //1 variables! + neastedTest = + { + + //Scope serialization summary: + //1 variables! + tst4 = 7.0; //Primitive data type: "5.0" the double value! Stored by "tst4" variable! + lol = {a : 789}; + } +}; + { //Scope serialization summary: //1 variables! @@ -21,13 +35,11 @@ ArrayList 0 0 T 1 3 0 5 T 5 6 {java.util.LinkedList 0 0 T 1 3 0 5 T 5 6}; //Obje //1 variables! neastedTest = { - num = 3; //Scope serialization summary: //1 variables! - //1 values! - tst4 = 5.0; //Primitive data type: "5.0" the double value! Stored by "tst4" variable! - $num.num; //Manually inserted code! + lol = []; + $num; } }; 111; //Primitive data type: "111" the integer value! @@ -35,16 +47,16 @@ ArrayList 0 0 T 1 3 0 5 T 5 6 {java.util.LinkedList 0 0 T 1 3 0 5 T 5 6}; //Obje { //Scope serialization summary: //1 values! - kokot = { - - hahahaah = $test.neastedTest.tst4; - } ArrayList "some" "elements" "..." { //Scope serialization summary: //2 values! '99'; //Primitive data type: "c" the character value! {} //Empty scope! + { + haha2 = $test.neastedTest.lol.a::new; + hahahaah = $test.neastedTest.tst4; + } }; //Object of java.util.ArrayList: "[some, elements, ..., Scope[c, Scope[]]]" serialized using org.ugp.serialx.protocols.ListProtocol[java.util.Collection]! } }; diff --git a/src/tests/n/benchmarks/Testing.java b/src/tests/n/benchmarks/Testing.java index 222773b..1c5d3d8 100644 --- a/src/tests/n/benchmarks/Testing.java +++ b/src/tests/n/benchmarks/Testing.java @@ -2,6 +2,7 @@ import java.awt.List; import java.io.File; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Iterator; @@ -17,20 +18,26 @@ public class Testing { public static void main(String[] args) throws Exception { - JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); + String str = "123 == 123"; - File file = new File("src/examples/implementations/test.juss"); + String[] path = Utils.splitValues(str, 0, false, new char[0], '='); - JussSerializer deserializer = new JussSerializer(); - deserializer.LoadFrom(file); + System.out.println(Arrays.asList(path)); - System.out.println(deserializer); - System.out.println(deserializer.get(new String[] { "kkt", "a" })); - - for (int i = 0; i < 12; i++) { - - System.out.println(deserializer.getParent(i)); - } +// JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); +// +// File file = new File("src/examples/implementations/test.juss"); +// +// JussSerializer deserializer = new JussSerializer(); +// deserializer.LoadFrom(file); +// +// System.out.println(deserializer); +// System.out.println(deserializer.get(new String[] { "kkt", "a" })); +// +// for (int i = 0; i < 12; i++) { +// +// System.out.println(deserializer.getParent(i)); +// } } } From af9635c05d21db493d9978a0915682f81f38f347 Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Tue, 19 Mar 2024 07:53:40 +0100 Subject: [PATCH 06/31] ... --- .../implementations/SimpleQuerying.java | 5 ++- .../implementations/commentedExample.juss | 2 +- src/examples/implementations/test.juss | 6 ++- src/tests/n/benchmarks/Benchmarks.java | 38 +++++++++++-------- src/tests/n/benchmarks/Testing.java | 8 ++-- 5 files changed, 37 insertions(+), 22 deletions(-) diff --git a/src/examples/implementations/SimpleQuerying.java b/src/examples/implementations/SimpleQuerying.java index 6d127a0..c103177 100644 --- a/src/examples/implementations/SimpleQuerying.java +++ b/src/examples/implementations/SimpleQuerying.java @@ -5,6 +5,7 @@ import org.ugp.serialx.Scope; import org.ugp.serialx.converters.DataParser; import org.ugp.serialx.juss.JussSerializer; +import org.ugp.serialx.juss.converters.ObjectConverter; /** * This example contains brief example of querying and obtaining real data from deserialized content! @@ -17,12 +18,14 @@ public class SimpleQuerying { public static void main(String[] args) throws Exception { + JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); //This is necessary since 1.3.7 + //Loading complex juss file "commentedExample.juss"! JussSerializer content = JussSerializer.from("src/examples/implementations/commentedExample.juss"); //Since 1.3.5 we can use "from/into API" to load content of scope by just typing its path into "from" method! //Printing loaded data! System.out.println("Used content:\n" + content + "\n"); - + /* * Scope#getScope method is capable of getting scopes that are direct sub-scopes of scope but also it will automatically search for required scope * through every sub-scope in content! Thats why we can get sub-scope stored by "serialx" variable even though it is neasted in 3 parent scopes, Scope#getScope method will diff --git a/src/examples/implementations/commentedExample.juss b/src/examples/implementations/commentedExample.juss index 4060ca5..20a0906 100644 --- a/src/examples/implementations/commentedExample.juss +++ b/src/examples/implementations/commentedExample.juss @@ -1,5 +1,5 @@ /* THIS IS HOW RESULT OF SERIALX (Juss) REAL LIFE IMPLEMENTATION MIGHT LOOK LIKE */ -import org.ugp.serialx.JsonSerializer => Json; //Importing JsonSerializer and aliasing it as Json! +import org.ugp.serialx.json.JsonSerializer => Json; //Importing JsonSerializer and aliasing it as Json! name = "app"; diff --git a/src/examples/implementations/test.juss b/src/examples/implementations/test.juss index f646340..a949320 100644 --- a/src/examples/implementations/test.juss +++ b/src/examples/implementations/test.juss @@ -10,7 +10,7 @@ yourMom = "has an event horizon... //lol"; //Object of java.lang.String: "has an java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@17d10166" serialized using examples.implementations.GeneralExample$1[java.util.Random]! ArrayList 0 0 T 1 3 0 5 T 5 6 {java.util.LinkedList 0 0 T 1 3 0 5 T 5 6}; //Object of java.util.ArrayList: "[0, 0, true, 1, 3, 0, 5, true, 5, 6, [0, 0, true, 1, 3, 0, 5, true, 5, 6]]" serialized using org.ugp.serialx.protocols.ListProtocol[java.util.Collection]! (1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@1b9e1916 converted by org.ugp.serialx.juss.converters.ArrayConverter -test2 = +test = { //Scope serialization summary: //1 variables! @@ -21,6 +21,7 @@ test2 = //1 variables! tst4 = 7.0; //Primitive data type: "5.0" the double value! Stored by "tst4" variable! lol = {a : 789}; + hiii: [] } }; @@ -40,6 +41,7 @@ test2 = tst4 = 5.0; //Primitive data type: "5.0" the double value! Stored by "tst4" variable! lol = []; $num; + } }; 111; //Primitive data type: "111" the integer value! @@ -50,7 +52,7 @@ test2 = ArrayList "some" "elements" "..." { //Scope serialization summary: //2 values! - + test.neastedTest.hiii.a = 135; '99'; //Primitive data type: "c" the character value! {} //Empty scope! { diff --git a/src/tests/n/benchmarks/Benchmarks.java b/src/tests/n/benchmarks/Benchmarks.java index 10a3ebc..d1341b3 100644 --- a/src/tests/n/benchmarks/Benchmarks.java +++ b/src/tests/n/benchmarks/Benchmarks.java @@ -13,8 +13,11 @@ import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.runner.Runner; import org.openjdk.jmh.runner.options.OptionsBuilder; import org.openjdk.jmh.runner.options.TimeValue; +import org.openjdk.jmh.runner.options.VerboseMode; +import org.ugp.serialx.Utils; @State(Benchmark) @OutputTimeUnit(TimeUnit.MICROSECONDS) @@ -33,9 +36,12 @@ public class Benchmarks { // @Param({"java.util.ArrayList 5 5 5", "java.util.concurrent.TimeUnit 1 2 3", "5hjdhjsakhdjsakhdjsahdjhdjak {} 59", "{hjdhjsakhdjsakhdjsahdjhdjak T T T"}) // String str; - @Param({"a", "{", "["}) + @Param({"a"}) char ch; + @Param({"4", "16", "250", "500"}) + int count; + // DataConverter benchSubject = new NumberConverter() { // public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args) { // if (arg.length() > 0) @@ -55,15 +61,11 @@ public class Benchmarks { // } @Benchmark - public Object benchNew() throws ClassNotFoundException { - return (ch | ' ') == '{'; - } - - @Benchmark - public Object benchOld() { - return ch == '{' || ch == '['; + public void bench() + { + Utils.multilpy(ch, count); } -// + public static void main(String[] args) throws Exception { OptionsBuilder ob = new OptionsBuilder(); ob.measurementTime(TimeValue.milliseconds(100)); @@ -79,7 +81,7 @@ public static void main(String[] args) throws Exception { // System.out.println(reg.parse("--5 --9")); // // ob.verbosity(VerboseMode.SILENT); -// new Runner(ob).run(); + new Runner(ob).run(); // Scope s = new Scope(); // s.add(new Scope("hi".equalsIgnoreCase(null), 123)); @@ -89,6 +91,8 @@ public static void main(String[] args) throws Exception { // String str = "0xff"; // Object num = numberOf(str, 10, 0); // System.out.println(num + " | " + num.getClass().getSimpleName()); + + System.out.println(Utils.multilpy("iop", 5)); } public static boolean equalsLowerCase(CharSequence str, CharSequence lowerCaseOther, int from, int to) @@ -122,7 +126,7 @@ else if (ch1 == 'x') base = 16; start++; } - else + else if (ch1 != '.') base = 8; start++; @@ -137,9 +141,9 @@ else if (chEnd == '.') else result = chEnd > '9' ? chEnd - 'a' + 10 : chEnd - '0'; - double baseCof = base; + double baseCof = base, exponent = 1; for (int ch; end >= start; end--) //Parsing - { + { if ((ch = str.charAt(end)) == '-') // Neg result = -result; else if (ch == '.') //Decimal @@ -151,16 +155,20 @@ else if (ch == '.') //Decimal } else if (base == 10 && (ch | ' ') == 'e') //Handle E-notation { - baseCof = Math.pow(base, result); + if ((exponent = Math.pow(base, result)) < 1 && type == 0); + type = 'd'; result = 0; + baseCof = 1; } else if (ch != '_' && ch != '+') { result += (ch > '9' ? (ch | ' ') - 'a' + 10 : ch - '0') * baseCof; baseCof *= base; } - } + } + result *= exponent; + if (type == 'd') return result; if (type == 'f') diff --git a/src/tests/n/benchmarks/Testing.java b/src/tests/n/benchmarks/Testing.java index 1c5d3d8..428fcd0 100644 --- a/src/tests/n/benchmarks/Testing.java +++ b/src/tests/n/benchmarks/Testing.java @@ -19,10 +19,12 @@ public class Testing { public static void main(String[] args) throws Exception { String str = "123 == 123"; + double l = 123; +// String[] path = Utils.splitValues(str, 0, false, new char[0], '='); +// +// System.out.println(Arrays.asList(path)); - String[] path = Utils.splitValues(str, 0, false, new char[0], '='); - - System.out.println(Arrays.asList(path)); + System.out.println(Benchmarks.numberOf("1.612e-19", 10, 0)); // JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); // From c78d32774b15b33cf45b5af05e6cf5766f525c22 Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Sun, 31 Mar 2024 00:14:24 +0100 Subject: [PATCH 07/31] writing complex tests in GeneralExample and SimpleQuerying, fixes... --- .../implementations/GeneralExample.java | 33 ++++--- .../implementations/SimpleQuerying.java | 84 ++++++++++++++++- .../implementations/commentedExample.juss | 43 +++++++-- src/examples/implementations/test.juss | 35 ++------ src/tests/n/benchmarks/Benchmarks.java | 90 +++++++++++-------- src/tests/n/benchmarks/Testing.java | 16 ++-- 6 files changed, 209 insertions(+), 92 deletions(-) diff --git a/src/examples/implementations/GeneralExample.java b/src/examples/implementations/GeneralExample.java index cfa576d..4efdc31 100644 --- a/src/examples/implementations/GeneralExample.java +++ b/src/examples/implementations/GeneralExample.java @@ -15,7 +15,9 @@ import java.util.concurrent.atomic.AtomicLong; import org.junit.Test; +import org.ugp.serialx.LogProvider; import org.ugp.serialx.Scope; +import org.ugp.serialx.Utils; import org.ugp.serialx.converters.StringConverter; import org.ugp.serialx.devtools.SerializationDebugger; import org.ugp.serialx.juss.JussSerializer; @@ -43,9 +45,11 @@ public class GeneralExample public static final String TEST_3 = "some string"; public static double TEST_4 = 5; public static Scope TEST_5 = new Scope(); + public static final String TEST_6 = "HELLO_WORLD"; @Test - public void test() throws Exception { + public void test() throws Exception + { GeneralExample.main(new String[0]); } @@ -109,6 +113,8 @@ public Class applicableFor() //------------------------------------------- Serializing ------------------------------------------- + LogProvider.instance.setReThrowException(true); // This is for testing purposes, so no error are allowed in this case, comment temporary when necessary... + JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); //This is necessary since 1.3.7 JussSerializer serializer = new JussSerializer(vars); //Creating an instance of Serializer that will serialize objects using Juss! Serializer is instance of scope so it behaves like so! @@ -120,7 +126,7 @@ public Class applicableFor() serializer.getParsers().resetCache(); //Enabling cache, this can improve performance when serializing a lot of data (not case of this example)! double t0 = System.nanoTime(); -// serializer.SerializeTo(f); //Saving content of serializer to file (serializing) + serializer.SerializeTo(f); //Saving content of serializer to file (serializing) double t = System.nanoTime(); System.out.println("Write: " + (t-t0)/1000000 + " ms"); //Write benchmark @@ -147,26 +153,29 @@ public Class applicableFor() System.out.println(deserializer.values()); //Performing test - assertEquals(deserializer.getString("parent"), TEST_1); - assertEquals(deserializer.getString("yourMom"), TEST_2); - assertEquals(deserializer.getInt("arrSize"), list.size()); + assertEquals(TEST_1, deserializer.getString("parent")); + assertEquals(TEST_2, deserializer.getString("yourMom")); + assertEquals(list.size(), deserializer.getInt("arrSize")); - assertEquals(deserializer.getScope(4).getScope("neastedTest").getDouble("tst4"), TEST_4, 0); - assertEquals(deserializer.getScope(4).getScope("test", "neastedTest").getParent(2), deserializer.getScope(4)); + assertEquals(TEST_4, deserializer.getScope(4).getScope("neastedTest").getDouble("tst4"), 0); + assertEquals(deserializer.getScope(4).getScope(Utils.splitValues("test neastedTest", ' ')).getParent(2), deserializer.getScope(4)); assertEquals(((Scope) deserializer.getScope(4).getSubScope(0).>get(0).get(3)).getSubScope(0).totalSize(), TEST_5.totalSize()); assertTrue(deserializer.filter(obj -> obj.equals(true)).get(0)); - assertEquals(deserializer.get(0), TEST_3); - assertEquals(deserializer.get(2), list); - assertEquals(deserializer.get(5), new Bar(TEST_1)); - assertArrayEquals(deserializer.get(3), ints); + assertEquals(TEST_3, deserializer.get(0)); + assertEquals(list, deserializer.get(2)); + assertEquals(new Bar(TEST_1), deserializer.get(5)); + assertArrayEquals(ints, deserializer.get(3)); + + assertEquals(TEST_6, deserializer.getString(-1)); } //We can invoke static members in JUSS! public static String hello = "Hello world!"; - public static void println(String str) + public static String println(String str) { System.out.println(str); + return TEST_6; } } \ No newline at end of file diff --git a/src/examples/implementations/SimpleQuerying.java b/src/examples/implementations/SimpleQuerying.java index c103177..834564e 100644 --- a/src/examples/implementations/SimpleQuerying.java +++ b/src/examples/implementations/SimpleQuerying.java @@ -1,9 +1,22 @@ package examples.implementations; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.util.Arrays; import java.util.List; +import org.junit.Test; +import org.ugp.serialx.GenericScope; +import org.ugp.serialx.LogProvider; import org.ugp.serialx.Scope; +import org.ugp.serialx.Serializer; import org.ugp.serialx.converters.DataParser; +import org.ugp.serialx.json.JsonSerializer; import org.ugp.serialx.juss.JussSerializer; import org.ugp.serialx.juss.converters.ObjectConverter; @@ -16,12 +29,37 @@ */ public class SimpleQuerying { + public static final String TEST_1 = "Is the best!"; + public static final String TEST_2 = "app"; + public static final long TEST_3 = 58; + public static final String TEST_JSON = "Hello world I am Javascript object notation!"; + + @Test + public void test() throws Exception + { + SimpleQuerying.main(new String[0]); + } + public static void main(String[] args) throws Exception { + LogProvider.instance.setReThrowException(true); // This is for testing purposes, so no error are allowed in this case, comment temporary when necessary... + JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); //This is necessary since 1.3.7 - //Loading complex juss file "commentedExample.juss"! - JussSerializer content = JussSerializer.from("src/examples/implementations/commentedExample.juss"); //Since 1.3.5 we can use "from/into API" to load content of scope by just typing its path into "from" method! + //Preparing to load complex juss file "commentedExample.juss"! + + JussSerializer content = new JussSerializer(); // Creating JussSerializer for deserialization... + + Scope testScope = new Scope(), testScope2 = new Scope(); + testScope2.put("1", TEST_1); + testScope.put("", testScope2); + content.putAllKv( // Putting initial variables into it before actual deserialization, these variables will then be accessible inside "commentedExample.juss"! + "TEST", testScope, + "TEST_2", TEST_2, + "", TEST_JSON + ); + + content = (JussSerializer) Serializer.from(content, "src/examples/implementations/commentedExample.juss", new String[0]); //Since 1.3.5 we can use "from/into API" to load content of scope by just typing its path into "from" method! //Printing loaded data! System.out.println("Used content:\n" + content + "\n"); @@ -90,6 +128,48 @@ public static void main(String[] args) throws Exception } }); System.out.println("Real \"Java\" residents of " + residence + " are: " + realResidents); //Printing results + + //Performing tests, note that correctness of these tests depends on src/examples/implementations/commentedExample.juss + assertEquals(TEST_1, serialx); + assertEquals(content.getScope("ppl").valuesCount(), ages.size()); + assertEquals(filtered.getScope("serialx"), content.getScope("serialx")); + + assertTrue(residents.valuesCount() > 0); //Should not be 0 + assertTrue(remappedValues.size() > 0); + + assertEquals(residents.valuesCount(), realResidents.size()); + assertFalse(realResidents.contains(DataParser.VOID) || realResidents.contains(null)); + + GenericScope sc = content.getScope("devDependencies", "ppl", "ludvig"); + assertEquals(TEST_2, content.get(-1)); + assertEquals(((Scope) sc).getString("residence"), "null"); + assertEquals(TEST_3, ((Scope) sc).getLong("age")); + assertEquals(content.getScope("alienFruit").toObjectOf("variants", List.class), new GenericScope<>(1, 2, 3).values()); + + assertNotEquals(TEST_2, (sc = content.getScope("devDependencies")).get("name")); + assertNull(sc.get(-1)); + assertNull(sc.get("nope")); + + sc = sc.getGenericScope("something"); + assertNotEquals(sc.get(0), sc.get(1)); + assertFalse(sc.containsVariable("version")); + + assertNotNull(content.get("srlxVer1")); + assertEquals(content.get("srlxVer1"), content.getString("srlxVer1")); + + sc = content.getScope("jsonCrossover"); + assertTrue(sc instanceof JsonSerializer); + assertEquals(TEST_JSON, sc.get("hello")); + assertFalse(sc.getGenericScope("jsonArray").isEmpty()); + assertEquals(sc.getClass(), content.get("jsonArrayClass")); + + assertEquals(content.getGenericScope("genericScope").get(Arrays.asList(1, 2, 3)), "123"); + assertEquals(content.getGenericScope("genericScope").get(Arrays.asList(4, 5, 6)).get(0), 456d); + assertEquals(content.getGenericScope("genericScope").get(Arrays.asList(7, 8, 9)).get("test"), 789l); + + assertNotNull(sc = content.getScope("arr")); + for (Object obj : content.getScope("superArr")) + assertTrue(sc.equals(obj)); } /** diff --git a/src/examples/implementations/commentedExample.juss b/src/examples/implementations/commentedExample.juss index 20a0906..3a15546 100644 --- a/src/examples/implementations/commentedExample.juss +++ b/src/examples/implementations/commentedExample.juss @@ -1,7 +1,10 @@ /* THIS IS HOW RESULT OF SERIALX (Juss) REAL LIFE IMPLEMENTATION MIGHT LOOK LIKE */ +/* See also SimpleQuerying.java. !! This file is used for unit tests, do not modify! */ + import org.ugp.serialx.json.JsonSerializer => Json; //Importing JsonSerializer and aliasing it as Json! +import org.ugp.serialx.GenericScope; //Importing without aliasing! -name = "app"; +name = $TEST_2; //"TEST_XY" variables are not declared in here as you can see, they are expected to be provided by the deserializer! dependencies = { @@ -35,7 +38,7 @@ dependencies = serialx = { version = "The best version!"; - "Is the best!" + $TEST..1 // this one is also provided by deserializer, also this one is a bit tricky... } totalVersion = "9.9.9" }, @@ -87,7 +90,12 @@ dependencies = }, "lololoolollool"; //This is independent value of this scope. }, -$dependencies.something.dataStorage.serialx.version; //Obtaining value of "serialx" variable in "dependencies" sub-scopes! +$srlxVer1 = srlxVer2 = $dependencies.something.dataStorage.serialx.version; //Obtaining value of "serialx" variable in "dependencies" sub-scopes! + +something = +[ + test = "NOPE" +} //Well yea... [} or {] is possible. In 99% cases the interpreter sees these 2 chars as the same one... but it does not mean that you should adopt this convention... devDependencies = { @@ -99,23 +107,33 @@ devDependencies = version = "1.2.3", something = { + $version, + version = "9.9.9", + $version, + version = void, //We can use void in order to remove variable entirely + dataStorage = {}, ppl = {} } + + nope = $something.test, + + $something.dataStorage.xml.version }; //Setting variable of scope from outer world (possible since 1.3.2) devDependencies.something.ppl.ludvig = { - age = 60; + age = Math::max {int::valueOf "50"} {Math::pow {Double::valueOf {String::valueOf Math::PI}} 3.55}; residence = "russia"; }; //Since 1.2.5 Serializer fully supports Json and JavaScript object! jsonCrossover = Json { - "hello" : "Hello world I am Javascript object notation!", + /* Yes... $ are not valid values in Json. But in SerialX, Json is the superset of Juss so it is possible. In real usecase you probably want to avoid this! */ + "hello" : $, // As we know, $ is for getting value of the variable however there is no variable name right...? Well actually it is "", the name-less variable. Yea... thats also a thing... "jsObject": { - name: "John", - age: 31, + name: "John", + age: 31, city: "New York" }, "jsonArray": [ @@ -125,6 +143,15 @@ jsonCrossover = Json { 4 ] }, +jsonArrayClass = $jsonCrossover.jsonArray::class; + +//Since 1.3.5, generic scopes are supported. They allow ussage of anything as a key not only strings! +genericScope = GenericScope { + ArrayList 1 2 3: String 49y 50s 51, + ArrayList 4 5 6: {456.000d}, + ArrayList 7 8 9: {test: 789L} +} +//But there is no way to read them if they are not string... //Since SerialX 1.3.5 we can use "from/into API" to load files from external locations! alienFruit = Json::from "src/examples/implementations/test.json"; //Loading content of external file by using JsonSerializer! @@ -137,6 +164,8 @@ bullshit = server = "service server", build = "service build", sql = "service sql"; + + devDependencies.something.ppl.ludvig.residence = ; //Same as = null }, $bullshit; //Now we can access variable "bullshit" diff --git a/src/examples/implementations/test.juss b/src/examples/implementations/test.juss index a949320..f934299 100644 --- a/src/examples/implementations/test.juss +++ b/src/examples/implementations/test.juss @@ -1,4 +1,4 @@ -//Date created: 02-11-2024 at 16:01:23 CET +//Date created: 03-31-2024 at 00:03:32 CET //Scope serialization summary: //2 variables! @@ -7,24 +7,9 @@ num = 6; //Primitive data type: "6" the integer value! Stored by "num" variable! yourMom = "has an event horizon... //lol"; //Object of java.lang.String: "has an event horizon... //lol"! Stored by "yourMom" variable! "some string"; //Object of java.lang.String: "some string"! -java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@17d10166" serialized using examples.implementations.GeneralExample$1[java.util.Random]! +java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@3b95a09c" serialized using examples.implementations.GeneralExample$1[java.util.Random]! ArrayList 0 0 T 1 3 0 5 T 5 6 {java.util.LinkedList 0 0 T 1 3 0 5 T 5 6}; //Object of java.util.ArrayList: "[0, 0, true, 1, 3, 0, 5, true, 5, 6, [0, 0, true, 1, 3, 0, 5, true, 5, 6]]" serialized using org.ugp.serialx.protocols.ListProtocol[java.util.Collection]! -(1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@1b9e1916 converted by org.ugp.serialx.juss.converters.ArrayConverter -test = -{ - //Scope serialization summary: - //1 variables! - neastedTest = - { - - //Scope serialization summary: - //1 variables! - tst4 = 7.0; //Primitive data type: "5.0" the double value! Stored by "tst4" variable! - lol = {a : 789}; - hiii: [] - } -}; - +(1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@6ae40994 converted by org.ugp.serialx.juss.converters.ArrayConverter { //Scope serialization summary: //1 variables! @@ -34,14 +19,15 @@ test = { //Scope serialization summary: //1 variables! + neastedTest = { //Scope serialization summary: //1 variables! + //1 values! + tst4 = 5.0; //Primitive data type: "5.0" the double value! Stored by "tst4" variable! - lol = []; - $num; - + $num; //Manually inserted code! } }; 111; //Primitive data type: "111" the integer value! @@ -49,16 +35,13 @@ test = { //Scope serialization summary: //1 values! + ArrayList "some" "elements" "..." { //Scope serialization summary: //2 values! - test.neastedTest.hiii.a = 135; + '99'; //Primitive data type: "c" the character value! {} //Empty scope! - { - haha2 = $test.neastedTest.lol.a::new; - hahahaah = $test.neastedTest.tst4; - } }; //Object of java.util.ArrayList: "[some, elements, ..., Scope[c, Scope[]]]" serialized using org.ugp.serialx.protocols.ListProtocol[java.util.Collection]! } }; diff --git a/src/tests/n/benchmarks/Benchmarks.java b/src/tests/n/benchmarks/Benchmarks.java index d1341b3..5169331 100644 --- a/src/tests/n/benchmarks/Benchmarks.java +++ b/src/tests/n/benchmarks/Benchmarks.java @@ -2,6 +2,7 @@ import static org.openjdk.jmh.annotations.Scope.Benchmark; +import java.util.Collection; import java.util.concurrent.TimeUnit; import org.openjdk.jmh.annotations.Benchmark; @@ -13,47 +14,49 @@ import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.infra.Blackhole; +import org.openjdk.jmh.results.RunResult; import org.openjdk.jmh.runner.Runner; import org.openjdk.jmh.runner.options.OptionsBuilder; import org.openjdk.jmh.runner.options.TimeValue; -import org.openjdk.jmh.runner.options.VerboseMode; -import org.ugp.serialx.Utils; +import org.ugp.serialx.converters.DataConverter; +import org.ugp.serialx.converters.NumberConverter; @State(Benchmark) @OutputTimeUnit(TimeUnit.MICROSECONDS) @Warmup(iterations = 0) -@Measurement(iterations = 15) +@Measurement(iterations = 20) @BenchmarkMode( -// Mode.SingleShotTime - Mode.Throughput + Mode.SingleShotTime +// Mode.Throughput ) -@Fork(1) +@Fork(4) // 1 or 2 public class Benchmarks { -// @Param({"0", "12345", "-14445", "0xff", "0b11111111", "011", "15.222", "16.8888", "1234567891011"}) -// String value; + @Param({"0", "0b11l", "12345", "-14445", "0xff", "0b11111111", "011", "15.222", "16.88e2", "1234_5678_91011"}) + String value; // @Param({"java.util.ArrayList 5 5 5", "java.util.concurrent.TimeUnit 1 2 3", "5hjdhjsakhdjsakhdjsahdjhdjak {} 59", "{hjdhjsakhdjsakhdjsahdjhdjak T T T"}) // String str; - @Param({"a"}) - char ch; +// @Param({"a"}) +// char ch; +// +// @Param({"4", "16", "250", "500"}) +// int count; - @Param({"4", "16", "250", "500"}) - int count; - -// DataConverter benchSubject = new NumberConverter() { -// public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args) { -// if (arg.length() > 0) -// { -// char ch = arg.charAt(0); -// if (ch == '+' || ch == '-' || ch == '.' || (ch >= '0' && ch <= '9')) -// return decode(arg, 10, 0); -// } -// return CONTINUE; -// }; -// }; -// DataConverter benchSubjectOld = new NumberConverter(); + DataConverter benchSubject = new NumberConverter() { + public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args) { + if (arg.length() > 0) + { + char ch = arg.charAt(0); + if (ch == '+' || ch == '-' || ch == '.' || (ch >= '0' && ch <= '9')) + return numberOf(arg, ch, 10, 0); + } + return CONTINUE; + }; + }; + DataConverter benchSubjectOld = new NumberConverter(); // @Setup() // public void setup() { @@ -61,9 +64,15 @@ public class Benchmarks { // } @Benchmark - public void bench() + public void bench(Blackhole hole) { - Utils.multilpy(ch, count); + hole.consume(benchSubject.parse(null, value)); + } + + @Benchmark + public void benchOld(Blackhole hole) + { + hole.consume(benchSubjectOld.parse(null, value)); } public static void main(String[] args) throws Exception { @@ -81,7 +90,7 @@ public static void main(String[] args) throws Exception { // System.out.println(reg.parse("--5 --9")); // // ob.verbosity(VerboseMode.SILENT); - new Runner(ob).run(); + Collection runResults = new Runner(ob).run(); // Scope s = new Scope(); // s.add(new Scope("hi".equalsIgnoreCase(null), 123)); @@ -92,7 +101,11 @@ public static void main(String[] args) throws Exception { // Object num = numberOf(str, 10, 0); // System.out.println(num + " | " + num.getClass().getSimpleName()); - System.out.println(Utils.multilpy("iop", 5)); +// for (char i = 0; i < 128; i++) +// System.out.println((int)i + " " + i + " | " + (i | ' ') + " " + (char)(i | ' ')); + System.out.println(numberOf("0b11l", '0', 10, 0) + " " + 0b11l); + System.out.println(numberOf("1_0_0", '1', 10, 0) + " " + 1_0_0); + System.out.println(numberOf(".1e2", '1', 10, 0) + " " + .1e2); } public static boolean equalsLowerCase(CharSequence str, CharSequence lowerCaseOther, int from, int to) @@ -103,9 +116,8 @@ public static boolean equalsLowerCase(CharSequence str, CharSequence lowerCaseOt return true; } - public static Number numberOf(CharSequence str, int base, int type) + public static Number numberOf(CharSequence str, char ch0, int base, int type) { - char ch0 = str.charAt(0); int len = str.length(), start = 0, end = len - 1; if (ch0 == '#') //Determine base @@ -132,16 +144,18 @@ else if (ch1 != '.') start++; } - double result = 0; + double result = 0, baseCof = 1, exponent = 1; int chEnd = str.charAt(end--) | ' '; //Determine data type if (base == 10 ? chEnd >= 'd' : chEnd >= 'l') type = chEnd; else if (chEnd == '.') type = 'd'; else + { result = chEnd > '9' ? chEnd - 'a' + 10 : chEnd - '0'; + baseCof = base; + } - double baseCof = base, exponent = 1; for (int ch; end >= start; end--) //Parsing { if ((ch = str.charAt(end)) == '-') // Neg @@ -153,22 +167,22 @@ else if (ch == '.') //Decimal if (type == 0) type = 'd'; } - else if (base == 10 && (ch | ' ') == 'e') //Handle E-notation + else if ((ch |= ' ') == 'e' && base == 10) //Handle E-notation { - if ((exponent = Math.pow(base, result)) < 1 && type == 0); + if ((exponent = Math.pow(base, result)) < 1 && type == 0) type = 'd'; result = 0; baseCof = 1; } - else if (ch != '_' && ch != '+') + else if (ch != 127 && ch != '+') { - result += (ch > '9' ? (ch | ' ') - 'a' + 10 : ch - '0') * baseCof; + result += (ch > '9' ? ch - 'a' + 10 : ch - '0') * baseCof; baseCof *= base; } } result *= exponent; - + if (type == 'd') return result; if (type == 'f') diff --git a/src/tests/n/benchmarks/Testing.java b/src/tests/n/benchmarks/Testing.java index 428fcd0..d59576c 100644 --- a/src/tests/n/benchmarks/Testing.java +++ b/src/tests/n/benchmarks/Testing.java @@ -10,6 +10,7 @@ import org.ugp.serialx.Utils; import org.ugp.serialx.juss.JussSerializer; import org.ugp.serialx.juss.converters.ObjectConverter; +import org.ugp.serialx.juss.converters.VariableConverter; /** * Testing random algorithms... @@ -17,14 +18,15 @@ public class Testing { public static void main(String[] args) throws Exception { + + System.out.println(Arrays.asList(Utils.splitValues("123=123 == 55 =2=", "123=123 == 55 =2=".indexOf('='), 0, 1, new char[0], '='))); + System.out.println(Arrays.asList(Utils.splitValues("==123=123 == 55 = 4", 0, 0, 1, new char[0], '='))); + System.out.println(Arrays.asList(Utils.splitValues("=9", 0, 0, 0, new char[0], '='))); + System.out.println(Arrays.asList(Utils.splitValues("===98==9", 0, 0, 1, new char[0], '='))); + System.out.println(Arrays.asList(Utils.splitValues("10 98", 0, 0, 2, new char[0], ' '))); - String str = "123 == 123"; - double l = 123; -// String[] path = Utils.splitValues(str, 0, false, new char[0], '='); -// -// System.out.println(Arrays.asList(path)); - - System.out.println(Benchmarks.numberOf("1.612e-19", 10, 0)); + String str = "srlxVer1 = srlxVer2 = $dependencies.something.dataStorage.serialx.version"; + System.out.println(Arrays.asList(Utils.splitValues(str, VariableConverter.isVarAssignment(str), 0, 1, new char[0], '='))); // JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); // From bef8142e6cadf7daa3e403dbb201f2c071cb7ef5 Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Tue, 2 Apr 2024 23:24:24 +0200 Subject: [PATCH 08/31] ... --- src/tests/n/benchmarks/Benchmarks.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/tests/n/benchmarks/Benchmarks.java b/src/tests/n/benchmarks/Benchmarks.java index 5169331..dd37ba1 100644 --- a/src/tests/n/benchmarks/Benchmarks.java +++ b/src/tests/n/benchmarks/Benchmarks.java @@ -30,7 +30,7 @@ Mode.SingleShotTime // Mode.Throughput ) -@Fork(4) // 1 or 2 +@Fork(2) // 1 or 2 public class Benchmarks { @Param({"0", "0b11l", "12345", "-14445", "0xff", "0b11111111", "011", "15.222", "16.88e2", "1234_5678_91011"}) @@ -72,6 +72,8 @@ public void bench(Blackhole hole) @Benchmark public void benchOld(Blackhole hole) { +// hole.consume(Integer.valueOf(value)); +// hole.consume(Double.valueOf(value)); hole.consume(benchSubjectOld.parse(null, value)); } From 2ac3d35e54c90e4378902b949ab2f03244592fb1 Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Fri, 5 Apr 2024 17:41:59 +0200 Subject: [PATCH 09/31] ... unit tests as maven deps --- pom.xml | 141 +++++++++++++------------ src/examples/implementations/test.juss | 6 +- 2 files changed, 79 insertions(+), 68 deletions(-) diff --git a/pom.xml b/pom.xml index a515c1a..e48117e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,69 +1,80 @@ - - 4.0.0 - SerialXTest - SerialXTest - 0.0.1-SNAPSHOT - SerualX-test - Used for testing - - - - org.ugp.serialx - json - 1.3.7 - - - org.ugp.serialx - devtools - 1.3.7 - - - org.ugp.serialx - operators - 1.3.7 - - - - org.openjdk.jmh - jmh-core - 1.36 + + 4.0.0 + SerialXTest + SerialXTest + 0.0.1-SNAPSHOT + SerualX-test + Used for testing + + + 8 + + UTF-8 + ${java.version} + ${java.version} + + + + + org.ugp.serialx + json + 1.3.7 + + + org.ugp.serialx + devtools + 1.3.7 + + + org.ugp.serialx + operators + 1.3.7 + + + + org.openjdk.jmh + jmh-core + 1.36 - org.openjdk.jmh - jmh-generator-annprocess - 1.36 + org.openjdk.jmh + jmh-generator-annprocess + 1.36 - - - - src - - - src - - **/*.java - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-surefire-plugin - - always - true - - - - + + + + src + + + src + + **/*.java + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + + ${java.version} + ${java.version} + + + + org.apache.maven.plugins + maven-surefire-plugin + + always + true + + + + \ No newline at end of file diff --git a/src/examples/implementations/test.juss b/src/examples/implementations/test.juss index f934299..04553cc 100644 --- a/src/examples/implementations/test.juss +++ b/src/examples/implementations/test.juss @@ -1,4 +1,4 @@ -//Date created: 03-31-2024 at 00:03:32 CET +//Date created: 04-04-2024 at 15:12:05 CEST //Scope serialization summary: //2 variables! @@ -7,9 +7,9 @@ num = 6; //Primitive data type: "6" the integer value! Stored by "num" variable! yourMom = "has an event horizon... //lol"; //Object of java.lang.String: "has an event horizon... //lol"! Stored by "yourMom" variable! "some string"; //Object of java.lang.String: "some string"! -java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@3b95a09c" serialized using examples.implementations.GeneralExample$1[java.util.Random]! +java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@722c41f4" serialized using examples.implementations.GeneralExample$1[java.util.Random]! ArrayList 0 0 T 1 3 0 5 T 5 6 {java.util.LinkedList 0 0 T 1 3 0 5 T 5 6}; //Object of java.util.ArrayList: "[0, 0, true, 1, 3, 0, 5, true, 5, 6, [0, 0, true, 1, 3, 0, 5, true, 5, 6]]" serialized using org.ugp.serialx.protocols.ListProtocol[java.util.Collection]! -(1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@6ae40994 converted by org.ugp.serialx.juss.converters.ArrayConverter +(1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@5b80350b converted by org.ugp.serialx.juss.converters.ArrayConverter { //Scope serialization summary: //1 variables! From 14ad388beaf0d31fba01150faa58bbb515d15acc Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Fri, 5 Apr 2024 17:42:59 +0200 Subject: [PATCH 10/31] utests in maven --- .factorypath | 2 ++ pom.xml | 38 ++++++-------------------- src/examples/Foo.java | 2 -- src/examples/implementations/test.juss | 6 ++-- 4 files changed, 13 insertions(+), 35 deletions(-) diff --git a/.factorypath b/.factorypath index 1c63f23..318adcd 100644 --- a/.factorypath +++ b/.factorypath @@ -1,4 +1,6 @@ + + diff --git a/pom.xml b/pom.xml index e48117e..06ad8ed 100644 --- a/pom.xml +++ b/pom.xml @@ -2,20 +2,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + SerialXTest SerialXTest 0.0.1-SNAPSHOT SerualX-test Used for testing - - 8 - - UTF-8 - ${java.version} - ${java.version} - - org.ugp.serialx @@ -33,6 +26,12 @@ 1.3.7 + + junit + junit + 4.13.2 + provided + org.openjdk.jmh jmh-core @@ -45,7 +44,7 @@ - + src @@ -55,26 +54,5 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-surefire-plugin - - always - true - - - \ No newline at end of file diff --git a/src/examples/Foo.java b/src/examples/Foo.java index 04374a8..39f313b 100644 --- a/src/examples/Foo.java +++ b/src/examples/Foo.java @@ -4,8 +4,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; -import java.util.Objects; -import java.util.Random; import java.util.concurrent.CopyOnWriteArrayList; import org.ugp.serialx.protocols.SerializationProtocol; diff --git a/src/examples/implementations/test.juss b/src/examples/implementations/test.juss index 04553cc..fd2fd72 100644 --- a/src/examples/implementations/test.juss +++ b/src/examples/implementations/test.juss @@ -1,4 +1,4 @@ -//Date created: 04-04-2024 at 15:12:05 CEST +//Date created: 04-04-2024 at 16:54:15 CEST //Scope serialization summary: //2 variables! @@ -7,9 +7,9 @@ num = 6; //Primitive data type: "6" the integer value! Stored by "num" variable! yourMom = "has an event horizon... //lol"; //Object of java.lang.String: "has an event horizon... //lol"! Stored by "yourMom" variable! "some string"; //Object of java.lang.String: "some string"! -java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@722c41f4" serialized using examples.implementations.GeneralExample$1[java.util.Random]! +java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@497470ed" serialized using examples.implementations.GeneralExample$1[java.util.Random]! ArrayList 0 0 T 1 3 0 5 T 5 6 {java.util.LinkedList 0 0 T 1 3 0 5 T 5 6}; //Object of java.util.ArrayList: "[0, 0, true, 1, 3, 0, 5, true, 5, 6, [0, 0, true, 1, 3, 0, 5, true, 5, 6]]" serialized using org.ugp.serialx.protocols.ListProtocol[java.util.Collection]! -(1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@5b80350b converted by org.ugp.serialx.juss.converters.ArrayConverter +(1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@63c12fb0 converted by org.ugp.serialx.juss.converters.ArrayConverter { //Scope serialization summary: //1 variables! From 940ac0d1057afe917064eba619b52fb4e541f924 Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Mon, 8 Apr 2024 08:11:28 +0200 Subject: [PATCH 11/31] ... --- src/examples/implementations/test.juss | 2 +- src/tests/n/benchmarks/Benchmarks.java | 167 ++++++++++--------------- 2 files changed, 68 insertions(+), 101 deletions(-) diff --git a/src/examples/implementations/test.juss b/src/examples/implementations/test.juss index fd2fd72..5ce407d 100644 --- a/src/examples/implementations/test.juss +++ b/src/examples/implementations/test.juss @@ -1,4 +1,4 @@ -//Date created: 04-04-2024 at 16:54:15 CEST +//Date created: 04-07-2024 at 15:46:06 CEST //Scope serialization summary: //2 variables! diff --git a/src/tests/n/benchmarks/Benchmarks.java b/src/tests/n/benchmarks/Benchmarks.java index dd37ba1..3f91019 100644 --- a/src/tests/n/benchmarks/Benchmarks.java +++ b/src/tests/n/benchmarks/Benchmarks.java @@ -1,6 +1,7 @@ package tests.n.benchmarks; import static org.openjdk.jmh.annotations.Scope.Benchmark; +import static org.ugp.serialx.Utils.*; import java.util.Collection; import java.util.concurrent.TimeUnit; @@ -19,21 +20,24 @@ import org.openjdk.jmh.runner.Runner; import org.openjdk.jmh.runner.options.OptionsBuilder; import org.openjdk.jmh.runner.options.TimeValue; +import org.ugp.serialx.LogProvider; +import org.ugp.serialx.Utils; +import org.ugp.serialx.converters.BooleanConverter; import org.ugp.serialx.converters.DataConverter; import org.ugp.serialx.converters.NumberConverter; @State(Benchmark) @OutputTimeUnit(TimeUnit.MICROSECONDS) @Warmup(iterations = 0) -@Measurement(iterations = 20) +@Measurement(iterations = 25) @BenchmarkMode( - Mode.SingleShotTime -// Mode.Throughput +// Mode.SingleShotTime + Mode.Throughput ) -@Fork(2) // 1 or 2 +@Fork(1) // 1 or 2 public class Benchmarks { - @Param({"0", "0b11l", "12345", "-14445", "0xff", "0b11111111", "011", "15.222", "16.88e2", "1234_5678_91011"}) + @Param({"0", "0b11l", "12345", "-14445", "1 1", "0xff", "0b11111111", "011", "15.222", "16.88e2", "1234_5678_91011"}) String value; // @Param({"java.util.ArrayList 5 5 5", "java.util.concurrent.TimeUnit 1 2 3", "5hjdhjsakhdjsakhdjsahdjhdjak {} 59", "{hjdhjsakhdjsakhdjsahdjhdjak T T T"}) @@ -45,18 +49,68 @@ public class Benchmarks { // @Param({"4", "16", "250", "500"}) // int count; - DataConverter benchSubject = new NumberConverter() { - public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args) { + DataConverter benchSubject = new NumberConverter(); + + DataConverter benchSubjectOld = new NumberConverter() { + public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args ) + { if (arg.length() > 0) { char ch = arg.charAt(0); if (ch == '+' || ch == '-' || ch == '.' || (ch >= '0' && ch <= '9')) - return numberOf(arg, ch, 10, 0); + { + arg = normFormatNum(arg.toLowerCase()); + ch = arg.charAt(arg.length()-1); //ch = last char + + if (ch == '.') + return CONTINUE; + if (Utils.contains(arg, '.') || (!arg.startsWith("0x") && ch == 'f' || ch == 'd')) + { + if (ch == 'f') + return new Float(fastReplace(arg, "f", "")); + return new Double(fastReplace(arg, "d", "")); + } + + try + { + if (ch == 'l') + return new Long(Long.parseLong(fastReplace(fastReplace(fastReplace(arg, "l", ""), "0b", ""), "0x", ""), arg.startsWith("0b") ? 2 : arg.startsWith("0x") ? 16 : 10)); + if (ch == 's') + return new Short(Short.parseShort(fastReplace(fastReplace(fastReplace(arg, "s", ""), "0b", ""), "0x", ""), arg.startsWith("0b") ? 2 : arg.startsWith("0x") ? 16 : 10)); + if (ch == 'y') + return new Byte(Byte.parseByte(fastReplace(fastReplace(arg, "y", ""), "0b", ""), arg.startsWith("0b") ? 2 : 10)); + return new Integer(Integer.parseInt(fastReplace(fastReplace(arg, "0b", ""), "0x", ""), arg.startsWith("0b") ? 2 : arg.startsWith("0x") ? 16 : 10)); + } + catch (NumberFormatException e) + { + if (arg.matches("[0-9.]+")) + try + { + return new Long(Long.parseLong(fastReplace(fastReplace(fastReplace(arg, "l", ""), "0b", ""), "0x", ""), arg.startsWith("0b") ? 2 : arg.startsWith("0x") ? 16 : 10)); + } + catch (NumberFormatException e2) + { + LogProvider.instance.logErr("Number " + arg + " is too big for its datatype! Try to change its datatype to double (suffix D)!", e2); + return null; + } + } + } } return CONTINUE; + } + }; + + BooleanConverter boolConv = new BooleanConverter(); + + BooleanConverter boolConvOld = new BooleanConverter() { + public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args) { + if (arg.equalsIgnoreCase("T") || arg.equalsIgnoreCase("true")) + return new Boolean(true); + if (arg.equalsIgnoreCase("F") || arg.equalsIgnoreCase("false")) + return new Boolean(false); + return CONTINUE; }; }; - DataConverter benchSubjectOld = new NumberConverter(); // @Setup() // public void setup() { @@ -105,96 +159,9 @@ public static void main(String[] args) throws Exception { // for (char i = 0; i < 128; i++) // System.out.println((int)i + " " + i + " | " + (i | ' ') + " " + (char)(i | ' ')); - System.out.println(numberOf("0b11l", '0', 10, 0) + " " + 0b11l); - System.out.println(numberOf("1_0_0", '1', 10, 0) + " " + 1_0_0); - System.out.println(numberOf(".1e2", '1', 10, 0) + " " + .1e2); - } - - public static boolean equalsLowerCase(CharSequence str, CharSequence lowerCaseOther, int from, int to) - { - for (; from < to; from++) - if ((str.charAt(from) | ' ') != lowerCaseOther.charAt(from)) - return false; - return true; - } - - public static Number numberOf(CharSequence str, char ch0, int base, int type) - { - int len = str.length(), start = 0, end = len - 1; - - if (ch0 == '#') //Determine base - { - base = 16; - start++; - } - else if (ch0 == '0' && len > 1) - { - int ch1 = str.charAt(1) | ' '; - if (ch1 == 'b') - { - base = 2; - start++; - } - else if (ch1 == 'x') - { - base = 16; - start++; - } - else if (ch1 != '.') - base = 8; - - start++; - } - - double result = 0, baseCof = 1, exponent = 1; - int chEnd = str.charAt(end--) | ' '; //Determine data type - if (base == 10 ? chEnd >= 'd' : chEnd >= 'l') - type = chEnd; - else if (chEnd == '.') - type = 'd'; - else - { - result = chEnd > '9' ? chEnd - 'a' + 10 : chEnd - '0'; - baseCof = base; - } - - for (int ch; end >= start; end--) //Parsing - { - if ((ch = str.charAt(end)) == '-') // Neg - result = -result; - else if (ch == '.') //Decimal - { - result /= baseCof; - baseCof = 1; - if (type == 0) - type = 'd'; - } - else if ((ch |= ' ') == 'e' && base == 10) //Handle E-notation - { - if ((exponent = Math.pow(base, result)) < 1 && type == 0) - type = 'd'; - result = 0; - baseCof = 1; - } - else if (ch != 127 && ch != '+') - { - result += (ch > '9' ? ch - 'a' + 10 : ch - '0') * baseCof; - baseCof *= base; - } - } - - result *= exponent; - - if (type == 'd') - return result; - if (type == 'f') - return (float) result; - if (type == 'l' || result > 0x7fffffff || result < 0x80000000) - return (long) result; - if (type == 's') - return (short) result; - if (type == 'y') - return (byte) result; - return (int) result; + System.out.println(NumberConverter.numberOf("0b11l", '0', 4, 10, 0) + " " + 0b11l); + System.out.println(NumberConverter.numberOf("1_0_0", '1', 4, 10, 0) + " " + 1_0_0); + System.out.println(NumberConverter.numberOf(".1e2", '1', 3, 10, 0) + " " + .1e2); + System.out.println(NumberConverter.numberOf("0", '0', 0, 10, 0) + " " + 0); } } From e4a995a318e4820019a84e7b5df358713659c06c Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Thu, 11 Apr 2024 10:41:39 +0200 Subject: [PATCH 12/31] testing --- .../implementations/GeneralExample.java | 2 +- src/tests/n/benchmarks/Benchmarks.java | 38 +++++++++++++++---- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/src/examples/implementations/GeneralExample.java b/src/examples/implementations/GeneralExample.java index 4efdc31..8c7d3dd 100644 --- a/src/examples/implementations/GeneralExample.java +++ b/src/examples/implementations/GeneralExample.java @@ -156,7 +156,7 @@ public Class applicableFor() assertEquals(TEST_1, deserializer.getString("parent")); assertEquals(TEST_2, deserializer.getString("yourMom")); assertEquals(list.size(), deserializer.getInt("arrSize")); - + assertEquals(TEST_4, deserializer.getScope(4).getScope("neastedTest").getDouble("tst4"), 0); assertEquals(deserializer.getScope(4).getScope(Utils.splitValues("test neastedTest", ' ')).getParent(2), deserializer.getScope(4)); assertEquals(((Scope) deserializer.getScope(4).getSubScope(0).>get(0).get(3)).getSubScope(0).totalSize(), TEST_5.totalSize()); diff --git a/src/tests/n/benchmarks/Benchmarks.java b/src/tests/n/benchmarks/Benchmarks.java index 3f91019..8693450 100644 --- a/src/tests/n/benchmarks/Benchmarks.java +++ b/src/tests/n/benchmarks/Benchmarks.java @@ -3,9 +3,12 @@ import static org.openjdk.jmh.annotations.Scope.Benchmark; import static org.ugp.serialx.Utils.*; +import java.util.Arrays; import java.util.Collection; import java.util.concurrent.TimeUnit; +import javax.sound.midi.SysexMessage; + import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -29,7 +32,7 @@ @State(Benchmark) @OutputTimeUnit(TimeUnit.MICROSECONDS) @Warmup(iterations = 0) -@Measurement(iterations = 25) +@Measurement(iterations = 20) @BenchmarkMode( // Mode.SingleShotTime Mode.Throughput @@ -37,8 +40,8 @@ @Fork(1) // 1 or 2 public class Benchmarks { - @Param({"0", "0b11l", "12345", "-14445", "1 1", "0xff", "0b11111111", "011", "15.222", "16.88e2", "1234_5678_91011"}) - String value; +// @Param({"0", "0b11l", "12345", "-14445", "1 1", "0xff", "0b11111111", "011", "15.222", "16.88e2", "1234_5678_91011"}) +// String nvalue; // @Param({"java.util.ArrayList 5 5 5", "java.util.concurrent.TimeUnit 1 2 3", "5hjdhjsakhdjsakhdjsahdjhdjak {} 59", "{hjdhjsakhdjsakhdjsahdjhdjak T T T"}) // String str; @@ -49,6 +52,9 @@ public class Benchmarks { // @Param({"4", "16", "250", "500"}) // int count; + @Param({"true", "f", "TRue", "FaLse", "tru0", "asdasdzxc", "falsr"}) + String bvalue; + DataConverter benchSubject = new NumberConverter(); DataConverter benchSubjectOld = new NumberConverter() { @@ -115,12 +121,26 @@ public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args) { // @Setup() // public void setup() { // +// } + +// @Benchmark +// public void bench(Blackhole hole) +// { +// hole.consume(benchSubject.parse(null, nvalue)); +// } +// +// @Benchmark +// public void benchOld(Blackhole hole) +// { +//// hole.consume(Integer.valueOf(value)); +//// hole.consume(Double.valueOf(value)); +// hole.consume(benchSubjectOld.parse(null, nvalue)); // } @Benchmark public void bench(Blackhole hole) { - hole.consume(benchSubject.parse(null, value)); + hole.consume(boolConv.parse(null, bvalue)); } @Benchmark @@ -128,7 +148,7 @@ public void benchOld(Blackhole hole) { // hole.consume(Integer.valueOf(value)); // hole.consume(Double.valueOf(value)); - hole.consume(benchSubjectOld.parse(null, value)); + hole.consume(boolConvOld.parse(null, bvalue)); } public static void main(String[] args) throws Exception { @@ -146,7 +166,7 @@ public static void main(String[] args) throws Exception { // System.out.println(reg.parse("--5 --9")); // // ob.verbosity(VerboseMode.SILENT); - Collection runResults = new Runner(ob).run(); +// Collection runResults = new Runner(ob).run(); // Scope s = new Scope(); // s.add(new Scope("hi".equalsIgnoreCase(null), 123)); @@ -162,6 +182,10 @@ public static void main(String[] args) throws Exception { System.out.println(NumberConverter.numberOf("0b11l", '0', 4, 10, 0) + " " + 0b11l); System.out.println(NumberConverter.numberOf("1_0_0", '1', 4, 10, 0) + " " + 1_0_0); System.out.println(NumberConverter.numberOf(".1e2", '1', 3, 10, 0) + " " + .1e2); - System.out.println(NumberConverter.numberOf("0", '0', 0, 10, 0) + " " + 0); + System.out.println(NumberConverter.numberOf("10e2", '1', 3, 10, 0).getClass() + " " + 10e2); + +// for (String bval : Arrays.asList("true", "f", "TRue", "FaLse", "tru0", "asdasdzxc", "falsr")) { +// System.out.println(new BooleanConverter().parse(null, bval)); +// } } } From d26e887f1a125982dd2df91a60a96b0fb260c158 Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Thu, 11 Apr 2024 10:58:30 +0200 Subject: [PATCH 13/31] tst --- src/tests/n/benchmarks/Benchmarks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/n/benchmarks/Benchmarks.java b/src/tests/n/benchmarks/Benchmarks.java index 8693450..83a58d4 100644 --- a/src/tests/n/benchmarks/Benchmarks.java +++ b/src/tests/n/benchmarks/Benchmarks.java @@ -182,7 +182,7 @@ public static void main(String[] args) throws Exception { System.out.println(NumberConverter.numberOf("0b11l", '0', 4, 10, 0) + " " + 0b11l); System.out.println(NumberConverter.numberOf("1_0_0", '1', 4, 10, 0) + " " + 1_0_0); System.out.println(NumberConverter.numberOf(".1e2", '1', 3, 10, 0) + " " + .1e2); - System.out.println(NumberConverter.numberOf("10e2", '1', 3, 10, 0).getClass() + " " + 10e2); + System.out.println(NumberConverter.numberOf("10e2", '1', 3, 10, 0) + " " + 10e2); // for (String bval : Arrays.asList("true", "f", "TRue", "FaLse", "tru0", "asdasdzxc", "falsr")) { // System.out.println(new BooleanConverter().parse(null, bval)); From a301c3b83a84705690649fa78d973b7e6eb9fa63 Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Tue, 30 Apr 2024 14:15:09 +0200 Subject: [PATCH 14/31] ... --- src/examples/Message.java | 4 ++-- src/examples/implementations/SerializingWithJson.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/examples/Message.java b/src/examples/Message.java index e94654d..cd5c2bf 100644 --- a/src/examples/Message.java +++ b/src/examples/Message.java @@ -1,10 +1,10 @@ package examples; -import org.ugp.serialx.protocols.SelfSerializable; +import org.ugp.serialx.juss.protocols.SelfSerializable; /** * Example of self-serializable object! - * SelfSerializable objects can be serialized directly without necessity of having any {@link SerializationDebugger}, all you need to do is implement {@link SelfSerializable} interface and override {@link SelfSerializable#serialize()} method accordingly! + * {@link SelfSerializable} objects can be serialized directly without necessity of having any {@link org.ugp.serialx.devtools.SerializationDebugger}, all you need to do is implement {@link SelfSerializable} interface and override {@link SelfSerializable#serialize()} method accordingly! * * @author PETO * diff --git a/src/examples/implementations/SerializingWithJson.java b/src/examples/implementations/SerializingWithJson.java index cfe8d4a..e49b987 100644 --- a/src/examples/implementations/SerializingWithJson.java +++ b/src/examples/implementations/SerializingWithJson.java @@ -7,7 +7,7 @@ import org.ugp.serialx.Scope; import org.ugp.serialx.Serializer; import org.ugp.serialx.json.JsonSerializer; -import org.ugp.serialx.protocols.AutoProtocol; +import org.ugp.serialx.juss.protocols.AutoProtocol; import org.ugp.serialx.protocols.SerializationProtocol; import examples.Message; From ca4a32a3afb029c95048a8b3c6cb557b6040c5b0 Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Sat, 11 May 2024 23:40:19 +0200 Subject: [PATCH 15/31] testing, improving test covarage --- .../implementations/GeneralExample.java | 12 +-- .../implementations/SerializingWithJson.java | 18 +++-- .../implementations/SimpleQuerying.java | 22 ++++-- .../implementations/commentedExample.juss | 6 +- src/examples/implementations/test.juss | 8 +- src/tests/n/benchmarks/Benchmarks.java | 8 +- src/tests/n/benchmarks/SimpleBench.java | 73 ------------------- .../n/benchmarks/StandardBenchmark.java} | 4 +- src/tests/n/benchmarks/Testing.java | 7 -- 9 files changed, 43 insertions(+), 115 deletions(-) delete mode 100644 src/tests/n/benchmarks/SimpleBench.java rename src/{tst/srlx/head/Main.java => tests/n/benchmarks/StandardBenchmark.java} (98%) diff --git a/src/examples/implementations/GeneralExample.java b/src/examples/implementations/GeneralExample.java index 8c7d3dd..dbb2fa2 100644 --- a/src/examples/implementations/GeneralExample.java +++ b/src/examples/implementations/GeneralExample.java @@ -8,6 +8,7 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -119,8 +120,8 @@ public Class applicableFor() JussSerializer serializer = new JussSerializer(vars); //Creating an instance of Serializer that will serialize objects using Juss! Serializer is instance of scope so it behaves like so! //Adding independent values Invokation of static members of this class (calling method "println" and obtaining "hello" field as argument! - serializer.addAll(TEST_3, r, list, ints, someScope, serializer.Comment("Size of array"), serializer.Var("arrSize", list.size()), new Bar(serializer.Code("$parent")), 1, 2.2, 3, 'A', true, false, null, serializer.Code("$num"), serializer.StaticMember(GeneralExample.class, "println", serializer.StaticMember(GeneralExample.class, "hello"))); - //This will insert an comment Another way to add variable except put method $ is used to obtain value from variable + serializer.addAll(TEST_3, r, list, ints, someScope, serializer.Comment("Size of array"), serializer.Var("arrSize", list.size()), new Bar(serializer.Code("$parent")), 1, 2.2, 3, 'A', true, false, null, serializer.Code("$num::new"), serializer.StaticMember(GeneralExample.class, "println", serializer.StaticMember(GeneralExample.class, "hello"))); + //This will insert an comment Another way to add variable except put method $ is used to obtain value from variable, ::new will attempt to clone the value serializer.setGenerateComments(true); //Enabling comment generation serializer.getParsers().resetCache(); //Enabling cache, this can improve performance when serializing a lot of data (not case of this example)! @@ -159,15 +160,16 @@ public Class applicableFor() assertEquals(TEST_4, deserializer.getScope(4).getScope("neastedTest").getDouble("tst4"), 0); assertEquals(deserializer.getScope(4).getScope(Utils.splitValues("test neastedTest", ' ')).getParent(2), deserializer.getScope(4)); - assertEquals(((Scope) deserializer.getScope(4).getSubScope(0).>get(0).get(3)).getSubScope(0).totalSize(), TEST_5.totalSize()); + assertEquals(((Scope) deserializer.getScope(4).getSubScope(0).>get(0).get(3)).getSubScope(0).toObject(List.class).size(), TEST_5.into(Collection.class).size()); + assertTrue(deserializer.clone() instanceof JussSerializer); assertTrue(deserializer.filter(obj -> obj.equals(true)).get(0)); assertEquals(TEST_3, deserializer.get(0)); assertEquals(list, deserializer.get(2)); assertEquals(new Bar(TEST_1), deserializer.get(5)); - assertArrayEquals(ints, deserializer.get(3)); + assertArrayEquals(ints, Scope.from(deserializer.get(3)).toValArray()); - assertEquals(TEST_6, deserializer.getString(-1)); + assertEquals(TEST_6, new Scope(deserializer).getString(-1)); } //We can invoke static members in JUSS! diff --git a/src/examples/implementations/SerializingWithJson.java b/src/examples/implementations/SerializingWithJson.java index e49b987..4f38b0b 100644 --- a/src/examples/implementations/SerializingWithJson.java +++ b/src/examples/implementations/SerializingWithJson.java @@ -24,13 +24,18 @@ public class SerializingWithJson { public static void main(String[] args) throws Exception { /* - * Registering AutoProtocol for Mesasge class and setting it to serialize it as Scope! + * Registering AutoProtocol for Message class and setting it to serialize it as Scope! * - * Note: You can see that we are getting "ProtocolRegistry: Protocol applicable for "examples.Message" is already registered!" this is because Message already implements SelfSerializable which means it can be already serialized via SelfSerializableProtocol. * Registering additional Serialization protocol is therefore not necessary, we are doing this only to enforce the Scope format. */ SerializationProtocol.REGISTRY.add(new AutoProtocol<>(Message.class, true)); + /* + * Note that Message is also SelfSerializable which makes it eligible to be serialized with SelfSerializableProtocol as well! + * You can try this by uncommenting this line and commenting line above, notice how data format will change slightly due to different serialization technique that SelfSerializable uses! + */ +// SerializationProtocol.REGISTRY.add(new SelfSerializableProtocol(Message.class)); + File medium = new File("src/examples/implementations/messages.json"); // Json file to use... // Content to serialzie (list of Messages) @@ -54,12 +59,13 @@ public static void main(String[] args) throws Exception // Mapping deserialized Scopes, or "json objects" in this case, back into our original messages! List deserializedMessages = deserializer.map(jsonObj -> { - try { + try + { return ((Scope) jsonObj).toObject(Message.class); } - catch (Exception e) { - e.printStackTrace(); - return null; + catch (Exception e) + { + throw new RuntimeException(e); } }); diff --git a/src/examples/implementations/SimpleQuerying.java b/src/examples/implementations/SimpleQuerying.java index 834564e..e32b4f7 100644 --- a/src/examples/implementations/SimpleQuerying.java +++ b/src/examples/implementations/SimpleQuerying.java @@ -15,8 +15,10 @@ import org.ugp.serialx.LogProvider; import org.ugp.serialx.Scope; import org.ugp.serialx.Serializer; +import org.ugp.serialx.Utils; import org.ugp.serialx.converters.DataParser; import org.ugp.serialx.json.JsonSerializer; +import org.ugp.serialx.json.converters.JsonCharacterConverter; import org.ugp.serialx.juss.JussSerializer; import org.ugp.serialx.juss.converters.ObjectConverter; @@ -134,17 +136,19 @@ public static void main(String[] args) throws Exception assertEquals(content.getScope("ppl").valuesCount(), ages.size()); assertEquals(filtered.getScope("serialx"), content.getScope("serialx")); - assertTrue(residents.valuesCount() > 0); //Should not be 0 + assertTrue(residents.toObject(List.class).size() > 0); //Should not be 0 assertTrue(remappedValues.size() > 0); - assertEquals(residents.valuesCount(), realResidents.size()); + JsonSerializer test = new JsonSerializer(); + assertEquals(new Scope(residents).clone().clone(JussSerializer.class).into(test).valuesCount(), realResidents.size()); assertFalse(realResidents.contains(DataParser.VOID) || realResidents.contains(null)); + assertEquals(residents, test); GenericScope sc = content.getScope("devDependencies", "ppl", "ludvig"); assertEquals(TEST_2, content.get(-1)); assertEquals(((Scope) sc).getString("residence"), "null"); assertEquals(TEST_3, ((Scope) sc).getLong("age")); - assertEquals(content.getScope("alienFruit").toObjectOf("variants", List.class), new GenericScope<>(1, 2, 3).values()); + assertEquals(((Scope) content.transformToScope()).getScope("alienFruit").toObjectOf("variants", List.class), new GenericScope<>(1, 2, 3).values()); assertNotEquals(TEST_2, (sc = content.getScope("devDependencies")).get("name")); assertNull(sc.get(-1)); @@ -159,13 +163,15 @@ public static void main(String[] args) throws Exception sc = content.getScope("jsonCrossover"); assertTrue(sc instanceof JsonSerializer); - assertEquals(TEST_JSON, sc.get("hello")); + assertTrue(Scope.from(sc).castTo(Scope.class) instanceof Scope); + assertEquals(TEST_JSON, sc.get("he" + Utils.multilpy("l", 2) + "o")); assertFalse(sc.getGenericScope("jsonArray").isEmpty()); - assertEquals(sc.getClass(), content.get("jsonArrayClass")); + assertEquals(sc.getClass(), content.get("jsonArrayCla" + Utils.multilpy('s', 2))); - assertEquals(content.getGenericScope("genericScope").get(Arrays.asList(1, 2, 3)), "123"); - assertEquals(content.getGenericScope("genericScope").get(Arrays.asList(4, 5, 6)).get(0), 456d); - assertEquals(content.getGenericScope("genericScope").get(Arrays.asList(7, 8, 9)).get("test"), 789l); + + assertEquals(content.getGenericScope("genericScope").get(Arrays.asList((Object[]) content.getParsers().parse("(1_0_0e-2 (0b10 ) 3d)"))), new JsonCharacterConverter(false).toString(null, '{') /* DO NOT DO IN PROD ("123") */); + assertEquals(content.getGenericScope("genericScope").get(Arrays.asList(-+-+04, -+-5.000, 0x6)).get(0), 456d); + assertEquals(content.getGenericScope("genericScope").get(Arrays.asList(.7, 8f, (byte) +-+-9)).get("test"), 789l); assertNotNull(sc = content.getScope("arr")); for (Object obj : content.getScope("superArr")) diff --git a/src/examples/implementations/commentedExample.juss b/src/examples/implementations/commentedExample.juss index 3a15546..a8f8d9e 100644 --- a/src/examples/implementations/commentedExample.juss +++ b/src/examples/implementations/commentedExample.juss @@ -147,9 +147,9 @@ jsonArrayClass = $jsonCrossover.jsonArray::class; //Since 1.3.5, generic scopes are supported. They allow ussage of anything as a key not only strings! genericScope = GenericScope { - ArrayList 1 2 3: String 49y 50s 51, - ArrayList 4 5 6: {456.000d}, - ArrayList 7 8 9: {test: 789L} + ArrayList 1_0_0e-2 0b10 3d: String 49y 50s 51, + ArrayList -+-+04 -+-5.000 0x6: {456.000d}, + ArrayList .7 8f +-+-9y: {test: 789L} } //But there is no way to read them if they are not string... diff --git a/src/examples/implementations/test.juss b/src/examples/implementations/test.juss index 5ce407d..e9c3d96 100644 --- a/src/examples/implementations/test.juss +++ b/src/examples/implementations/test.juss @@ -1,4 +1,4 @@ -//Date created: 04-07-2024 at 15:46:06 CEST +//Date created: 05-11-2024 at 23:32:02 CEST //Scope serialization summary: //2 variables! @@ -7,9 +7,9 @@ num = 6; //Primitive data type: "6" the integer value! Stored by "num" variable! yourMom = "has an event horizon... //lol"; //Object of java.lang.String: "has an event horizon... //lol"! Stored by "yourMom" variable! "some string"; //Object of java.lang.String: "some string"! -java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@497470ed" serialized using examples.implementations.GeneralExample$1[java.util.Random]! +java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@791f145a" serialized using examples.implementations.GeneralExample$1[java.util.Random]! ArrayList 0 0 T 1 3 0 5 T 5 6 {java.util.LinkedList 0 0 T 1 3 0 5 T 5 6}; //Object of java.util.ArrayList: "[0, 0, true, 1, 3, 0, 5, true, 5, 6, [0, 0, true, 1, 3, 0, 5, true, 5, 6]]" serialized using org.ugp.serialx.protocols.ListProtocol[java.util.Collection]! -(1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@63c12fb0 converted by org.ugp.serialx.juss.converters.ArrayConverter +(1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@38cee291 converted by org.ugp.serialx.juss.converters.ArrayConverter { //Scope serialization summary: //1 variables! @@ -55,5 +55,5 @@ examples.Bar 8 1 456 5.0 1453.3646F '108' "a" F {java.util.concurrent.CopyOnWrit T; //Primitive data type: "true" the boolean value! F; //Primitive data type: "false" the boolean value! null; //Null, the nothing! -$num; //Manually inserted code! +$num::new; //Manually inserted code! {examples.implementations.GeneralExample::println examples.implementations.GeneralExample::hello}; //Manually inserted code! \ No newline at end of file diff --git a/src/tests/n/benchmarks/Benchmarks.java b/src/tests/n/benchmarks/Benchmarks.java index 83a58d4..92f83f5 100644 --- a/src/tests/n/benchmarks/Benchmarks.java +++ b/src/tests/n/benchmarks/Benchmarks.java @@ -1,14 +1,10 @@ package tests.n.benchmarks; import static org.openjdk.jmh.annotations.Scope.Benchmark; -import static org.ugp.serialx.Utils.*; +import static org.ugp.serialx.Utils.fastReplace; -import java.util.Arrays; -import java.util.Collection; import java.util.concurrent.TimeUnit; -import javax.sound.midi.SysexMessage; - import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -19,8 +15,6 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Warmup; import org.openjdk.jmh.infra.Blackhole; -import org.openjdk.jmh.results.RunResult; -import org.openjdk.jmh.runner.Runner; import org.openjdk.jmh.runner.options.OptionsBuilder; import org.openjdk.jmh.runner.options.TimeValue; import org.ugp.serialx.LogProvider; diff --git a/src/tests/n/benchmarks/SimpleBench.java b/src/tests/n/benchmarks/SimpleBench.java deleted file mode 100644 index e5d3f1c..0000000 --- a/src/tests/n/benchmarks/SimpleBench.java +++ /dev/null @@ -1,73 +0,0 @@ -package tests.n.benchmarks; - -import java.util.HashMap; -import java.util.Map; -import java.util.Random; -import java.util.concurrent.Callable; -import java.util.function.Function; - -import org.ugp.serialx.GenericScope; -import org.ugp.serialx.converters.DataConverter; -import org.ugp.serialx.converters.DataParser; -import org.ugp.serialx.converters.DataParser.ParserRegistry; -import org.ugp.serialx.converters.NumberConverter; - -public class SimpleBench { - - - @SuppressWarnings("unchecked") - public static RESULT[] benchmark(Callable benchDataGenerator, Function action, int count) throws Exception { - Object[] results = new Object[count]; - - double total = 0; - for (int i = 0; i < count; i++) { - DATA benchmarkDataData = benchDataGenerator.call(); - - double t0 = System.nanoTime(); - - results[i] = action.apply(benchmarkDataData); - - double t = System.nanoTime(); - - total += t-t0; - } - - System.out.println("Avarage time " + String.format("%.5f", total/count/1000000) + "ms"); - - return (RESULT[]) results; - } - - - - static Random rand = new Random(12345); - public static void main(String[] args) throws Exception { - Callable data = () -> rand.nextBoolean() ? rand.nextInt(100000) : rand.nextBoolean(); - - ParserRegistry reg = DataParser.REGISTRY; - DataConverter benchSubject = new NumberConverter(); - - GenericScope hashMap = new GenericScope<>(); - - for (int i = 0; i < 1000; i++) { - String key = "Key" + i; - Object value = i; - hashMap.put(key, value); - } - - hashMap.put("hii", null); - - - - double t0 = System.nanoTime(); - System.out.println( hashMap.variables().getOrDefault("hiii", DataParser.VOID) ); - double t = System.nanoTime(); - System.out.println((t-t0)/1000000); - - -// Object[] results = benchmark(data, state -> { -// return reg.toString(state); -// }, 10); -// System.out.println(results[5].toString()); - } - -} \ No newline at end of file diff --git a/src/tst/srlx/head/Main.java b/src/tests/n/benchmarks/StandardBenchmark.java similarity index 98% rename from src/tst/srlx/head/Main.java rename to src/tests/n/benchmarks/StandardBenchmark.java index 68dcb89..a95a563 100644 --- a/src/tst/srlx/head/Main.java +++ b/src/tests/n/benchmarks/StandardBenchmark.java @@ -1,4 +1,4 @@ -package tst.srlx.head; +package tests.n.benchmarks; import java.io.File; import java.lang.reflect.Field; @@ -24,7 +24,7 @@ * * @since 1.0.0 */ -public class Main +public class StandardBenchmark { public static void main(String[] args) throws Exception { diff --git a/src/tests/n/benchmarks/Testing.java b/src/tests/n/benchmarks/Testing.java index d59576c..74aadb3 100644 --- a/src/tests/n/benchmarks/Testing.java +++ b/src/tests/n/benchmarks/Testing.java @@ -1,15 +1,8 @@ package tests.n.benchmarks; -import java.awt.List; -import java.io.File; import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; import org.ugp.serialx.Utils; -import org.ugp.serialx.juss.JussSerializer; -import org.ugp.serialx.juss.converters.ObjectConverter; import org.ugp.serialx.juss.converters.VariableConverter; /** From 552f8eda282b24860e0fd25dab8b5b4e5933566a Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Fri, 12 Jul 2024 22:40:55 +0200 Subject: [PATCH 16/31] greatly impriving coverage for GeneralExa --- src/examples/Foo.java | 3 +- .../implementations/GeneralExample.java | 45 ++++++++++++------- src/examples/implementations/test.juss | 17 +++---- src/tests/n/benchmarks/Testing.java | 3 ++ 4 files changed, 44 insertions(+), 24 deletions(-) diff --git a/src/examples/Foo.java b/src/examples/Foo.java index 39f313b..9efd077 100644 --- a/src/examples/Foo.java +++ b/src/examples/Foo.java @@ -1,5 +1,6 @@ package examples; +import java.nio.file.AccessMode; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -24,7 +25,7 @@ public Foo() l.add(9); l.add(13); l.add(new HashMap<>()); - l.add(new ArrayList<>(Arrays.asList(4, 5, 6d, new ArrayList<>(), "hi"))); + l.add(new ArrayList<>(Arrays.asList(4, 5, 6d, new ArrayList<>(), AccessMode.READ, "hi"))); } @Override diff --git a/src/examples/implementations/GeneralExample.java b/src/examples/implementations/GeneralExample.java index dbb2fa2..7d69c99 100644 --- a/src/examples/implementations/GeneralExample.java +++ b/src/examples/implementations/GeneralExample.java @@ -16,9 +16,12 @@ import java.util.concurrent.atomic.AtomicLong; import org.junit.Test; +import org.ugp.serialx.GenericScope; import org.ugp.serialx.LogProvider; import org.ugp.serialx.Scope; import org.ugp.serialx.Utils; +import org.ugp.serialx.converters.DataParser; +import org.ugp.serialx.converters.Operators; import org.ugp.serialx.converters.StringConverter; import org.ugp.serialx.devtools.SerializationDebugger; import org.ugp.serialx.juss.JussSerializer; @@ -42,10 +45,11 @@ public class GeneralExample //Test constants... public static final String TEST_1 = "father"; public static final String TEST_2 = "has an event horizon... //lol"; - public static final String TEST_3 = "some string"; - public static double TEST_4 = 5; - public static Scope TEST_5 = new Scope(); + + public static final double TEST_4 = 5; + public static final int TEST_4A = 6; + public static final Scope TEST_5 = new Scope(); public static final String TEST_6 = "HELLO_WORLD"; @Test @@ -56,6 +60,8 @@ public void test() throws Exception public static void main(String[] args) throws Exception { + LogProvider.instance.setReThrowException(true); // This is for testing purposes, so no error are allowed in this case, comment temporary when necessary... + //------------------------------------------- Custom protocol registration ------------------------------------------- SerializationProtocol.REGISTRY.addAll(new Bar.BarProtocol(), new Foo.FooProtocol(), new SerializationProtocol() //Sample custom protocol to serialized Random. @@ -101,11 +107,12 @@ public Class applicableFor() HashMap vars = new HashMap<>(); //Variables to serialize vars.put("yourMom", TEST_2); - vars.put("num", 6); + vars.put("num", TEST_4A); int[][] ints = {{1, 2, 3}, {4, 5, 4}, {3, 2, 1}}; - Scope someScope = new Scope(111, 222, new Scope(new ArrayList<>(Arrays.asList("some", "elements", "...", new Scope('c', TEST_5))))); + String complexExpression = "$undef??0 ?12 : 11??{} ? ($_boolTst1 = 1 2 <= {1, 2, 3} - 2 - 3 + 5)&& ($_boolTst2: !!T instanceof java.lang.Boolean) && !!!5.0 > 5 && ($_boolTst3 = T) || ($_boolTst4= 'i'- 5 == 'd' ^ 240/4*2 != 'x') ? (+1 --+-6l /- 2*(2l+--(T || F))%- 10**2 + 1 ) * \"a\""; + Scope someScope = new Scope(111, 222, new Scope(new ArrayList<>(Arrays.asList("some{", "}elements{", "...", new Scope('c', TEST_5))))); Scope neastedScope1 = new Scope(), neastedScope2 = new Scope(); neastedScope2.put("tst4", TEST_4); neastedScope2.add(StringConverter.DirectCode("$num")); @@ -113,14 +120,12 @@ public Class applicableFor() someScope.put("test", neastedScope1); //------------------------------------------- Serializing ------------------------------------------- - - LogProvider.instance.setReThrowException(true); // This is for testing purposes, so no error are allowed in this case, comment temporary when necessary... - + JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); //This is necessary since 1.3.7 JussSerializer serializer = new JussSerializer(vars); //Creating an instance of Serializer that will serialize objects using Juss! Serializer is instance of scope so it behaves like so! - //Adding independent values Invokation of static members of this class (calling method "println" and obtaining "hello" field as argument! - serializer.addAll(TEST_3, r, list, ints, someScope, serializer.Comment("Size of array"), serializer.Var("arrSize", list.size()), new Bar(serializer.Code("$parent")), 1, 2.2, 3, 'A', true, false, null, serializer.Code("$num::new"), serializer.StaticMember(GeneralExample.class, "println", serializer.StaticMember(GeneralExample.class, "hello"))); + //Adding independent values Invokation of static members of this class (calling method "println" and obtaining "hello" field as argument! + serializer.addAll(TEST_3, r, list, ints, someScope, serializer.Comment("Size of array"), serializer.Var("arrSize", list.size()), new Bar(serializer.Code("$parent")), 1, 2.2, 3, 'A', true, false, null, serializer.Code("-$num::new"), serializer.Code(complexExpression), serializer.StaticMember(GeneralExample.class, "println", serializer.StaticMember(GeneralExample.class, "hello"))); //This will insert an comment Another way to add variable except put method $ is used to obtain value from variable, ::new will attempt to clone the value serializer.setGenerateComments(true); //Enabling comment generation @@ -138,9 +143,12 @@ public Class applicableFor() deserializer.setParsers(JussSerializer.JUSS_PARSERS_AND_OPERATORS); //Doing this will allow us to use operators from org.ugp.serialx.converters.operators while deserializing! deserializer.put("parent", TEST_1); //Setting global variables - deserializer.getParsers().resetCache(); //Enabling cache, this can improve performance when serializing a lot of data (not case of this example)! + deserializer = SerializationDebugger.debug(deserializer); //Enabling debugging for deserialization! Do this before applying caching! - deserializer = SerializationDebugger.debug(deserializer); //Enabling debugging for deserialization! + deserializer.getParsers().resetCache(); //Enabling cache, this can improve performance when serializing a lot of data (not the case of this example)! + for (DataParser opr : Operators.BINARY) //We have to pre-cache the operator parser to prevent parser cache from breaking precedence! + deserializer.getParsers().preCache(opr.getClass()); + deserializer.getParsers().preCache(SerializationDebugger.class); t0 = System.nanoTime(); deserializer.LoadFrom(f); //Loading content of file in to deserializer! @@ -152,24 +160,31 @@ public Class applicableFor() //Printing values and variables of scope! System.out.println(deserializer.variables()); System.out.println(deserializer.values()); - + //Performing test assertEquals(TEST_1, deserializer.getString("parent")); assertEquals(TEST_2, deserializer.getString("yourMom")); + assertEquals(deserializer.getString("yourMom").charAt(0), deserializer.getChar("yourMom")); assertEquals(list.size(), deserializer.getInt("arrSize")); assertEquals(TEST_4, deserializer.getScope(4).getScope("neastedTest").getDouble("tst4"), 0); assertEquals(deserializer.getScope(4).getScope(Utils.splitValues("test neastedTest", ' ')).getParent(2), deserializer.getScope(4)); assertEquals(((Scope) deserializer.getScope(4).getSubScope(0).>get(0).get(3)).getSubScope(0).toObject(List.class).size(), TEST_5.into(Collection.class).size()); assertTrue(deserializer.clone() instanceof JussSerializer); - assertTrue(deserializer.filter(obj -> obj.equals(true)).get(0)); + assertTrue(deserializer.filter(obj -> obj.equals(new Scope("true").getBool(0))).get(0)); assertEquals(TEST_3, deserializer.get(0)); assertEquals(list, deserializer.get(2)); assertEquals(new Bar(TEST_1), deserializer.get(5)); - assertArrayEquals(ints, Scope.from(deserializer.get(3)).toValArray()); + assertArrayEquals(ints, Scope.from(deserializer.get(3)).toArray()); + assertEquals(-TEST_4A, deserializer.getByte(-3)); + + assertTrue(deserializer.get("_boolTst1") && deserializer.cloneOf("_boolTst2") && deserializer.getBool("_boolTst4") && !deserializer.containsVariable("_boolTst3")); + assertEquals(Utils.multilpy(GenericScope.intoBidirectional(Scope.from(new Scope()) , null, Arrays.asList(97)).getChar(0), +1 +-6 / -2*(2+1)%- 100 + 1).toString(), deserializer.get(-2)); assertEquals(TEST_6, new Scope(deserializer).getString(-1)); + + // TODO Cover juss protocols } //We can invoke static members in JUSS! diff --git a/src/examples/implementations/test.juss b/src/examples/implementations/test.juss index e9c3d96..44fc407 100644 --- a/src/examples/implementations/test.juss +++ b/src/examples/implementations/test.juss @@ -1,15 +1,15 @@ -//Date created: 05-11-2024 at 23:32:02 CEST +//Date created: 07-12-2024 at 21:57:29 CEST //Scope serialization summary: //2 variables! -//17 values! +//18 values! num = 6; //Primitive data type: "6" the integer value! Stored by "num" variable! yourMom = "has an event horizon... //lol"; //Object of java.lang.String: "has an event horizon... //lol"! Stored by "yourMom" variable! "some string"; //Object of java.lang.String: "some string"! -java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@791f145a" serialized using examples.implementations.GeneralExample$1[java.util.Random]! +java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@52b1beb6" serialized using examples.implementations.GeneralExample$1[java.util.Random]! ArrayList 0 0 T 1 3 0 5 T 5 6 {java.util.LinkedList 0 0 T 1 3 0 5 T 5 6}; //Object of java.util.ArrayList: "[0, 0, true, 1, 3, 0, 5, true, 5, 6, [0, 0, true, 1, 3, 0, 5, true, 5, 6]]" serialized using org.ugp.serialx.protocols.ListProtocol[java.util.Collection]! -(1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@38cee291 converted by org.ugp.serialx.juss.converters.ArrayConverter +(1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@273e7444 converted by org.ugp.serialx.juss.converters.ArrayConverter { //Scope serialization summary: //1 variables! @@ -36,18 +36,18 @@ ArrayList 0 0 T 1 3 0 5 T 5 6 {java.util.LinkedList 0 0 T 1 3 0 5 T 5 6}; //Obje //Scope serialization summary: //1 values! - ArrayList "some" "elements" "..." { + ArrayList "some{" "}elements{" "..." { //Scope serialization summary: //2 values! '99'; //Primitive data type: "c" the character value! {} //Empty scope! - }; //Object of java.util.ArrayList: "[some, elements, ..., Scope[c, Scope[]]]" serialized using org.ugp.serialx.protocols.ListProtocol[java.util.Collection]! + }; //Object of java.util.ArrayList: "[some{, }elements{, ..., Scope[c, Scope[]]]" serialized using org.ugp.serialx.protocols.ListProtocol[java.util.Collection]! } }; //Size of array arrSize = 11; //Manually inserted code! -examples.Bar 8 1 456 5.0 1453.3646F '108' "a" F {java.util.concurrent.CopyOnWriteArrayList 6 9 13 java.util.HashMap {ArrayList 4 5 6.0 ArrayList "hi"}} -114Y 515S $parent; //Object of examples.Bar: "Bar[8 1 456 5.0 1453.3646 l a false [6, 9, 13, {}, [4, 5, 6.0, [], hi]] -114 515 ${$parent}]" serialized using examples.Bar$BarProtocol[examples.Bar]! +examples.Bar 8 1 456 5.0 1453.3646F '108' "a" F {java.util.concurrent.CopyOnWriteArrayList 6 9 13 java.util.HashMap {ArrayList 4 5 6.0 ArrayList {java.nio.file.AccessMode "READ"} "hi"}} -114Y 515S $parent; //Object of examples.Bar: "Bar[8 1 456 5.0 1453.3646 l a false [6, 9, 13, {}, [4, 5, 6.0, [], READ, hi]] -114 515 ${$parent}]" serialized using examples.Bar$BarProtocol[examples.Bar]! 1; //Primitive data type: "1" the integer value! 2.2; //Primitive data type: "2.2" the double value! 3; //Primitive data type: "3" the integer value! @@ -55,5 +55,6 @@ examples.Bar 8 1 456 5.0 1453.3646F '108' "a" F {java.util.concurrent.CopyOnWrit T; //Primitive data type: "true" the boolean value! F; //Primitive data type: "false" the boolean value! null; //Null, the nothing! -$num::new; //Manually inserted code! +-$num::new; //Manually inserted code! +$undef??0 ?12 : 11??{} ? ($_boolTst1 = 1 2 <= {1, 2, 3} - 2 - 3 + 5)&& ($_boolTst2: !!T instanceof java.lang.Boolean) && !!!5.0 > 5 && ($_boolTst3 = T) || ($_boolTst4= 'i'- 5 == 'd' ^ 240/4*2 != 'x') ? (+1 --+-6l /- 2*(2l+--(T || F))%- 10**2 + 1 ) * "a"; //Manually inserted code! {examples.implementations.GeneralExample::println examples.implementations.GeneralExample::hello}; //Manually inserted code! \ No newline at end of file diff --git a/src/tests/n/benchmarks/Testing.java b/src/tests/n/benchmarks/Testing.java index 74aadb3..574a267 100644 --- a/src/tests/n/benchmarks/Testing.java +++ b/src/tests/n/benchmarks/Testing.java @@ -20,7 +20,10 @@ public static void main(String[] args) throws Exception { String str = "srlxVer1 = srlxVer2 = $dependencies.something.dataStorage.serialx.version"; System.out.println(Arrays.asList(Utils.splitValues(str, VariableConverter.isVarAssignment(str), 0, 1, new char[0], '='))); + System.out.println(Utils.showPosInString("abc", 2)); + + System.out.println(1 +-6 / -2*(2+1)%- 100 + 1); // JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); // // File file = new File("src/examples/implementations/test.juss"); From aaefa3cfc17a4ba0fd9ca33d9967c2fc13054ebc Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Fri, 19 Jul 2024 22:24:08 +0200 Subject: [PATCH 17/31] improving coverage for Json and Juss protocols... --- src/examples/Message.java | 65 +++++- .../implementations/GeneralExample.java | 10 +- .../implementations/SerializingWithJson.java | 101 ++++++++-- .../implementations/SimpleQuerying.java | 2 +- src/examples/implementations/messages.json | 15 +- src/examples/implementations/test.juss | 6 +- src/tests/n/benchmarks/Benchmarks.java | 187 ++++++++++-------- 7 files changed, 259 insertions(+), 127 deletions(-) diff --git a/src/examples/Message.java b/src/examples/Message.java index cd5c2bf..0dca7ab 100644 --- a/src/examples/Message.java +++ b/src/examples/Message.java @@ -1,5 +1,10 @@ package examples; +import java.util.HashMap; +import java.util.List; +import java.util.Objects; +import java.util.Random; + import org.ugp.serialx.juss.protocols.SelfSerializable; /** @@ -17,25 +22,47 @@ public class Message implements SelfSerializable protected String str; protected long date; + protected List replies; + protected HashMap mappedReplies; + + protected transient Object rand = new Random(); + public Message(String str, int date) { - this.str = str; - this.date = date; + this(str, date, (List) null); + } + + public Message(String str, int date, List replies) + { + setStr(str); + setDate(date); + setReplies(replies); } @Override - public boolean equals(Object obj) { + public boolean equals(Object obj) + { if (this == obj) return true; if (obj == null || getClass() != obj.getClass()) return false; Message other = (Message) obj; - return date == other.date && str.equals(other.str); + return date == other.date && + Objects.equals(str, other.str) && + mappedReplies == null ? Objects.deepEquals(replies, other.replies) : + Objects.deepEquals(mappedReplies, other.mappedReplies); } @Override - public String toString() { - return "Message["+str+", "+date+"]"; + public String toString() + { + return "Message["+str+", "+date+", "+(mappedReplies == null ? replies : mappedReplies)+"]"; + } + + @Override + public Object[] serialize() + { + return new Object[] {str, date, replies}; } public String getStr() { @@ -54,9 +81,27 @@ public void setDate(long date) { this.date = date; } - @Override - public Object[] serialize() - { - return new Object[] {str, date}; + public List getReplies() { + return replies; + } + + public void setReplies(List replies) { + this.replies = replies; + } + + public HashMap getMappedReplies() { + return mappedReplies; + } + + public void setMappedReplies(HashMap mappedReplies) { + this.mappedReplies = mappedReplies; + } + + public Object getRand() { + return rand; + } + + public void setRand(Object rand) { + this.rand = rand; } } diff --git a/src/examples/implementations/GeneralExample.java b/src/examples/implementations/GeneralExample.java index 7d69c99..37c482a 100644 --- a/src/examples/implementations/GeneralExample.java +++ b/src/examples/implementations/GeneralExample.java @@ -48,7 +48,7 @@ public class GeneralExample public static final String TEST_3 = "some string"; public static final double TEST_4 = 5; - public static final int TEST_4A = 6; + public static final int TEST_4I = 6; public static final Scope TEST_5 = new Scope(); public static final String TEST_6 = "HELLO_WORLD"; @@ -107,7 +107,7 @@ public Class applicableFor() HashMap vars = new HashMap<>(); //Variables to serialize vars.put("yourMom", TEST_2); - vars.put("num", TEST_4A); + vars.put("num", TEST_4I); int[][] ints = {{1, 2, 3}, {4, 5, 4}, {3, 2, 1}}; @@ -169,7 +169,7 @@ public Class applicableFor() assertEquals(TEST_4, deserializer.getScope(4).getScope("neastedTest").getDouble("tst4"), 0); assertEquals(deserializer.getScope(4).getScope(Utils.splitValues("test neastedTest", ' ')).getParent(2), deserializer.getScope(4)); - assertEquals(((Scope) deserializer.getScope(4).getSubScope(0).>get(0).get(3)).getSubScope(0).toObject(List.class).size(), TEST_5.into(Collection.class).size()); + assertEquals(((Scope) deserializer.getScope(4).getSubScope(0).>get(0).get(3)).getSubScope(0).>toObject(List.class).size(), TEST_5.>into(Collection.class).size()); assertTrue(deserializer.clone() instanceof JussSerializer); assertTrue(deserializer.filter(obj -> obj.equals(new Scope("true").getBool(0))).get(0)); @@ -177,14 +177,12 @@ public Class applicableFor() assertEquals(list, deserializer.get(2)); assertEquals(new Bar(TEST_1), deserializer.get(5)); assertArrayEquals(ints, Scope.from(deserializer.get(3)).toArray()); - assertEquals(-TEST_4A, deserializer.getByte(-3)); + assertEquals(-TEST_4I, deserializer.getByte(-3)); assertTrue(deserializer.get("_boolTst1") && deserializer.cloneOf("_boolTst2") && deserializer.getBool("_boolTst4") && !deserializer.containsVariable("_boolTst3")); assertEquals(Utils.multilpy(GenericScope.intoBidirectional(Scope.from(new Scope()) , null, Arrays.asList(97)).getChar(0), +1 +-6 / -2*(2+1)%- 100 + 1).toString(), deserializer.get(-2)); assertEquals(TEST_6, new Scope(deserializer).getString(-1)); - - // TODO Cover juss protocols } //We can invoke static members in JUSS! diff --git a/src/examples/implementations/SerializingWithJson.java b/src/examples/implementations/SerializingWithJson.java index 4f38b0b..a419fb0 100644 --- a/src/examples/implementations/SerializingWithJson.java +++ b/src/examples/implementations/SerializingWithJson.java @@ -1,13 +1,22 @@ package examples.implementations; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.io.File; import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import java.util.Objects; +import org.junit.Test; +import org.ugp.serialx.LogProvider; import org.ugp.serialx.Scope; import org.ugp.serialx.Serializer; import org.ugp.serialx.json.JsonSerializer; import org.ugp.serialx.juss.protocols.AutoProtocol; +import org.ugp.serialx.juss.protocols.SelfSerializableProtocol; import org.ugp.serialx.protocols.SerializationProtocol; import examples.Message; @@ -19,30 +28,73 @@ * * @since 1.3.7 */ -public class SerializingWithJson { +public class SerializingWithJson +{ + public static final String[] NO_SCOPE = new String[] {"str", "date", "replies"}; + + @Test + public void test() throws Exception // SelfSerializable + { + SerializingWithJson.main(null); + } + + @Test + public void test1() throws Exception // AutoProtocol + { + SerializingWithJson.main(NO_SCOPE); + } + + @Test + public void test2() throws Exception // AutoProtocol + { + SerializingWithJson.main(new String[] {"str", "date"}); + } + + @Test + public void test3() throws Exception // AutoProtocol + { + SerializingWithJson.main(new String[] {"str", "date", "replies"}); + } + + @Test + public void test4() throws Exception // AutoProtocol + { + SerializingWithJson.main(new String[] {"str", "date", "mappedReplies"}); + } public static void main(String[] args) throws Exception { - /* - * Registering AutoProtocol for Message class and setting it to serialize it as Scope! - * - * Registering additional Serialization protocol is therefore not necessary, we are doing this only to enforce the Scope format. - */ - SerializationProtocol.REGISTRY.add(new AutoProtocol<>(Message.class, true)); - - /* - * Note that Message is also SelfSerializable which makes it eligible to be serialized with SelfSerializableProtocol as well! - * You can try this by uncommenting this line and commenting line above, notice how data format will change slightly due to different serialization technique that SelfSerializable uses! - */ -// SerializationProtocol.REGISTRY.add(new SelfSerializableProtocol(Message.class)); + LogProvider.instance.setReThrowException(true); // This is for testing purposes, so no error are allowed in this case, comment temporary when necessary... + + SerializationProtocol.REGISTRY.add( + SerializationProtocol.REGISTRY.removeIf(prot -> prot.applicableFor() == Message.class) ? // Change this accordingly while experimenting (add negation in front)... + + /* + * Registering AutoProtocol for Message class and setting it to serialize it as Scope, but feel free to experiment (except when args are NO_SCOPE in case you are running this as test)! + */ + new AutoProtocol<>(Message.class, args != NO_SCOPE /*true*/, args) : + + /* + * Note that Message is also SelfSerializable which makes it eligible to be serialized with SelfSerializableProtocol as well! + * You can try this by changing the condition above, notice how data format will change slightly due to different serialization technique that SelfSerializable uses! + */ + new SelfSerializableProtocol(Message.class) + ); File medium = new File("src/examples/implementations/messages.json"); // Json file to use... - // Content to serialzie (list of Messages) + // Content to serialize (list of Messages) List messages = new ArrayList<>(); messages.add(new Message("Hi!", 1)); messages.add(new Message("My name is Json.", 2)); messages.add(new Message("And I am data format!", 3)); + if (Objects.deepEquals(args, new String[] {"str", "date", "mappedReplies"})) + messages.get(2).setMappedReplies(Scope.mapKvArray(new HashMap<>(), "entry1", new Message("Hello to you as well from map!", 12))); + else + { + messages.get(0).setReplies(new ArrayList<>()); + messages.get(1).setReplies(new ArrayList<>(Arrays.asList(new Message("Hello to you as well!", 11)))); + } /* * Creating new JsonSerializer object and putting out Messages into it. @@ -50,13 +102,13 @@ public static void main(String[] args) throws Exception Serializer serializer = new JsonSerializer(null, messages); serializer.SerializeTo(medium); // Serializing to given file. - System.out.println("-------- Serialized sucessfully! --------"); + System.out.println("-------- Serialization complete! --------"); /* * Deserializing our Messages from given file. */ Serializer deserializer = JsonSerializer.from(medium); - + // Mapping deserialized Scopes, or "json objects" in this case, back into our original messages! List deserializedMessages = deserializer.map(jsonObj -> { try @@ -69,8 +121,21 @@ public static void main(String[] args) throws Exception } }); - System.out.println("-------- Deserialized sucessfully! --------"); + System.out.println("-------- Deserialization complete! --------"); + System.out.println(deserializedMessages + "\n"); + + /* Test if original content was successfully serialized as well as deserialized! */ + if (Objects.deepEquals(args, new String[] {"str", "date"})) + { + for (int i = 0; i < messages.size(); i++) + { + assertTrue(deserializedMessages.get(i).getDate() == messages.get(i).getDate()); + assertTrue(Objects.equals(deserializedMessages.get(i).getStr(), messages.get(i).getStr())); + } + + return; + } - System.out.println(messages.equals(deserializedMessages)); // True means that original content was successfully serialized as well as deserialized! + assertEquals(messages, deserializedMessages); } } diff --git a/src/examples/implementations/SimpleQuerying.java b/src/examples/implementations/SimpleQuerying.java index e32b4f7..53ddb68 100644 --- a/src/examples/implementations/SimpleQuerying.java +++ b/src/examples/implementations/SimpleQuerying.java @@ -136,7 +136,7 @@ public static void main(String[] args) throws Exception assertEquals(content.getScope("ppl").valuesCount(), ages.size()); assertEquals(filtered.getScope("serialx"), content.getScope("serialx")); - assertTrue(residents.toObject(List.class).size() > 0); //Should not be 0 + assertTrue(residents.>toObject(List.class).size() > 0); //Should not be 0 assertTrue(remappedValues.size() > 0); JsonSerializer test = new JsonSerializer(); diff --git a/src/examples/implementations/messages.json b/src/examples/implementations/messages.json index ba8aa7a..87f4f80 100644 --- a/src/examples/implementations/messages.json +++ b/src/examples/implementations/messages.json @@ -1,14 +1,23 @@ [ { "str" : "Hi!", - "date" : 1 + "date" : 1, + "mappedReplies" : null }, { "str" : "My name is Json.", - "date" : 2 + "date" : 2, + "mappedReplies" : null }, { "str" : "And I am data format!", - "date" : 3 + "date" : 3, + "mappedReplies" : { + "entry1" : { + "str" : "Hello to you as well from map!", + "date" : 12, + "mappedReplies" : null + } + } } ] \ No newline at end of file diff --git a/src/examples/implementations/test.juss b/src/examples/implementations/test.juss index 44fc407..71a28d0 100644 --- a/src/examples/implementations/test.juss +++ b/src/examples/implementations/test.juss @@ -1,4 +1,4 @@ -//Date created: 07-12-2024 at 21:57:29 CEST +//Date created: 07-18-2024 at 23:24:38 CEST //Scope serialization summary: //2 variables! @@ -7,9 +7,9 @@ num = 6; //Primitive data type: "6" the integer value! Stored by "num" variable! yourMom = "has an event horizon... //lol"; //Object of java.lang.String: "has an event horizon... //lol"! Stored by "yourMom" variable! "some string"; //Object of java.lang.String: "some string"! -java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@52b1beb6" serialized using examples.implementations.GeneralExample$1[java.util.Random]! +java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@18df8434" serialized using examples.implementations.GeneralExample$1[java.util.Random]! ArrayList 0 0 T 1 3 0 5 T 5 6 {java.util.LinkedList 0 0 T 1 3 0 5 T 5 6}; //Object of java.util.ArrayList: "[0, 0, true, 1, 3, 0, 5, true, 5, 6, [0, 0, true, 1, 3, 0, 5, true, 5, 6]]" serialized using org.ugp.serialx.protocols.ListProtocol[java.util.Collection]! -(1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@273e7444 converted by org.ugp.serialx.juss.converters.ArrayConverter +(1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@65c7a252 converted by org.ugp.serialx.juss.converters.ArrayConverter { //Scope serialization summary: //1 variables! diff --git a/src/tests/n/benchmarks/Benchmarks.java b/src/tests/n/benchmarks/Benchmarks.java index 92f83f5..0b81b36 100644 --- a/src/tests/n/benchmarks/Benchmarks.java +++ b/src/tests/n/benchmarks/Benchmarks.java @@ -1,9 +1,12 @@ package tests.n.benchmarks; import static org.openjdk.jmh.annotations.Scope.Benchmark; -import static org.ugp.serialx.Utils.fastReplace; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; import java.util.concurrent.TimeUnit; +import java.util.function.Function; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; @@ -11,27 +14,26 @@ import org.openjdk.jmh.annotations.Measurement; import org.openjdk.jmh.annotations.Mode; import org.openjdk.jmh.annotations.OutputTimeUnit; -import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Setup; import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Warmup; import org.openjdk.jmh.infra.Blackhole; +import org.openjdk.jmh.results.RunResult; +import org.openjdk.jmh.runner.Runner; import org.openjdk.jmh.runner.options.OptionsBuilder; import org.openjdk.jmh.runner.options.TimeValue; -import org.ugp.serialx.LogProvider; -import org.ugp.serialx.Utils; -import org.ugp.serialx.converters.BooleanConverter; -import org.ugp.serialx.converters.DataConverter; +import org.ugp.serialx.GenericScope; import org.ugp.serialx.converters.NumberConverter; @State(Benchmark) @OutputTimeUnit(TimeUnit.MICROSECONDS) @Warmup(iterations = 0) -@Measurement(iterations = 20) +@Measurement(iterations = 100) @BenchmarkMode( -// Mode.SingleShotTime - Mode.Throughput + Mode.SingleShotTime +// Mode.Throughput ) -@Fork(1) // 1 or 2 +@Fork(2) // 1 or 2 public class Benchmarks { // @Param({"0", "0b11l", "12345", "-14445", "1 1", "0xff", "0b11111111", "011", "15.222", "16.88e2", "1234_5678_91011"}) @@ -45,77 +47,81 @@ public class Benchmarks { // // @Param({"4", "16", "250", "500"}) // int count; +// +// @Param({"true", "f", "TRue", "FaLse", "tru0", "asdasdzxc", "falsr"}) +// String bvalue; - @Param({"true", "f", "TRue", "FaLse", "tru0", "asdasdzxc", "falsr"}) - String bvalue; - - DataConverter benchSubject = new NumberConverter(); - - DataConverter benchSubjectOld = new NumberConverter() { - public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args ) - { - if (arg.length() > 0) - { - char ch = arg.charAt(0); - if (ch == '+' || ch == '-' || ch == '.' || (ch >= '0' && ch <= '9')) - { - arg = normFormatNum(arg.toLowerCase()); - ch = arg.charAt(arg.length()-1); //ch = last char - - if (ch == '.') - return CONTINUE; - if (Utils.contains(arg, '.') || (!arg.startsWith("0x") && ch == 'f' || ch == 'd')) - { - if (ch == 'f') - return new Float(fastReplace(arg, "f", "")); - return new Double(fastReplace(arg, "d", "")); - } - - try - { - if (ch == 'l') - return new Long(Long.parseLong(fastReplace(fastReplace(fastReplace(arg, "l", ""), "0b", ""), "0x", ""), arg.startsWith("0b") ? 2 : arg.startsWith("0x") ? 16 : 10)); - if (ch == 's') - return new Short(Short.parseShort(fastReplace(fastReplace(fastReplace(arg, "s", ""), "0b", ""), "0x", ""), arg.startsWith("0b") ? 2 : arg.startsWith("0x") ? 16 : 10)); - if (ch == 'y') - return new Byte(Byte.parseByte(fastReplace(fastReplace(arg, "y", ""), "0b", ""), arg.startsWith("0b") ? 2 : 10)); - return new Integer(Integer.parseInt(fastReplace(fastReplace(arg, "0b", ""), "0x", ""), arg.startsWith("0b") ? 2 : arg.startsWith("0x") ? 16 : 10)); - } - catch (NumberFormatException e) - { - if (arg.matches("[0-9.]+")) - try - { - return new Long(Long.parseLong(fastReplace(fastReplace(fastReplace(arg, "l", ""), "0b", ""), "0x", ""), arg.startsWith("0b") ? 2 : arg.startsWith("0x") ? 16 : 10)); - } - catch (NumberFormatException e2) - { - LogProvider.instance.logErr("Number " + arg + " is too big for its datatype! Try to change its datatype to double (suffix D)!", e2); - return null; - } - } - } - } - return CONTINUE; - } - }; + GenericScope scope; - BooleanConverter boolConv = new BooleanConverter(); + static final Function trans = val -> ((Number)val).doubleValue()+5; - BooleanConverter boolConvOld = new BooleanConverter() { - public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args) { - if (arg.equalsIgnoreCase("T") || arg.equalsIgnoreCase("true")) - return new Boolean(true); - if (arg.equalsIgnoreCase("F") || arg.equalsIgnoreCase("false")) - return new Boolean(false); - return CONTINUE; - }; - }; +// DataConverter benchSubject = new NumberConverter(); +// +// DataConverter benchSubjectOld = new NumberConverter() { +// public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args ) +// { +// if (arg.length() > 0) +// { +// char ch = arg.charAt(0); +// if (ch == '+' || ch == '-' || ch == '.' || (ch >= '0' && ch <= '9')) +// { +// arg = normFormatNum(arg.toLowerCase()); +// ch = arg.charAt(arg.length()-1); //ch = last char +// +// if (ch == '.') +// return CONTINUE; +// if (Utils.contains(arg, '.') || (!arg.startsWith("0x") && ch == 'f' || ch == 'd')) +// { +// if (ch == 'f') +// return new Float(fastReplace(arg, "f", "")); +// return new Double(fastReplace(arg, "d", "")); +// } +// +// try +// { +// if (ch == 'l') +// return new Long(Long.parseLong(fastReplace(fastReplace(fastReplace(arg, "l", ""), "0b", ""), "0x", ""), arg.startsWith("0b") ? 2 : arg.startsWith("0x") ? 16 : 10)); +// if (ch == 's') +// return new Short(Short.parseShort(fastReplace(fastReplace(fastReplace(arg, "s", ""), "0b", ""), "0x", ""), arg.startsWith("0b") ? 2 : arg.startsWith("0x") ? 16 : 10)); +// if (ch == 'y') +// return new Byte(Byte.parseByte(fastReplace(fastReplace(arg, "y", ""), "0b", ""), arg.startsWith("0b") ? 2 : 10)); +// return new Integer(Integer.parseInt(fastReplace(fastReplace(arg, "0b", ""), "0x", ""), arg.startsWith("0b") ? 2 : arg.startsWith("0x") ? 16 : 10)); +// } +// catch (NumberFormatException e) +// { +// if (arg.matches("[0-9.]+")) +// try +// { +// return new Long(Long.parseLong(fastReplace(fastReplace(fastReplace(arg, "l", ""), "0b", ""), "0x", ""), arg.startsWith("0b") ? 2 : arg.startsWith("0x") ? 16 : 10)); +// } +// catch (NumberFormatException e2) +// { +// LogProvider.instance.logErr("Number " + arg + " is too big for its datatype! Try to change its datatype to double (suffix D)!", e2); +// return null; +// } +// } +// } +// } +// return CONTINUE; +// } +// }; +// +// BooleanConverter boolConv = new BooleanConverter(); +// +// BooleanConverter boolConvOld = new BooleanConverter() { +// public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args) { +// if (arg.equalsIgnoreCase("T") || arg.equalsIgnoreCase("true")) +// return new Boolean(true); +// if (arg.equalsIgnoreCase("F") || arg.equalsIgnoreCase("false")) +// return new Boolean(false); +// return CONTINUE; +// }; +// }; -// @Setup() -// public void setup() { -// -// } + @Setup() + public void setup() { + scope = new GenericScope(null, nums(1000_000)); + } // @Benchmark // public void bench(Blackhole hole) @@ -134,16 +140,17 @@ public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args) { @Benchmark public void bench(Blackhole hole) { - hole.consume(boolConv.parse(null, bvalue)); + hole.consume(scope.map(trans)); +// hole.consume(boolConv.parse(null, bvalue)); } - @Benchmark - public void benchOld(Blackhole hole) - { -// hole.consume(Integer.valueOf(value)); -// hole.consume(Double.valueOf(value)); - hole.consume(boolConvOld.parse(null, bvalue)); - } +// @Benchmark +// public void benchOld(Blackhole hole) +// { +//// hole.consume(Integer.valueOf(value)); +//// hole.consume(Double.valueOf(value)); +//// hole.consume(boolConvOld.parse(null, bvalue)); +// } public static void main(String[] args) throws Exception { OptionsBuilder ob = new OptionsBuilder(); @@ -160,7 +167,7 @@ public static void main(String[] args) throws Exception { // System.out.println(reg.parse("--5 --9")); // // ob.verbosity(VerboseMode.SILENT); -// Collection runResults = new Runner(ob).run(); + Collection runResults = new Runner(ob).run(); // Scope s = new Scope(); // s.add(new Scope("hi".equalsIgnoreCase(null), 123)); @@ -182,4 +189,12 @@ public static void main(String[] args) throws Exception { // System.out.println(new BooleanConverter().parse(null, bval)); // } } + + public static List nums(int size) + { + ArrayList nums = new ArrayList<>(); + for (int i = 0; i < size; i++) + nums.add(i); + return nums; + } } From a8068164114978b2eb20f3e92f98a8e40ecbbafc Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Sat, 20 Jul 2024 19:53:56 +0200 Subject: [PATCH 18/31] finishing.... --- .../implementations/SerializingWithJson.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/examples/implementations/SerializingWithJson.java b/src/examples/implementations/SerializingWithJson.java index a419fb0..9f23d63 100644 --- a/src/examples/implementations/SerializingWithJson.java +++ b/src/examples/implementations/SerializingWithJson.java @@ -16,6 +16,7 @@ import org.ugp.serialx.Serializer; import org.ugp.serialx.json.JsonSerializer; import org.ugp.serialx.juss.protocols.AutoProtocol; +import org.ugp.serialx.juss.protocols.SelfSerializable; import org.ugp.serialx.juss.protocols.SelfSerializableProtocol; import org.ugp.serialx.protocols.SerializationProtocol; @@ -72,13 +73,24 @@ public static void main(String[] args) throws Exception /* * Registering AutoProtocol for Message class and setting it to serialize it as Scope, but feel free to experiment (except when args are NO_SCOPE in case you are running this as test)! */ - new AutoProtocol<>(Message.class, args != NO_SCOPE /*true*/, args) : + new AutoProtocol(Message.class, args != NO_SCOPE /*true*/, args) + { + /* + * This is not really necessary to do but in this case we are doing it to achieve a bit better efficiency/performance... + */ + public Message createBlankInstance(Class objectClass) throws Exception + { + if (objectClass == Message.class) + return new Message(null, 0, null); // Faster + return super.createBlankInstance(objectClass); // Slower... + } + } : /* * Note that Message is also SelfSerializable which makes it eligible to be serialized with SelfSerializableProtocol as well! * You can try this by changing the condition above, notice how data format will change slightly due to different serialization technique that SelfSerializable uses! */ - new SelfSerializableProtocol(Message.class) + new SelfSerializableProtocol<>(Message.class) ); File medium = new File("src/examples/implementations/messages.json"); // Json file to use... From dbee887938de8442df5f1a7228fcae27aa8c9059 Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Sat, 20 Jul 2024 20:39:22 +0200 Subject: [PATCH 19/31] ... --- src/examples/implementations/SerializingWithJson.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/examples/implementations/SerializingWithJson.java b/src/examples/implementations/SerializingWithJson.java index 9f23d63..88939a5 100644 --- a/src/examples/implementations/SerializingWithJson.java +++ b/src/examples/implementations/SerializingWithJson.java @@ -16,7 +16,6 @@ import org.ugp.serialx.Serializer; import org.ugp.serialx.json.JsonSerializer; import org.ugp.serialx.juss.protocols.AutoProtocol; -import org.ugp.serialx.juss.protocols.SelfSerializable; import org.ugp.serialx.juss.protocols.SelfSerializableProtocol; import org.ugp.serialx.protocols.SerializationProtocol; From ed23bf5141bcd317bc9051a1d6f6dacf02e13820 Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Wed, 31 Jul 2024 21:32:14 +0200 Subject: [PATCH 20/31] ... --- src/examples/implementations/commentedExample.juss | 3 +-- src/examples/implementations/test.juss | 2 +- src/tests/n/benchmarks/Testing.java | 5 +++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/examples/implementations/commentedExample.juss b/src/examples/implementations/commentedExample.juss index a8f8d9e..8f3c333 100644 --- a/src/examples/implementations/commentedExample.juss +++ b/src/examples/implementations/commentedExample.juss @@ -20,8 +20,7 @@ dependencies = version = "2.3.4", something = { - dataStorage = - { + dataStorage { //This is "dataStorage" (stored by variable "dataStorage") sub-scope aka nested skope of its parent scope "something" which is subscope of "dependencies", xml = { diff --git a/src/examples/implementations/test.juss b/src/examples/implementations/test.juss index 71a28d0..b19f3e9 100644 --- a/src/examples/implementations/test.juss +++ b/src/examples/implementations/test.juss @@ -1,4 +1,4 @@ -//Date created: 07-18-2024 at 23:24:38 CEST +//Date created: 07-31-2024 at 21:29:01 CEST //Scope serialization summary: //2 variables! diff --git a/src/tests/n/benchmarks/Testing.java b/src/tests/n/benchmarks/Testing.java index 574a267..1c87c69 100644 --- a/src/tests/n/benchmarks/Testing.java +++ b/src/tests/n/benchmarks/Testing.java @@ -3,6 +3,7 @@ import java.util.Arrays; import org.ugp.serialx.Utils; +import org.ugp.serialx.juss.converters.OperationGroups; import org.ugp.serialx.juss.converters.VariableConverter; /** @@ -24,6 +25,10 @@ public static void main(String[] args) throws Exception { System.out.println(1 +-6 / -2*(2+1)%- 100 + 1); + + char mark = (char) new OperationGroups().hashCode(); + System.out.println(OperationGroups.isGroupMark(new StringBuilder().append(mark--).append(21).append(mark), ++mark)); + // JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); // // File file = new File("src/examples/implementations/test.juss"); From 80afd7f7489dbb2f9e372707602029797ca92dfe Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Wed, 31 Jul 2024 23:32:46 +0200 Subject: [PATCH 21/31] make it 1.3.8 --- src/examples/implementations/AdvancedParsersExample.java | 2 +- src/examples/implementations/GeneralExample.java | 2 +- src/examples/implementations/SerializingWithJson.java | 2 +- src/examples/implementations/SimpleQuerying.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/examples/implementations/AdvancedParsersExample.java b/src/examples/implementations/AdvancedParsersExample.java index a30b512..2836745 100644 --- a/src/examples/implementations/AdvancedParsersExample.java +++ b/src/examples/implementations/AdvancedParsersExample.java @@ -27,7 +27,7 @@ public class AdvancedParsersExample { public static void main(String[] args) throws Exception { - JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); //This is necessary since 1.3.7 + JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); //This is necessary since 1.3.8 //In this case JussSerializer acts as an interpreter for our custom scripting language. JussSerializer interpreter = new JussSerializer(); diff --git a/src/examples/implementations/GeneralExample.java b/src/examples/implementations/GeneralExample.java index 37c482a..c23756d 100644 --- a/src/examples/implementations/GeneralExample.java +++ b/src/examples/implementations/GeneralExample.java @@ -121,7 +121,7 @@ public Class applicableFor() //------------------------------------------- Serializing ------------------------------------------- - JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); //This is necessary since 1.3.7 + JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); //This is necessary since 1.3.8 JussSerializer serializer = new JussSerializer(vars); //Creating an instance of Serializer that will serialize objects using Juss! Serializer is instance of scope so it behaves like so! //Adding independent values Invokation of static members of this class (calling method "println" and obtaining "hello" field as argument! diff --git a/src/examples/implementations/SerializingWithJson.java b/src/examples/implementations/SerializingWithJson.java index 88939a5..b9e79f5 100644 --- a/src/examples/implementations/SerializingWithJson.java +++ b/src/examples/implementations/SerializingWithJson.java @@ -26,7 +26,7 @@ * * @author PETO * - * @since 1.3.7 + * @since 1.3.8 */ public class SerializingWithJson { diff --git a/src/examples/implementations/SimpleQuerying.java b/src/examples/implementations/SimpleQuerying.java index 53ddb68..6003718 100644 --- a/src/examples/implementations/SimpleQuerying.java +++ b/src/examples/implementations/SimpleQuerying.java @@ -46,7 +46,7 @@ public static void main(String[] args) throws Exception { LogProvider.instance.setReThrowException(true); // This is for testing purposes, so no error are allowed in this case, comment temporary when necessary... - JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); //This is necessary since 1.3.7 + JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); //This is necessary since 1.3.8 //Preparing to load complex juss file "commentedExample.juss"! From 7b282745b016b507e2c1d15077aa0f8dddec615e Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Mon, 12 Aug 2024 23:20:25 +0200 Subject: [PATCH 22/31] fixing some tests... --- src/examples/MemberInvokeOperator.java | 2 +- src/examples/TryParser.java | 2 +- .../implementations/AdvancedParsersExample.java | 10 ++++++++-- src/examples/implementations/GeneralExample.java | 2 +- .../implementations/ReadingJsonFromInternet.java | 2 +- src/examples/implementations/SimpleQuerying.java | 2 +- src/examples/implementations/commentedExample.juss | 3 ++- src/examples/implementations/simpleScript.juss | 6 +++--- src/examples/implementations/test.juss | 6 +++--- src/tests/n/benchmarks/Testing.java | 8 +++++--- 10 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/examples/MemberInvokeOperator.java b/src/examples/MemberInvokeOperator.java index a204e80..35788b9 100644 --- a/src/examples/MemberInvokeOperator.java +++ b/src/examples/MemberInvokeOperator.java @@ -25,7 +25,7 @@ public class MemberInvokeOperator implements DataParser public Object parse(ParserRegistry myHomeRegistry, String str, Object... args) { int index; - if ((index = indexOfNotInObj(str, "->", false)) > 0) + if ((index = indexOfNotInObj(str, 0, str.length(), -1, false, "->")) > 0) { Object obj = myHomeRegistry.parse(str.substring(0, index).trim(), args); String[] funcArgs = splitValues(str.substring(index+2).trim(), ' '); diff --git a/src/examples/TryParser.java b/src/examples/TryParser.java index 15beb08..64b94c7 100644 --- a/src/examples/TryParser.java +++ b/src/examples/TryParser.java @@ -23,7 +23,7 @@ public Object parse(ParserRegistry myHomeRegistry, String str, Object... args) { try { - return myHomeRegistry.parse(str.substring(3).trim(), false, new Class[] {getClass()}, args); + return myHomeRegistry.parse(str.substring(3).trim(), false, getClass(), args); } catch (Exception e) { diff --git a/src/examples/implementations/AdvancedParsersExample.java b/src/examples/implementations/AdvancedParsersExample.java index 2836745..1222a94 100644 --- a/src/examples/implementations/AdvancedParsersExample.java +++ b/src/examples/implementations/AdvancedParsersExample.java @@ -3,9 +3,12 @@ import java.io.File; import org.ugp.serialx.LogProvider; +import org.ugp.serialx.devtools.SerializationDebugger; import org.ugp.serialx.juss.JussSerializer; import org.ugp.serialx.juss.converters.ObjectConverter; import org.ugp.serialx.juss.converters.VariableConverter; +import org.ugp.serialx.juss.protocols.UniversalObjectInstantiationProtocol; +import org.ugp.serialx.protocols.SerializationProtocol; import examples.MemberInvokeOperator; import examples.TryParser; @@ -27,13 +30,16 @@ public class AdvancedParsersExample { public static void main(String[] args) throws Exception { - JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); //This is necessary since 1.3.8 + JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).getInvokableClasses().add(System.class); //This is necessary since 1.3.8 + SerializationProtocol.REGISTRY.add(new UniversalObjectInstantiationProtocol<>(Object.class)); //In this case JussSerializer acts as an interpreter for our custom scripting language. JussSerializer interpreter = new JussSerializer(); - interpreter.setParsers(JussSerializer.JUSS_PARSERS_AND_OPERATORS); //Allowing usage of operators in our script! + interpreter.setParsers(JussSerializer.JUSS_PARSERS_AND_OPERATORS.clone()); //Allowing usage of operators in our script! interpreter.getParsers().addAllAfter(VariableConverter.class, new TryParser(), new MemberInvokeOperator()); //Allowing method calls and try expressions in our script! + + interpreter = SerializationDebugger.debug(interpreter); LogProvider.instance.setReThrowException(true); //This allows us to implement custom exception handling! diff --git a/src/examples/implementations/GeneralExample.java b/src/examples/implementations/GeneralExample.java index c23756d..d3e671c 100644 --- a/src/examples/implementations/GeneralExample.java +++ b/src/examples/implementations/GeneralExample.java @@ -121,7 +121,7 @@ public Class applicableFor() //------------------------------------------- Serializing ------------------------------------------- - JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); //This is necessary since 1.3.8 + JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).getInvokableClasses().add(GeneralExample.class); //This is necessary since 1.3.8 JussSerializer serializer = new JussSerializer(vars); //Creating an instance of Serializer that will serialize objects using Juss! Serializer is instance of scope so it behaves like so! //Adding independent values Invokation of static members of this class (calling method "println" and obtaining "hello" field as argument! diff --git a/src/examples/implementations/ReadingJsonFromInternet.java b/src/examples/implementations/ReadingJsonFromInternet.java index 38282f1..3ddd2b6 100644 --- a/src/examples/implementations/ReadingJsonFromInternet.java +++ b/src/examples/implementations/ReadingJsonFromInternet.java @@ -28,7 +28,7 @@ public static void main(String[] args) throws IOException, Exception JsonSerializer reader = JsonSerializer.from("https://jsonplaceholder.typicode.com/users"); //Getting and deserializing data from remote web address! String user = "Glenna Reichert"; //User we want to get (Glenna Reichert)! - String glennasCompany = reader.getScopesWith("name", user).getScope(0).getString("name"); //Obtaining first scope that contains variable with users name and getting name of his company as string from it! + String glennasCompany = reader.getScopesWith("name", user).getScope(0).getScope("company").getString("name"); //Obtaining first scope that contains variable with users name and getting name of his company as string from it! System.out.println(user + " is working for " + glennasCompany); //Printing results! } } diff --git a/src/examples/implementations/SimpleQuerying.java b/src/examples/implementations/SimpleQuerying.java index 6003718..35d17f1 100644 --- a/src/examples/implementations/SimpleQuerying.java +++ b/src/examples/implementations/SimpleQuerying.java @@ -46,7 +46,7 @@ public static void main(String[] args) throws Exception { LogProvider.instance.setReThrowException(true); // This is for testing purposes, so no error are allowed in this case, comment temporary when necessary... - JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); //This is necessary since 1.3.8 + JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).getInvokableClasses().addAll(Arrays.asList(JsonSerializer.class, Integer.class)); //This is necessary since 1.3.8 //Preparing to load complex juss file "commentedExample.juss"! diff --git a/src/examples/implementations/commentedExample.juss b/src/examples/implementations/commentedExample.juss index 8f3c333..63c2245 100644 --- a/src/examples/implementations/commentedExample.juss +++ b/src/examples/implementations/commentedExample.juss @@ -122,8 +122,9 @@ devDependencies = //Setting variable of scope from outer world (possible since 1.3.2) devDependencies.something.ppl.ludvig = { + String::valueOf "_SCOPE"; age = Math::max {int::valueOf "50"} {Math::pow {Double::valueOf {String::valueOf Math::PI}} 3.55}; - residence = "russia"; + residence = String::valueOf "russia"; }; //Since 1.2.5 Serializer fully supports Json and JavaScript object! diff --git a/src/examples/implementations/simpleScript.juss b/src/examples/implementations/simpleScript.juss index 28c700d..230e1c1 100644 --- a/src/examples/implementations/simpleScript.juss +++ b/src/examples/implementations/simpleScript.juss @@ -1,4 +1,4 @@ -/* THIS EXAMPLE IS DEMONSTRATING CAPABILITIES OF SERIALX AS A DOMAIN SPECIFIC LANGUAGE TOOLKIT BY CREATING AN SIMPLE SCRIPT */ +/* THIS EXAMPLE IS DEMONSTRATING CAPABILITIES OF SERIALX AS A DOMAIN SPECIFIC LANGUAGE TOOLKIT BY CREATING A SIMPLE SCRIPT */ /* In this case, we are writing a simple script that will print "Hello world!" and then analyze your age category from the age given! */ System::out->println "Hello world!"; //Saying the famous "Hello world" in our custom script by calling java methods! @@ -15,7 +15,7 @@ result = try { //Convenient usage of JUSS scope as a code block... } //Printing adequate error message... -$result instanceof java.lang.RuntimeException ? (System::err->println "Age must be a number you dummy..."); +$result instanceof java.lang.RuntimeException ? System::err->println (Math::random > 0.5 ? "Age must be a number you dummy..." : "Age must be numeric, dum-dum..."); //Voidification of used variables that are not needed! This is not really a necessity but it nice to know about it... -//result = void; //Voidification will remove the variable from this scope releasing some memory! +result = void; //Voidification will remove the variable from this scope releasing some memory! diff --git a/src/examples/implementations/test.juss b/src/examples/implementations/test.juss index b19f3e9..0879421 100644 --- a/src/examples/implementations/test.juss +++ b/src/examples/implementations/test.juss @@ -1,4 +1,4 @@ -//Date created: 07-31-2024 at 21:29:01 CEST +//Date created: 08-12-2024 at 22:50:35 CEST //Scope serialization summary: //2 variables! @@ -7,9 +7,9 @@ num = 6; //Primitive data type: "6" the integer value! Stored by "num" variable! yourMom = "has an event horizon... //lol"; //Object of java.lang.String: "has an event horizon... //lol"! Stored by "yourMom" variable! "some string"; //Object of java.lang.String: "some string"! -java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@18df8434" serialized using examples.implementations.GeneralExample$1[java.util.Random]! +java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@6574a52c" serialized using examples.implementations.GeneralExample$1[java.util.Random]! ArrayList 0 0 T 1 3 0 5 T 5 6 {java.util.LinkedList 0 0 T 1 3 0 5 T 5 6}; //Object of java.util.ArrayList: "[0, 0, true, 1, 3, 0, 5, true, 5, 6, [0, 0, true, 1, 3, 0, 5, true, 5, 6]]" serialized using org.ugp.serialx.protocols.ListProtocol[java.util.Collection]! -(1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@65c7a252 converted by org.ugp.serialx.juss.converters.ArrayConverter +(1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@6c1a5b54 converted by org.ugp.serialx.juss.converters.ArrayConverter { //Scope serialization summary: //1 variables! diff --git a/src/tests/n/benchmarks/Testing.java b/src/tests/n/benchmarks/Testing.java index 1c87c69..b08ac86 100644 --- a/src/tests/n/benchmarks/Testing.java +++ b/src/tests/n/benchmarks/Testing.java @@ -14,20 +14,22 @@ public class Testing { public static void main(String[] args) throws Exception { System.out.println(Arrays.asList(Utils.splitValues("123=123 == 55 =2=", "123=123 == 55 =2=".indexOf('='), 0, 1, new char[0], '='))); - System.out.println(Arrays.asList(Utils.splitValues("==123=123 == 55 = 4", 0, 0, 1, new char[0], '='))); + System.out.println(Arrays.asList(Utils.splitValues("==123=123 == \"55\" = 4", 0, 0, 1, new char[0], '='))); System.out.println(Arrays.asList(Utils.splitValues("=9", 0, 0, 0, new char[0], '='))); System.out.println(Arrays.asList(Utils.splitValues("===98==9", 0, 0, 1, new char[0], '='))); System.out.println(Arrays.asList(Utils.splitValues("10 98", 0, 0, 2, new char[0], ' '))); String str = "srlxVer1 = srlxVer2 = $dependencies.something.dataStorage.serialx.version"; System.out.println(Arrays.asList(Utils.splitValues(str, VariableConverter.isVarAssignment(str), 0, 1, new char[0], '='))); - System.out.println(Utils.showPosInString("abc", 2)); - + System.out.println(Utils.showPosInString("abc", 1)); System.out.println(1 +-6 / -2*(2+1)%- 100 + 1); char mark = (char) new OperationGroups().hashCode(); System.out.println(OperationGroups.isGroupMark(new StringBuilder().append(mark--).append(21).append(mark), ++mark)); + + str = "jjiij {ha -> asd } \"hchaha\"\" a->b\" aaa bbb ha"; + System.err.println(Utils.showPosInString(str, Utils.indexOfNotInObj(str, 0, str.length(), -1, true, "->"))); // JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); // From b5f6620ac5caa2721b713eba5f7e120a4979ed04 Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Wed, 14 Aug 2024 00:56:24 +0200 Subject: [PATCH 23/31] ...1.3.8 --- pom.xml | 6 +++--- .../implementations/AdvancedParsersExample.java | 1 - src/examples/implementations/simpleScript.juss | 2 +- src/examples/implementations/test.juss | 6 +++--- src/tests/n/benchmarks/Benchmarks.java | 13 ++++++++----- src/tests/n/benchmarks/Testing.java | 2 +- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 06ad8ed..485ed8d 100644 --- a/pom.xml +++ b/pom.xml @@ -13,17 +13,17 @@ org.ugp.serialx json - 1.3.7 + 1.3.8 org.ugp.serialx devtools - 1.3.7 + 1.3.8 org.ugp.serialx operators - 1.3.7 + 1.3.8 diff --git a/src/examples/implementations/AdvancedParsersExample.java b/src/examples/implementations/AdvancedParsersExample.java index 1222a94..6564bf4 100644 --- a/src/examples/implementations/AdvancedParsersExample.java +++ b/src/examples/implementations/AdvancedParsersExample.java @@ -47,6 +47,5 @@ public static void main(String[] args) throws Exception //Printing the results of our script... System.out.println(interpreter); //This is not necessary in this case! - } } diff --git a/src/examples/implementations/simpleScript.juss b/src/examples/implementations/simpleScript.juss index 230e1c1..cf8cd1d 100644 --- a/src/examples/implementations/simpleScript.juss +++ b/src/examples/implementations/simpleScript.juss @@ -15,7 +15,7 @@ result = try { //Convenient usage of JUSS scope as a code block... } //Printing adequate error message... -$result instanceof java.lang.RuntimeException ? System::err->println (Math::random > 0.5 ? "Age must be a number you dummy..." : "Age must be numeric, dum-dum..."); +$result instanceof java.lang.RuntimeException ? (System::err->println (Math::random > 0.5 ? "Age must be a number you dummy..." : "Age must be numeric, dum-dum...")); //Voidification of used variables that are not needed! This is not really a necessity but it nice to know about it... result = void; //Voidification will remove the variable from this scope releasing some memory! diff --git a/src/examples/implementations/test.juss b/src/examples/implementations/test.juss index 0879421..cc7eec0 100644 --- a/src/examples/implementations/test.juss +++ b/src/examples/implementations/test.juss @@ -1,4 +1,4 @@ -//Date created: 08-12-2024 at 22:50:35 CEST +//Date created: 08-14-2024 at 00:50:12 CEST //Scope serialization summary: //2 variables! @@ -7,9 +7,9 @@ num = 6; //Primitive data type: "6" the integer value! Stored by "num" variable! yourMom = "has an event horizon... //lol"; //Object of java.lang.String: "has an event horizon... //lol"! Stored by "yourMom" variable! "some string"; //Object of java.lang.String: "some string"! -java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@6574a52c" serialized using examples.implementations.GeneralExample$1[java.util.Random]! +java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@46cdf8bd" serialized using examples.implementations.GeneralExample$1[java.util.Random]! ArrayList 0 0 T 1 3 0 5 T 5 6 {java.util.LinkedList 0 0 T 1 3 0 5 T 5 6}; //Object of java.util.ArrayList: "[0, 0, true, 1, 3, 0, 5, true, 5, 6, [0, 0, true, 1, 3, 0, 5, true, 5, 6]]" serialized using org.ugp.serialx.protocols.ListProtocol[java.util.Collection]! -(1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@6c1a5b54 converted by org.ugp.serialx.juss.converters.ArrayConverter +(1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@f0c8a99 converted by org.ugp.serialx.juss.converters.ArrayConverter { //Scope serialization summary: //1 variables! diff --git a/src/tests/n/benchmarks/Benchmarks.java b/src/tests/n/benchmarks/Benchmarks.java index 0b81b36..e07f7cd 100644 --- a/src/tests/n/benchmarks/Benchmarks.java +++ b/src/tests/n/benchmarks/Benchmarks.java @@ -14,7 +14,7 @@ import org.openjdk.jmh.annotations.Measurement; import org.openjdk.jmh.annotations.Mode; import org.openjdk.jmh.annotations.OutputTimeUnit; -import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Warmup; import org.openjdk.jmh.infra.Blackhole; @@ -51,6 +51,9 @@ public class Benchmarks { // @Param({"true", "f", "TRue", "FaLse", "tru0", "asdasdzxc", "falsr"}) // String bvalue; + @Param({"adsadas {adsa {asdasd adasdsa asdas} adasdsdas } adsad adas", "{a{b{c}}aaaaaa}"}) + String objs; + GenericScope scope; static final Function trans = val -> ((Number)val).doubleValue()+5; @@ -118,10 +121,10 @@ public class Benchmarks { // }; // }; - @Setup() - public void setup() { - scope = new GenericScope(null, nums(1000_000)); - } +// @Setup() +// public void setup() { +// scope = new GenericScope(null, nums(1000_000)); +// } // @Benchmark // public void bench(Blackhole hole) diff --git a/src/tests/n/benchmarks/Testing.java b/src/tests/n/benchmarks/Testing.java index b08ac86..5904f21 100644 --- a/src/tests/n/benchmarks/Testing.java +++ b/src/tests/n/benchmarks/Testing.java @@ -28,7 +28,7 @@ public static void main(String[] args) throws Exception { char mark = (char) new OperationGroups().hashCode(); System.out.println(OperationGroups.isGroupMark(new StringBuilder().append(mark--).append(21).append(mark), ++mark)); - str = "jjiij {ha -> asd } \"hchaha\"\" a->b\" aaa bbb ha"; + str = "jjiij {ha -> asd } \"hchaha\" a->b\" aaa bbb ha {}"; System.err.println(Utils.showPosInString(str, Utils.indexOfNotInObj(str, 0, str.length(), -1, true, "->"))); // JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); From b97d2a468ca3cf6f2d05df52293128ebc1fbce9c Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Wed, 14 Aug 2024 20:01:32 +0200 Subject: [PATCH 24/31] ... --- src/examples/implementations/test.juss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/examples/implementations/test.juss b/src/examples/implementations/test.juss index cc7eec0..265c113 100644 --- a/src/examples/implementations/test.juss +++ b/src/examples/implementations/test.juss @@ -1,4 +1,4 @@ -//Date created: 08-14-2024 at 00:50:12 CEST +//Date created: 08-14-2024 at 11:36:06 CEST //Scope serialization summary: //2 variables! @@ -7,9 +7,9 @@ num = 6; //Primitive data type: "6" the integer value! Stored by "num" variable! yourMom = "has an event horizon... //lol"; //Object of java.lang.String: "has an event horizon... //lol"! Stored by "yourMom" variable! "some string"; //Object of java.lang.String: "some string"! -java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@46cdf8bd" serialized using examples.implementations.GeneralExample$1[java.util.Random]! +java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@6477463f" serialized using examples.implementations.GeneralExample$1[java.util.Random]! ArrayList 0 0 T 1 3 0 5 T 5 6 {java.util.LinkedList 0 0 T 1 3 0 5 T 5 6}; //Object of java.util.ArrayList: "[0, 0, true, 1, 3, 0, 5, true, 5, 6, [0, 0, true, 1, 3, 0, 5, true, 5, 6]]" serialized using org.ugp.serialx.protocols.ListProtocol[java.util.Collection]! -(1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@f0c8a99 converted by org.ugp.serialx.juss.converters.ArrayConverter +(1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@3d71d552 converted by org.ugp.serialx.juss.converters.ArrayConverter { //Scope serialization summary: //1 variables! From fef3214ba9957e60870608e8f9be1b9c33631d7d Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Fri, 16 Aug 2024 22:28:57 +0200 Subject: [PATCH 25/31] ... --- pom.xml | 2 ++ src/examples/implementations/test.juss | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 485ed8d..ede5b99 100644 --- a/pom.xml +++ b/pom.xml @@ -46,6 +46,8 @@ src + src + src diff --git a/src/examples/implementations/test.juss b/src/examples/implementations/test.juss index 265c113..29b2c97 100644 --- a/src/examples/implementations/test.juss +++ b/src/examples/implementations/test.juss @@ -1,4 +1,4 @@ -//Date created: 08-14-2024 at 11:36:06 CEST +//Date created: 08-16-2024 at 13:02:23 CEST //Scope serialization summary: //2 variables! @@ -7,9 +7,9 @@ num = 6; //Primitive data type: "6" the integer value! Stored by "num" variable! yourMom = "has an event horizon... //lol"; //Object of java.lang.String: "has an event horizon... //lol"! Stored by "yourMom" variable! "some string"; //Object of java.lang.String: "some string"! -java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@6477463f" serialized using examples.implementations.GeneralExample$1[java.util.Random]! +java.util.Random 68284896517770L; //Object of java.util.Random: "java.util.Random@46cdf8bd" serialized using examples.implementations.GeneralExample$1[java.util.Random]! ArrayList 0 0 T 1 3 0 5 T 5 6 {java.util.LinkedList 0 0 T 1 3 0 5 T 5 6}; //Object of java.util.ArrayList: "[0, 0, true, 1, 3, 0, 5, true, 5, 6, [0, 0, true, 1, 3, 0, 5, true, 5, 6]]" serialized using org.ugp.serialx.protocols.ListProtocol[java.util.Collection]! -(1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@3d71d552 converted by org.ugp.serialx.juss.converters.ArrayConverter +(1 2 3) (4 5 4) (3 2 1); //Primitive array [[I@f0c8a99 converted by org.ugp.serialx.juss.converters.ArrayConverter { //Scope serialization summary: //1 variables! From 98b3afd8ae0a96cdc45aadfd4c2e67d3ceed2bc1 Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Thu, 22 Aug 2024 21:46:32 +0200 Subject: [PATCH 26/31] std bench --- .gitignore | 1 + pom.xml | 4 +- src/examples/implementations/test.juss | 2 +- src/tests/n/benchmarks/Benchmarks.java | 17 +- src/tests/n/benchmarks/StandardBenchmark.java | 330 +++++++++++++----- 5 files changed, 260 insertions(+), 94 deletions(-) diff --git a/.gitignore b/.gitignore index 0cc8a41..8e0f6b8 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ UserInterfaceState.xcuserstate $RECYCLE.BIN/ *.log +_bench.juss log.txt npm-debug.log* diff --git a/pom.xml b/pom.xml index ede5b99..c1141bf 100644 --- a/pom.xml +++ b/pom.xml @@ -35,12 +35,12 @@ org.openjdk.jmh jmh-core - 1.36 + 1.37 org.openjdk.jmh jmh-generator-annprocess - 1.36 + 1.37 diff --git a/src/examples/implementations/test.juss b/src/examples/implementations/test.juss index 29b2c97..aedc580 100644 --- a/src/examples/implementations/test.juss +++ b/src/examples/implementations/test.juss @@ -1,4 +1,4 @@ -//Date created: 08-16-2024 at 13:02:23 CEST +//Date created: 08-20-2024 at 22:25:34 CEST //Scope serialization summary: //2 variables! diff --git a/src/tests/n/benchmarks/Benchmarks.java b/src/tests/n/benchmarks/Benchmarks.java index e07f7cd..4fb0089 100644 --- a/src/tests/n/benchmarks/Benchmarks.java +++ b/src/tests/n/benchmarks/Benchmarks.java @@ -51,8 +51,8 @@ public class Benchmarks { // @Param({"true", "f", "TRue", "FaLse", "tru0", "asdasdzxc", "falsr"}) // String bvalue; - @Param({"adsadas {adsa {asdasd adasdsa asdas} adasdsdas } adsad adas", "{a{b{c}}aaaaaa}"}) - String objs; +// @Param({"adsadas {adsa {asdasd adasdsa asdas} adasdsdas } adsad adas", "{a{b{c}}aaaaaa}"}) +// String objs; GenericScope scope; @@ -140,12 +140,12 @@ public class Benchmarks { // hole.consume(benchSubjectOld.parse(null, nvalue)); // } - @Benchmark - public void bench(Blackhole hole) - { - hole.consume(scope.map(trans)); -// hole.consume(boolConv.parse(null, bvalue)); - } +// @Benchmark +// public void bench(Blackhole hole) +// { +// hole.consume(scope.map(trans)); +//// hole.consume(boolConv.parse(null, bvalue)); +// } // @Benchmark // public void benchOld(Blackhole hole) @@ -158,6 +158,7 @@ public void bench(Blackhole hole) public static void main(String[] args) throws Exception { OptionsBuilder ob = new OptionsBuilder(); ob.measurementTime(TimeValue.milliseconds(100)); + ob.include(Benchmarks.class.getSimpleName()); // ParserRegistry reg = Operators.install(new ParserRegistry(new OperationGroups(), new VariableConverter(), new StringConverter(), new ObjectConverter(), new ArrayConverter(), new NumberConverter(), new BooleanConverter(), new CharacterConverter(), new NullConverter(), new SerializableBase64Converter())); // diff --git a/src/tests/n/benchmarks/StandardBenchmark.java b/src/tests/n/benchmarks/StandardBenchmark.java index a95a563..6bee7bc 100644 --- a/src/tests/n/benchmarks/StandardBenchmark.java +++ b/src/tests/n/benchmarks/StandardBenchmark.java @@ -1,121 +1,285 @@ package tests.n.benchmarks; +import java.io.BufferedReader; import java.io.File; -import java.lang.reflect.Field; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.Reader; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Random; -import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.TimeUnit; -import org.ugp.serialx.Scope; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.infra.Blackhole; +import org.openjdk.jmh.runner.Runner; +import org.openjdk.jmh.runner.options.OptionsBuilder; +import org.ugp.serialx.Serializer; import org.ugp.serialx.juss.JussSerializer; -import org.ugp.serialx.protocols.SerializationProtocol; - -import examples.Bar; -import examples.Foo; /** - * This example is overview of general SerialX API functionalities! - * We will look at how to serialize and deserialize objects using file. We will also create protocols for our objects as well as for already existing ones! - * This example is also for benchmarking! + * StandardBenchmark for SerialX * - * @author PETO + * @since 1.3.8 * - * @since 1.0.0 + * @author PETO */ +@OutputTimeUnit(TimeUnit.MILLISECONDS) +@Warmup(iterations = 0) +@Measurement(iterations = 1) +@BenchmarkMode( + Mode.SingleShotTime +// Mode.Throughput +) +@Fork(3) // 3 or 4 public class StandardBenchmark { - public static void main(String[] args) throws Exception + static final int seed = 123; // DO NOT CHANGE + + public static abstract class FileDataState { - //Protocol registration - SerializationProtocol.REGISTRY.addAll(new Bar.BarProtocol(), new Foo.FooProtocol(), new SerializationProtocol() //Sample custom protocol to serialized Random. - { //Random will be serialized also without protocol via classic Java Base64 because it implements java.io.Serializable! - @Override - public Object[] serialize(Random object) - { - try - { - Field f = Random.class.getDeclaredField("seed"); - f.setAccessible(true); - return new Object[] {((AtomicLong) f.get(object)).get()}; - } - catch (Exception e) + final File file; + final List data; + + public FileDataState(File file, int count) // DO NOT CHANGE + { + this.file = file; + + data = new ArrayList<>(); + Random rand = new Random(seed); + for (int i = 1; i <= count; i++) + switch (rand.nextInt(4)) { - e.printStackTrace(); - return new Object[] {-1}; + case 0: + data.add(rand.nextBoolean()); break; + case 1: + data.add(0.25 + rand.nextInt(i)); break; + case 2: + data.add(rand.nextInt(i)); break; + case 3: + data.add("bench" + i); break; } - } - - @Override - public Random unserialize(Class objectClass, Object... args) - { - return new Random(((Number) args[0]).longValue()); - } - @Override - public Class applicableFor() - { - return Random.class; + try { + if (file.createNewFile()) + new JussSerializer(null, data).SerializeTo(file); + + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); } - }); + +// long i = 4000000000l; +// while (i-- > 1); +// System.out.println(i); + } - File f = new File("test.juss"); //File to write and read from! + public abstract Serializer newSerializer(Map vars, List data); + } + + @State(Scope.Benchmark) + public static class LargeFileData extends FileDataState + { + public LargeFileData() + { + super(new File("src/tests/n/benchmarks/large_bench.juss"), 8000000); + } - //Sample objects - Random r = new Random(); - List list = new ArrayList<>(); - for (int i = 1; i <= 8000000; i++) - list.add( r.nextInt(i)); + @Override + public Serializer newSerializer(Map vars, List data) + { + JussSerializer srl = new JussSerializer(vars, data); + srl.getParsers().resetCache(); + return srl; + } + } - HashMap vars = new HashMap<>(); //Variables to serialize - vars.put("yourMom", "is heavier than sun..."); - vars.put("num", 6); - - int[][] ints = {{1, 2, 3}, {4, 5, 4}, {3, 2, 1}}; + @State(Scope.Benchmark) + public static class MediumFileData extends FileDataState + { + public MediumFileData() + { + super(new File("src/tests/n/benchmarks/medium_bench.juss"), 4000000); + } - //-------------------------------------------Serializing------------------------------------------- + @Override + public Serializer newSerializer(Map vars, List data) + { + JussSerializer srl = new JussSerializer(vars, data); + srl.getParsers().resetCache(); + return srl; + } + } + + @Benchmark + public void fileLarge_write(LargeFileData data, Blackhole hole) throws IOException + { + JussSerializer serializer = (JussSerializer) data.newSerializer(null, data.data); +// serializer.setGenerateComments(true); - JussSerializer serializer = new JussSerializer(vars); //Creating an instance of Serializer that will serialize objects using Juss! Serializer is instance of scope so it behaves like so! - //Adding independent values Invokation of static members of this class (calling method "println" and obtaining "hello" field as argument! - serializer.addAll(list /*serializer.Comment("Size of array"), serializer.Var("arrSize", list.size()), new Bar(), 1, 2.2, 3, 'A', true, false, null, ints, serializer.Code("$num"), new Scope(), serializer.StaticMember(Main.class, "println", serializer.StaticMember(Main.class, "hello"))*/); - //This will insert an comment Another way to add variable except Map $ is used to obtain value from variable -// serializer.setGenerateComments(true); //Enabling comment generation + serializer.SerializeTo(data.file); -// serializer.getParsers().resetCache(); - - double t0 = System.nanoTime(); -// serializer.SerializeTo(f); //Saving content of serializer to file (serializing) - double t = System.nanoTime(); - System.out.println("Write: " + (t-t0)/1000000 + " ms"); //Write benchmark + hole.consume(serializer); + } + + @Benchmark + public void fileLarge_read(LargeFileData data, Blackhole hole) throws FileNotFoundException + { + JussSerializer deserializer = (JussSerializer) data.newSerializer(null, null); - //-------------------------------------------Deserializing------------------------------------------- + hole.consume(deserializer.LoadFrom(data.file)); + } + + @Benchmark + public void fileMedium_write(MediumFileData data, Blackhole hole) throws IOException + { + JussSerializer serializer = (JussSerializer) data.newSerializer(null, data.data); +// serializer.setGenerateComments(true); - SerializationProtocol.REGISTRY.setActivityForAll(true); //Enabling all protocols, just in case... + serializer.SerializeTo(data.file); - JussSerializer deserializer = new JussSerializer(); //Creating instance of Serializer that will deserialize objects serialized in Juss (same class is responsible for serializing and deserializing)! - deserializer.setParsers(JussSerializer.JUSS_PARSERS_AND_OPERATORS); - deserializer.put("parent", "father"); //Setting global variables + hole.consume(serializer); + } -// deserializer.getParsers().resetCache(); + @Benchmark + public void fileMedium_read(MediumFileData data, Blackhole hole) throws FileNotFoundException + { + JussSerializer deserializer = (JussSerializer) data.newSerializer(null, null); - t0 = System.nanoTime(); - deserializer.LoadFrom(f); //Loading content of file in to deserializer! - t = System.nanoTime(); - System.out.println("Read: " + (t-t0)/1000000 + " ms"); //Read benchmark + hole.consume(deserializer.LoadFrom(data.file)); + } + +// @Benchmark +// public void readAndFormat(LargeFileData data, Blackhole hole) throws FileNotFoundException +// { +// hole.consume(new JussSerializer().readAndFormat(new FileReader(data.file), false)); +// } + + /* IO */ + +// @Benchmark +// public StringBuilder file_readChars(LargeFileData data) throws IOException +// { +// try (Reader reader = new FileReader(data.file)) +// { +// return readChars(reader); +// } +// } +// +// @Benchmark +// public StringBuilder file_readLinesAndChars(LargeFileData data) throws IOException { +// try (Reader reader = new FileReader(data.file)) +// { +// return readLinesAndChars(reader); +// } +// } +// +// +// @Benchmark +// public StringBuilder file_readCharsArrayed(LargeFileData data) throws IOException { +// try (Reader reader = new FileReader(data.file)) +// { +// return readCharsArrayed(reader); +// } +// } + +////StringBuilder sb = new StringBuilder(); +////char[] arr = new char[256*4]; +////try (Reader reader = new FileReader(fileLarge)) { +//// for (; reader.read(arr) != -1; ) { +//// sb.append(arr); +//// } +////} +////strLarge = sb.toString(); - //deserializer = (JussSerializer) deserializer.filter(obj -> obj != null); //This will filter away every null value and variable! +// @Benchmark +// public int str_readChars(Blackhole hole) throws IOException +// { +// try (Reader reader = new StringReader(strLarge)) +// { +// return readChars(reader); +// } +// } +// +// @Benchmark +// public int str_readLinesAndChars() throws IOException, InterruptedException { +// try (Reader reader = new StringReader(strLarge)) +// { +// return readLinesAndChars(reader); +// } +// } +// +// +// @Benchmark +// public int str_readCharsArrayed() throws IOException, InterruptedException { +// try (Reader reader = new StringReader(strLarge)) +// { +// return readCharsArrayed(reader); +// } +// } + + public static StringBuilder readChars(Reader r) throws IOException + { + StringBuilder sb = new StringBuilder(); + for (int ch; (ch = r.read()) != -1; ) { + if (ch > 31) + sb.append((char) ch); + } + + return sb; + } + + public static StringBuilder readLinesAndChars(Reader r) throws IOException + { + StringBuilder sb = new StringBuilder(); + BufferedReader reader = new BufferedReader(r); - //Printing values and variables of scope! - System.out.println(deserializer.variables()); - System.out.println(deserializer.values()); - } + for (String line; (line = reader.readLine()) != null; ) { + for (int i = 0, len = line.length(); i < len; i++) + { + char ch = line.charAt(i); + if (ch > 31) + sb.append(ch); + } + } + + reader.close(); + return sb; + } - //We can invoke static members in JUSS! - public static String hello = "Hello world!"; + public static StringBuilder readCharsArrayed(Reader r) throws IOException + { + StringBuilder sb = new StringBuilder(); + char[] arr = new char[256]; + + for (int charsRead; (charsRead = r.read(arr)) != -1; ) { + for (int i = 0; i < charsRead; i++) { + if (arr[i] > 31) + sb.append(arr[i]); + } + } + + return sb; + } - public static void println(String str) + public static void main(String[] args) throws Exception { - System.out.println(str); +// org.openjdk.jmh.Main.main(args); + + OptionsBuilder ob = new OptionsBuilder(); + ob.include(StandardBenchmark.class.getSimpleName()); + + new Runner(ob).run(); + + System.out.println("Cached - 1.3.8"); } } \ No newline at end of file From 0d5ee9a3a5a1c86c8d64026445019d3901f57f5e Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Thu, 22 Aug 2024 21:55:23 +0200 Subject: [PATCH 27/31] ... --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8e0f6b8..c70fb91 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,7 @@ UserInterfaceState.xcuserstate $RECYCLE.BIN/ *.log -_bench.juss +*_bench.juss log.txt npm-debug.log* From 0efbf8bd1a21f9aa80e527902e9077db98abac5f Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Sat, 24 Aug 2024 11:07:56 +0200 Subject: [PATCH 28/31] ... --- src/tests/n/benchmarks/StandardBenchmark.java | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/src/tests/n/benchmarks/StandardBenchmark.java b/src/tests/n/benchmarks/StandardBenchmark.java index 6bee7bc..c509c97 100644 --- a/src/tests/n/benchmarks/StandardBenchmark.java +++ b/src/tests/n/benchmarks/StandardBenchmark.java @@ -27,20 +27,22 @@ import org.ugp.serialx.juss.JussSerializer; /** - * StandardBenchmark for SerialX + * StandardBenchmark for SerialX, single shot no warmup... + * + * @version 1.0.0 * * @since 1.3.8 * * @author PETO */ @OutputTimeUnit(TimeUnit.MILLISECONDS) -@Warmup(iterations = 0) -@Measurement(iterations = 1) +@Warmup(iterations = 0) // 2 +@Measurement(iterations = 1) // 1 @BenchmarkMode( Mode.SingleShotTime // Mode.Throughput ) -@Fork(3) // 3 or 4 +@Fork(3) // 1 public class StandardBenchmark { static final int seed = 123; // DO NOT CHANGE @@ -54,27 +56,28 @@ public FileDataState(File file, int count) // DO NOT CHANGE { this.file = file; - data = new ArrayList<>(); + data = new ArrayList<>(count); Random rand = new Random(seed); - for (int i = 1; i <= count; i++) - switch (rand.nextInt(4)) + for (int i = 1, rng = rand.nextInt(count/2)+2, bool = rng % 2; i <= count; i++) + switch (i % 4) { case 0: - data.add(rand.nextBoolean()); break; + data.add(++bool % 2 == 0 || bool % 11 == 0); break; case 1: - data.add(0.25 + rand.nextInt(i)); break; + data.add(0.25 + rng + i); break; case 2: - data.add(rand.nextInt(i)); break; + data.add(rng + i); break; case 3: data.add("bench" + i); break; } - try { + try + { if (file.createNewFile()) new JussSerializer(null, data).SerializeTo(file); - - } catch (IOException e) { - // TODO Auto-generated catch block + } + catch (IOException e) + { e.printStackTrace(); } @@ -277,6 +280,7 @@ public static void main(String[] args) throws Exception OptionsBuilder ob = new OptionsBuilder(); ob.include(StandardBenchmark.class.getSimpleName()); +// ob.addProfiler(StackProfiler.class); new Runner(ob).run(); From 4cb293f49095ddd201d898fa6aee5a93c4d9bc1b Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Sun, 25 Aug 2024 22:08:59 +0200 Subject: [PATCH 29/31] std bench 1.1.0, supports JFR --- .gitignore | 2 + src/tests/n/benchmarks/StandardBenchmark.java | 158 ++++++++---------- 2 files changed, 68 insertions(+), 92 deletions(-) diff --git a/.gitignore b/.gitignore index c70fb91..9114065 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,8 @@ $RECYCLE.BIN/ *.log *_bench.juss +jfr_out/ +.jfr log.txt npm-debug.log* diff --git a/src/tests/n/benchmarks/StandardBenchmark.java b/src/tests/n/benchmarks/StandardBenchmark.java index c509c97..d787c18 100644 --- a/src/tests/n/benchmarks/StandardBenchmark.java +++ b/src/tests/n/benchmarks/StandardBenchmark.java @@ -5,8 +5,8 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.Reader; -import java.util.ArrayList; -import java.util.List; +import java.util.Arrays; +import java.util.Collection; import java.util.Map; import java.util.Random; import java.util.concurrent.TimeUnit; @@ -17,9 +17,12 @@ import org.openjdk.jmh.annotations.Measurement; import org.openjdk.jmh.annotations.Mode; import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.infra.BenchmarkParams; import org.openjdk.jmh.infra.Blackhole; import org.openjdk.jmh.runner.Runner; import org.openjdk.jmh.runner.options.OptionsBuilder; @@ -29,136 +32,101 @@ /** * StandardBenchmark for SerialX, single shot no warmup... * - * @version 1.0.0 + * @version 1.1.0 * * @since 1.3.8 * * @author PETO */ +@State(Scope.Benchmark) @OutputTimeUnit(TimeUnit.MILLISECONDS) @Warmup(iterations = 0) // 2 @Measurement(iterations = 1) // 1 @BenchmarkMode( Mode.SingleShotTime -// Mode.Throughput ) @Fork(3) // 1 public class StandardBenchmark { static final int seed = 123; // DO NOT CHANGE - public static abstract class FileDataState + public static class DataState { - final File file; - final List data; + protected final M medium; + protected final Collection data; - public FileDataState(File file, int count) // DO NOT CHANGE + public DataState(M medium, int count) // DO NOT CHANGE { - this.file = file; + this.medium = medium; - data = new ArrayList<>(count); - Random rand = new Random(seed); - for (int i = 1, rng = rand.nextInt(count/2)+2, bool = rng % 2; i <= count; i++) - switch (i % 4) - { - case 0: - data.add(++bool % 2 == 0 || bool % 11 == 0); break; - case 1: - data.add(0.25 + rng + i); break; - case 2: - data.add(rng + i); break; - case 3: - data.add("bench" + i); break; - } - - try - { - if (file.createNewFile()) - new JussSerializer(null, data).SerializeTo(file); - } - catch (IOException e) + if (count > 0) { - e.printStackTrace(); + Object[] dataArr = new Object[count]; + Random rand = new Random(seed); + for (int i = 0, rng = rand.nextInt(count/2)+2, bool = rng % 2; i < count; i++) + switch (i % 4) + { + case 0: + dataArr[i] = (++bool % 2 == 0 || bool % 11 == 0); break; + case 1: + dataArr[i] = (0.25 + rng + i); break; + case 2: + dataArr[i] = (rng + i); break; + case 3: + dataArr[i] = ("bench" + i); break; + } + data = Arrays.asList(dataArr); } + else + data = null; -// long i = 4000000000l; + setupMedium(); + +// double t0 = System.nanoTime(); +// long i = 4500000000l; // while (i-- > 1); -// System.out.println(i); +// double t = System.nanoTime(); +// System.out.println(i + " | " + (t-t0)/1000000); } - public abstract Serializer newSerializer(Map vars, List data); + public void setupMedium() {} } - @State(Scope.Benchmark) - public static class LargeFileData extends FileDataState - { - public LargeFileData() - { - super(new File("src/tests/n/benchmarks/large_bench.juss"), 8000000); - } - - @Override - public Serializer newSerializer(Map vars, List data) - { - JussSerializer srl = new JussSerializer(vars, data); - srl.getParsers().resetCache(); - return srl; - } - } - - @State(Scope.Benchmark) - public static class MediumFileData extends FileDataState + public Serializer newSerializer(Map vars, Collection data) { - public MediumFileData() - { - super(new File("src/tests/n/benchmarks/medium_bench.juss"), 4000000); - } - - @Override - public Serializer newSerializer(Map vars, List data) - { - JussSerializer srl = new JussSerializer(vars, data); - srl.getParsers().resetCache(); - return srl; - } + JussSerializer srl = new JussSerializer(vars, data); + srl.getParsers().resetCache(); // Cached + return srl; } - @Benchmark - public void fileLarge_write(LargeFileData data, Blackhole hole) throws IOException - { - JussSerializer serializer = (JussSerializer) data.newSerializer(null, data.data); -// serializer.setGenerateComments(true); - - serializer.SerializeTo(data.file); - - hole.consume(serializer); - } + @Param({"8000000", "4000000"}) + protected int dataCount; - @Benchmark - public void fileLarge_read(LargeFileData data, Blackhole hole) throws FileNotFoundException + protected DataState state; + + @Setup + public void setupState(BenchmarkParams params) { - JussSerializer deserializer = (JussSerializer) data.newSerializer(null, null); - - hole.consume(deserializer.LoadFrom(data.file)); + state = new DataState(new File("src/tests/n/benchmarks/_" + dataCount + "_bench.juss"), params.getBenchmark().endsWith("write") ? dataCount : 0); } @Benchmark - public void fileMedium_write(MediumFileData data, Blackhole hole) throws IOException + public void _0_write(Blackhole hole) throws IOException { - JussSerializer serializer = (JussSerializer) data.newSerializer(null, data.data); + JussSerializer serializer = (JussSerializer) newSerializer(null, state.data); // serializer.setGenerateComments(true); - serializer.SerializeTo(data.file); + serializer.SerializeTo((File) state.medium); hole.consume(serializer); } - + @Benchmark - public void fileMedium_read(MediumFileData data, Blackhole hole) throws FileNotFoundException + public Object _1_read() throws FileNotFoundException { - JussSerializer deserializer = (JussSerializer) data.newSerializer(null, null); + JussSerializer deserializer = (JussSerializer) newSerializer(null, null); - hole.consume(deserializer.LoadFrom(data.file)); + return deserializer.LoadFrom((File) state.medium); } // @Benchmark @@ -170,7 +138,7 @@ public void fileMedium_read(MediumFileData data, Blackhole hole) throws FileNotF /* IO */ // @Benchmark -// public StringBuilder file_readChars(LargeFileData data) throws IOException +// public StringBuilder readChars(LargeFileData data) throws IOException // { // try (Reader reader = new FileReader(data.file)) // { @@ -179,7 +147,7 @@ public void fileMedium_read(MediumFileData data, Blackhole hole) throws FileNotF // } // // @Benchmark -// public StringBuilder file_readLinesAndChars(LargeFileData data) throws IOException { +// public StringBuilder readLinesAndChars(LargeFileData data) throws IOException { // try (Reader reader = new FileReader(data.file)) // { // return readLinesAndChars(reader); @@ -188,7 +156,7 @@ public void fileMedium_read(MediumFileData data, Blackhole hole) throws FileNotF // // // @Benchmark -// public StringBuilder file_readCharsArrayed(LargeFileData data) throws IOException { +// public StringBuilder readCharsArrayed(LargeFileData data) throws IOException { // try (Reader reader = new FileReader(data.file)) // { // return readCharsArrayed(reader); @@ -277,10 +245,16 @@ public static StringBuilder readCharsArrayed(Reader r) throws IOException public static void main(String[] args) throws Exception { // org.openjdk.jmh.Main.main(args); - + OptionsBuilder ob = new OptionsBuilder(); ob.include(StandardBenchmark.class.getSimpleName()); -// ob.addProfiler(StackProfiler.class); +// ob.jvm(System.getProperty("user.home") + "\\.sdkman\\candidates\\java\\17.0.12-graal\\bin\\java.exe"); + +// ob.addProfiler(org.openjdk.jmh.profile.StackProfiler.class); +// ob.addProfiler(org.openjdk.jmh.profile.JavaFlightRecorderProfiler.class, "dir=./jfr_out"); + +// ob.result("src/tests/n/benchmarks/bench.scsv"); +// ob.resultFormat(ResultFormatType.SCSV); new Runner(ob).run(); From 5eb0c8e3057adbe89d73536a968d996813830c59 Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Fri, 6 Sep 2024 19:44:55 +0200 Subject: [PATCH 30/31] ... --- .gitignore | 1 + pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9114065..f1c5818 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,7 @@ tmp/ .classpath .settings .project +.factorypath target/ diff --git a/pom.xml b/pom.xml index c1141bf..8904d0f 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ SerualX-test Used for testing - + org.ugp.serialx json @@ -46,7 +46,7 @@ src - src + From 57a0c16464de580cf3fbe58f8a343cf2366df740 Mon Sep 17 00:00:00 2001 From: Programmer001 Date: Sun, 8 Sep 2024 23:06:04 +0200 Subject: [PATCH 31/31] ... --- pom.xml | 6 +- src/examples/implementations/test.juss | 2 +- src/tests/n/benchmarks/Benchmarks.java | 136 +++++++++++++------------ src/tests/n/benchmarks/Testing.java | 9 ++ 4 files changed, 83 insertions(+), 70 deletions(-) diff --git a/pom.xml b/pom.xml index 8904d0f..c9fd16a 100644 --- a/pom.xml +++ b/pom.xml @@ -12,17 +12,17 @@ org.ugp.serialx - json + serialx-json 1.3.8 org.ugp.serialx - devtools + serialx-devtools 1.3.8 org.ugp.serialx - operators + serialx-operators 1.3.8 diff --git a/src/examples/implementations/test.juss b/src/examples/implementations/test.juss index aedc580..3b9515b 100644 --- a/src/examples/implementations/test.juss +++ b/src/examples/implementations/test.juss @@ -1,4 +1,4 @@ -//Date created: 08-20-2024 at 22:25:34 CEST +//Date created: 09-08-2024 at 23:04:27 CEST //Scope serialization summary: //2 variables! diff --git a/src/tests/n/benchmarks/Benchmarks.java b/src/tests/n/benchmarks/Benchmarks.java index 4fb0089..7265e5b 100644 --- a/src/tests/n/benchmarks/Benchmarks.java +++ b/src/tests/n/benchmarks/Benchmarks.java @@ -1,6 +1,7 @@ package tests.n.benchmarks; import static org.openjdk.jmh.annotations.Scope.Benchmark; +import static org.ugp.serialx.Utils.fastReplace; import java.util.ArrayList; import java.util.Collection; @@ -23,6 +24,9 @@ import org.openjdk.jmh.runner.options.OptionsBuilder; import org.openjdk.jmh.runner.options.TimeValue; import org.ugp.serialx.GenericScope; +import org.ugp.serialx.LogProvider; +import org.ugp.serialx.Utils; +import org.ugp.serialx.converters.DataConverter; import org.ugp.serialx.converters.NumberConverter; @State(Benchmark) @@ -33,11 +37,11 @@ Mode.SingleShotTime // Mode.Throughput ) -@Fork(2) // 1 or 2 +@Fork(1) // 1 or 2 public class Benchmarks { -// @Param({"0", "0b11l", "12345", "-14445", "1 1", "0xff", "0b11111111", "011", "15.222", "16.88e2", "1234_5678_91011"}) -// String nvalue; + @Param({"0", "0b11l", "12345", "-14445", "1 1", "0xff", "0b11111111", "011", "15.222", "16.88e2", "1234_5678_91011"}) + String nvalue; // @Param({"java.util.ArrayList 5 5 5", "java.util.concurrent.TimeUnit 1 2 3", "5hjdhjsakhdjsakhdjsahdjhdjak {} 59", "{hjdhjsakhdjsakhdjsahdjhdjak T T T"}) // String str; @@ -58,56 +62,56 @@ public class Benchmarks { static final Function trans = val -> ((Number)val).doubleValue()+5; -// DataConverter benchSubject = new NumberConverter(); -// -// DataConverter benchSubjectOld = new NumberConverter() { -// public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args ) -// { -// if (arg.length() > 0) -// { -// char ch = arg.charAt(0); -// if (ch == '+' || ch == '-' || ch == '.' || (ch >= '0' && ch <= '9')) -// { -// arg = normFormatNum(arg.toLowerCase()); -// ch = arg.charAt(arg.length()-1); //ch = last char -// -// if (ch == '.') -// return CONTINUE; -// if (Utils.contains(arg, '.') || (!arg.startsWith("0x") && ch == 'f' || ch == 'd')) -// { -// if (ch == 'f') -// return new Float(fastReplace(arg, "f", "")); -// return new Double(fastReplace(arg, "d", "")); -// } -// -// try -// { -// if (ch == 'l') -// return new Long(Long.parseLong(fastReplace(fastReplace(fastReplace(arg, "l", ""), "0b", ""), "0x", ""), arg.startsWith("0b") ? 2 : arg.startsWith("0x") ? 16 : 10)); -// if (ch == 's') -// return new Short(Short.parseShort(fastReplace(fastReplace(fastReplace(arg, "s", ""), "0b", ""), "0x", ""), arg.startsWith("0b") ? 2 : arg.startsWith("0x") ? 16 : 10)); -// if (ch == 'y') -// return new Byte(Byte.parseByte(fastReplace(fastReplace(arg, "y", ""), "0b", ""), arg.startsWith("0b") ? 2 : 10)); -// return new Integer(Integer.parseInt(fastReplace(fastReplace(arg, "0b", ""), "0x", ""), arg.startsWith("0b") ? 2 : arg.startsWith("0x") ? 16 : 10)); -// } -// catch (NumberFormatException e) -// { -// if (arg.matches("[0-9.]+")) -// try -// { -// return new Long(Long.parseLong(fastReplace(fastReplace(fastReplace(arg, "l", ""), "0b", ""), "0x", ""), arg.startsWith("0b") ? 2 : arg.startsWith("0x") ? 16 : 10)); -// } -// catch (NumberFormatException e2) -// { -// LogProvider.instance.logErr("Number " + arg + " is too big for its datatype! Try to change its datatype to double (suffix D)!", e2); -// return null; -// } -// } -// } -// } -// return CONTINUE; -// } -// }; + DataConverter benchSubject = new NumberConverter(); + + DataConverter benchSubjectOld = new NumberConverter() { + public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args ) + { + if (arg.length() > 0) + { + char ch = arg.charAt(0); + if (ch == '+' || ch == '-' || ch == '.' || (ch >= '0' && ch <= '9')) + { + arg = normFormatNum(arg.toLowerCase()); + ch = arg.charAt(arg.length()-1); //ch = last char + + if (ch == '.') + return CONTINUE; + if (Utils.contains(arg, '.') || (!arg.startsWith("0x") && ch == 'f' || ch == 'd')) + { + if (ch == 'f') + return new Float(fastReplace(arg, "f", "")); + return new Double(fastReplace(arg, "d", "")); + } + + try + { + if (ch == 'l') + return new Long(Long.parseLong(fastReplace(fastReplace(fastReplace(arg, "l", ""), "0b", ""), "0x", ""), arg.startsWith("0b") ? 2 : arg.startsWith("0x") ? 16 : 10)); + if (ch == 's') + return new Short(Short.parseShort(fastReplace(fastReplace(fastReplace(arg, "s", ""), "0b", ""), "0x", ""), arg.startsWith("0b") ? 2 : arg.startsWith("0x") ? 16 : 10)); + if (ch == 'y') + return new Byte(Byte.parseByte(fastReplace(fastReplace(arg, "y", ""), "0b", ""), arg.startsWith("0b") ? 2 : 10)); + return new Integer(Integer.parseInt(fastReplace(fastReplace(arg, "0b", ""), "0x", ""), arg.startsWith("0b") ? 2 : arg.startsWith("0x") ? 16 : 10)); + } + catch (NumberFormatException e) + { + if (arg.matches("[0-9.]+")) + try + { + return new Long(Long.parseLong(fastReplace(fastReplace(fastReplace(arg, "l", ""), "0b", ""), "0x", ""), arg.startsWith("0b") ? 2 : arg.startsWith("0x") ? 16 : 10)); + } + catch (NumberFormatException e2) + { + LogProvider.instance.logErr("Number " + arg + " is too big for its datatype! Try to change its datatype to double (suffix D)!", e2); + return null; + } + } + } + } + return CONTINUE; + } + }; // // BooleanConverter boolConv = new BooleanConverter(); // @@ -126,19 +130,19 @@ public class Benchmarks { // scope = new GenericScope(null, nums(1000_000)); // } -// @Benchmark -// public void bench(Blackhole hole) -// { -// hole.consume(benchSubject.parse(null, nvalue)); -// } -// -// @Benchmark -// public void benchOld(Blackhole hole) -// { -//// hole.consume(Integer.valueOf(value)); -//// hole.consume(Double.valueOf(value)); -// hole.consume(benchSubjectOld.parse(null, nvalue)); -// } + @Benchmark + public void bench(Blackhole hole) + { + hole.consume(benchSubject.parse(null, nvalue)); + } + + @Benchmark + public void benchOld(Blackhole hole) + { +// hole.consume(Integer.valueOf(value)); +// hole.consume(Double.valueOf(value)); + hole.consume(benchSubjectOld.parse(null, nvalue)); + } // @Benchmark // public void bench(Blackhole hole) diff --git a/src/tests/n/benchmarks/Testing.java b/src/tests/n/benchmarks/Testing.java index 5904f21..2b8d531 100644 --- a/src/tests/n/benchmarks/Testing.java +++ b/src/tests/n/benchmarks/Testing.java @@ -1,11 +1,18 @@ package tests.n.benchmarks; +import java.io.File; +import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; +import org.ugp.serialx.GenericScope; import org.ugp.serialx.Utils; +import org.ugp.serialx.json.JsonSerializer; import org.ugp.serialx.juss.converters.OperationGroups; import org.ugp.serialx.juss.converters.VariableConverter; +import examples.implementations.GeneralExample; + /** * Testing random algorithms... */ @@ -31,6 +38,8 @@ public static void main(String[] args) throws Exception { str = "jjiij {ha -> asd } \"hchaha\" a->b\" aaa bbb ha {}"; System.err.println(Utils.showPosInString(str, Utils.indexOfNotInObj(str, 0, str.length(), -1, true, "->"))); +// new JsonSerializer(new Object[] {1,2,3}, new HashMap<>(), GenericScope.mapKvArray(new HashMap<>(), "hi", 123), null, new ArrayList<>()).SerializeTo(new File("src/tests/n/benchmarks/test.json")); + // JussSerializer.JUSS_PARSERS.get(ObjectConverter.class).setAllowStaticMemberInvocation(true); // // File file = new File("src/examples/implementations/test.juss");