From 238b009412eaaec26b8d4cc7f658238ee78b9289 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Sun, 22 Mar 2015 10:26:49 -0400
Subject: [PATCH] Refactored the framefactories into their own packages.
---
.../java/com/syncleus/ferma/AbstractElementFrame.java | 2 +-
.../com/syncleus/ferma/DelegatingFramedGraph.java | 4 +++-
.../ferma/DelegatingFramedTransactionalGraph.java | 1 +
.../{ => framefactories}/DefaultFrameFactory.java | 2 +-
.../ferma/{ => framefactories}/FrameFactory.java | 2 +-
.../annotation}/AdjacencyMethodHandler.java | 3 ++-
.../annotation}/AnnotationFrameFactory.java | 11 ++++++++++-
.../annotation}/CachesReflection.java | 2 +-
.../annotation}/InVertexMethodHandler.java | 3 ++-
.../annotation}/IncidenceMethodHandler.java | 3 ++-
.../annotation}/MethodHandler.java | 2 +-
.../annotation}/OutVertexMethodHandler.java | 3 ++-
.../annotation}/PropertyMethodHandler.java | 3 ++-
.../annotation}/ReflectionUtility.java | 2 +-
src/test/java/com/syncleus/ferma/FramedGraphTest.java | 1 +
.../com/syncleus/ferma/SimpleTypeResolverTest.java | 2 +-
16 files changed, 32 insertions(+), 14 deletions(-)
rename src/main/java/com/syncleus/ferma/{ => framefactories}/DefaultFrameFactory.java (97%)
rename src/main/java/com/syncleus/ferma/{ => framefactories}/FrameFactory.java (97%)
rename src/main/java/com/syncleus/ferma/{annotations => framefactories/annotation}/AdjacencyMethodHandler.java (99%)
rename src/main/java/com/syncleus/ferma/{annotations => framefactories/annotation}/AnnotationFrameFactory.java (90%)
rename src/main/java/com/syncleus/ferma/{annotations => framefactories/annotation}/CachesReflection.java (77%)
rename src/main/java/com/syncleus/ferma/{annotations => framefactories/annotation}/InVertexMethodHandler.java (97%)
rename src/main/java/com/syncleus/ferma/{annotations => framefactories/annotation}/IncidenceMethodHandler.java (98%)
rename src/main/java/com/syncleus/ferma/{annotations => framefactories/annotation}/MethodHandler.java (97%)
rename src/main/java/com/syncleus/ferma/{annotations => framefactories/annotation}/OutVertexMethodHandler.java (97%)
rename src/main/java/com/syncleus/ferma/{annotations => framefactories/annotation}/PropertyMethodHandler.java (98%)
rename src/main/java/com/syncleus/ferma/{annotations => framefactories/annotation}/ReflectionUtility.java (98%)
diff --git a/src/main/java/com/syncleus/ferma/AbstractElementFrame.java b/src/main/java/com/syncleus/ferma/AbstractElementFrame.java
index b6a1b254..94081f56 100644
--- a/src/main/java/com/syncleus/ferma/AbstractElementFrame.java
+++ b/src/main/java/com/syncleus/ferma/AbstractElementFrame.java
@@ -29,7 +29,7 @@ package com.syncleus.ferma;
import java.util.Set;
-import com.syncleus.ferma.annotations.CachesReflection;
+import com.syncleus.ferma.framefactories.annotation.CachesReflection;
import com.tinkerpop.blueprints.Element;
/**
diff --git a/src/main/java/com/syncleus/ferma/DelegatingFramedGraph.java b/src/main/java/com/syncleus/ferma/DelegatingFramedGraph.java
index 4a2b8066..bd298e43 100644
--- a/src/main/java/com/syncleus/ferma/DelegatingFramedGraph.java
+++ b/src/main/java/com/syncleus/ferma/DelegatingFramedGraph.java
@@ -27,12 +27,14 @@
*/
package com.syncleus.ferma;
+import com.syncleus.ferma.framefactories.FrameFactory;
+import com.syncleus.ferma.framefactories.DefaultFrameFactory;
import com.syncleus.ferma.typeresolvers.UntypedTypeResolver;
import com.syncleus.ferma.typeresolvers.TypeResolver;
import com.syncleus.ferma.typeresolvers.PolymorphicTypeResolver;
import com.google.common.base.Function;
import com.google.common.collect.Iterators;
-import com.syncleus.ferma.annotations.AnnotationFrameFactory;
+import com.syncleus.ferma.framefactories.annotation.AnnotationFrameFactory;
import com.tinkerpop.blueprints.*;
import java.util.Collection;
diff --git a/src/main/java/com/syncleus/ferma/DelegatingFramedTransactionalGraph.java b/src/main/java/com/syncleus/ferma/DelegatingFramedTransactionalGraph.java
index e0927462..3a38dec5 100644
--- a/src/main/java/com/syncleus/ferma/DelegatingFramedTransactionalGraph.java
+++ b/src/main/java/com/syncleus/ferma/DelegatingFramedTransactionalGraph.java
@@ -18,6 +18,7 @@
******************************************************************************/
package com.syncleus.ferma;
+import com.syncleus.ferma.framefactories.FrameFactory;
import com.syncleus.ferma.typeresolvers.TypeResolver;
import com.tinkerpop.blueprints.TransactionalGraph;
diff --git a/src/main/java/com/syncleus/ferma/DefaultFrameFactory.java b/src/main/java/com/syncleus/ferma/framefactories/DefaultFrameFactory.java
similarity index 97%
rename from src/main/java/com/syncleus/ferma/DefaultFrameFactory.java
rename to src/main/java/com/syncleus/ferma/framefactories/DefaultFrameFactory.java
index 1df52f5f..2f8502a4 100644
--- a/src/main/java/com/syncleus/ferma/DefaultFrameFactory.java
+++ b/src/main/java/com/syncleus/ferma/framefactories/DefaultFrameFactory.java
@@ -16,7 +16,7 @@
* Philadelphia, PA 19148 *
* *
******************************************************************************/
-package com.syncleus.ferma;
+package com.syncleus.ferma.framefactories;
import com.tinkerpop.blueprints.Element;
diff --git a/src/main/java/com/syncleus/ferma/FrameFactory.java b/src/main/java/com/syncleus/ferma/framefactories/FrameFactory.java
similarity index 97%
rename from src/main/java/com/syncleus/ferma/FrameFactory.java
rename to src/main/java/com/syncleus/ferma/framefactories/FrameFactory.java
index 89ddd461..03b177bd 100644
--- a/src/main/java/com/syncleus/ferma/FrameFactory.java
+++ b/src/main/java/com/syncleus/ferma/framefactories/FrameFactory.java
@@ -25,7 +25,7 @@
* Source License: Apache Public License v2.0
* When: November, 20th 2014
*/
-package com.syncleus.ferma;
+package com.syncleus.ferma.framefactories;
import com.tinkerpop.blueprints.Element;
diff --git a/src/main/java/com/syncleus/ferma/annotations/AdjacencyMethodHandler.java b/src/main/java/com/syncleus/ferma/framefactories/annotation/AdjacencyMethodHandler.java
similarity index 99%
rename from src/main/java/com/syncleus/ferma/annotations/AdjacencyMethodHandler.java
rename to src/main/java/com/syncleus/ferma/framefactories/annotation/AdjacencyMethodHandler.java
index a726d7ac..352e1523 100644
--- a/src/main/java/com/syncleus/ferma/annotations/AdjacencyMethodHandler.java
+++ b/src/main/java/com/syncleus/ferma/framefactories/annotation/AdjacencyMethodHandler.java
@@ -16,10 +16,11 @@
* Philadelphia, PA 19148 *
* *
******************************************************************************/
-package com.syncleus.ferma.annotations;
+package com.syncleus.ferma.framefactories.annotation;
import com.syncleus.ferma.typeresolvers.TypeResolver;
import com.syncleus.ferma.*;
+import com.syncleus.ferma.annotations.Adjacency;
import com.tinkerpop.blueprints.Direction;
import com.tinkerpop.gremlin.Tokens;
import net.bytebuddy.dynamic.DynamicType;
diff --git a/src/main/java/com/syncleus/ferma/annotations/AnnotationFrameFactory.java b/src/main/java/com/syncleus/ferma/framefactories/annotation/AnnotationFrameFactory.java
similarity index 90%
rename from src/main/java/com/syncleus/ferma/annotations/AnnotationFrameFactory.java
rename to src/main/java/com/syncleus/ferma/framefactories/annotation/AnnotationFrameFactory.java
index 54182346..3082bfc1 100644
--- a/src/main/java/com/syncleus/ferma/annotations/AnnotationFrameFactory.java
+++ b/src/main/java/com/syncleus/ferma/framefactories/annotation/AnnotationFrameFactory.java
@@ -16,9 +16,18 @@
* Philadelphia, PA 19148 *
* *
******************************************************************************/
-package com.syncleus.ferma.annotations;
+package com.syncleus.ferma.framefactories.annotation;
+import com.syncleus.ferma.framefactories.FrameFactory;
import com.syncleus.ferma.*;
+import com.syncleus.ferma.framefactories.FrameFactory;
+import com.syncleus.ferma.framefactories.annotation.AdjacencyMethodHandler;
+import com.syncleus.ferma.framefactories.annotation.CachesReflection;
+import com.syncleus.ferma.framefactories.annotation.InVertexMethodHandler;
+import com.syncleus.ferma.framefactories.annotation.IncidenceMethodHandler;
+import com.syncleus.ferma.framefactories.annotation.MethodHandler;
+import com.syncleus.ferma.framefactories.annotation.OutVertexMethodHandler;
+import com.syncleus.ferma.framefactories.annotation.PropertyMethodHandler;
import com.tinkerpop.blueprints.Edge;
import com.tinkerpop.blueprints.Element;
import com.tinkerpop.blueprints.Vertex;
diff --git a/src/main/java/com/syncleus/ferma/annotations/CachesReflection.java b/src/main/java/com/syncleus/ferma/framefactories/annotation/CachesReflection.java
similarity index 77%
rename from src/main/java/com/syncleus/ferma/annotations/CachesReflection.java
rename to src/main/java/com/syncleus/ferma/framefactories/annotation/CachesReflection.java
index 1d57e328..e886a7b3 100644
--- a/src/main/java/com/syncleus/ferma/annotations/CachesReflection.java
+++ b/src/main/java/com/syncleus/ferma/framefactories/annotation/CachesReflection.java
@@ -1,4 +1,4 @@
-package com.syncleus.ferma.annotations;
+package com.syncleus.ferma.framefactories.annotation;
import com.syncleus.ferma.ReflectionCache;
diff --git a/src/main/java/com/syncleus/ferma/annotations/InVertexMethodHandler.java b/src/main/java/com/syncleus/ferma/framefactories/annotation/InVertexMethodHandler.java
similarity index 97%
rename from src/main/java/com/syncleus/ferma/annotations/InVertexMethodHandler.java
rename to src/main/java/com/syncleus/ferma/framefactories/annotation/InVertexMethodHandler.java
index 2e96aea3..6e09d731 100644
--- a/src/main/java/com/syncleus/ferma/annotations/InVertexMethodHandler.java
+++ b/src/main/java/com/syncleus/ferma/framefactories/annotation/InVertexMethodHandler.java
@@ -16,9 +16,10 @@
* Philadelphia, PA 19148 *
* *
******************************************************************************/
-package com.syncleus.ferma.annotations;
+package com.syncleus.ferma.framefactories.annotation;
import com.syncleus.ferma.EdgeFrame;
+import com.syncleus.ferma.annotations.InVertex;
import net.bytebuddy.dynamic.DynamicType;
import net.bytebuddy.instrumentation.MethodDelegation;
import net.bytebuddy.instrumentation.method.bytecode.bind.annotation.Origin;
diff --git a/src/main/java/com/syncleus/ferma/annotations/IncidenceMethodHandler.java b/src/main/java/com/syncleus/ferma/framefactories/annotation/IncidenceMethodHandler.java
similarity index 98%
rename from src/main/java/com/syncleus/ferma/annotations/IncidenceMethodHandler.java
rename to src/main/java/com/syncleus/ferma/framefactories/annotation/IncidenceMethodHandler.java
index 1d3cae29..29153dc7 100644
--- a/src/main/java/com/syncleus/ferma/annotations/IncidenceMethodHandler.java
+++ b/src/main/java/com/syncleus/ferma/framefactories/annotation/IncidenceMethodHandler.java
@@ -16,10 +16,11 @@
* Philadelphia, PA 19148 *
* *
******************************************************************************/
-package com.syncleus.ferma.annotations;
+package com.syncleus.ferma.framefactories.annotation;
import com.syncleus.ferma.typeresolvers.TypeResolver;
import com.syncleus.ferma.*;
+import com.syncleus.ferma.annotations.Incidence;
import com.tinkerpop.blueprints.Direction;
import com.tinkerpop.gremlin.Tokens;
import net.bytebuddy.dynamic.DynamicType;
diff --git a/src/main/java/com/syncleus/ferma/annotations/MethodHandler.java b/src/main/java/com/syncleus/ferma/framefactories/annotation/MethodHandler.java
similarity index 97%
rename from src/main/java/com/syncleus/ferma/annotations/MethodHandler.java
rename to src/main/java/com/syncleus/ferma/framefactories/annotation/MethodHandler.java
index e010d53a..c1855653 100644
--- a/src/main/java/com/syncleus/ferma/annotations/MethodHandler.java
+++ b/src/main/java/com/syncleus/ferma/framefactories/annotation/MethodHandler.java
@@ -16,7 +16,7 @@
* Philadelphia, PA 19148 *
* *
******************************************************************************/
-package com.syncleus.ferma.annotations;
+package com.syncleus.ferma.framefactories.annotation;
import net.bytebuddy.dynamic.DynamicType;
diff --git a/src/main/java/com/syncleus/ferma/annotations/OutVertexMethodHandler.java b/src/main/java/com/syncleus/ferma/framefactories/annotation/OutVertexMethodHandler.java
similarity index 97%
rename from src/main/java/com/syncleus/ferma/annotations/OutVertexMethodHandler.java
rename to src/main/java/com/syncleus/ferma/framefactories/annotation/OutVertexMethodHandler.java
index a55d3726..8f1d1432 100644
--- a/src/main/java/com/syncleus/ferma/annotations/OutVertexMethodHandler.java
+++ b/src/main/java/com/syncleus/ferma/framefactories/annotation/OutVertexMethodHandler.java
@@ -16,9 +16,10 @@
* Philadelphia, PA 19148 *
* *
******************************************************************************/
-package com.syncleus.ferma.annotations;
+package com.syncleus.ferma.framefactories.annotation;
import com.syncleus.ferma.EdgeFrame;
+import com.syncleus.ferma.annotations.OutVertex;
import net.bytebuddy.dynamic.DynamicType;
import net.bytebuddy.instrumentation.MethodDelegation;
import net.bytebuddy.instrumentation.method.bytecode.bind.annotation.Origin;
diff --git a/src/main/java/com/syncleus/ferma/annotations/PropertyMethodHandler.java b/src/main/java/com/syncleus/ferma/framefactories/annotation/PropertyMethodHandler.java
similarity index 98%
rename from src/main/java/com/syncleus/ferma/annotations/PropertyMethodHandler.java
rename to src/main/java/com/syncleus/ferma/framefactories/annotation/PropertyMethodHandler.java
index 058c587c..837808ec 100644
--- a/src/main/java/com/syncleus/ferma/annotations/PropertyMethodHandler.java
+++ b/src/main/java/com/syncleus/ferma/framefactories/annotation/PropertyMethodHandler.java
@@ -16,9 +16,10 @@
* Philadelphia, PA 19148 *
* *
******************************************************************************/
-package com.syncleus.ferma.annotations;
+package com.syncleus.ferma.framefactories.annotation;
import com.syncleus.ferma.ElementFrame;
+import com.syncleus.ferma.annotations.Property;
import net.bytebuddy.dynamic.DynamicType;
import net.bytebuddy.instrumentation.MethodDelegation;
import net.bytebuddy.instrumentation.method.bytecode.bind.annotation.Argument;
diff --git a/src/main/java/com/syncleus/ferma/annotations/ReflectionUtility.java b/src/main/java/com/syncleus/ferma/framefactories/annotation/ReflectionUtility.java
similarity index 98%
rename from src/main/java/com/syncleus/ferma/annotations/ReflectionUtility.java
rename to src/main/java/com/syncleus/ferma/framefactories/annotation/ReflectionUtility.java
index 87bedabd..d0df693c 100644
--- a/src/main/java/com/syncleus/ferma/annotations/ReflectionUtility.java
+++ b/src/main/java/com/syncleus/ferma/framefactories/annotation/ReflectionUtility.java
@@ -16,7 +16,7 @@
* Philadelphia, PA 19148 *
* *
******************************************************************************/
-package com.syncleus.ferma.annotations;
+package com.syncleus.ferma.framefactories.annotation;
import com.tinkerpop.blueprints.Vertex;
diff --git a/src/test/java/com/syncleus/ferma/FramedGraphTest.java b/src/test/java/com/syncleus/ferma/FramedGraphTest.java
index 440a13ba..2208353c 100644
--- a/src/test/java/com/syncleus/ferma/FramedGraphTest.java
+++ b/src/test/java/com/syncleus/ferma/FramedGraphTest.java
@@ -18,6 +18,7 @@
******************************************************************************/
package com.syncleus.ferma;
+import com.syncleus.ferma.framefactories.FrameFactory;
import com.syncleus.ferma.typeresolvers.PolymorphicTypeResolver;
import java.util.Collection;
import org.junit.Assert;
diff --git a/src/test/java/com/syncleus/ferma/SimpleTypeResolverTest.java b/src/test/java/com/syncleus/ferma/SimpleTypeResolverTest.java
index 7a806ec4..47c09c56 100644
--- a/src/test/java/com/syncleus/ferma/SimpleTypeResolverTest.java
+++ b/src/test/java/com/syncleus/ferma/SimpleTypeResolverTest.java
@@ -19,7 +19,7 @@
package com.syncleus.ferma;
import com.syncleus.ferma.typeresolvers.PolymorphicTypeResolver;
-import com.syncleus.ferma.annotations.AnnotationFrameFactory;
+import com.syncleus.ferma.framefactories.annotation.AnnotationFrameFactory;
import com.tinkerpop.blueprints.impls.tg.TinkerGraph;
import org.junit.Assert;
import org.junit.Test;
--
GitLab