refactor: removed usages of legacy OSerializableStream

Author: tglman

core/src/main/java/com/orientechnologies/orient/core/config/OStorageConfigurationImpl.java

@@ -29,7 +29,6 @@
 import com.orientechnologies.orient.core.id.ORecordId;
 import com.orientechnologies.orient.core.metadata.schema.OType;
 import com.orientechnologies.orient.core.record.impl.OBlob;
-import com.orientechnologies.orient.core.serialization.OSerializableStream;
 import com.orientechnologies.orient.core.storage.disk.OLocalPaginatedStorage;
 import com.orientechnologies.orient.core.storage.impl.local.OAbstractPaginatedStorage;
 import com.orientechnologies.orient.core.storage.impl.local.paginated.atomicoperations.OAtomicOperation;
@@ -72,7 +71,7 @@
  * @author Luca Garulli (l.garulli--(at)--orientdb.com)
  */
 @SuppressWarnings("serial")
-public class OStorageConfigurationImpl implements OSerializableStream, OStorageConfiguration {
+public class OStorageConfigurationImpl implements OStorageConfiguration {
   private static final OLogger logger =
       OLogManager.instance().logger(OStorageConfigurationImpl.class);
 
@@ -657,23 +656,6 @@ public void fromStream(final byte[] stream, int offset, int length, Charset char
     }
   }
 
-  /**
-   * @deprecated because method uses native encoding use {@link #fromStream(byte[], int, int,
-   *     Charset)} instead.
-   */
-  @Override
-  @Deprecated
-  public OSerializableStream fromStream(final byte[] iStream) throws OSerializationException {
-    fromStream(iStream, 0, iStream.length, Charset.defaultCharset());
-    return this;
-  }
-
-  /** @deprecated because method uses native encoding use {@link #toStream(Charset)} instead. */
-  @Override
-  public byte[] toStream() throws OSerializationException {
-    return toStream(Integer.MAX_VALUE, Charset.defaultCharset());
-  }
-
   public byte[] toStream(Charset charset) throws OSerializationException {
     return toStream(Integer.MAX_VALUE, charset);
   }

core/src/main/java/com/orientechnologies/orient/core/id/ORID.java

@@ -20,9 +20,9 @@
 package com.orientechnologies.orient.core.id;
 
 import com.orientechnologies.orient.core.db.record.OIdentifiable;
-import com.orientechnologies.orient.core.serialization.OSerializableStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.Serializable;
 
 /**
  * RecordID interface that represents a recordid in database. RecordID are made of 2 numbers:
@@ -31,7 +31,7 @@
  *
  * @author Luca Garulli (l.garulli--(at)--orientdb.com)
  */
-public interface ORID extends OIdentifiable, OSerializableStream {
+public interface ORID extends OIdentifiable, Serializable {
   char PREFIX = '#';
   char SEPARATOR = ':';
   int CLUSTER_MAX = 32767;

core/src/main/java/com/orientechnologies/orient/core/storage/OPhysicalPosition.java

@@ -19,20 +19,12 @@
  */
 package com.orientechnologies.orient.core.storage;
 
-import com.orientechnologies.orient.core.exception.OSerializationException;
-import com.orientechnologies.orient.core.serialization.OBinaryProtocol;
-import com.orientechnologies.orient.core.serialization.OSerializableStream;
 import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 
-public class OPhysicalPosition implements OSerializableStream, Externalizable {
-  private static final int binarySize =
-      OBinaryProtocol.SIZE_LONG
-          + OBinaryProtocol.SIZE_BYTE
-          + OBinaryProtocol.SIZE_INT
-          + OBinaryProtocol.SIZE_INT;
+public class OPhysicalPosition implements Externalizable {
   public long clusterPosition;
   public byte recordType;
   public int recordVersion = 0;
@@ -77,42 +69,6 @@ public String toString() {
         + ")";
   }
 
-  @Override
-  public OSerializableStream fromStream(final byte[] iStream) throws OSerializationException {
-    int pos = 0;
-
-    clusterPosition = OBinaryProtocol.bytes2long(iStream);
-    pos += OBinaryProtocol.SIZE_LONG;
-
-    recordType = iStream[pos];
-    pos += OBinaryProtocol.SIZE_BYTE;
-
-    recordSize = OBinaryProtocol.bytes2int(iStream, pos);
-    pos += OBinaryProtocol.SIZE_INT;
-
-    recordVersion = OBinaryProtocol.bytes2int(iStream, pos);
-
-    return this;
-  }
-
-  @Override
-  public byte[] toStream() throws OSerializationException {
-    final byte[] buffer = new byte[binarySize];
-    int pos = 0;
-
-    OBinaryProtocol.long2bytes(clusterPosition, buffer, pos);
-    pos += OBinaryProtocol.SIZE_LONG;
-
-    buffer[pos] = recordType;
-    pos += OBinaryProtocol.SIZE_BYTE;
-
-    OBinaryProtocol.int2bytes(recordSize, buffer, pos);
-    pos += OBinaryProtocol.SIZE_INT;
-
-    OBinaryProtocol.int2bytes(recordVersion, buffer, pos);
-    return buffer;
-  }
-
   @Override
   public boolean equals(Object obj) {
     if (obj == null || !(obj instanceof OPhysicalPosition)) return false;

core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/OStorageMemoryConfiguration.java

@@ -32,7 +32,6 @@
  * @since 7/15/14
  */
 public class OStorageMemoryConfiguration extends OStorageConfigurationImpl {
-  private static final long serialVersionUID = 7001342008735208586L;
 
   private byte[] serializedContent;
 

gremlin/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/gremlintest/MockORID.java

@@ -1,10 +1,8 @@
 package org.apache.tinkerpop.gremlin.orientdb.gremlintest;
 
 import com.orientechnologies.orient.core.db.record.OIdentifiable;
-import com.orientechnologies.orient.core.exception.OSerializationException;
 import com.orientechnologies.orient.core.id.ORID;
 import com.orientechnologies.orient.core.record.ORecord;
-import com.orientechnologies.orient.core.serialization.OSerializableStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
@@ -38,16 +36,6 @@ public int compare(OIdentifiable o1, OIdentifiable o2) {
     throw new IllegalArgumentException(errorText);
   }
 
-  @Override
-  public byte[] toStream() throws OSerializationException {
-    throw new IllegalArgumentException(errorText);
-  }
-
-  @Override
-  public OSerializableStream fromStream(byte[] iStream) throws OSerializationException {
-    throw new IllegalArgumentException(errorText);
-  }
-
   @Override
   public int getClusterId() {
     throw new IllegalArgumentException(errorText);

jdbc/src/main/java/com/orientechnologies/orient/jdbc/OrientJdbcDatabaseMetaData.java

@@ -1244,14 +1244,14 @@ public ResultSet getSuperTypes(String catalog, String schemaPattern, String type
     final OClass cls = database.getMetadata().getSchema().getClass(typeNamePattern);
 
     final OResultSetReady resultSet = new OResultSetReady();
-    if (cls != null && cls.getSuperClass() != null) {
+    if (cls != null && !cls.getSuperClassesNames().isEmpty()) {
       final OResultInternal res = new OResultInternal();
       res.setProperty("TABLE_CAT", catalog);
       res.setProperty("TABLE_SCHEM", catalog);
       res.setProperty("TABLE_NAME", cls.getName());
       res.setProperty("SUPERTYPE_CAT", catalog);
       res.setProperty("SUPERTYPE_SCHEM", catalog);
-      res.setProperty("SUPERTYPE_NAME", cls.getSuperClass().getName());
+      res.setProperty("SUPERTYPE_NAME", cls.getSuperClassesNames().toString());
       resultSet.add(res);
     }
 
@@ -1270,15 +1270,15 @@ public ResultSet getSuperTables(
     final OClass cls = database.getMetadata().getSchema().getClass(tableNamePattern);
     final OResultSetReady resultSet = new OResultSetReady();
 
-    if (cls != null && cls.getSuperClass() != null) {
+    if (cls != null && !cls.getSuperClassesNames().isEmpty()) {
       final OResultInternal res = new OResultInternal();
 
       res.setProperty("TABLE_CAT", catalog);
       res.setProperty("TABLE_SCHEM", catalog);
       res.setProperty("TABLE_NAME", cls.getName());
       res.setProperty("SUPERTABLE_CAT", catalog);
       res.setProperty("SUPERTABLE_SCHEM", catalog);
-      res.setProperty("SUPERTABLE_NAME", cls.getSuperClass().getName());
+      res.setProperty("SUPERTABLE_NAME", cls.getSuperClassesNames().toString());
       resultSet.add(res);
     }
 

jdbc/src/main/java/com/orientechnologies/orient/jdbc/OrientRowId.java

@@ -16,6 +16,10 @@
 package com.orientechnologies.orient.jdbc;
 
 import com.orientechnologies.orient.core.id.ORID;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutput;
+import java.io.DataOutputStream;
+import java.io.IOException;
 import java.sql.RowId;
 
 public class OrientRowId implements RowId {
@@ -28,7 +32,16 @@ public OrientRowId(final ORID rid) {
 
   @Override
   public byte[] getBytes() {
-    return rid.toStream();
+    try {
+      var stream = new ByteArrayOutputStream(12);
+      DataOutput out = new DataOutputStream(stream);
+      out.writeInt(rid.getClusterId());
+      out.writeLong(rid.getClusterPosition());
+      return stream.toByteArray();
+    } catch (IOException e) {
+      // This should never happen
+      throw new RuntimeException(e);
+    }
   }
 
   @Override