Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BFA8C200CB1 for ; Tue, 16 May 2017 20:50:56 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BE531160BC1; Tue, 16 May 2017 18:50:56 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8A965160BDC for ; Tue, 16 May 2017 20:50:54 +0200 (CEST) Received: (qmail 1182 invoked by uid 500); 16 May 2017 18:50:53 -0000 Mailing-List: contact commits-help@polygene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@polygene.apache.org Delivered-To: mailing list commits@polygene.apache.org Received: (qmail 935 invoked by uid 99); 16 May 2017 18:50:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 May 2017 18:50:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 87171E038B; Tue, 16 May 2017 18:50:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: paulmerlin@apache.org To: commits@polygene.apache.org Date: Tue, 16 May 2017 18:51:08 -0000 Message-Id: In-Reply-To: <68236d0633fc4adcbf189c348ad880b6@git.apache.org> References: <68236d0633fc4adcbf189c348ad880b6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/50] [abbrv] polygene-java git commit: :extensions:indexing-rdf refine archived-at: Tue, 16 May 2017 18:50:57 -0000 :extensions:indexing-rdf refine Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/452320f3 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/452320f3 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/452320f3 Branch: refs/heads/master Commit: 452320f39644aecbd10a43a9fb4ac0bb42ba02bc Parents: fd52a06 Author: Paul Merlin Authored: Mon May 15 11:14:55 2017 +0200 Committer: Paul Merlin Committed: Mon May 15 11:14:55 2017 +0200 ---------------------------------------------------------------------- .../org/apache/polygene/index/rdf/RdfIndexingEngineService.java | 3 +-- .../rdf/query/CollectingQualifiedIdentityResultCallback.java | 2 +- .../apache/polygene/index/rdf/query/RdfQueryParserFactory.java | 2 -- .../org/apache/polygene/index/rdf/query/RdfQueryService.java | 5 ++--- .../apache/polygene/index/rdf/query/internal/Namespaces.java | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/452320f3/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/RdfIndexingEngineService.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/RdfIndexingEngineService.java b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/RdfIndexingEngineService.java index 34bc334..089c255 100644 --- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/RdfIndexingEngineService.java +++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/RdfIndexingEngineService.java @@ -20,12 +20,11 @@ package org.apache.polygene.index.rdf; -import org.apache.polygene.api.service.ServiceComposite; import org.apache.polygene.index.rdf.indexing.RdfExporter; import org.apache.polygene.index.rdf.indexing.RdfIndexingService; import org.apache.polygene.index.rdf.query.RdfQueryService; public interface RdfIndexingEngineService - extends RdfQueryService, RdfIndexingService, RdfExporter, ServiceComposite + extends RdfQueryService, RdfIndexingService, RdfExporter { } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/452320f3/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/CollectingQualifiedIdentityResultCallback.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/CollectingQualifiedIdentityResultCallback.java b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/CollectingQualifiedIdentityResultCallback.java index 1f384f0..c77f471 100644 --- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/CollectingQualifiedIdentityResultCallback.java +++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/CollectingQualifiedIdentityResultCallback.java @@ -27,7 +27,7 @@ import org.apache.polygene.api.entity.EntityReference; public class CollectingQualifiedIdentityResultCallback implements QualifiedIdentityResultCallback { - private final Collection entities = new ArrayList(); + private final Collection entities = new ArrayList<>(); @Override public boolean processRow( long row, EntityReference entityReference ) http://git-wip-us.apache.org/repos/asf/polygene-java/blob/452320f3/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/RdfQueryParserFactory.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/RdfQueryParserFactory.java b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/RdfQueryParserFactory.java index b317c48..ab7d1e1 100644 --- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/RdfQueryParserFactory.java +++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/RdfQueryParserFactory.java @@ -23,7 +23,6 @@ package org.apache.polygene.index.rdf.query; import org.apache.polygene.api.injection.scope.Service; import org.apache.polygene.api.injection.scope.Structure; import org.apache.polygene.api.mixin.Mixins; -import org.apache.polygene.api.service.ServiceComposite; import org.apache.polygene.index.rdf.UnsupportedLanguageException; import org.apache.polygene.index.rdf.query.internal.RdfQueryParserImpl; import org.apache.polygene.spi.PolygeneSPI; @@ -32,7 +31,6 @@ import org.openrdf.query.QueryLanguage; @Mixins( RdfQueryParserFactory.RdfQueryParserFactoryMixin.class ) public interface RdfQueryParserFactory - extends ServiceComposite { RdfQueryParser newQueryParser( QueryLanguage language ); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/452320f3/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/RdfQueryService.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/RdfQueryService.java b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/RdfQueryService.java index cfac402..7c3fdf7 100644 --- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/RdfQueryService.java +++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/RdfQueryService.java @@ -31,7 +31,6 @@ import org.apache.polygene.api.injection.scope.This; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.api.query.grammar.OrderBy; import org.apache.polygene.api.query.grammar.QuerySpecification; -import org.apache.polygene.api.service.ServiceComposite; import org.apache.polygene.spi.query.EntityFinder; import org.apache.polygene.spi.query.EntityFinderException; import org.openrdf.query.QueryLanguage; @@ -41,12 +40,12 @@ import org.openrdf.query.QueryLanguage; */ @Mixins( { RdfQueryService.RdfEntityFinderMixin.class } ) public interface RdfQueryService - extends EntityFinder, RdfQueryParserFactory, ServiceComposite + extends EntityFinder, RdfQueryParserFactory { /** * JAVADOC Add JavaDoc */ - public static class RdfEntityFinderMixin + class RdfEntityFinderMixin implements EntityFinder { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/452320f3/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/internal/Namespaces.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/internal/Namespaces.java b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/internal/Namespaces.java index 25d0343..47527fa 100644 --- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/internal/Namespaces.java +++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/internal/Namespaces.java @@ -31,7 +31,7 @@ public class Namespaces /** * Mapping between namespace and prefix. */ - private final Map namespaces = new HashMap(); + private final Map namespaces = new HashMap<>(); public Namespaces() {