Synchronizing DyadicDatasetGraph::begin and breaking out Pair.OfSameType into its own compilation unit
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c52dbe4f Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c52dbe4f Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c52dbe4f Branch: refs/heads/master Commit: c52dbe4f9a5e720f4c2e92a8f0bd0ce700b82e45 Parents: 09ceffc Author: ajs6f <[email protected]> Authored: Tue Jan 2 11:30:33 2018 -0500 Committer: ajs6f <[email protected]> Committed: Fri Jan 5 09:32:55 2018 -0500 ---------------------------------------------------------------------- .../jena/sparql/util/DyadicDatasetGraph.java | 10 ++--- .../java/org/apache/jena/atlas/lib/Pair.java | 27 ------------ .../apache/jena/atlas/lib/PairOfSameType.java | 45 ++++++++++++++++++++ 3 files changed, 50 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/c52dbe4f/jena-arq/src/main/java/org/apache/jena/sparql/util/DyadicDatasetGraph.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/DyadicDatasetGraph.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/DyadicDatasetGraph.java index 6b70fd5..25a9055 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/util/DyadicDatasetGraph.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/DyadicDatasetGraph.java @@ -29,7 +29,7 @@ import static org.apache.jena.sparql.util.graph.GraphUtils.triples2quads; import java.util.Iterator; -import org.apache.jena.atlas.lib.Pair; +import org.apache.jena.atlas.lib.PairOfSameType; import org.apache.jena.graph.Graph; import org.apache.jena.graph.Node; import org.apache.jena.graph.compose.MultiUnion; @@ -38,13 +38,13 @@ import org.apache.jena.shared.Lock; import org.apache.jena.sparql.core.DatasetGraph; import org.apache.jena.sparql.core.Quad; -public abstract class DyadicDatasetGraph extends Pair.OfSameType<DatasetGraph> implements DatasetGraph { +public abstract class DyadicDatasetGraph extends PairOfSameType<DatasetGraph> implements DatasetGraph { private Context context; private final Lock lock; - public DyadicDatasetGraph(DatasetGraph left, DatasetGraph right, Context c) { + protected DyadicDatasetGraph(DatasetGraph left, DatasetGraph right, Context c) { super(requireNonNull(left), requireNonNull(right)); this.context = requireNonNull(c); this.lock = new PairLock(left.getLock(), right.getLock()); @@ -60,7 +60,7 @@ public abstract class DyadicDatasetGraph extends Pair.OfSameType<DatasetGraph> i } @Override - public void begin(ReadWrite readWrite) { + public synchronized void begin(ReadWrite readWrite) { switch (readWrite) { case WRITE: throwNoMutationAllowed(); @@ -206,7 +206,7 @@ public abstract class DyadicDatasetGraph extends Pair.OfSameType<DatasetGraph> i return listGraphNodes().hasNext(); } - private static class PairLock extends Pair.OfSameType<Lock> implements Lock { + private static class PairLock extends PairOfSameType<Lock> implements Lock { public PairLock(Lock left, Lock right) { super(left, right); http://git-wip-us.apache.org/repos/asf/jena/blob/c52dbe4f/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 cd925bf..4e248c8 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 @@ -22,9 +22,6 @@ import static org.apache.jena.atlas.lib.Lib.hashCodeObject ; import static org.apache.jena.atlas.lib.StrUtils.str ; import java.util.Objects; -import java.util.function.BiFunction; -import java.util.function.Consumer; -import java.util.function.Function; public class Pair<A, B> { @@ -40,30 +37,6 @@ public class Pair<A, B> public A car() { return a ; } public B cdr() { return b ; } - public static class OfSameType<T> extends Pair<T, T> { - - public OfSameType(T a, T b) { - super(a, b); - } - - public void forEach(Consumer<T> op) { - op.accept(a); - op.accept(b); - } - - public boolean both(Function<T, Boolean> op) { - return apply(Boolean::logicalAnd, op); - } - - public boolean either(Function<T, Boolean> op) { - return apply(Boolean::logicalOr, op); - } - - public <S, X> S apply(BiFunction<X, X, S> f, Function<T, X> op) { - return f.apply(op.apply(a), op.apply(b)); - } - } - @Override public int hashCode() { http://git-wip-us.apache.org/repos/asf/jena/blob/c52dbe4f/jena-base/src/main/java/org/apache/jena/atlas/lib/PairOfSameType.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/PairOfSameType.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/PairOfSameType.java new file mode 100644 index 0000000..5386fe0 --- /dev/null +++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/PairOfSameType.java @@ -0,0 +1,45 @@ +/* + * 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.jena.atlas.lib; + +import java.util.function.*; + +public class PairOfSameType<T> extends Pair<T, T> { + + public PairOfSameType(T a, T b) { + super(a, b); + } + + public void forEach(Consumer<T> op) { + op.accept(a); + op.accept(b); + } + + public boolean both(Function<T, Boolean> op) { + return apply(Boolean::logicalAnd, op); + } + + public boolean either(Function<T, Boolean> op) { + return apply(Boolean::logicalOr, op); + } + + public <S, X> S apply(BiFunction<X, X, S> f, Function<T, X> op) { + return f.apply(op.apply(a), op.apply(b)); + } +} \ No newline at end of file
