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 3426D200C85 for ; Mon, 15 May 2017 13:03:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 32D95160BCE; Mon, 15 May 2017 11:03:13 +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 B0C86160BF7 for ; Mon, 15 May 2017 13:03:09 +0200 (CEST) Received: (qmail 57324 invoked by uid 500); 15 May 2017 11:03:08 -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 55809 invoked by uid 99); 15 May 2017 11:03:07 -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; Mon, 15 May 2017 11:03:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C08E5E00C4; Mon, 15 May 2017 11:03:07 +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: Mon, 15 May 2017 11:03:51 -0000 Message-Id: <6db59c8179934315a76092040abd7383@git.apache.org> In-Reply-To: <81344bc2677c4f7a8c448c7dc43520ed@git.apache.org> References: <81344bc2677c4f7a8c448c7dc43520ed@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [46/50] polygene-java git commit: :extensions:entitystore-file refine archived-at: Mon, 15 May 2017 11:03:13 -0000 :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 Authored: Mon May 15 11:31:27 2017 +0200 Committer: Paul Merlin 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 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 {