Some minor formatting and imports fixes
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/ea3f3a6f Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/ea3f3a6f Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/ea3f3a6f Branch: refs/heads/develop Commit: ea3f3a6f249fff63dd89103a26be503bcbb9edde Parents: 9f946d9 Author: Paul Merlin <[email protected]> Authored: Sun Sep 11 18:15:49 2016 -0700 Committer: Paul Merlin <[email protected]> Committed: Sun Sep 11 18:15:49 2016 -0700 ---------------------------------------------------------------------- build.gradle | 2 +- .../apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java | 3 --- .../zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java | 2 +- .../zest/library/sql/datasource/ExternalDataSourceTest.java | 2 +- manual/src/docs/tutorials/howto-build-system.txt | 2 +- 5 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/ea3f3a6f/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 73c8e39..56c4c4f 100644 --- a/build.gradle +++ b/build.gradle @@ -1020,7 +1020,7 @@ task checkReleaseSpec { def notReleasable = [:] releaseApprovedProjects*.configurations.runtime.allDependencies.findAll({ it instanceof ProjectDependency }).each { dep -> def depNotReleaseApproved = releaseApprovedProjects.findAll { rp -> - rp.group == dep.dependencyProject.group && rp.name == dep.dependencyProject.name + rp.group == dep.dependencyProject.group && rp.name == dep.dependencyProject.name }.isEmpty() if( depNotReleaseApproved ) { http://git-wip-us.apache.org/repos/asf/zest-java/blob/ea3f3a6f/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java b/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java index 96c2982..0d0cbff 100644 --- a/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java +++ b/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java @@ -19,15 +19,12 @@ */ package org.apache.zest.index.rdf.query.internal; -import java.text.DateFormat; -import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import java.util.TimeZone; import java.util.function.Predicate; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.zest.api.composite.Composite; http://git-wip-us.apache.org/repos/asf/zest-java/blob/ea3f3a6f/libraries/sql-dbcp/src/main/java/org/apache/zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java ---------------------------------------------------------------------- diff --git a/libraries/sql-dbcp/src/main/java/org/apache/zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java b/libraries/sql-dbcp/src/main/java/org/apache/zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java index 86daca4..2ee64c3 100644 --- a/libraries/sql-dbcp/src/main/java/org/apache/zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java +++ b/libraries/sql-dbcp/src/main/java/org/apache/zest/library/sql/dbcp/DBCPDataSourceServiceImporter.java @@ -35,7 +35,7 @@ public interface DBCPDataSourceServiceImporter extends ServiceImporter<DataSource>, DataSourceServiceImporterActivation, ServiceComposite { - public static class Mixin + class Mixin extends AbstractDataSourceServiceImporterMixin<BasicDataSource> { http://git-wip-us.apache.org/repos/asf/zest-java/blob/ea3f3a6f/libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java ---------------------------------------------------------------------- diff --git a/libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java b/libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java index 749d1bb..e49a61e 100644 --- a/libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java +++ b/libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java @@ -23,13 +23,13 @@ import java.sql.Connection; import java.sql.SQLException; import javax.sql.DataSource; import org.apache.commons.dbcp2.BasicDataSource; -import org.junit.Test; import org.apache.zest.api.common.Visibility; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; import org.apache.zest.library.sql.assembly.ExternalDataSourceAssembler; import org.apache.zest.library.sql.common.SQLUtil; import org.apache.zest.test.AbstractZestTest; +import org.junit.Test; public class ExternalDataSourceTest extends AbstractZestTest http://git-wip-us.apache.org/repos/asf/zest-java/blob/ea3f3a6f/manual/src/docs/tutorials/howto-build-system.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-build-system.txt b/manual/src/docs/tutorials/howto-build-system.txt index f75999d..2af9cbf 100644 --- a/manual/src/docs/tutorials/howto-build-system.txt +++ b/manual/src/docs/tutorials/howto-build-system.txt @@ -151,7 +151,7 @@ We'll list here services that the unit tests will use if available. - Memcached, ASCII protocol, no authentication on +localhost:4444+ for +extensions/cache-memcache+ - MongoDB without authentication on +localhost:27017+ for +extensions/entitystore-mongodb+ -- Riak without authentication on +localhost:4444+ for +extensions/entitystore-riak+ +- Riak without authentication on +localhost:8087+ for +extensions/entitystore-riak+ - Redis without authentication on +localhost:4444+ for +extensions/entitystore-redis+ - PostgreSQL for +extensions/entitystore-sql+ and +extensions/indexing-sql+ (need setup, see test source) - MySQL for +extensions/entitystore-sql+ (need setup, see test source)
