Changeset 105 for java/main/src/main/java/com/framsticks/params/AccessOperations.java

Timestamp:

09/10/13 21:11:41 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• import refactorization: move Tree, Path, etc.

from core to structure package

• initial serialization implementation
• improve PrimeExperiment? test
• many organizational changes and convenience improvements

CHANGELOG:
Make registry in AbstractTree? final.

Move most classes from core to structure package.

Minor changes.

Switch names of Future and FutureHandler?.

Rename ExceptionResultHandler? to ExceptionHandler?.

Rename ExceptionHandler? to ExceptionDispatcherHandler?.

Fix bug in ParamCandidate? cache.

Add missing synchronization to the BufferedDispatcher?.

Develop @Serialized support.

Rework serialization further.

Add serialization/deserialization interface to ValueParam?.

Move getStorageType and isNumeric from Param down to params hierarchy.

Minor changes.

Improve param type induction.

Add TestSerializedClass? for testing new serialization.

Add info files gor GenePool? and Population.

Add standard.expt exemplary netfile.

Add type name field to PropertiesObject?.

Use PropertiesObject? for PropertiesAccess? instead of ordinary map.

Hide getFramsClass is several more places.

More unification accross FramsClass?, Access and Path.

Add ParamCollection?.

Simplify interface for getting params from FramsClass?, Access
or Path.

Make Access.call() interface variadic.

Add arguments(args) convenience wrapper around new Object[] {args}.

Upgrade to apache.commons.lang version 3.1

Minor improvement with Response constructors.

Develop proper result printing in ClientAtServer?.

Add experimentNetsave to PrimeExperiment?.

File:

• java/main/src/main/java/com/framsticks/params/AccessOperations.java (modified) (6 diffs)

java/main/src/main/java/com/framsticks/params/AccessOperations.java

@@ -6 +6 @@
 import javax.annotation.Nullable;
 
+import org.apache.commons.lang3.ClassUtils;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
@@ -12 +13 @@
 import com.framsticks.params.types.ListParam;
 import com.framsticks.parsers.MultiParamLoader;
+import com.framsticks.structure.messages.Result;
 import com.framsticks.util.FramsticksException;
 import com.framsticks.util.FramsticksUnsupportedOperationException;
@@ -114 +116 @@
                                         first.set(false);
                                         if (rootAccess != null) {
-                                                if (name.equals(rootAccess.getId())) {
+                                                if (name.equals(rootAccess.getTypeId())) {
                                                         needAdd.set(false);
                                                         currentAccess.set(rootAccess);
@@ -224 +226 @@
                 if (access instanceof ObjectAccess) {
                         ObjectAccess objectAccess = (ObjectAccess) access;
-                        FramsClass framsClass = access.getFramsClass();
-                        assert framsClass != null;
                         boolean headerNeeded = true;
                         // sink.print(framsClass.getId()).print(":").breakLine();
-                        for (PrimitiveParam<?> p : filterInstanceof(framsClass.getParamEntries(), PrimitiveParam.class)) {
+                        for (PrimitiveParam<?> p : filterInstanceof(access.getParams(), PrimitiveParam.class)) {
 
                                 Object value = objectAccess.get(p, Object.class);
@@ -236 +236 @@
 
                                 if (headerNeeded) {
-                                        sink.print(framsClass.getId()).print(":").breakLine();
+                                        sink.print(access.getTypeId()).print(":").breakLine();
                                         headerNeeded = false;
                                 }
 
-                                sink.print(p.getId()).print(":");
-                                p.save(sink, value);
+                                String stringValue = p.serialize(value);
+
+                                sink.print(p.getId()).print(":").print(stringValue);
+                                // p.save(sink, stringValue);
                                 sink.breakLine();
                         }
@@ -414 +416 @@
         }
 
+        public static Object wrapValueInResultIfPrimitive(Object object) {
+                Class<?> javaClass = object.getClass();
+                if (ClassUtils.isPrimitiveOrWrapper(javaClass)) {
+                        return new Result(object);
+                }
+                if (javaClass.equals(String.class)) {
+                        return new Result(object);
+                }
+                return object;
+        }
 
         /**