You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2015/07/01 12:28:36 UTC
[22/30] marmotta git commit: MARMOTTA-611: added final qualifiers to
selector fields.
MARMOTTA-611: added final qualifiers to selector fields.
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/9458ea2d
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/9458ea2d
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/9458ea2d
Branch: refs/heads/MARMOTTA-588
Commit: 9458ea2d9cdc7c8a1bc70276a01f7050593bcc28
Parents: 7fed0fe
Author: Jakob Frank <ja...@apache.org>
Authored: Fri May 8 10:32:51 2015 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Fri May 8 10:32:51 2015 +0200
----------------------------------------------------------------------
.../ldpath/model/selectors/FunctionSelector.java | 12 ++++--------
.../ldpath/model/selectors/IntersectionSelector.java | 11 +++++------
.../marmotta/ldpath/model/selectors/PathSelector.java | 13 ++++---------
.../ldpath/model/selectors/PropertySelector.java | 9 ++++-----
.../ldpath/model/selectors/StringConstantSelector.java | 10 +++++-----
.../ldpath/model/selectors/TestingSelector.java | 13 ++++++-------
.../marmotta/ldpath/model/selectors/UnionSelector.java | 12 ++++--------
7 files changed, 32 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/9458ea2d/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/FunctionSelector.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/FunctionSelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/FunctionSelector.java
index feee075..ec16081 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/FunctionSelector.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/FunctionSelector.java
@@ -18,17 +18,13 @@
package org.apache.marmotta.ldpath.model.selectors;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.marmotta.ldpath.api.backend.NodeBackend;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.functions.NodeFunction;
import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
+import java.util.*;
+
/**
* Apply a function to the collection of nodes passed as argument of the selector.
*
@@ -38,8 +34,8 @@ import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
*/
public class FunctionSelector<Node> implements NodeSelector<Node> {
- private List<NodeSelector<Node>> selectors;
- private NodeFunction<Collection<Node>,Node> function;
+ private final List<NodeSelector<Node>> selectors;
+ private final NodeFunction<Collection<Node>,Node> function;
public FunctionSelector(NodeFunction<Collection<Node>,Node> function, List<NodeSelector<Node>> selectors) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/9458ea2d/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/IntersectionSelector.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/IntersectionSelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/IntersectionSelector.java
index 86d95ed..295068b 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/IntersectionSelector.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/IntersectionSelector.java
@@ -19,15 +19,14 @@ package org.apache.marmotta.ldpath.model.selectors;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
+import org.apache.marmotta.ldpath.api.backend.NodeBackend;
+import org.apache.marmotta.ldpath.api.backend.RDFBackend;
+import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
import java.util.Collection;
import java.util.List;
import java.util.Map;
-import org.apache.marmotta.ldpath.api.backend.NodeBackend;
-import org.apache.marmotta.ldpath.api.backend.RDFBackend;
-import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
-
/**
* Add file description here!
* <p/>
@@ -35,8 +34,8 @@ import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
*/
public class IntersectionSelector<Node> implements NodeSelector<Node> {
- private NodeSelector<Node> left;
- private NodeSelector<Node> right;
+ private final NodeSelector<Node> left;
+ private final NodeSelector<Node> right;
public IntersectionSelector(NodeSelector<Node> left, NodeSelector<Node> right) {
this.left = left;
http://git-wip-us.apache.org/repos/asf/marmotta/blob/9458ea2d/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/PathSelector.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/PathSelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/PathSelector.java
index 3e6d199..b5bb36f 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/PathSelector.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/PathSelector.java
@@ -18,17 +18,12 @@
package org.apache.marmotta.ldpath.model.selectors;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.marmotta.ldpath.api.backend.NodeBackend;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
+import java.util.*;
+
/**
* Traverse a path by following several edges in the RDF graph. Each step is separated by a "/".
* <p/>
@@ -36,8 +31,8 @@ import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
*/
public class PathSelector<Node> implements NodeSelector<Node> {
- private NodeSelector<Node> left;
- private NodeSelector<Node> right;
+ private final NodeSelector<Node> left;
+ private final NodeSelector<Node> right;
public PathSelector(NodeSelector<Node> left, NodeSelector<Node> right) {
this.left = left;
http://git-wip-us.apache.org/repos/asf/marmotta/blob/9458ea2d/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/PropertySelector.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/PropertySelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/PropertySelector.java
index da0b07e..7bfd5a1 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/PropertySelector.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/PropertySelector.java
@@ -18,16 +18,15 @@
package org.apache.marmotta.ldpath.model.selectors;
import com.google.common.collect.ImmutableList;
+import org.apache.marmotta.ldpath.api.backend.NodeBackend;
+import org.apache.marmotta.ldpath.api.backend.RDFBackend;
+import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.marmotta.ldpath.api.backend.NodeBackend;
-import org.apache.marmotta.ldpath.api.backend.RDFBackend;
-import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
-
/**
* A path definition selecting the value of a property. Either a URI enclosed in <> or a namespace prefix and a
* local name separated by ":"
@@ -36,7 +35,7 @@ import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
*/
public class PropertySelector<Node> implements NodeSelector<Node> {
- private Node property;
+ private final Node property;
public PropertySelector(Node property) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/9458ea2d/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/StringConstantSelector.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/StringConstantSelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/StringConstantSelector.java
index 95a66f3..e4d89c7 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/StringConstantSelector.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/StringConstantSelector.java
@@ -18,15 +18,15 @@
package org.apache.marmotta.ldpath.model.selectors;
+import org.apache.marmotta.ldpath.api.backend.NodeBackend;
+import org.apache.marmotta.ldpath.api.backend.RDFBackend;
+import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
+
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.marmotta.ldpath.api.backend.NodeBackend;
-import org.apache.marmotta.ldpath.api.backend.RDFBackend;
-import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
-
/**
* Add file description here!
* <p/>
@@ -34,7 +34,7 @@ import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
*/
public class StringConstantSelector<Node> implements NodeSelector<Node> {
- private String constant;
+ private final String constant;
public StringConstantSelector(String constant) {
this.constant = constant;
http://git-wip-us.apache.org/repos/asf/marmotta/blob/9458ea2d/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/TestingSelector.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/TestingSelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/TestingSelector.java
index b1a5b49..d6bb737 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/TestingSelector.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/TestingSelector.java
@@ -19,16 +19,15 @@ package org.apache.marmotta.ldpath.model.selectors;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
import org.apache.marmotta.ldpath.api.backend.NodeBackend;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
import org.apache.marmotta.ldpath.api.tests.NodeTest;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
/**
* A node selector that wraps a node test around the selection and delegates the selection to another selector.
* The result set will be filtered based on the node test.
@@ -37,8 +36,8 @@ import org.apache.marmotta.ldpath.api.tests.NodeTest;
*/
public class TestingSelector<Node> implements NodeSelector<Node> {
- private NodeSelector<Node> delegate;
- private NodeTest<Node> test;
+ private final NodeSelector<Node> delegate;
+ private final NodeTest<Node> test;
public TestingSelector(NodeSelector<Node> delegate, NodeTest<Node> test) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/9458ea2d/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/UnionSelector.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/UnionSelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/UnionSelector.java
index f6b7a05..1a24939 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/UnionSelector.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/UnionSelector.java
@@ -18,16 +18,12 @@
package org.apache.marmotta.ldpath.model.selectors;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.marmotta.ldpath.api.backend.NodeBackend;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
+import java.util.*;
+
/**
* Builds the union of two node selectors. Will eliminate duplicates.
*
@@ -37,8 +33,8 @@ import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
*/
public class UnionSelector<Node> implements NodeSelector<Node> {
- private NodeSelector<Node> left;
- private NodeSelector<Node> right;
+ private final NodeSelector<Node> left;
+ private final NodeSelector<Node> right;
public UnionSelector(NodeSelector<Node> left, NodeSelector<Node> right) {
this.left = left;