polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From paulmer...@apache.org
Subject [34/50] polygene-java git commit: :extensions:indexing-solr refine
Date Mon, 15 May 2017 11:03:39 GMT
:extensions:indexing-solr 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/fd52a06a
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/fd52a06a
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/fd52a06a

Branch: refs/heads/develop
Commit: fd52a06ace923f405c2f709e75d840b6341a6172
Parents: fc8d574
Author: Paul Merlin <paulmerlin@apache.org>
Authored: Mon May 15 11:13:02 2017 +0200
Committer: Paul Merlin <paulmerlin@apache.org>
Committed: Mon May 15 11:13:02 2017 +0200

----------------------------------------------------------------------
 .../org/apache/polygene/index/solr/EmbeddedSolrService.java    | 5 ++---
 .../java/org/apache/polygene/index/solr/SolrQueryService.java  | 3 +--
 .../main/java/org/apache/polygene/index/solr/SolrSearch.java   | 2 +-
 .../polygene/index/solr/internal/SolrEntityQueryMixin.java     | 6 +++---
 4 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/polygene-java/blob/fd52a06a/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/EmbeddedSolrService.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/EmbeddedSolrService.java
b/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/EmbeddedSolrService.java
index 57d1e6c..29653a3 100644
--- a/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/EmbeddedSolrService.java
+++ b/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/EmbeddedSolrService.java
@@ -31,14 +31,13 @@ import org.apache.polygene.api.activation.Activators;
 import org.apache.polygene.api.injection.scope.Service;
 import org.apache.polygene.api.injection.scope.Uses;
 import org.apache.polygene.api.mixin.Mixins;
-import org.apache.polygene.api.service.ServiceComposite;
 import org.apache.polygene.api.service.ServiceDescriptor;
 import org.apache.polygene.api.service.ServiceReference;
 import org.apache.polygene.library.fileconfig.FileConfiguration;
 
 @Mixins( EmbeddedSolrService.Mixin.class )
 @Activators( EmbeddedSolrService.Activator.class )
-public interface EmbeddedSolrService extends ServiceComposite
+public interface EmbeddedSolrService
 {
    SolrServer solrServer();
 
@@ -91,7 +90,7 @@ public interface EmbeddedSolrService extends ServiceComposite
          try
          {
             File directory = new File( fileConfig.dataDirectory(), descriptor.identity().toString()
);
-            directory.mkdir();
+            directory.mkdirs();
 
             System.setProperty( "solr.solr.home", directory.getAbsolutePath() );
 

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/fd52a06a/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/SolrQueryService.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/SolrQueryService.java
b/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/SolrQueryService.java
index 0f75fb0..445f7ea 100644
--- a/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/SolrQueryService.java
+++ b/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/SolrQueryService.java
@@ -22,7 +22,6 @@ package org.apache.polygene.index.solr;
 import org.apache.polygene.api.activation.ActivatorAdapter;
 import org.apache.polygene.api.activation.Activators;
 import org.apache.polygene.api.mixin.Mixins;
-import org.apache.polygene.api.service.ServiceComposite;
 import org.apache.polygene.api.service.ServiceReference;
 import org.apache.polygene.index.solr.internal.SolrEntityIndexerMixin;
 import org.apache.polygene.index.solr.internal.SolrEntityQueryMixin;
@@ -35,7 +34,7 @@ import org.apache.polygene.spi.query.EntityFinder;
 @Mixins( { SolrEntityIndexerMixin.class, SolrEntityQueryMixin.class } )
 @Activators( SolrQueryService.Activator.class )
 public interface SolrQueryService
-        extends EntityFinder, StateChangeListener, SolrSearch, ServiceComposite
+        extends EntityFinder, StateChangeListener, SolrSearch
 {
 
     void inflateSolrSchema();

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/fd52a06a/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/SolrSearch.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/SolrSearch.java
b/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/SolrSearch.java
index f398bad..8f25cfe 100644
--- a/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/SolrSearch.java
+++ b/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/SolrSearch.java
@@ -28,5 +28,5 @@ import org.apache.solr.common.SolrDocumentList;
  */
 public interface SolrSearch
 {
-   public SolrDocumentList search( String queryString ) throws SolrServerException;
+   SolrDocumentList search( String queryString ) throws SolrServerException;
 }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/fd52a06a/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/internal/SolrEntityQueryMixin.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/internal/SolrEntityQueryMixin.java
b/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/internal/SolrEntityQueryMixin.java
index 840ae70..bbad9a6 100644
--- a/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/internal/SolrEntityQueryMixin.java
+++ b/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/internal/SolrEntityQueryMixin.java
@@ -71,7 +71,7 @@ public class SolrEntityQueryMixin
 
             SolrServer server = solr.solrServer();
 
-            NamedList<Object> list = new NamedList<Object>();
+            NamedList<Object> list = new NamedList<>();
 
             list.add( "q", expr.query() );
             list.add( "rows", maxResults != 0 ? maxResults : 10000 );
@@ -95,7 +95,7 @@ public class SolrEntityQueryMixin
 
             SolrDocumentList results = query.getResults();
 
-            List<EntityReference> references = new ArrayList<EntityReference>(
results.size() );
+            List<EntityReference> references = new ArrayList<>( results.size()
);
             for( SolrDocument result : results )
             {
                 references.add( EntityReference.parseEntityReference( result.getFirstValue(
"id" ).toString() ) );
@@ -127,7 +127,7 @@ public class SolrEntityQueryMixin
     {
         SolrServer server = solr.solrServer();
 
-        NamedList<Object> list = new NamedList<Object>();
+        NamedList<Object> list = new NamedList<>();
 
         list.add( "q", queryString );
 


Mime
View raw message