Refactored exterialize and amf in/out handling

Author: mondain

common/src/main/java/org/red5/server/net/rtmp/status/RuntimeStatusObject.java

@@ -7,20 +7,14 @@
 
 package org.red5.server.net.rtmp.status;
 
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
+import org.red5.io.amf3.IDataInput;
+import org.red5.io.amf3.IDataOutput;
 
 /**
  * Runtime status object
  */
 public class RuntimeStatusObject extends StatusObject {
 
-    /**
-     * Serializable
-     */
-    private static final long serialVersionUID = 6990998992583246039L;
-
     /**
      * Status event details
      */
@@ -109,14 +103,14 @@ public void setDetails(String details) {
     }
 
     @Override
-    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+    public void readExternal(IDataInput in) {
         super.readExternal(in);
         clientid = in.readInt();
         details = (String) in.readObject();
     }
 
     @Override
-    public void writeExternal(ObjectOutput out) throws IOException {
+    public void writeExternal(IDataOutput out) {
         super.writeExternal(out);
         out.writeInt(clientid);
         out.writeObject(details);

common/src/main/java/org/red5/server/net/rtmp/status/Status.java

@@ -7,22 +7,16 @@
 
 package org.red5.server.net.rtmp.status;
 
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
 import org.red5.annotations.Anonymous;
-import org.red5.io.object.ICustomSerializable;
-import org.red5.io.object.Output;
+import org.red5.io.amf3.IDataInput;
+import org.red5.io.amf3.IDataOutput;
+import org.red5.io.amf3.IExternalizable;
 
 /**
  * Represents status object that are transferred between server and client
  */
 @Anonymous
-public class Status implements StatusCodes, ICustomSerializable, Externalizable {
-
-    private static final long serialVersionUID = -5501563718489586136L;
+public class Status implements StatusCodes, IExternalizable {
 
     /**
      * Error constant
@@ -206,36 +200,22 @@ public String toString() {
         return "Status: code: " + getCode() + " desc: " + getDescription() + " level: " + getLevel();
     }
 
-    public void serialize(Output output) {
-        output.putString("level");
-        output.writeString(getLevel());
-        output.putString("code");
-        output.writeString(getCode());
-        output.putString("description");
-        output.writeString(getDescription());
-        output.putString("details");
-        if (getDetails() != null) {
-            output.writeString(getDetails());
-        } else {
-            output.writeNull();
-        }
-        output.putString("clientid");
-        output.writeNumber(getClientid());
-    }
-
-    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+    @Override
+    public void readExternal(IDataInput in) {
         clientid = (Number) in.readDouble();
-        code = (String) in.readObject();
-        description = (String) in.readObject();
-        details = (String) in.readObject();
-        level = (String) in.readObject();
+        code = (String) in.readUTF();
+        description = (String) in.readUTF();
+        details = (String) in.readUTF();
+        level = (String) in.readUTF();
     }
 
-    public void writeExternal(ObjectOutput out) throws IOException {
+    @Override
+    public void writeExternal(IDataOutput out) {
         out.writeDouble(clientid.doubleValue());
-        out.writeObject(code);
-        out.writeObject(description);
-        out.writeObject(details);
-        out.writeObject(level);
+        out.writeUTF(code);
+        out.writeUTF(description);
+        out.writeUTF(details);
+        out.writeUTF(level);
     }
+
 }

common/src/main/java/org/red5/server/net/rtmp/status/StatusObject.java

@@ -7,18 +7,13 @@
 
 package org.red5.server.net.rtmp.status;
 
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.red5.annotations.Anonymous;
-import org.red5.io.object.ICustomSerializable;
-import org.red5.io.object.Output;
-import org.red5.io.object.Serializer;
+import org.red5.io.amf3.IDataInput;
+import org.red5.io.amf3.IDataOutput;
+import org.red5.io.amf3.IExternalizable;
 
 /**
  * Status object that is sent to client with every status event
@@ -27,9 +22,7 @@
  * @author Luke Hubbard, Codegent Ltd ([email protected])
  */
 @Anonymous
-public class StatusObject implements Serializable, ICustomSerializable, Externalizable {
-
-    private static final long serialVersionUID = 8817297676191096283L;
+public class StatusObject implements IExternalizable {
 
     public static final String ERROR = "error";
 
@@ -139,10 +132,14 @@ public Object getApplication() {
         return application;
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String toString() {
-        return String.format("Status code: %s level: %s description: %s", code, level, description);
+    public void setAdditional(String name, Object value) {
+        if ("code,level,description,application".indexOf(name) != -1) {
+            throw new RuntimeException("the name \"" + name + "\" is reserved");
+        }
+        if (additional == null) {
+            additional = new HashMap<>();
+        }
+        additional.put(name, value);
     }
 
     /**
@@ -154,54 +151,37 @@ public Status asStatus() {
         return new Status(getCode(), getLevel(), getDescription());
     }
 
-    public void setAdditional(String name, Object value) {
-        if ("code,level,description,application".indexOf(name) != -1) {
-            throw new RuntimeException("the name \"" + name + "\" is reserved");
-        }
-        if (additional == null) {
-            additional = new HashMap<String, Object>();
-        }
-        additional.put(name, value);
-    }
-
-    public void serialize(Output output) {
-        output.putString("level");
-        output.writeString(getLevel());
-        output.putString("code");
-        output.writeString(getCode());
-        output.putString("description");
-        output.writeString(getDescription());
-        if (application != null) {
-            output.putString("application");
-            Serializer.serialize(output, application);
-        }
-        if (additional != null) {
-            // Add additional parameters
-            for (Map.Entry<String, Object> entry : additional.entrySet()) {
-                output.putString(entry.getKey());
-                Serializer.serialize(output, entry.getValue());
-            }
-        }
+    /** {@inheritDoc} */
+    @Override
+    public String toString() {
+        return String.format("Status code: %s level: %s description: %s", code, level, description);
     }
 
     @SuppressWarnings("unchecked")
-    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        code = (String) in.readObject();
-        description = (String) in.readObject();
-        level = (String) in.readObject();
-        additional = (Map<String, Object>) in.readObject();
+    @Override
+    public void readExternal(IDataInput in) {
+        code = (String) in.readUTF();
+        description = (String) in.readUTF();
+        level = (String) in.readUTF();
         application = in.readObject();
+        additional = (Map<String, Object>) in.readObject();
     }
 
-    public void writeExternal(ObjectOutput out) throws IOException {
-        out.writeObject(code);
-        out.writeObject(description);
-        out.writeObject(level);
+    @Override
+    public void writeExternal(IDataOutput out) {
+        out.writeUTF(code);
+        out.writeUTF(description);
+        out.writeUTF(level);
         if (application != null) {
-            out.writeObject(additional);
+            out.writeObject(application);
+        } else {
+            out.writeObject(null);
         }
         if (additional != null) {
-            out.writeObject(application);
+            out.writeObject(additional);
+        } else {
+            out.writeObject(null);
         }
     }
+
 }

common/src/main/java/org/red5/server/net/rtmp/status/StatusObjectService.java

@@ -46,17 +46,15 @@ public class StatusObjectService implements StatusCodes, InitializingBean {
      * Initialization
      */
     public void afterPropertiesSet() throws Exception {
-        log.trace("Loading status objects");
-        loadStatusObjects();
-        log.trace("Caching status objects");
-        cacheStatusObjects();
+        log.trace("Loading and caching status objects");
+        loadAndCacheStatusObjects();
         log.debug("Status service ready");
     }
 
     /**
-     * Creates all status objects and adds them to status objects map
+     * Creates all status objects and adds them to status objects map; then caches them.
      */
-    public void loadStatusObjects() {
+    public void loadAndCacheStatusObjects() {
         statusObjects = new HashMap<>();
 
         statusObjects.put(NC_CALL_FAILED, new StatusObject(NC_CALL_FAILED, StatusObject.ERROR, ""));
@@ -103,31 +101,23 @@ public void loadStatusObjects() {
         statusObjects.put(NS_PLAY_FILE_STRUCTURE_INVALID, new StatusObject(NS_PLAY_FILE_STRUCTURE_INVALID, StatusObject.ERROR, ""));
         statusObjects.put(NS_PLAY_NO_SUPPORTED_TRACK_FOUND, new StatusObject(NS_PLAY_NO_SUPPORTED_TRACK_FOUND, StatusObject.ERROR, ""));
 
-    }
-
-    /**
-     * Cache status objects
-     */
-    public void cacheStatusObjects() {
-
-        cachedStatusObjects = new HashMap<String, byte[]>();
-
+        cachedStatusObjects = new HashMap<>();
         String statusCode;
         IoBuffer out = IoBuffer.allocate(256);
         out.setAutoExpand(true);
-
         for (String s : statusObjects.keySet()) {
             statusCode = s;
             StatusObject statusObject = statusObjects.get(statusCode);
-            if (statusObject instanceof RuntimeStatusObject) {
+            if (RuntimeStatusObject.class.isAssignableFrom(statusObject.getClass())) {
+                log.debug("Skip caching runtime status object: {}", statusCode);
                 continue;
             }
             serializeStatusObject(out, statusObject);
             out.flip();
             if (log.isTraceEnabled()) {
                 log.trace(HexDump.formatHexDump(out.getHexDump()));
             }
-            byte[] cachedBytes = new byte[out.limit()];
+            byte[] cachedBytes = new byte[out.remaining()];
             out.get(cachedBytes);
             out.clear();
             cachedStatusObjects.put(statusCode, cachedBytes);

common/src/main/java/org/red5/server/service/Call.java

@@ -7,22 +7,22 @@
 
 package org.red5.server.service;
 
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
+import org.red5.io.amf3.IDataInput;
+import org.red5.io.amf3.IDataOutput;
+import org.red5.io.amf3.IExternalizable;
 import org.red5.server.api.service.IServiceCall;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Basic service call (remote call) implementation
  *
  * @author The Red5 Project
  * @author Luke Hubbard, Codegent Ltd ([email protected])
  */
-public class Call implements IServiceCall, Externalizable {
+public class Call implements IServiceCall, IExternalizable {
 
-    private static final long serialVersionUID = -3699712251588013875L;
+    private static final Logger log = LoggerFactory.getLogger(Call.class);
 
     /**
      * Pending status constant
@@ -279,25 +279,37 @@ public String toString() {
         return sb.toString();
     }
 
-    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+    @Override
+    public void readExternal(IDataInput in) {
         // keep a time of receipt
         readTime = System.currentTimeMillis();
         // read-in properties
-        serviceName = (String) in.readObject();
-        serviceMethodName = (String) in.readObject();
-        arguments = (Object[]) in.readObject();
         status = in.readByte();
+        serviceName = (String) in.readUTF();
+        serviceMethodName = (String) in.readUTF();
+        arguments = (Object[]) in.readObject();
+        if (log.isDebugEnabled()) {
+            for (int i = 0; i < arguments.length; i++) {
+                log.debug("ReadExt - Arg: {} type: {} => {}", i, (arguments[i] != null ? arguments[i].getClass().getName() : null), arguments[i]);
+            }
+        }
         exception = (Exception) in.readObject();
     }
 
-    public void writeExternal(ObjectOutput out) throws IOException {
+    @Override
+    public void writeExternal(IDataOutput out) {
         // keep a time of receipt
         writeTime = System.currentTimeMillis();
         // write-out properties
-        out.writeObject(serviceName);
-        out.writeObject(serviceMethodName);
-        out.writeObject(arguments);
         out.writeByte(status);
+        out.writeUTF(serviceName);
+        out.writeUTF(serviceMethodName);
+        if (log.isDebugEnabled()) {
+            for (int i = 0; i < arguments.length; i++) {
+                log.debug("WriteExt - Arg: {} type: {} => {}", i, (arguments[i] != null ? arguments[i].getClass().getName() : null), arguments[i]);
+            }
+        }
+        out.writeObject(arguments);
         out.writeObject(exception);
     }
 }