Prevent lamba instantiation.

Author: MarcGuiot

pom.xml

@@ -131,7 +131,7 @@
         <dependency>
             <groupId>org.globsframework</groupId>
             <artifactId>globs</artifactId>
-            <version>4.2.0</version>
+            <version>4.7.0</version>
         </dependency>
 
 <!--        <dependency>-->

src/main/java/org/globsframework/serialisation/BinReaderFactory.java

@@ -1,8 +1,8 @@
 package org.globsframework.serialisation;
 
+import org.globsframework.core.model.GlobInstantiator;
 import org.globsframework.core.utils.serialization.SerializedInput;
 import org.globsframework.serialisation.glob.GlobBinReader;
-import org.globsframework.serialisation.glob.GlobInstantiator;
 import org.globsframework.serialisation.glob.type.factory.DefaultGlobTypeFieldReadersFactory;
 import org.globsframework.serialisation.glob.type.manager.DefaultGlobTypeFieldReadersManager;
 
@@ -19,15 +19,15 @@ public static BinReaderFactory create() {
         return new BinReaderFactory();
     }
 
-    public BinReader createGlobBinReader(InputStream  inputStream) {
+    public BinReader createGlobBinReader(InputStream inputStream) {
         return new GlobBinReader(globTypeFieldReadersManager, inputStream);
     }
 
     public BinReader createGlobBinReader(SerializedInput serializedInput) {
         return new GlobBinReader(globTypeFieldReadersManager, serializedInput);
     }
 
-    public BinReader createGlobBinReader(GlobInstantiator globInstantiator,  SerializedInput serializedInput) {
+    public BinReader createGlobBinReader(GlobInstantiator globInstantiator, SerializedInput serializedInput) {
         return new GlobBinReader(globInstantiator, globTypeFieldReadersManager, serializedInput);
     }
 }

src/main/java/org/globsframework/serialisation/glob/GlobBinReader.java

@@ -2,6 +2,7 @@
 
 import org.globsframework.core.metamodel.GlobType;
 import org.globsframework.core.model.Glob;
+import org.globsframework.core.model.GlobInstantiator;
 import org.globsframework.core.utils.serialization.SerializedInput;
 import org.globsframework.serialisation.BinReader;
 import org.globsframework.serialisation.glob.type.manager.GlobTypeFieldReadersManager;
@@ -13,7 +14,7 @@
 public class GlobBinReader implements BinReader {
     private final CodedInputStream codedInputStream;
 
-    public GlobBinReader(GlobTypeFieldReadersManager globTypeFieldReadersManager, InputStream  inputStream) {
+    public GlobBinReader(GlobTypeFieldReadersManager globTypeFieldReadersManager, InputStream inputStream) {
         codedInputStream = CodedInputStream.newInstance(globTypeFieldReadersManager, inputStream);
     }
 
@@ -31,7 +32,7 @@ public Optional<Glob> read(GlobType type) {
 
     public Glob[] readArray(GlobType type) {
         int size = codedInputStream.readInt();
-        Glob[] elements = new  Glob[size];
+        Glob[] elements = new Glob[size];
         for (int i = 0; i < size; i++) {
             elements[i] = codedInputStream.readGlob(type);
         }

src/main/java/org/globsframework/serialisation/glob/GlobInstantiator.java

@@ -1,30 +1,21 @@
 package org.globsframework.serialisation.glob.type.manager;
 
 import org.globsframework.core.metamodel.GlobType;
-import org.globsframework.core.metamodel.fields.Field;
-import org.globsframework.serialisation.field.FieldReader;
-import org.globsframework.serialisation.field.reader.FieldReaderVisitorCreator;
-import org.globsframework.serialisation.field.reader.UnknownFieldReader;
 import org.globsframework.serialisation.glob.type.GlobTypeFieldReaders;
 import org.globsframework.serialisation.glob.type.factory.GlobTypeFieldReadersFactory;
-import org.globsframework.serialisation.model.FieldNumber;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class DefaultGlobTypeFieldReadersManager implements GlobTypeFieldReadersManager {
-    private final Map<String, GlobTypeFieldReaders> readersMap = new ConcurrentHashMap<>();
+    private final Map<GlobType, GlobTypeFieldReaders> readersMap = new ConcurrentHashMap<>();
     private final GlobTypeFieldReadersFactory globTypeFieldReadersFactory;
 
     public DefaultGlobTypeFieldReadersManager(GlobTypeFieldReadersFactory globTypeFieldReadersFactory) {
         this.globTypeFieldReadersFactory = globTypeFieldReadersFactory;
     }
 
     public GlobTypeFieldReaders getOrCreate(GlobType globType) {
-        return readersMap.computeIfAbsent(globType.getName(), s -> globTypeFieldReadersFactory.create(globType));
+        return readersMap.computeIfAbsent(globType, globTypeFieldReadersFactory::create);
     }
-
 }

src/main/java/org/globsframework/serialisation/glob/type/manager/DefaultGlobTypeFieldReadersManager.java

@@ -8,11 +8,10 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 public class DefaultGlobTypeFieldWritersManager implements GlobTypeFieldWritersManager {
-    private final Map<String, GlobTypeFieldWriters> writersMap = new ConcurrentHashMap<>();
+    private final Map<GlobType, GlobTypeFieldWriters> writersMap = new ConcurrentHashMap<>();
     private final DefaultGlobTypeFieldWritersFactory factory = new DefaultGlobTypeFieldWritersFactory();
 
     public GlobTypeFieldWriters getOrCreate(GlobType globType) {
-        return writersMap.computeIfAbsent(globType.getName(), s -> factory.create(globType));
+        return writersMap.computeIfAbsent(globType, factory::create);
     }
-
 }

src/main/java/org/globsframework/serialisation/glob/type/manager/DefaultGlobTypeFieldWritersManager.java

@@ -2,11 +2,11 @@
 
 import org.globsframework.core.metamodel.GlobType;
 import org.globsframework.core.model.Glob;
+import org.globsframework.core.model.GlobInstantiator;
 import org.globsframework.core.model.MutableGlob;
 import org.globsframework.core.utils.serialization.SerializedInput;
 import org.globsframework.core.utils.serialization.SerializedInputOutputFactory;
 import org.globsframework.serialisation.WireConstants;
-import org.globsframework.serialisation.glob.GlobInstantiator;
 import org.globsframework.serialisation.glob.type.GlobTypeFieldReaders;
 import org.globsframework.serialisation.glob.type.manager.GlobTypeFieldReadersManager;
 

src/main/java/org/globsframework/serialisation/stream/CodedInputStream.java

@@ -8,6 +8,8 @@
 import org.globsframework.core.metamodel.impl.DefaultGlobTypeBuilder;
 import org.globsframework.core.model.Glob;
 import org.globsframework.core.utils.ReusableByteArrayOutputStream;
+import org.globsframework.core.utils.serialization.ByteOutputInBytes;
+import org.globsframework.core.utils.serialization.DefaultSerializationOutput;
 import org.globsframework.serialisation.model.FieldNumber;
 import org.junit.Assert;
 import org.junit.Test;
@@ -145,8 +147,12 @@ private byte[] write(List<Glob> collect, BinWriterFactory writerFactory) {
         ReusableByteArrayOutputStream outputStream = new ReusableByteArrayOutputStream();
         for (int i = 0; i < 1000; i++) {
             outputStream = new ReusableByteArrayOutputStream();
-            BinWriter binWriter = writerFactory.create(outputStream);
+//            final Output output = new Output(outputStream);
+//            BinWriter binWriter = writerFactory.create(new KryoSerializationOutput(output));
+            final ByteOutputInBytes output = new ByteOutputInBytes(outputStream);
+            BinWriter binWriter = writerFactory.create(new DefaultSerializationOutput(output));
             binWriter.write(collect);
+            output.flush();
         }
         long end = System.nanoTime();
         System.out.println("write " + (end - start) / 1000000. + "ms size : " + outputStream.size() + " s=" + new String(outputStream.getBuffer(), 0, 10));  // 1100ms puis 600ms
@@ -168,6 +174,7 @@ private void read(BinReaderFactory binReader, byte[] s, GlobType globType) {
         Glob[] globs = new Glob[0];
         for (int i = 0; i < 1000; i++) {
             globs = binReader.createGlobBinReader(new ByteArrayInputStream(s)).readArray(globType);
+//            globs = binReader.createGlobBinReader(new KryoSerializationInput(new Input(s))).readArray(globType);
             Assert.assertEquals(globs.length, 1000);
         }
         long end = System.nanoTime();