Repository: marmotta Updated Branches: refs/heads/develop 377077856 -> e5ee6af11
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java index 79d9934..77110d8 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java @@ -654,13 +654,10 @@ public class KiWiConnection implements AutoCloseable { query = getPreparedStatement("load.literal_by_vl"); query.setString(1,value); query.setString(2, lang); - } else if(ltype != null) { + } else { query = getPreparedStatement("load.literal_by_vt"); query.setString(1,value); query.setLong(2,ltype.getId()); - } else { - // This cannot happen... - throw new IllegalArgumentException("Impossible combination of lang/type in loadLiteral!"); } // run the database query and if it yields a result, construct a new node; the method call will take care of @@ -1935,8 +1932,8 @@ public class KiWiConnection implements AutoCloseable { KiWiNode[] nodes = loadNodesByIds(Longs.toArray(nodeIds)); Map<Long,KiWiNode> nodeMap = new HashMap<>(nodes.length << 1); - for (int i=0; i<nodes.length; i++) { - nodeMap.put(nodes[i].getId(), nodes[i]); + for (KiWiNode node : nodes) { + nodeMap.put(node.getId(), node); } for (KiWiTriple t : result) { @@ -2044,7 +2041,7 @@ public class KiWiConnection implements AutoCloseable { * @return a new sequence ID * @throws SQLException */ - public long getNextSequence() throws SQLException { + public long getNextSequence() { return persistence.getIdGenerator().getId(); } @@ -2212,11 +2209,9 @@ public class KiWiConnection implements AutoCloseable { * * @return the current state of this <code>Connection</code> object's * auto-commit mode - * @exception java.sql.SQLException if a database access error occurs - * or this method is called on a closed connection * @see #setAutoCommit */ - public boolean getAutoCommit() throws SQLException { + public boolean getAutoCommit() { return autoCommit; } http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiGarbageCollector.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiGarbageCollector.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiGarbageCollector.java index f6a2225..b2d53e0 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiGarbageCollector.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiGarbageCollector.java @@ -374,9 +374,8 @@ public class KiWiGarbageCollector extends Thread { TableDependency that = (TableDependency) o; if (!column.equals(that.column)) return false; - if (!table.equals(that.table)) return false; + return table.equals(that.table); - return true; } @Override http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/h2/H2Dialect.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/h2/H2Dialect.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/h2/H2Dialect.java index fc0027a..a6cb562 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/h2/H2Dialect.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/h2/H2Dialect.java @@ -74,11 +74,8 @@ public class H2Dialect extends KiWiDialect { if(StringUtils.containsIgnoreCase(flags,"m")) { return false; } - if(StringUtils.containsIgnoreCase(flags,"x")) { - return false; - } + return !StringUtils.containsIgnoreCase(flags, "x"); - return true; } @Override http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/pgsql/PostgreSQLDialect.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/pgsql/PostgreSQLDialect.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/pgsql/PostgreSQLDialect.java index e193274..7fc242c 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/pgsql/PostgreSQLDialect.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/pgsql/PostgreSQLDialect.java @@ -78,11 +78,8 @@ public class PostgreSQLDialect extends KiWiDialect { if(StringUtils.containsIgnoreCase(flags,"m")) { return false; } - if(StringUtils.containsIgnoreCase(flags,"x")) { - return false; - } + return !StringUtils.containsIgnoreCase(flags, "x"); - return true; } @Override http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiSailConnection.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiSailConnection.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiSailConnection.java index ecedf09..d93ac61 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiSailConnection.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiSailConnection.java @@ -131,7 +131,7 @@ public class KiWiSailConnection extends NotifyingSailConnectionBase implements I public Set<KiWiTriple> addStatementInternal(Resource subj, URI pred, Value obj, boolean inferred, Resource... contexts) throws SailException { try { - Set<Resource> contextSet = new HashSet<Resource>(); + Set<Resource> contextSet = new HashSet<>(); for(Resource ctx : contexts) { if(ctx != null) { contextSet.add(ctx); @@ -148,7 +148,7 @@ public class KiWiSailConnection extends NotifyingSailConnectionBase implements I contextSet.add(valueFactory.createURI(inferredContext)); } - Set<KiWiTriple> added = new HashSet<KiWiTriple>(); + Set<KiWiTriple> added = new HashSet<>(); for(Resource context : contextSet) { KiWiResource kcontext = valueFactory.convert(context); @@ -254,7 +254,7 @@ public class KiWiSailConnection extends NotifyingSailConnectionBase implements I final KiWiUriResource rpred = valueFactory.convert(pred); final KiWiNode robj = valueFactory.convert(obj); - Set<KiWiResource> contextSet = new HashSet<KiWiResource>(); + Set<KiWiResource> contextSet = new HashSet<>(); contextSet.addAll(Lists.transform(Arrays.asList(contexts), new Function<Resource, KiWiResource>() { @Override public KiWiResource apply(Resource input) { @@ -262,7 +262,7 @@ public class KiWiSailConnection extends NotifyingSailConnectionBase implements I } })); - Set<DelayedIteration<Statement,RepositoryException>> iterations = new HashSet<DelayedIteration<Statement, RepositoryException>>(); + Set<DelayedIteration<Statement,RepositoryException>> iterations = new HashSet<>(); if(contextSet.size() > 0) { for(final KiWiResource context : contextSet) { iterations.add(new DelayedIteration<Statement, RepositoryException>() { @@ -652,7 +652,7 @@ public class KiWiSailConnection extends NotifyingSailConnectionBase implements I @Override public RepositoryResult<Resource> getResources() throws RepositoryException { try { - return new RepositoryResult<Resource>(new ExceptionConvertingIteration<Resource,RepositoryException>(databaseConnection.listResources()) { + return new RepositoryResult<>(new ExceptionConvertingIteration<Resource, RepositoryException>(databaseConnection.listResources()) { @Override protected RepositoryException convert(Exception e) { return new RepositoryException(e); @@ -671,7 +671,7 @@ public class KiWiSailConnection extends NotifyingSailConnectionBase implements I @Override public RepositoryResult<URI> getResources(String prefix) throws RepositoryException { try { - return new RepositoryResult<URI>(new ExceptionConvertingIteration<URI,RepositoryException>(databaseConnection.listResources(prefix)) { + return new RepositoryResult<>(new ExceptionConvertingIteration<URI, RepositoryException>(databaseConnection.listResources(prefix)) { @Override protected RepositoryException convert(Exception e) { return new RepositoryException(e); http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java index dda62a7..e866ccd 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java @@ -51,7 +51,7 @@ public class KiWiValueFactory implements ValueFactory { private KiWiStore store; - private KiWiTripleRegistry registry; + private final KiWiTripleRegistry registry; private String defaultContext; @@ -303,10 +303,10 @@ public class KiWiValueFactory implements ValueFactory { // differentiate between the different types of the value if (type == null) { // FIXME: MARMOTTA-39 (this is to avoid a NullPointerException in the following if-clauses) - result = connection.loadLiteral(value.toString(), lang, rtype); + result = connection.loadLiteral(value.toString(), lang, null); if(result == null) { - result = new KiWiStringLiteral(value.toString(), locale, rtype); + result = new KiWiStringLiteral(value.toString(), locale, null); } } else if(value instanceof Date || value instanceof DateTime || type.equals(Namespaces.NS_XSD+"dateTime") || type.equals(Namespaces.NS_XSD+"date") || http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/persistence/KiWiVersioningConnection.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/persistence/KiWiVersioningConnection.java b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/persistence/KiWiVersioningConnection.java index cd44bd9..0f8625b 100644 --- a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/persistence/KiWiVersioningConnection.java +++ b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/persistence/KiWiVersioningConnection.java @@ -653,7 +653,7 @@ public class KiWiVersioningConnection extends KiWiConnection { public long getSnapshotSize(KiWiResource context, Date snapshotDate) throws SQLException { if(context.getId() < 0) { return 0; - }; + } requireJDBCConnection(); http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiSnapshotConnection.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiSnapshotConnection.java b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiSnapshotConnection.java index ba265ce..28b12d4 100644 --- a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiSnapshotConnection.java +++ b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiSnapshotConnection.java @@ -20,23 +20,14 @@ package org.apache.marmotta.kiwi.versioning.sail; import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import info.aduna.iteration.CloseableIteration; -import info.aduna.iteration.DelayedIteration; -import info.aduna.iteration.ExceptionConvertingIteration; -import info.aduna.iteration.Iteration; -import info.aduna.iteration.UnionIteration; +import info.aduna.iteration.*; import org.apache.marmotta.kiwi.model.rdf.KiWiNamespace; import org.apache.marmotta.kiwi.model.rdf.KiWiNode; import org.apache.marmotta.kiwi.model.rdf.KiWiResource; import org.apache.marmotta.kiwi.model.rdf.KiWiUriResource; import org.apache.marmotta.kiwi.sail.KiWiValueFactory; import org.apache.marmotta.kiwi.versioning.persistence.KiWiVersioningConnection; -import org.openrdf.model.Namespace; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; +import org.openrdf.model.*; import org.openrdf.query.BindingSet; import org.openrdf.query.Dataset; import org.openrdf.query.QueryEvaluationException; @@ -49,11 +40,7 @@ import org.openrdf.query.algebra.evaluation.EvaluationStrategy; import org.openrdf.query.algebra.evaluation.TripleSource; import org.openrdf.query.algebra.evaluation.impl.*; import org.openrdf.repository.RepositoryException; -import org.openrdf.sail.SailConnection; -import org.openrdf.sail.SailException; -import org.openrdf.sail.SailReadOnlyException; -import org.openrdf.sail.UnknownSailTransactionStateException; -import org.openrdf.sail.UpdateContext; +import org.openrdf.sail.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -173,7 +160,7 @@ public class KiWiSnapshotConnection implements SailConnection { final KiWiUriResource rpred = valueFactory.convert(pred); final KiWiNode robj = valueFactory.convert(obj); - Set<KiWiResource> contextSet = new HashSet<KiWiResource>(); + Set<KiWiResource> contextSet = new HashSet<>(); contextSet.addAll(Lists.transform(Arrays.asList(contexts), new Function<Resource, KiWiResource>() { @Override public KiWiResource apply(Resource input) { @@ -181,7 +168,7 @@ public class KiWiSnapshotConnection implements SailConnection { } })); - Set<DelayedIteration<Statement,RepositoryException>> iterations = new HashSet<DelayedIteration<Statement, RepositoryException>>(); + Set<DelayedIteration<Statement,RepositoryException>> iterations = new HashSet<>(); if(contextSet.size() > 0) { for(final KiWiResource context : contextSet) { iterations.add(new DelayedIteration<Statement, RepositoryException>() { @@ -209,7 +196,7 @@ public class KiWiSnapshotConnection implements SailConnection { } - return new UnionIteration<Statement, SailException>( + return new UnionIteration<>( Iterables.transform(iterations, new Function<DelayedIteration<Statement, RepositoryException>, Iteration<? extends Statement, SailException>>() { @Override public Iteration<? extends Statement, SailException> apply(DelayedIteration<Statement, RepositoryException> input) { http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5ee6af1/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiVersioningSail.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiVersioningSail.java b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiVersioningSail.java index 349e299..fb1b184 100644 --- a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiVersioningSail.java +++ b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiVersioningSail.java @@ -34,7 +34,6 @@ import org.openrdf.model.Statement; import org.openrdf.model.URI; import org.openrdf.repository.RepositoryException; import org.openrdf.repository.RepositoryResult; -import org.openrdf.repository.sail.SailRepositoryConnection; import org.openrdf.sail.SailConnection; import org.openrdf.sail.SailException; import org.openrdf.sail.StackableSail; @@ -70,7 +69,7 @@ public class KiWiVersioningSail extends TransactionalSailWrapper implements Tran private KiWiVersioningPersistence persistence; - private Set<KiWiSnapshotConnection> activeSnapshots; + private final Set<KiWiSnapshotConnection> activeSnapshots; private SesameFilter<Statement> filter; @@ -104,7 +103,7 @@ public class KiWiVersioningSail extends TransactionalSailWrapper implements Tran public KiWiVersioningSail(TransactionalSail parent, SesameFilter<Statement> filter) { super(parent); this.persistence = new KiWiVersioningPersistence(getBaseStore().getPersistence()); - this.activeSnapshots = new HashSet<KiWiSnapshotConnection>(); + this.activeSnapshots = new HashSet<>(); this.filter = filter; parent.addTransactionListener(this); @@ -327,12 +326,9 @@ public class KiWiVersioningSail extends TransactionalSailWrapper implements Tran */ public void removeVersion(Long id) throws SailException { try { - final KiWiVersioningConnection connection = persistence.getConnection(); - try { + try (KiWiVersioningConnection connection = persistence.getConnection()) { connection.removeVersion(id); connection.commit(); - } finally { - connection.close(); } } catch(SQLException ex) { @@ -349,12 +345,9 @@ public class KiWiVersioningSail extends TransactionalSailWrapper implements Tran */ public void removeVersions(Date until) throws SailException { try { - final KiWiVersioningConnection connection = persistence.getConnection(); - try { + try (KiWiVersioningConnection connection = persistence.getConnection()) { connection.removeVersions(until); connection.commit(); - } finally { - connection.close(); } } catch(SQLException ex) { @@ -373,12 +366,9 @@ public class KiWiVersioningSail extends TransactionalSailWrapper implements Tran */ public void removeVersions(Date from, Date to) throws SailException { try { - final KiWiVersioningConnection connection = persistence.getConnection(); - try { + try (KiWiVersioningConnection connection = persistence.getConnection()) { connection.removeVersions(from, to); connection.commit(); - } finally { - connection.close(); } } catch(SQLException ex) { @@ -516,7 +506,7 @@ public class KiWiVersioningSail extends TransactionalSailWrapper implements Tran } // create a copy of the set and rollback-close all active connections - HashSet<KiWiSnapshotConnection> connectionCopy = new HashSet<KiWiSnapshotConnection>(activeSnapshots); + HashSet<KiWiSnapshotConnection> connectionCopy = new HashSet<>(activeSnapshots); for(KiWiSnapshotConnection con : connectionCopy) { if(con.isActive()) { con.rollback();
