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:32 UTC
[3/3] marmotta git commit: * code style cleanups across the whole
source code * test fixes
* code style cleanups across the whole source code
* test fixes
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/e21293a2
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/e21293a2
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/e21293a2
Branch: refs/heads/develop
Commit: e21293a29017e39c16b29c9444aa6d6548b016a0
Parents: e5ee6af
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Sun Nov 20 12:49:19 2016 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Sun Nov 20 12:49:19 2016 +0100
----------------------------------------------------------------------
.../kiwi/model/rdf/KiWiDateLiteral.java | 1 -
.../backend/file/LDCachingFileBackend.java | 2 +-
.../backend/file/util/FileBackendUtils.java | 17 +++-----
.../backend/file/test/LDCacheFileTest.java | 6 +--
.../infinispan/io/ModelExternalizer.java | 2 +-
.../infinispan/io/ValueExternalizer.java | 2 +-
.../LDCachingKiWiPersistenceConnection.java | 13 +++---
.../sail/GenericLinkedDataSailConnection.java | 4 +-
.../ldclient/test/vimeo/vimeo-channel.sparql | 2 +-
.../marmotta/ldpath/backend/file/FileQuery.java | 29 +++++--------
.../backend/linkeddata/LDCacheBackend.java | 2 +-
.../backend/sesame/AbstractSesameBackend.java | 21 +++++-----
.../backend/sesame/SesameValueBackend.java | 21 +++++-----
.../java/org/apache/marmotta/ldpath/LDPath.java | 36 +++++++---------
.../functions/AbstractTextFilterFunction.java | 17 ++++----
.../model/functions/ConcatenateFunction.java | 10 ++---
.../ldpath/model/functions/SortFunction.java | 16 +++----
.../model/selectors/FunctionSelector.java | 6 +--
.../ldpath/model/selectors/PathSelector.java | 2 +-
.../model/selectors/RecursivePathSelector.java | 10 ++---
.../ldpath/model/selectors/UnionSelector.java | 2 +-
.../ldpath/parser/DefaultConfiguration.java | 23 ++++------
.../marmotta/ldpath/util/Collections.java | 2 +-
.../model/functions/coll/FlattenFunction.java | 13 +++---
.../model/functions/coll/GetFunction.java | 11 ++---
.../model/functions/coll/SubListFunction.java | 11 ++---
.../functions/date/EarliestDateFunction.java | 13 +++---
.../functions/date/LatestDateFunction.java | 13 +++---
.../model/functions/html/CssSelectFunction.java | 41 +++++++-----------
.../model/functions/json/JsonPathFunction.java | 30 +++++--------
.../model/functions/math/MaxFunction.java | 18 ++++----
.../model/functions/math/MinFunction.java | 16 +++----
.../model/functions/math/RoundFunction.java | 18 ++++----
.../model/functions/math/SumFunction.java | 20 ++++-----
.../model/functions/text/ReplaceFunction.java | 15 +++----
.../model/functions/text/StrJoinFunction.java | 11 ++---
.../model/functions/text/StrLeftFunction.java | 15 ++++---
.../model/functions/text/StrLenFunction.java | 10 ++---
.../model/functions/text/StrRightFunction.java | 15 ++++---
.../model/functions/text/SubstringFunction.java | 15 ++++---
.../model/functions/text/WordCountFunction.java | 10 ++---
.../text/AbstractBinaryStringTest.java | 7 ++--
.../functions/text/AbstractStringTest.java | 14 +++----
.../tests/functions/text/StringIsEmptyTest.java | 7 ++--
.../model/functions/xml/XPathFunction.java | 26 ++++--------
.../apache/marmotta/ldpath/ldquery/LDQuery.java | 2 +-
.../marmotta/ldpath/template/LDTemplate.java | 2 +-
.../ldpath/template/engine/LDPathDirective.java | 19 ++++-----
.../ldpath/template/engine/LDPathMethod.java | 18 ++++----
.../template/engine/NamespaceDirective.java | 28 +++++--------
.../model/freemarker/TemplateStackModel.java | 2 +-
.../TemplateBooleanTransformer.java | 7 ++--
.../transformers/TemplateDateTransformer.java | 9 ++--
.../transformers/TemplateDoubleTransformer.java | 7 ++--
.../transformers/TemplateFloatTransformer.java | 7 ++--
.../TemplateIntegerTransformer.java | 7 ++--
.../transformers/TemplateScalarTransformer.java | 7 ++--
.../ostrich/sail/ClosableResponseStream.java | 2 +-
.../ostrich/sail/OstrichSailConnection.java | 2 +-
.../platform/core/api/task/TaskInfo.java | 6 +--
.../core/exception/HttpErrorException.java | 2 +-
.../platform/core/filters/TemplatingFilter.java | 23 ++++------
.../jaxrs/exceptionmappers/ErrorResponse.java | 2 +-
.../platform/core/jndi/MarmottaContext.java | 13 +++---
.../core/jndi/MarmottaContextFactory.java | 3 +-
.../platform/core/model/template/MenuItem.java | 7 ++--
.../platform/core/rio/RDFHtmlFormat.java | 3 +-
.../platform/core/rio/RDFHtmlWriterImpl.java | 24 +++++------
.../config/ConfigurationServiceImpl.java | 10 ++---
.../config/DependenciesServiceImpl.java | 14 +++----
.../services/content/ContentServiceImpl.java | 31 +++++++-------
.../content/FileSystemContentReader.java | 5 +--
.../services/content/HTTPContentReader.java | 2 +-
.../services/http/HttpClientServiceImpl.java | 20 ++-------
.../services/importer/ImportServiceImpl.java | 3 +-
.../services/importer/rdf/RDFImporterImpl.java | 10 ++---
.../core/services/io/MarmottaIOServiceImpl.java | 8 ++--
.../services/logging/LoggingServiceImpl.java | 2 +-
.../services/modules/ModuleServiceImpl.java | 28 ++++++-------
.../platform/core/services/prefix/PrefixCC.java | 8 ++--
.../core/services/prefix/PrefixServiceImpl.java | 32 +++++++-------
.../core/services/ssl/SSLServiceImpl.java | 21 ++++------
.../statistics/StatisticsServiceImpl.java | 4 +-
.../system/SystemStatisticsModule.java | 4 +-
.../services/task/TaskManagerServiceImpl.java | 43 ++++++++-----------
.../templating/AdminTemplatingServiceImpl.java | 25 ++++++-----
.../templating/TemplatingServiceImpl.java | 32 ++++++--------
.../services/triplestore/SesameServiceImpl.java | 8 +---
.../core/services/user/UserServiceImpl.java | 2 +-
.../core/servlet/MarmottaResourceFilter.java | 15 ++-----
.../marmotta/platform/core/util/CDIContext.java | 6 +--
.../core/util/LinkedHashSetBlockingQueue.java | 4 +-
.../platform/core/util/WebServiceUtil.java | 14 +++----
.../core/webservices/CoreApplication.java | 2 +-
.../config/ConfigurationWebService.java | 44 +++++++-------------
.../core/webservices/io/ExportWebService.java | 2 +-
.../core/webservices/io/ImportWebService.java | 4 +-
.../webservices/modules/ModuleWebService.java | 15 +++----
.../webservices/prefix/PrefixWebService.java | 19 +++------
.../resource/InspectionWebService.java | 10 ++---
.../webservices/resource/MetaWebService.java | 8 ++--
.../resource/ResourceWebService.java | 2 +-
.../resource/ResourceWebServiceHelper.java | 2 +-
.../statistics/StatisticsWebService.java | 11 ++---
.../webservices/task/TaskManagerWebService.java | 5 +--
.../triplestore/ContextWebService.java | 4 +-
106 files changed, 541 insertions(+), 735 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiDateLiteral.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiDateLiteral.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiDateLiteral.java
index 879b271..8097f26 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiDateLiteral.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiDateLiteral.java
@@ -160,5 +160,4 @@ public class KiWiDateLiteral extends KiWiStringLiteral {
return false;
}
-
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldcache/ldcache-backend-file/src/main/java/org/apache/marmotta/ldcache/backend/file/LDCachingFileBackend.java
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-file/src/main/java/org/apache/marmotta/ldcache/backend/file/LDCachingFileBackend.java b/libraries/ldcache/ldcache-backend-file/src/main/java/org/apache/marmotta/ldcache/backend/file/LDCachingFileBackend.java
index 205933d..8364575 100644
--- a/libraries/ldcache/ldcache-backend-file/src/main/java/org/apache/marmotta/ldcache/backend/file/LDCachingFileBackend.java
+++ b/libraries/ldcache/ldcache-backend-file/src/main/java/org/apache/marmotta/ldcache/backend/file/LDCachingFileBackend.java
@@ -50,7 +50,7 @@ public class LDCachingFileBackend implements LDCachingBackend {
private Repository cacheRepository;
- public LDCachingFileBackend(File storageDir) throws RepositoryException {
+ public LDCachingFileBackend(File storageDir) {
if (storageDir == null) throw new NullPointerException();
this.storageDir = storageDir;
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldcache/ldcache-backend-file/src/main/java/org/apache/marmotta/ldcache/backend/file/util/FileBackendUtils.java
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-file/src/main/java/org/apache/marmotta/ldcache/backend/file/util/FileBackendUtils.java b/libraries/ldcache/ldcache-backend-file/src/main/java/org/apache/marmotta/ldcache/backend/file/util/FileBackendUtils.java
index 1722fb9..5ac243d 100644
--- a/libraries/ldcache/ldcache-backend-file/src/main/java/org/apache/marmotta/ldcache/backend/file/util/FileBackendUtils.java
+++ b/libraries/ldcache/ldcache-backend-file/src/main/java/org/apache/marmotta/ldcache/backend/file/util/FileBackendUtils.java
@@ -41,9 +41,8 @@ public class FileBackendUtils {
}
public static File getMetaFile(String resourceURI, File baseDir) {
- File meta = getResourceFile(baseDir, resourceURI, META_EXT);
- return meta;
+ return getResourceFile(baseDir, resourceURI, META_EXT);
}
private static File getResourceFile(File baseDir, String resourceURI, String ext) {
@@ -63,7 +62,7 @@ public class FileBackendUtils {
}
public static List<File> listFiles(final File baseDir, final String ext) {
- List<File> list = new LinkedList<File>();
+ List<File> list = new LinkedList<>();
listFiles(baseDir, ext, list);
return list;
}
@@ -72,8 +71,7 @@ public class FileBackendUtils {
for (File f: baseDir.listFiles(new FileFilter() {
@Override
public boolean accept(File pathname) {
- if (pathname.isDirectory()) return true;
- else return pathname.getName().endsWith(ext);
+ return pathname.isDirectory() || pathname.getName().endsWith(ext);
}
})) {
if (f.isDirectory()) {
@@ -110,16 +108,13 @@ public class FileBackendUtils {
// ensure that the directory where we write the file exists
metaFile.getParentFile().mkdirs();
try {
- PrintStream ps = new PrintStream(metaFile);
- try {
+ try (PrintStream ps = new PrintStream(metaFile)) {
ps.println(ce.getResource().stringValue());
ps.printf("%tQ # last retrieved: %<tF %<tT.%<tL%n", ce.getLastRetrieved());
ps.printf("%tQ # expires: %<tF %<tT.%<tL%n", ce.getExpiryDate());
ps.printf("%d # %<d updates%n", ce.getUpdateCount());
- ps.printf("%d # %<d triples%n", ce.getTripleCount());
- ps.flush();
- } finally {
- ps.close();
+ ps.printf("%d # %<d triples%n", ce.getTripleCount());
+ ps.flush();
}
} catch (FileNotFoundException e) {
throw e;
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldcache/ldcache-backend-file/src/test/java/org/apache/marmotta/ldcache/backend/file/test/LDCacheFileTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-file/src/test/java/org/apache/marmotta/ldcache/backend/file/test/LDCacheFileTest.java b/libraries/ldcache/ldcache-backend-file/src/test/java/org/apache/marmotta/ldcache/backend/file/test/LDCacheFileTest.java
index 040eb4f..dccad61 100644
--- a/libraries/ldcache/ldcache-backend-file/src/test/java/org/apache/marmotta/ldcache/backend/file/test/LDCacheFileTest.java
+++ b/libraries/ldcache/ldcache-backend-file/src/test/java/org/apache/marmotta/ldcache/backend/file/test/LDCacheFileTest.java
@@ -22,7 +22,6 @@ import org.apache.marmotta.ldcache.services.test.ng.BaseLDCacheTest;
import org.junit.Rule;
import org.junit.internal.AssumptionViolatedException;
import org.junit.rules.TemporaryFolder;
-import org.openrdf.repository.RepositoryException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,13 +49,10 @@ public class LDCacheFileTest extends BaseLDCacheTest {
protected LDCachingBackend createBackend() {
try {
final File storageDir = temporaryFolder.newFolder();
- LDCachingBackend backend = null;
- backend = new LDCachingFileBackend(storageDir);
+ LDCachingBackend backend = new LDCachingFileBackend(storageDir);
backend.initialize();
return backend;
- } catch (RepositoryException e) {
- throw new AssumptionViolatedException("could not initialise backend",e);
} catch (IOException e) {
throw new AssumptionViolatedException("could not create storage-dir for file backend", e);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldcache/ldcache-backend-infinispan/src/main/java/org/apache/marmotta/ldcache/backend/infinispan/io/ModelExternalizer.java
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-infinispan/src/main/java/org/apache/marmotta/ldcache/backend/infinispan/io/ModelExternalizer.java b/libraries/ldcache/ldcache-backend-infinispan/src/main/java/org/apache/marmotta/ldcache/backend/infinispan/io/ModelExternalizer.java
index 017e557..f7913ae 100644
--- a/libraries/ldcache/ldcache-backend-infinispan/src/main/java/org/apache/marmotta/ldcache/backend/infinispan/io/ModelExternalizer.java
+++ b/libraries/ldcache/ldcache-backend-infinispan/src/main/java/org/apache/marmotta/ldcache/backend/infinispan/io/ModelExternalizer.java
@@ -145,6 +145,6 @@ public class ModelExternalizer implements AdvancedExternalizer<TreeModel> {
}
}
- return null;
+ return model;
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldcache/ldcache-backend-infinispan/src/main/java/org/apache/marmotta/ldcache/backend/infinispan/io/ValueExternalizer.java
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-infinispan/src/main/java/org/apache/marmotta/ldcache/backend/infinispan/io/ValueExternalizer.java b/libraries/ldcache/ldcache-backend-infinispan/src/main/java/org/apache/marmotta/ldcache/backend/infinispan/io/ValueExternalizer.java
index 09aab92..1c1a589 100644
--- a/libraries/ldcache/ldcache-backend-infinispan/src/main/java/org/apache/marmotta/ldcache/backend/infinispan/io/ValueExternalizer.java
+++ b/libraries/ldcache/ldcache-backend-infinispan/src/main/java/org/apache/marmotta/ldcache/backend/infinispan/io/ValueExternalizer.java
@@ -184,7 +184,7 @@ public class ValueExternalizer implements AdvancedExternalizer<Value> {
private static <C extends Value> int getType(Class<C> clazz) {
- int t = 0;
+ int t;
if(URI.class.isAssignableFrom(clazz)) {
t = TYPE_URI;
} else if(BNode.class.isAssignableFrom(clazz)) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldcache/ldcache-backend-kiwi/src/main/java/org/apache/marmotta/ldcache/backend/kiwi/persistence/LDCachingKiWiPersistenceConnection.java
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-kiwi/src/main/java/org/apache/marmotta/ldcache/backend/kiwi/persistence/LDCachingKiWiPersistenceConnection.java b/libraries/ldcache/ldcache-backend-kiwi/src/main/java/org/apache/marmotta/ldcache/backend/kiwi/persistence/LDCachingKiWiPersistenceConnection.java
index f8442e7..5786287 100644
--- a/libraries/ldcache/ldcache-backend-kiwi/src/main/java/org/apache/marmotta/ldcache/backend/kiwi/persistence/LDCachingKiWiPersistenceConnection.java
+++ b/libraries/ldcache/ldcache-backend-kiwi/src/main/java/org/apache/marmotta/ldcache/backend/kiwi/persistence/LDCachingKiWiPersistenceConnection.java
@@ -62,7 +62,7 @@ public class LDCachingKiWiPersistenceConnection implements Closeable {
private Map<Long,KiWiCacheEntry> entryIdCache;
- public LDCachingKiWiPersistenceConnection(KiWiConnection connection) throws SQLException {
+ public LDCachingKiWiPersistenceConnection(KiWiConnection connection) {
this.connection = connection;
entryResourceCache = connection.getCacheManager().getCacheByName("ldcache-entry-uri");
@@ -116,15 +116,12 @@ public class LDCachingKiWiPersistenceConnection implements Closeable {
// run the database query and if it yields a result, construct a new node; the method call will take care of
// caching the constructed node for future calls
- ResultSet result = query.executeQuery();
- try {
- if(result.next()) {
+ try (ResultSet result = query.executeQuery()) {
+ if (result.next()) {
return constructCacheEntry(result);
} else {
return null;
}
- } finally {
- result.close();
}
}
@@ -224,7 +221,7 @@ public class LDCachingKiWiPersistenceConnection implements Closeable {
PreparedStatement queryExpired = connection.getPreparedStatement("query.entries_expired");
final ResultSet result = queryExpired.executeQuery();
- return new ResultSetIteration<KiWiCacheEntry>(result, new ResultTransformerFunction<KiWiCacheEntry>() {
+ return new ResultSetIteration<>(result, new ResultTransformerFunction<KiWiCacheEntry>() {
@Override
public KiWiCacheEntry apply(ResultSet input) throws SQLException {
return constructCacheEntry(result);
@@ -242,7 +239,7 @@ public class LDCachingKiWiPersistenceConnection implements Closeable {
PreparedStatement queryExpired = connection.getPreparedStatement("query.entries_all");
final ResultSet result = queryExpired.executeQuery();
- return new ResultSetIteration<KiWiCacheEntry>(result, new ResultTransformerFunction<KiWiCacheEntry>() {
+ return new ResultSetIteration<>(result, new ResultTransformerFunction<KiWiCacheEntry>() {
@Override
public KiWiCacheEntry apply(ResultSet input) throws SQLException {
return constructCacheEntry(result);
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldcache/ldcache-sail-generic/src/main/java/org/apache/marmotta/ldcache/sail/GenericLinkedDataSailConnection.java
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-generic/src/main/java/org/apache/marmotta/ldcache/sail/GenericLinkedDataSailConnection.java b/libraries/ldcache/ldcache-sail-generic/src/main/java/org/apache/marmotta/ldcache/sail/GenericLinkedDataSailConnection.java
index 3c56985..485117e 100644
--- a/libraries/ldcache/ldcache-sail-generic/src/main/java/org/apache/marmotta/ldcache/sail/GenericLinkedDataSailConnection.java
+++ b/libraries/ldcache/ldcache-sail-generic/src/main/java/org/apache/marmotta/ldcache/sail/GenericLinkedDataSailConnection.java
@@ -78,8 +78,8 @@ public class GenericLinkedDataSailConnection extends NotifyingSailConnectionWrap
final Model cached = ldcache.get((URI)subj);
// join the results of the cache connection and the wrapped connection in a single result
- return new UnionIteration<Statement, SailException>(
- new CloseableIteratorIteration<Statement,SailException>(cached.iterator()),
+ return new UnionIteration<>(
+ new CloseableIteratorIteration<Statement, SailException>(cached.iterator()),
super.getStatements(subj, pred, obj, includeInferred, contexts)
);
} else {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldclient/ldclient-provider-vimeo/src/test/resources/org/apache/marmotta/ldclient/test/vimeo/vimeo-channel.sparql
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-vimeo/src/test/resources/org/apache/marmotta/ldclient/test/vimeo/vimeo-channel.sparql b/libraries/ldclient/ldclient-provider-vimeo/src/test/resources/org/apache/marmotta/ldclient/test/vimeo/vimeo-channel.sparql
index cacd470..c51f99a 100644
--- a/libraries/ldclient/ldclient-provider-vimeo/src/test/resources/org/apache/marmotta/ldclient/test/vimeo/vimeo-channel.sparql
+++ b/libraries/ldclient/ldclient-provider-vimeo/src/test/resources/org/apache/marmotta/ldclient/test/vimeo/vimeo-channel.sparql
@@ -19,6 +19,6 @@ PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX ma: <http://www.w3.org/ns/ma-ont#>
ASK {
- <http://vimeo.com/channels/ninlive09> ma:hasMember <http://vimeo.com/8344405> .
+ <http://vimeo.com/channels/ninlive09> ma:hasMember <https://vimeo.com/8344405> .
<http://vimeo.com/channels/ninlive09> rdf:type ma:Collection
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-backend-file/src/main/java/org/apache/marmotta/ldpath/backend/file/FileQuery.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-file/src/main/java/org/apache/marmotta/ldpath/backend/file/FileQuery.java b/libraries/ldpath/ldpath-backend-file/src/main/java/org/apache/marmotta/ldpath/backend/file/FileQuery.java
index 5cb70da..0af8afa 100644
--- a/libraries/ldpath/ldpath-backend-file/src/main/java/org/apache/marmotta/ldpath/backend/file/FileQuery.java
+++ b/libraries/ldpath/ldpath-backend-file/src/main/java/org/apache/marmotta/ldpath/backend/file/FileQuery.java
@@ -17,6 +17,15 @@
*/
package org.apache.marmotta.ldpath.backend.file;
+import ch.qos.logback.classic.Level;
+import org.apache.commons.cli.*;
+import org.apache.marmotta.ldpath.LDPath;
+import org.apache.marmotta.ldpath.exception.LDPathParseException;
+import org.openrdf.model.Resource;
+import org.openrdf.model.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
@@ -26,24 +35,6 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.OptionGroup;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
-import org.apache.marmotta.ldpath.LDPath;
-import org.apache.marmotta.ldpath.exception.LDPathParseException;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import ch.qos.logback.classic.Level;
-
/**
* Command line application for querying input from files.
* <p/>
@@ -106,7 +97,7 @@ public class FileQuery {
}
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-backend-linkeddata/src/main/java/org/apache/marmotta/ldpath/backend/linkeddata/LDCacheBackend.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-linkeddata/src/main/java/org/apache/marmotta/ldpath/backend/linkeddata/LDCacheBackend.java b/libraries/ldpath/ldpath-backend-linkeddata/src/main/java/org/apache/marmotta/ldpath/backend/linkeddata/LDCacheBackend.java
index 3da9512..fd0b554 100644
--- a/libraries/ldpath/ldpath-backend-linkeddata/src/main/java/org/apache/marmotta/ldpath/backend/linkeddata/LDCacheBackend.java
+++ b/libraries/ldpath/ldpath-backend-linkeddata/src/main/java/org/apache/marmotta/ldpath/backend/linkeddata/LDCacheBackend.java
@@ -274,7 +274,7 @@ public class LDCacheBackend implements RDFBackend<Value> {
@Override
public Literal createLiteral(String content, Locale language, URI type) {
- log.debug("creating literal with content \"{}\", language {}, datatype {}",new Object[]{content,language,type});
+ log.debug("creating literal with content \"{}\", language {}, datatype {}",content,language,type);
if(language == null && type == null) {
return createLiteral(content);
} else if(type == null) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-backend-sesame/src/main/java/org/apache/marmotta/ldpath/backend/sesame/AbstractSesameBackend.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-sesame/src/main/java/org/apache/marmotta/ldpath/backend/sesame/AbstractSesameBackend.java b/libraries/ldpath/ldpath-backend-sesame/src/main/java/org/apache/marmotta/ldpath/backend/sesame/AbstractSesameBackend.java
index 08f7365..2310c91 100644
--- a/libraries/ldpath/ldpath-backend-sesame/src/main/java/org/apache/marmotta/ldpath/backend/sesame/AbstractSesameBackend.java
+++ b/libraries/ldpath/ldpath-backend-sesame/src/main/java/org/apache/marmotta/ldpath/backend/sesame/AbstractSesameBackend.java
@@ -17,14 +17,6 @@
*/
package org.apache.marmotta.ldpath.backend.sesame;
-import java.net.URI;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Set;
-import java.util.concurrent.ThreadPoolExecutor;
-
-
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.openrdf.model.*;
import org.openrdf.repository.RepositoryConnection;
@@ -33,6 +25,13 @@ import org.openrdf.repository.RepositoryResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.net.URI;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
+import java.util.concurrent.ThreadPoolExecutor;
+
public abstract class AbstractSesameBackend extends SesameValueBackend implements RDFBackend<Value> {
@@ -49,7 +48,7 @@ public abstract class AbstractSesameBackend extends SesameValueBackend implement
protected Literal createLiteralInternal(final ValueFactory valueFactory, String content,
Locale language, URI type) {
- log.debug("creating literal with content \"{}\", language {}, datatype {}",new Object[]{content,language,type});
+ log.debug("creating literal with content \"{}\", language {}, datatype {}", content,language,type);
if(language == null && type == null) {
return valueFactory.createLiteral(content);
} else if(type == null) {
@@ -63,7 +62,7 @@ public abstract class AbstractSesameBackend extends SesameValueBackend implement
throws RepositoryException {
final ValueFactory valueFactory = connection.getValueFactory();
- Set<Value> result = new HashSet<Value>();
+ Set<Value> result = new HashSet<>();
RepositoryResult<Statement> qResult = connection.getStatements(merge(subject, valueFactory), merge(property, valueFactory), null, includeInferred, contexts);
try {
while(qResult.hasNext()) {
@@ -79,7 +78,7 @@ public abstract class AbstractSesameBackend extends SesameValueBackend implement
throws RepositoryException {
final ValueFactory valueFactory = connection.getValueFactory();
- Set<Value> result = new HashSet<Value>();
+ Set<Value> result = new HashSet<>();
RepositoryResult<Statement> qResult = connection.getStatements(null, merge(property, valueFactory), merge(object, valueFactory), includeInferred, contexts);
try {
while(qResult.hasNext()) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-backend-sesame/src/main/java/org/apache/marmotta/ldpath/backend/sesame/SesameValueBackend.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-sesame/src/main/java/org/apache/marmotta/ldpath/backend/sesame/SesameValueBackend.java b/libraries/ldpath/ldpath-backend-sesame/src/main/java/org/apache/marmotta/ldpath/backend/sesame/SesameValueBackend.java
index 5d0ad97..0f29baa 100644
--- a/libraries/ldpath/ldpath-backend-sesame/src/main/java/org/apache/marmotta/ldpath/backend/sesame/SesameValueBackend.java
+++ b/libraries/ldpath/ldpath-backend-sesame/src/main/java/org/apache/marmotta/ldpath/backend/sesame/SesameValueBackend.java
@@ -17,16 +17,6 @@
package org.apache.marmotta.ldpath.backend.sesame;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Locale;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
import org.apache.marmotta.ldpath.api.backend.NodeBackend;
import org.openrdf.model.BNode;
import org.openrdf.model.Literal;
@@ -36,6 +26,15 @@ import org.openrdf.model.impl.URIImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+
public class SesameValueBackend implements NodeBackend<Value>{
private static final Logger log = LoggerFactory.getLogger(SesameValueBackend.class);
@@ -256,7 +255,7 @@ public class SesameValueBackend implements NodeBackend<Value>{
@Override
public Literal createLiteral(String content, Locale language, URI type) {
- log.debug("creating literal with content \"{}\", language {}, datatype {}",new Object[]{content,language,type});
+ log.debug("creating literal with content \"{}\", language {}, datatype {}",content,language,type);
if(language == null && type == null) {
return createLiteral(content);
} else if(type == null) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/LDPath.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/LDPath.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/LDPath.java
index 02fd1c0..4923602 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/LDPath.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/LDPath.java
@@ -17,15 +17,9 @@
*/
package org.apache.marmotta.ldpath;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.functions.SelectorFunction;
import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
@@ -35,12 +29,12 @@ import org.apache.marmotta.ldpath.model.fields.FieldMapping;
import org.apache.marmotta.ldpath.model.programs.Program;
import org.apache.marmotta.ldpath.parser.Configuration;
import org.apache.marmotta.ldpath.parser.DefaultConfiguration;
-import org.apache.marmotta.ldpath.parser.ParseException;
import org.apache.marmotta.ldpath.parser.LdPathParser;
+import org.apache.marmotta.ldpath.parser.ParseException;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.*;
/**
* Main class providing query functionality for the different RDF backends.
@@ -76,8 +70,8 @@ public class LDPath<Node> {
*/
public LDPath(RDFBackend<Node> backend, Configuration<Node> config) {
this.backend = backend;
- this.functions = new HashSet<SelectorFunction<Node>>();
- this.transformers = new HashMap<String, NodeTransformer<?, Node>>();
+ this.functions = new HashSet<>();
+ this.transformers = new HashMap<>();
this.config = config;
}
@@ -104,7 +98,7 @@ public class LDPath<Node> {
* @throws LDPathParseException when the path passed as argument is not valid
*/
public Collection<Node> pathQuery(Node context, String path, Map<String, String> namespaces) throws LDPathParseException {
- LdPathParser<Node> parser = new LdPathParser<Node>(backend,config,new StringReader(path));
+ LdPathParser<Node> parser = new LdPathParser<>(backend, config, new StringReader(path));
for(SelectorFunction<Node> function : functions) {
parser.registerFunction(function);
}
@@ -150,7 +144,7 @@ public class LDPath<Node> {
* @throws LDPathParseException when the path passed as argument is not valid
*/
public Collection<Node> pathQuery(Node context, String path, Map<String, String> namespaces, Map<Node,List<Node>> paths) throws LDPathParseException {
- LdPathParser<Node> parser = new LdPathParser<Node>(backend,config,new StringReader(path));
+ LdPathParser<Node> parser = new LdPathParser<>(backend, config, new StringReader(path));
for(SelectorFunction<Node> function : functions) {
parser.registerFunction(function);
}
@@ -194,7 +188,7 @@ public class LDPath<Node> {
* @throws LDPathParseException when the path passed as argument is not valid
*/
public <T> Collection<T> pathTransform(Node context, String path, Map<String, String> namespaces) throws LDPathParseException {
- LdPathParser<Node> parser = new LdPathParser<Node>(backend,config,new StringReader(path));
+ LdPathParser<Node> parser = new LdPathParser<>(backend, config, new StringReader(path));
for(SelectorFunction<Node> function : functions) {
parser.registerFunction(function);
}
@@ -223,7 +217,7 @@ public class LDPath<Node> {
* @throws LDPathParseException
*/
public Map<String,Collection<?>> programQuery(Node context, Reader program) throws LDPathParseException {
- LdPathParser<Node> parser = new LdPathParser<Node>(backend,config,program);
+ LdPathParser<Node> parser = new LdPathParser<>(backend, config, program);
for(SelectorFunction<Node> function : functions) {
parser.registerFunction(function);
}
@@ -234,7 +228,7 @@ public class LDPath<Node> {
try {
Program<Node> p = parser.parseProgram();
- Map<String,Collection<?>> result = new HashMap<String, Collection<?>>();
+ Map<String,Collection<?>> result = new HashMap<>();
for(FieldMapping<?,Node> mapping : p.getFields()) {
result.put(mapping.getFieldName(),mapping.getValues(backend,context));
@@ -255,7 +249,7 @@ public class LDPath<Node> {
* @throws LDPathParseException
*/
public Program<Node> parseProgram(Reader program) throws LDPathParseException {
- LdPathParser<Node> parser = new LdPathParser<Node>(backend,config,program);
+ LdPathParser<Node> parser = new LdPathParser<>(backend, config, program);
for(SelectorFunction<Node> function : functions) {
parser.registerFunction(function);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/AbstractTextFilterFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/AbstractTextFilterFunction.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/AbstractTextFilterFunction.java
index 09eb52e..a5ecc1d 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/AbstractTextFilterFunction.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/AbstractTextFilterFunction.java
@@ -17,11 +17,6 @@
*/
package org.apache.marmotta.ldpath.model.functions;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.functions.SelectorFunction;
import org.apache.marmotta.ldpath.model.transformers.StringTransformer;
@@ -29,11 +24,16 @@ import org.apache.marmotta.ldpath.util.Collections;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
public abstract class AbstractTextFilterFunction<Node> extends SelectorFunction<Node> {
protected final Logger log = LoggerFactory.getLogger(this.getClass());
- private final StringTransformer<Node> transformer = new StringTransformer<Node>();
+ private final StringTransformer<Node> transformer = new StringTransformer<>();
/**
* Apply the function to the list of nodes passed as arguments and return the result as type T.
@@ -43,8 +43,9 @@ public abstract class AbstractTextFilterFunction<Node> extends SelectorFunction<
* @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){
log.debug("filter text from context {}",context);
return java.util.Collections.singleton(
@@ -52,7 +53,7 @@ public abstract class AbstractTextFilterFunction<Node> extends SelectorFunction<
} else {
log.debug("filter text from parameters");
Iterator<Node> it = Collections.iterator(args);
- List<Node> result = new ArrayList<Node>();
+ List<Node> result = new ArrayList<>();
while (it.hasNext()) {
result.add(rdfBackend.createLiteral(doFilter(transformer.transform(rdfBackend, it.next(), null))));
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/ConcatenateFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/ConcatenateFunction.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/ConcatenateFunction.java
index 18cfb5a..2275851 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/ConcatenateFunction.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/ConcatenateFunction.java
@@ -18,14 +18,14 @@
package org.apache.marmotta.ldpath.model.functions;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-
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 java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+
/**
* A node function concatenating a list of nodes interpreted as strings.
*
@@ -35,7 +35,7 @@ import org.apache.marmotta.ldpath.model.transformers.StringTransformer;
*/
public class ConcatenateFunction<Node> extends SelectorFunction<Node> {
- private final StringTransformer<Node> transformer = new StringTransformer<Node>();
+ private final StringTransformer<Node> transformer = new StringTransformer<>();
/**
* Apply the function to the list of nodes passed as arguments and return the result as type T.
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/SortFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/SortFunction.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/SortFunction.java
index ed82985..24c580c 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/SortFunction.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/SortFunction.java
@@ -18,18 +18,14 @@
package org.apache.marmotta.ldpath.model.functions;
-import java.text.Collator;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Locale;
-
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.functions.SelectorFunction;
import org.apache.marmotta.ldpath.model.transformers.DateTimeTransformer;
import org.apache.marmotta.ldpath.model.transformers.StringTransformer;
+import java.text.Collator;
+import java.util.*;
+
/**
* Allow sorting of the selection passed as first argument. Usage:
*
@@ -52,8 +48,8 @@ public class SortFunction<Node> extends SelectorFunction<Node> {
public SortFunction() {
- transformer = new StringTransformer<Node>();
- dateTransformer = new DateTimeTransformer<Node>();
+ transformer = new StringTransformer<>();
+ dateTransformer = new DateTimeTransformer<>();
}
/**
@@ -120,7 +116,7 @@ public class SortFunction<Node> extends SelectorFunction<Node> {
};
}
- List<Node> result = new ArrayList<Node>(args[0]);
+ List<Node> result = new ArrayList<>(args[0]);
if(comparator != null) {
java.util.Collections.sort(result,comparator);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/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 017d9fa..9dc2d29 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
@@ -56,12 +56,12 @@ public class FunctionSelector<Node> implements NodeSelector<Node> {
*/
@Override
public Collection<Node> select(RDFBackend<Node> nodeRDFBackend, Node context, List<Node> path, Map<Node, List<Node>> resultPaths) {
- ArrayList<Collection<Node>> args = new ArrayList<Collection<Node>>();
+ ArrayList<Collection<Node>> args = new ArrayList<>();
// for a function, we include in the result path all paths to all arguments, so we create a new map to collect the paths
Map<Node, List<Node>> myResultPaths = null;
if(resultPaths != null && path != null) {
- myResultPaths = new HashMap<Node, List<Node>>();
+ myResultPaths = new HashMap<>();
}
for(NodeSelector<Node> selector : selectors) {
@@ -72,7 +72,7 @@ public class FunctionSelector<Node> implements NodeSelector<Node> {
Collection<Node> result = function.apply(nodeRDFBackend, context, args.toArray(new Collection[selectors.size()]));
if(myResultPaths != null && path != null) {
// for a function, we include in the result path all paths to all arguments ...
- List<Node> functionPath = new ArrayList<Node>();
+ List<Node> functionPath = new ArrayList<>();
for(List<Node> subpath : myResultPaths.values()) {
for(Node n : subpath) {
if(!functionPath.contains(n)) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/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 448f831..6c7a9b9 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
@@ -59,7 +59,7 @@ public class PathSelector<Node> implements NodeSelector<Node> {
}
Collection<Node> nodesLeft = left.select(rdfBackend,context,path,myResultPaths);
- final Set<Node> result = new HashSet<Node>();
+ final Set<Node> result = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/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 8eb160b..41c9b85 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
@@ -145,7 +145,7 @@ public class RecursivePathSelector<Node> implements NodeSelector<Node> {
* @param delegate the delegate
*/
public static <N> RecursivePathSelector<N> getPathSelectorStared(NodeSelector<N> delegate) {
- return new RecursivePathSelector<N>(delegate, 0, Integer.MAX_VALUE);
+ return new RecursivePathSelector<>(delegate, 0, Integer.MAX_VALUE);
}
/**
@@ -153,7 +153,7 @@ public class RecursivePathSelector<Node> implements NodeSelector<Node> {
* @param delegate the delegate
*/
public static <N> RecursivePathSelector<N> getPathSelectorPlused(NodeSelector<N> delegate) {
- return new RecursivePathSelector<N>(delegate, 1, Integer.MAX_VALUE);
+ return new RecursivePathSelector<>(delegate, 1, Integer.MAX_VALUE);
}
/**
@@ -162,7 +162,7 @@ public class RecursivePathSelector<Node> implements NodeSelector<Node> {
* @param minBound <code>m</code>
*/
public static <N> RecursivePathSelector<N> getPathSelectorMinBound(NodeSelector<N> delegate, int minBound) {
- return new RecursivePathSelector<N>(delegate, minBound, Integer.MAX_VALUE);
+ return new RecursivePathSelector<>(delegate, minBound, Integer.MAX_VALUE);
}
/**
@@ -171,7 +171,7 @@ public class RecursivePathSelector<Node> implements NodeSelector<Node> {
* @param maxBound <code>n</code>
*/
public static <N> RecursivePathSelector<N> getPathSelectorMaxBound(NodeSelector<N> delegate, int maxBound) {
- return new RecursivePathSelector<N>(delegate, 0, maxBound);
+ return new RecursivePathSelector<>(delegate, 0, maxBound);
}
/**
@@ -181,7 +181,7 @@ public class RecursivePathSelector<Node> implements NodeSelector<Node> {
* @param maxBound <code>n</code>
*/
public static <N> RecursivePathSelector<N> getPathSelectorMinMaxBound(NodeSelector<N> delegate, int minBound, int maxBound) {
- return new RecursivePathSelector<N>(delegate, minBound, maxBound);
+ return new RecursivePathSelector<>(delegate, minBound, maxBound);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/UnionSelector.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/UnionSelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/UnionSelector.java
index 1a24939..f640328 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/UnionSelector.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/UnionSelector.java
@@ -55,7 +55,7 @@ public class UnionSelector<Node> implements NodeSelector<Node> {
*/
@Override
public Collection<Node> select(final RDFBackend<Node> rdfBackend, final Node context, final List<Node> path, final Map<Node, List<Node>> resultPaths) {
- final Set<Node> result = new HashSet<Node>();
+ final Set<Node> result = new HashSet<>();
result.addAll(left.select(rdfBackend,context,path,resultPaths));
result.addAll(right.select(rdfBackend,context,path,resultPaths));
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/parser/DefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/parser/DefaultConfiguration.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/parser/DefaultConfiguration.java
index 608b071..6e81f10 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/parser/DefaultConfiguration.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/parser/DefaultConfiguration.java
@@ -29,14 +29,7 @@ import org.apache.marmotta.ldpath.model.transformers.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.ServiceConfigurationError;
-import java.util.ServiceLoader;
-import java.util.Set;
+import java.util.*;
/**
* Add file description here!
@@ -115,10 +108,9 @@ public class DefaultConfiguration<Node> extends Configuration<Node> {
}
private void addDefaultFunctions() {
- Iterator<SelectorFunction> functions = functionLoader.iterator();
- while (functions.hasNext()) {
+ for (SelectorFunction aFunctionLoader : functionLoader) {
try {
- SelectorFunction<Node> f = functions.next();
+ SelectorFunction<Node> f = aFunctionLoader;
log.debug("registering LDPath function: {}", f.getSignature());
addFunction(f);
} catch (ServiceConfigurationError e) {
@@ -133,18 +125,17 @@ public class DefaultConfiguration<Node> extends Configuration<Node> {
}
private void addDefaultTestFunctions() {
- Iterator<TestFunction> testFunctions = testLoader.iterator();
- while(testFunctions.hasNext()){
+ for (TestFunction aTestLoader : testLoader) {
try {
- TestFunction testFunction = testFunctions.next();
- log.debug("registering LDPath test function: {}",
+ TestFunction testFunction = aTestLoader;
+ log.debug("registering LDPath test function: {}",
testFunction.getSignature());
addTestFunction(testFunction);
} catch (ServiceConfigurationError e) {
log.warn("Unable to load function because of an "
+ e.getClass().getSimpleName(), e);
}
- }
+ }
}
private void addTestFunction(TestFunction<Node> test) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/util/Collections.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/util/Collections.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/util/Collections.java
index 6a25caf..11e2526 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/util/Collections.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/util/Collections.java
@@ -36,7 +36,7 @@ public class Collections {
*/
@SafeVarargs
public static <T> List<T> concat(final Collection<T>... lists) {
- List<T> result = new ArrayList<T>();
+ List<T> result = new ArrayList<>();
for(Collection<T> list : lists) {
result.addAll(list);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-functions-collections/src/main/java/org/apache/marmotta/ldpath/model/functions/coll/FlattenFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-collections/src/main/java/org/apache/marmotta/ldpath/model/functions/coll/FlattenFunction.java b/libraries/ldpath/ldpath-functions-collections/src/main/java/org/apache/marmotta/ldpath/model/functions/coll/FlattenFunction.java
index 1412e2b..b8e3873 100644
--- a/libraries/ldpath/ldpath-functions-collections/src/main/java/org/apache/marmotta/ldpath/model/functions/coll/FlattenFunction.java
+++ b/libraries/ldpath/ldpath-functions-collections/src/main/java/org/apache/marmotta/ldpath/model/functions/coll/FlattenFunction.java
@@ -18,20 +18,17 @@
package org.apache.marmotta.ldpath.model.functions.coll;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
+import java.util.*;
+
public class FlattenFunction<Node> extends AbstractCollFunction<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 {
if (args.length > 1) {
throw new IllegalArgumentException(getLocalName() + " must not have more than one parameter");
}
@@ -42,7 +39,7 @@ public class FlattenFunction<Node> extends AbstractCollFunction<Node> {
nodes = Collections.singleton(context);
}
- final List<Node> result = new LinkedList<Node>();
+ final List<Node> result = new LinkedList<>();
for (Node node : nodes) {
if (hasType(backend, node, RDF + "Bag")) {
flattenContainer(backend, node, result);
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-functions-collections/src/main/java/org/apache/marmotta/ldpath/model/functions/coll/GetFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-collections/src/main/java/org/apache/marmotta/ldpath/model/functions/coll/GetFunction.java b/libraries/ldpath/ldpath-functions-collections/src/main/java/org/apache/marmotta/ldpath/model/functions/coll/GetFunction.java
index 86b14ea..9afc63f 100644
--- a/libraries/ldpath/ldpath-functions-collections/src/main/java/org/apache/marmotta/ldpath/model/functions/coll/GetFunction.java
+++ b/libraries/ldpath/ldpath-functions-collections/src/main/java/org/apache/marmotta/ldpath/model/functions/coll/GetFunction.java
@@ -18,16 +18,17 @@
package org.apache.marmotta.ldpath.model.functions.coll;
+import org.apache.marmotta.ldpath.api.backend.RDFBackend;
+
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
-import org.apache.marmotta.ldpath.api.backend.RDFBackend;
-
public class GetFunction<Node> extends AbstractCollFunction<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 {
final Collection<Node> nodes;
final int index;
switch (args.length) {
@@ -43,7 +44,7 @@ public class GetFunction<Node> extends AbstractCollFunction<Node> {
throw new IllegalArgumentException(getLocalName() + " must not have more than one or two parameters");
}
- Collection<Node> result = new HashSet<Node>();
+ Collection<Node> result = new HashSet<>();
for (Node node : nodes) {
if (hasType(backend, node, RDF + "Bag")) {
result.addAll(getFromContainer(backend, node, index));
@@ -64,7 +65,7 @@ public class GetFunction<Node> extends AbstractCollFunction<Node> {
} else if (index == 0) {
return backend.listObjects(node, backend.createURI(RDF + "first"));
} else {
- HashSet<Node> result = new HashSet<Node>();
+ HashSet<Node> result = new HashSet<>();
for (Node n : backend.listObjects(node, backend.createURI(RDF + "rest"))) {
result.addAll(getFromCollection(backend, n, index - 1));
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-functions-collections/src/main/java/org/apache/marmotta/ldpath/model/functions/coll/SubListFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-collections/src/main/java/org/apache/marmotta/ldpath/model/functions/coll/SubListFunction.java b/libraries/ldpath/ldpath-functions-collections/src/main/java/org/apache/marmotta/ldpath/model/functions/coll/SubListFunction.java
index 1b79172..b9e4f51 100644
--- a/libraries/ldpath/ldpath-functions-collections/src/main/java/org/apache/marmotta/ldpath/model/functions/coll/SubListFunction.java
+++ b/libraries/ldpath/ldpath-functions-collections/src/main/java/org/apache/marmotta/ldpath/model/functions/coll/SubListFunction.java
@@ -18,17 +18,18 @@
package org.apache.marmotta.ldpath.model.functions.coll;
+import org.apache.marmotta.ldpath.api.backend.RDFBackend;
+
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
-import org.apache.marmotta.ldpath.api.backend.RDFBackend;
-
public class SubListFunction<Node> extends AbstractCollFunction<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 {
final Collection<Node> nodes;
final int start, end;
switch (args.length) {
@@ -57,7 +58,7 @@ public class SubListFunction<Node> extends AbstractCollFunction<Node> {
throw new IllegalArgumentException(getLocalName() + " takes at most 3 arguments");
}
- final List<Node> result = new LinkedList<Node>();
+ final List<Node> result = new LinkedList<>();
for (Node node : nodes) {
if (hasType(backend, node, RDF + "Bag")) {
result.addAll(subListFromContainer(backend, node, start, end));
@@ -88,7 +89,7 @@ public class SubListFunction<Node> extends AbstractCollFunction<Node> {
}
private Collection<? extends Node> subListFromContainer(RDFBackend<Node> backend, Node node, int start, int end) {
- List<Node> result = new LinkedList<Node>();
+ List<Node> result = new LinkedList<>();
for (int i = start; i < end; i++) {
final Collection<Node> objects = backend.listObjects(node, backend.createURI(RDF + "_" + (i + 1)));
if (objects.size() > 0) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-functions-date/src/main/java/org/apache/marmotta/ldpath/model/functions/date/EarliestDateFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-date/src/main/java/org/apache/marmotta/ldpath/model/functions/date/EarliestDateFunction.java b/libraries/ldpath/ldpath-functions-date/src/main/java/org/apache/marmotta/ldpath/model/functions/date/EarliestDateFunction.java
index 9417e94..2cd13bd 100644
--- a/libraries/ldpath/ldpath-functions-date/src/main/java/org/apache/marmotta/ldpath/model/functions/date/EarliestDateFunction.java
+++ b/libraries/ldpath/ldpath-functions-date/src/main/java/org/apache/marmotta/ldpath/model/functions/date/EarliestDateFunction.java
@@ -18,20 +18,21 @@
package org.apache.marmotta.ldpath.model.functions.date;
+import org.apache.marmotta.ldpath.api.backend.RDFBackend;
+import org.apache.marmotta.ldpath.model.transformers.DateTransformer;
+
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
-import org.apache.marmotta.ldpath.api.backend.RDFBackend;
-import org.apache.marmotta.ldpath.model.transformers.DateTransformer;
-
public class EarliestDateFunction<Node> extends DateFunction<Node> {
- private final DateTransformer<Node> transformer = new DateTransformer<Node>();
+ private final DateTransformer<Node> transformer = new DateTransformer<>();
+ @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 {
if (args.length != 1) {
throw new IllegalArgumentException("earliest requires exactly one argument");
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-functions-date/src/main/java/org/apache/marmotta/ldpath/model/functions/date/LatestDateFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-date/src/main/java/org/apache/marmotta/ldpath/model/functions/date/LatestDateFunction.java b/libraries/ldpath/ldpath-functions-date/src/main/java/org/apache/marmotta/ldpath/model/functions/date/LatestDateFunction.java
index a4b3a55..71917ae 100644
--- a/libraries/ldpath/ldpath-functions-date/src/main/java/org/apache/marmotta/ldpath/model/functions/date/LatestDateFunction.java
+++ b/libraries/ldpath/ldpath-functions-date/src/main/java/org/apache/marmotta/ldpath/model/functions/date/LatestDateFunction.java
@@ -18,20 +18,21 @@
package org.apache.marmotta.ldpath.model.functions.date;
+import org.apache.marmotta.ldpath.api.backend.RDFBackend;
+import org.apache.marmotta.ldpath.model.transformers.DateTransformer;
+
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
-import org.apache.marmotta.ldpath.api.backend.RDFBackend;
-import org.apache.marmotta.ldpath.model.transformers.DateTransformer;
-
public class LatestDateFunction<Node> extends DateFunction<Node> {
- private final DateTransformer<Node> transformer = new DateTransformer<Node>();
+ private final DateTransformer<Node> transformer = new DateTransformer<>();
+ @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 {
if (args.length != 1) {
throw new IllegalArgumentException("latest requires exactly one argument");
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-functions-html/src/main/java/org/apache/marmotta/ldpath/model/functions/html/CssSelectFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-html/src/main/java/org/apache/marmotta/ldpath/model/functions/html/CssSelectFunction.java b/libraries/ldpath/ldpath-functions-html/src/main/java/org/apache/marmotta/ldpath/model/functions/html/CssSelectFunction.java
index 1732964..f55eef3 100644
--- a/libraries/ldpath/ldpath-functions-html/src/main/java/org/apache/marmotta/ldpath/model/functions/html/CssSelectFunction.java
+++ b/libraries/ldpath/ldpath-functions-html/src/main/java/org/apache/marmotta/ldpath/model/functions/html/CssSelectFunction.java
@@ -28,21 +28,13 @@ import org.jsoup.select.Selector.SelectorParseException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-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.*;
public class CssSelectFunction<KiWiNode> extends SelectorFunction<KiWiNode> {
private Logger log = LoggerFactory.getLogger(CssSelectFunction.class);
- private final StringTransformer<KiWiNode> transformer = new StringTransformer<KiWiNode>();
+ private final StringTransformer<KiWiNode> transformer = new StringTransformer<>();
/**
* Apply the function to the list of nodes passed as arguments and return the result as type T.
@@ -53,13 +45,14 @@ public class CssSelectFunction<KiWiNode> extends SelectorFunction<KiWiNode> {
* @param args a nested list of KiWiNodes
* @return
*/
+ @SafeVarargs
@Override
- public Collection<KiWiNode> apply(RDFBackend<KiWiNode> rdfBackend, KiWiNode context, Collection<KiWiNode>... args)
+ public final Collection<KiWiNode> apply(RDFBackend<KiWiNode> rdfBackend, KiWiNode context, Collection<KiWiNode>... args)
throws IllegalArgumentException {
if (args.length < 1) {
throw new IllegalArgumentException("CSS-Selector is required as first argument.");
}
- Set<String> jsoupSelectors = new HashSet<String>();
+ Set<String> jsoupSelectors = new HashSet<>();
for (KiWiNode xpath : args[0]) {
try {
jsoupSelectors.add(transformer.transform(rdfBackend, xpath, null));
@@ -75,28 +68,24 @@ public class CssSelectFunction<KiWiNode> extends SelectorFunction<KiWiNode> {
log.debug("apply css-selector {} on parsed parameters", jsoupSelectors);
it = org.apache.marmotta.ldpath.util.Collections.iterator(1, args);
}
- List<KiWiNode> result = new ArrayList<KiWiNode>();
+ List<KiWiNode> result = new ArrayList<>();
while (it.hasNext()) {
KiWiNode n = it.next();
- try {
- final String string = transformer.transform(rdfBackend, n, null);
- final Document jsoup = Jsoup.parse(string);
- if (rdfBackend.isURI(context)) {
- jsoup.setBaseUri(rdfBackend.stringValue(context));
- }
- for (String r : doFilter(jsoup, jsoupSelectors)) {
- result.add(rdfBackend.createLiteral(r));
- }
- } catch (IOException e) {
- // This should never happen, since validation is turned off.
+ final String string = transformer.transform(rdfBackend, n, null);
+ final Document jsoup = Jsoup.parse(string);
+ if (rdfBackend.isURI(context)) {
+ jsoup.setBaseUri(rdfBackend.stringValue(context));
+ }
+ for (String r : doFilter(jsoup, jsoupSelectors)) {
+ result.add(rdfBackend.createLiteral(r));
}
}
return result;
}
- private LinkedList<String> doFilter(Document jsoup, Set<String> jsoupSelectors) throws IOException {
- LinkedList<String> result = new LinkedList<String>();
+ private LinkedList<String> doFilter(Document jsoup, Set<String> jsoupSelectors) {
+ LinkedList<String> result = new LinkedList<>();
for (String jsoupSel : jsoupSelectors) {
try {
for (Element e : jsoup.select(jsoupSel)) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-functions-json/src/main/java/org/apache/marmotta/ldpath/model/functions/json/JsonPathFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-json/src/main/java/org/apache/marmotta/ldpath/model/functions/json/JsonPathFunction.java b/libraries/ldpath/ldpath-functions-json/src/main/java/org/apache/marmotta/ldpath/model/functions/json/JsonPathFunction.java
index 4546a69..3350384 100644
--- a/libraries/ldpath/ldpath-functions-json/src/main/java/org/apache/marmotta/ldpath/model/functions/json/JsonPathFunction.java
+++ b/libraries/ldpath/ldpath-functions-json/src/main/java/org/apache/marmotta/ldpath/model/functions/json/JsonPathFunction.java
@@ -23,29 +23,23 @@ import org.apache.marmotta.ldpath.model.transformers.StringTransformer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
public class JsonPathFunction<Node> extends SelectorFunction<Node> {
private static final Logger log = LoggerFactory.getLogger(JsonPathFunction.class);
- private final StringTransformer<Node> transformer = new StringTransformer<Node>();
+ private final StringTransformer<Node> transformer = new StringTransformer<>();
@Override
protected String getLocalName() {
return "jsonpath";
}
+ @SafeVarargs
@Override
- public Collection<Node> apply(RDFBackend<Node> rdfBackend, Node context, @SuppressWarnings("unchecked") Collection<Node>... args) throws IllegalArgumentException {
+ public final Collection<Node> apply(RDFBackend<Node> rdfBackend, Node context, @SuppressWarnings("unchecked") Collection<Node>... args) throws IllegalArgumentException {
- Set<String> jsonpaths = new HashSet<String>();
+ Set<String> jsonpaths = new HashSet<>();
for (Node jsonpath : args[0]) {
try {
jsonpaths.add(transformer.transform(rdfBackend,jsonpath, null));
@@ -63,23 +57,19 @@ public class JsonPathFunction<Node> extends SelectorFunction<Node> {
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 {
- for (String r : doFilter(transformer.transform(rdfBackend,n, null), jsonpaths)) {
- result.add(rdfBackend.createLiteral(r));
- }
- } catch (IOException e) {
- // This should never happen, since validation is turned off.
+ for (String r : doFilter(transformer.transform(rdfBackend,n, null), jsonpaths)) {
+ result.add(rdfBackend.createLiteral(r));
}
}
return result;
}
- private List<String> doFilter(String in, Set<String> jsonpaths) throws IOException {
- List<String> result = new ArrayList<String>();
+ private List<String> doFilter(String in, Set<String> jsonpaths) {
+ List<String> result = new ArrayList<>();
for (String jsonpath : jsonpaths) {
result.add(String.valueOf(JsonPath.read(in, jsonpath)));
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MaxFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MaxFunction.java b/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MaxFunction.java
index 2d2ab42..a49ff1f 100644
--- a/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MaxFunction.java
+++ b/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MaxFunction.java
@@ -18,25 +18,25 @@
package org.apache.marmotta.ldpath.model.functions.math;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.apache.marmotta.ldpath.api.backend.NodeBackend;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.model.Constants;
import org.apache.marmotta.ldpath.model.transformers.DoubleTransformer;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collection;
+
public class MaxFunction<Node> extends MathFunction<Node> {
- protected final DoubleTransformer<Node> doubleTransformer = new DoubleTransformer<Node>();
+ protected final DoubleTransformer<Node> doubleTransformer = new DoubleTransformer<>();
protected final URI doubleType = URI.create(Constants.NS_XSD + "double");
+ @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 {
- ArrayList<Node> result = new ArrayList<Node>();
+ ArrayList<Node> result = new ArrayList<>();
for (Collection<Node> arg : args) {
Node res = calc(backend, arg);
if (res != null) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MinFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MinFunction.java b/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MinFunction.java
index efc92b3..69eb402 100644
--- a/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MinFunction.java
+++ b/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MinFunction.java
@@ -18,26 +18,26 @@
package org.apache.marmotta.ldpath.model.functions.math;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.apache.marmotta.ldpath.api.backend.NodeBackend;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.model.Constants;
import org.apache.marmotta.ldpath.model.transformers.DoubleTransformer;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collection;
+
public class MinFunction<Node> extends MathFunction<Node> {
- protected final DoubleTransformer<Node> doubleTransformer = new DoubleTransformer<Node>();
+ protected final DoubleTransformer<Node> doubleTransformer = new DoubleTransformer<>();
protected final URI doubleType = URI.create(Constants.NS_XSD + "double");
+ @SafeVarargs
@Override
- public Collection<Node> apply(RDFBackend<Node> backend, Node context, Collection<Node>... args)
+ public final Collection<Node> apply(RDFBackend<Node> backend, Node context, Collection<Node>... args)
throws IllegalArgumentException {
- ArrayList<Node> result = new ArrayList<Node>();
+ ArrayList<Node> result = new ArrayList<>();
for (Collection<Node> arg : args) {
Node res = calc(backend, arg);
if (res != null) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/RoundFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/RoundFunction.java b/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/RoundFunction.java
index 7081cea..aea5d01 100644
--- a/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/RoundFunction.java
+++ b/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/RoundFunction.java
@@ -18,28 +18,28 @@
package org.apache.marmotta.ldpath.model.functions.math;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.apache.marmotta.ldpath.api.backend.NodeBackend;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.model.Constants;
import org.apache.marmotta.ldpath.model.transformers.DoubleTransformer;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collection;
+
public class RoundFunction<Node> extends MathFunction<Node> {
- protected final DoubleTransformer<Node> doubleTransformer = new DoubleTransformer<Node>();
+ protected final DoubleTransformer<Node> doubleTransformer = new DoubleTransformer<>();
protected final URI intType = URI.create(Constants.NS_XSD + "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 {
if (args.length != 1) {
throw new IllegalArgumentException("round takes only one argument");
}
- ArrayList<Node> result = new ArrayList<Node>();
+ ArrayList<Node> result = new ArrayList<>();
for (Node node : args[0]) {
Node res = calc(backend, node);
if (res != null) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e21293a2/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/SumFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/SumFunction.java b/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/SumFunction.java
index f5f5271..12a80a4 100644
--- a/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/SumFunction.java
+++ b/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/SumFunction.java
@@ -18,25 +18,25 @@
package org.apache.marmotta.ldpath.model.functions.math;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.apache.marmotta.ldpath.api.backend.NodeBackend;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.model.Constants;
import org.apache.marmotta.ldpath.model.transformers.DoubleTransformer;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collection;
+
public class SumFunction<Node> extends MathFunction<Node> {
- protected final DoubleTransformer<Node> doubleTransformer = new DoubleTransformer<Node>();
+ protected final DoubleTransformer<Node> doubleTransformer = new DoubleTransformer<>();
protected final URI doubleType = URI.create(Constants.NS_XSD + "double");
+ @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 {
- ArrayList<Node> result = new ArrayList<Node>();
+ ArrayList<Node> result = new ArrayList<>();
for (Collection<Node> arg : args) {
Node res = calc(backend, arg);
if (res != null) {
@@ -52,7 +52,7 @@ public class SumFunction<Node> extends MathFunction<Node> {
for (Node n : arg) {
try {
Double val = doubleTransformer.transform(backend, n, null);
- d += val.doubleValue();
+ d += val;
} catch (IllegalArgumentException e) {
// we just ignore non-numeric nodes
}
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/ReplaceFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/ReplaceFunction.java b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/ReplaceFunction.java
index fbb3a5e..bc89e2e 100644
--- a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/ReplaceFunction.java
+++ b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/ReplaceFunction.java
@@ -18,6 +18,10 @@
package org.apache.marmotta.ldpath.model.functions.text;
+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 java.net.URI;
import java.util.Collection;
import java.util.HashSet;
@@ -26,10 +30,6 @@ import java.util.Set;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
-import org.apache.marmotta.ldpath.api.backend.RDFBackend;
-import org.apache.marmotta.ldpath.api.functions.SelectorFunction;
-import org.apache.marmotta.ldpath.model.transformers.StringTransformer;
-
/**
* Apply a {@link String#replaceAll(String, String)} to the passed Nodes.
*
@@ -39,10 +39,11 @@ import org.apache.marmotta.ldpath.model.transformers.StringTransformer;
*/
public class ReplaceFunction<Node> extends SelectorFunction<Node> {
- private final StringTransformer<Node> transformer = new StringTransformer<Node>();
+ private final StringTransformer<Node> transformer = new StringTransformer<>();
+ @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 {
if (args.length != 3 || args[1].size() != 1 || args[2].size() != 1) {
throw new IllegalArgumentException("wrong usage: " + getSignature());
}
@@ -54,7 +55,7 @@ public class ReplaceFunction<Node> extends SelectorFunction<Node> {
try {
final Pattern pattern = Pattern.compile(regex);
- Set<Node> result = new HashSet<Node>();
+ Set<Node> result = new HashSet<>();
for (Node node : nodes) {
final String string = backend.stringValue(node);
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/StrJoinFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/StrJoinFunction.java b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/StrJoinFunction.java
index 785f4f8..08d33ed 100644
--- a/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/StrJoinFunction.java
+++ b/libraries/ldpath/ldpath-functions-text/src/main/java/org/apache/marmotta/ldpath/model/functions/text/StrJoinFunction.java
@@ -18,23 +18,24 @@
package org.apache.marmotta.ldpath.model.functions.text;
-import java.util.Collection;
-import java.util.Collections;
-
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 java.util.Collection;
+import java.util.Collections;
+
/**
* Join the string representation of all provided nodes to a single string literal.
*
*/
public class StrJoinFunction<Node> extends SelectorFunction<Node> {
- private final StringTransformer<Node> transformer = new StringTransformer<Node>();
+ private final StringTransformer<Node> transformer = new StringTransformer<>();
+ @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 {
if ((args.length < 2 || args.length > 4)) {
throw new IllegalArgumentException("wrong usage: " + getSignature());
}