Renaming join -> apply
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/018a706f Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/018a706f Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/018a706f Branch: refs/heads/master Commit: 018a706fa3d973712354d9fc4c0a635e77039ef6 Parents: da59884 Author: ajs6f <[email protected]> Authored: Mon Jan 1 19:44:24 2018 -0500 Committer: ajs6f <[email protected]> Committed: Fri Jan 5 09:32:55 2018 -0500 ---------------------------------------------------------------------- .../org/apache/jena/sparql/util/DifferenceDatasetGraph.java | 2 +- .../org/apache/jena/sparql/util/IntersectionDatasetGraph.java | 2 +- .../java/org/apache/jena/sparql/util/UnionDatasetGraph.java | 4 ++-- jena-base/src/main/java/org/apache/jena/atlas/lib/Pair.java | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/018a706f/jena-arq/src/main/java/org/apache/jena/sparql/util/DifferenceDatasetGraph.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/DifferenceDatasetGraph.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/DifferenceDatasetGraph.java index 7febc9a..c092b34 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/util/DifferenceDatasetGraph.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/DifferenceDatasetGraph.java @@ -36,7 +36,7 @@ public class DifferenceDatasetGraph extends ViewDatasetGraph { } private Graph difference(Function<DatasetGraph, Graph> op) { - return join(DifferenceView::new, op); + return apply(DifferenceView::new, op); } @Override http://git-wip-us.apache.org/repos/asf/jena/blob/018a706f/jena-arq/src/main/java/org/apache/jena/sparql/util/IntersectionDatasetGraph.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/IntersectionDatasetGraph.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/IntersectionDatasetGraph.java index ade1de2..52bcbc3 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/util/IntersectionDatasetGraph.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/IntersectionDatasetGraph.java @@ -36,7 +36,7 @@ public class IntersectionDatasetGraph extends ViewDatasetGraph { } Graph intersect(Function<DatasetGraph, Graph> op) { - return join(IntersectionView::new, op); + return apply(IntersectionView::new, op); } @Override http://git-wip-us.apache.org/repos/asf/jena/blob/018a706f/jena-arq/src/main/java/org/apache/jena/sparql/util/UnionDatasetGraph.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/UnionDatasetGraph.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/UnionDatasetGraph.java index a78bbb6..ebcdae4 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/util/UnionDatasetGraph.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/UnionDatasetGraph.java @@ -34,11 +34,11 @@ public class UnionDatasetGraph extends ViewDatasetGraph { } private Graph union(Function<DatasetGraph, Graph> op) { - return join(UnionView::new, op); + return apply(UnionView::new, op); } <T> Iter<T> fromEach(Function<DatasetGraph, Iterator<T>> op) { - return join(Iter::concat, op).distinct(); + return apply(Iter::concat, op).distinct(); } @Override http://git-wip-us.apache.org/repos/asf/jena/blob/018a706f/jena-base/src/main/java/org/apache/jena/atlas/lib/Pair.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/Pair.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/Pair.java index 097e147..cd925bf 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/lib/Pair.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/Pair.java @@ -52,14 +52,14 @@ public class Pair<A, B> } public boolean both(Function<T, Boolean> op) { - return join(Boolean::logicalAnd, op); + return apply(Boolean::logicalAnd, op); } public boolean either(Function<T, Boolean> op) { - return join(Boolean::logicalOr, op); + return apply(Boolean::logicalOr, op); } - public <S, X> S join(BiFunction<X, X, S> f, Function<T, X> op) { + public <S, X> S apply(BiFunction<X, X, S> f, Function<T, X> op) { return f.apply(op.apply(a), op.apply(b)); } }
