Moved Distributed classes (+tasks) under distributed package

orientechnologies · Feb 27, 2016 · d0d0384 · d0d0384
1 parent ff26714
commit d0d0384
Show file tree

Hide file tree

Showing 45 changed files with 4,826 additions and 4,834 deletions.
diff --git a/...om/orientechnologies/orient/core/storage/impl/local/paginated/wal/OLogSequenceNumber.java b/...om/orientechnologies/orient/core/storage/impl/local/paginated/wal/OLogSequenceNumber.java
@@ -15,10 +15,6 @@
  */
 package com.orientechnologies.orient.core.storage.impl.local.paginated.wal;
 
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
 /**
  * Immutable number representing the position in WAL file (LSN).
  * 
@@ -34,11 +30,6 @@ public OLogSequenceNumber(final long segment, final long position) {
     this.position = position;
   }
 
-  public OLogSequenceNumber(final ObjectInput in) throws IOException, ClassNotFoundException {
-    this.segment = in.readLong();
-    this.position = in.readLong();
-  }
-
   public long getSegment() {
     return segment;
   }
@@ -86,11 +77,6 @@ else if (position < otherNumber.position)
     return 0;
   }
 
-  public void writeExternal(final ObjectOutput out) throws IOException {
-    out.writeLong(segment);
-    out.writeLong(position);
-  }
-
   @Override
   public String toString() {
     return "OLogSequenceNumber{segment=" + segment + ", position=" + position + '}';

diff --git a/distributed/pom.xml b/distributed/pom.xml
@@ -122,12 +122,12 @@
         <dependency>
             <groupId>com.hazelcast</groupId>
             <artifactId>hazelcast</artifactId>
-            <version>3.5.4</version>
+            <version>3.6</version>
         </dependency>
         <dependency>
             <groupId>com.hazelcast</groupId>
             <artifactId>hazelcast-cloud</artifactId>
-            <version>3.5.4</version>
+            <version>3.6</version>
         </dependency>
     </dependencies>
 

diff --git a/...tributed/OAsynchDistributedOperation.java → ...tributed/OAsynchDistributedOperation.java b/...tributed/OAsynchDistributedOperation.java → ...tributed/OAsynchDistributedOperation.java
diff --git a/...erver/distributed/ODiscardedResponse.java → ...erver/distributed/ODiscardedResponse.java b/...erver/distributed/ODiscardedResponse.java → ...erver/distributed/ODiscardedResponse.java
@@ -20,12 +20,24 @@
 
 package com.orientechnologies.orient.server.distributed;
 
-import java.io.Serializable;
+import com.hazelcast.nio.ObjectDataInput;
+import com.hazelcast.nio.ObjectDataOutput;
+import com.hazelcast.nio.serialization.DataSerializable;
+
+import java.io.IOException;
 
 /**
  * Immutable class used to report back a discarded response.
  */
-public class ODiscardedResponse implements Serializable {
+public class ODiscardedResponse implements DataSerializable {
   public ODiscardedResponse() {
   }
+
+  @Override
+  public void writeData(ObjectDataOutput objectDataOutput) throws IOException {
+  }
+
+  @Override
+  public void readData(ObjectDataInput objectDataInput) throws IOException {
+  }
 }