Changeset 1353

Timestamp:

03/08/07 19:09:12 (21 months ago)

Author:

jmoore

Message:

#625 Better handling of Sets in IceMapper? and other minor fixes.

Location:

trunk/components/blitz/src

Files:

• ome/services/icy/impl/Interceptor.java (modified) (1 diff)
• ome/services/icy/util/IceMethodInvoker.java (modified) (5 diffs)
• omero/util/IceMapper.java (modified) (8 diffs)

trunk/components/blitz/src/ome/services/icy/impl/Interceptor.java

@@ -103 +103 @@
 
     public Object invoke(MethodInvocation mi) throws Throwable {
+
+        Object retVal = null;
+        try {
+            Object[] args = mi.getArguments();
+            Ice.Current __current = (Ice.Current) args[args.length-1];
+            Object[] strippedArgs = strip(args);
         
-        Object[] args = mi.getArguments();
-        Ice.Current __current = (Ice.Current) args[args.length-1];
-        Object[] strippedArgs = strip(args);
-        
-        IceMapper mapper = new IceMapper();
-        ServiceInterface service = servantHelper.getService(key,__current);
-        Object retVal = invoker.invoke(service, __current, mapper, strippedArgs);
+            IceMapper mapper = new IceMapper();
+            ServiceInterface service = servantHelper.getService(key,__current);
+            retVal = invoker.invoke(service, __current, mapper, strippedArgs);
+        } catch (Throwable t) {
+            t.printStackTrace();
+            throw t;
+        }
         servantHelper.throwIfNecessary(retVal);
         return retVal;

trunk/components/blitz/src/ome/services/icy/util/IceMethodInvoker.java

@@ -3 +3 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -151 +153 @@
             Object arg = args[i];
             objs[i] = handleInput(mapper, p, arg);
-            if (null != objs[i] && !isPrimitive(p) && // FIXME need way to check autoboxing.
-                    !p.isAssignableFrom(objs[i].getClass())) {
-                throw new IllegalStateException(String.format(
-                        "Cannot assign %s to %s",objs[i],p));
-            }
+// This check duplicates what should be in handleInput
+//            if (null != objs[i] && !isPrimitive(p) && // FIXME need way to check autoboxing.
+//                    !p.isAssignableFrom(objs[i].getClass())) {
+//                throw new IllegalStateException(String.format(
+//                        "Cannot assign %s to %s",objs[i],p));
+//            }
         }
 
@@ -215 +218 @@
             return mapper.convert((omero.sys.Parameters) arg);
         } else if (List.class.isAssignableFrom(p)) {
-            return mapper.reverse(new HashSet((List) arg)); // Necessary since Ice doesn't support Sets.
+            return mapper.reverse((Collection) arg);
         } else if (Set.class.isAssignableFrom(p)) {
-            return mapper.reverse((Collection) arg);
+            return mapper.reverse(new HashSet((Collection) arg)); // Necessary since Ice doesn't support Sets.
         } else if (Map.class.isAssignableFrom(p)) {
             return mapper.reverse((Map) arg);
@@ -241 +244 @@
         } else if (EventContext.class.isAssignableFrom(type)) {
             return mapper.convert((EventContext)o);
+        } else if (Set.class.isAssignableFrom(type)) {
+            return mapper.map(new ArrayList((Set)o)); // Necessary since Ice doesn't support Sets.
         } else if (Collection.class.isAssignableFrom(type)) {
             return mapper.map((Collection) o);
@@ -254 +259 @@
     protected Ice.UserException handleException(Throwable t) {
 
+        // Getting rid of the reflection wrapper.
+        if (InvocationTargetException.class.isAssignableFrom(t.getClass())) {
+            t = t.getCause();
+        }
+
         if (log.isInfoEnabled()) {
             log.info("Handling:", t);
         }
-
+        
         Class c = t.getClass();
         if (ome.conditions.ValidationException.class.isAssignableFrom(c)) {

trunk/components/blitz/src/omero/util/IceMapper.java

@@ -13 +13 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -176 +177 @@
     }
     
-    public static ome.parameters.Parameters convert(Parameters params) 
+    public ome.parameters.Parameters convert(Parameters params) 
     throws ApiUsageException {
         
@@ -182 +183 @@
         
         ome.parameters.Parameters p = new ome.parameters.Parameters();
-        if (params.p != null) {
-            for (Object obj : params.p.values()) {
+        if (params.map != null) {
+            for (Object obj : params.map.values()) {
                 QueryParam qp = (QueryParam) obj;
                 p.add(convert(qp));
             }
         }
+        if (params.filt != null) {
+            p.setFilter(convert(params.filt));
+        }
         return p;
     }
 
-    public static ome.parameters.QueryParameter convert(QueryParam qParam) 
+    public ome.parameters.QueryParameter convert(QueryParam qParam) 
     throws ApiUsageException {
         
@@ -229 +233 @@
                 klass = Class.class;
                 break;
-            case Type._objectType: // Not currently supported
+            case Type._timeType:
+                omero.RTime rt = qParam.timeVal;
+                value = (rt == null ? null : rt._null ? null : new Timestamp(rt.val.val));
+                klass = Timestamp.class;
+                break;
+            case Type._objectType:
+                omero.RObject ro = qParam.objectVal;
+                value = (ro == null ? null : ro._null ? null : reverse(ro.val));
+                klass = IObject.class;
+                break;
             default:
                 throw new IllegalArgumentException("Unknown type code:" + t);
@@ -284 +297 @@
     }
     
-    public Object reverse(Object source) {
+    public Object reverse(Object source) throws ApiUsageException {
         if (source == null) {
             return null;
@@ -293 +306 @@
         } else if (isImmutable(source)) {
             return source;
+        } else if (QueryParam.class.isAssignableFrom(source.getClass())) {
+            return convert((QueryParam)source);
         } else {
             throw new IllegalArgumentException("Don't know how to reverse "+source);
@@ -325 +340 @@
             }
             target2model.put(source, target);
-            for (Object object : source) {
-                target.add(reverse(object));
+            try {
+                for (Object object : source) {
+                    target.add(reverse(object));
+                } 
+            } catch (ApiUsageException aue) { // FIXME reverse can't throw ServerErrors!
+                convertAndThrow(aue);
             }
         }
         return target;
     }
-    
+
     public Map reverse(Map map) {
+        if (map == null) return null;
         Map<Object, Object> target = new HashMap<Object, Object>();
-        for (Object key : map.keySet()) {
-            Object value = map.get(key);
-            Object targetKey = reverse(key);
-            Object targetValue = reverse(value);
-            target.put(targetKey, targetValue);
+        try {
+            for (Object key : map.keySet()) {
+                Object value = map.get(key);
+                Object targetKey = reverse(key);
+                Object targetValue = reverse(value);
+                target.put(targetKey, targetValue);
+            }
+        } catch (ApiUsageException aue) {
+            convertAndThrow(aue);
         }
         return target;
@@ -405 +429 @@
     }
 
+    private void convertAndThrow(ApiUsageException aue) {
+        InternalException ie = new InternalException(aue.getMessage());
+        ie.setStackTrace(aue.getStackTrace());
+    }
+    
 }