You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2016/11/19 17:45:15 UTC
[2/6] marmotta git commit: code style cleanups across the whole
source code
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/functions/NodeFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/functions/NodeFunction.java b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/functions/NodeFunction.java
index 17fc40d..dfc62ee 100644
--- a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/functions/NodeFunction.java
+++ b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/functions/NodeFunction.java
@@ -18,12 +18,12 @@
package org.apache.marmotta.ldpath.api.functions;
-import java.util.Collection;
-
import org.apache.marmotta.ldpath.api.LDPathConstruct;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
+import java.util.Collection;
+
/**
* A function applied to nodes.
*
@@ -44,7 +44,7 @@ public interface NodeFunction<T,Node> extends LDPathConstruct<Node> {
* @param args a nested list of KiWiNodes
* @return
*/
- public T apply(RDFBackend<Node> backend, Node context, @SuppressWarnings("unchecked") Collection<Node>... args) throws IllegalArgumentException;
+ T apply(RDFBackend<Node> backend, Node context, @SuppressWarnings("unchecked") Collection<Node>... args) throws IllegalArgumentException;
/**
* A string describing the signature of this node function, e.g. "fn:content(uris : Nodes) : Nodes". The
@@ -52,11 +52,11 @@ public interface NodeFunction<T,Node> extends LDPathConstruct<Node> {
* purposes only.
* @return
*/
- public String getSignature();
+ String getSignature();
/**
* A short human-readable description of what the node function does.
* @return
*/
- public String getDescription();
+ String getDescription();
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/selectors/NodeSelector.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/selectors/NodeSelector.java b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/selectors/NodeSelector.java
index 655de4f..93d2c80 100644
--- a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/selectors/NodeSelector.java
+++ b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/selectors/NodeSelector.java
@@ -18,14 +18,14 @@
package org.apache.marmotta.ldpath.api.selectors;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
import org.apache.marmotta.ldpath.api.LDPathConstruct;
import org.apache.marmotta.ldpath.api.backend.NodeBackend;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
/**
* A node selector takes as argument a KiWiNode and returns a collection of selected
* <p/>
@@ -44,7 +44,7 @@ public interface NodeSelector<Node> extends LDPathConstruct<Node> {
* if null, path tracking is disabled and the path argument is ignored
* @return the collection of selected nodes
*/
- public Collection<Node> select(RDFBackend<Node> backend, Node context, List<Node> path, Map<Node,List<Node>> resultPaths);
+ Collection<Node> select(RDFBackend<Node> backend, Node context, List<Node> path, Map<Node, List<Node>> resultPaths);
/**
@@ -56,5 +56,5 @@ public interface NodeSelector<Node> extends LDPathConstruct<Node> {
*
* @throws UnsupportedOperationException in case returning a name is not reasonable
*/
- public String getName(NodeBackend<Node> backend);
+ String getName(NodeBackend<Node> backend);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/transformers/NodeTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/transformers/NodeTransformer.java b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/transformers/NodeTransformer.java
index 4141e7b..8a56530 100644
--- a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/transformers/NodeTransformer.java
+++ b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/transformers/NodeTransformer.java
@@ -17,10 +17,10 @@
*/
package org.apache.marmotta.ldpath.api.transformers;
-import java.util.Map;
-
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
+import java.util.Map;
+
/**
* Implementations of this interface allow to transform KiWiNode objects into the type T. This is
* currently required by the indexer to map KiWiNodes to the Java types corresponding to the
@@ -43,6 +43,6 @@ public interface NodeTransformer<T,Node> {
* @param configuration the field configuration used when defining the LDPath rule
* @return
*/
- public T transform(RDFBackend<Node> backend, Node node, Map<String, String> configuration) throws IllegalArgumentException;
+ T transform(RDFBackend<Node> backend, Node node, Map<String, String> configuration) throws IllegalArgumentException;
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/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 ec16081..017d9fa 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
@@ -150,11 +150,8 @@ public class FunctionSelector<Node> implements NodeSelector<Node> {
if (function != null ? !function.equals(that.function) : that.function != null) {
return false;
}
- if (selectors != null ? !selectors.equals(that.selectors) : that.selectors != null) {
- return false;
- }
+ return selectors != null ? selectors.equals(that.selectors) : that.selectors == null;
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/GroupedSelector.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/GroupedSelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/GroupedSelector.java
index 587ccee..48bced3 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/GroupedSelector.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/GroupedSelector.java
@@ -18,14 +18,14 @@
package org.apache.marmotta.ldpath.model.selectors;
-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 java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
/**
* A Group is a complex selector in brackets.
*
@@ -94,9 +94,8 @@ public class GroupedSelector<Node> implements NodeSelector<Node> {
@SuppressWarnings("rawtypes")
GroupedSelector that = (GroupedSelector) o;
- if (content!= null ? !content.equals(that.content) : that.content!= null) return false;
+ return content != null ? content.equals(that.content) : that.content == null;
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/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 b5bb36f..448f831 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
@@ -99,9 +99,8 @@ public class PathSelector<Node> implements NodeSelector<Node> {
PathSelector that = (PathSelector) o;
if (left != null ? !left.equals(that.left) : that.left != null) return false;
- if (right != null ? !right.equals(that.right) : that.right != null) return false;
+ return right != null ? right.equals(that.right) : that.right == null;
- return true;
}
/**
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/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 7bfd5a1..263fadf 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
@@ -110,9 +110,8 @@ public class PropertySelector<Node> implements NodeSelector<Node> {
@SuppressWarnings("rawtypes")
PropertySelector that = (PropertySelector) o;
- if (property != null ? !property.equals(that.property) : that.property != null) return false;
+ return property != null ? property.equals(that.property) : that.property == null;
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/RecursivePathSelector.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/RecursivePathSelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/RecursivePathSelector.java
index 1019a5c..8eb160b 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/RecursivePathSelector.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/RecursivePathSelector.java
@@ -18,13 +18,15 @@
package org.apache.marmotta.ldpath.model.selectors;
import com.google.common.collect.ImmutableList;
-
-import java.util.*;
-
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.LinkedList;
+import java.util.List;
+import java.util.Map;
+
public class RecursivePathSelector<Node> implements NodeSelector<Node> {
private final NodeSelector<Node> delegate;
@@ -192,9 +194,8 @@ public class RecursivePathSelector<Node> implements NodeSelector<Node> {
RecursivePathSelector<Node> that = (RecursivePathSelector<Node>) o;
if (delegate != null ? !delegate.equals(that.delegate) : that.delegate != null) return false;
- if (minRecursions != that.minRecursions || maxRecursions != that.maxRecursions) return false;
+ return !(minRecursions != that.minRecursions || maxRecursions != that.maxRecursions);
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/ReversePropertySelector.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/ReversePropertySelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/ReversePropertySelector.java
index ba5086d..28abe04 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/ReversePropertySelector.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/ReversePropertySelector.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;
-
/**
* Perform a reverse navigation step over the property wrapped by this selector
*
@@ -104,9 +103,8 @@ public class ReversePropertySelector<Node> implements NodeSelector<Node> {
@SuppressWarnings("rawtypes")
ReversePropertySelector that = (ReversePropertySelector) o;
- if (property != null ? !property.equals(that.property) : that.property != null) return false;
+ return property != null ? property.equals(that.property) : that.property == null;
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/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 e4d89c7..3b9afba 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
@@ -95,9 +95,8 @@ public class StringConstantSelector<Node> implements NodeSelector<Node> {
@SuppressWarnings("rawtypes")
StringConstantSelector that = (StringConstantSelector) o;
- if (constant != null ? !constant.equals(that.constant) : that.constant != null) return false;
+ return constant != null ? constant.equals(that.constant) : that.constant == null;
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/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 d6bb737..17cd363 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
@@ -123,11 +123,8 @@ public class TestingSelector<Node> implements NodeSelector<Node> {
if (delegate != null ? !delegate.equals(that.delegate) : that.delegate != null) {
return false;
}
- if (test != null ? !test.equals(that.test) : that.test != null) {
- return false;
- }
+ return test != null ? test.equals(that.test) : that.test == null;
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/WildcardSelector.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/WildcardSelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/WildcardSelector.java
index 480c687..cbd6055 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/WildcardSelector.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/WildcardSelector.java
@@ -40,8 +40,7 @@ public class WildcardSelector<Node> extends PropertySelector<Node> implements No
@Override
public boolean equals(Object o) {
if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ return !(o == null || getClass() != o.getClass());
- return true;
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/AndTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/AndTest.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/AndTest.java
index 5c0300c..8e6ea95 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/AndTest.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/AndTest.java
@@ -117,11 +117,8 @@ public class AndTest<Node> extends ComplexTest<Node> {
if (left != null ? !left.equals(andTest.left) : andTest.left != null) {
return false;
}
- if (right != null ? !right.equals(andTest.right) : andTest.right != null) {
- return false;
- }
+ return right != null ? right.equals(andTest.right) : andTest.right == null;
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/LiteralLanguageTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/LiteralLanguageTest.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/LiteralLanguageTest.java
index 07f56d7..0d7954a 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/LiteralLanguageTest.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/LiteralLanguageTest.java
@@ -115,11 +115,8 @@ public class LiteralLanguageTest<Node> extends NodeTest<Node> {
@SuppressWarnings("rawtypes")
LiteralLanguageTest that = (LiteralLanguageTest) o;
- if (lang != null ? !lang.equals(that.lang) : that.lang != null) {
- return false;
- }
+ return lang != null ? lang.equals(that.lang) : that.lang == null;
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/LiteralTypeTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/LiteralTypeTest.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/LiteralTypeTest.java
index b4d1768..893d32e 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/LiteralTypeTest.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/LiteralTypeTest.java
@@ -124,11 +124,8 @@ public class LiteralTypeTest<Node> extends NodeTest<Node> {
@SuppressWarnings("rawtypes")
LiteralTypeTest that = (LiteralTypeTest) o;
- if (typeUri != null ? !typeUri.equals(that.typeUri) : that.typeUri != null) {
- return false;
- }
+ return typeUri != null ? typeUri.equals(that.typeUri) : that.typeUri == null;
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/NotTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/NotTest.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/NotTest.java
index ca98892..b4053d1 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/NotTest.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/NotTest.java
@@ -85,11 +85,8 @@ public class NotTest<Node> extends NodeTest<Node> {
@SuppressWarnings("rawtypes")
NotTest notTest = (NotTest) o;
- if (delegate != null ? !delegate.equals(notTest.delegate) : notTest.delegate != null) {
- return false;
- }
+ return delegate != null ? delegate.equals(notTest.delegate) : notTest.delegate == null;
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/OrTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/OrTest.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/OrTest.java
index 8553cb0..e4b7786 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/OrTest.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/OrTest.java
@@ -108,9 +108,8 @@ public class OrTest<Node> extends ComplexTest<Node> {
OrTest orTest = (OrTest) o;
if (left != null ? !left.equals(orTest.left) : orTest.left != null) { return false; }
- if (right != null ? !right.equals(orTest.right) : orTest.right != null) { return false; }
+ return right != null ? right.equals(orTest.right) : orTest.right == null;
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/PathEqualityTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/PathEqualityTest.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/PathEqualityTest.java
index da46028..656f1d8 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/PathEqualityTest.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/PathEqualityTest.java
@@ -128,11 +128,8 @@ public class PathEqualityTest<Node> extends NodeTest<Node> {
if (node != null ? !node.equals(that.node) : that.node != null) {
return false;
}
- if (path != null ? !path.equals(that.path) : that.path != null) {
- return false;
- }
+ return path != null ? path.equals(that.path) : that.path == null;
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/PathTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/PathTest.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/PathTest.java
index 00b0958..6499897 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/PathTest.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/PathTest.java
@@ -107,9 +107,8 @@ public class PathTest<Node> extends NodeTest<Node> {
@SuppressWarnings("rawtypes")
PathTest pathTest = (PathTest) o;
- if (path != null ? !path.equals(pathTest.path) : pathTest.path != null) { return false; }
+ return path != null ? path.equals(pathTest.path) : pathTest.path == null;
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ostrich/backend/ldpath/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/libraries/ostrich/backend/ldpath/CMakeLists.txt b/libraries/ostrich/backend/ldpath/CMakeLists.txt
new file mode 100644
index 0000000..65e33f7
--- /dev/null
+++ b/libraries/ostrich/backend/ldpath/CMakeLists.txt
@@ -0,0 +1,6 @@
+include_directories(.. ${CMAKE_CURRENT_BINARY_DIR}/..)
+
+add_library(marmotta_ldpath
+ ldpath_model.h ldpath_model.cc
+ parser_base.h parser_base.cc)
+target_link_libraries(marmotta_ldpath ${CMAKE_THREAD_LIBS_INIT})
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ostrich/backend/ldpath/ldpath_model.cc
----------------------------------------------------------------------
diff --git a/libraries/ostrich/backend/ldpath/ldpath_model.cc b/libraries/ostrich/backend/ldpath/ldpath_model.cc
new file mode 100644
index 0000000..17d7721
--- /dev/null
+++ b/libraries/ostrich/backend/ldpath/ldpath_model.cc
@@ -0,0 +1,26 @@
+//
+// Created by wastl on 15.02.16.
+//
+
+#include "ldpath_model.h"
+
+namespace marmotta {
+namespace ldpath {
+namespace model {
+
+std::vector<rdf::Value> PropertySelector::select(
+ const RDFBackend *backend, const rdf::Value &context) const {
+ return backend->listObjects(context, property);
+}
+
+std::string PropertySelector::getPathExpression() const {
+ std::string s = "<";
+ s += property.getUri();
+ s += ">";
+ return s;
+}
+
+}
+}
+}
+
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ostrich/backend/ldpath/ldpath_model.h
----------------------------------------------------------------------
diff --git a/libraries/ostrich/backend/ldpath/ldpath_model.h b/libraries/ostrich/backend/ldpath/ldpath_model.h
new file mode 100644
index 0000000..6275033
--- /dev/null
+++ b/libraries/ostrich/backend/ldpath/ldpath_model.h
@@ -0,0 +1,46 @@
+//
+// Created by wastl on 15.02.16.
+//
+
+#ifndef MARMOTTA_LDPATH_MODEL_H
+#define MARMOTTA_LDPATH_MODEL_H
+
+#include <vector>
+#include <string>
+
+#include "model/rdf_model.h"
+
+namespace marmotta {
+namespace ldpath {
+namespace model {
+
+class RDFBackend {
+ public:
+ virtual std::vector<rdf::Value> listObjects(const rdf::Value& subject, const rdf::Value& property) const = 0;
+
+ virtual std::vector<rdf::Value> listSubjects(const rdf::Value& property, const rdf::Value& object) const = 0;
+};
+
+
+class NodeSelector {
+ public:
+ virtual std::vector<rdf::Value> select(const RDFBackend* backend, const rdf::Value& context) const = 0;
+
+ virtual std::string getPathExpression() const = 0;
+};
+
+class PropertySelector : public NodeSelector {
+ public:
+ PropertySelector(const rdf::URI& property) : property(property) {}
+
+ std::vector<rdf::Value> select(const RDFBackend* backend, const rdf::Value& context) const override;
+ std::string getPathExpression() const override;
+
+ private:
+ rdf::URI property;
+};
+}
+}
+}
+
+#endif //MARMOTTA_LDPATH_MODEL_H
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ostrich/backend/ldpath/parser_base.cc
----------------------------------------------------------------------
diff --git a/libraries/ostrich/backend/ldpath/parser_base.cc b/libraries/ostrich/backend/ldpath/parser_base.cc
new file mode 100644
index 0000000..089bcf4
--- /dev/null
+++ b/libraries/ostrich/backend/ldpath/parser_base.cc
@@ -0,0 +1,5 @@
+//
+// Created by wastl on 15.02.16.
+//
+
+#include "parser_base.h"
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ostrich/backend/ldpath/parser_base.h
----------------------------------------------------------------------
diff --git a/libraries/ostrich/backend/ldpath/parser_base.h b/libraries/ostrich/backend/ldpath/parser_base.h
new file mode 100644
index 0000000..ba415de
--- /dev/null
+++ b/libraries/ostrich/backend/ldpath/parser_base.h
@@ -0,0 +1,304 @@
+//
+// Created by wastl on 15.02.16.
+//
+
+#ifndef MARMOTTA_PARSER_BASE_H
+#define MARMOTTA_PARSER_BASE_H
+
+#include <utility>
+#include <map>
+#include <string>
+
+#include <model/rdf_model.h>
+
+namespace marmotta {
+namespace ldpath {
+namespace parser {
+
+template<Node>
+class LdPathParser<Node> {
+
+ private:
+ enum Mode { RULE, SELECTOR, TEST, PROGRAM, PREFIX };
+
+ /**
+ * A map mapping from namespace prefix to namespace URI
+ */
+ std::map<std::string,std::string> namespaces;
+
+ Mode mode;
+
+ public:
+ LdPathParser(NodeBackend<Node> backend, Reader in) {
+ this(backend,null,in);
+ }
+
+ public LdPathParser(NodeBackend<Node> backend, Configuration config, Reader in) {
+ this(in);
+ this.backend = backend;
+ if(config == null) {
+ this.config = new DefaultConfiguration();
+ } else {
+ this.config = config;
+ }
+
+ initialise();
+ }
+
+ public LdPathParser(NodeBackend<Node> backend, InputStream in) {
+ this(backend,null,in);
+ }
+
+ public LdPathParser(NodeBackend<Node> backend, Configuration config, InputStream in) {
+ this(in);
+ this.backend = backend;
+ if(config == null) {
+ this.config = new DefaultConfiguration();
+ } else {
+ this.config = config;
+ }
+
+ initialise();
+ }
+
+ public LdPathParser(NodeBackend<Node> backend, InputStream in, String encoding) {
+ this(backend,null,in,encoding);
+ }
+
+ public LdPathParser(NodeBackend<Node> backend, Configuration config, InputStream in, String encoding) {
+ this(in,encoding);
+ this.backend = backend;
+ if(config == null) {
+ this.config = new DefaultConfiguration();
+ } else {
+ this.config = config;
+ }
+
+ initialise();
+ }
+
+ public Program<Node> parseProgram() throws ParseException {
+ namespaces.clear();
+ namespaces.putAll(config.getNamespaces());
+
+ mode = Mode.PROGRAM;
+ try {
+ return Program();
+ } catch(TokenMgrError error){
+ throw new ParseException("Unable to parse Program: (Message: "+error.getMessage()+")");
+ }
+ }
+
+ public Entry<String, String> parsePrefix() throws ParseException {
+ namespaces.clear();
+ namespaces.putAll(config.getNamespaces());
+ mode = Mode.PREFIX;
+ try {
+ return Namespace();
+ } catch (TokenMgrError error) {
+ throw new ParseException("Unable to parse Prefix: (Message: "+ error.getMessage()+")");
+ }
+ }
+
+ public Map<String, String> parsePrefixes() throws ParseException {
+ namespaces.clear();
+ namespaces.putAll(config.getNamespaces());
+ mode = Mode.PREFIX;
+ try {
+ return Namespaces();
+ } catch (TokenMgrError error) {
+ throw new ParseException("Unable to parse Prefixes: (Message: "+ error.getMessage()+")");
+ }
+ }
+
+
+ public NodeSelector<Node> parseSelector(Map<String,String> ctxNamespaces) throws ParseException {
+ namespaces.clear();
+ namespaces.putAll(config.getNamespaces());
+ if(ctxNamespaces != null) {
+ namespaces.putAll(ctxNamespaces);
+ }
+
+ mode = Mode.SELECTOR;
+
+ try {
+ return Selector();
+ } catch(TokenMgrError error){
+ throw new ParseException("Unable to parse Selector: (Message: "+error.getMessage()+")");
+ }
+ }
+
+ public NodeTest<Node> parseTest(Map<String, String> ctxNamespaces) throws ParseException {
+ namespaces.clear();
+ namespaces.putAll(config.getNamespaces());
+ if (ctxNamespaces != null) {
+ namespaces.putAll(ctxNamespaces);
+ }
+ mode = Mode.TEST;
+ try {
+ return NodeTest();
+ } catch (TokenMgrError error) {
+ throw new ParseException("Unable to parse Test: (Message: "+ error.getMessage()+")");
+ }
+ }
+
+ public <T> FieldMapping<T,Node> parseRule(Map<String,String> ctxNamespaces) throws ParseException {
+ namespaces.clear();
+ namespaces.putAll(config.getNamespaces());
+ if(ctxNamespaces != null) {
+ namespaces.putAll(ctxNamespaces);
+ }
+
+ mode = Mode.RULE;
+
+ try {
+ return Rule();
+ } catch(TokenMgrError error){
+ throw new ParseException("Unable to parse Rule: (Message: "+error.getMessage()+")");
+ }
+ }
+
+ public Node resolveURI(URI uri) {
+ return backend.createURI(uri.toString());
+ }
+
+ public Node resolveResource(String uri) throws ParseException {
+ return backend.createURI(uri);
+ }
+
+ public Node resolveResource(String prefix, String local) throws ParseException {
+ return resolveResource(resolveNamespace(prefix)+local);
+ }
+
+
+ public String resolveNamespace(String prefix) throws ParseException {
+ String uri = namespaces.get(prefix);
+ if(uri == null) {
+ throw new ParseException("Namespace "+prefix+" not defined!");
+ }
+ return uri;
+ }
+
+
+ public SelectorFunction<Node> getFunction(String uri) throws ParseException {
+ if(xsdNodeFunctionMap.get(uri) != null) {
+ return xsdNodeFunctionMap.get(uri);
+ } else {
+ throw new ParseException("function with URI "+uri+" does not exist");
+ }
+ }
+
+ public TestFunction<Node> getTestFunction(String uri) throws ParseException {
+ if (xsdNodeTestMap.get(uri) != null) {
+ return xsdNodeTestMap.get(uri);
+ } else {
+ throw new ParseException("test function with URI "+uri+" does not exist");
+ }
+ }
+
+ public NodeTransformer<?,Node> getTransformer(URI type) throws ParseException {
+ return getTransformer(type.toString());
+ }
+
+ public NodeTransformer<?,Node> getTransformer(Node node) throws ParseException {
+ return getTransformer(backend.stringValue(node));
+ }
+
+ public NodeTransformer<?,Node> getTransformer(String uri) throws ParseException {
+ if(xsdNodeTransformerMap.get(uri) != null) {
+ return xsdNodeTransformerMap.get(uri);
+ } else {
+ throw new ParseException("transformer with URI "+uri+" does not exist");
+ }
+ }
+
+
+ private void initialise() {
+ initTransformerMappings();
+ initFunctionMappings();
+ }
+
+ /**
+ * Register the function passed as argument in this parser's function map.
+ */
+ public void registerFunction(SelectorFunction<Node> function) {
+ registerFunction(xsdNodeFunctionMap,function);
+ }
+
+ public void registerFunction(TestFunction<Node> test) {
+ registerTest(xsdNodeTestMap, test);
+ }
+
+ /**
+ * Register the result transformer passed as argument for the given type uri.
+ */
+ public void registerTransformer(String typeUri, NodeTransformer<?,Node> transformer) {
+ xsdNodeTransformerMap.put(typeUri,transformer);
+ }
+
+
+ /**
+ * A map mapping from XSD types to node transformers.
+ */
+ private Map<String, NodeTransformer<?,Node>> xsdNodeTransformerMap;
+ private void initTransformerMappings() {
+ Map<String, NodeTransformer<?,Node>> transformerMap = new HashMap<String, NodeTransformer<?,Node>>();
+
+ transformerMap.putAll(config.getTransformers());
+
+ xsdNodeTransformerMap = transformerMap;
+ }
+
+
+ private Map<String, SelectorFunction<Node>> xsdNodeFunctionMap;
+ private Map<String, TestFunction<Node>> xsdNodeTestMap;
+ private void initFunctionMappings() {
+ Map<String, SelectorFunction<Node>> functionMap = new HashMap<String, SelectorFunction<Node>>();
+
+ functionMap.putAll(config.getFunctions());
+
+ xsdNodeFunctionMap = functionMap;
+
+ Map<String, TestFunction<Node>> testMap = new HashMap<String, TestFunction<Node>>();
+ testMap.putAll(config.getTestFunctions());
+ xsdNodeTestMap = testMap;
+ }
+
+ private void registerFunction(Map<String, SelectorFunction<Node>> register, final SelectorFunction<Node> function) {
+ register.put(NS_LMF_FUNCS + function.getPathExpression(backend), function);
+ }
+
+ private void registerTest(Map<String, TestFunction<Node>> register, final TestFunction<Node> test) {
+ register.put(NS_LMF_FUNCS + test.getLocalName(), test);
+ }
+
+ private class Namespace implements Entry<String, String> {
+ private String key, val;
+ public Namespace(String key, String val) {
+ this.key = key;
+ this.val = val;
+ }
+ @Override
+ public String getKey() {
+ return key;
+ }
+ @Override
+ public String getValue() {
+ return val;
+ }
+ @Override
+ public String setValue(String value) {
+ String oV = val;
+ val = value;
+ return oV;
+ }
+ }
+
+}
+
+}
+}
+}
+
+
+#endif //MARMOTTA_PARSER_BASE_H
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ostrich/model/src/main/java/org/apache/marmotta/ostrich/model/ProtoLiteralBase.java
----------------------------------------------------------------------
diff --git a/libraries/ostrich/model/src/main/java/org/apache/marmotta/ostrich/model/ProtoLiteralBase.java b/libraries/ostrich/model/src/main/java/org/apache/marmotta/ostrich/model/ProtoLiteralBase.java
index 559258f..11a4a87 100644
--- a/libraries/ostrich/model/src/main/java/org/apache/marmotta/ostrich/model/ProtoLiteralBase.java
+++ b/libraries/ostrich/model/src/main/java/org/apache/marmotta/ostrich/model/ProtoLiteralBase.java
@@ -171,9 +171,8 @@ public abstract class ProtoLiteralBase implements Literal {
if(this.getDatatype()==null && that.getDatatype()!=null) return false;
- if(this.getDatatype() != null && !this.getDatatype().equals(that.getDatatype())) return false;
+ return !(this.getDatatype() != null && !this.getDatatype().equals(that.getDatatype()));
- return true;
}
return false;
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/loader/marmotta-loader-core/src/main/java/org/apache/marmotta/loader/api/LoaderBackend.java
----------------------------------------------------------------------
diff --git a/loader/marmotta-loader-core/src/main/java/org/apache/marmotta/loader/api/LoaderBackend.java b/loader/marmotta-loader-core/src/main/java/org/apache/marmotta/loader/api/LoaderBackend.java
index ac802ad..1200fc9 100644
--- a/loader/marmotta-loader-core/src/main/java/org/apache/marmotta/loader/api/LoaderBackend.java
+++ b/loader/marmotta-loader-core/src/main/java/org/apache/marmotta/loader/api/LoaderBackend.java
@@ -38,14 +38,14 @@ public interface LoaderBackend {
*
* @return
*/
- public String getIdentifier();
+ String getIdentifier();
/**
* Create the RDFHandler to be used for bulk-loading, optionally using the configuration passed as argument.
*
* @return a newly created RDFHandler instance
*/
- public LoaderHandler createLoader(Configuration configuration);
+ LoaderHandler createLoader(Configuration configuration);
/**
@@ -54,6 +54,6 @@ public interface LoaderBackend {
*
* @return
*/
- public Collection<Option> getOptions();
+ Collection<Option> getOptions();
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/loader/marmotta-loader-core/src/main/java/org/apache/marmotta/loader/api/LoaderHandler.java
----------------------------------------------------------------------
diff --git a/loader/marmotta-loader-core/src/main/java/org/apache/marmotta/loader/api/LoaderHandler.java b/loader/marmotta-loader-core/src/main/java/org/apache/marmotta/loader/api/LoaderHandler.java
index 52ce648..1cf2a41 100644
--- a/loader/marmotta-loader-core/src/main/java/org/apache/marmotta/loader/api/LoaderHandler.java
+++ b/loader/marmotta-loader-core/src/main/java/org/apache/marmotta/loader/api/LoaderHandler.java
@@ -33,13 +33,13 @@ public interface LoaderHandler extends RDFHandler {
*
* @throws RDFHandlerException
*/
- public void initialise() throws RDFHandlerException;
+ void initialise() throws RDFHandlerException;
/**
* Peform cleanup on shutdown, e.g. re-creating indexes after import completed or freeing resources acquired by
* the handler.
*/
- public void shutdown() throws RDFHandlerException;
+ void shutdown() throws RDFHandlerException;
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/platform/backends/marmotta-backend-accumulograph/src/main/java/org/apache/marmotta/platform/backend/accumulograph/AccumuloGraphProvider.java
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-accumulograph/src/main/java/org/apache/marmotta/platform/backend/accumulograph/AccumuloGraphProvider.java b/platform/backends/marmotta-backend-accumulograph/src/main/java/org/apache/marmotta/platform/backend/accumulograph/AccumuloGraphProvider.java
index 897149d..6da410c 100644
--- a/platform/backends/marmotta-backend-accumulograph/src/main/java/org/apache/marmotta/platform/backend/accumulograph/AccumuloGraphProvider.java
+++ b/platform/backends/marmotta-backend-accumulograph/src/main/java/org/apache/marmotta/platform/backend/accumulograph/AccumuloGraphProvider.java
@@ -18,9 +18,6 @@ package org.apache.marmotta.platform.backend.accumulograph;
import com.tinkerpop.blueprints.oupls.sail.GraphSail;
import edu.jhuapl.tinkerpop.AccumuloGraph;
-import edu.jhuapl.tinkerpop.AccumuloGraphConfiguration.InstanceType;
-import edu.jhuapl.tinkerpop.AccumuloGraphConfiguration;
-import com.tinkerpop.blueprints.GraphFactory;
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.marmotta.platform.core.api.config.ConfigurationService;
@@ -54,8 +51,6 @@ public class AccumuloGraphProvider implements StoreProvider {
@Inject
private SesameService sesameService;
- private NotifyingSail m_sail;
-
/**
* Create the store provided by this SailProvider
*
@@ -65,8 +60,7 @@ public class AccumuloGraphProvider implements StoreProvider {
public NotifyingSail createStore() {
log.info("Initializing Backend: AccumuloGraph Store");
final AccumuloGraph graph = createAccumuloGraph();
- m_sail = new GraphSail(graph);
- return m_sail;
+ return new GraphSail(graph);
}
/**
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/platform/ldcache/marmotta-ldcache-common/src/main/java/org/apache/marmotta/platform/ldcache/api/endpoint/LinkedDataEndpointService.java
----------------------------------------------------------------------
diff --git a/platform/ldcache/marmotta-ldcache-common/src/main/java/org/apache/marmotta/platform/ldcache/api/endpoint/LinkedDataEndpointService.java b/platform/ldcache/marmotta-ldcache-common/src/main/java/org/apache/marmotta/platform/ldcache/api/endpoint/LinkedDataEndpointService.java
index 2969571..e1a1cfb 100644
--- a/platform/ldcache/marmotta-ldcache-common/src/main/java/org/apache/marmotta/platform/ldcache/api/endpoint/LinkedDataEndpointService.java
+++ b/platform/ldcache/marmotta-ldcache-common/src/main/java/org/apache/marmotta/platform/ldcache/api/endpoint/LinkedDataEndpointService.java
@@ -34,28 +34,28 @@ public interface LinkedDataEndpointService {
*
* @param endpoint
*/
- public void addEndpoint(Endpoint endpoint);
+ void addEndpoint(Endpoint endpoint);
/**`
* Update the endpoint passed as argument in the database.
*
* @param endpoint
*/
- public void updateEndpoint(Endpoint endpoint);
+ void updateEndpoint(Endpoint endpoint);
/**
* List all endpoints registered in the system.
*
* @return a list of endpoints in the order they were added to the database.
*/
- public List<Endpoint> listEndpoints();
+ List<Endpoint> listEndpoints();
/**
* Remove the endpoint given as argument. The endpoint will be deleted in the database.
*
* @param endpoint
*/
- public void removeEndpoint(Endpoint endpoint);
+ void removeEndpoint(Endpoint endpoint);
/**
* Return the endpoint with the given ID.
@@ -63,7 +63,7 @@ public interface LinkedDataEndpointService {
* @param id ID of the endpoint to return.
* @return
*/
- public Endpoint getEndpoint(String id);
+ Endpoint getEndpoint(String id);
@@ -75,7 +75,7 @@ public interface LinkedDataEndpointService {
*
* @param resource the KiWiUriResource to check.
*/
- public Endpoint getEndpoint(URI resource);
+ Endpoint getEndpoint(URI resource);
/**
* Test whether an endpoint definition for the given url pattern already exists.
@@ -83,5 +83,5 @@ public interface LinkedDataEndpointService {
* @param urlPattern
* @return
*/
- public boolean hasEndpoint(String urlPattern);
+ boolean hasEndpoint(String urlPattern);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/platform/ldcache/marmotta-ldcache-common/src/main/java/org/apache/marmotta/platform/ldcache/webservices/LinkedDataCachingWebService.java
----------------------------------------------------------------------
diff --git a/platform/ldcache/marmotta-ldcache-common/src/main/java/org/apache/marmotta/platform/ldcache/webservices/LinkedDataCachingWebService.java b/platform/ldcache/marmotta-ldcache-common/src/main/java/org/apache/marmotta/platform/ldcache/webservices/LinkedDataCachingWebService.java
index daa125c..e801104 100644
--- a/platform/ldcache/marmotta-ldcache-common/src/main/java/org/apache/marmotta/platform/ldcache/webservices/LinkedDataCachingWebService.java
+++ b/platform/ldcache/marmotta-ldcache-common/src/main/java/org/apache/marmotta/platform/ldcache/webservices/LinkedDataCachingWebService.java
@@ -288,7 +288,7 @@ public class LinkedDataCachingWebService {
resultMap.put("endpoint",endpoint.getEndpointUrl());
resultMap.put("expiry", endpoint.getDefaultExpiry());
resultMap.put("prefix",endpoint.getUriPattern());
- resultMap.put("kind",endpoint.getType().toString());
+ resultMap.put("kind", endpoint.getType());
resultMap.put("mimetype",endpoint.getContentTypes());
resultMap.put("active", endpoint.isActive());
resultMap.put("volatile", isVolatile);
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/platform/ldcache/marmotta-ldcache-file/src/main/java/org/apache/marmotta/platform/ldcache/services/kiwi/FileLDCacheSailProvider.java
----------------------------------------------------------------------
diff --git a/platform/ldcache/marmotta-ldcache-file/src/main/java/org/apache/marmotta/platform/ldcache/services/kiwi/FileLDCacheSailProvider.java b/platform/ldcache/marmotta-ldcache-file/src/main/java/org/apache/marmotta/platform/ldcache/services/kiwi/FileLDCacheSailProvider.java
index 96daf10..02066d3 100644
--- a/platform/ldcache/marmotta-ldcache-file/src/main/java/org/apache/marmotta/platform/ldcache/services/kiwi/FileLDCacheSailProvider.java
+++ b/platform/ldcache/marmotta-ldcache-file/src/main/java/org/apache/marmotta/platform/ldcache/services/kiwi/FileLDCacheSailProvider.java
@@ -82,8 +82,6 @@ public class FileLDCacheSailProvider extends LDCacheSailProvider {
SesameFilter<Resource> cacheFilters = new OneOfFilter<Resource>(filters);
- String cache_context = configurationService.getCacheContext();
-
directory = new File(configurationService.getHome() + File.separator + "ldcache");
try {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/cache/CachingService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/cache/CachingService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/cache/CachingService.java
index 6a80235..89eef4a 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/cache/CachingService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/cache/CachingService.java
@@ -36,18 +36,18 @@ public interface CachingService {
* @param injectionPoint
* @return
*/
- public ConcurrentMap getCache(InjectionPoint injectionPoint);
+ ConcurrentMap getCache(InjectionPoint injectionPoint);
/**
* Return the names of all caches registered in the caching service
* @return
*/
- public Set<String> getCacheNames();
+ Set<String> getCacheNames();
/**
* Clear all caches registered in the caching service
*/
- public void clearAll();
+ void clearAll();
/**
* Get the cache with the given name. Creates a new cache if needed.
@@ -55,6 +55,6 @@ public interface CachingService {
* @param cacheName
* @return
*/
- public ConcurrentMap getCacheByName(String cacheName);
+ ConcurrentMap getCacheByName(String cacheName);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/config/ConfigurationService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/config/ConfigurationService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/config/ConfigurationService.java
index 3155416..f73a48e 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/config/ConfigurationService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/config/ConfigurationService.java
@@ -35,41 +35,41 @@ import java.util.regex.Pattern;
*/
public interface ConfigurationService {
- static final String RESOURCE_PATH = "resource";
+ String RESOURCE_PATH = "resource";
- static final String ANONYMOUS_PATH = "anon";
+ String ANONYMOUS_PATH = "anon";
- static final String META_PATH = "meta";
+ String META_PATH = "meta";
- static final String CONTENT_PATH = "content";
+ String CONTENT_PATH = "content";
- static final String INSPECT_PATH = "inspect";
+ String INSPECT_PATH = "inspect";
- static final String LDP_PATH = "ldp"; //to be removed
- static final String CONTAINER_PATH = "container";
+ String LDP_PATH = "ldp"; //to be removed
+ String CONTAINER_PATH = "container";
@Deprecated
- static final String KNOWLEDGESPACE_PATH = "knowledgedspace";
+ String KNOWLEDGESPACE_PATH = "knowledgedspace";
- static final String CONTEXT_PATH = "context";
+ String CONTEXT_PATH = "context";
- static final String CONTEXT_DEFAULT = "default";
+ String CONTEXT_DEFAULT = "default";
- static final String CONTEXT_CACHE = "cache";
+ String CONTEXT_CACHE = "cache";
- static final String CONTEXT_ENHANCEMENT = "enhanced";
+ String CONTEXT_ENHANCEMENT = "enhanced";
- static final String CONTEXT_INFERRED = "inferred";
+ String CONTEXT_INFERRED = "inferred";
- static final String CONTEXT_SYSTEM = "system";
+ String CONTEXT_SYSTEM = "system";
- static final String DIR_CONFIG = "config";
+ String DIR_CONFIG = "config";
- static final String DIR_LOG = "log";
+ String DIR_LOG = "log";
- static final String DIR_IMPORT = "import";
+ String DIR_IMPORT = "import";
- static final String LOGGING_PATH = "logging";
+ String LOGGING_PATH = "logging";
/**
* Get the base URI of the system.
@@ -401,7 +401,7 @@ public interface ConfigurationService {
*
* @param home
*/
- public void setHome(String home);
+ void setHome(String home);
/**
* Return the value of the LMF_HOME setting. Used during the initialisation process.
@@ -415,7 +415,7 @@ public interface ConfigurationService {
*
* @return
*/
- public String getHome();
+ String getHome();
/**
* Get the base URI for contexts
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/content/ContentReader.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/content/ContentReader.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/content/ContentReader.java
index 8bfaf1d..6829d8c 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/content/ContentReader.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/content/ContentReader.java
@@ -35,7 +35,7 @@ public interface ContentReader {
* Return the name of the content reader. Used to identify and display the content reader to admin users.
* @return
*/
- public String getName();
+ String getName();
/**
* Retrieve the content of the specified mime type for the specified resource. Returns a byte array containing
@@ -49,7 +49,7 @@ public interface ContentReader {
* @param mimetype the mime type to retrieve of the content
* @return a byte array containing the content of the resource, or null if no content exists
*/
- public byte[] getContentData(Resource resource, String mimetype) throws IOException;
+ byte[] getContentData(Resource resource, String mimetype) throws IOException;
/**
@@ -66,7 +66,7 @@ public interface ContentReader {
* @param mimetype the mime type to retrieve of the content
* @return a InputStream containing the content of the resource, or null if no content exists
*/
- public InputStream getContentStream(Resource resource, String mimetype) throws IOException;
+ InputStream getContentStream(Resource resource, String mimetype) throws IOException;
/**
@@ -77,7 +77,7 @@ public interface ContentReader {
* @param mimetype the mimetype to look for
* @return true if content of this mimetype is associated with the resource, false otherwise
*/
- public boolean hasContent(Resource resource, String mimetype);
+ boolean hasContent(Resource resource, String mimetype);
/**
@@ -86,7 +86,7 @@ public interface ContentReader {
* @param resource resource for which to return the content type
* @return the MIME content type of the resource
*/
- public String getContentType(Resource resource);
+ String getContentType(Resource resource);
/**
@@ -95,5 +95,5 @@ public interface ContentReader {
* @param resource resource for which to return the content length
* @return byte count for the resource content
*/
- public long getContentLength(Resource resource, String mimetype);
+ long getContentLength(Resource resource, String mimetype);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/content/ContentService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/content/ContentService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/content/ContentService.java
index e541921..8c709c0 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/content/ContentService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/content/ContentService.java
@@ -34,7 +34,7 @@ public interface ContentService {
/**
* Initialise the content service, setting up all content readers and writers.
*/
- public void initialise();
+ void initialise();
/**
@@ -45,7 +45,7 @@ public interface ContentService {
* @param mimeType the mime type of the content
* @param data a byte array containing the content of the resource
*/
- public void setContentData(Resource resource, byte[] data, String mimeType) throws WritingNotSupportedException;
+ void setContentData(Resource resource, byte[] data, String mimeType) throws WritingNotSupportedException;
/**
@@ -58,7 +58,7 @@ public interface ContentService {
* @param mimeType the mime type to retrieve of the content
* @param in a InputStream containing the content of the resource
*/
- public void setContentStream(Resource resource, InputStream in, String mimeType) throws WritingNotSupportedException;
+ void setContentStream(Resource resource, InputStream in, String mimeType) throws WritingNotSupportedException;
/**
@@ -73,7 +73,7 @@ public interface ContentService {
* @param mimeType the mime type to retrieve of the content
* @return a byte array containing the content of the resource, or null if no content exists
*/
- public byte[] getContentData(Resource resource, String mimeType);
+ byte[] getContentData(Resource resource, String mimeType);
/**
@@ -90,7 +90,7 @@ public interface ContentService {
* @param mimetype the mime type to retrieve of the content
* @return a InputStream containing the content of the resource, or null if no content exists
*/
- public InputStream getContentStream(Resource resource, String mimetype) throws IOException;
+ InputStream getContentStream(Resource resource, String mimetype) throws IOException;
/**
@@ -101,9 +101,9 @@ public interface ContentService {
* @param mimetype the mimetype to look for
* @return true if content of this mimetype is associated with the resource, false otherwise
*/
- public boolean hasContent(Resource resource, String mimetype);
+ boolean hasContent(Resource resource, String mimetype);
- public String getContentType(Resource resource);
+ String getContentType(Resource resource);
/**
* Return the number of bytes the content of this resource contains.
@@ -112,12 +112,12 @@ public interface ContentService {
* @return byte count for the resource content
*/
- public long getContentLength(Resource resource, String mimetype);
+ long getContentLength(Resource resource, String mimetype);
/**
* Delete the content of the specified resource.
*
* @param resource the resource for which to delete the content
*/
- public boolean deleteContent(Resource resource) throws MarmottaException;
+ boolean deleteContent(Resource resource) throws MarmottaException;
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/content/ContentWriter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/content/ContentWriter.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/content/ContentWriter.java
index 8958515..523b65a 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/content/ContentWriter.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/content/ContentWriter.java
@@ -34,7 +34,7 @@ public interface ContentWriter {
* Return the name of the content reader. Used to identify and display the content reader to admin users.
* @return
*/
- public String getName();
+ String getName();
/**
@@ -45,7 +45,7 @@ public interface ContentWriter {
* @param mimetype the mime type of the content
* @param data a byte array containing the content of the resource
*/
- public void setContentData(Resource resource, byte[] data, String mimetype) throws IOException;
+ void setContentData(Resource resource, byte[] data, String mimetype) throws IOException;
/**
@@ -58,7 +58,7 @@ public interface ContentWriter {
* @param mimetype the mime type to retrieve of the content
* @param in a InputStream containing the content of the resource
*/
- public void setContentStream(Resource resource, InputStream in, String mimetype) throws IOException;
+ void setContentStream(Resource resource, InputStream in, String mimetype) throws IOException;
/**
@@ -67,6 +67,6 @@ public interface ContentWriter {
* @param resource the resource for which to delete the content
* @param mimetype the mime type of the content to delete (optional)
*/
- public void deleteContent(Resource resource, String mimetype) throws IOException;
+ void deleteContent(Resource resource, String mimetype) throws IOException;
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/exporter/ExportService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/exporter/ExportService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/exporter/ExportService.java
index 2b2996b..5ddbca1 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/exporter/ExportService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/exporter/ExportService.java
@@ -39,7 +39,7 @@ public interface ExportService {
*
* @return a set of strings representing the mime types accepted by this exporter
*/
- public Set<String> getProducedTypes();
+ Set<String> getProducedTypes();
/**
@@ -59,7 +59,7 @@ public interface ExportService {
*
* @throws UnsupportedExporterException in case there is no matching exporter for the given mime type
*/
- public String exportData(URI context, String mimeType) throws UnsupportedExporterException;
+ String exportData(URI context, String mimeType) throws UnsupportedExporterException;
/**
* Export the triple data contained in the named graph passed as argument "context" and write it
@@ -80,7 +80,7 @@ public interface ExportService {
* @throws UnsupportedExporterException in case there is no matching exporter for the given mime type
* @throws IOException in case there is an error writing to the output
*/
- public void exportData(Writer writer, URI context, String mimeType) throws UnsupportedExporterException, IOException;
+ void exportData(Writer writer, URI context, String mimeType) throws UnsupportedExporterException, IOException;
/**
@@ -103,7 +103,7 @@ public interface ExportService {
* @throws UnsupportedExporterException in case there is no matching exporter for the given mime type
* @throws IOException in case there is an error writing to the output
*/
- public void exportData(OutputStream outputStream, URI context, String mimeType) throws UnsupportedExporterException, IOException;
+ void exportData(OutputStream outputStream, URI context, String mimeType) throws UnsupportedExporterException, IOException;
@@ -124,7 +124,7 @@ public interface ExportService {
*
* @throws UnsupportedExporterException in case there is no matching exporter for the given mime type
*/
- public String exportData(URI resource, URI context, String mimeType) throws UnsupportedExporterException;
+ String exportData(URI resource, URI context, String mimeType) throws UnsupportedExporterException;
/**
* Export the triple data for the given resource contained in the named graph passed as argument "context" and write it
@@ -145,7 +145,7 @@ public interface ExportService {
* @throws UnsupportedExporterException in case there is no matching exporter for the given mime type
* @throws IOException in case there is an error writing to the output
*/
- public void exportData(Writer writer, URI resource, URI context, String mimeType) throws UnsupportedExporterException, IOException;
+ void exportData(Writer writer, URI resource, URI context, String mimeType) throws UnsupportedExporterException, IOException;
/**
@@ -168,6 +168,6 @@ public interface ExportService {
* @throws UnsupportedExporterException in case there is no matching exporter for the given mime type
* @throws IOException in case there is an error writing to the output
*/
- public void exportData(OutputStream outputStream, URI resource, URI context, String mimeType) throws UnsupportedExporterException, IOException;
+ void exportData(OutputStream outputStream, URI resource, URI context, String mimeType) throws UnsupportedExporterException, IOException;
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/http/HttpClientService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/http/HttpClientService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/http/HttpClientService.java
index a894af6..0ccf96e 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/http/HttpClientService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/http/HttpClientService.java
@@ -41,7 +41,7 @@ public interface HttpClientService {
*
* @see HttpClient#execute(HttpUriRequest, ResponseHandler)
*/
- public <T> T execute(HttpRequestBase request, ResponseHandler<? extends T> handler) throws ClientProtocolException, IOException;
+ <T> T execute(HttpRequestBase request, ResponseHandler<? extends T> handler) throws ClientProtocolException, IOException;
/**
* Execute the {@link HttpRequestBase}.
@@ -56,7 +56,7 @@ public interface HttpClientService {
* use {@link #cleanupResponse(HttpResponse)}!
* @see #cleanupResponse(HttpResponse)
*/
- public HttpResponse execute(HttpRequestBase request) throws ClientProtocolException, IOException;
+ HttpResponse execute(HttpRequestBase request) throws ClientProtocolException, IOException;
/**
* Close and release all resources of the provided {@link HttpResponse}.
@@ -64,7 +64,7 @@ public interface HttpClientService {
* @param response the {@link HttpResponse} to clean up.
* @see org.apache.http.util.EntityUtils#consume(HttpEntity)
*/
- public void cleanupResponse(HttpResponse response);
+ void cleanupResponse(HttpResponse response);
/**
* Convenience method to execute a <code>GET</code>-request.
@@ -73,7 +73,7 @@ public interface HttpClientService {
* @param responseHandler the {@link ResponseHandler} for the request
* @return whatever the {@link ResponseHandler} builds.
*/
- public <T> T doGet(String requestUrl, ResponseHandler<? extends T> responseHandler) throws IOException;
+ <T> T doGet(String requestUrl, ResponseHandler<? extends T> responseHandler) throws IOException;
/**
* Convenience method to execute a <code>GET</code>-request, returning the response-entity as
@@ -82,7 +82,7 @@ public interface HttpClientService {
* @param requestUrl the request URL
* @return the response-entity.
*/
- public String doGet(String requestUrl) throws IOException;
+ String doGet(String requestUrl) throws IOException;
/**
* Convenience method to execute a <code>POST</code>-request.
@@ -92,7 +92,7 @@ public interface HttpClientService {
* @param responseHandler the {@link ResponseHandler} for the request
* @return whatever the {@link ResponseHandler} builds.
*/
- public <T> T doPost(String requestUrl, HttpEntity body, ResponseHandler<? extends T> responseHandler) throws IOException;
+ <T> T doPost(String requestUrl, HttpEntity body, ResponseHandler<? extends T> responseHandler) throws IOException;
/**
* Convenience method to execute a <code>POST</code>-request, returning the response-entity as
@@ -102,7 +102,7 @@ public interface HttpClientService {
* @param body the (body) content of the <code>POST</code>-request
* @return the response-entity.
*/
- public String doPost(String url, String body) throws IOException;
+ String doPost(String url, String body) throws IOException;
/**
* Convenience method to execute a <code>PUT</code>-request.
@@ -112,7 +112,7 @@ public interface HttpClientService {
* @param responseHandler the {@link ResponseHandler} for the request
* @return whatever the {@link ResponseHandler} builds.
*/
- public <T> T doPut(String url, HttpEntity body, ResponseHandler<? extends T> responseHandler) throws IOException;
+ <T> T doPut(String url, HttpEntity body, ResponseHandler<? extends T> responseHandler) throws IOException;
/**
* Convenience method to execute a <code>PUT</code>-request, returning the response-entity as
@@ -122,7 +122,7 @@ public interface HttpClientService {
* @param body the (body) content of the <code>PUT</code>-request
* @return the response-entity.
*/
- public String doPut(String url, String body) throws IOException;
+ String doPut(String url, String body) throws IOException;
/**
* Convenience method to execute a <code>DELETE</code>-request.
@@ -131,7 +131,7 @@ public interface HttpClientService {
* @param responseHandler the {@link ResponseHandler} for the request
* @return whatever the {@link ResponseHandler} builds.
*/
- public <T> T doDelete(String url, ResponseHandler<? extends T> responseHandler) throws IOException;
+ <T> T doDelete(String url, ResponseHandler<? extends T> responseHandler) throws IOException;
/**
* Convenience method to execute a <code>DELETE</code>-request, returning the response code.
@@ -140,7 +140,7 @@ public interface HttpClientService {
* @return the http response code (e.g. <code>200</code> for success)
* @see org.apache.http.HttpStatus
*/
- public int doDelete(String url) throws IOException;
+ int doDelete(String url) throws IOException;
/**
* Convenience method to execute a <code>HEAD</code>-request.
@@ -149,7 +149,7 @@ public interface HttpClientService {
* @param responseHandler the {@link ResponseHandler} for the request
* @return whatever the {@link ResponseHandler} builds.
*/
- public <T> T doHead(String url, ResponseHandler<? extends T> responseHandler) throws IOException;
+ <T> T doHead(String url, ResponseHandler<? extends T> responseHandler) throws IOException;
/**
* Convenience method to execute a <code>HEAD</code>-request, returning the last-modified date.
@@ -158,11 +158,11 @@ public interface HttpClientService {
* @return the value Last-Modified Header, or <code>null</code> if the header was missing or
* could not be parsed.
*/
- public Date doHead(String url) throws IOException;
+ Date doHead(String url) throws IOException;
/**
* Get a ready-to-use {@link HttpClient}.
*/
- public HttpClient getHttpClient();
+ HttpClient getHttpClient();
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/importer/ImportService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/importer/ImportService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/importer/ImportService.java
index 09bf53e..6288c91 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/importer/ImportService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/importer/ImportService.java
@@ -44,7 +44,7 @@ public interface ImportService {
*
* @return a set of strings representing the mime types accepted by this importer
*/
- public Set<String> getAcceptTypes();
+ Set<String> getAcceptTypes();
/**
* Import data from the input stream provided as argument into the KiWi database.
@@ -59,7 +59,7 @@ public interface ImportService {
* @return the number of Content Items imported
* @throws org.apache.marmotta.platform.core.exception.io.MarmottaImportException in case the import fails
*/
- public int importData(URL url, String format, Resource user, URI context) throws MarmottaImportException;
+ int importData(URL url, String format, Resource user, URI context) throws MarmottaImportException;
/**
@@ -75,7 +75,7 @@ public interface ImportService {
* @return the number of Content Items imported
* @throws org.apache.marmotta.platform.core.exception.io.MarmottaImportException in case the import cannot execute
*/
- public int importData(InputStream is, String format, Resource user, URI context) throws MarmottaImportException;
+ int importData(InputStream is, String format, Resource user, URI context) throws MarmottaImportException;
/**
* Import data from the reader provided as argument into the KiWi database.
@@ -90,7 +90,7 @@ public interface ImportService {
* @return the number of Content Items imported
* @throws org.apache.marmotta.platform.core.exception.io.MarmottaImportException in case the import fails
*/
- public int importData(Reader reader, String format, Resource user, URI context) throws MarmottaImportException;
+ int importData(Reader reader, String format, Resource user, URI context) throws MarmottaImportException;
/**
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/importer/Importer.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/importer/Importer.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/importer/Importer.java
index 77d0f08..dbfc89e 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/importer/Importer.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/importer/Importer.java
@@ -48,14 +48,14 @@ public interface Importer {
*
* @return a string uniquely identifying this importer
*/
- public String getName();
+ String getName();
/**
* Get a description of this importer for presentation to the user.
*
* @return a string describing this importer for the user
*/
- public String getDescription();
+ String getDescription();
/**
@@ -64,7 +64,7 @@ public interface Importer {
*
* @return a set of strings representing the mime types accepted by this importer
*/
- public Set<String> getAcceptTypes();
+ Set<String> getAcceptTypes();
/**
* Import data from the input stream provided as argument into the KiWi database.
@@ -78,7 +78,7 @@ public interface Importer {
* @return the number of Content Items imported
* @throws org.apache.marmotta.platform.core.exception.io.MarmottaImportException in case the import fails
*/
- public int importData(URL url, String format, Resource user, URI context) throws MarmottaImportException;
+ int importData(URL url, String format, Resource user, URI context) throws MarmottaImportException;
/**
* Import data from the input stream provided as argument into the KiWi database.
@@ -92,7 +92,7 @@ public interface Importer {
* @return the number of Content Items imported
* @throws org.apache.marmotta.platform.core.exception.io.MarmottaImportException in case the import cannot execute
*/
- public int importData(InputStream is, String format, Resource user, URI context) throws MarmottaImportException;
+ int importData(InputStream is, String format, Resource user, URI context) throws MarmottaImportException;
/**
* Import data from the reader provided as argument into the KiWi database.
@@ -106,6 +106,6 @@ public interface Importer {
* @return the number of Content Items imported
* @throws org.apache.marmotta.platform.core.exception.io.MarmottaImportException in case the import fails
*/
- public int importData(Reader reader, String format, Resource user, URI context) throws MarmottaImportException;
+ int importData(Reader reader, String format, Resource user, URI context) throws MarmottaImportException;
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/io/MarmottaIOService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/io/MarmottaIOService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/io/MarmottaIOService.java
index 640b445..8c53ea2 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/io/MarmottaIOService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/io/MarmottaIOService.java
@@ -34,25 +34,25 @@ public interface MarmottaIOService {
* returns a list of all mimetypes which can be parsed by implemented parsers
* @return
*/
- public List<String> getAcceptTypes();
+ List<String> getAcceptTypes();
/**
* returns a list of all mimetypes which can be produced by implemented serializers
* @return
*/
- public List<String> getProducedTypes();
+ List<String> getProducedTypes();
/**
* returns a serializer for a given mimetype; null if no serializer defined
* @param mimetype
* @return
*/
- public RDFFormat getSerializer(String mimetype);
+ RDFFormat getSerializer(String mimetype);
/**
* returns a parser for a given mimetype; null if no parser defined
* @param mimetype
* @return
*/
- public RDFFormat getParser(String mimetype);
+ RDFFormat getParser(String mimetype);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/io/RDFHtmlWriter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/io/RDFHtmlWriter.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/io/RDFHtmlWriter.java
index 44fd978..1305adf 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/io/RDFHtmlWriter.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/io/RDFHtmlWriter.java
@@ -26,6 +26,6 @@ import org.openrdf.rio.RDFWriter;
*/
public interface RDFHtmlWriter extends RDFWriter {
- public RDFWriterPriority getPriority();
+ RDFWriterPriority getPriority();
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/io/RDFWriterPriority.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/io/RDFWriterPriority.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/io/RDFWriterPriority.java
index d5e2c2a..82402ed 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/io/RDFWriterPriority.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/io/RDFWriterPriority.java
@@ -24,6 +24,6 @@ package org.apache.marmotta.platform.core.api.io;
*/
public enum RDFWriterPriority {
- VERY_LOW,LOW,MEDIUM,HIGH,VERY_HIGH;
+ VERY_LOW,LOW,MEDIUM,HIGH,VERY_HIGH
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/logging/LoggingModule.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/logging/LoggingModule.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/logging/LoggingModule.java
index a9c0c3e..5558c94 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/logging/LoggingModule.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/logging/LoggingModule.java
@@ -45,7 +45,7 @@ public interface LoggingModule {
*
* @return a unique identifier for the module, suitable for use in the configuration file
*/
- public String getId();
+ String getId();
/**
@@ -54,7 +54,7 @@ public interface LoggingModule {
*
* @return a human-readable name for the module, suitable for displaying in a user interface
*/
- public String getName();
+ String getName();
/**
@@ -63,7 +63,7 @@ public interface LoggingModule {
*
* @return a collection of package names
*/
- public Collection<String> getPackages();
+ Collection<String> getPackages();
/**
@@ -71,7 +71,7 @@ public interface LoggingModule {
*
* @return
*/
- public Level getDefaultLevel();
+ Level getDefaultLevel();
/**
@@ -80,7 +80,7 @@ public interface LoggingModule {
*
* @return
*/
- public Level getCurrentLevel();
+ Level getCurrentLevel();
/**
@@ -89,28 +89,28 @@ public interface LoggingModule {
*
* @param level
*/
- public void setCurrentLevel(Level level);
+ void setCurrentLevel(Level level);
/**
* Return the identifiers of all logging outputs configured for this module
* @return
*/
- public List<String> getLoggingOutputIds();
+ List<String> getLoggingOutputIds();
/**
* Set the identifiers of all logging outputs for this module
* @param ids
*/
- public void setLoggingOutputIds(List<String> ids);
+ void setLoggingOutputIds(List<String> ids);
/**
* Return the logging outputs configured for this module (resolved using the LoggingService).
*
* @return
*/
- public List<LoggingOutput> getLoggingOutputs();
+ List<LoggingOutput> getLoggingOutputs();
/**
@@ -118,5 +118,5 @@ public interface LoggingModule {
*
* @param outputs
*/
- public void setLoggingOutputs(List<LoggingOutput> outputs);
+ void setLoggingOutputs(List<LoggingOutput> outputs);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/logging/LoggingService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/logging/LoggingService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/logging/LoggingService.java
index 38ba7dc..02540f1 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/logging/LoggingService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/logging/LoggingService.java
@@ -41,7 +41,7 @@ public interface LoggingService {
* @param injectionPoint
* @return
*/
- public Logger createLogger(InjectionPoint injectionPoint);
+ Logger createLogger(InjectionPoint injectionPoint);
/**
@@ -49,7 +49,7 @@ public interface LoggingService {
*
* @return
*/
- public List<LoggingOutput> listOutputConfigurations();
+ List<LoggingOutput> listOutputConfigurations();
/**
@@ -57,7 +57,7 @@ public interface LoggingService {
* @param id
* @return
*/
- public LoggingOutput getOutputConfiguration(String id);
+ LoggingOutput getOutputConfiguration(String id);
/**
@@ -66,7 +66,7 @@ public interface LoggingService {
*
* @return
*/
- public ConsoleOutput getConsoleOutput();
+ ConsoleOutput getConsoleOutput();
/**
* Create a new syslog output configuration using the given parameters; further options can be set on the object
@@ -76,7 +76,7 @@ public interface LoggingService {
* @param name human-readable name for configuration (displayed in UI)
* @return
*/
- public SyslogOutput createSyslogOutput(String id, String name);
+ SyslogOutput createSyslogOutput(String id, String name);
/**
* Create a new logfile output configuration using the given parameters; further options can be set on the object
@@ -87,7 +87,7 @@ public interface LoggingService {
* @param file filename under MARMOTTA_HOME/log
* @return
*/
- public LogFileOutput createLogFileOutput(String id, String name, String file);
+ LogFileOutput createLogFileOutput(String id, String name, String file);
/**
@@ -96,6 +96,6 @@ public interface LoggingService {
*
* @return
*/
- public List<LoggingModule> listModules();
+ List<LoggingModule> listModules();
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/modules/MarmottaHttpFilter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/modules/MarmottaHttpFilter.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/modules/MarmottaHttpFilter.java
index 618b29f..f54f632 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/modules/MarmottaHttpFilter.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/modules/MarmottaHttpFilter.java
@@ -27,18 +27,18 @@ import javax.servlet.Filter;
public interface MarmottaHttpFilter extends Filter {
// authentication and access control have to come before everything else
- public static int PRIO_AUTH = Integer.MIN_VALUE;
+ int PRIO_AUTH = Integer.MIN_VALUE;
- public static int PRIO_ACL = Integer.MIN_VALUE + 10;
+ int PRIO_ACL = Integer.MIN_VALUE + 10;
// first in filter chain
- public static int PRIO_FIRST = 1;
+ int PRIO_FIRST = 1;
// somewhere inbetween
- public static int PRIO_MIDDLE = Integer.MAX_VALUE / 2;
+ int PRIO_MIDDLE = Integer.MAX_VALUE / 2;
// last in filter chain
- public static int PRIO_LAST = Integer.MAX_VALUE;
+ int PRIO_LAST = Integer.MAX_VALUE;
/**
* Return the pattern (regular expression) that a request URI (relative to the LMF base URI) has to match
@@ -46,7 +46,7 @@ public interface MarmottaHttpFilter extends Filter {
*
* @return
*/
- public String getPattern();
+ String getPattern();
/**
@@ -55,5 +55,5 @@ public interface MarmottaHttpFilter extends Filter {
* something inbetween (e.g. PRIO_MIDDLE).
* @return
*/
- public int getPriority();
+ int getPriority();
}