code style cleanups across the whole source code
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/e5ee6af1 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/e5ee6af1 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/e5ee6af1 Branch: refs/heads/develop Commit: e5ee6af11b1af0385a5f6295ab6630dcaca8bbb0 Parents: 3770778 Author: Sebastian Schaffert <[email protected]> Authored: Sat Nov 19 19:41:20 2016 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Sat Nov 19 19:41:20 2016 +0100 ---------------------------------------------------------------------- .../caching/HazelcastCacheManager.java | 2 +- .../InfinispanEmbeddedCacheManager.java | 7 +- .../remote/CustomClassExternalizerFactory.java | 4 +- .../infinispan/remote/CustomClassTable.java | 6 +- .../marmotta/kiwi/infinispan/util/AsyncMap.java | 2 +- .../kiwi/loader/csv/SQLBooleanProcessor.java | 2 +- .../kiwi/loader/generic/KiWiHandler.java | 4 +- .../kiwi/reasoner/engine/ReasoningEngine.java | 37 ++++---- .../reasoner/model/program/Justification.java | 3 +- .../kiwi/reasoner/model/program/Pattern.java | 3 +- .../kiwi/reasoner/model/program/Program.java | 4 +- .../kiwi/reasoner/model/program/Rule.java | 4 +- .../kiwi/reasoner/model/query/QueryResult.java | 3 +- .../reasoner/parser/KWRLProgramParserBase.java | 6 +- .../persistence/KiWiReasoningConnection.java | 98 +++++++++----------- .../kiwi/reasoner/sail/KiWiReasoningSail.java | 35 +++---- .../kiwi/sparql/builder/SQLBuilder.java | 35 +++---- .../sparql/builder/collect/ConditionFinder.java | 2 +- .../builder/eval/ValueExpressionEvaluator.java | 16 ++-- .../builder/model/SQLAbstractSubquery.java | 3 +- .../kiwi/sparql/builder/model/SQLClause.java | 6 +- .../kiwi/sparql/builder/model/SQLFragment.java | 10 +- .../kiwi/sparql/builder/model/SQLPattern.java | 6 +- .../kiwi/sparql/builder/model/SQLUnion.java | 4 +- .../evaluation/KiWiEvaluationStrategy.java | 33 ++++--- .../kiwi/sparql/sail/KiWiSparqlSail.java | 35 ++++--- .../kiwi/persistence/util/ScriptRunner.java | 21 +---- .../kiwi/caching/GuavaCacheManager.java | 2 +- .../marmotta/kiwi/config/KiWiConfiguration.java | 2 +- .../kiwi/generator/SnowflakeIDGenerator.java | 5 +- .../kiwi/model/rdf/KiWiDoubleLiteral.java | 2 +- .../marmotta/kiwi/model/rdf/KiWiIntLiteral.java | 2 +- .../marmotta/kiwi/model/rdf/KiWiLiteral.java | 3 +- .../marmotta/kiwi/model/rdf/KiWiNamespace.java | 3 +- .../kiwi/persistence/KiWiConnection.java | 15 +-- .../kiwi/persistence/KiWiGarbageCollector.java | 3 +- .../marmotta/kiwi/persistence/h2/H2Dialect.java | 5 +- .../persistence/pgsql/PostgreSQLDialect.java | 5 +- .../marmotta/kiwi/sail/KiWiSailConnection.java | 12 +-- .../marmotta/kiwi/sail/KiWiValueFactory.java | 6 +- .../persistence/KiWiVersioningConnection.java | 2 +- .../versioning/sail/KiWiSnapshotConnection.java | 25 ++--- .../versioning/sail/KiWiVersioningSail.java | 22 ++--- 43 files changed, 196 insertions(+), 309 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-caching-hazelcast/src/main/java/org/apache/marmotta/kiwi/hazelcast/caching/HazelcastCacheManager.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-caching-hazelcast/src/main/java/org/apache/marmotta/kiwi/hazelcast/caching/HazelcastCacheManager.java b/libraries/kiwi/kiwi-caching-hazelcast/src/main/java/org/apache/marmotta/kiwi/hazelcast/caching/HazelcastCacheManager.java index b16037c..c5eb497 100644 --- a/libraries/kiwi/kiwi-caching-hazelcast/src/main/java/org/apache/marmotta/kiwi/hazelcast/caching/HazelcastCacheManager.java +++ b/libraries/kiwi/kiwi-caching-hazelcast/src/main/java/org/apache/marmotta/kiwi/hazelcast/caching/HazelcastCacheManager.java @@ -255,7 +255,7 @@ public class HazelcastCacheManager implements CacheManager { @Override public Map<Long, Long> getRegistryCache() { if(registryCache == null) { - registryCache = hazelcast.<Long, Long>getMap(REGISTRY_CACHE); + registryCache = hazelcast.getMap(REGISTRY_CACHE); } return registryCache; http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/embedded/InfinispanEmbeddedCacheManager.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/embedded/InfinispanEmbeddedCacheManager.java b/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/embedded/InfinispanEmbeddedCacheManager.java index 8de905a..2d32ca4 100644 --- a/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/embedded/InfinispanEmbeddedCacheManager.java +++ b/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/embedded/InfinispanEmbeddedCacheManager.java @@ -40,7 +40,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; -import java.util.Iterator; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; @@ -474,10 +473,8 @@ public class InfinispanEmbeddedCacheManager implements CacheManager { */ public void clear() { Set<String> set = cacheManager.getCacheNames(); - Iterator<String> iterator = set.iterator(); - while(iterator.hasNext()){ - String cacheName = iterator.next(); - Cache<String,Object> cache = cacheManager.getCache(cacheName); + for (String cacheName : set) { + Cache<String, Object> cache = cacheManager.getCache(cacheName); cache.clear(); } http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/remote/CustomClassExternalizerFactory.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/remote/CustomClassExternalizerFactory.java b/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/remote/CustomClassExternalizerFactory.java index d68bda5..148a231 100644 --- a/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/remote/CustomClassExternalizerFactory.java +++ b/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/remote/CustomClassExternalizerFactory.java @@ -30,9 +30,9 @@ import java.util.Set; * * @author Sebastian Schaffert ([email protected]) */ -public class CustomClassExternalizerFactory implements ClassExternalizerFactory { +class CustomClassExternalizerFactory implements ClassExternalizerFactory { - Map<Class<?>,Externalizer> externalizers = new HashMap<>(); + private Map<Class<?>,Externalizer> externalizers = new HashMap<>(); public CustomClassExternalizerFactory() { http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/remote/CustomClassTable.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/remote/CustomClassTable.java b/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/remote/CustomClassTable.java index 05d9283..0b8d028 100644 --- a/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/remote/CustomClassTable.java +++ b/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/remote/CustomClassTable.java @@ -34,10 +34,10 @@ import java.util.Map; */ public class CustomClassTable implements ClassTable { - Writer writer; + private Writer writer; - Map<Integer,Class> classLookup; - Map<Class,Integer> idLookup; + private Map<Integer,Class> classLookup; + private Map<Class,Integer> idLookup; public CustomClassTable() { http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/util/AsyncMap.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/util/AsyncMap.java b/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/util/AsyncMap.java index 150af7d..77be683 100644 --- a/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/util/AsyncMap.java +++ b/libraries/kiwi/kiwi-caching-infinispan/src/main/java/org/apache/marmotta/kiwi/infinispan/util/AsyncMap.java @@ -69,7 +69,7 @@ public class AsyncMap<K,V> implements Map<K,V> { @Override public V remove(Object o) { - delegate.removeAsync((K)o); + delegate.removeAsync(o); return null; } http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/csv/SQLBooleanProcessor.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/csv/SQLBooleanProcessor.java b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/csv/SQLBooleanProcessor.java index fc4e18b..5f29777 100644 --- a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/csv/SQLBooleanProcessor.java +++ b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/csv/SQLBooleanProcessor.java @@ -58,7 +58,7 @@ public class SQLBooleanProcessor extends CellProcessorAdaptor implements BoolCel throw new SuperCsvCellProcessorException(Boolean.class, value, context, this); } - if( ((Boolean)value).booleanValue()) { + if((Boolean) value) { return "t"; } else { return "f"; http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/generic/KiWiHandler.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/generic/KiWiHandler.java b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/generic/KiWiHandler.java index 016cd19..499f196 100644 --- a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/generic/KiWiHandler.java +++ b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/generic/KiWiHandler.java @@ -311,9 +311,9 @@ public class KiWiHandler implements RDFHandler { } else if(value instanceof KiWiNode) { return (KiWiNode)value; } else if(value instanceof URI) { - return createURI(((URI)value).stringValue()); + return createURI(value.stringValue()); } else if(value instanceof BNode) { - return createBNode(((BNode)value).stringValue()); + return createBNode(value.stringValue()); } else if(value instanceof Literal) { return createLiteral((Literal)value); } else { http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java index db5a85c..f530d06 100644 --- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java +++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java @@ -148,28 +148,25 @@ public class ReasoningEngine implements TransactionListener { loadPrograms(); - this.reasoningQueue = new LinkedBlockingQueue<TransactionData>(); + this.reasoningQueue = new LinkedBlockingQueue<>(); this.reasonerThread = new SKWRLReasoner(); } public void loadPrograms() { log.info("program configuration changed, reloading ..."); - patternRuleMap = HashMultimap.<Pattern,Rule>create(); + patternRuleMap = HashMultimap.create(); try { - KiWiReasoningConnection connection = persistence.getConnection(); - try { - programs = Iterations.asList(connection.listPrograms()); + try (KiWiReasoningConnection connection = persistence.getConnection()) { + programs = Iterations.asList(connection.listPrograms()); - for(Program p : programs) { - for(Rule rule : p.getRules()) { - for(Pattern pattern : rule.getBody()) { - patternRuleMap.put(pattern,rule); + for (Program p : programs) { + for (Rule rule : p.getRules()) { + for (Pattern pattern : rule.getBody()) { + patternRuleMap.put(pattern, rule); } } } - } finally { - connection.close(); } } catch (SQLException ex) { programs = Collections.emptyList(); @@ -573,7 +570,7 @@ public class ReasoningEngine implements TransactionListener { log.debug("REASONER(rule '{}'): evaluating rule body {} ...", rule.getName() != null ? rule.getName() : rule.getId(), rule); // create a collection consisting of the body minus the pattern that already matched - Set<Pattern> body = new HashSet<Pattern>(rule.getBody()); + Set<Pattern> body = new HashSet<>(rule.getBody()); if(p != null) { body.remove(p); @@ -591,16 +588,16 @@ public class ReasoningEngine implements TransactionListener { if(body.size() > 0) { bodyResult = connection.query(body,match,null,null,true); } else if(match != null) { - bodyResult = new SingletonIteration<QueryResult, SQLException>(match); + bodyResult = new SingletonIteration<>(match); } else { - bodyResult = new EmptyIteration<QueryResult, SQLException>(); + bodyResult = new EmptyIteration<>(); } // construct triples out of the bindings and the rule heads long counter = 0; // initialise a new set of justifications - Set<Justification> justifications = new HashSet<Justification>(); + Set<Justification> justifications = new HashSet<>(); sail.begin(); while(bodyResult.hasNext()) { @@ -728,7 +725,7 @@ public class ReasoningEngine implements TransactionListener { * @return */ protected Collection<Justification> getJustifications(KiWiReasoningConnection connection, KiWiTriple t, Set<Justification> transactionJustifications) throws SQLException { - HashSet<Justification> justifications = new HashSet<Justification>(); + HashSet<Justification> justifications = new HashSet<>(); Iterations.addAll(connection.listJustificationsForTriple(t), justifications); for(Justification j : transactionJustifications) { if(equivalence.equivalent(j.getTriple(), t)) { @@ -746,7 +743,7 @@ public class ReasoningEngine implements TransactionListener { * @return */ protected Set<Justification> getBaseJustifications(KiWiReasoningConnection connection, Set<Justification> justifications) throws SQLException, ReasoningException { - Set<Justification> baseJustifications = new HashSet<Justification>(); + Set<Justification> baseJustifications = new HashSet<>(); Map<KiWiTriple,Collection<Justification>> justificationCache = StatementCommons.newQuadrupleMap(); for(Justification justification : justifications) { @@ -774,7 +771,7 @@ public class ReasoningEngine implements TransactionListener { // mix the two sets Set<Justification> oldTripleJustifications = tripleJustifications; - tripleJustifications = new HashSet<Justification>(); + tripleJustifications = new HashSet<>(); for(Justification j1 : oldTripleJustifications) { for(Justification j2 : supportJustifications) { Justification j3 = new Justification(); @@ -990,10 +987,8 @@ public class ReasoningEngine implements TransactionListener { updateTaskMaxProgress(reasoningQueue.size()); executeReasoner(data); - } catch (InterruptedException ex) { + } catch (InterruptedException | RuntimeException ex) { - } catch (RuntimeException ex) { - // can happen on forced shutdown } catch (Exception ex) { log.warn("reasoning task threw an exception",ex); } http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Justification.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Justification.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Justification.java index ec8f947..d5d1659 100644 --- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Justification.java +++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Justification.java @@ -124,9 +124,8 @@ public class Justification { //if (id != null ? !id.equals(that.id) : that.id != null) return false; if (!supportingRules.equals(that.supportingRules)) return false; if (!supportingTriples.equals(that.supportingTriples)) return false; - if (!equivalence.equivalent(this.triple, that.triple)) return false; + return equivalence.equivalent(this.triple, that.triple); - return true; } @Override http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Pattern.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Pattern.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Pattern.java index 8dde59a..554dec6 100644 --- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Pattern.java +++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Pattern.java @@ -105,9 +105,8 @@ public class Pattern { if(!Objects.equal(this.context, pattern.context)) return false; if(!Objects.equal(this.object, pattern.object)) return false; if(!Objects.equal(this.property, pattern.property)) return false; - if(!Objects.equal(this.subject, pattern.subject)) return false; + return Objects.equal(this.subject, pattern.subject); - return true; } @Override http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Program.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Program.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Program.java index 9659402..d939ebb 100644 --- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Program.java +++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Program.java @@ -41,8 +41,8 @@ public class Program { public Program() { - rules = new ArrayList<Rule>(); - namespaces = new HashMap<String, String>(); + rules = new ArrayList<>(); + namespaces = new HashMap<>(); } public long getId() { http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Rule.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Rule.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Rule.java index 3db56ec..e30f0ce 100644 --- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Rule.java +++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Rule.java @@ -184,8 +184,8 @@ public class Rule { if (name != null ? !name.equals(rule.name) : rule.name != null) return false; if(getBody() != null && rule.getBody() != null) { - HashSet<Pattern> s1 = new HashSet<Pattern>(getBody()); - HashSet<Pattern> s2 = new HashSet<Pattern>(rule.getBody()); + HashSet<Pattern> s1 = new HashSet<>(getBody()); + HashSet<Pattern> s2 = new HashSet<>(rule.getBody()); return s1.equals(s2); } else { http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/query/QueryResult.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/query/QueryResult.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/query/QueryResult.java index d262430..01186b9 100644 --- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/query/QueryResult.java +++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/query/QueryResult.java @@ -23,7 +23,6 @@ import org.apache.marmotta.kiwi.model.rdf.KiWiTriple; import org.apache.marmotta.kiwi.reasoner.model.program.VariableField; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -39,7 +38,7 @@ public class QueryResult { private Set<KiWiTriple> justifications; public QueryResult() { - bindings = new HashMap<VariableField, KiWiNode>(); + bindings = new HashMap<>(); justifications = StatementCommons.newQuadrupleSet(); } http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/parser/KWRLProgramParserBase.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/parser/KWRLProgramParserBase.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/parser/KWRLProgramParserBase.java index 06fcd1c..d1c737b 100644 --- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/parser/KWRLProgramParserBase.java +++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/parser/KWRLProgramParserBase.java @@ -53,7 +53,7 @@ public abstract class KWRLProgramParserBase { protected KWRLProgramParserBase() { - namespaces = new HashMap<String, String>(); + namespaces = new HashMap<>(); } protected ValueFactory getValueFactory() { @@ -169,8 +169,8 @@ public abstract class KWRLProgramParserBase { } protected void startRule() { - variables = new HashMap<String,VariableField>(); - resources = new HashMap<String,ResourceField>(); + variables = new HashMap<>(); + resources = new HashMap<>(); } protected void endRule() { http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/persistence/KiWiReasoningConnection.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/persistence/KiWiReasoningConnection.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/persistence/KiWiReasoningConnection.java index e1c379f..155e86f 100644 --- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/persistence/KiWiReasoningConnection.java +++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/persistence/KiWiReasoningConnection.java @@ -110,7 +110,7 @@ public class KiWiReasoningConnection extends KiWiConnection { // load namespaces if they are not yet given if(namespaces == null) { - namespaces = new HashMap<String, String>(); + namespaces = new HashMap<>(); PreparedStatement loadNamespaces = getPreparedStatement("namespaces.load_by_rule"); synchronized (loadNamespaces) { loadNamespaces.setLong(1,ruleId); @@ -126,17 +126,14 @@ public class KiWiReasoningConnection extends KiWiConnection { PreparedStatement loadRule = getPreparedStatement("rules.load_by_id"); synchronized (loadRule) { loadRule.setLong(1,ruleId); - ResultSet result = loadRule.executeQuery(); - try { - if(result.next()) { - return constructRuleFromDatabase(result,namespaces); + try (ResultSet result = loadRule.executeQuery()) { + if (result.next()) { + return constructRuleFromDatabase(result, namespaces); } else { return null; } } catch (ParseException e) { - throw new SQLException("error while parsing rule body",e); - } finally { - result.close(); + throw new SQLException("error while parsing rule body", e); } } } @@ -156,13 +153,13 @@ public class KiWiReasoningConnection extends KiWiConnection { loadRule.setLong(1,programId); ResultSet result = loadRule.executeQuery(); - return new ResultSetIteration<Rule>(result, new ResultTransformerFunction<Rule>() { + return new ResultSetIteration<>(result, new ResultTransformerFunction<Rule>() { @Override public Rule apply(ResultSet row) throws SQLException { try { - return constructRuleFromDatabase(row,namespaces); + return constructRuleFromDatabase(row, namespaces); } catch (ParseException e) { - throw new SQLException("error while parsing rule body",e); + throw new SQLException("error while parsing rule body", e); } } }); @@ -431,17 +428,14 @@ public class KiWiReasoningConnection extends KiWiConnection { PreparedStatement loadProgram = getPreparedStatement("programs.load_by_name"); synchronized (loadProgram) { loadProgram.setString(1, name); - ResultSet result = loadProgram.executeQuery(); - try { - if(result.next()) { + try (ResultSet result = loadProgram.executeQuery()) { + if (result.next()) { return constructProgramFromDatabase(result); } else { return null; } } catch (ParseException e) { - throw new SQLException("error while parsing program rules",e); - } finally { - result.close(); + throw new SQLException("error while parsing program rules", e); } } @@ -460,17 +454,14 @@ public class KiWiReasoningConnection extends KiWiConnection { PreparedStatement loadProgram = getPreparedStatement("programs.load_by_id"); synchronized (loadProgram) { loadProgram.setLong(1, id); - ResultSet result = loadProgram.executeQuery(); - try { - if(result.next()) { + try (ResultSet result = loadProgram.executeQuery()) { + if (result.next()) { return constructProgramFromDatabase(result); } else { return null; } } catch (ParseException e) { - throw new SQLException("error while parsing program rules",e); - } finally { - result.close(); + throw new SQLException("error while parsing program rules", e); } } @@ -520,13 +511,13 @@ public class KiWiReasoningConnection extends KiWiConnection { synchronized (listPrograms) { ResultSet result = listPrograms.executeQuery(); - return new ResultSetIteration<Program>(result, new ResultTransformerFunction<Program>() { + return new ResultSetIteration<>(result, new ResultTransformerFunction<Program>() { @Override public Program apply(ResultSet row) throws SQLException { try { return constructProgramFromDatabase(row); } catch (ParseException e) { - throw new SQLException("error while parsing program rules",e); + throw new SQLException("error while parsing program rules", e); } } }); @@ -760,7 +751,7 @@ public class KiWiReasoningConnection extends KiWiConnection { */ public CloseableIteration<Justification,SQLException> listJustificationsBySupporting(Rule rule) throws SQLException { if(rule.getId() <= 0) { - return new EmptyIteration<Justification, SQLException>(); + return new EmptyIteration<>(); } else { requireJDBCConnection(); @@ -770,7 +761,7 @@ public class KiWiReasoningConnection extends KiWiConnection { ResultSet result = listByRule.executeQuery(); - return new ResultSetIteration<Justification>(result, new ResultTransformerFunction<Justification>() { + return new ResultSetIteration<>(result, new ResultTransformerFunction<Justification>() { @Override public Justification apply(ResultSet row) throws SQLException { return constructJustificationFromDatabase(row); @@ -788,7 +779,7 @@ public class KiWiReasoningConnection extends KiWiConnection { */ public CloseableIteration<Justification,SQLException> listJustificationsBySupporting(KiWiTriple triple) throws SQLException { if(triple.getId() < 0) { - return new EmptyIteration<Justification, SQLException>(); + return new EmptyIteration<>(); } else { requireJDBCConnection(); @@ -798,7 +789,7 @@ public class KiWiReasoningConnection extends KiWiConnection { ResultSet result = listByTriple.executeQuery(); - return new ResultSetIteration<Justification>(result, new ResultTransformerFunction<Justification>() { + return new ResultSetIteration<>(result, new ResultTransformerFunction<Justification>() { @Override public Justification apply(ResultSet row) throws SQLException { return constructJustificationFromDatabase(row); @@ -816,7 +807,7 @@ public class KiWiReasoningConnection extends KiWiConnection { */ public CloseableIteration<Justification,SQLException> listJustificationsForTriple(KiWiTriple triple) throws SQLException { if(triple.getId() < 0) { - return new EmptyIteration<Justification, SQLException>(); + return new EmptyIteration<>(); } else { return listJustificationsForTriple(triple.getId()); } @@ -837,7 +828,7 @@ public class KiWiReasoningConnection extends KiWiConnection { ResultSet result = listForTriple.executeQuery(); - return new ResultSetIteration<Justification>(result, new ResultTransformerFunction<Justification>() { + return new ResultSetIteration<>(result, new ResultTransformerFunction<Justification>() { @Override public Justification apply(ResultSet row) throws SQLException { return constructJustificationFromDatabase(row); @@ -889,7 +880,7 @@ public class KiWiReasoningConnection extends KiWiConnection { synchronized (listUnsupported) { ResultSet result = listUnsupported.executeQuery(); - return new ResultSetIteration<KiWiTriple>(result, new ResultTransformerFunction<KiWiTriple>() { + return new ResultSetIteration<>(result, new ResultTransformerFunction<KiWiTriple>() { @Override public KiWiTriple apply(ResultSet row) throws SQLException { return constructTripleFromDatabase(row); @@ -937,7 +928,7 @@ public class KiWiReasoningConnection extends KiWiConnection { // associate a name with each pattern; the names are used in the database query to refer to the triple // that matched this pattern and in the construction of variable names for the HQL query int patternCount = 0; - final Map<Pattern,String> patternNames = new HashMap<Pattern, String>(); + final Map<Pattern,String> patternNames = new HashMap<>(); for(Pattern p : patterns) { patternNames.put(p,"P"+ (++patternCount)); } @@ -949,12 +940,12 @@ public class KiWiReasoningConnection extends KiWiConnection { int variableCount = 0; // a map for the variable names; will look like { ?x -> "V1", ?y -> "V2", ... } - final Map<VariableField,String> variableNames = new HashMap<VariableField, String>(); + final Map<VariableField,String> variableNames = new HashMap<>(); // a map for mapping variables to field names; each variable might have one or more field names, // depending on the number of patterns it occurs in; will look like // { ?x -> ["P1_V1", "P2_V1"], ?y -> ["P2_V2"], ... } - Map<VariableField,List<String>> queryVariables = new HashMap<VariableField, List<String>>(); + Map<VariableField,List<String>> queryVariables = new HashMap<>(); for(Pattern p : patterns) { Field[] fields = new Field[] { p.getSubject(), @@ -978,7 +969,7 @@ public class KiWiReasoningConnection extends KiWiConnection { // build the select clause by projecting for each query variable the first name StringBuilder selectClause = new StringBuilder(); - final List<VariableField> selectVariables = new LinkedList<VariableField>(); + final List<VariableField> selectVariables = new LinkedList<>(); for(Iterator<VariableField> it = queryVariables.keySet().iterator(); it.hasNext(); ) { VariableField v = it.next(); String projectedName = variableNames.get(v); @@ -993,9 +984,8 @@ public class KiWiReasoningConnection extends KiWiConnection { } if(justifications) { // project also the ids of triples that have matched; we use it for building justifications - for(Iterator<Pattern> it = patterns.iterator(); it.hasNext(); ) { - Pattern p = it.next(); - if(selectClause.length() > 0) { + for (Pattern p : patterns) { + if (selectClause.length() > 0) { selectClause.append(", "); } selectClause.append(patternNames.get(p)); @@ -1018,7 +1008,7 @@ public class KiWiReasoningConnection extends KiWiConnection { for(Iterator<Pattern> it = patterns.iterator(); it.hasNext(); ) { Pattern p = it.next(); String pName = patternNames.get(p); - fromClause.append("triples "+pName); + fromClause.append("triples ").append(pName); Field[] fields = new Field[] { p.getSubject(), @@ -1030,9 +1020,9 @@ public class KiWiReasoningConnection extends KiWiConnection { if(fields[i] != null && fields[i].isVariableField()) { String vName = variableNames.get(fields[i]); fromClause.append(" INNER JOIN nodes AS "); - fromClause.append(pName + "_"+positions[i]+"_" + vName); - fromClause.append(" ON " + pName + "." + positions[i] + " = "); - fromClause.append(pName + "_"+positions[i]+"_" + vName + ".id "); + fromClause.append(pName).append("_").append(positions[i]).append("_").append(vName); + fromClause.append(" ON ").append(pName).append(".").append(positions[i]).append(" = "); + fromClause.append(pName).append("_").append(positions[i]).append("_").append(vName).append(".id "); } } @@ -1050,7 +1040,7 @@ public class KiWiReasoningConnection extends KiWiConnection { // 3. for each variable in the initialBindings, add a condition to the where clause // list of where conditions that will later be connected by AND - List<String> whereConditions = new LinkedList<String>(); + List<String> whereConditions = new LinkedList<>(); // 1. iterate over all patterns and for each resource and literal field in subject, @@ -1146,35 +1136,35 @@ public class KiWiReasoningConnection extends KiWiConnection { PreparedStatement queryStatement = getJDBCConnection().prepareStatement(queryString); ResultSet result = queryStatement.executeQuery(); - return new ResultSetIteration<QueryResult>(result, true, new ResultTransformerFunction<QueryResult>() { + return new ResultSetIteration<>(result, true, new ResultTransformerFunction<QueryResult>() { @Override public QueryResult apply(ResultSet row) throws SQLException { QueryResult resultRow = new QueryResult(); long[] nodeIds = new long[selectVariables.size()]; - for(int i=0; i<selectVariables.size(); i++) { + for (int i = 0; i < selectVariables.size(); i++) { nodeIds[i] = row.getLong(variableNames.get(selectVariables.get(i))); } KiWiNode[] nodes = loadNodesByIds(nodeIds); - for(int i=0; i<selectVariables.size(); i++) { + for (int i = 0; i < selectVariables.size(); i++) { VariableField v = selectVariables.get(i); resultRow.getBindings().put(v, nodes[i]); } - if(justifications) { - for(Pattern p : patterns) { + if (justifications) { + for (Pattern p : patterns) { resultRow.getJustifications().add(loadTripleById(row.getLong(patternNames.get(p)))); } } - if(initialBindings != null && initialBindings.getBindings().size() > 0) { - for(VariableField v : initialBindings.getBindings().keySet()) { - if(!resultRow.getBindings().containsKey(v)) { - resultRow.getBindings().put(v,initialBindings.getBindings().get(v)); + if (initialBindings != null && initialBindings.getBindings().size() > 0) { + for (VariableField v : initialBindings.getBindings().keySet()) { + if (!resultRow.getBindings().containsKey(v)) { + resultRow.getBindings().put(v, initialBindings.getBindings().get(v)); } } - if(justifications) { + if (justifications) { resultRow.getJustifications().addAll(initialBindings.getJustifications()); } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/sail/KiWiReasoningSail.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/sail/KiWiReasoningSail.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/sail/KiWiReasoningSail.java index c1a7b0b..76c187e 100644 --- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/sail/KiWiReasoningSail.java +++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/sail/KiWiReasoningSail.java @@ -19,7 +19,6 @@ package org.apache.marmotta.kiwi.reasoner.sail; import info.aduna.iteration.CloseableIteration; import info.aduna.iteration.ExceptionConvertingIteration; - import org.apache.marmotta.commons.sesame.transactions.api.TransactionalSail; import org.apache.marmotta.commons.sesame.transactions.wrapper.TransactionalSailWrapper; import org.apache.marmotta.kiwi.reasoner.engine.ReasoningConfiguration; @@ -158,13 +157,10 @@ public class KiWiReasoningSail extends TransactionalSailWrapper { public void addProgram(Program program) throws SailException { // store program in the database try { - KiWiReasoningConnection connection = persistence.getConnection(); - try { + try (KiWiReasoningConnection connection = persistence.getConnection()) { // should not throw an exception and the program should have a database ID afterwards connection.storeProgram(program); connection.commit(); - } finally { - connection.close(); } } catch (SQLException ex) { throw new SailException("cannot store program in database",ex); @@ -206,21 +202,20 @@ public class KiWiReasoningSail extends TransactionalSailWrapper { * @throws SailException in case a database error occurs */ public void updateProgram(Program program) throws SailException { - Set<Rule> added = new HashSet<Rule>(); - Set<Rule> removed = new HashSet<Rule>(); + Set<Rule> added = new HashSet<>(); + Set<Rule> removed = new HashSet<>(); try { - KiWiReasoningConnection connection = persistence.getConnection(); - try { + try (KiWiReasoningConnection connection = persistence.getConnection()) { // load old version of program and calculate difference Program old = connection.loadProgram(program.getName()); - if(old != null) { - for(Rule r : old.getRules()) { - if(!program.getRules().contains(r)) { + if (old != null) { + for (Rule r : old.getRules()) { + if (!program.getRules().contains(r)) { removed.add(r); } } - for(Rule r : program.getRules()) { - if(!old.getRules().contains(r)) { + for (Rule r : program.getRules()) { + if (!old.getRules().contains(r)) { added.add(r); } } @@ -230,8 +225,6 @@ public class KiWiReasoningSail extends TransactionalSailWrapper { // store program in the database connection.updateProgram(program); connection.commit(); - } finally { - connection.close(); } } catch (SQLException ex) { throw new SailException("cannot store program in database",ex); @@ -298,14 +291,11 @@ public class KiWiReasoningSail extends TransactionalSailWrapper { */ public Program getProgram(String name) throws SailException { try { - KiWiReasoningConnection connection = persistence.getConnection(); - try { + try (KiWiReasoningConnection connection = persistence.getConnection()) { // should not throw an exception and the program should have a database ID afterwards Program p = connection.loadProgram(name); connection.commit(); return p; - } finally { - connection.close(); } } catch (SQLException ex) { throw new SailException("cannot load program from database",ex); @@ -324,13 +314,10 @@ public class KiWiReasoningSail extends TransactionalSailWrapper { */ public void deleteProgram(String name) throws SailException { try { - KiWiReasoningConnection connection = persistence.getConnection(); - try { + try (KiWiReasoningConnection connection = persistence.getConnection()) { Program p = connection.loadProgram(name); connection.deleteProgram(p); connection.commit(); - } finally { - connection.close(); } } catch (SQLException ex) { throw new SailException("cannot load program from database",ex); http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java index 45b2340..c842aca 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java @@ -521,11 +521,7 @@ public class SQLBuilder { long nodeId = -1; if (fields[i] != null && fields[i].hasValue()) { Value v = converter.convert(fields[i].getValue()); - if (v instanceof KiWiNode) { - nodeId = ((KiWiNode) v).getId(); - } else { - throw new UnsatisfiableQueryException("the values in this query have not been created by the KiWi value factory"); - } + nodeId = ((KiWiNode) v).getId(); if (nodeId >= 0) { p.addCondition(pName + "." + positions[i] + " = " + nodeId); @@ -549,16 +545,12 @@ public class SQLBuilder { cCond.append("("); for (Iterator<Resource> it = p.getVariableContexts().iterator(); it.hasNext(); ) { Value v = converter.convert(it.next()); - if (v instanceof KiWiNode) { - long nodeId = ((KiWiNode) v).getId(); + long nodeId = ((KiWiNode) v).getId(); - cCond.append(varName).append(".context = ").append(nodeId); + cCond.append(varName).append(".context = ").append(nodeId); - if (it.hasNext()) { - cCond.append(" OR "); - } - } else { - throw new UnsatisfiableQueryException("the values in this query have not been created by the KiWi value factory"); + if (it.hasNext()) { + cCond.append(" OR "); } } @@ -683,7 +675,7 @@ public class SQLBuilder { // 3. for each variable in the initialBindings, add a condition to the where clause // list of where conditions that will later be connected by AND - List<String> whereConditions = new LinkedList<String>(); + List<String> whereConditions = new LinkedList<>(); // 1. for the first pattern of the first fragment, we add the conditions to the WHERE clause @@ -703,12 +695,7 @@ public class SQLBuilder { List<String> vNames = sv.getExpressions(); String vName = vNames.get(0); Value binding = converter.convert(bindings.getValue(v)); - if(binding instanceof KiWiNode) { - whereConditions.add(vName+" = "+((KiWiNode)binding).getId()); - } else { - throw new IllegalStateException("the values in this binding have not been created by the KiWi value factory"); - } - + whereConditions.add(vName+" = "+((KiWiNode)binding).getId()); } } } @@ -731,18 +718,18 @@ public class SQLBuilder { private StringBuilder buildHavingClause() { // list of where conditions that will later be connected by AND - List<CharSequence> havingConditions = new LinkedList<CharSequence>(); + List<CharSequence> havingConditions = new LinkedList<>(); // 1. for the first pattern of the first fragment, we add the conditions to the WHERE clause for(SQLFragment fragment : fragments) { if(fragment.getConditionPosition() == SQLFragment.ConditionPosition.HAVING) { StringBuilder conditionClause = new StringBuilder(); - for(Iterator<String> cit = fragment.getConditions().iterator(); cit.hasNext(); ) { - if(conditionClause.length() > 0) { + for (String s : fragment.getConditions()) { + if (conditionClause.length() > 0) { conditionClause.append("\n AND "); } - conditionClause.append(cit.next()); + conditionClause.append(s); } havingConditions.add(conditionClause); http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/collect/ConditionFinder.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/collect/ConditionFinder.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/collect/ConditionFinder.java index a167b51..5ca1aba 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/collect/ConditionFinder.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/collect/ConditionFinder.java @@ -32,7 +32,7 @@ public class ConditionFinder extends QueryModelVisitorBase<RuntimeException> { // indicate (if > 0) if the value of variables in recursive calls need to be retrieved because the // enclosing construct operates on values instead of nodes - int valueNeeded = 0; + private int valueNeeded = 0; // set of variables that need a value to be resolved (used by ExtensionElem resolution) private Set<String> neededVariables = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/eval/ValueExpressionEvaluator.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/eval/ValueExpressionEvaluator.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/eval/ValueExpressionEvaluator.java index 2082164..cf6df35 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/eval/ValueExpressionEvaluator.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/eval/ValueExpressionEvaluator.java @@ -197,7 +197,7 @@ public class ValueExpressionEvaluator extends QueryModelVisitorBase<RuntimeExcep gen.getNodeIdExpr().visit(this); optypes.pop(); } else { - builder.append("'").append(Long.toHexString(System.currentTimeMillis())+Integer.toHexString(anonIdGenerator.nextInt(1000))).append("'"); + builder.append("'").append(Long.toHexString(System.currentTimeMillis())).append(Integer.toHexString(anonIdGenerator.nextInt(1000))).append("'"); } } @@ -205,15 +205,11 @@ public class ValueExpressionEvaluator extends QueryModelVisitorBase<RuntimeExcep public void meet(Bound node) throws RuntimeException { ValueExpr arg = node.getArg(); - if(arg instanceof ValueConstant) { - builder.append(Boolean.toString(true)); - } else if(arg instanceof Var) { - builder.append("("); - optypes.push(ValueType.NODE); - arg.visit(this); - optypes.pop(); - builder.append(" IS NOT NULL)"); - } + builder.append("("); + optypes.push(ValueType.NODE); + arg.visit(this); + optypes.pop(); + builder.append(" IS NOT NULL)"); } @Override http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLAbstractSubquery.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLAbstractSubquery.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLAbstractSubquery.java index 106b291..6863d28 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLAbstractSubquery.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLAbstractSubquery.java @@ -109,9 +109,8 @@ public abstract class SQLAbstractSubquery extends SQLClause { VariableMapping that = (VariableMapping) o; if (!parentName.equals(that.parentName)) return false; - if (!subqueryName.equals(that.subqueryName)) return false; + return subqueryName.equals(that.subqueryName); - return true; } @Override http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLClause.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLClause.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLClause.java index 75b2a60..47c9502 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLClause.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLClause.java @@ -18,7 +18,6 @@ package org.apache.marmotta.kiwi.sparql.builder.model; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; /** @@ -72,9 +71,8 @@ public abstract class SQLClause { // previous statements StringBuilder onClause = new StringBuilder(); - for(Iterator<String> cit = conditions.iterator(); cit.hasNext(); ) { - String next = cit.next(); - if(onClause.length() > 0 && next.length() > 0) { + for (String next : conditions) { + if (onClause.length() > 0 && next.length() > 0) { onClause.append("\n AND "); } onClause.append(next); http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLFragment.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLFragment.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLFragment.java index 13b80b8..6a978a7 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLFragment.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLFragment.java @@ -112,8 +112,7 @@ public class SQLFragment extends SQLClause { // in case the pattern is the last of the fragment, also add the filter conditions of the fragment (TODO: verify this does indeed the right thing) if (conditionPosition == ConditionPosition.JOIN && !it.hasNext()) { // if this is the last pattern of the fragment, add the filter conditions - for (Iterator<String> cit = getConditions().iterator(); cit.hasNext(); ) { - String next = cit.next(); + for (String next : getConditions()) { if (conditionClause.length() > 0 && next.length() > 0) { conditionClause.append("\n AND "); } @@ -148,7 +147,7 @@ public class SQLFragment extends SQLClause { } } } else { - fromClause.append("(SELECT true) AS _EMPTY"+singletonSetGenerator.nextInt(1000)); + fromClause.append("(SELECT true) AS _EMPTY").append(singletonSetGenerator.nextInt(1000)); } return fromClause.toString(); @@ -179,9 +178,8 @@ public class SQLFragment extends SQLClause { if(conditionPosition == ConditionPosition.WHERE) { // in case the pattern is the last of the fragment, also add the filter conditions of the fragment // if this is the last pattern of the fragment, add the filter conditions - for(Iterator<String> cit = getConditions().iterator(); cit.hasNext(); ) { - String next = cit.next(); - if(conditionClause.length() > 0 && next.length() > 0) { + for (String next : getConditions()) { + if (conditionClause.length() > 0 && next.length() > 0) { conditionClause.append("\n AND "); } conditionClause.append(next); http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLPattern.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLPattern.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLPattern.java index fc84ade..4c7578e 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLPattern.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLPattern.java @@ -155,7 +155,7 @@ public class SQLPattern extends SQLClause { StringBuilder fromClause = new StringBuilder(); - fromClause.append("triples " + name); + fromClause.append("triples ").append(name); for(Map.Entry<TripleColumns,String> colEntry : joinFields.entrySet()) { @@ -163,9 +163,9 @@ public class SQLPattern extends SQLClause { String var = colEntry.getValue(); fromClause.append("\n INNER JOIN nodes AS "); - fromClause.append(name + "_" + col.getFieldName() + "_" + var); + fromClause.append(name).append("_").append(col.getFieldName()).append("_").append(var); - fromClause.append(" ON " + name + "." + col.getFieldName() + " = " + name + "_" + col.getFieldName() + "_" + var + ".id "); + fromClause.append(" ON ").append(name).append(".").append(col.getFieldName()).append(" = ").append(name).append("_").append(col.getFieldName()).append("_").append(var).append(".id "); } http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLUnion.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLUnion.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLUnion.java index de08cf2..09946ee 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLUnion.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLUnion.java @@ -164,9 +164,9 @@ public class SQLUnion extends SQLAbstractSubquery { for(VariableMapping var : getJoinFields()) { fromClause.append(" LEFT JOIN nodes AS "); // outer join because binding might be NULL - fromClause.append(alias + "_" + var.getParentName()); + fromClause.append(alias).append("_").append(var.getParentName()); - fromClause.append(" ON " + alias + "." + var.getSubqueryName() + " = " + alias + "_" + var.getParentName() + ".id "); + fromClause.append(" ON ").append(alias).append(".").append(var.getSubqueryName()).append(" = ").append(alias).append("_").append(var.getParentName()).append(".id "); } return fromClause.toString(); http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/evaluation/KiWiEvaluationStrategy.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/evaluation/KiWiEvaluationStrategy.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/evaluation/KiWiEvaluationStrategy.java index a198ebc..013f368 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/evaluation/KiWiEvaluationStrategy.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/evaluation/KiWiEvaluationStrategy.java @@ -230,7 +230,7 @@ public class KiWiEvaluationStrategy extends EvaluationStrategyImpl{ try { ResultSet result = queryFuture.get(); - ResultSetIteration<BindingSet> it = new ResultSetIteration<BindingSet>(result, true, new ResultTransformerFunction<BindingSet>() { + ResultSetIteration<BindingSet> it = new ResultSetIteration<>(result, true, new ResultTransformerFunction<BindingSet>() { @Override public BindingSet apply(ResultSet row) throws SQLException { MapBindingSet resultRow = new MapBindingSet(); @@ -238,9 +238,9 @@ public class KiWiEvaluationStrategy extends EvaluationStrategyImpl{ List<SQLVariable> vars = new ArrayList<>(builder.getVariables().values()); long[] nodeIds = new long[vars.size()]; - for(int i=0; i<vars.size(); i++) { + for (int i = 0; i < vars.size(); i++) { SQLVariable sv = vars.get(i); - if(sv.getProjectionType() == ValueType.NODE && (builder.getProjectedVars().isEmpty() + if (sv.getProjectionType() == ValueType.NODE && (builder.getProjectedVars().isEmpty() || builder.getProjectedVars().contains(sv.getSparqlName()))) { nodeIds[i] = row.getLong(sv.getName()); } @@ -249,28 +249,29 @@ public class KiWiEvaluationStrategy extends EvaluationStrategyImpl{ for (int i = 0; i < vars.size(); i++) { SQLVariable sv = vars.get(i); - if(nodes[i] != null) { + if (nodes[i] != null) { // resolved node resultRow.addBinding(sv.getSparqlName(), nodes[i]); - } else if(sv.getProjectionType() != ValueType.NONE && (builder.getProjectedVars().isEmpty() + } else if (sv.getProjectionType() != ValueType.NONE && (builder.getProjectedVars().isEmpty() || builder.getProjectedVars().contains(sv.getSparqlName()))) { // literal value String svalue; switch (sv.getProjectionType()) { case URI: svalue = row.getString(sv.getName()); - if(svalue != null) + if (svalue != null) try { resultRow.addBinding(sv.getSparqlName(), new URIImpl(svalue)); - } catch (IllegalArgumentException ex) {} // illegal URI unbound + } catch (IllegalArgumentException ex) { + } // illegal URI unbound break; case BNODE: svalue = row.getString(sv.getName()); - if(svalue != null) + if (svalue != null) resultRow.addBinding(sv.getSparqlName(), new BNodeImpl(svalue)); break; case INT: - if(row.getObject(sv.getName()) != null) { + if (row.getObject(sv.getName()) != null) { svalue = Integer.toString(row.getInt(sv.getName())); URI type = XSD.Integer; try { @@ -284,7 +285,7 @@ public class KiWiEvaluationStrategy extends EvaluationStrategyImpl{ } break; case DOUBLE: - if(row.getObject(sv.getName()) != null) { + if (row.getObject(sv.getName()) != null) { svalue = Double.toString(row.getDouble(sv.getName())); URI type = XSD.Double; try { @@ -298,7 +299,7 @@ public class KiWiEvaluationStrategy extends EvaluationStrategyImpl{ } break; case DECIMAL: - if(row.getObject(sv.getName()) != null) { + if (row.getObject(sv.getName()) != null) { svalue = row.getBigDecimal(sv.getName()).toString(); URI type = XSD.Decimal; try { @@ -312,7 +313,7 @@ public class KiWiEvaluationStrategy extends EvaluationStrategyImpl{ } break; case BOOL: - if(row.getObject(sv.getName()) != null) { + if (row.getObject(sv.getName()) != null) { svalue = Boolean.toString(row.getBoolean(sv.getName())); resultRow.addBinding(sv.getSparqlName(), new LiteralImpl(svalue.toLowerCase(), XSD.Boolean)); } @@ -321,7 +322,7 @@ public class KiWiEvaluationStrategy extends EvaluationStrategyImpl{ default: svalue = row.getString(sv.getName()); - if(svalue != null) { + if (svalue != null) { // retrieve optional type and language information, because string functions // need to preserve this in certain cases, even when constructing new literals @@ -347,7 +348,7 @@ public class KiWiEvaluationStrategy extends EvaluationStrategyImpl{ resultRow.addBinding(sv.getSparqlName(), new LiteralImpl("")); } } else if (type != null) { - if(type.stringValue().equals(XSD.String.stringValue())) { + if (type.stringValue().equals(XSD.String.stringValue())) { // string functions on other datatypes than string should yield no binding if (svalue.length() > 0) { resultRow.addBinding(sv.getSparqlName(), new LiteralImpl(svalue, type)); @@ -402,9 +403,7 @@ public class KiWiEvaluationStrategy extends EvaluationStrategyImpl{ throw new QueryEvaluationException("error executing SPARQL query", e); } } - } catch (SQLException e) { - throw new QueryEvaluationException(e); - } catch (IllegalArgumentException e) { + } catch (SQLException | IllegalArgumentException e) { throw new QueryEvaluationException(e); } catch (UnsatisfiableQueryException ex) { return new EmptyIteration<>(); http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sail/KiWiSparqlSail.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sail/KiWiSparqlSail.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sail/KiWiSparqlSail.java index ba19159..7211c60 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sail/KiWiSparqlSail.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sail/KiWiSparqlSail.java @@ -88,9 +88,8 @@ public class KiWiSparqlSail extends NotifyingSailWrapper { private void prepareFulltext(KiWiConfiguration configuration) { try { if(configuration.isFulltextEnabled()) { - KiWiConnection connection = parent.getPersistence().getConnection(); - try { - if(configuration.getDialect() instanceof PostgreSQLDialect) { + try (KiWiConnection connection = parent.getPersistence().getConnection()) { + if (configuration.getDialect() instanceof PostgreSQLDialect) { // for postgres, we need to create // - a stored procedure for mapping ISO language codes to PostgreSQL fulltext configuration names @@ -98,11 +97,11 @@ public class KiWiSparqlSail extends NotifyingSailWrapper { // an index over nodes.svalue ScriptRunner runner = new ScriptRunner(connection.getJDBCConnection(), false, false); - if(connection.getMetadata("ft.lookup") == null) { + if (connection.getMetadata("ft.lookup") == null) { log.info("PostgreSQL: creating language configuration lookup function"); StringBuilder script = new StringBuilder(); - for(String line : IOUtils.readLines(PostgreSQLDialect.class.getResourceAsStream("create_fulltext_langlookup.sql"))) { - if(!line.startsWith("--")) { + for (String line : IOUtils.readLines(PostgreSQLDialect.class.getResourceAsStream("create_fulltext_langlookup.sql"))) { + if (!line.startsWith("--")) { script.append(line); script.append(" "); } @@ -112,20 +111,20 @@ public class KiWiSparqlSail extends NotifyingSailWrapper { } // language specific indexes - if(configuration.getFulltextLanguages() != null) { + if (configuration.getFulltextLanguages() != null) { StringBuilder script = new StringBuilder(); - for(String line : IOUtils.readLines(PostgreSQLDialect.class.getResourceAsStream("create_fulltext_index.sql"))) { - if(!line.startsWith("--")) { + for (String line : IOUtils.readLines(PostgreSQLDialect.class.getResourceAsStream("create_fulltext_index.sql"))) { + if (!line.startsWith("--")) { script.append(line); script.append(" "); } } - for(String lang : configuration.getFulltextLanguages()) { - if(connection.getMetadata("ft.idx."+lang) == null) { + for (String lang : configuration.getFulltextLanguages()) { + if (connection.getMetadata("ft.idx." + lang) == null) { String pg_configuration = POSTGRES_LANG_MAPPINGS.get(lang); - if(pg_configuration != null) { + if (pg_configuration != null) { log.info("PostgreSQL: creating fulltext index for language {}", lang); - String script_lang = script.toString().replaceAll("@LANGUAGE@", lang).replaceAll("@CONFIGURATION@",pg_configuration); + String script_lang = script.toString().replaceAll("@LANGUAGE@", lang).replaceAll("@CONFIGURATION@", pg_configuration); log.debug("PostgreSQL: running SQL script '{}'", script_lang); runner.runScript(new StringReader(script_lang)); } @@ -134,11 +133,11 @@ public class KiWiSparqlSail extends NotifyingSailWrapper { } // generic index - if(configuration.getFulltextLanguages() != null) { - if(connection.getMetadata("ft.idx.generic") == null) { + if (configuration.getFulltextLanguages() != null) { + if (connection.getMetadata("ft.idx.generic") == null) { StringBuilder script = new StringBuilder(); - for(String line : IOUtils.readLines(PostgreSQLDialect.class.getResourceAsStream("create_fulltext_index_generic.sql"))) { - if(!line.startsWith("--")) { + for (String line : IOUtils.readLines(PostgreSQLDialect.class.getResourceAsStream("create_fulltext_index_generic.sql"))) { + if (!line.startsWith("--")) { script.append(line); script.append(" "); } @@ -171,8 +170,6 @@ public class KiWiSparqlSail extends NotifyingSailWrapper { } */ } - } finally { - connection.close(); } } } catch (IOException | SQLException ex) { http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-triplestore/src/ext/java/org/apache/marmotta/kiwi/persistence/util/ScriptRunner.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/ext/java/org/apache/marmotta/kiwi/persistence/util/ScriptRunner.java b/libraries/kiwi/kiwi-triplestore/src/ext/java/org/apache/marmotta/kiwi/persistence/util/ScriptRunner.java index 350d362..5faec1a 100644 --- a/libraries/kiwi/kiwi-triplestore/src/ext/java/org/apache/marmotta/kiwi/persistence/util/ScriptRunner.java +++ b/libraries/kiwi/kiwi-triplestore/src/ext/java/org/apache/marmotta/kiwi/persistence/util/ScriptRunner.java @@ -55,11 +55,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.LineNumberReader; import java.io.Reader; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.SQLException; -import java.sql.Statement; +import java.sql.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -128,9 +124,7 @@ public class ScriptRunner { } finally { connection.setAutoCommit(originalAutoCommit); } - } catch (IOException e) { - throw e; - } catch (SQLException e) { + } catch (IOException | SQLException e) { throw e; } catch (Exception e) { throw new RuntimeException("Error running script. Cause: " + e, e); @@ -230,9 +224,7 @@ public class ScriptRunner { e.printStackTrace(); } try { - if (statement != null) { - statement.close(); - } + statement.close(); } catch (Exception e) { e.printStackTrace(); // Ignore to workaround a bug in Jakarta DBCP @@ -256,12 +248,7 @@ public class ScriptRunner { if (!autoCommit) { conn.commit(); } - } catch (SQLException e) { - e.fillInStackTrace(); - printlnError("Error executing: " + command); - printlnError(e); - throw e; - } catch (IOException e) { + } catch (SQLException | IOException e) { e.fillInStackTrace(); printlnError("Error executing: " + command); printlnError(e); http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/caching/GuavaCacheManager.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/caching/GuavaCacheManager.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/caching/GuavaCacheManager.java index d60221c..472b804 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/caching/GuavaCacheManager.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/caching/GuavaCacheManager.java @@ -49,7 +49,7 @@ public class GuavaCacheManager implements CacheManager { private Cache<String,KiWiNamespace> namespaceUriCache, namespacePrefixCache; private ConcurrentHashMap<Long,Long> registryCache; - private Map<String,Cache> dynamicCaches; + private final Map<String,Cache> dynamicCaches; public GuavaCacheManager(KiWiConfiguration configuration) { http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/config/KiWiConfiguration.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/config/KiWiConfiguration.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/config/KiWiConfiguration.java index 816eed6..8b250c9 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/config/KiWiConfiguration.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/config/KiWiConfiguration.java @@ -311,7 +311,7 @@ public class KiWiConfiguration { * fulltext support, use the empty array. */ public KiWiConfiguration setFulltextLanguages(List<String> fulltextLanguages) { - this.fulltextLanguages = new ArrayList<String>(fulltextLanguages).toArray(new String[fulltextLanguages.size()]); + this.fulltextLanguages = new ArrayList<>(fulltextLanguages).toArray(new String[fulltextLanguages.size()]); return this; } http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/SnowflakeIDGenerator.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/SnowflakeIDGenerator.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/SnowflakeIDGenerator.java index f2a004b..552f9a1 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/SnowflakeIDGenerator.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/SnowflakeIDGenerator.java @@ -102,10 +102,7 @@ public class SnowflakeIDGenerator implements IDGenerator { byte rndByte = (byte)(rnd.nextInt() & 0x000000FF); // take the last byte of the MAC address and a random byte as datacenter ID - long id = ((0x000000FF & (long)mac[mac.length-1]) | (0x0000FF00 & (((long)rndByte)<<8)))>>6; - - - return id; + return ((0x000000FF & (long)mac[mac.length-1]) | (0x0000FF00 & (((long)rndByte)<<8)))>>6; } http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiDoubleLiteral.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiDoubleLiteral.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiDoubleLiteral.java index 22e64e8..cd0401f 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiDoubleLiteral.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiDoubleLiteral.java @@ -86,7 +86,7 @@ public class KiWiDoubleLiteral extends KiWiStringLiteral { */ @Override public double doubleValue() { - return getDoubleContent().doubleValue(); + return getDoubleContent(); } http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiIntLiteral.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiIntLiteral.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiIntLiteral.java index 20aadd3..2cf9e66 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiIntLiteral.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiIntLiteral.java @@ -108,6 +108,6 @@ public class KiWiIntLiteral extends KiWiDoubleLiteral { */ @Override public long longValue() { - return getIntContent().longValue(); + return getIntContent(); } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java index 987c9d2..22794c4 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java @@ -165,9 +165,8 @@ public abstract class KiWiLiteral extends KiWiNode implements Literal { // getDatatype should never be null, this is only for legacy support if(this.getDatatype()==null && that.getDatatype()!=null) return false; - if(this.getDatatype() != null && !this.getDatatype().equals(that.getDatatype())) return false; + return !(this.getDatatype() != null && !this.getDatatype().equals(that.getDatatype())); - return true; } return false; http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiNamespace.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiNamespace.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiNamespace.java index 8432de6..e1dc6e6 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiNamespace.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiNamespace.java @@ -146,9 +146,8 @@ public class KiWiNamespace implements Namespace, Serializable { if (deleted != that.deleted) return false; if (prefix != null ? !prefix.equals(that.prefix) : that.prefix != null) return false; - if (uri != null ? !uri.equals(that.uri) : that.uri != null) return false; + return uri != null ? uri.equals(that.uri) : that.uri == null; - return true; } @Override
