Refactoring

src/opensesim/util/idgenerator/IDGenerator.java

@@ -25,16 +25,21 @@
  */
 package opensesim.util.idgenerator;
 
+import java.util.function.Supplier;
+
 /**
- * Implementation of a simple ID generator to create uniqe IDs of type long
+ * Implementation of a simple ID generator to create unique IDs 
  *
  * @author 7u83 <7u83@mail.ru>
  */
-public class IDGenerator {
+public class IDGenerator<T extends Number> {
 
-    private Long next_id;
+    private Long next_id ;
     private Long start_id;
 
+    
+     
+    
     /**
      * Initialize the ID generator
      *
@@ -50,6 +55,7 @@ public class IDGenerator {
      */
     public IDGenerator() {
         this(0L);
+        
     }
 
     /**
@@ -65,6 +71,6 @@ public class IDGenerator {
      * @return the next generated ID
      */
     public synchronized Id getNext() {
-        return new Id<>(next_id++);
+        return new Id<Long>(next_id++);
     }
 }

src/opensesim/util/idgenerator/LongIDGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 7u83 <7u83@mail.ru>
+ * Copyright (c) 2017, 7u83 <7u83@mail.ru>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,35 +23,48 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package opensesim.util;
-
-import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+package opensesim.util.idgenerator;
 
 /**
+ * Implementation of a simple ID generator to create unique IDs of type long
  *
  * @author 7u83 <7u83@mail.ru>
  */
-public final class SeSimObjectMapper extends ObjectMapper {
+public class LongIDGenerator {
 
-    Object object;
+    private long next_id;
+    private long start_id;
 
-    public SeSimObjectMapper(Object o) {
-        super();
-        object = o;
-        // disable auto detection
-        disable(MapperFeature.AUTO_DETECT_CREATORS,
-                MapperFeature.AUTO_DETECT_FIELDS,
-                MapperFeature.AUTO_DETECT_GETTERS,
-                MapperFeature.AUTO_DETECT_IS_GETTERS);
-        // if you want to prevent an exception when classes have no annotated properties
-        disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+    /**
+     * Initialize the ID generator
+     *
+     * @param start ID value to start with
+     */
+    public LongIDGenerator(long start) {
+        start_id=start;
+        reset();
     }
 
-    ObjectNode getObjectNode() {
-        return valueToTree(object);
+    /**
+     * Initialize ID Generator with start ID = 0
+     */
+    public LongIDGenerator() {
+        this(0);
+    }
+    
+    /**
+     * Reset the ID generator
+     */
+    public final void reset(){
+        next_id = start_id;
     }
 
+    /**
+     * Get the next ID
+     *
+     * @return the next generated ID
+     */
+    public synchronized long getNext() {
+        return next_id++;
+    }
 }