polygene-commits mailing list archives

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

Branch: refs/heads/develop
Commit: c0fefa78cb2698af2e8fb5da3e52b34bf7ffcfa4
Parents: 50448c1
Author: Paul Merlin <paulmerlin@apache.org>
Authored: Mon May 15 10:41:04 2017 +0200
Committer: Paul Merlin <paulmerlin@apache.org>
Committed: Mon May 15 10:41:04 2017 +0200

----------------------------------------------------------------------
 .../org/apache/polygene/library/rdf/model/Model2XML.java |  4 ++--
 .../rdf/repository/HttpRepositoryConfiguration.java      |  2 --
 .../library/rdf/repository/HttpRepositoryService.java    |  7 +++----
 .../library/rdf/repository/MemoryRepositoryService.java  |  7 +++----
 .../library/rdf/repository/NativeRepositoryService.java  |  3 +--
 .../library/rdf/repository/RdbmsRepositoryService.java   | 11 +++++------
 6 files changed, 14 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c0fefa78/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/model/Model2XML.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/model/Model2XML.java
b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/model/Model2XML.java
index 7fa79c5..f9cb7ec 100644
--- a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/model/Model2XML.java
+++ b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/model/Model2XML.java
@@ -45,7 +45,7 @@ import org.w3c.dom.Node;
 public class Model2XML
     implements Function<ApplicationDescriptor, Document>
 {
-    private static Map<String, String> simpleMappings = new HashMap<String, String>();
+    private static Map<String, String> simpleMappings = new HashMap<>();
 
     static
     {
@@ -69,7 +69,7 @@ public class Model2XML
             DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
             final Document document = builder.newDocument();
 
-            final Stack<Node> current = new Stack<Node>();
+            final Stack<Node> current = new Stack<>();
             current.push( document );
 
             application.accept( new HierarchicalVisitor<Object, Object, DOMException>()

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c0fefa78/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/HttpRepositoryConfiguration.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/HttpRepositoryConfiguration.java
b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/HttpRepositoryConfiguration.java
index f57a1f2..b1de8af 100644
--- a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/HttpRepositoryConfiguration.java
+++ b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/HttpRepositoryConfiguration.java
@@ -21,14 +21,12 @@
 package org.apache.polygene.library.rdf.repository;
 
 import org.apache.polygene.api.common.Optional;
-import org.apache.polygene.api.configuration.ConfigurationComposite;
 import org.apache.polygene.api.property.Property;
 
 /**
  * JAVADOC Add JavaDoc
  */
 public interface HttpRepositoryConfiguration
-    extends ConfigurationComposite
 {
     /**
      * The URL of the remote Sesame HTTP Repository.

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c0fefa78/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/HttpRepositoryService.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/HttpRepositoryService.java
b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/HttpRepositoryService.java
index 4cf3b0b..9005066 100644
--- a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/HttpRepositoryService.java
+++ b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/HttpRepositoryService.java
@@ -29,13 +29,12 @@ import org.apache.polygene.api.configuration.Configuration;
 import org.apache.polygene.api.injection.scope.This;
 import org.apache.polygene.api.mixin.Mixins;
 import org.apache.polygene.api.property.Property;
-import org.apache.polygene.api.service.ServiceComposite;
 import org.apache.polygene.api.service.ServiceReference;
 
 @Mixins( HttpRepositoryService.HttpRepositoryMixin.class )
 @Activators( HttpRepositoryService.Activator.class )
 public interface HttpRepositoryService
-    extends Repository, ServiceComposite
+    extends Repository
 {
     @Override
     void initialize()
@@ -45,7 +44,7 @@ public interface HttpRepositoryService
     void shutDown()
             throws RepositoryException;
 
-    public static class Activator
+    class Activator
             extends ActivatorAdapter<ServiceReference<HttpRepositoryService>>
     {
 
@@ -65,7 +64,7 @@ public interface HttpRepositoryService
 
     }
 
-    public static class HttpRepositoryMixin
+    class HttpRepositoryMixin
         extends HTTPRepository
         implements Repository
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c0fefa78/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/MemoryRepositoryService.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/MemoryRepositoryService.java
b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/MemoryRepositoryService.java
index a84d1be..c30c39f 100644
--- a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/MemoryRepositoryService.java
+++ b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/MemoryRepositoryService.java
@@ -30,13 +30,12 @@ import org.openrdf.sail.memory.MemoryStore;
 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;
 
 @Mixins( MemoryRepositoryService.MemoryRepositoryMixin.class )
 @Activators( MemoryRepositoryService.Activator.class )
 public interface MemoryRepositoryService
-    extends Repository, ServiceComposite
+    extends Repository
 {
 
     @Override
@@ -47,7 +46,7 @@ public interface MemoryRepositoryService
     void shutDown()
         throws RepositoryException;
 
-    public static class Activator
+    class Activator
         extends ActivatorAdapter<ServiceReference<MemoryRepositoryService>>
     {
 
@@ -66,7 +65,7 @@ public interface MemoryRepositoryService
         }
     }
 
-    public static abstract class MemoryRepositoryMixin
+    abstract class MemoryRepositoryMixin
         implements MemoryRepositoryService, ResetableRepository
     {
 

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c0fefa78/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/NativeRepositoryService.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/NativeRepositoryService.java
b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/NativeRepositoryService.java
index 28ac523..18643bd 100644
--- a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/NativeRepositoryService.java
+++ b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/NativeRepositoryService.java
@@ -35,13 +35,12 @@ import org.apache.polygene.api.injection.scope.Service;
 import org.apache.polygene.api.injection.scope.This;
 import org.apache.polygene.api.mixin.Mixins;
 import org.apache.polygene.api.service.Availability;
-import org.apache.polygene.api.service.ServiceComposite;
 import org.apache.polygene.api.service.ServiceReference;
 import org.apache.polygene.library.fileconfig.FileConfiguration;
 
 @Mixins( { NativeRepositoryService.NativeRepositoryMixin.class } )
 @Activators( NativeRepositoryService.Activator.class )
-public interface NativeRepositoryService extends Repository, ServiceComposite, Availability
+public interface NativeRepositoryService extends Repository, Availability
 {
     @Override
     void initialize()

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c0fefa78/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/RdbmsRepositoryService.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/RdbmsRepositoryService.java
b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/RdbmsRepositoryService.java
index 353052c..61cf547 100644
--- a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/RdbmsRepositoryService.java
+++ b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/repository/RdbmsRepositoryService.java
@@ -32,23 +32,22 @@ import org.apache.polygene.api.activation.Activators;
 import org.apache.polygene.api.configuration.Configuration;
 import org.apache.polygene.api.injection.scope.This;
 import org.apache.polygene.api.mixin.Mixins;
-import org.apache.polygene.api.service.ServiceComposite;
 import org.apache.polygene.api.service.ServiceReference;
 
 @Mixins( RdbmsRepositoryService.RdbmsRepositoryMixin.class )
 @Activators( RdbmsRepositoryService.Activator.class )
-public interface RdbmsRepositoryService extends Repository, ServiceComposite
+public interface RdbmsRepositoryService extends Repository
 {
 
     @Override
-    public void initialize()
+    void initialize()
             throws RepositoryException;
 
     @Override
-    public void shutDown()
+    void shutDown()
             throws RepositoryException;
 
-    public static class Activator
+    class Activator
             extends ActivatorAdapter<ServiceReference<RdbmsRepositoryService>>
     {
 
@@ -68,7 +67,7 @@ public interface RdbmsRepositoryService extends Repository, ServiceComposite
 
     }
 
-    public static abstract class RdbmsRepositoryMixin
+    abstract class RdbmsRepositoryMixin
         implements RdbmsRepositoryService
     {
         @This


Mime
View raw message