polygene-commits mailing list archives

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

Branch: refs/heads/develop
Commit: f2b4197603c4b59b0cac0fae8e4364df2ffd2489
Parents: 4106a2e
Author: Paul Merlin <paulmerlin@apache.org>
Authored: Mon May 15 11:31:27 2017 +0200
Committer: Paul Merlin <paulmerlin@apache.org>
Committed: Mon May 15 11:31:27 2017 +0200

----------------------------------------------------------------------
 .../entitystore/file/FileEntityStoreConfiguration.java         | 2 --
 .../apache/polygene/entitystore/file/FileEntityStoreMixin.java | 6 +++++-
 .../polygene/entitystore/file/FileEntityStoreService.java      | 2 --
 3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/polygene-java/blob/f2b41976/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/FileEntityStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/FileEntityStoreConfiguration.java
b/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/FileEntityStoreConfiguration.java
index 257fc89..e66a7a0 100644
--- a/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/FileEntityStoreConfiguration.java
+++ b/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/FileEntityStoreConfiguration.java
@@ -20,7 +20,6 @@
 package org.apache.polygene.entitystore.file;
 
 import org.apache.polygene.api.common.Optional;
-import org.apache.polygene.api.configuration.ConfigurationComposite;
 import org.apache.polygene.api.property.Property;
 import org.apache.polygene.library.constraints.annotation.Range;
 
@@ -29,7 +28,6 @@ import org.apache.polygene.library.constraints.annotation.Range;
  */
 // START SNIPPET: config
 public interface FileEntityStoreConfiguration
-    extends ConfigurationComposite
 {
     // END SNIPPET: config
     /**

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/f2b41976/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/FileEntityStoreMixin.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/FileEntityStoreMixin.java
b/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/FileEntityStoreMixin.java
index 270503d..6a16a84 100644
--- a/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/FileEntityStoreMixin.java
+++ b/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/FileEntityStoreMixin.java
@@ -34,6 +34,7 @@ import org.apache.polygene.api.common.Optional;
 import org.apache.polygene.api.configuration.Configuration;
 import org.apache.polygene.api.entity.EntityDescriptor;
 import org.apache.polygene.api.entity.EntityReference;
+import org.apache.polygene.api.identity.HasIdentity;
 import org.apache.polygene.api.injection.scope.Service;
 import org.apache.polygene.api.injection.scope.This;
 import org.apache.polygene.library.fileconfig.FileConfiguration;
@@ -56,6 +57,9 @@ public class FileEntityStoreMixin
     FileConfiguration fileConfiguration;
 
     @This
+    private HasIdentity hasIdentity;
+
+    @This
     private Configuration<FileEntityStoreConfiguration> config;
 
     private String storeId;
@@ -68,7 +72,7 @@ public class FileEntityStoreMixin
         throws Exception
     {
         config.refresh();
-        storeId = config.get().identity().get().toString();
+        storeId = hasIdentity.identity().get().toString();
         String pathName = config.get().directory().get();
         if( pathName == null )
         {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/f2b41976/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/FileEntityStoreService.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/FileEntityStoreService.java
b/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/FileEntityStoreService.java
index 262be25..7088541 100644
--- a/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/FileEntityStoreService.java
+++ b/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/FileEntityStoreService.java
@@ -22,7 +22,6 @@ package org.apache.polygene.entitystore.file;
 import org.apache.polygene.api.concern.Concerns;
 import org.apache.polygene.api.configuration.Configuration;
 import org.apache.polygene.api.mixin.Mixins;
-import org.apache.polygene.api.service.ServiceComposite;
 import org.apache.polygene.library.locking.LockingAbstractComposite;
 import org.apache.polygene.spi.entitystore.BackupRestore;
 import org.apache.polygene.spi.entitystore.ConcurrentModificationCheckConcern;
@@ -46,7 +45,6 @@ public interface FileEntityStoreService
                 EntityStateVersions,
                 StateStore,
                 BackupRestore,
-                ServiceComposite,
                 LockingAbstractComposite,
                 Configuration
 {


Mime
View raw message