You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2019/03/17 16:13:25 UTC
[tinkerpop] branch tp4 updated: removed InternalFunction and
NestedFunction interfaces. We are not using them right now. We will
probably need something like this later,
but cleaning up what we aren't currently using.
This is an automated email from the ASF dual-hosted git repository.
okram pushed a commit to branch tp4
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/tp4 by this push:
new 2769868 removed InternalFunction and NestedFunction interfaces. We are not using them right now. We will probably need something like this later, but cleaning up what we aren't currently using.
2769868 is described below
commit 2769868037d278445dcc06588fa26925be9649ce
Author: Marko A. Rodriguez <ok...@gmail.com>
AuthorDate: Sun Mar 17 10:13:17 2019 -0600
removed InternalFunction and NestedFunction interfaces. We are not using them right now. We will probably need something like this later, but cleaning up what we aren't currently using.
---
.../tinkerpop/machine/function/BranchFunction.java | 2 +-
.../machine/function/InternalFunction.java | 26 ---------------------
.../tinkerpop/machine/function/NestedFunction.java | 27 ----------------------
.../machine/function/filter/FilterFilter.java | 4 ++--
.../tinkerpop/machine/function/map/MapMap.java | 3 +--
.../machine/function/reduce/GroupCountReduce.java | 3 +--
6 files changed, 5 insertions(+), 60 deletions(-)
diff --git a/java/core/src/main/java/org/apache/tinkerpop/machine/function/BranchFunction.java b/java/core/src/main/java/org/apache/tinkerpop/machine/function/BranchFunction.java
index a58a6f8..73a7fb2 100644
--- a/java/core/src/main/java/org/apache/tinkerpop/machine/function/BranchFunction.java
+++ b/java/core/src/main/java/org/apache/tinkerpop/machine/function/BranchFunction.java
@@ -27,7 +27,7 @@ import java.util.Map;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public interface BranchFunction<C, S, E, M> extends InternalFunction<C> {
+public interface BranchFunction<C, S, E, M> extends CFunction<C> {
public Selector<C, S, M> getBranchSelector();
diff --git a/java/core/src/main/java/org/apache/tinkerpop/machine/function/InternalFunction.java b/java/core/src/main/java/org/apache/tinkerpop/machine/function/InternalFunction.java
deleted file mode 100644
index 75809ca..0000000
--- a/java/core/src/main/java/org/apache/tinkerpop/machine/function/InternalFunction.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.machine.function;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public interface InternalFunction<C> extends CFunction<C> {
-
-}
diff --git a/java/core/src/main/java/org/apache/tinkerpop/machine/function/NestedFunction.java b/java/core/src/main/java/org/apache/tinkerpop/machine/function/NestedFunction.java
deleted file mode 100644
index b31045d..0000000
--- a/java/core/src/main/java/org/apache/tinkerpop/machine/function/NestedFunction.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.machine.function;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public interface NestedFunction<C> extends InternalFunction<C> {
-
-
-}
diff --git a/java/core/src/main/java/org/apache/tinkerpop/machine/function/filter/FilterFilter.java b/java/core/src/main/java/org/apache/tinkerpop/machine/function/filter/FilterFilter.java
index ec841e4..ba29b88 100644
--- a/java/core/src/main/java/org/apache/tinkerpop/machine/function/filter/FilterFilter.java
+++ b/java/core/src/main/java/org/apache/tinkerpop/machine/function/filter/FilterFilter.java
@@ -21,8 +21,8 @@ package org.apache.tinkerpop.machine.function.filter;
import org.apache.tinkerpop.machine.bytecode.Compilation;
import org.apache.tinkerpop.machine.coefficient.Coefficient;
import org.apache.tinkerpop.machine.function.AbstractFunction;
+import org.apache.tinkerpop.machine.function.CFunction;
import org.apache.tinkerpop.machine.function.FilterFunction;
-import org.apache.tinkerpop.machine.function.NestedFunction;
import org.apache.tinkerpop.machine.traverser.Traverser;
import org.apache.tinkerpop.util.StringFactory;
@@ -31,7 +31,7 @@ import java.util.Set;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public final class FilterFilter<C, S> extends AbstractFunction<C> implements FilterFunction<C, S>, NestedFunction<C> {
+public final class FilterFilter<C, S> extends AbstractFunction<C> implements FilterFunction<C, S> {
private final Compilation<C, S, ?> internalFilter;
diff --git a/java/core/src/main/java/org/apache/tinkerpop/machine/function/map/MapMap.java b/java/core/src/main/java/org/apache/tinkerpop/machine/function/map/MapMap.java
index 719b3e7..8333d76 100644
--- a/java/core/src/main/java/org/apache/tinkerpop/machine/function/map/MapMap.java
+++ b/java/core/src/main/java/org/apache/tinkerpop/machine/function/map/MapMap.java
@@ -22,7 +22,6 @@ import org.apache.tinkerpop.machine.bytecode.Compilation;
import org.apache.tinkerpop.machine.coefficient.Coefficient;
import org.apache.tinkerpop.machine.function.AbstractFunction;
import org.apache.tinkerpop.machine.function.MapFunction;
-import org.apache.tinkerpop.machine.function.NestedFunction;
import org.apache.tinkerpop.machine.traverser.Traverser;
import org.apache.tinkerpop.util.StringFactory;
@@ -31,7 +30,7 @@ import java.util.Set;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public class MapMap<C, S, E> extends AbstractFunction<C> implements MapFunction<C, S, E>, NestedFunction<C> {
+public class MapMap<C, S, E> extends AbstractFunction<C> implements MapFunction<C, S, E> {
private final Compilation<C, S, E> internalMap;
diff --git a/java/core/src/main/java/org/apache/tinkerpop/machine/function/reduce/GroupCountReduce.java b/java/core/src/main/java/org/apache/tinkerpop/machine/function/reduce/GroupCountReduce.java
index 8e66345..db2b96c 100644
--- a/java/core/src/main/java/org/apache/tinkerpop/machine/function/reduce/GroupCountReduce.java
+++ b/java/core/src/main/java/org/apache/tinkerpop/machine/function/reduce/GroupCountReduce.java
@@ -22,7 +22,6 @@ import org.apache.tinkerpop.machine.bytecode.Compilation;
import org.apache.tinkerpop.machine.coefficient.Coefficient;
import org.apache.tinkerpop.machine.function.AbstractFunction;
import org.apache.tinkerpop.machine.function.ReduceFunction;
-import org.apache.tinkerpop.machine.function.NestedFunction;
import org.apache.tinkerpop.machine.traverser.Traverser;
import java.util.HashMap;
@@ -32,7 +31,7 @@ import java.util.Set;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public class GroupCountReduce<C, S, E> extends AbstractFunction<C> implements ReduceFunction<C, S, Map<E, Long>>, NestedFunction<C> {
+public class GroupCountReduce<C, S, E> extends AbstractFunction<C> implements ReduceFunction<C, S, Map<E, Long>> {
private final Compilation<C, S, E> byCompilation;