temporary switched BeanUtil internal code to Lens

git-svn-id: http://www.xerial.org/svn/project/XerialJ/trunk/xerial-core@3314 ae02f08e-27ec-0310-ae8c-8ba02fe2eafd

diff --git a/src/main/java/org/xerial/lens/ObjectLens.java b/src/main/java/org/xerial/lens/ObjectLens.java
index 8b117a5..e981acd 100644 (file)
--- a/src/main/java/org/xerial/lens/ObjectLens.java
+++ b/src/main/java/org/xerial/lens/ObjectLens.java
@@ -113,7 +113,7 @@ public class ObjectLens
             for (Field eachField : eachClass.getFields())\r
             {\r
                 int fieldModifier = eachField.getModifiers();\r
-                if (Modifier.isPublic(fieldModifier) || !Modifier.isTransient(fieldModifier))\r
+                if (Modifier.isPublic(fieldModifier) && !Modifier.isTransient(fieldModifier))\r
                 {\r
                     Class< ? > fieldType = eachField.getType();\r
                     String paramName = getCanonicalParameterName(eachField.getName());\r
@@ -159,6 +159,12 @@ public class ObjectLens
                     {\r
                         // relation adder\r
                         Pair<String, String> relName = pickRelationName(paramPart);\r
+                        if (relName == null)\r
+                        {\r
+                            // infer relation node names\r
+                            relName = new Pair<String, String>(argTypes[0].getSimpleName(), argTypes[1].getSimpleName());\r
+                        }\r
+\r
                         relationSetterContainer.add(RelationSetter.newRelationSetter(relName.getFirst(), relName\r
                                 .getSecond(), eachMethod));\r
                         break;\r

diff --git a/src/main/java/org/xerial/lens/ObjectMapper.java b/src/main/java/org/xerial/lens/ObjectMapper.java
index 299fb94..8e354ac 100644 (file)
--- a/src/main/java/org/xerial/lens/ObjectMapper.java
+++ b/src/main/java/org/xerial/lens/ObjectMapper.java
@@ -42,6 +42,7 @@ import org.xerial.relation.schema.Schema;
 import org.xerial.relation.schema.SchemaBuilder;
 import org.xerial.util.ArrayDeque;
 import org.xerial.util.Deque;
+import org.xerial.util.bean.TypeConverter;
 import org.xerial.util.bean.TypeInfo;
 import org.xerial.util.log.Logger;
 import org.xerial.util.tree.TreeWalker;
@@ -248,7 +249,7 @@ public class ObjectMapper
 
         if (TypeInfo.isBasicType(nodeType))
         {
-            instance = node.nodeValue;
+            instance = TypeConverter.convertToBasicType(nodeType, node.nodeValue);
         }
         else
         {

diff --git a/src/main/java/org/xerial/relation/query/StreamAmoebaJoin.java b/src/main/java/org/xerial/relation/query/StreamAmoebaJoin.java
index fae6b42..b57462b 100644 (file)
--- a/src/main/java/org/xerial/relation/query/StreamAmoebaJoin.java
+++ b/src/main/java/org/xerial/relation/query/StreamAmoebaJoin.java
@@ -76,20 +76,22 @@ public class StreamAmoebaJoin implements TreeVisitor
     final QuerySet query;
     final AmoebaJoinHandler handler;
 
+    private final static String EMPTY_NODE_NAME = "";
+
     // for running amoeba join
-    long nodeCount = -1;
-    Lattice<String> nodeNameLattice = new Lattice<String>();
-    LatticeCursor<String> latticeCursor;
+    private long nodeCount = -1;
+    private Lattice<String> nodeNameLattice = new Lattice<String>();
+    private LatticeCursor<String> latticeCursor;
 
-    Deque<String> currentPath = new ArrayDeque<String>();
-    Deque<LatticeNode<String>> stateStack = new ArrayDeque<LatticeNode<String>>();
+    private Deque<String> currentPath = new ArrayDeque<String>();
+    private Deque<LatticeNode<String>> stateStack = new ArrayDeque<LatticeNode<String>>();
 
     //  HashedChainMap<String, XMLNode> nodeStackOfEachTag = new HashedChainMap<String, XMLNode>();
-    HashedDeque<String, Node> nodeStackOfEachTag = new HashedDeque<String, Node>();
+    private HashedDeque<String, Node> nodeStackOfEachTag = new HashedDeque<String, Node>();
 
-    HashMap<Edge, List<Operation>> operationSetOnForward = new HashMap<Edge, List<Operation>>();
-    HashMap<Edge, List<Operation>> operationSetOnBack = new HashMap<Edge, List<Operation>>();
-    HashMap<Edge, List<TextOperation>> operatSetOnText = new HashMap<Edge, List<TextOperation>>();
+    private HashMap<Edge, List<Operation>> operationSetOnForward = new HashMap<Edge, List<Operation>>();
+    private HashMap<Edge, List<Operation>> operationSetOnBack = new HashMap<Edge, List<Operation>>();
+    private HashMap<Edge, List<TextOperation>> operatSetOnText = new HashMap<Edge, List<TextOperation>>();
 
     public StreamAmoebaJoin(QuerySet query, AmoebaJoinHandler handler) throws IOException
     {
@@ -355,7 +357,7 @@ public class StreamAmoebaJoin implements TreeVisitor
 
         forward(currentNode);
 
-        currentPath.addLast(nodeName);
+        currentPath.addLast(nodeName != null ? nodeName : EMPTY_NODE_NAME);
 
         // for tree nodes
         if (query.isTreeNode(nodeName))

diff --git a/src/main/java/org/xerial/util/bean/BeanUtil.java b/src/main/java/org/xerial/util/bean/BeanUtil.java
index 0486c74..33f830c 100644 (file)
--- a/src/main/java/org/xerial/util/bean/BeanUtil.java
+++ b/src/main/java/org/xerial/util/bean/BeanUtil.java
@@ -50,7 +50,6 @@ import org.xerial.core.XerialException;
 import org.xerial.json.JSONArray;\r
 import org.xerial.json.JSONBoolean;\r
 import org.xerial.json.JSONDouble;\r
-import org.xerial.json.JSONException;\r
 import org.xerial.json.JSONInteger;\r
 import org.xerial.json.JSONLong;\r
 import org.xerial.json.JSONObject;\r
@@ -872,6 +871,7 @@ public class BeanUtil
      *            a bean class\r
      * @param jsonData\r
      *            a string representation of a JSON data\r
+     * @throws IOException\r
      * @throws InvalidJSONDataException\r
      *             when the input json data is invalid (cannot interpret as a\r
      *             JSON object)\r
@@ -883,13 +883,13 @@ public class BeanUtil
         // parse the input JSON data\r
         try\r
         {\r
-            JSONObject inputJson = new JSONObject(jsonData);\r
-            populateBean(bean, inputJson);\r
+            populateBeanWithJSON(bean, new StringReader(jsonData));\r
         }\r
-        catch (JSONException e)\r
+        catch (IOException e)\r
         {\r
-            throw new BeanException(BeanErrorCode.InvalidJSONData, e);\r
+            throw new BeanException(BeanErrorCode.IOError, e);\r
         }\r
+\r
     }\r
 \r
     /**\r

diff --git a/src/main/java/org/xerial/util/bean/impl/BeanUtilImpl.java b/src/main/java/org/xerial/util/bean/impl/BeanUtilImpl.java
index dc517f5..e6d34c4 100644 (file)
--- a/src/main/java/org/xerial/util/bean/impl/BeanUtilImpl.java
+++ b/src/main/java/org/xerial/util/bean/impl/BeanUtilImpl.java
@@ -32,6 +32,7 @@ import java.util.Map;
 import org.antlr.runtime.tree.Tree;
 import org.w3c.dom.Element;
 import org.xerial.core.XerialException;
+import org.xerial.lens.ObjectMapper;
 import org.xerial.silk.SilkWalker;
 import org.xerial.util.bean.ANTLRWalker;
 import org.xerial.util.bean.JSONStreamWalker;
@@ -68,7 +69,8 @@ public class BeanUtilImpl
      */
     protected static <E> E createTypedBean(TreeWalker treeWalker, Class<E> beanType) throws XerialException
     {
-        return beanType.cast(createBean(treeWalker, new BeanBindingProcess(beanType)));
+        //return beanType.cast(createBean(treeWalker, new BeanBindingProcess(beanType)));
+        return new ObjectMapper().map(beanType, treeWalker);
     }
 
     /**
@@ -81,7 +83,8 @@ public class BeanUtilImpl
      */
     protected static Object createBean(TreeWalker treeWalker, Object bean) throws XerialException
     {
-        return createBean(treeWalker, new BeanBindingProcess(bean));
+        //return createBean(treeWalker, new BeanBindingProcess(bean));
+        return new ObjectMapper().map(bean, treeWalker);
     }
 
     protected static Object createBean(TreeWalker treeWalker, BeanBindingProcess beanBindingVisitor)

diff --git a/src/test/java/org/xerial/util/bean/BeanUtilTest.java b/src/test/java/org/xerial/util/bean/BeanUtilTest.java
index 547cfec..cd24ec0 100644 (file)
--- a/src/test/java/org/xerial/util/bean/BeanUtilTest.java
+++ b/src/test/java/org/xerial/util/bean/BeanUtilTest.java
@@ -185,7 +185,7 @@ public class BeanUtilTest
     }
 
     @Test
-    public void populate() throws JSONException, BeanException
+    public void populate() throws JSONException, BeanException, IOException
     {
         Person s = new Person(10, "leo");
         Person s2 = new Person();
@@ -195,7 +195,7 @@ public class BeanUtilTest
     }
 
     @Test
-    public void populateArray() throws JSONException, BeanException
+    public void populateArray() throws JSONException, BeanException, IOException
     {
         Book s1 = new Book("Data on the Web", new String[] { "Abiteboul", "Buneman" });
         Book s2 = new Book();
@@ -205,7 +205,7 @@ public class BeanUtilTest
     }
 
     @Test
-    public void doNotUsePrivateSetter() throws JSONException, BeanException
+    public void doNotUsePrivateSetter() throws JSONException, BeanException, IOException
     {
         PrivateGetterSetter p = new PrivateGetterSetter(0.0);
         BeanUtil.populateBeanWithJSON(p, "{\"value\" : 1.34}");
@@ -213,7 +213,7 @@ public class BeanUtilTest
     }
 
     @Test
-    public void beanWithCollectionParameters() throws BeanException
+    public void beanWithCollectionParameters() throws BeanException, IOException
     {
         String[] name = { "taro", "leo" };
         Vector<String> v = new Vector<String>();