Merge pull request #802 from ngmr/refactor/improve-fvd-descriptors

refactor/improve fvd descriptors

Author: joe-chacko

yoko-rmi-impl/src/main/java/org/apache/yoko/rmi/impl/AbstractObjectDescriptor.java

@@ -19,37 +19,23 @@
 
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.OutputStream;
+import org.omg.CORBA_2_3.portable.InputStream;
+import org.omg.CORBA_2_3.portable.OutputStream;
 
 import java.io.PrintWriter;
 
 class AbstractObjectDescriptor extends ValueDescriptor {
-    protected AbstractObjectDescriptor(Class type, TypeRepository repository) {
-        super(type, repository);
+    protected AbstractObjectDescriptor(Class<?> type, TypeRepository repository) {
+        super(type, repository,
+            in -> ((InputStream) in).read_abstract_interface(),
+            (out, value) -> ((OutputStream) out).write_abstract_interface(value));
     }
 
     @Override
     String genRepId() {
         return String.format("IDL:%s:1.0", getType().getName().replace('.', '/'));
     }
 
-    /** Read an instance of this value from a CDR stream */
-    @Override
-    public Object read(InputStream in) {
-        org.omg.CORBA_2_3.portable.InputStream _in = (org.omg.CORBA_2_3.portable.InputStream) in;
-
-        return _in.read_abstract_interface();
-    }
-
-    /** Write an instance of this value to a CDR stream */
-    @Override
-    public void write(OutputStream out, Object value) {
-        org.omg.CORBA_2_3.portable.OutputStream _out = (org.omg.CORBA_2_3.portable.OutputStream) out;
-
-        _out.write_abstract_interface(value);
-    }
-
     @Override
     protected TypeCode genTypeCode() {
         ORB orb = ORB.init();

yoko-rmi-impl/src/main/java/org/apache/yoko/rmi/impl/AnyDescriptor.java

@@ -27,26 +27,14 @@
 
 class AnyDescriptor extends TypeDescriptor {
     AnyDescriptor(Class<?> type, TypeRepository rep) {
-        super(type, rep);
+        super(type, rep, javax.rmi.CORBA.Util::readAny, javax.rmi.CORBA.Util::writeAny);
     }
 
     @Override
     protected String genRepId() {
         return String.format("IDL:%s:1.0", getType().getName().replace('.', '/'));
     }
 
-    /** Read an instance of this value from a CDR stream */
-    @Override
-    public Object read(InputStream in) {
-        return javax.rmi.CORBA.Util.readAny(in);
-    }
-
-    /** Write an instance of this value to a CDR stream */
-    @Override
-    public void write(OutputStream out, Object val) {
-        javax.rmi.CORBA.Util.writeAny(out, val);
-    }
-
     @Override
     protected TypeCode genTypeCode() {
         ORB orb = ORB.init();

yoko-rmi-impl/src/main/java/org/apache/yoko/rmi/impl/ArrayDescriptor.java

@@ -47,8 +47,18 @@ abstract class ArrayDescriptor<ARR extends Serializable> extends ValueDescriptor
     final Class basicType;
     private final int order;
 
+    private static <ARR extends Serializable> WriteFn createWriter(Class<? extends ARR> type, TypeRepository rep) {
+        return (out, value) -> {
+            org.omg.CORBA_2_3.portable.OutputStream _out = (org.omg.CORBA_2_3.portable.OutputStream) out;
+            String repositoryID = rep.getDescriptor(type).getRepositoryID();
+            _out.write_value((Serializable)value, repositoryID);
+        };
+    }
+
     protected ArrayDescriptor(Class<? extends ARR> type, Class elemType, TypeRepository rep) {
-        super(type, rep);
+        super(type, rep,
+            in -> ((org.omg.CORBA_2_3.portable.InputStream) in).read_value(type),
+            createWriter(type, rep));
         logger.fine(() -> "Creating an array descriptor for type " + type.getName() + " holding elements of " + elemType.getName());
         this.elementType = elemType;
 
@@ -100,12 +110,12 @@ final String genIDLName() {
         StringBuffer sb = new StringBuffer("org_omg_boxedRMI_");
 
         TypeDescriptor desc = repo.getDescriptor(basicType);
-        
-        // The logic that looks for the last "_" fails when this is a 
-        // long_long primitive type.  The primitive types have a "" package 
-        // name, so check those first.  If it's not one of the primitives, 
+
+        // The logic that looks for the last "_" fails when this is a
+        // long_long primitive type.  The primitive types have a "" package
+        // name, so check those first.  If it's not one of the primitives,
         // then we can safely split using the last index position.
-        String pkgName = desc.getPackageName(); 
+        String pkgName = desc.getPackageName();
         if (pkgName.length() == 0) {
             sb.append("seq");
             sb.append(order);
@@ -173,29 +183,6 @@ static ArrayDescriptor get(final Class type, TypeRepository rep) {
         }
     }
 
-    /**
-     * Read an instance of this value from a CDR stream. Overridden to provide a
-     * specific type
-     */
-    @Override
-    public Object read(InputStream in) {
-        org.omg.CORBA_2_3.portable.InputStream _in = (org.omg.CORBA_2_3.portable.InputStream) in;
-        logger.fine(() -> "Reading an array value with repository id " + getRepositoryID() + " java class is " + getType());
-
-        // if we have a resolved class, read using that, otherwise fall back on the
-        // repository id.
-        Class<?> type = getType();
-        return ((null == type) ? _in.read_value(getRepositoryID()) : _in.read_value(type));
-    }
-
-    /** Write an instance of this value to a CDR stream */
-    @Override
-    public void write(OutputStream out, Object value) {
-        org.omg.CORBA_2_3.portable.OutputStream _out = (org.omg.CORBA_2_3.portable.OutputStream) out;
-
-        _out.write_value((Serializable)value, getRepositoryID());
-    }
-
     @Override
     protected List<ValueMember> genValueMembers() {
         final TypeDescriptor elemDesc = repo.getDescriptor(elementType);

yoko-rmi-impl/src/main/java/org/apache/yoko/rmi/impl/BooleanDescriptor.java

@@ -20,10 +20,12 @@
 import java.io.IOException;
 import java.io.ObjectStreamField;
 import java.io.Serializable;
+import java.io.UncheckedIOException;
 import java.util.Map;
 
+import static org.apache.yoko.util.Arrays.emptyArray;
+
 class EnumSubclassDescriptor extends UncustomizableValueDescriptor {
-    private static final ObjectStreamField[] SERIAL_PERSISTENT_FIELDS = {};
 
     EnumSubclassDescriptor(Class<?> type, TypeRepository repository) {
         super(type, repository);
@@ -44,10 +46,23 @@ final long genSerialVersionUid() {
     protected final boolean isEnum() { return true; }
 
     @Override
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    protected Serializable readValue(ObjectReader reader, Serializable val) throws IOException {
-        Map<String,Object> fields = getSuperDescriptor().readFields(reader);
-        return Enum.valueOf((Class)getType(), (String)fields.get("name"));
+    ValueReader genValueReader() {
+        return genValueReader(this.getSuperDescriptor(), this.getType());
+    }
+
+    static ValueReader genValueReader(ValueDescriptor superDesc, Class<?> type) {
+        return (reader, ignored) -> readValue(superDesc, type, reader);
+    }
+
+    private static Serializable readValue(ValueDescriptor superDesc, Class<?> type, ObjectReader reader) {
+        try {
+            Map<String, Object> fields = superDesc.readFields(reader);
+            @SuppressWarnings({"unchecked", "rawtypes"})
+            Serializable result = Enum.valueOf((Class)type, (String) fields.get("name"));
+            return result;
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
     }
 
     @Override
@@ -65,6 +80,6 @@ public final boolean isChunked() {
     @Override
     ObjectStreamField[] findSerialPersistentFields() {
         // Enum subclasses have no fields of their own - they delegate to the parent enum
-        return SERIAL_PERSISTENT_FIELDS;
+        return emptyArray(ObjectStreamField.class);
     }
-}
+}