POLYGENE-263 - Missed some changes in the constructor signature.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/17a20799 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/17a20799 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/17a20799 Branch: refs/heads/develop Commit: 17a207993c8d01defefc8bc65c15a18d0d93bac0 Parents: 5704bb8 Author: niclas <[email protected]> Authored: Sun Jun 25 08:39:33 2017 +0800 Committer: niclas <[email protected]> Committed: Sun Jun 25 08:39:33 2017 +0800 ---------------------------------------------------------------------- .../spi/entitystore/helpers/JSONMapEntityStoreMixin.java | 2 +- .../polygene/spi/entitystore/helpers/MapEntityStoreMixin.java | 2 +- .../apache/polygene/test/entity/model/EntityStoreTestSuite.java | 2 +- .../java/org/apache/polygene/test/entity/model/people/Rent.java | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/17a20799/core/spi/src/main/java/org/apache/polygene/spi/entitystore/helpers/JSONMapEntityStoreMixin.java ---------------------------------------------------------------------- diff --git a/core/spi/src/main/java/org/apache/polygene/spi/entitystore/helpers/JSONMapEntityStoreMixin.java b/core/spi/src/main/java/org/apache/polygene/spi/entitystore/helpers/JSONMapEntityStoreMixin.java index aa0bdc4..2f6856b 100644 --- a/core/spi/src/main/java/org/apache/polygene/spi/entitystore/helpers/JSONMapEntityStoreMixin.java +++ b/core/spi/src/main/java/org/apache/polygene/spi/entitystore/helpers/JSONMapEntityStoreMixin.java @@ -449,7 +449,7 @@ public class JSONMapEntityStoreMixin EntityDescriptor entityDescriptor = module.entityDescriptor( type ); if( entityDescriptor == null ) { - throw new NoSuchEntityTypeException( type, module.name(), module.typeLookup() ); + throw new NoSuchEntityTypeException( type, module ); } return new JSONEntityState( entityDescriptor.module(), serialization, jsonFactories, http://git-wip-us.apache.org/repos/asf/polygene-java/blob/17a20799/core/spi/src/main/java/org/apache/polygene/spi/entitystore/helpers/MapEntityStoreMixin.java ---------------------------------------------------------------------- diff --git a/core/spi/src/main/java/org/apache/polygene/spi/entitystore/helpers/MapEntityStoreMixin.java b/core/spi/src/main/java/org/apache/polygene/spi/entitystore/helpers/MapEntityStoreMixin.java index 2dde5dc..78a95bc 100644 --- a/core/spi/src/main/java/org/apache/polygene/spi/entitystore/helpers/MapEntityStoreMixin.java +++ b/core/spi/src/main/java/org/apache/polygene/spi/entitystore/helpers/MapEntityStoreMixin.java @@ -412,7 +412,7 @@ public class MapEntityStoreMixin EntityDescriptor entityDescriptor = module.entityDescriptor( type ); if( entityDescriptor == null ) { - throw new NoSuchEntityTypeException( type, module.name(), module.typeLookup() ); + throw new NoSuchEntityTypeException( type, module ); } Map<QualifiedName, Object> properties = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/17a20799/core/testsupport/src/main/java/org/apache/polygene/test/entity/model/EntityStoreTestSuite.java ---------------------------------------------------------------------- diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/entity/model/EntityStoreTestSuite.java b/core/testsupport/src/main/java/org/apache/polygene/test/entity/model/EntityStoreTestSuite.java index 68b2b9a..169b93b 100644 --- a/core/testsupport/src/main/java/org/apache/polygene/test/entity/model/EntityStoreTestSuite.java +++ b/core/testsupport/src/main/java/org/apache/polygene/test/entity/model/EntityStoreTestSuite.java @@ -421,7 +421,7 @@ public abstract class EntityStoreTestSuite extends AbstractPolygeneMultiLayeredT @Test public void givenEntityInheritanceWhenStoreRetrieveExpectSuccess() { - Currency.Builder currencyBuilder = objectFactory.newObject( Currency.Builder.class ); + Currency.Builder currencyBuilder = transientBuilderFactory.newTransient( Currency.Builder.class ); Identity willId; try( UnitOfWork uow = unitOfWorkFactory.newUnitOfWork( UsecaseBuilder.newUsecase( "Test - givenEntityInheritanceWhenStoreRetrieveExpectSuccess" ) ) ) { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/17a20799/core/testsupport/src/main/java/org/apache/polygene/test/entity/model/people/Rent.java ---------------------------------------------------------------------- diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/entity/model/people/Rent.java b/core/testsupport/src/main/java/org/apache/polygene/test/entity/model/people/Rent.java index b05aec5..68999b6 100644 --- a/core/testsupport/src/main/java/org/apache/polygene/test/entity/model/people/Rent.java +++ b/core/testsupport/src/main/java/org/apache/polygene/test/entity/model/people/Rent.java @@ -19,6 +19,7 @@ */ package org.apache.polygene.test.entity.model.people; +import org.apache.polygene.api.composite.TransientBuilderFactory; import org.apache.polygene.api.injection.scope.Structure; import org.apache.polygene.api.object.ObjectFactory; import org.apache.polygene.api.property.Property; @@ -37,9 +38,9 @@ public interface Rent @Structure private ValueBuilderFactory vbf; - public Builder( @Structure ObjectFactory objectFactory) + public Builder( @Structure TransientBuilderFactory tbf ) { - currencyBuilder = objectFactory.newObject( Currency.Builder.class ); + currencyBuilder = tbf.newTransient( Currency.Builder.class ); } public Rent create( int amount, String currency )
