moved relation package into the lens package

git-svn-id: http://www.xerial.org/svn/project/XerialJ/trunk/xerial-core@3447 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 3aca20f..64c9786 100644 (file)
--- a/src/main/java/org/xerial/lens/ObjectLens.java
+++ b/src/main/java/org/xerial/lens/ObjectLens.java
@@ -408,24 +408,31 @@ public class ObjectLens {
             Collection< ? > collection = (Collection< ? >) obj;\r
             boolean hasAttributes = lens.hasAttributes();\r
 \r
+            boolean bracketIsOpen = false;\r
+\r
             if (hasAttributes) {\r
                 json.startObject();\r
                 outputParemters(json, obj);\r
 \r
-                if (!collection.isEmpty())\r
+                if (!collection.isEmpty()) {\r
                     json.startArray("entry");\r
+                    bracketIsOpen = true;\r
+                }\r
             }\r
-            else\r
+            else {\r
                 json.startArray();\r
+                bracketIsOpen = true;\r
+            }\r
 \r
             for (Object elem : collection) {\r
                 toJSON(json, elem);\r
             }\r
 \r
+            if (bracketIsOpen)\r
+                json.endArray();\r
+\r
             if (hasAttributes)\r
                 json.endObject();\r
-            else\r
-                json.endArray();\r
 \r
         }\r
         else if (TypeInfo.isMap(c)) {\r

diff --git a/src/main/java/org/xerial/lens/ObjectMapper.java b/src/main/java/org/xerial/lens/ObjectMapper.java
index 5bda964..15e5b91 100644 (file)
--- a/src/main/java/org/xerial/lens/ObjectMapper.java
+++ b/src/main/java/org/xerial/lens/ObjectMapper.java
@@ -37,14 +37,14 @@ import org.xerial.lens.impl.MapEntry;
 import org.xerial.lens.impl.ParameterSetter;
 import org.xerial.lens.impl.RelationSetter;
 import org.xerial.lens.impl.ParameterSetter.MapEntryBinder;
-import org.xerial.relation.Node;
-import org.xerial.relation.query.AmoebaJoinHandler;
-import org.xerial.relation.query.AmoebaJoinHandlerBase;
-import org.xerial.relation.query.QuerySet;
-import org.xerial.relation.query.StreamAmoebaJoin;
-import org.xerial.relation.query.QuerySet.QuerySetBuilder;
-import org.xerial.relation.schema.Schema;
-import org.xerial.relation.schema.SchemaBuilder;
+import org.xerial.lens.relation.Node;
+import org.xerial.lens.relation.query.AmoebaJoinHandler;
+import org.xerial.lens.relation.query.AmoebaJoinHandlerBase;
+import org.xerial.lens.relation.query.QuerySet;
+import org.xerial.lens.relation.query.StreamAmoebaJoin;
+import org.xerial.lens.relation.query.QuerySet.QuerySetBuilder;
+import org.xerial.lens.relation.schema.Schema;
+import org.xerial.lens.relation.schema.SchemaBuilder;
 import org.xerial.util.ArrayDeque;
 import org.xerial.util.Deque;
 import org.xerial.util.bean.TypeConverter;

diff --git a/src/main/java/org/xerial/relation/Cell.java b/src/main/java/org/xerial/lens/relation/Cell.java
similarity index 94%
rename from src/main/java/org/xerial/relation/Cell.java
rename to src/main/java/org/xerial/lens/relation/Cell.java
index 54b7b2d..ff0df61 100644 (file)
--- a/src/main/java/org/xerial/relation/Cell.java
+++ b/src/main/java/org/xerial/lens/relation/Cell.java
@@ -22,7 +22,7 @@
 // $URL$\r
 // $Author$\r
 //--------------------------------------\r
-package org.xerial.relation;\r
+package org.xerial.lens.relation;\r
 \r
 /**\r
  * A composite pattern interface for representing tree node and tuple structure.\r

diff --git a/src/main/java/org/xerial/relation/CellVisitor.java b/src/main/java/org/xerial/lens/relation/CellVisitor.java
similarity index 93%
rename from src/main/java/org/xerial/relation/CellVisitor.java
rename to src/main/java/org/xerial/lens/relation/CellVisitor.java
index 4eca1dc..942ea64 100644 (file)
--- a/src/main/java/org/xerial/relation/CellVisitor.java
+++ b/src/main/java/org/xerial/lens/relation/CellVisitor.java
@@ -22,7 +22,7 @@
 // $URL$\r
 // $Author$\r
 //--------------------------------------\r
-package org.xerial.relation;\r
+package org.xerial.lens.relation;\r
 \r
 /**\r
  * Visitor interface for traversing Tuple\r

diff --git a/src/main/java/org/xerial/relation/DataType.java b/src/main/java/org/xerial/lens/relation/DataType.java
similarity index 96%
rename from src/main/java/org/xerial/relation/DataType.java
rename to src/main/java/org/xerial/lens/relation/DataType.java
index 66c3d32..a1f9084 100644 (file)
--- a/src/main/java/org/xerial/relation/DataType.java
+++ b/src/main/java/org/xerial/lens/relation/DataType.java
@@ -22,7 +22,7 @@
 // $URL$
 // $Author$
 //--------------------------------------
-package org.xerial.relation;
+package org.xerial.lens.relation;
 
 /**
  * Definition of the data types for schema node

diff --git a/src/main/java/org/xerial/relation/FD.java b/src/main/java/org/xerial/lens/relation/FD.java
similarity index 97%
rename from src/main/java/org/xerial/relation/FD.java
rename to src/main/java/org/xerial/lens/relation/FD.java
index e899d3e..4a62356 100644 (file)
--- a/src/main/java/org/xerial/relation/FD.java
+++ b/src/main/java/org/xerial/lens/relation/FD.java
@@ -22,7 +22,7 @@
 // $URL$
 // $Author$
 //--------------------------------------
-package org.xerial.relation;
+package org.xerial.lens.relation;
 
 /**
  * Functional dependency that holds in the relation

diff --git a/src/main/java/org/xerial/relation/IndexAccess.java b/src/main/java/org/xerial/lens/relation/IndexAccess.java
similarity index 94%
rename from src/main/java/org/xerial/relation/IndexAccess.java
rename to src/main/java/org/xerial/lens/relation/IndexAccess.java
index b398de2..d4afb0e 100644 (file)
--- a/src/main/java/org/xerial/relation/IndexAccess.java
+++ b/src/main/java/org/xerial/lens/relation/IndexAccess.java
@@ -22,7 +22,7 @@
 // $URL$\r
 // $Author$\r
 //--------------------------------------\r
-package org.xerial.relation;\r
+package org.xerial.lens.relation;\r
 \r
 public interface IndexAccess<NodeType>\r
 {\r

diff --git a/src/main/java/org/xerial/relation/LNode.java b/src/main/java/org/xerial/lens/relation/LNode.java
similarity index 98%
rename from src/main/java/org/xerial/relation/LNode.java
rename to src/main/java/org/xerial/lens/relation/LNode.java
index 12b389e..db6ee88 100644 (file)
--- a/src/main/java/org/xerial/relation/LNode.java
+++ b/src/main/java/org/xerial/lens/relation/LNode.java
@@ -22,7 +22,7 @@
 // $URL$
 // $Author$
 //--------------------------------------
-package org.xerial.relation;
+package org.xerial.lens.relation;
 
 /**
  * Light-weight node that holds only a node ID and node value.

diff --git a/src/main/java/org/xerial/relation/Node.java b/src/main/java/org/xerial/lens/relation/Node.java
similarity index 95%
rename from src/main/java/org/xerial/relation/Node.java
rename to src/main/java/org/xerial/lens/relation/Node.java
index 9022d89..ff10e14 100644 (file)
--- a/src/main/java/org/xerial/relation/Node.java
+++ b/src/main/java/org/xerial/lens/relation/Node.java
@@ -22,7 +22,7 @@
 // $URL$\r
 // $Author$\r
 //--------------------------------------\r
-package org.xerial.relation;\r
+package org.xerial.lens.relation;\r
 \r
 /**\r
  * Node is an element ({@link Cell}) of a relation.\r

diff --git a/src/main/java/org/xerial/relation/NodeBase.java b/src/main/java/org/xerial/lens/relation/NodeBase.java
similarity index 94%
rename from src/main/java/org/xerial/relation/NodeBase.java
rename to src/main/java/org/xerial/lens/relation/NodeBase.java
index cb99d58..228a16a 100644 (file)
--- a/src/main/java/org/xerial/relation/NodeBase.java
+++ b/src/main/java/org/xerial/lens/relation/NodeBase.java
@@ -22,7 +22,7 @@
 // $URL$\r
 // $Author$\r
 //--------------------------------------\r
-package org.xerial.relation;\r
+package org.xerial.lens.relation;\r
 \r
 import org.xerial.core.XerialError;\r
 import org.xerial.core.XerialErrorCode;\r

diff --git a/src/main/java/org/xerial/relation/Tuple.java b/src/main/java/org/xerial/lens/relation/Tuple.java
similarity index 95%
rename from src/main/java/org/xerial/relation/Tuple.java
rename to src/main/java/org/xerial/lens/relation/Tuple.java
index 5e097f5..d686224 100644 (file)
--- a/src/main/java/org/xerial/relation/Tuple.java
+++ b/src/main/java/org/xerial/lens/relation/Tuple.java
@@ -22,7 +22,7 @@
 // $URL$\r
 // $Author$\r
 //--------------------------------------\r
-package org.xerial.relation;\r
+package org.xerial.lens.relation;\r
 \r
 import java.util.ArrayList;\r
 import java.util.Collection;\r

diff --git a/src/main/java/org/xerial/relation/TupleIndex.java b/src/main/java/org/xerial/lens/relation/TupleIndex.java
similarity index 95%
rename from src/main/java/org/xerial/relation/TupleIndex.java
rename to src/main/java/org/xerial/lens/relation/TupleIndex.java
index 36cbe4d..a33af76 100644 (file)
--- a/src/main/java/org/xerial/relation/TupleIndex.java
+++ b/src/main/java/org/xerial/lens/relation/TupleIndex.java
@@ -22,7 +22,7 @@
 // $URL$\r
 // $Author$\r
 //--------------------------------------\r
-package org.xerial.relation;\r
+package org.xerial.lens.relation;\r
 \r
 import org.xerial.core.XerialError;\r
 import org.xerial.core.XerialErrorCode;\r

diff --git a/src/main/java/org/xerial/relation/query/AmoebaJoinHandler.java b/src/main/java/org/xerial/lens/relation/query/AmoebaJoinHandler.java
similarity index 92%
rename from src/main/java/org/xerial/relation/query/AmoebaJoinHandler.java
rename to src/main/java/org/xerial/lens/relation/query/AmoebaJoinHandler.java
index 0ee7f61..976afbd 100644 (file)
--- a/src/main/java/org/xerial/relation/query/AmoebaJoinHandler.java
+++ b/src/main/java/org/xerial/lens/relation/query/AmoebaJoinHandler.java
@@ -22,10 +22,10 @@
 // $URL$
 // $Author$
 //--------------------------------------
-package org.xerial.relation.query;
+package org.xerial.lens.relation.query;
 
-import org.xerial.relation.Node;
-import org.xerial.relation.schema.Schema;
+import org.xerial.lens.relation.Node;
+import org.xerial.lens.relation.schema.Schema;
 
 public interface AmoebaJoinHandler
 {

diff --git a/src/main/java/org/xerial/relation/query/AmoebaJoinHandlerBase.java b/src/main/java/org/xerial/lens/relation/query/AmoebaJoinHandlerBase.java
similarity index 88%
rename from src/main/java/org/xerial/relation/query/AmoebaJoinHandlerBase.java
rename to src/main/java/org/xerial/lens/relation/query/AmoebaJoinHandlerBase.java
index 4a00faa..003db51 100644 (file)
--- a/src/main/java/org/xerial/relation/query/AmoebaJoinHandlerBase.java
+++ b/src/main/java/org/xerial/lens/relation/query/AmoebaJoinHandlerBase.java
@@ -22,10 +22,10 @@
 // $URL$\r
 // $Author$\r
 //--------------------------------------\r
-package org.xerial.relation.query;\r
+package org.xerial.lens.relation.query;\r
 \r
-import org.xerial.relation.Node;\r
-import org.xerial.relation.schema.Schema;\r
+import org.xerial.lens.relation.Node;\r
+import org.xerial.lens.relation.schema.Schema;\r
 \r
 /**\r
  * An empty implementation of {@link AmoebaJoinHandler}\r

diff --git a/src/main/java/org/xerial/relation/query/QuerySet.java b/src/main/java/org/xerial/lens/relation/query/QuerySet.java
similarity index 96%
rename from src/main/java/org/xerial/relation/query/QuerySet.java
rename to src/main/java/org/xerial/lens/relation/query/QuerySet.java
index 9c40134..0e9816a 100644 (file)
--- a/src/main/java/org/xerial/relation/query/QuerySet.java
+++ b/src/main/java/org/xerial/lens/relation/query/QuerySet.java
@@ -22,7 +22,7 @@
 // $URL$
 // $Author$
 //--------------------------------------
-package org.xerial.relation.query;
+package org.xerial.lens.relation.query;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -30,7 +30,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.xerial.relation.schema.Schema;
+import org.xerial.lens.relation.schema.Schema;
 import org.xerial.util.IndexedSet;
 
 /**

diff --git a/src/main/java/org/xerial/relation/query/RelationFragmentHolder.java b/src/main/java/org/xerial/lens/relation/query/RelationFragmentHolder.java
similarity index 96%
rename from src/main/java/org/xerial/relation/query/RelationFragmentHolder.java
rename to src/main/java/org/xerial/lens/relation/query/RelationFragmentHolder.java
index 611c164..a2d10f5 100644 (file)
--- a/src/main/java/org/xerial/relation/query/RelationFragmentHolder.java
+++ b/src/main/java/org/xerial/lens/relation/query/RelationFragmentHolder.java
@@ -22,7 +22,7 @@
 // $URL$
 // $Author$
 //--------------------------------------
-package org.xerial.relation.query;
+package org.xerial.lens.relation.query;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -30,13 +30,13 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.xerial.relation.Cell;
-import org.xerial.relation.CellVisitor;
-import org.xerial.relation.Node;
-import org.xerial.relation.Tuple;
-import org.xerial.relation.TupleIndex;
-import org.xerial.relation.schema.Schema;
-import org.xerial.relation.schema.SchemaBuilder;
+import org.xerial.lens.relation.Cell;
+import org.xerial.lens.relation.CellVisitor;
+import org.xerial.lens.relation.Node;
+import org.xerial.lens.relation.Tuple;
+import org.xerial.lens.relation.TupleIndex;
+import org.xerial.lens.relation.schema.Schema;
+import org.xerial.lens.relation.schema.SchemaBuilder;
 import org.xerial.util.ArrayDeque;
 import org.xerial.util.Deque;
 import org.xerial.util.log.Logger;

diff --git a/src/main/java/org/xerial/relation/query/StreamAmoebaJoin.java b/src/main/java/org/xerial/lens/relation/query/StreamAmoebaJoin.java
similarity index 98%
rename from src/main/java/org/xerial/relation/query/StreamAmoebaJoin.java
rename to src/main/java/org/xerial/lens/relation/query/StreamAmoebaJoin.java
index d042a63..f4f1cde 100644 (file)
--- a/src/main/java/org/xerial/relation/query/StreamAmoebaJoin.java
+++ b/src/main/java/org/xerial/lens/relation/query/StreamAmoebaJoin.java
@@ -22,7 +22,7 @@
 // $URL$
 // $Author$
 //--------------------------------------
-package org.xerial.relation.query;
+package org.xerial.lens.relation.query;
 
 import java.io.IOException;
 import java.io.StringWriter;
@@ -36,13 +36,13 @@ import org.xerial.core.XerialError;
 import org.xerial.core.XerialErrorCode;
 import org.xerial.core.XerialException;
 import org.xerial.lens.ObjectLens;
-import org.xerial.relation.Node;
-import org.xerial.relation.TupleIndex;
-import org.xerial.relation.Node.NodeBuilder;
-import org.xerial.relation.schema.Schema;
-import org.xerial.relation.schema.SchemaArray;
-import org.xerial.relation.schema.SchemaAtom;
-import org.xerial.relation.schema.SchemaVisitor;
+import org.xerial.lens.relation.Node;
+import org.xerial.lens.relation.TupleIndex;
+import org.xerial.lens.relation.Node.NodeBuilder;
+import org.xerial.lens.relation.schema.Schema;
+import org.xerial.lens.relation.schema.SchemaArray;
+import org.xerial.lens.relation.schema.SchemaAtom;
+import org.xerial.lens.relation.schema.SchemaVisitor;
 import org.xerial.util.ArrayDeque;
 import org.xerial.util.Deque;
 import org.xerial.util.HashedDeque;

diff --git a/src/main/java/org/xerial/relation/schema/Schema.java b/src/main/java/org/xerial/lens/relation/schema/Schema.java
similarity index 94%
rename from src/main/java/org/xerial/relation/schema/Schema.java
rename to src/main/java/org/xerial/lens/relation/schema/Schema.java
index dc5b367..3429e09 100644 (file)
--- a/src/main/java/org/xerial/relation/schema/Schema.java
+++ b/src/main/java/org/xerial/lens/relation/schema/Schema.java
@@ -22,12 +22,12 @@
 // $URL$
 // $Author$
 //--------------------------------------
-package org.xerial.relation.schema;
+package org.xerial.lens.relation.schema;
 
 import java.util.List;
 
-import org.xerial.relation.FD;
-import org.xerial.relation.TupleIndex;
+import org.xerial.lens.relation.FD;
+import org.xerial.lens.relation.TupleIndex;
 import org.xerial.util.Functor;
 
 /**

diff --git a/src/main/java/org/xerial/relation/schema/SchemaArray.java b/src/main/java/org/xerial/lens/relation/schema/SchemaArray.java
similarity index 98%
rename from src/main/java/org/xerial/relation/schema/SchemaArray.java
rename to src/main/java/org/xerial/lens/relation/schema/SchemaArray.java
index 5a07aad..4832846 100644 (file)
--- a/src/main/java/org/xerial/relation/schema/SchemaArray.java
+++ b/src/main/java/org/xerial/lens/relation/schema/SchemaArray.java
@@ -22,7 +22,7 @@
 // $URL$
 // $Author$
 //--------------------------------------
-package org.xerial.relation.schema;
+package org.xerial.lens.relation.schema;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -32,8 +32,8 @@ import java.util.List;
 
 import org.xerial.core.XerialError;
 import org.xerial.core.XerialErrorCode;
-import org.xerial.relation.FD;
-import org.xerial.relation.TupleIndex;
+import org.xerial.lens.relation.FD;
+import org.xerial.lens.relation.TupleIndex;
 import org.xerial.util.Functor;
 
 /**

diff --git a/src/main/java/org/xerial/relation/schema/SchemaAtom.java b/src/main/java/org/xerial/lens/relation/schema/SchemaAtom.java
similarity index 94%
rename from src/main/java/org/xerial/relation/schema/SchemaAtom.java
rename to src/main/java/org/xerial/lens/relation/schema/SchemaAtom.java
index bd1ae8e..90050a1 100644 (file)
--- a/src/main/java/org/xerial/relation/schema/SchemaAtom.java
+++ b/src/main/java/org/xerial/lens/relation/schema/SchemaAtom.java
@@ -22,14 +22,14 @@
 // $URL$
 // $Author$
 //--------------------------------------
-package org.xerial.relation.schema;
+package org.xerial.lens.relation.schema;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.xerial.relation.DataType;
-import org.xerial.relation.FD;
-import org.xerial.relation.TupleIndex;
+import org.xerial.lens.relation.DataType;
+import org.xerial.lens.relation.FD;
+import org.xerial.lens.relation.TupleIndex;
 import org.xerial.util.Functor;
 
 /**

diff --git a/src/main/java/org/xerial/relation/schema/SchemaBuilder.java b/src/main/java/org/xerial/lens/relation/schema/SchemaBuilder.java
similarity index 90%
rename from src/main/java/org/xerial/relation/schema/SchemaBuilder.java
rename to src/main/java/org/xerial/lens/relation/schema/SchemaBuilder.java
index 22830ac..27506f2 100644 (file)
--- a/src/main/java/org/xerial/relation/schema/SchemaBuilder.java
+++ b/src/main/java/org/xerial/lens/relation/schema/SchemaBuilder.java
@@ -22,12 +22,12 @@
 // $URL$\r
 // $Author$\r
 //--------------------------------------\r
-package org.xerial.relation.schema;\r
+package org.xerial.lens.relation.schema;\r
 \r
 import java.util.ArrayList;\r
 \r
-import org.xerial.relation.DataType;\r
-import org.xerial.relation.FD;\r
+import org.xerial.lens.relation.DataType;\r
+import org.xerial.lens.relation.FD;\r
 \r
 public class SchemaBuilder\r
 {\r

diff --git a/src/main/java/org/xerial/relation/schema/SchemaNode.java b/src/main/java/org/xerial/lens/relation/schema/SchemaNode.java
similarity index 88%
rename from src/main/java/org/xerial/relation/schema/SchemaNode.java
rename to src/main/java/org/xerial/lens/relation/schema/SchemaNode.java
index 6b41faf..9c16add 100644 (file)
--- a/src/main/java/org/xerial/relation/schema/SchemaNode.java
+++ b/src/main/java/org/xerial/lens/relation/schema/SchemaNode.java
@@ -22,13 +22,13 @@
 // $URL$\r
 // $Author$\r
 //--------------------------------------\r
-package org.xerial.relation.schema;\r
+package org.xerial.lens.relation.schema;\r
 \r
 import java.io.Serializable;\r
 \r
-import org.xerial.relation.DataType;\r
-import org.xerial.relation.FD;\r
-import org.xerial.relation.NodeBase;\r
+import org.xerial.lens.relation.DataType;\r
+import org.xerial.lens.relation.FD;\r
+import org.xerial.lens.relation.NodeBase;\r
 \r
 /**\r
  * SchemaNode\r

diff --git a/src/main/java/org/xerial/relation/schema/SchemaVisitor.java b/src/main/java/org/xerial/lens/relation/schema/SchemaVisitor.java
similarity index 96%
rename from src/main/java/org/xerial/relation/schema/SchemaVisitor.java
rename to src/main/java/org/xerial/lens/relation/schema/SchemaVisitor.java
index bf7287c..d00c856 100644 (file)
--- a/src/main/java/org/xerial/relation/schema/SchemaVisitor.java
+++ b/src/main/java/org/xerial/lens/relation/schema/SchemaVisitor.java
@@ -22,7 +22,7 @@
 // $URL$
 // $Author$
 //--------------------------------------
-package org.xerial.relation.schema;
+package org.xerial.lens.relation.schema;
 
 public interface SchemaVisitor
 {

diff --git a/src/main/java/org/xerial/silk/archive/SilkArchiver.java b/src/main/java/org/xerial/silk/archive/SilkArchiver.java
index 16636d8..e2a0a2c 100644 (file)
--- a/src/main/java/org/xerial/silk/archive/SilkArchiver.java
+++ b/src/main/java/org/xerial/silk/archive/SilkArchiver.java
@@ -24,11 +24,11 @@
 //--------------------------------------\r
 package org.xerial.silk.archive;\r
 \r
-import org.xerial.relation.Node;\r
-import org.xerial.relation.query.AmoebaJoinHandler;\r
-import org.xerial.relation.query.QuerySet;\r
-import org.xerial.relation.query.StreamAmoebaJoin;\r
-import org.xerial.relation.schema.Schema;\r
+import org.xerial.lens.relation.Node;\r
+import org.xerial.lens.relation.query.AmoebaJoinHandler;\r
+import org.xerial.lens.relation.query.QuerySet;\r
+import org.xerial.lens.relation.query.StreamAmoebaJoin;\r
+import org.xerial.lens.relation.schema.Schema;\r
 import org.xerial.silk.schema.SilkSchema;\r
 import org.xerial.util.tree.TreeParser;\r
 \r

diff --git a/src/test/java/org/xerial/relation/query/StreamAmoebaJoinTest.java b/src/test/java/org/xerial/lens/relation/query/StreamAmoebaJoinTest.java
similarity index 71%
rename from src/test/java/org/xerial/relation/query/StreamAmoebaJoinTest.java
rename to src/test/java/org/xerial/lens/relation/query/StreamAmoebaJoinTest.java
index 68fd88e..0571d4e 100644 (file)
--- a/src/test/java/org/xerial/relation/query/StreamAmoebaJoinTest.java
+++ b/src/test/java/org/xerial/lens/relation/query/StreamAmoebaJoinTest.java
@@ -22,19 +22,19 @@
 // $URL$\r
 // $Author$\r
 //--------------------------------------\r
-package org.xerial.relation.query;\r
+package org.xerial.lens.relation.query;\r
 \r
 import static org.junit.Assert.*;\r
 \r
 import org.junit.After;\r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.xerial.relation.DataType;\r
-import org.xerial.relation.FD;\r
-import org.xerial.relation.Node;\r
-import org.xerial.relation.query.QuerySet.QuerySetBuilder;\r
-import org.xerial.relation.schema.Schema;\r
-import org.xerial.relation.schema.SchemaBuilder;\r
+import org.xerial.lens.relation.DataType;\r
+import org.xerial.lens.relation.FD;\r
+import org.xerial.lens.relation.Node;\r
+import org.xerial.lens.relation.query.QuerySet.QuerySetBuilder;\r
+import org.xerial.lens.relation.schema.Schema;\r
+import org.xerial.lens.relation.schema.SchemaBuilder;\r
 import org.xerial.silk.SilkParser;\r
 import org.xerial.silk.SilkParserConfig;\r
 import org.xerial.util.FileResource;\r
@@ -42,48 +42,43 @@ import org.xerial.util.StopWatch;
 import org.xerial.util.log.Logger;\r
 import org.xerial.util.tree.TreeEventHandlerBase;\r
 \r
-public class StreamAmoebaJoinTest\r
-{\r
+public class StreamAmoebaJoinTest {\r
     private static Logger _logger = Logger.getLogger(StreamAmoebaJoinTest.class);\r
 \r
     SilkParserConfig config = new SilkParserConfig();\r
 \r
     @Before\r
-    public void setUp() throws Exception\r
-    {\r
+    public void setUp() throws Exception {\r
         config.bufferSize = 1024 * 1024 * 8; // 8MB\r
         config.numWorkers = 2;\r
     }\r
 \r
     @After\r
-    public void tearDown() throws Exception\r
-    {}\r
+    public void tearDown() throws Exception {}\r
 \r
     @Test\r
-    public void query() throws Exception\r
-    {\r
+    public void query() throws Exception {\r
         QuerySetBuilder qs = new QuerySetBuilder();\r
-        qs.addQueryTarget(new SchemaBuilder().add("coordinate").add("group").add("species").add("revision").add("name")\r
-                .add("sequence").build());\r
-        qs.addQueryTarget(new SchemaBuilder().add("coordinate").add("gene", DataType.STRUCT, FD.ONE_OR_MORE).build());\r
-        qs.addQueryTarget(new SchemaBuilder().add("gene").add("id").add("name").add("start").add("end").add("sequence")\r
-                .build());\r
+        qs.addQueryTarget(new SchemaBuilder().add("coordinate").add("group").add("species").add(\r
+                "revision").add("name").add("sequence").build());\r
+        qs.addQueryTarget(new SchemaBuilder().add("coordinate").add("gene", DataType.STRUCT,\r
+                FD.ONE_OR_MORE).build());\r
+        qs.addQueryTarget(new SchemaBuilder().add("gene").add("id").add("name").add("start").add(\r
+                "end").add("sequence").build());\r
 \r
         StreamAmoebaJoin aj = new StreamAmoebaJoin(qs.build(), new AmoebaJoinHandlerBase() {\r
 \r
-            public void newAmoeba(Schema schema, Node n1, Node n2)\r
-            {\r
+            public void newAmoeba(Schema schema, Node n1, Node n2) {\r
                 _logger.debug(String.format("relation (%s, %s)", n1, n2));\r
             }\r
 \r
-            public void leaveNode(Schema schema, Node node)\r
-            {\r
+            public void leaveNode(Schema schema, Node node) {\r
                 _logger.trace(String.format("leave %s in %s", node, schema));\r
             }\r
 \r
-            public void text(Schema schema, Node contextNode, String nodeName, String text)\r
-            {\r
-                _logger.debug(String.format("text %s:%s of %s in %s", nodeName, text, contextNode, schema));\r
+            public void text(Schema schema, Node contextNode, String nodeName, String text) {\r
+                _logger.debug(String.format("text %s:%s of %s in %s", nodeName, text, contextNode,\r
+                        schema));\r
             }\r
         });\r
 \r
@@ -91,8 +86,7 @@ public class StreamAmoebaJoinTest
     }\r
 \r
     @Test\r
-    public void amoebaTest() throws Exception\r
-    {\r
+    public void amoebaTest() throws Exception {\r
         QuerySetBuilder qs = new QuerySetBuilder();\r
         qs.addQueryTarget(new SchemaBuilder().add("coordinate").add("revision").build());\r
 \r
@@ -100,14 +94,12 @@ public class StreamAmoebaJoinTest
 \r
             int count = 0;\r
 \r
-            public void newAmoeba(Schema schema, Node n1, Node n2)\r
-            {\r
+            public void newAmoeba(Schema schema, Node n1, Node n2) {\r
                 _logger.debug(String.format("relation (%s, %s)", n1, n2));\r
                 count++;\r
             }\r
 \r
-            public void finish()\r
-            {\r
+            public void finish() {\r
                 assertEquals(2, count);\r
             }\r
 \r
@@ -118,20 +110,19 @@ public class StreamAmoebaJoinTest
     }\r
 \r
     @Test\r
-    public void loadScaffold1() throws Exception\r
-    {\r
+    public void loadScaffold1() throws Exception {\r
         QuerySet qs = new QuerySetBuilder().build();\r
         StreamAmoebaJoin aj = new StreamAmoebaJoin(qs, new AmoebaJoinHandlerBase());\r
         StopWatch sw = new StopWatch();\r
-        aj.sweep(new SilkParser(FileResource.find(StreamAmoebaJoinTest.class, "../../silk/scaffold1.silk"), config));\r
+        aj.sweep(new SilkParser(FileResource.find(StreamAmoebaJoinTest.class,\r
+                "../../../silk/scaffold1.silk"), config));\r
         _logger.info("time: " + sw.getElapsedTime());\r
     }\r
 \r
     @Test\r
-    public void silkWalkPerformance() throws Exception\r
-    {\r
-        SilkParser parser = new SilkParser(FileResource.find(StreamAmoebaJoinTest.class, "../../silk/scaffold1.silk"),\r
-                config);\r
+    public void silkWalkPerformance() throws Exception {\r
+        SilkParser parser = new SilkParser(FileResource.find(StreamAmoebaJoinTest.class,\r
+                "../../../silk/scaffold1.silk"), config);\r
         StopWatch sw = new StopWatch();\r
         parser.parse(new TreeEventHandlerBase());\r
         _logger.info("time: " + sw.getElapsedTime());\r

diff --git a/src/test/java/org/xerial/relation/query/gene.silk b/src/test/java/org/xerial/lens/relation/query/gene.silk
similarity index 100%
rename from src/test/java/org/xerial/relation/query/gene.silk
rename to src/test/java/org/xerial/lens/relation/query/gene.silk

diff --git a/src/test/java/org/xerial/relation/query/sample.silk b/src/test/java/org/xerial/lens/relation/query/sample.silk
similarity index 100%
rename from src/test/java/org/xerial/relation/query/sample.silk
rename to src/test/java/org/xerial/lens/relation/query/sample.silk

diff --git a/src/test/java/org/xerial/relation/schema/SchemaNodeTest.java b/src/test/java/org/xerial/lens/relation/schema/SchemaNodeTest.java
similarity index 94%
rename from src/test/java/org/xerial/relation/schema/SchemaNodeTest.java
rename to src/test/java/org/xerial/lens/relation/schema/SchemaNodeTest.java
index 7194b20..536d14f 100644 (file)
--- a/src/test/java/org/xerial/relation/schema/SchemaNodeTest.java
+++ b/src/test/java/org/xerial/lens/relation/schema/SchemaNodeTest.java
@@ -22,7 +22,7 @@
 // $URL$
 // $Author$
 //--------------------------------------
-package org.xerial.relation.schema;
+package org.xerial.lens.relation.schema;
 
 import static org.junit.Assert.*;
 
@@ -35,7 +35,8 @@ import java.lang.reflect.Field;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.xerial.relation.DataType;
+import org.xerial.lens.relation.DataType;
+import org.xerial.lens.relation.schema.SchemaNode;
 
 public class SchemaNodeTest
 {