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/20 11:49:31 UTC
[2/3] marmotta git commit: * code style cleanups across the whole
source code * test fixes
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/StrLeftFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/StrLeftFunction.java b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/StrLeftFunction.java
index 49adb31..8618d42 100644
--- a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/StrLeftFunction.java
+++ b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/StrLeftFunction.java
@@ -18,15 +18,16 @@
package org.apache.marmotta.ldpath.model.functions.text;
-import java.util.Collection;
-import java.util.LinkedList;
-
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.functions.SelectorFunction;
+import java.util.Collection;
+import java.util.LinkedList;
+
public class StrLeftFunction<Node> extends SelectorFunction<Node> {
+ @SafeVarargs
@Override
- public Collection<Node> apply(RDFBackend<Node> backend, Node context, Collection<Node>... args) throws IllegalArgumentException {
+ public final Collection<Node> apply(RDFBackend<Node> backend, Node context, Collection<Node>... args) throws IllegalArgumentException {
try {
if (args.length != 2) { throw new IllegalArgumentException("LdPath function " + getLocalName() + " requires 2 arguments"); }
if (args[1].size() != 1) { throw new IllegalArgumentException("len argument must be a single literal for function " + getLocalName()); }
@@ -34,17 +35,15 @@ public class StrLeftFunction<Node> extends SelectorFunction<Node> {
final Collection<Node> nodes = args[0];
final int length = Math.max(backend.intValue(args[1].iterator().next()), 0);
- final Collection<Node> result = new LinkedList<Node>();
+ final Collection<Node> result = new LinkedList<>();
for (Node node : nodes) {
final String str = backend.stringValue(node);
result.add(backend.createLiteral(str.substring(0, Math.min(length, str.length()))));
}
return result;
- } catch (NumberFormatException nfe) {
+ } catch (NumberFormatException | ArithmeticException nfe) {
throw new IllegalArgumentException(nfe);
- } catch (ArithmeticException ae) {
- throw new IllegalArgumentException(ae);
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/StrLenFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/StrLenFunction.java b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/StrLenFunction.java
index 6af5bcb..bc4fb15 100644
--- a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/StrLenFunction.java
+++ b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/StrLenFunction.java
@@ -19,23 +19,23 @@ package org.apache.marmotta.ldpath.model.functions.text;
import com.google.common.base.Preconditions;
+import org.apache.marmotta.ldpath.api.backend.RDFBackend;
+import org.apache.marmotta.ldpath.api.functions.SelectorFunction;
import java.net.URI;
import java.util.Collection;
import java.util.LinkedList;
-import org.apache.marmotta.ldpath.api.backend.RDFBackend;
-import org.apache.marmotta.ldpath.api.functions.SelectorFunction;
-
public class StrLenFunction<Node> extends SelectorFunction<Node> {
private static final URI dataType = URI.create("http://www.w3.org/2001/XMLSchema#integer");
+ @SafeVarargs
@Override
- public Collection<Node> apply(RDFBackend<Node> backend, Node context, Collection<Node>... args) throws IllegalArgumentException {
+ public final Collection<Node> apply(RDFBackend<Node> backend, Node context, Collection<Node>... args) throws IllegalArgumentException {
Preconditions.checkArgument(args.length == 1, "Check usage: " + getSignature());
- LinkedList<Node> result = new LinkedList<Node>();
+ LinkedList<Node> result = new LinkedList<>();
for (Node node : args[0]) {
final String stringValue = backend.stringValue(node);
final int c = stringValue.length();
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/StrRightFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/StrRightFunction.java b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/StrRightFunction.java
index 2c7b29e..53abe90 100644
--- a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/StrRightFunction.java
+++ b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/StrRightFunction.java
@@ -18,16 +18,17 @@
package org.apache.marmotta.ldpath.model.functions.text;
-import java.util.Collection;
-import java.util.LinkedList;
-
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.functions.SelectorFunction;
+import java.util.Collection;
+import java.util.LinkedList;
+
public class StrRightFunction<Node> extends SelectorFunction<Node> {
+ @SafeVarargs
@Override
- public Collection<Node> apply(RDFBackend<Node> backend, Node context, Collection<Node>... args) throws IllegalArgumentException {
+ public final Collection<Node> apply(RDFBackend<Node> backend, Node context, Collection<Node>... args) throws IllegalArgumentException {
try {
if (args.length != 2) { throw new IllegalArgumentException("LdPath function " + getLocalName() + " requires 2 arguments"); }
if (args[1].size() != 1) { throw new IllegalArgumentException("len argument must be a single literal for function " + getLocalName()); }
@@ -35,17 +36,15 @@ public class StrRightFunction<Node> extends SelectorFunction<Node> {
final Collection<Node> nodes = args[0];
final int length = Math.max(backend.intValue(args[1].iterator().next()), 0);
- final Collection<Node> result = new LinkedList<Node>();
+ final Collection<Node> result = new LinkedList<>();
for (Node node : nodes) {
final String str = backend.stringValue(node);
result.add(backend.createLiteral(str.substring(Math.max(0, str.length() - length))));
}
return result;
- } catch (NumberFormatException nfe) {
+ } catch (NumberFormatException | ArithmeticException nfe) {
throw new IllegalArgumentException(nfe);
- } catch (ArithmeticException ae) {
- throw new IllegalArgumentException(ae);
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/SubstringFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/SubstringFunction.java b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/SubstringFunction.java
index 99af1bb..d0f01be 100644
--- a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/SubstringFunction.java
+++ b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/SubstringFunction.java
@@ -18,16 +18,17 @@
package org.apache.marmotta.ldpath.model.functions.text;
-import java.util.Collection;
-import java.util.LinkedList;
-
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.functions.SelectorFunction;
+import java.util.Collection;
+import java.util.LinkedList;
+
public class SubstringFunction<Node> extends SelectorFunction<Node> {
+ @SafeVarargs
@Override
- public Collection<Node> apply(RDFBackend<Node> backend, Node context, Collection<Node>... args) throws IllegalArgumentException {
+ public final Collection<Node> apply(RDFBackend<Node> backend, Node context, Collection<Node>... args) throws IllegalArgumentException {
try {
if (args.length < 2 || args.length > 3) { throw new IllegalArgumentException("LdPath function " + getLocalName() + " requires 2 or 3 arguments"); }
if (args[1].size() != 1) { throw new IllegalArgumentException("start argument must be a single literal for function " + getLocalName()); }
@@ -46,17 +47,15 @@ public class SubstringFunction<Node> extends SelectorFunction<Node> {
throw new IllegalArgumentException(getLocalName() + " does not allow end beeing smaller than start (end:" + end + " < start:" + start + ")");
}
- final Collection<Node> result = new LinkedList<Node>();
+ final Collection<Node> result = new LinkedList<>();
for (Node node : nodes) {
final String str = backend.stringValue(node);
result.add(backend.createLiteral(str.substring(Math.min(start, str.length()), Math.min(end, str.length()))));
}
return result;
- } catch (NumberFormatException nfe) {
+ } catch (NumberFormatException | ArithmeticException nfe) {
throw new IllegalArgumentException(nfe);
- } catch (ArithmeticException ae) {
- throw new IllegalArgumentException(ae);
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/WordCountFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/WordCountFunction.java b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/WordCountFunction.java
index 74a1a66..c174d73 100644
--- a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/WordCountFunction.java
+++ b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/WordCountFunction.java
@@ -18,23 +18,23 @@
package org.apache.marmotta.ldpath.model.functions.text;
import com.google.common.base.Preconditions;
+import org.apache.marmotta.ldpath.api.backend.RDFBackend;
+import org.apache.marmotta.ldpath.api.functions.SelectorFunction;
import java.net.URI;
import java.util.Collection;
import java.util.LinkedList;
-import org.apache.marmotta.ldpath.api.backend.RDFBackend;
-import org.apache.marmotta.ldpath.api.functions.SelectorFunction;
-
public class WordCountFunction<Node> extends SelectorFunction<Node> {
private final URI dataType = URI.create("http://www.w3.org/2001/XMLSchema#integer");
+ @SafeVarargs
@Override
- public Collection<Node> apply(RDFBackend<Node> backend, Node context, Collection<Node>... args) throws IllegalArgumentException {
+ public final Collection<Node> apply(RDFBackend<Node> backend, Node context, Collection<Node>... args) throws IllegalArgumentException {
Preconditions.checkArgument(args.length == 1, "Check usage: " + getSignature());
- LinkedList<Node> result = new LinkedList<Node>();
+ LinkedList<Node> result = new LinkedList<>();
for (Node node : args[0]) {
final String stringValue = backend.stringValue(node);
boolean isWordChar = false;
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/text/AbstractBinaryStringTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/text/AbstractBinaryStringTest.java b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/text/AbstractBinaryStringTest.java
index 79bafe2..7acf1b3 100644
--- a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/text/AbstractBinaryStringTest.java
+++ b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/text/AbstractBinaryStringTest.java
@@ -17,10 +17,10 @@
*/
package org.apache.marmotta.ldpath.model.tests.functions.text;
-import java.util.Collection;
-
import com.google.common.collect.Collections2;
+import java.util.Collection;
+
/**
* Abstract base class for binary string tests.
* @author Jakob Frank <ja...@apache.org>
@@ -28,8 +28,9 @@ import com.google.common.collect.Collections2;
*/
public abstract class AbstractBinaryStringTest<Node> extends AbstractStringTest<Node> {
+ @SafeVarargs
@Override
- protected boolean test(AbstractStringTest<Node>.ToStringFunction toStringFunction, Collection<Node>... args) {
+ protected final boolean test(AbstractStringTest<Node>.ToStringFunction toStringFunction, Collection<Node>... args) {
final Collection<Node> l = args[0], r = args[1];
try {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/text/AbstractStringTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/text/AbstractStringTest.java b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/text/AbstractStringTest.java
index 8c76849..16b871a 100644
--- a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/text/AbstractStringTest.java
+++ b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/text/AbstractStringTest.java
@@ -17,14 +17,13 @@
*/
package org.apache.marmotta.ldpath.model.tests.functions.text;
-import java.util.Collection;
-
+import com.google.common.base.Function;
+import com.google.common.collect.Collections2;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.functions.TestFunction;
import org.apache.marmotta.ldpath.model.transformers.StringTransformer;
-import com.google.common.base.Function;
-import com.google.common.collect.Collections2;
+import java.util.Collection;
/**
* Abstract base class for LDPath Test functions that work on the string representation of nodes.
@@ -33,11 +32,12 @@ import com.google.common.collect.Collections2;
*/
public abstract class AbstractStringTest<Node> extends TestFunction<Node> {
- protected final StringTransformer<Node> transformer = new StringTransformer<Node>();
+ protected final StringTransformer<Node> transformer = new StringTransformer<>();
+ @SafeVarargs
@Override
- public Boolean apply(RDFBackend<Node> backend, Node context,
- Collection<Node>... args) throws IllegalArgumentException {
+ public final Boolean apply(RDFBackend<Node> backend, Node context,
+ Collection<Node>... args) throws IllegalArgumentException {
if (args.length != getArgCount()) { throw new IllegalArgumentException(getLocalName() + " requires exactly " + getArgCount() + " arguments"); }
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/text/StringIsEmptyTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/text/StringIsEmptyTest.java b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/text/StringIsEmptyTest.java
index 3736d64..46f315d 100644
--- a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/text/StringIsEmptyTest.java
+++ b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/text/StringIsEmptyTest.java
@@ -17,10 +17,10 @@
*/
package org.apache.marmotta.ldpath.model.tests.functions.text;
-import java.util.Collection;
-
import com.google.common.collect.Collections2;
+import java.util.Collection;
+
/**
* LDPath test function to check if the string representation of an node is empty.
*
@@ -34,8 +34,9 @@ public class StringIsEmptyTest<Node> extends AbstractStringTest<Node> {
return "Check if the string representation of the node is empty";
}
+ @SafeVarargs
@Override
- protected boolean test(AbstractStringTest<Node>.ToStringFunction toStringFunction, Collection<Node>... args) {
+ protected final boolean test(AbstractStringTest<Node>.ToStringFunction toStringFunction, Collection<Node>... args) {
try {
for (String str: Collections2.transform(args[0], toStringFunction)) {
if (!str.isEmpty()) return false;
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-functions-xml/src/main/java/org/apache/marmotta/ldpath/model/functions/xml/XPathFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-xml/src/main/java/org/apache/marmotta/ldpath/model/functions/xml/XPathFunction.java b/libraries/ldpath/ldpath-functions-xml/src/main/java/org/apache/marmotta/ldpath/model/functions/xml/XPathFunction.java
index 446921d..30d669a 100644
--- a/libraries/ldpath/ldpath-functions-xml/src/main/java/org/apache/marmotta/ldpath/model/functions/xml/XPathFunction.java
+++ b/libraries/ldpath/ldpath-functions-xml/src/main/java/org/apache/marmotta/ldpath/model/functions/xml/XPathFunction.java
@@ -21,11 +21,7 @@ package org.apache.marmotta.ldpath.model.functions.xml;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.functions.SelectorFunction;
import org.apache.marmotta.ldpath.model.transformers.StringTransformer;
-import org.jdom2.Content;
-import org.jdom2.Document;
-import org.jdom2.Element;
-import org.jdom2.JDOMException;
-import org.jdom2.Text;
+import org.jdom2.*;
import org.jdom2.filter.Filters;
import org.jdom2.input.SAXBuilder;
import org.jdom2.input.sax.XMLReaders;
@@ -37,14 +33,7 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
/**
* Execute XPath functions over the content of the selected value.
@@ -55,7 +44,7 @@ public class XPathFunction<Node> extends SelectorFunction<Node> {
private static final Logger log = LoggerFactory.getLogger(XPathFunction.class);
- private final StringTransformer<Node> transformer = new StringTransformer<Node>();
+ private final StringTransformer<Node> transformer = new StringTransformer<>();
/**
@@ -66,10 +55,11 @@ public class XPathFunction<Node> extends SelectorFunction<Node> {
* @param args a nested list of KiWiNodes
* @return
*/
+ @SafeVarargs
@Override
- public Collection<Node> apply(RDFBackend<Node> rdfBackend, Node context, Collection<Node>... args) throws IllegalArgumentException {
+ public final Collection<Node> apply(RDFBackend<Node> rdfBackend, Node context, Collection<Node>... args) throws IllegalArgumentException {
if (args.length < 1) { throw new IllegalArgumentException("XPath expression is required as first argument."); }
- Set<String> xpaths = new HashSet<String>();
+ Set<String> xpaths = new HashSet<>();
for (Node xpath : args[0]) {
try {
xpaths.add(transformer.transform(rdfBackend,xpath, null));
@@ -85,7 +75,7 @@ public class XPathFunction<Node> extends SelectorFunction<Node> {
log.debug("execute xpaths {} on parsed parameters",xpaths);
it = org.apache.marmotta.ldpath.util.Collections.iterator(1,args);
}
- List<Node> result = new ArrayList<Node>();
+ List<Node> result = new ArrayList<>();
while (it.hasNext()) {
Node n = it.next();
try {
@@ -101,7 +91,7 @@ public class XPathFunction<Node> extends SelectorFunction<Node> {
}
private LinkedList<String> doFilter(String in, Set<String> xpaths) throws IOException {
- LinkedList<String> result = new LinkedList<String>();
+ LinkedList<String> result = new LinkedList<>();
try {
Document doc = new SAXBuilder(XMLReaders.NONVALIDATING).build(new StringReader(in));
XMLOutputter out = new XMLOutputter();
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-ldquery-cli/src/main/java/org/apache/marmotta/ldpath/ldquery/LDQuery.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-ldquery-cli/src/main/java/org/apache/marmotta/ldpath/ldquery/LDQuery.java b/libraries/ldpath/ldpath-ldquery-cli/src/main/java/org/apache/marmotta/ldpath/ldquery/LDQuery.java
index 5cfb0b0..efbd9d0 100644
--- a/libraries/ldpath/ldpath-ldquery-cli/src/main/java/org/apache/marmotta/ldpath/ldquery/LDQuery.java
+++ b/libraries/ldpath/ldpath-ldquery-cli/src/main/java/org/apache/marmotta/ldpath/ldquery/LDQuery.java
@@ -90,7 +90,7 @@ public class LDQuery {
}
if(backend != null && context != null) {
- LDPath<Value> ldpath = new LDPath<Value>(backend);
+ LDPath<Value> ldpath = new LDPath<>(backend);
if(cmd.hasOption("path")) {
String path = cmd.getOptionValue("path");
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-template-linkeddata/src/main/java/org/apache/marmotta/ldpath/template/LDTemplate.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template-linkeddata/src/main/java/org/apache/marmotta/ldpath/template/LDTemplate.java b/libraries/ldpath/ldpath-template-linkeddata/src/main/java/org/apache/marmotta/ldpath/template/LDTemplate.java
index 1b4aec5..a2d0e71 100644
--- a/libraries/ldpath/ldpath-template-linkeddata/src/main/java/org/apache/marmotta/ldpath/template/LDTemplate.java
+++ b/libraries/ldpath/ldpath-template-linkeddata/src/main/java/org/apache/marmotta/ldpath/template/LDTemplate.java
@@ -101,7 +101,7 @@ public class LDTemplate {
}
if(backend != null && context != null && template != null) {
- TemplateEngine<Value> engine = new TemplateEngine<Value>(backend);
+ TemplateEngine<Value> engine = new TemplateEngine<>(backend);
engine.setDirectoryForTemplateLoading(template.getAbsoluteFile().getParentFile());
engine.processFileTemplate(context,template.getName(),out);
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/LDPathDirective.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/LDPathDirective.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/LDPathDirective.java
index 62a3632..89a392b 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/LDPathDirective.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/LDPathDirective.java
@@ -19,12 +19,6 @@ package org.apache.marmotta.ldpath.template.engine;
import freemarker.core.Environment;
import freemarker.template.*;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.marmotta.ldpath.LDPath;
import org.apache.marmotta.ldpath.api.backend.NodeBackend;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
@@ -36,6 +30,11 @@ import org.apache.marmotta.ldpath.template.model.freemarker.TemplateWrapperModel
import org.apache.marmotta.ldpath.template.model.transformers.*;
import org.apache.marmotta.ldpath.template.util.FormatUtil;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* A directive for inserting values retrieved with LDPath. It can be used in several forms:
* <p/>
@@ -72,7 +71,7 @@ public class LDPathDirective<Node> implements TemplateDirectiveModel {
private NodeBackend<Node> backend;
public LDPathDirective(RDFBackend<Node> backend) {
- this.ldpath = new LDPath<Node>(backend);
+ this.ldpath = new LDPath<>(backend);
this.backend = backend;
// register custom freemarker transformers for the parser so we get the results immediately in the freemarker model
@@ -135,7 +134,7 @@ public class LDPathDirective<Node> implements TemplateDirectiveModel {
Map<String,String> namespaces;
if(namespacesWrapped == null) {
- namespaces = new HashMap<String, String>();
+ namespaces = new HashMap<>();
namespacesWrapped = new TemplateWrapperModel<Map<String, String>>(new HashMap<String, String>());
env.setGlobalVariable("namespaces",namespacesWrapped);
} else {
@@ -185,10 +184,10 @@ public class LDPathDirective<Node> implements TemplateDirectiveModel {
} else {
try {
for(Node node : ldpath.pathQuery(context.getNode(),path,namespaces)) {
- contextStack.push(new TemplateNodeModel<Node>(node, backend));
+ contextStack.push(new TemplateNodeModel<>(node, backend));
if(loopVars.length > 0) {
- loopVars[0] = new TemplateNodeModel<Node>(node,backend);
+ loopVars[0] = new TemplateNodeModel<>(node, backend);
}
body.render(env.getOut());
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/LDPathMethod.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/LDPathMethod.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/LDPathMethod.java
index 74b0983..82f5e29 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/LDPathMethod.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/LDPathMethod.java
@@ -21,14 +21,7 @@ import freemarker.core.Environment;
import freemarker.template.TemplateDateModel;
import freemarker.template.TemplateMethodModel;
import freemarker.template.TemplateModelException;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.marmotta.ldpath.LDPath;
-import org.apache.marmotta.ldpath.api.backend.NodeBackend;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.exception.LDPathParseException;
import org.apache.marmotta.ldpath.model.Constants;
@@ -37,6 +30,11 @@ import org.apache.marmotta.ldpath.template.model.freemarker.TemplateStackModel;
import org.apache.marmotta.ldpath.template.model.freemarker.TemplateWrapperModel;
import org.apache.marmotta.ldpath.template.model.transformers.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* Add file description here!
* <p/>
@@ -46,11 +44,9 @@ public class LDPathMethod<Node> implements TemplateMethodModel {
private LDPath<Node> ldpath;
- private NodeBackend<Node> backend;
public LDPathMethod(RDFBackend<Node> backend) {
- this.ldpath = new LDPath<Node>(backend);
- this.backend = backend;
+ this.ldpath = new LDPath<>(backend);
// register custom freemarker transformers for the parser so we get the results immediately in the freemarker model
ldpath.registerTransformer(Constants.NS_XSD + "string", new TemplateScalarTransformer<Node>());
@@ -110,7 +106,7 @@ public class LDPathMethod<Node> implements TemplateMethodModel {
Map<String,String> namespaces;
if(namespacesWrapped == null) {
- namespaces = new HashMap<String, String>();
+ namespaces = new HashMap<>();
namespacesWrapped = new TemplateWrapperModel<Map<String, String>>(new HashMap<String, String>());
env.setGlobalVariable("namespaces",namespacesWrapped);
} else {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/NamespaceDirective.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/NamespaceDirective.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/NamespaceDirective.java
index 46ded3c..4e794ed 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/NamespaceDirective.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/NamespaceDirective.java
@@ -18,22 +18,15 @@
package org.apache.marmotta.ldpath.template.engine;
import freemarker.core.Environment;
-import freemarker.template.TemplateDirectiveBody;
-import freemarker.template.TemplateDirectiveModel;
-import freemarker.template.TemplateException;
-import freemarker.template.TemplateModel;
-import freemarker.template.TemplateModelException;
-import freemarker.template.TemplateScalarModel;
+import freemarker.template.*;
+import org.apache.marmotta.ldpath.template.model.freemarker.TemplateWrapperModel;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
-import org.apache.marmotta.ldpath.template.model.freemarker.TemplateWrapperModel;
-
/**
* Add file description here!
* <p/>
@@ -77,29 +70,28 @@ public class NamespaceDirective implements TemplateDirectiveModel {
Map<String,String> namespaces;
if(namespacesWrapped == null) {
- namespaces = new HashMap<String, String>();
- namespacesWrapped = new TemplateWrapperModel<Map<String, String>>(namespaces);
+ namespaces = new HashMap<>();
+ namespacesWrapped = new TemplateWrapperModel<>(namespaces);
env.setGlobalVariable("namespaces",namespacesWrapped);
} else {
namespaces = namespacesWrapped.getAdaptedObject(Map.class);
}
- Iterator paramIter = params.entrySet().iterator();
- while (paramIter.hasNext()) {
- Map.Entry ent = (Map.Entry) paramIter.next();
+ for (Object o : params.entrySet()) {
+ Map.Entry ent = (Map.Entry) o;
String paramName = (String) ent.getKey();
TemplateModel paramValue = (TemplateModel) ent.getValue();
- if(paramValue instanceof TemplateScalarModel) {
- String uri = ((TemplateScalarModel)paramValue).getAsString();
+ if (paramValue instanceof TemplateScalarModel) {
+ String uri = ((TemplateScalarModel) paramValue).getAsString();
try {
URI test = new URI(uri);
- namespaces.put(paramName,test.toString());
+ namespaces.put(paramName, test.toString());
} catch (URISyntaxException e) {
- throw new TemplateModelException("invalid namespace URI '"+uri+"'",e);
+ throw new TemplateModelException("invalid namespace URI '" + uri + "'", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/freemarker/TemplateStackModel.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/freemarker/TemplateStackModel.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/freemarker/TemplateStackModel.java
index c496c82..b4e7c51 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/freemarker/TemplateStackModel.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/freemarker/TemplateStackModel.java
@@ -31,7 +31,7 @@ public class TemplateStackModel implements TemplateModel {
private Stack<TemplateModel> stack;
public TemplateStackModel() {
- stack = new Stack<TemplateModel>();
+ stack = new Stack<>();
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateBooleanTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateBooleanTransformer.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateBooleanTransformer.java
index e1f6ce3..6ec032c 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateBooleanTransformer.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateBooleanTransformer.java
@@ -17,13 +17,12 @@
*/
package org.apache.marmotta.ldpath.template.model.transformers;
+import freemarker.template.TemplateBooleanModel;
+import freemarker.template.TemplateModelException;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
import org.apache.marmotta.ldpath.model.transformers.BooleanTransformer;
-import freemarker.template.TemplateBooleanModel;
-import freemarker.template.TemplateModelException;
-
import java.util.Map;
/**
@@ -36,7 +35,7 @@ public class TemplateBooleanTransformer<Node> implements NodeTransformer<Templat
private BooleanTransformer<Node> delegate;
public TemplateBooleanTransformer() {
- delegate = new BooleanTransformer<Node>();
+ delegate = new BooleanTransformer<>();
}
/**
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDateTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDateTransformer.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDateTransformer.java
index 6cb6d22..0c94646 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDateTransformer.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDateTransformer.java
@@ -19,14 +19,13 @@ package org.apache.marmotta.ldpath.template.model.transformers;
import freemarker.template.TemplateDateModel;
import freemarker.template.TemplateModelException;
-
-import java.util.Date;
-import java.util.Map;
-
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
import org.apache.marmotta.ldpath.model.transformers.DateTimeTransformer;
+import java.util.Date;
+import java.util.Map;
+
/**
* Transform a node into the freemarker date type ({@link freemarker.template.TemplateDateModel}).
* <p/>
@@ -39,7 +38,7 @@ public class TemplateDateTransformer<Node> implements NodeTransformer<TemplateDa
private int type = TemplateDateModel.UNKNOWN;
public TemplateDateTransformer() {
- delegate = new DateTimeTransformer<Node>();
+ delegate = new DateTimeTransformer<>();
}
public TemplateDateTransformer(int type) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDoubleTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDoubleTransformer.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDoubleTransformer.java
index e45a3ab..f5c26c8 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDoubleTransformer.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDoubleTransformer.java
@@ -17,13 +17,12 @@
*/
package org.apache.marmotta.ldpath.template.model.transformers;
+import freemarker.template.TemplateModelException;
+import freemarker.template.TemplateNumberModel;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
import org.apache.marmotta.ldpath.model.transformers.DoubleTransformer;
-import freemarker.template.TemplateModelException;
-import freemarker.template.TemplateNumberModel;
-
import java.util.Map;
/**
@@ -38,7 +37,7 @@ public class TemplateDoubleTransformer<Node> implements NodeTransformer<Template
private DoubleTransformer<Node> delegate;
public TemplateDoubleTransformer() {
- delegate = new DoubleTransformer<Node>();
+ delegate = new DoubleTransformer<>();
}
/**
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateFloatTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateFloatTransformer.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateFloatTransformer.java
index c9be369..8998550 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateFloatTransformer.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateFloatTransformer.java
@@ -17,13 +17,12 @@
*/
package org.apache.marmotta.ldpath.template.model.transformers;
+import freemarker.template.TemplateModelException;
+import freemarker.template.TemplateNumberModel;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
import org.apache.marmotta.ldpath.model.transformers.FloatTransformer;
-import freemarker.template.TemplateModelException;
-import freemarker.template.TemplateNumberModel;
-
import java.util.Map;
/**
@@ -36,7 +35,7 @@ public class TemplateFloatTransformer<Node> implements NodeTransformer<TemplateN
private FloatTransformer<Node> delegate;
public TemplateFloatTransformer() {
- delegate = new FloatTransformer<Node>();
+ delegate = new FloatTransformer<>();
}
/**
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateIntegerTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateIntegerTransformer.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateIntegerTransformer.java
index 4ea2b59..203e601 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateIntegerTransformer.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateIntegerTransformer.java
@@ -17,13 +17,12 @@
*/
package org.apache.marmotta.ldpath.template.model.transformers;
+import freemarker.template.TemplateModelException;
+import freemarker.template.TemplateNumberModel;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
import org.apache.marmotta.ldpath.model.transformers.IntTransformer;
-import freemarker.template.TemplateModelException;
-import freemarker.template.TemplateNumberModel;
-
import java.util.Map;
/**
@@ -36,7 +35,7 @@ public class TemplateIntegerTransformer<Node> implements NodeTransformer<Templat
private IntTransformer<Node> delegate;
public TemplateIntegerTransformer() {
- delegate = new IntTransformer<Node>();
+ delegate = new IntTransformer<>();
}
/**
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateScalarTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateScalarTransformer.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateScalarTransformer.java
index 5b9fdde..fcdbde4 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateScalarTransformer.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateScalarTransformer.java
@@ -17,13 +17,12 @@
*/
package org.apache.marmotta.ldpath.template.model.transformers;
+import freemarker.template.TemplateModelException;
+import freemarker.template.TemplateScalarModel;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
import org.apache.marmotta.ldpath.model.transformers.StringTransformer;
-import freemarker.template.TemplateModelException;
-import freemarker.template.TemplateScalarModel;
-
import java.util.Map;
/**
@@ -37,7 +36,7 @@ public class TemplateScalarTransformer<Node> implements NodeTransformer<Template
public TemplateScalarTransformer() {
- delegate = new StringTransformer<Node>();
+ delegate = new StringTransformer<>();
}
/**
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ostrich/client/src/main/java/org/apache/marmotta/ostrich/sail/ClosableResponseStream.java
----------------------------------------------------------------------
diff --git a/libraries/ostrich/client/src/main/java/org/apache/marmotta/ostrich/sail/ClosableResponseStream.java b/libraries/ostrich/client/src/main/java/org/apache/marmotta/ostrich/sail/ClosableResponseStream.java
index e9ec41e..5f10d61 100644
--- a/libraries/ostrich/client/src/main/java/org/apache/marmotta/ostrich/sail/ClosableResponseStream.java
+++ b/libraries/ostrich/client/src/main/java/org/apache/marmotta/ostrich/sail/ClosableResponseStream.java
@@ -42,7 +42,7 @@ public class ClosableResponseStream<Svc extends AbstractStub<Svc>, ReqT, T> impl
private static Logger log = LoggerFactory.getLogger(ClosableResponseStream.class);
// Due to flow control, only needs to hold up to 2 items: 1 for value, 1 for close.
- private final BlockingQueue<Object> buffer = new ArrayBlockingQueue<Object>(2);
+ private final BlockingQueue<Object> buffer = new ArrayBlockingQueue<>(2);
private final ClientCall.Listener<T> listener = new QueuingListener();
private final ClientCall<ReqT, T> call;
// Only accessed when iterating.
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ostrich/client/src/main/java/org/apache/marmotta/ostrich/sail/OstrichSailConnection.java
----------------------------------------------------------------------
diff --git a/libraries/ostrich/client/src/main/java/org/apache/marmotta/ostrich/sail/OstrichSailConnection.java b/libraries/ostrich/client/src/main/java/org/apache/marmotta/ostrich/sail/OstrichSailConnection.java
index b8f6b27..2529151 100644
--- a/libraries/ostrich/client/src/main/java/org/apache/marmotta/ostrich/sail/OstrichSailConnection.java
+++ b/libraries/ostrich/client/src/main/java/org/apache/marmotta/ostrich/sail/OstrichSailConnection.java
@@ -134,7 +134,7 @@ public class OstrichSailConnection extends NotifyingSailConnectionBase {
try {
channel.shutdown().awaitTermination(5, TimeUnit.SECONDS);
} catch (InterruptedException e) {
- new SailException("Shutdown interrupted", e);
+ throw new SailException("Shutdown interrupted", e);
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/task/TaskInfo.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/task/TaskInfo.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/task/TaskInfo.java
index 482a01e..cc62c04 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/task/TaskInfo.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/task/TaskInfo.java
@@ -17,13 +17,13 @@
*/
package org.apache.marmotta.platform.core.api.task;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
import java.util.Collections;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
public abstract class TaskInfo {
protected final long started;
@@ -79,7 +79,7 @@ public abstract class TaskInfo {
protected TaskInfo(String uuid) {
this.uuid = uuid;
- this.detailMessages = new LinkedHashMap<String, String>();
+ this.detailMessages = new LinkedHashMap<>();
this.lastUpdate = this.started = System.currentTimeMillis();
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/exception/HttpErrorException.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/exception/HttpErrorException.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/exception/HttpErrorException.java
index 13ec999..3e6c755 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/exception/HttpErrorException.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/exception/HttpErrorException.java
@@ -102,7 +102,7 @@ public class HttpErrorException extends Exception {
this.status = status;
this.reason = reason;
this.uri = uri;
- this.headers = new HashMap<String,String>(headers);
+ this.headers = new HashMap<>(headers);
}
public int getStatus() {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/filters/TemplatingFilter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/filters/TemplatingFilter.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/filters/TemplatingFilter.java
index b7de9be..a84d153 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/filters/TemplatingFilter.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/filters/TemplatingFilter.java
@@ -17,19 +17,6 @@
*/
package org.apache.marmotta.platform.core.filters;
-import java.io.IOException;
-import java.net.URL;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.marmotta.platform.core.api.config.ConfigurationService;
import org.apache.marmotta.platform.core.api.modules.MarmottaHttpFilter;
import org.apache.marmotta.platform.core.api.modules.MarmottaResourceService;
@@ -38,6 +25,14 @@ import org.apache.marmotta.platform.core.api.templating.AdminInterfaceService;
import org.apache.marmotta.platform.core.exception.TemplatingException;
import org.slf4j.Logger;
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URL;
+
/**
* Add file description here!
* <p/>
@@ -97,7 +92,7 @@ public class TemplatingFilter implements MarmottaHttpFilter {
try {
adminInterfaceService.init(filterConfig.getServletContext());
} catch (TemplatingException e) {
- log.error("templating service could not be initialized: " + e.getMessage());
+ log.error("templating service could not be initialized: {}", e.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jaxrs/exceptionmappers/ErrorResponse.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jaxrs/exceptionmappers/ErrorResponse.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jaxrs/exceptionmappers/ErrorResponse.java
index 878be4f..2fd4e12 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jaxrs/exceptionmappers/ErrorResponse.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jaxrs/exceptionmappers/ErrorResponse.java
@@ -110,7 +110,7 @@ public class ErrorResponse {
public String toString() {
- StringBuffer b = new StringBuffer();
+ StringBuilder b = new StringBuilder();
b.append("Code: ");
b.append(code);
b.append(System.getProperty("line.separator"));
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/MarmottaContext.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/MarmottaContext.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/MarmottaContext.java
index 8126ca8..5816af8 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/MarmottaContext.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/MarmottaContext.java
@@ -19,7 +19,6 @@ package org.apache.marmotta.platform.core.jndi;
import javax.naming.*;
import javax.naming.spi.ObjectFactory;
-
import java.util.*;
/**
@@ -44,8 +43,8 @@ public class MarmottaContext implements Context {
public MarmottaContext(Hashtable<Object, Object> environment) {
this.environment = environment;
- this.bindings = new HashMap<Name, Object>();
- this.factories = new HashMap<String, ObjectFactory>();
+ this.bindings = new HashMap<>();
+ this.factories = new HashMap<>();
}
private ObjectFactory getObjectFactory(String className) throws ClassNotFoundException, IllegalAccessException, InstantiationException {
@@ -75,8 +74,8 @@ public class MarmottaContext implements Context {
public Object lookup(Name name) throws NamingException {
if(name.size() == 0) {
// clone current context
- MarmottaContext clone = new MarmottaContext(new Hashtable<Object, Object>(this.environment));
- clone.bindings = new HashMap<Name, Object>(this.bindings);
+ MarmottaContext clone = new MarmottaContext(new Hashtable<>(this.environment));
+ clone.bindings = new HashMap<>(this.bindings);
return clone;
} else if(name.size() > 1) {
// look in subcontexts
@@ -494,7 +493,7 @@ public class MarmottaContext implements Context {
*/
@Override
public Context createSubcontext(Name name) throws NamingException {
- MarmottaContext subcontext = new MarmottaContext(new Hashtable<Object, Object>(this.environment));
+ MarmottaContext subcontext = new MarmottaContext(new Hashtable<>(this.environment));
bind(name,subcontext);
return subcontext;
}
@@ -687,7 +686,7 @@ public class MarmottaContext implements Context {
*/
@Override
public Hashtable<?, ?> getEnvironment() throws NamingException {
- return new Hashtable<Object, Object>(environment);
+ return new Hashtable<>(environment);
}
/**
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/MarmottaContextFactory.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/MarmottaContextFactory.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/MarmottaContextFactory.java
index 2e808cb..d78d9e3 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/MarmottaContextFactory.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/MarmottaContextFactory.java
@@ -23,7 +23,6 @@ import org.slf4j.LoggerFactory;
import javax.naming.Context;
import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactory;
-
import java.util.Hashtable;
/**
@@ -54,7 +53,7 @@ public class MarmottaContextFactory implements InitialContextFactory {
@Override
public Context getInitialContext(Hashtable<?, ?> hashtable) throws NamingException {
- Hashtable<Object,Object> env = new Hashtable<Object, Object>();
+ Hashtable<Object,Object> env = new Hashtable<>();
env.put("jndi.syntax.direction", "left_to_right");
env.put("jndi.syntax.separator","/");
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/model/template/MenuItem.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/model/template/MenuItem.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/model/template/MenuItem.java
index 1cf1131..036aa54 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/model/template/MenuItem.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/model/template/MenuItem.java
@@ -22,7 +22,6 @@ import org.apache.marmotta.platform.core.api.templating.TemplatingService;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* Created with IntelliJ IDEA.
@@ -41,9 +40,9 @@ public class MenuItem {
private MenuItemType type;
public MenuItem(String label, MenuItemType type) {
- this.properties = new HashMap<String, Object>();
+ this.properties = new HashMap<>();
this.type = type;
- this.items = new ArrayList<MenuItem>();
+ this.items = new ArrayList<>();
properties.put("items",items);
properties.put("label",label);
@@ -53,7 +52,7 @@ public class MenuItem {
public HashMap<String,Object> getProperties() {
if(properties.get("items") != null) {
- List<Object> os = new ArrayList<Object>();
+ List<Object> os = new ArrayList<>();
for(MenuItem item : items) {
os.add(item.getProperties());
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/rio/RDFHtmlFormat.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/rio/RDFHtmlFormat.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/rio/RDFHtmlFormat.java
index 649d6e6..e08a33f 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/rio/RDFHtmlFormat.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/rio/RDFHtmlFormat.java
@@ -21,6 +21,7 @@ import org.openrdf.rio.RDFFormat;
import java.nio.charset.Charset;
import java.util.Arrays;
+import java.util.Collections;
/**
* Add file description here!
@@ -33,7 +34,7 @@ public class RDFHtmlFormat {
"HTML",
Arrays.asList("text/html", "application/xhtml+xml"),
Charset.forName("UTF-8"),
- Arrays.asList("html"),
+ Collections.singletonList("html"),
true,
false
);
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/rio/RDFHtmlWriterImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/rio/RDFHtmlWriterImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/rio/RDFHtmlWriterImpl.java
index 7b16cc5..735e9cc 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/rio/RDFHtmlWriterImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/rio/RDFHtmlWriterImpl.java
@@ -59,9 +59,9 @@ public class RDFHtmlWriterImpl implements RDFHtmlWriter {
protected WriterConfig config;
- protected Map<Resource, SortedSet<Statement>> tripleMap = new HashMap<Resource, SortedSet<Statement>>();
+ protected Map<Resource, SortedSet<Statement>> tripleMap = new HashMap<>();
- protected Map<String, String> namespaceMap = new HashMap<String, String>();
+ protected Map<String, String> namespaceMap = new HashMap<>();
public RDFHtmlWriterImpl(OutputStream out) {
this(new OutputStreamWriter(out));
@@ -112,10 +112,10 @@ public class RDFHtmlWriterImpl implements RDFHtmlWriter {
@Override
public void endRDF() throws RDFHandlerException {
- List<Map<String, Object>> resources = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> resources = new ArrayList<>();
for (Map.Entry<Resource, SortedSet<Statement>> entry : tripleMap.entrySet()) {
SortedSet<Statement> ts = entry.getValue();
- Map<String, Object> resource = new HashMap<String, Object>();
+ Map<String, Object> resource = new HashMap<>();
String subject = ts.first().getSubject().stringValue();
if (UriUtil.validate(subject)) {
resource.put("uri", subject);
@@ -135,12 +135,12 @@ public class RDFHtmlWriterImpl implements RDFHtmlWriter {
}
}
- List<Map<String, Object>> triples = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> triples = new ArrayList<>();
for (Statement t : ts) {
- Map<String, Object> triple = new HashMap<String, Object>();
+ Map<String, Object> triple = new HashMap<>();
//predicate
- Map<String, String> predicate = new HashMap<String, String>();
+ Map<String, String> predicate = new HashMap<>();
String predicateUri = t.getPredicate().stringValue();
predicate.put("uri", predicateUri);
String predicateCurie = prefixService.getCurie(predicateUri);
@@ -148,7 +148,7 @@ public class RDFHtmlWriterImpl implements RDFHtmlWriter {
triple.put("predicate", predicate);
//object
- Map<String, String> object = new HashMap<String, String>();
+ Map<String, String> object = new HashMap<>();
Value value = t.getObject();
String objectValue = value.stringValue();
if (value instanceof URI) { //http uri
@@ -189,7 +189,7 @@ public class RDFHtmlWriterImpl implements RDFHtmlWriter {
triple.put("object", object);
if(t.getContext() != null) {
- Map<String, String> context = new HashMap<String, String>();
+ Map<String, String> context = new HashMap<>();
String contextUri = t.getContext().stringValue();
context.put("uri", contextUri);
String contextCurie = prefixService.getCurie(contextUri);
@@ -213,7 +213,7 @@ public class RDFHtmlWriterImpl implements RDFHtmlWriter {
}
try {
- Map<String, Object> data = new HashMap<String, Object>();
+ Map<String, Object> data = new HashMap<>();
data.put("baseUri", configurationService.getServerUri());
data.put("resources", resources);
data.put("prefixMappings", prefixService.serializePrefixMapping());
@@ -265,7 +265,7 @@ public class RDFHtmlWriterImpl implements RDFHtmlWriter {
SortedSet<Statement> ts = tripleMap.get(st.getSubject());
ts.add(st);
} else {
- SortedSet<Statement> ts = new TreeSet<Statement>(
+ SortedSet<Statement> ts = new TreeSet<>(
new Comparator<Statement>() {
@Override
public int compare(Statement o1, Statement o2) {
@@ -327,7 +327,7 @@ public class RDFHtmlWriterImpl implements RDFHtmlWriter {
*/
@Override
public Collection<RioSetting<?>> getSupportedSettings() {
- return new ArrayList<RioSetting<?>>();
+ return new ArrayList<>();
}
/**
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
index e32dc5f..69db839 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
@@ -73,7 +73,7 @@ public class ConfigurationServiceImpl implements ConfigurationService {
private String home;
- private static Logger log = LoggerFactory.getLogger(ConfigurationService.class);
+ private static Logger log = LoggerFactory.getLogger(ConfigurationServiceImpl.class);
private String configFileName, metaFileName;
@@ -144,7 +144,7 @@ public class ConfigurationServiceImpl implements ConfigurationService {
public ConfigurationServiceImpl() {
- runtimeFlags = new HashMap<String, Boolean>();
+ runtimeFlags = new HashMap<>();
lock = new ReentrantReadWriteLock();
eventTimer = new Timer("Configuration Event Timer", true);
@@ -460,7 +460,7 @@ public class ConfigurationServiceImpl implements ConfigurationService {
public List<String> listConfigurationKeys() {
lock.readLock().lock();
try {
- List<String> keys = new LinkedList<String>();
+ List<String> keys = new LinkedList<>();
for (Iterator<String> it = config.getKeys(); it.hasNext();) {
keys.add(it.next());
}
@@ -480,7 +480,7 @@ public class ConfigurationServiceImpl implements ConfigurationService {
public List<String> listConfigurationKeys(String prefix) {
lock.readLock().lock();
try {
- List<String> keys = new LinkedList<String>();
+ List<String> keys = new LinkedList<>();
for (Iterator<String> it = config.getKeys(prefix); it.hasNext();) {
keys.add(it.next());
}
@@ -501,7 +501,7 @@ public class ConfigurationServiceImpl implements ConfigurationService {
public List<Matcher> listConfigurationKeys(Pattern pattern) {
lock.readLock().lock();
try {
- List<Matcher> keys = new LinkedList<Matcher>();
+ List<Matcher> keys = new LinkedList<>();
for (Iterator<String> it = config.getKeys(); it.hasNext();) {
Matcher m = pattern.matcher(it.next());
if(m.matches()) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/DependenciesServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/DependenciesServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/DependenciesServiceImpl.java
index 988b4b2..abeb6a1 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/DependenciesServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/DependenciesServiceImpl.java
@@ -42,7 +42,7 @@ public class DependenciesServiceImpl implements DependenciesService {
private List<Map<String, String>> dependencies;
public DependenciesServiceImpl() {
- this.dependencies = new ArrayList<Map<String, String>>();
+ this.dependencies = new ArrayList<>();
}
@PostConstruct
@@ -72,24 +72,22 @@ public class DependenciesServiceImpl implements DependenciesService {
while ((line = br.readLine()) != null) {
line = StringUtils.stripToNull(line);
if (line != null) {
- Map<String, String> dep = new HashMap<String, String>();
+ Map<String, String> dep = new HashMap<>();
String[] split = StringUtils.split(line, ":");
if (split.length >= 4) {
dep.put(DependenciesService.GROUP, split[0]);
dep.put(DependenciesService.ARTIFACT, split[1]);
dep.put(DependenciesService.VERSION, split[3]);
this.dependencies.add(dep);
- log.debug("Recovered dependency " + split[0] + ":" + split[2] + ":" + split[2]);
+ log.debug("Recovered dependency {}:{}:{}", split[0], split[2], split[2]);
}
}
}
br.close();
- } catch (IOException e) {
- log.error("Error reading dependencies: " + e.getMessage());
- } catch (NullPointerException e) {
- log.error("Error reading dependencies: " + e.getMessage());
+ } catch (IOException | NullPointerException e) {
+ log.error("Error reading dependencies: {}", e.getMessage());
}
}
}
@@ -101,7 +99,7 @@ public class DependenciesServiceImpl implements DependenciesService {
@Override
public List<Map<String, String>> getArtifacts(String groupId) {
- List<Map<String, String>> deps = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> deps = new ArrayList<>();
for (Map<String, String> dep : this.dependencies) {
if (groupId.equals(dep.get(DependenciesService.GROUP))) {
deps.add(Collections.unmodifiableMap(dep));
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/ContentServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/ContentServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/ContentServiceImpl.java
index 6db15e3..dc9d2a7 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/ContentServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/ContentServiceImpl.java
@@ -17,19 +17,6 @@
*/
package org.apache.marmotta.platform.core.services.content;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-
import org.apache.marmotta.platform.core.api.config.ConfigurationService;
import org.apache.marmotta.platform.core.api.content.ContentReader;
import org.apache.marmotta.platform.core.api.content.ContentService;
@@ -41,6 +28,18 @@ import org.apache.marmotta.platform.core.exception.WritingNotSupportedException;
import org.openrdf.model.Resource;
import org.slf4j.Logger;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+
/**
* Service that provides access to the content associated with a resource. It makes use of the ContentReader and
* ContentWriter implementations registered in the system.
@@ -78,13 +77,13 @@ public class ContentServiceImpl implements ContentService {
}
private void initialiseReadersWriters() {
- readerMap = new HashMap<Pattern, ContentReader>();
- writerMap = new HashMap<Pattern, ContentWriter>();
+ readerMap = new HashMap<>();
+ writerMap = new HashMap<>();
// first read from the config file all content.* keys and store the name of the reader/writer in this set
// will e.g. store "triplestore" and "filesystem" if it finds keys of the form "content.triplestore.reader"
// and "content.filesystem.writer"
- Set<String> configNames = new HashSet<String>();
+ Set<String> configNames = new HashSet<>();
for(String key : configurationService.listConfigurationKeys("content")) {
String[] components = key.split("\\.");
if(components.length > 1) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/FileSystemContentReader.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/FileSystemContentReader.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/FileSystemContentReader.java
index 83513d9..e6dfc69 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/FileSystemContentReader.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/FileSystemContentReader.java
@@ -90,11 +90,8 @@ public class FileSystemContentReader implements ContentReader {
*/
@Override
public byte[] getContentData(Resource resource, String mimetype) throws IOException {
- InputStream in = getContentStream(resource,mimetype);
- try {
+ try (InputStream in = getContentStream(resource, mimetype)) {
return ByteStreams.toByteArray(in);
- } finally {
- in.close();
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/HTTPContentReader.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/HTTPContentReader.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/HTTPContentReader.java
index 091b4be..c047abf 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/HTTPContentReader.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/HTTPContentReader.java
@@ -281,7 +281,7 @@ public class HTTPContentReader implements ContentReader {
if (response.getStatusLine().getStatusCode() == 200)
return Long.parseLong(response.getFirstHeader("Content-Length").getValue());
else
- return 0l;
+ return 0L;
}
});
} else
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/HttpClientServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/HttpClientServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/HttpClientServiceImpl.java
index dc40248..82bf9d0 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/HttpClientServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/HttpClientServiceImpl.java
@@ -182,10 +182,10 @@ public class HttpClientServiceImpl implements HttpClientService {
private static String formatNanoDuration(long nano) {
// convert to microseconds (1/1000s)
final long micro = nano / 1000;
- if (micro > 1000 * 1000l) {
+ if (micro > 1000 * 1000L) {
// more than a second
- long millis = micro / 1000l;
- if (millis > 60000l)
+ long millis = micro / 1000L;
+ if (millis > 60000L)
// more than a minute
return String.format("%d min %.1f sec", millis / (1000 * 60), 0.001d * millis % 60);
else
@@ -490,7 +490,7 @@ public class HttpClientServiceImpl implements HttpClientService {
@Override
public Map<String, String> getStatistics() {
int i = 0;
- final Map<String, String> data = new LinkedHashMap<String, String>();
+ final Map<String, String> data = new LinkedHashMap<>();
data.put(KEYS[i++], String.valueOf(requestsExecuted.get()));
data.put(KEYS[i++], humanReadableBytes(bytesSent.get(), false));
data.put(KEYS[i++], humanReadableBytes(bytesReceived.get(), false));
@@ -649,9 +649,6 @@ public class HttpClientServiceImpl implements HttpClientService {
lock.readLock().lock();
try {
response = delegate.execute(request);
- } catch (ClientProtocolException cpe) {
- task.endTask();
- throw cpe;
} catch (IOException io) {
task.endTask();
throw io;
@@ -670,9 +667,6 @@ public class HttpClientServiceImpl implements HttpClientService {
lock.readLock().lock();
try {
response = delegate.execute(request, context);
- } catch (ClientProtocolException cpe) {
- task.endTask();
- throw cpe;
} catch (IOException io) {
task.endTask();
throw io;
@@ -731,9 +725,6 @@ public class HttpClientServiceImpl implements HttpClientService {
lock.readLock().lock();
try {
response = delegate.execute(target, request);
- } catch (ClientProtocolException cpe) {
- task.endTask();
- throw cpe;
} catch (IOException io) {
task.endTask();
throw io;
@@ -752,9 +743,6 @@ public class HttpClientServiceImpl implements HttpClientService {
lock.readLock().lock();
try {
response = delegate.execute(target, request, context);
- } catch (ClientProtocolException cpe) {
- task.endTask();
- throw cpe;
} catch (IOException io) {
task.endTask();
throw io;
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/importer/ImportServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/importer/ImportServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/importer/ImportServiceImpl.java
index 634c387..339b74d 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/importer/ImportServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/importer/ImportServiceImpl.java
@@ -29,7 +29,6 @@ import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Instance;
import javax.inject.Inject;
-
import java.io.InputStream;
import java.io.Reader;
import java.net.URL;
@@ -56,7 +55,7 @@ public class ImportServiceImpl implements ImportService{
@Inject
public void initImporters(@Any Instance<Importer> importers) {
if(importerMap == null) {
- importerMap = new HashMap<String,Importer>();
+ importerMap = new HashMap<>();
for( Importer i : importers ) {
for( String s : i.getAcceptTypes() ) {
importerMap.put(s,i);
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/importer/rdf/RDFImporterImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/importer/rdf/RDFImporterImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/importer/rdf/RDFImporterImpl.java
index 41daad7..5ee10ce 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/importer/rdf/RDFImporterImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/importer/rdf/RDFImporterImpl.java
@@ -39,11 +39,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
/**
* An io for importing RDF sources in RDF/XML or other RDF formats. Currently uses
@@ -83,7 +79,7 @@ public class RDFImporterImpl implements Importer {
*/
@Override
public Set<String> getAcceptTypes() {
- return new HashSet<String>(acceptTypes);
+ return new HashSet<>(acceptTypes);
}
/**
@@ -280,7 +276,7 @@ public class RDFImporterImpl implements Importer {
RDFParserRegistry parserRegistry = RDFParserRegistry.getInstance();
- acceptTypes = new ArrayList<String>();
+ acceptTypes = new ArrayList<>();
for(RDFFormat format : parserRegistry.getKeys()) {
acceptTypes.addAll(format.getMIMETypes());
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/io/MarmottaIOServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/io/MarmottaIOServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/io/MarmottaIOServiceImpl.java
index 2a8620b..87e1dba 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/io/MarmottaIOServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/io/MarmottaIOServiceImpl.java
@@ -53,14 +53,14 @@ public class MarmottaIOServiceImpl implements MarmottaIOService {
*/
@Override
public List<String> getAcceptTypes() {
- Set<String> acceptTypes = new LinkedHashSet<String>();
+ Set<String> acceptTypes = new LinkedHashSet<>();
for(RDFFormat format : RDFParserRegistry.getInstance().getKeys()) {
// Ignore binary formats
if(format.hasCharset()) {
acceptTypes.addAll(format.getMIMETypes());
}
}
- return new ArrayList<String>(acceptTypes);
+ return new ArrayList<>(acceptTypes);
}
/**
@@ -69,14 +69,14 @@ public class MarmottaIOServiceImpl implements MarmottaIOService {
*/
@Override
public List<String> getProducedTypes() {
- Set<String> producedTypes = new LinkedHashSet<String>();
+ Set<String> producedTypes = new LinkedHashSet<>();
for(RDFFormat format : RDFWriterRegistry.getInstance().getKeys()) {
// Ignore binary formats
if(format.hasCharset()) {
producedTypes.addAll(format.getMIMETypes());
}
}
- return new ArrayList<String>(producedTypes);
+ return new ArrayList<>(producedTypes);
}
/**
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/logging/LoggingServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/logging/LoggingServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/logging/LoggingServiceImpl.java
index 017c77c..96a6d5a 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/logging/LoggingServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/logging/LoggingServiceImpl.java
@@ -71,7 +71,7 @@ import java.util.regex.Pattern;
*/
@ApplicationScoped
public class LoggingServiceImpl implements LoggingService {
- private static Logger log = LoggerFactory.getLogger(LoggingService.class);
+ private static Logger log = LoggerFactory.getLogger(LoggingServiceImpl.class);
@Inject
private ConfigurationService configurationService;