Repository: zest-java Updated Branches: refs/heads/ZEST-132 e291e7801 -> 25eadfab3
ZEST-132 rDefaultUnitOfWorkAssembler moved to runtime and used directly - no longer used by application code Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/25eadfab Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/25eadfab Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/25eadfab Branch: refs/heads/ZEST-132 Commit: 25eadfab320960fe57955e0ebe0878005feed2f9 Parents: e291e78 Author: Kent Sølvsten <[email protected]> Authored: Mon Dec 21 00:14:22 2015 +0100 Committer: Kent Sølvsten <[email protected]> Committed: Mon Dec 21 00:14:22 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/zest/api/OperatorsTest.java | 8 ++- .../zest/api/value/DocumentationSupport.java | 7 +-- .../unitofwork/DefaultUnitOfWorkAssembler.java | 55 -------------------- .../apache/zest/bootstrap/ClassScannerTest.java | 11 ++-- .../org/apache/zest/runtime/event/EventBus.java | 12 ++--- .../unitofwork/DefaultUnitOfWorkAssembler.java | 37 +++++++++++++ .../entity/EntityBuilderWithStateTest.java | 8 ++- .../runtime/entity/EntityVisibilityTest.java | 13 ++--- .../ConstructorInjectionOfThisTest.java | 6 +-- .../runtime/objects/ObjectVisibilityTest.java | 16 ++---- .../runtime/query/IterableQuerySourceTest.java | 24 ++------- .../runtime/service/AvailableServiceTest.java | 8 +-- .../runtime/service/ServiceVisibilityTest.java | 14 ++--- .../structure/TypeToCompositeLookupTest.java | 13 +---- .../transients/TransientVisibilityTest.java | 8 --- .../unitofwork/PrivateEntityUnitOfWorkTest.java | 3 -- .../zest/runtime/value/ValueComposite2Test.java | 6 +-- .../zest/runtime/value/ValueVisibilityTest.java | 16 ++---- .../visibility/VisibilityInUnitOfWorkTest.java | 4 -- .../ElasticSearchQueryMultimoduleTest.java | 2 - .../index/rdf/RdfNamedQueryMultimoduleTest.java | 3 -- .../zest/index/rdf/RdfQueryMultimoduleTest.java | 4 -- .../zest/index/rdf/qi95/Qi95IssueTest.java | 20 +++---- .../apache/zest/migration/MigrationTest.java | 12 ++--- .../domain/source/helper/EventRouterTest.java | 12 ++--- .../domain/source/helper/EventsTest.java | 21 ++++---- .../source/helper/UnitOfWorkRouterTest.java | 17 +++--- .../library/scala/HelloWorldCompositeTest.java | 2 - .../zest/library/rest/admin/RestTest.java | 11 ++-- .../sql/liquibase/LiquibaseServiceTest.java | 14 ++--- ...taSourceConfigurationManagerServiceTest.java | 7 +-- 31 files changed, 129 insertions(+), 265 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/core/api/src/test/java/org/apache/zest/api/OperatorsTest.java ---------------------------------------------------------------------- diff --git a/core/api/src/test/java/org/apache/zest/api/OperatorsTest.java b/core/api/src/test/java/org/apache/zest/api/OperatorsTest.java old mode 100644 new mode 100755 index 2214433..0212902 --- a/core/api/src/test/java/org/apache/zest/api/OperatorsTest.java +++ b/core/api/src/test/java/org/apache/zest/api/OperatorsTest.java @@ -19,10 +19,6 @@ package org.apache.zest.api; import java.util.function.Predicate; -import org.apache.zest.api.unitofwork.UnitOfWorkFactory; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.Assert; -import org.junit.Test; import org.apache.zest.api.activation.ActivationException; import org.apache.zest.api.composite.Composite; import org.apache.zest.api.entity.EntityBuilder; @@ -32,12 +28,15 @@ import org.apache.zest.api.query.QueryBuilder; import org.apache.zest.api.query.QueryExpressions; import org.apache.zest.api.unitofwork.UnitOfWork; import org.apache.zest.api.unitofwork.UnitOfWorkCompletionException; +import org.apache.zest.api.unitofwork.UnitOfWorkFactory; import org.apache.zest.api.value.ValueComposite; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; import org.apache.zest.bootstrap.SingletonAssembler; import org.apache.zest.functional.Iterables; import org.apache.zest.test.EntityTestAssembler; +import org.junit.Assert; +import org.junit.Test; /** * TODO @@ -60,7 +59,6 @@ public class OperatorsTest module.values( TestValue.class ); module.forMixin( TestEntity.class ).declareDefaults().foo().set( "Bar" ); module.forMixin( TestValue.class ).declareDefaults().bar().set( "Xyz" ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }; http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/core/api/src/test/java/org/apache/zest/api/value/DocumentationSupport.java ---------------------------------------------------------------------- diff --git a/core/api/src/test/java/org/apache/zest/api/value/DocumentationSupport.java b/core/api/src/test/java/org/apache/zest/api/value/DocumentationSupport.java old mode 100644 new mode 100755 index e85e2fc..5612cd9 --- a/core/api/src/test/java/org/apache/zest/api/value/DocumentationSupport.java +++ b/core/api/src/test/java/org/apache/zest/api/value/DocumentationSupport.java @@ -37,7 +37,6 @@ import org.apache.zest.bootstrap.Assembler; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.Energy4Java; import org.apache.zest.bootstrap.ModuleAssembly; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.zest.io.Inputs; import org.apache.zest.io.Outputs; import org.apache.zest.io.Transforms; @@ -46,8 +45,8 @@ import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationAssem import org.junit.Before; import org.junit.Test; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; /** * Snippets: @@ -80,7 +79,6 @@ public class DocumentationSupport module.values( SomeValue.class ); // (2) // END SNIPPET: default new OrgJsonValueSerializationAssembler().assemble( module ); // (3) - new DefaultUnitOfWorkAssembler().assemble( module ); // START SNIPPET: default } // END SNIPPET: default @@ -227,7 +225,6 @@ public class DocumentationSupport valuesModule.setName( "VALUES-Module" ); valuesModule.values( SomeValue.class ); - new DefaultUnitOfWorkAssembler().assemble( valuesModule ); } }, { http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/core/bootstrap/src/main/java/org/apache/zest/bootstrap/unitofwork/DefaultUnitOfWorkAssembler.java ---------------------------------------------------------------------- diff --git a/core/bootstrap/src/main/java/org/apache/zest/bootstrap/unitofwork/DefaultUnitOfWorkAssembler.java b/core/bootstrap/src/main/java/org/apache/zest/bootstrap/unitofwork/DefaultUnitOfWorkAssembler.java deleted file mode 100755 index 568de0f..0000000 --- a/core/bootstrap/src/main/java/org/apache/zest/bootstrap/unitofwork/DefaultUnitOfWorkAssembler.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -package org.apache.zest.bootstrap.unitofwork; - -import org.apache.zest.bootstrap.Assembler; -import org.apache.zest.bootstrap.AssemblyException; -import org.apache.zest.bootstrap.ModuleAssembly; - -@Deprecated -public class DefaultUnitOfWorkAssembler - implements Assembler -{ - @Override - public void assemble( ModuleAssembly module ) - throws AssemblyException - { - // Do nothing - added automatically by EventBus - //Class factoryMixin = loadMixinClass( "org.apache.zest.runtime.unitofwork.UnitOfWorkFactoryMixin" ); - //module.services( UnitOfWorkFactory.class ).withMixins( factoryMixin ); - - //Class uowMixin = loadMixinClass( "org.apache.zest.runtime.unitofwork.ModuleUnitOfWork" ); - //module.transients( UnitOfWork.class ).withMixins( uowMixin ); - } - - private Class<?> loadMixinClass( String name ) - throws AssemblyException - { - try - { - return getClass().getClassLoader().loadClass( name ); - } - catch( ClassNotFoundException e ) - { - throw new AssemblyException( "Default UnitOfWorkFactory mixin is not present in the system." ); - } - } -} http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/core/bootstrap/src/test/java/org/apache/zest/bootstrap/ClassScannerTest.java ---------------------------------------------------------------------- diff --git a/core/bootstrap/src/test/java/org/apache/zest/bootstrap/ClassScannerTest.java b/core/bootstrap/src/test/java/org/apache/zest/bootstrap/ClassScannerTest.java old mode 100644 new mode 100755 index 90b6d5a..ff1f227 --- a/core/bootstrap/src/test/java/org/apache/zest/bootstrap/ClassScannerTest.java +++ b/core/bootstrap/src/test/java/org/apache/zest/bootstrap/ClassScannerTest.java @@ -18,16 +18,14 @@ */ package org.apache.zest.bootstrap; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.Assert; -import org.junit.Test; import org.apache.zest.api.activation.ActivationException; import org.apache.zest.bootstrap.somepackage.Test2Value; import org.apache.zest.functional.Iterables; +import org.junit.Assert; +import org.junit.Test; -import static org.apache.zest.bootstrap.ClassScanner.findClasses; -import static org.apache.zest.bootstrap.ClassScanner.matches; -import static org.apache.zest.functional.Iterables.filter; +import static org.apache.zest.bootstrap.ClassScanner.*; +import static org.apache.zest.functional.Iterables.*; /** * Test and showcase of the ClassScanner assembly utility. @@ -49,7 +47,6 @@ public class ClassScannerTest for( Class aClass : filter( matches( ".*Value" ), findClasses( TestValue.class ) ) ) { module.values( aClass ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } }; http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/core/runtime/src/main/java/org/apache/zest/runtime/event/EventBus.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/event/EventBus.java b/core/runtime/src/main/java/org/apache/zest/runtime/event/EventBus.java index 1989d53..9b93baa 100755 --- a/core/runtime/src/main/java/org/apache/zest/runtime/event/EventBus.java +++ b/core/runtime/src/main/java/org/apache/zest/runtime/event/EventBus.java @@ -26,23 +26,19 @@ import java.util.ListIterator; import java.util.Map; import org.apache.zest.api.event.ZestEvent; import org.apache.zest.api.event.ZestEventHandler; -import org.apache.zest.api.unitofwork.UnitOfWork; -import org.apache.zest.api.unitofwork.UnitOfWorkFactory; -import org.apache.zest.bootstrap.ModuleAssembly; import org.apache.zest.bootstrap.handler.ModuleAssembledEvent; import org.apache.zest.bootstrap.handler.ModuleAssemblingEvent; -import org.apache.zest.runtime.unitofwork.ModuleUnitOfWork; -import org.apache.zest.runtime.unitofwork.UnitOfWorkFactoryMixin; +import org.apache.zest.runtime.unitofwork.DefaultUnitOfWorkAssembler; public class EventBus { public EventBus() { // add default UnitOfWork to all modules (may be customized by user afterwards) + // @TODO add a way to ask for existing stuff duroing assembly - and give the user + // a chance of replacing the default addHandler( ModuleAssemblingRuntimeEvent.TYPE, event -> { - ModuleAssembly moduleAssembly = event.getModuleAssembly(); - moduleAssembly.services( UnitOfWorkFactory.class ).withMixins( UnitOfWorkFactoryMixin.class ); - moduleAssembly.transients( UnitOfWork.class ).withMixins( ModuleUnitOfWork.class ); + new DefaultUnitOfWorkAssembler().assemble( event.getModuleAssembly() ); } ); // emit ModuleAssemblingEvent to interested users addHandler( ModuleAssemblingRuntimeEvent.TYPE, event -> http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/core/runtime/src/main/java/org/apache/zest/runtime/unitofwork/DefaultUnitOfWorkAssembler.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/unitofwork/DefaultUnitOfWorkAssembler.java b/core/runtime/src/main/java/org/apache/zest/runtime/unitofwork/DefaultUnitOfWorkAssembler.java new file mode 100755 index 0000000..6e86114 --- /dev/null +++ b/core/runtime/src/main/java/org/apache/zest/runtime/unitofwork/DefaultUnitOfWorkAssembler.java @@ -0,0 +1,37 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +package org.apache.zest.runtime.unitofwork; + +import org.apache.zest.api.unitofwork.UnitOfWork; +import org.apache.zest.api.unitofwork.UnitOfWorkFactory; +import org.apache.zest.bootstrap.Assembler; +import org.apache.zest.bootstrap.ModuleAssembly; + +public class DefaultUnitOfWorkAssembler + implements Assembler +{ + @Override + public void assemble( ModuleAssembly module ) + { + module.services( UnitOfWorkFactory.class ).withMixins( UnitOfWorkFactoryMixin.class ); + module.transients( UnitOfWork.class ).withMixins( ModuleUnitOfWork.class ); + } +} http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityBuilderWithStateTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityBuilderWithStateTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityBuilderWithStateTest.java old mode 100644 new mode 100755 index cd501d1..cd323f9 --- a/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityBuilderWithStateTest.java +++ b/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityBuilderWithStateTest.java @@ -17,8 +17,6 @@ package org.apache.zest.runtime.entity; import java.util.Arrays; import java.util.Collections; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.Test; import org.apache.zest.api.association.Association; import org.apache.zest.api.association.ManyAssociation; import org.apache.zest.api.association.NamedAssociation; @@ -33,9 +31,10 @@ import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; import org.apache.zest.test.AbstractZestTest; import org.apache.zest.test.EntityTestAssembler; +import org.junit.Test; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.MatcherAssert.*; /** * EntityBuilder With State Test. @@ -49,7 +48,6 @@ public class EntityBuilderWithStateTest { new EntityTestAssembler().assemble( module ); module.entities( SomeEntity.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } @Test http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityVisibilityTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityVisibilityTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityVisibilityTest.java old mode 100644 new mode 100755 index 0d0e6f1..35defdc --- a/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityVisibilityTest.java +++ b/core/runtime/src/test/java/org/apache/zest/runtime/entity/EntityVisibilityTest.java @@ -16,11 +16,6 @@ package org.apache.zest.runtime.entity; -import org.apache.zest.api.unitofwork.UnitOfWorkFactory; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; import org.apache.zest.api.common.Visibility; import org.apache.zest.api.composite.TransientComposite; import org.apache.zest.api.entity.EntityComposite; @@ -31,6 +26,7 @@ import org.apache.zest.api.structure.Application; import org.apache.zest.api.structure.Module; import org.apache.zest.api.unitofwork.EntityTypeNotFoundException; import org.apache.zest.api.unitofwork.UnitOfWork; +import org.apache.zest.api.unitofwork.UnitOfWorkFactory; import org.apache.zest.api.value.ValueComposite; import org.apache.zest.bootstrap.ApplicationAssemblerAdapter; import org.apache.zest.bootstrap.Assembler; @@ -38,6 +34,9 @@ import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.Energy4Java; import org.apache.zest.bootstrap.ModuleAssembly; import org.apache.zest.test.EntityTestAssembler; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; public class EntityVisibilityTest { @@ -659,7 +658,6 @@ public class EntityVisibilityTest module.entities( ModuleApplicationVisible.class ).visibleIn( Visibility.application ); module.entities( ModuleLayerVisible.class ).visibleIn( Visibility.layer ); module.entities( ModuleModuleVisible.class ).visibleIn( Visibility.module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -677,7 +675,6 @@ public class EntityVisibilityTest module.entities( BelowModuleVisible.class ).visibleIn( Visibility.module ); new EntityTestAssembler().visibleIn( Visibility.application ).assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -693,7 +690,6 @@ public class EntityVisibilityTest module.entities( AboveApplicationVisible.class ).visibleIn( Visibility.application ); module.entities( AboveLayerVisible.class ).visibleIn( Visibility.layer ); module.entities( AboveModuleVisible.class ).visibleIn( Visibility.module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -708,7 +704,6 @@ public class EntityVisibilityTest module.entities( BesideApplicationVisible.class ).visibleIn( Visibility.application ); module.entities( BesideLayerVisible.class ).visibleIn( Visibility.layer ); module.entities( BesideModuleVisible.class ).visibleIn( Visibility.module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/core/runtime/src/test/java/org/apache/zest/runtime/injection/ConstructorInjectionOfThisTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/injection/ConstructorInjectionOfThisTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/injection/ConstructorInjectionOfThisTest.java old mode 100644 new mode 100755 index be703e6..558d05a --- a/core/runtime/src/test/java/org/apache/zest/runtime/injection/ConstructorInjectionOfThisTest.java +++ b/core/runtime/src/test/java/org/apache/zest/runtime/injection/ConstructorInjectionOfThisTest.java @@ -15,8 +15,6 @@ */ package org.apache.zest.runtime.injection; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.Test; import org.apache.zest.api.activation.ActivationException; import org.apache.zest.api.common.UseDefaults; import org.apache.zest.api.concern.ConcernOf; @@ -29,8 +27,9 @@ import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; import org.apache.zest.bootstrap.SingletonAssembler; import org.junit.Ignore; +import org.junit.Test; -import static org.junit.Assert.assertFalse; +import static org.junit.Assert.*; /** * This test is created in response to QI-359 @@ -50,7 +49,6 @@ public class ConstructorInjectionOfThisTest throws AssemblyException { module.values( Does.class ).withMixins( DoesMixin.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }; Module module = singletonAssembler.application().findModule( "Layer 1", "Module 1" ); http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/core/runtime/src/test/java/org/apache/zest/runtime/objects/ObjectVisibilityTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/objects/ObjectVisibilityTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/objects/ObjectVisibilityTest.java old mode 100644 new mode 100755 index dcaa0c8..20928a9 --- a/core/runtime/src/test/java/org/apache/zest/runtime/objects/ObjectVisibilityTest.java +++ b/core/runtime/src/test/java/org/apache/zest/runtime/objects/ObjectVisibilityTest.java @@ -16,11 +16,6 @@ package org.apache.zest.runtime.objects; -import org.apache.zest.api.unitofwork.UnitOfWorkFactory; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; import org.apache.zest.api.common.Visibility; import org.apache.zest.api.composite.TransientComposite; import org.apache.zest.api.entity.EntityComposite; @@ -31,6 +26,7 @@ import org.apache.zest.api.service.ServiceComposite; import org.apache.zest.api.structure.Application; import org.apache.zest.api.structure.Module; import org.apache.zest.api.unitofwork.UnitOfWork; +import org.apache.zest.api.unitofwork.UnitOfWorkFactory; import org.apache.zest.api.value.ValueComposite; import org.apache.zest.bootstrap.ApplicationAssemblerAdapter; import org.apache.zest.bootstrap.Assembler; @@ -38,6 +34,9 @@ import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.Energy4Java; import org.apache.zest.bootstrap.ModuleAssembly; import org.apache.zest.test.EntityTestAssembler; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; public class ObjectVisibilityTest { @@ -659,8 +658,6 @@ public class ObjectVisibilityTest module.objects( ModuleApplicationVisible.class ).visibleIn( Visibility.application ); module.objects( ModuleLayerVisible.class ).visibleIn( Visibility.layer ); module.objects( ModuleModuleVisible.class ).visibleIn( Visibility.module ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -678,7 +675,6 @@ public class ObjectVisibilityTest module.objects( BelowModuleVisible.class ).visibleIn( Visibility.module ); new EntityTestAssembler().visibleIn( Visibility.application ).assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -694,8 +690,6 @@ public class ObjectVisibilityTest module.objects( AboveApplicationVisible.class ).visibleIn( Visibility.application ); module.objects( AboveLayerVisible.class ).visibleIn( Visibility.layer ); module.objects( AboveModuleVisible.class ).visibleIn( Visibility.module ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -710,8 +704,6 @@ public class ObjectVisibilityTest module.objects( BesideApplicationVisible.class ).visibleIn( Visibility.application ); module.objects( BesideLayerVisible.class ).visibleIn( Visibility.layer ); module.objects( BesideModuleVisible.class ).visibleIn( Visibility.module ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } } http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/core/runtime/src/test/java/org/apache/zest/runtime/query/IterableQuerySourceTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/query/IterableQuerySourceTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/query/IterableQuerySourceTest.java old mode 100644 new mode 100755 index 726c14a..7206e8b --- a/core/runtime/src/test/java/org/apache/zest/runtime/query/IterableQuerySourceTest.java +++ b/core/runtime/src/test/java/org/apache/zest/runtime/query/IterableQuerySourceTest.java @@ -20,10 +20,6 @@ package org.apache.zest.runtime.query; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; import org.apache.zest.api.activation.ActivationException; import org.apache.zest.api.query.Query; import org.apache.zest.api.query.QueryBuilder; @@ -50,21 +46,12 @@ import org.apache.zest.runtime.query.model.values.ContactValue; import org.apache.zest.runtime.query.model.values.ContactsValue; import org.apache.zest.spi.query.EntityFinderException; import org.apache.zest.test.EntityTestAssembler; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.apache.zest.api.query.QueryExpressions.eq; -import static org.apache.zest.api.query.QueryExpressions.ge; -import static org.apache.zest.api.query.QueryExpressions.gt; -import static org.apache.zest.api.query.QueryExpressions.isNotNull; -import static org.apache.zest.api.query.QueryExpressions.isNull; -import static org.apache.zest.api.query.QueryExpressions.lt; -import static org.apache.zest.api.query.QueryExpressions.matches; -import static org.apache.zest.api.query.QueryExpressions.not; -import static org.apache.zest.api.query.QueryExpressions.or; -import static org.apache.zest.api.query.QueryExpressions.orderBy; -import static org.apache.zest.api.query.QueryExpressions.property; -import static org.apache.zest.api.query.QueryExpressions.templateFor; +import static org.apache.zest.api.query.QueryExpressions.*; +import static org.junit.Assert.*; public class IterableQuerySourceTest { @@ -90,7 +77,6 @@ public class IterableQuerySourceTest module.values( ContactsValue.class, ContactValue.class ); new EntityTestAssembler().assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }; uow = assembler.module().unitOfWorkFactory().newUnitOfWork(); http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/core/runtime/src/test/java/org/apache/zest/runtime/service/AvailableServiceTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/service/AvailableServiceTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/service/AvailableServiceTest.java old mode 100644 new mode 100755 index 0e14d4a..7fe1973 --- a/core/runtime/src/test/java/org/apache/zest/runtime/service/AvailableServiceTest.java +++ b/core/runtime/src/test/java/org/apache/zest/runtime/service/AvailableServiceTest.java @@ -14,8 +14,6 @@ package org.apache.zest.runtime.service; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.Test; import org.apache.zest.api.activation.ActivationException; import org.apache.zest.api.common.Optional; import org.apache.zest.api.configuration.Configuration; @@ -32,9 +30,10 @@ import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; import org.apache.zest.bootstrap.SingletonAssembler; import org.apache.zest.test.EntityTestAssembler; +import org.junit.Test; import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.*; /** * JAVADOC @@ -51,7 +50,6 @@ public class AvailableServiceTest throws AssemblyException { module.services( TestServiceComposite1.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }; @@ -74,7 +72,6 @@ public class AvailableServiceTest module.entities( TestServiceConfiguration.class ); new EntityTestAssembler().assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }; @@ -103,7 +100,6 @@ public class AvailableServiceTest module.entities( TestServiceConfiguration.class ); new EntityTestAssembler().assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }; http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/core/runtime/src/test/java/org/apache/zest/runtime/service/ServiceVisibilityTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/service/ServiceVisibilityTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/service/ServiceVisibilityTest.java old mode 100644 new mode 100755 index 92edd73..fef4450 --- a/core/runtime/src/test/java/org/apache/zest/runtime/service/ServiceVisibilityTest.java +++ b/core/runtime/src/test/java/org/apache/zest/runtime/service/ServiceVisibilityTest.java @@ -16,11 +16,6 @@ package org.apache.zest.runtime.service; -import org.apache.zest.api.unitofwork.UnitOfWorkFactory; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; import org.apache.zest.api.common.Visibility; import org.apache.zest.api.composite.TransientComposite; import org.apache.zest.api.entity.EntityComposite; @@ -31,6 +26,7 @@ import org.apache.zest.api.service.ServiceComposite; import org.apache.zest.api.structure.Application; import org.apache.zest.api.structure.Module; import org.apache.zest.api.unitofwork.UnitOfWork; +import org.apache.zest.api.unitofwork.UnitOfWorkFactory; import org.apache.zest.api.value.ValueComposite; import org.apache.zest.bootstrap.ApplicationAssemblerAdapter; import org.apache.zest.bootstrap.Assembler; @@ -38,6 +34,9 @@ import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.Energy4Java; import org.apache.zest.bootstrap.ModuleAssembly; import org.apache.zest.test.EntityTestAssembler; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; public class ServiceVisibilityTest { @@ -658,8 +657,6 @@ public class ServiceVisibilityTest module.services( ModuleApplicationVisible.class ).visibleIn( Visibility.application ); module.services( ModuleLayerVisible.class ).visibleIn( Visibility.layer ); module.services( ModuleModuleVisible.class ).visibleIn( Visibility.module ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -677,7 +674,6 @@ public class ServiceVisibilityTest module.services( BelowModuleVisible.class ).visibleIn( Visibility.module ); new EntityTestAssembler().visibleIn( Visibility.application ).assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -693,7 +689,6 @@ public class ServiceVisibilityTest module.services( AboveApplicationVisible.class ).visibleIn( Visibility.application ); module.services( AboveLayerVisible.class ).visibleIn( Visibility.layer ); module.services( AboveModuleVisible.class ).visibleIn( Visibility.module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -708,7 +703,6 @@ public class ServiceVisibilityTest module.services( BesideApplicationVisible.class ).visibleIn( Visibility.application ); module.services( BesideLayerVisible.class ).visibleIn( Visibility.layer ); module.services( BesideModuleVisible.class ).visibleIn( Visibility.module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/core/runtime/src/test/java/org/apache/zest/runtime/structure/TypeToCompositeLookupTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/structure/TypeToCompositeLookupTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/structure/TypeToCompositeLookupTest.java old mode 100644 new mode 100755 index d516ede..66b06e7 --- a/core/runtime/src/test/java/org/apache/zest/runtime/structure/TypeToCompositeLookupTest.java +++ b/core/runtime/src/test/java/org/apache/zest/runtime/structure/TypeToCompositeLookupTest.java @@ -14,9 +14,6 @@ package org.apache.zest.runtime.structure; import java.util.Iterator; -import org.apache.zest.api.unitofwork.UnitOfWorkFactory; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.Test; import org.apache.zest.api.activation.ActivationException; import org.apache.zest.api.composite.AmbiguousTypeException; import org.apache.zest.api.entity.Identity; @@ -25,11 +22,13 @@ import org.apache.zest.api.service.ServiceReference; import org.apache.zest.api.structure.Module; import org.apache.zest.api.unitofwork.UnitOfWork; import org.apache.zest.api.unitofwork.UnitOfWorkCompletionException; +import org.apache.zest.api.unitofwork.UnitOfWorkFactory; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; import org.apache.zest.bootstrap.SingletonAssembler; import org.apache.zest.functional.Iterables; import org.apache.zest.test.EntityTestAssembler; +import org.junit.Test; import static org.junit.Assert.*; @@ -98,7 +97,6 @@ public class TypeToCompositeLookupTest throws AssemblyException { module.objects( SomeOtherFooImpl.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }.module(); @@ -120,7 +118,6 @@ public class TypeToCompositeLookupTest throws AssemblyException { module.objects( SomeOtherFooImpl.class, BasicFooImpl.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }.module(); @@ -150,7 +147,6 @@ public class TypeToCompositeLookupTest throws AssemblyException { module.transients( SomeOtherFoo.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }.module(); @@ -172,7 +168,6 @@ public class TypeToCompositeLookupTest throws AssemblyException { module.transients( SomeOtherFoo.class, BasicFoo.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }.module(); @@ -202,7 +197,6 @@ public class TypeToCompositeLookupTest throws AssemblyException { module.values( SomeOtherFoo.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }.module(); @@ -224,7 +218,6 @@ public class TypeToCompositeLookupTest throws AssemblyException { module.values( SomeOtherFoo.class, BasicFoo.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }.module(); @@ -255,7 +248,6 @@ public class TypeToCompositeLookupTest { new EntityTestAssembler().assemble( module ); module.entities( SomeOtherFoo.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }.module().unitOfWorkFactory(); @@ -298,7 +290,6 @@ public class TypeToCompositeLookupTest { new EntityTestAssembler().assemble( module ); module.entities( SomeOtherFoo.class, BasicFoo.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }.module().unitOfWorkFactory(); http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/core/runtime/src/test/java/org/apache/zest/runtime/transients/TransientVisibilityTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/transients/TransientVisibilityTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/transients/TransientVisibilityTest.java old mode 100644 new mode 100755 index ad27219..1a54dee --- a/core/runtime/src/test/java/org/apache/zest/runtime/transients/TransientVisibilityTest.java +++ b/core/runtime/src/test/java/org/apache/zest/runtime/transients/TransientVisibilityTest.java @@ -34,7 +34,6 @@ import org.apache.zest.bootstrap.Assembler; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.Energy4Java; import org.apache.zest.bootstrap.ModuleAssembly; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.zest.test.EntityTestAssembler; import org.junit.After; import org.junit.Before; @@ -660,7 +659,6 @@ public class TransientVisibilityTest module.transients( ModuleLayerVisible.class ).visibleIn( Visibility.layer ); module.transients( ModuleModuleVisible.class ).visibleIn( Visibility.module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -678,8 +676,6 @@ public class TransientVisibilityTest module.transients( BelowModuleVisible.class ).visibleIn( Visibility.module ); new EntityTestAssembler().visibleIn( Visibility.application ).assemble( module ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -695,8 +691,6 @@ public class TransientVisibilityTest module.transients( AboveApplicationVisible.class ).visibleIn( Visibility.application ); module.transients( AboveLayerVisible.class ).visibleIn( Visibility.layer ); module.transients( AboveModuleVisible.class ).visibleIn( Visibility.module ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -711,8 +705,6 @@ public class TransientVisibilityTest module.transients( BesideApplicationVisible.class ).visibleIn( Visibility.application ); module.transients( BesideLayerVisible.class ).visibleIn( Visibility.layer ); module.transients( BesideModuleVisible.class ).visibleIn( Visibility.module ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } } http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/PrivateEntityUnitOfWorkTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/PrivateEntityUnitOfWorkTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/PrivateEntityUnitOfWorkTest.java old mode 100644 new mode 100755 index 1d81f68..442bc98 --- a/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/PrivateEntityUnitOfWorkTest.java +++ b/core/runtime/src/test/java/org/apache/zest/runtime/unitofwork/PrivateEntityUnitOfWorkTest.java @@ -32,7 +32,6 @@ import org.apache.zest.api.value.ValueBuilderFactory; import org.apache.zest.api.value.ValueComposite; import org.apache.zest.bootstrap.Assembler; import org.apache.zest.bootstrap.Energy4Java; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.zest.test.EntityTestAssembler; import org.junit.Test; @@ -61,7 +60,6 @@ public class PrivateEntityUnitOfWorkTest { module -> { module.objects( PrivateEntityUnitOfWorkTest.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } }, @@ -72,7 +70,6 @@ public class PrivateEntityUnitOfWorkTest module.entities( ProductCatalogEntity.class ).visibleIn( application ); module.values( ProductInfo.class ); new EntityTestAssembler().assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } } http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueComposite2Test.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueComposite2Test.java b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueComposite2Test.java old mode 100644 new mode 100755 index 79f8151..6694c72 --- a/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueComposite2Test.java +++ b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueComposite2Test.java @@ -18,9 +18,6 @@ package org.apache.zest.runtime.value; import java.security.Guard; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.Assert; -import org.junit.Test; import org.apache.zest.api.activation.ActivationException; import org.apache.zest.api.injection.scope.Service; import org.apache.zest.api.injection.scope.Structure; @@ -34,6 +31,8 @@ import org.apache.zest.api.value.ValueComposite; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; import org.apache.zest.bootstrap.SingletonAssembler; +import org.junit.Assert; +import org.junit.Test; public class ValueComposite2Test { @@ -48,7 +47,6 @@ public class ValueComposite2Test { module.values( SomeValue.class ); module.services( DummyService.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }; ValueBuilder<Some> builder = app.module().newValueBuilder( Some.class ); http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueVisibilityTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueVisibilityTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueVisibilityTest.java old mode 100644 new mode 100755 index aa14297..5c5b8a8 --- a/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueVisibilityTest.java +++ b/core/runtime/src/test/java/org/apache/zest/runtime/value/ValueVisibilityTest.java @@ -16,11 +16,6 @@ package org.apache.zest.runtime.value; -import org.apache.zest.api.unitofwork.UnitOfWorkFactory; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; import org.apache.zest.api.common.Visibility; import org.apache.zest.api.composite.TransientComposite; import org.apache.zest.api.entity.EntityComposite; @@ -30,6 +25,7 @@ import org.apache.zest.api.service.ServiceComposite; import org.apache.zest.api.structure.Application; import org.apache.zest.api.structure.Module; import org.apache.zest.api.unitofwork.UnitOfWork; +import org.apache.zest.api.unitofwork.UnitOfWorkFactory; import org.apache.zest.api.value.NoSuchValueException; import org.apache.zest.api.value.ValueBuilder; import org.apache.zest.api.value.ValueComposite; @@ -39,6 +35,9 @@ import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.Energy4Java; import org.apache.zest.bootstrap.ModuleAssembly; import org.apache.zest.test.EntityTestAssembler; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; public class ValueVisibilityTest { @@ -660,8 +659,6 @@ public class ValueVisibilityTest module.values( ModuleApplicationVisible.class ).visibleIn( Visibility.application ); module.values( ModuleLayerVisible.class ).visibleIn( Visibility.layer ); module.values( ModuleModuleVisible.class ).visibleIn( Visibility.module ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -679,7 +676,6 @@ public class ValueVisibilityTest module.values( BelowModuleVisible.class ).visibleIn( Visibility.module ); new EntityTestAssembler().visibleIn( Visibility.application ).assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -695,8 +691,6 @@ public class ValueVisibilityTest module.values( AboveApplicationVisible.class ).visibleIn( Visibility.application ); module.values( AboveLayerVisible.class ).visibleIn( Visibility.layer ); module.values( AboveModuleVisible.class ).visibleIn( Visibility.module ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } } @@ -711,8 +705,6 @@ public class ValueVisibilityTest module.values( BesideApplicationVisible.class ).visibleIn( Visibility.application ); module.values( BesideLayerVisible.class ).visibleIn( Visibility.layer ); module.values( BesideModuleVisible.class ).visibleIn( Visibility.module ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } } http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/core/runtime/src/test/java/org/apache/zest/runtime/visibility/VisibilityInUnitOfWorkTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/visibility/VisibilityInUnitOfWorkTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/visibility/VisibilityInUnitOfWorkTest.java old mode 100644 new mode 100755 index 55662db..6cc5646 --- a/core/runtime/src/test/java/org/apache/zest/runtime/visibility/VisibilityInUnitOfWorkTest.java +++ b/core/runtime/src/test/java/org/apache/zest/runtime/visibility/VisibilityInUnitOfWorkTest.java @@ -31,7 +31,6 @@ import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.Energy4Java; import org.apache.zest.bootstrap.LayerAssembly; import org.apache.zest.bootstrap.ModuleAssembly; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.zest.entitystore.memory.MemoryEntityStoreService; import org.apache.zest.spi.uuid.UuidIdentityGeneratorService; import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationService; @@ -142,16 +141,13 @@ public class VisibilityInUnitOfWorkTest ModuleAssembly infraModule = layer1.module( "Infra Module" ); myModule.services( MyService.class ); myModule.entities( MyEntity.class ); - new DefaultUnitOfWorkAssembler().assemble( myModule ); yourModule.entities( YourEntity.class ); yourModule.services( YourService.class ).visibleIn( Visibility.layer ); - new DefaultUnitOfWorkAssembler().assemble( yourModule ); infraModule.services( MemoryEntityStoreService.class ).visibleIn( Visibility.layer ); infraModule.services( UuidIdentityGeneratorService.class ).visibleIn( Visibility.layer ); infraModule.services( OrgJsonValueSerializationService.class ) .visibleIn( Visibility.layer ) .taggedWith( ValueSerialization.Formats.JSON ); - new DefaultUnitOfWorkAssembler().assemble( infraModule ); return appAssembly; } ); } http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryMultimoduleTest.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryMultimoduleTest.java b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryMultimoduleTest.java index edd2652..6e50400 100755 --- a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryMultimoduleTest.java +++ b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryMultimoduleTest.java @@ -25,7 +25,6 @@ import org.apache.zest.api.common.Visibility; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.LayerAssembly; import org.apache.zest.bootstrap.ModuleAssembly; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.zest.index.elasticsearch.assembly.ESFilesystemIndexQueryAssembler; import org.apache.zest.library.fileconfig.FileConfigurationOverride; import org.apache.zest.library.fileconfig.FileConfigurationService; @@ -47,7 +46,6 @@ public class ElasticSearchQueryMultimoduleTest extends ElasticSearchQueryTest module = module.layer().module( "module2" ); new EntityTestAssembler().visibleIn( Visibility.layer ).assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); // Config module LayerAssembly configLayer = module.layer().application().layer( "config" ); http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfNamedQueryMultimoduleTest.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfNamedQueryMultimoduleTest.java b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfNamedQueryMultimoduleTest.java index e1434f9..d0b1d19 100755 --- a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfNamedQueryMultimoduleTest.java +++ b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfNamedQueryMultimoduleTest.java @@ -24,7 +24,6 @@ import org.apache.zest.api.common.Visibility; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.LayerAssembly; import org.apache.zest.bootstrap.ModuleAssembly; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.zest.index.rdf.assembly.RdfMemoryStoreAssembler; import org.apache.zest.test.EntityTestAssembler; @@ -40,12 +39,10 @@ public class RdfNamedQueryMultimoduleTest assembleValues( module, Visibility.module ); ModuleAssembly storeModule = layer.module( "store" ); - new DefaultUnitOfWorkAssembler().assemble( storeModule ); new EntityTestAssembler().visibleIn( Visibility.layer ).assemble( storeModule ); assembleValues( storeModule, Visibility.module ); ModuleAssembly indexModule = layer.module( "index" ); - new DefaultUnitOfWorkAssembler().assemble( indexModule ); new RdfMemoryStoreAssembler( Visibility.layer, Visibility.module ).assemble( indexModule ); } http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfQueryMultimoduleTest.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfQueryMultimoduleTest.java b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfQueryMultimoduleTest.java index 390818e..d25f79a 100755 --- a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfQueryMultimoduleTest.java +++ b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfQueryMultimoduleTest.java @@ -25,7 +25,6 @@ import org.apache.zest.api.common.Visibility; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.LayerAssembly; import org.apache.zest.bootstrap.ModuleAssembly; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.zest.index.rdf.assembly.RdfNativeSesameStoreAssembler; import org.apache.zest.library.rdf.repository.NativeConfiguration; import org.apache.zest.test.EntityTestAssembler; @@ -50,11 +49,9 @@ public class RdfQueryMultimoduleTest ModuleAssembly storeModule = layer.module( "store" ); new EntityTestAssembler().visibleIn( Visibility.layer ).assemble( storeModule ); assembleValues( storeModule, Visibility.module ); - new DefaultUnitOfWorkAssembler().assemble( storeModule ); ModuleAssembly indexModule = layer.module( "index" ); new RdfNativeSesameStoreAssembler( Visibility.layer, Visibility.module ).assemble( indexModule ); - new DefaultUnitOfWorkAssembler().assemble( indexModule ); LayerAssembly configLayer = module.layer().application().layer( "config" ); module.layer().uses( configLayer ); @@ -62,7 +59,6 @@ public class RdfQueryMultimoduleTest config.entities( NativeConfiguration.class ).visibleIn( Visibility.application ); config.forMixin( NativeConfiguration.class ).declareDefaults().dataDirectory().set( DATA_DIR.getAbsolutePath() ); new EntityTestAssembler().assemble( config ); - new DefaultUnitOfWorkAssembler().assemble( config ); } } http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi95/Qi95IssueTest.java ---------------------------------------------------------------------- diff --git a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi95/Qi95IssueTest.java b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi95/Qi95IssueTest.java old mode 100644 new mode 100755 index b67db87..757e030 --- a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi95/Qi95IssueTest.java +++ b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi95/Qi95IssueTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.Rule; -import org.junit.Test; import org.apache.zest.api.common.Visibility; import org.apache.zest.api.entity.EntityBuilder; import org.apache.zest.api.entity.EntityComposite; @@ -34,7 +31,14 @@ import org.apache.zest.api.structure.Application; import org.apache.zest.api.structure.Module; import org.apache.zest.api.unitofwork.UnitOfWork; import org.apache.zest.api.unitofwork.UnitOfWorkFactory; -import org.apache.zest.bootstrap.*; +import org.apache.zest.bootstrap.ApplicationAssembler; +import org.apache.zest.bootstrap.ApplicationAssembly; +import org.apache.zest.bootstrap.ApplicationAssemblyFactory; +import org.apache.zest.bootstrap.Assembler; +import org.apache.zest.bootstrap.AssemblyException; +import org.apache.zest.bootstrap.Energy4Java; +import org.apache.zest.bootstrap.LayerAssembly; +import org.apache.zest.bootstrap.ModuleAssembly; import org.apache.zest.entitystore.jdbm.JdbmConfiguration; import org.apache.zest.entitystore.jdbm.assembly.JdbmEntityStoreAssembler; import org.apache.zest.index.rdf.assembly.RdfMemoryStoreAssembler; @@ -43,8 +47,10 @@ import org.apache.zest.library.rdf.repository.NativeConfiguration; import org.apache.zest.test.EntityTestAssembler; import org.apache.zest.test.util.DelTreeAfter; import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationAssembler; +import org.junit.Rule; +import org.junit.Test; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class Qi95IssueTest { @@ -279,7 +285,6 @@ public class Qi95IssueTest throws AssemblyException { module.entities( ItemTypeEntity.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } } ); return domainLayer; @@ -295,7 +300,6 @@ public class Qi95IssueTest throws AssemblyException { new EntityTestAssembler().assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); module.entities( NativeConfiguration.class ).visibleIn( Visibility.application ); module.forMixin( NativeConfiguration.class ) @@ -323,7 +327,6 @@ public class Qi95IssueTest { new OrgJsonValueSerializationAssembler().assemble( module ); new JdbmEntityStoreAssembler().visibleIn( Visibility.application ).assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }; } @@ -333,7 +336,6 @@ public class Qi95IssueTest { ModuleAssembly moduleAssembly = layerAssembly.module( name ); assembler.assemble( moduleAssembly ); - new DefaultUnitOfWorkAssembler().assemble( moduleAssembly ); return moduleAssembly; } http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/extensions/migration/src/test/java/org/apache/zest/migration/MigrationTest.java ---------------------------------------------------------------------- diff --git a/extensions/migration/src/test/java/org/apache/zest/migration/MigrationTest.java b/extensions/migration/src/test/java/org/apache/zest/migration/MigrationTest.java old mode 100644 new mode 100755 index fe2b2fa..3c03020 --- a/extensions/migration/src/test/java/org/apache/zest/migration/MigrationTest.java +++ b/extensions/migration/src/test/java/org/apache/zest/migration/MigrationTest.java @@ -16,11 +16,6 @@ package org.apache.zest.migration; import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.hamcrest.CoreMatchers; -import org.json.JSONException; -import org.json.JSONObject; -import org.junit.Test; import org.apache.zest.api.activation.ActivationException; import org.apache.zest.api.service.importer.NewObjectImporter; import org.apache.zest.api.unitofwork.UnitOfWork; @@ -40,8 +35,12 @@ import org.apache.zest.spi.entitystore.helpers.JSONKeys; import org.apache.zest.spi.entitystore.helpers.StateStore; import org.apache.zest.test.AbstractZestTest; import org.apache.zest.test.EntityTestAssembler; +import org.hamcrest.CoreMatchers; +import org.json.JSONException; +import org.json.JSONObject; +import org.junit.Test; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.*; /** * JAVADOC @@ -54,7 +53,6 @@ public class MigrationTest throws AssemblyException { new EntityTestAssembler().assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); module.objects( MigrationEventLogger.class ); module.importedServices( MigrationEventLogger.class ).importedBy( NewObjectImporter.class ); http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/source/helper/EventRouterTest.java ---------------------------------------------------------------------- diff --git a/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/source/helper/EventRouterTest.java b/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/source/helper/EventRouterTest.java old mode 100644 new mode 100755 index b8785ee..92b326c --- a/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/source/helper/EventRouterTest.java +++ b/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/source/helper/EventRouterTest.java @@ -18,11 +18,6 @@ package org.apache.zest.library.eventsourcing.domain.source.helper; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.json.JSONException; -import org.json.JSONObject; -import org.junit.Before; -import org.junit.Test; import org.apache.zest.api.activation.ActivationException; import org.apache.zest.api.value.ValueBuilder; import org.apache.zest.bootstrap.AssemblyException; @@ -32,9 +27,13 @@ import org.apache.zest.io.Inputs; import org.apache.zest.io.Receiver; import org.apache.zest.library.eventsourcing.domain.api.DomainEventValue; import org.apache.zest.library.eventsourcing.domain.api.UnitOfWorkDomainEventsValue; +import org.json.JSONException; +import org.json.JSONObject; +import org.junit.Before; +import org.junit.Test; +import static org.apache.zest.test.util.JSONAssert.*; import static org.junit.Assert.assertEquals; -import static org.apache.zest.test.util.JSONAssert.jsonObjectsEquals; public class EventRouterTest { @@ -50,7 +49,6 @@ public class EventRouterTest public void assemble( ModuleAssembly module ) throws AssemblyException { module.values( UnitOfWorkDomainEventsValue.class, DomainEventValue.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }; http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/source/helper/EventsTest.java ---------------------------------------------------------------------- diff --git a/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/source/helper/EventsTest.java b/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/source/helper/EventsTest.java old mode 100644 new mode 100755 index 0402c4f..8c583da --- a/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/source/helper/EventsTest.java +++ b/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/source/helper/EventsTest.java @@ -18,9 +18,8 @@ */ package org.apache.zest.library.eventsourcing.domain.source.helper; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.Before; -import org.junit.Test; +import java.util.ArrayList; +import java.util.List; import org.apache.zest.api.activation.ActivationException; import org.apache.zest.api.value.ValueBuilder; import org.apache.zest.bootstrap.AssemblyException; @@ -28,16 +27,15 @@ import org.apache.zest.bootstrap.ModuleAssembly; import org.apache.zest.bootstrap.SingletonAssembler; import org.apache.zest.library.eventsourcing.domain.api.DomainEventValue; import org.apache.zest.library.eventsourcing.domain.api.UnitOfWorkDomainEventsValue; +import org.junit.Before; +import org.junit.Test; -import java.util.ArrayList; -import java.util.List; - -import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; -import static org.apache.zest.functional.Iterables.count; +import static org.apache.zest.functional.Iterables.*; import static org.apache.zest.io.Inputs.iterable; -import static org.apache.zest.io.Outputs.systemOut; -import static org.apache.zest.library.eventsourcing.domain.source.helper.Events.events; +import static org.apache.zest.io.Outputs.*; +import static org.apache.zest.library.eventsourcing.domain.source.helper.Events.*; +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; /** * TODO @@ -56,7 +54,6 @@ public class EventsTest public void assemble( ModuleAssembly module ) throws AssemblyException { module.values( UnitOfWorkDomainEventsValue.class, DomainEventValue.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }; http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/source/helper/UnitOfWorkRouterTest.java ---------------------------------------------------------------------- diff --git a/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/source/helper/UnitOfWorkRouterTest.java b/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/source/helper/UnitOfWorkRouterTest.java old mode 100644 new mode 100755 index 94b1d56..91394da --- a/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/source/helper/UnitOfWorkRouterTest.java +++ b/libraries/eventsourcing/src/test/java/org/apache/zest/library/eventsourcing/domain/source/helper/UnitOfWorkRouterTest.java @@ -18,11 +18,9 @@ */ package org.apache.zest.library.eventsourcing.domain.source.helper; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.hamcrest.CoreMatchers; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; import org.apache.zest.api.activation.ActivationException; import org.apache.zest.api.value.ValueBuilder; import org.apache.zest.bootstrap.AssemblyException; @@ -32,10 +30,10 @@ import org.apache.zest.io.Inputs; import org.apache.zest.io.Receiver; import org.apache.zest.library.eventsourcing.domain.api.DomainEventValue; import org.apache.zest.library.eventsourcing.domain.api.UnitOfWorkDomainEventsValue; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; +import org.hamcrest.CoreMatchers; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * TODO @@ -54,7 +52,6 @@ public class UnitOfWorkRouterTest public void assemble( ModuleAssembly module ) throws AssemblyException { module.values( UnitOfWorkDomainEventsValue.class, DomainEventValue.class ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }; http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldCompositeTest.java ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldCompositeTest.java b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldCompositeTest.java old mode 100644 new mode 100755 index 0f53355..5de7f53 --- a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldCompositeTest.java +++ b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/HelloWorldCompositeTest.java @@ -18,7 +18,6 @@ import org.apache.zest.api.unitofwork.UnitOfWork; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; import org.apache.zest.bootstrap.SingletonAssembler; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.zest.index.rdf.assembly.RdfMemoryStoreAssembler; import org.apache.zest.spi.query.IndexExporter; import org.apache.zest.test.EntityTestAssembler; @@ -85,7 +84,6 @@ public class HelloWorldCompositeTest new EntityTestAssembler().assemble( module ); new RdfMemoryStoreAssembler().assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); } }; http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/libraries/rest/src/test/java/org/apache/zest/library/rest/admin/RestTest.java ---------------------------------------------------------------------- diff --git a/libraries/rest/src/test/java/org/apache/zest/library/rest/admin/RestTest.java b/libraries/rest/src/test/java/org/apache/zest/library/rest/admin/RestTest.java old mode 100644 new mode 100755 index bb75c84..5dbe4c8 --- a/libraries/rest/src/test/java/org/apache/zest/library/rest/admin/RestTest.java +++ b/libraries/rest/src/test/java/org/apache/zest/library/rest/admin/RestTest.java @@ -40,7 +40,6 @@ import org.apache.zest.bootstrap.ApplicationAssemblerAdapter; import org.apache.zest.bootstrap.Assembler; import org.apache.zest.bootstrap.AssemblyException; import org.apache.zest.bootstrap.ModuleAssembly; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; import org.apache.zest.entitystore.memory.MemoryEntityStoreService; import org.apache.zest.index.rdf.assembly.RdfMemoryStoreAssembler; import org.apache.zest.spi.uuid.UuidIdentityGeneratorService; @@ -48,11 +47,8 @@ import org.apache.zest.test.AbstractZestTest; import org.junit.Before; import org.junit.Test; -import static org.hamcrest.CoreMatchers.anyOf; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; public class RestTest extends AbstractZestTest @@ -69,8 +65,7 @@ public class RestTest { RestTest.this, new RestAssembler(), - new RdfMemoryStoreAssembler(), - new DefaultUnitOfWorkAssembler() + new RdfMemoryStoreAssembler() } } } ) http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/libraries/sql-liquibase/src/test/java/org/apache/zest/library/sql/liquibase/LiquibaseServiceTest.java ---------------------------------------------------------------------- diff --git a/libraries/sql-liquibase/src/test/java/org/apache/zest/library/sql/liquibase/LiquibaseServiceTest.java b/libraries/sql-liquibase/src/test/java/org/apache/zest/library/sql/liquibase/LiquibaseServiceTest.java old mode 100644 new mode 100755 index 8555f14..91b1c77 --- a/libraries/sql-liquibase/src/test/java/org/apache/zest/library/sql/liquibase/LiquibaseServiceTest.java +++ b/libraries/sql-liquibase/src/test/java/org/apache/zest/library/sql/liquibase/LiquibaseServiceTest.java @@ -21,8 +21,6 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Function; import javax.sql.DataSource; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.Test; import org.apache.zest.api.activation.ActivationEvent; import org.apache.zest.api.activation.ActivationEventListener; import org.apache.zest.api.activation.ActivationException; @@ -41,12 +39,12 @@ import org.apache.zest.library.sql.assembly.DataSourceAssembler; import org.apache.zest.library.sql.common.Databases; import org.apache.zest.library.sql.dbcp.DBCPDataSourceServiceAssembler; import org.apache.zest.test.EntityTestAssembler; +import org.junit.Test; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.apache.zest.io.Outputs.collection; -import static org.apache.zest.io.Transforms.map; +import static org.apache.zest.io.Outputs.*; +import static org.apache.zest.io.Transforms.*; +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; /** * Test DataSource and Liquibase services @@ -87,8 +85,6 @@ public class LiquibaseServiceTest // END SNIPPET: assembly module.forMixin( LiquibaseConfiguration.class ).declareDefaults().enabled().set( true ); module.forMixin( LiquibaseConfiguration.class ).declareDefaults().changeLog().set( "changelog.xml" ); - - new DefaultUnitOfWorkAssembler().assemble( module ); } @Override http://git-wip-us.apache.org/repos/asf/zest-java/blob/25eadfab/libraries/sql/src/test/java/org/apache/zest/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java ---------------------------------------------------------------------- diff --git a/libraries/sql/src/test/java/org/apache/zest/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java b/libraries/sql/src/test/java/org/apache/zest/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java index 25eeb26..63b29e1 100755 --- a/libraries/sql/src/test/java/org/apache/zest/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java +++ b/libraries/sql/src/test/java/org/apache/zest/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java @@ -18,9 +18,6 @@ import java.beans.PropertyVetoException; import java.sql.ResultSet; import java.sql.SQLException; import javax.sql.DataSource; -import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler; -import org.junit.Assert; -import org.junit.Test; import org.apache.zest.api.activation.ActivationException; import org.apache.zest.api.common.Visibility; import org.apache.zest.api.injection.scope.Service; @@ -41,6 +38,8 @@ import org.apache.zest.library.sql.dbcp.DBCPDataSourceServiceAssembler; import org.apache.zest.library.sql.liquibase.LiquibaseConfiguration; import org.apache.zest.library.sql.liquibase.LiquibaseService; import org.apache.zest.test.EntityTestAssembler; +import org.junit.Assert; +import org.junit.Test; /** * Test of export of DataSources to JMX, and some other stuff @@ -80,8 +79,6 @@ public class DataSourceConfigurationManagerServiceTest // Create in-memory store for configurations new EntityTestAssembler().visibleIn( Visibility.layer ).assemble( module ); - new DefaultUnitOfWorkAssembler().assemble( module ); - // Set up DataSource service that will manage the connection pools new DBCPDataSourceServiceAssembler().identifiedBy( "datasource-service" ).visibleIn( Visibility.layer ).assemble( module );
