Remove @deprecated Predicate and Supplier

neo4j · Mar 30, 2016 · 90e56c7 · 90e56c7
1 parent aeb8c9c
commit 90e56c7
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 81 deletions.
diff --git a/community/common/src/main/java/org/neo4j/function/Predicate.java b/community/common/src/main/java/org/neo4j/function/Predicate.java
diff --git a/community/common/src/main/java/org/neo4j/function/Supplier.java b/community/common/src/main/java/org/neo4j/function/Supplier.java
diff --git a/...er/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/GeneratedQueryStructure.scala b/...er/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/GeneratedQueryStructure.scala
@@ -71,7 +71,7 @@ object GeneratedQueryStructure extends CodeStructure[GeneratedQuery] {
         ro = clazz.field(typeRef[ReadOperations], "ro"),
         nodeManager = clazz.field(typeRef[NodeManager], "nodeManager"),
         executionMode = clazz.field(typeRef[ExecutionMode], "executionMode"),
-        description = clazz.field(typeRef[org.neo4j.function.Supplier[InternalPlanDescription]], "description"),
+        description = clazz.field(typeRef[java.util.function.Supplier[InternalPlanDescription]], "description"),
         tracer = clazz.field(typeRef[QueryExecutionTracer], "tracer"),
         params = clazz.field(typeRef[util.Map[String, Object]], "params"),
         closeable = clazz.field(typeRef[SuccessfulCloseable], "closeable"),
@@ -115,15 +115,15 @@ object GeneratedQueryStructure extends CodeStructure[GeneratedQuery] {
         param[Statement]("statement"),
         param[NodeManager]("nodeManager"),
         param[ExecutionMode]("executionMode"),
-        param[org.neo4j.function.Supplier[InternalPlanDescription]]("description"),
+        param[java.util.function.Supplier[InternalPlanDescription]]("description"),
         param[QueryExecutionTracer]("tracer"),
         param[util.Map[String, Object]]("params"))) { execute =>
         execute.returns(Expression.invoke(Expression.newInstance(execution), MethodReference.constructorReference(execution,
           typeRef[TaskCloser],
           typeRef[Statement],
           typeRef[NodeManager],
           typeRef[ExecutionMode],
-          typeRef[org.neo4j.function.Supplier[InternalPlanDescription]],
+          typeRef[java.util.function.Supplier[InternalPlanDescription]],
           typeRef[QueryExecutionTracer],
           typeRef[util.Map[String, Object]]),
           execute.load("closer"),
@@ -847,13 +847,13 @@ private object Templates {
     param[Statement]("statement"),
     param[NodeManager]("nodeManager"),
     param[ExecutionMode]("executionMode"),
-    param[org.neo4j.function.Supplier[InternalPlanDescription]]("description"),
+    param[java.util.function.Supplier[InternalPlanDescription]]("description"),
     param[QueryExecutionTracer]("tracer"),
     param[util.Map[String, Object]]("params")).
     put(self(), typeRef[TaskCloser], "closer", load("closer")).
     put(self(), typeRef[ReadOperations], "ro", invoke(load("statement"), method[Statement, ReadOperations]("readOperations"))).
     put(self(), typeRef[ExecutionMode], "executionMode", load("executionMode")).
-    put(self(), typeRef[org.neo4j.function.Supplier[InternalPlanDescription]], "description", load("description")).
+    put(self(), typeRef[java.util.function.Supplier[InternalPlanDescription]], "description", load("description")).
     put(self(), typeRef[QueryExecutionTracer], "tracer", load("tracer")).
     put(self(), typeRef[util.Map[String, Object]], "params", load("params")).
     put(self(), typeRef[NodeManager], "nodeManager", load("nodeManager")).
@@ -873,7 +873,7 @@ private object Templates {
     returns(get(self(), typeRef[ExecutionMode], "executionMode")).
     build()
   val EXECUTION_PLAN_DESCRIPTION = MethodTemplate.method(typeRef[InternalPlanDescription], "executionPlanDescription").
-    returns(invoke(get(self(), typeRef[org.neo4j.function.Supplier[InternalPlanDescription]], "description"), method[org.neo4j.function.Supplier[InternalPlanDescription], InternalPlanDescription]("get"))).
+    returns(invoke(get(self(), typeRef[java.util.function.Supplier[InternalPlanDescription]], "description"), method[java.util.function.Supplier[InternalPlanDescription], InternalPlanDescription]("get"))).
     build()
   val JAVA_COLUMNS = MethodTemplate.method(typeRef[util.List[String]], "javaColumns").
     returns(get(typeRef[util.List[String]], "COLUMNS")).

diff --git a/...db/traversal/AbstractSelectorOrderer.java → ...pl/traversal/AbstractSelectorOrderer.java b/...db/traversal/AbstractSelectorOrderer.java → ...pl/traversal/AbstractSelectorOrderer.java
@@ -17,24 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.graphdb.traversal;
+package org.neo4j.graphdb.impl.traversal;
 
 import org.neo4j.graphdb.Direction;
+import org.neo4j.graphdb.traversal.BranchSelector;
+import org.neo4j.graphdb.traversal.SideSelector;
+import org.neo4j.graphdb.traversal.TraversalBranch;
+import org.neo4j.graphdb.traversal.TraversalContext;
 
-/**
- * @deprecated This will be moved to internal packages in the next major release.
- */
-@Deprecated
 public abstract class AbstractSelectorOrderer<T> implements SideSelector
 {
-    private static final BranchSelector EMPTY_SELECTOR = new BranchSelector()
-    {
-        @Override
-        public TraversalBranch next( TraversalContext metadata )
-        {
-            return null;
-        }
-    };
+    private static final BranchSelector EMPTY_SELECTOR = metadata -> null;
 
     private final BranchSelector[] selectors;
     @SuppressWarnings( "unchecked" )
@@ -97,8 +90,7 @@ private TraversalBranch nextBranchFromSelector( TraversalContext metadata,
     protected BranchSelector nextSelector()
     {
         selectorIndex = (selectorIndex+1)%2;
-        BranchSelector selector = selectors[selectorIndex];
-        return selector;
+        return selectors[selectorIndex];
     }
 
     @Override

diff --git a/...ity/graphdb-api/src/main/java/org/neo4j/graphdb/traversal/AlternatingSelectorOrderer.java b/...ity/graphdb-api/src/main/java/org/neo4j/graphdb/traversal/AlternatingSelectorOrderer.java
@@ -19,6 +19,8 @@
  */
 package org.neo4j.graphdb.traversal;
 
+import org.neo4j.graphdb.impl.traversal.AbstractSelectorOrderer;
+
 public class AlternatingSelectorOrderer extends AbstractSelectorOrderer<Integer>
 {
     public AlternatingSelectorOrderer( BranchSelector startSelector, BranchSelector endSelector )

diff --git a/community/graphdb-api/src/main/java/org/neo4j/graphdb/traversal/LevelSelectorOrderer.java b/community/graphdb-api/src/main/java/org/neo4j/graphdb/traversal/LevelSelectorOrderer.java
@@ -22,6 +22,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.neo4j.graphdb.Direction;
+import org.neo4j.graphdb.impl.traversal.AbstractSelectorOrderer;
 
 public class LevelSelectorOrderer extends AbstractSelectorOrderer<LevelSelectorOrderer.Entry>
 {