:manual:recipes refine snippets
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/342ee70d Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/342ee70d Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/342ee70d Branch: refs/heads/develop Commit: 342ee70d51081b38edc2f2c08ed093a0948b6b42 Parents: 153d102 Author: Paul Merlin <[email protected]> Authored: Mon May 15 09:46:27 2017 +0200 Committer: Paul Merlin <[email protected]> Committed: Mon May 15 09:46:27 2017 +0200 ---------------------------------------------------------------------- .../polygene/manual/recipes/assemble/Docs.java | 3 +- .../polygene/manual/recipes/assemble/Main.java | 41 +++++++------------- .../recipes/contextualFragments/TraceAll.java | 2 - .../recipes/createEntity/AccidentValue.java | 2 +- .../manual/recipes/createEntity/CarEntity.java | 4 +- .../createEntity/CarEntityFactoryService.java | 3 +- .../manual/recipes/createEntity/Main.java | 10 +---- .../createEntity/ManufacturerEntity.java | 4 +- .../ManufacturerRepositoryMixin.java | 2 +- .../ManufacturerRepositoryService.java | 3 +- .../recipes/createEntity/MyAssembler.java | 2 +- .../manual/recipes/sideeffects/OrderEntity.java | 4 +- .../org/apache/polygene/manual/travel/Main.java | 13 +++---- .../manual/travel/TravelPlanService.java | 3 +- 14 files changed, 36 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/342ee70d/manual/src/main/java/org/apache/polygene/manual/recipes/assemble/Docs.java ---------------------------------------------------------------------- diff --git a/manual/src/main/java/org/apache/polygene/manual/recipes/assemble/Docs.java b/manual/src/main/java/org/apache/polygene/manual/recipes/assemble/Docs.java index ff80d98..7c27654 100644 --- a/manual/src/main/java/org/apache/polygene/manual/recipes/assemble/Docs.java +++ b/manual/src/main/java/org/apache/polygene/manual/recipes/assemble/Docs.java @@ -22,7 +22,6 @@ package org.apache.polygene.manual.recipes.assemble; import org.apache.polygene.api.injection.scope.This; import org.apache.polygene.api.unitofwork.UnitOfWork; import org.apache.polygene.api.unitofwork.UnitOfWorkFactory; -import org.apache.polygene.api.value.ValueComposite; public class Docs { @@ -49,7 +48,7 @@ public class Docs { } - public interface PersonEntity extends ValueComposite + public interface PersonEntity { } } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/342ee70d/manual/src/main/java/org/apache/polygene/manual/recipes/assemble/Main.java ---------------------------------------------------------------------- diff --git a/manual/src/main/java/org/apache/polygene/manual/recipes/assemble/Main.java b/manual/src/main/java/org/apache/polygene/manual/recipes/assemble/Main.java index a1c87e2..abdf123 100644 --- a/manual/src/main/java/org/apache/polygene/manual/recipes/assemble/Main.java +++ b/manual/src/main/java/org/apache/polygene/manual/recipes/assemble/Main.java @@ -20,8 +20,6 @@ package org.apache.polygene.manual.recipes.assemble; import org.apache.polygene.api.common.Visibility; -import org.apache.polygene.api.entity.EntityComposite; -import org.apache.polygene.api.service.ServiceComposite; import org.apache.polygene.api.structure.Application; import org.apache.polygene.bootstrap.*; @@ -39,18 +37,14 @@ public class Main polygene = new Energy4Java(); // Instantiate the Application Model. - application = polygene.newApplication( new ApplicationAssembler() - { - public ApplicationAssembly assemble( - ApplicationAssemblyFactory factory ) - throws AssemblyException + application = polygene.newApplication( + factory -> { - ApplicationAssembly assembly = - factory.newApplicationAssembly(); + ApplicationAssembly assembly = factory.newApplicationAssembly(); LayerAssembly runtime = createRuntimeLayer( assembly ); LayerAssembly designer = createDesignerLayer( assembly ); LayerAssembly domain = createDomainLayer( assembly ); - LayerAssembly messaging= createMessagingLayer( assembly ); + LayerAssembly messaging = createMessagingLayer( assembly ); LayerAssembly persistence = createPersistenceLayer( assembly ); // declare structure between layers @@ -61,8 +55,7 @@ public class Main runtime.uses( domain ); return assembly; - } - } ); + } ); // We need to handle shutdown. installShutdownHook(); @@ -74,26 +67,22 @@ public class Main // END SNIPPET: main private static LayerAssembly createRuntimeLayer( ApplicationAssembly app ) { - LayerAssembly layer = app.layer( "runtime-layer" ); - return layer; + return app.layer( "runtime-layer" ); } private static LayerAssembly createDesignerLayer( ApplicationAssembly app ) { - LayerAssembly layer = app.layer( "designer-layer" ); - return layer; + return app.layer( "designer-layer" ); } private static LayerAssembly createMessagingLayer( ApplicationAssembly app ) { - LayerAssembly layer = app.layer( "messaging-layer" ); - return layer; + return app.layer( "messaging-layer" ); } private static LayerAssembly createPersistenceLayer( ApplicationAssembly app ) { - LayerAssembly layer = app.layer( "persistence-layer" ); - return layer; + return app.layer( "persistence-layer" ); } // START SNIPPET: domainLayer @@ -165,10 +154,10 @@ public class Main } // END SNIPPET: main -interface AccountEntity extends EntityComposite {}; -interface EntryEntity extends EntityComposite {}; +interface AccountEntity {} +interface EntryEntity {} -interface AccountFactoryService extends ServiceComposite{}; -interface EntryFactoryService extends ServiceComposite{}; -interface EntryRepositoryService extends ServiceComposite{}; -interface AccountRepositoryService extends ServiceComposite{}; +interface AccountFactoryService {} +interface EntryFactoryService {} +interface EntryRepositoryService {} +interface AccountRepositoryService {} http://git-wip-us.apache.org/repos/asf/polygene-java/blob/342ee70d/manual/src/main/java/org/apache/polygene/manual/recipes/contextualFragments/TraceAll.java ---------------------------------------------------------------------- diff --git a/manual/src/main/java/org/apache/polygene/manual/recipes/contextualFragments/TraceAll.java b/manual/src/main/java/org/apache/polygene/manual/recipes/contextualFragments/TraceAll.java index f5683b6..aab3e17 100644 --- a/manual/src/main/java/org/apache/polygene/manual/recipes/contextualFragments/TraceAll.java +++ b/manual/src/main/java/org/apache/polygene/manual/recipes/contextualFragments/TraceAll.java @@ -19,7 +19,6 @@ */ package org.apache.polygene.manual.recipes.contextualFragments; -import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.bootstrap.ServiceDeclaration; import org.apache.polygene.library.logging.trace.TraceAllConcern; @@ -28,7 +27,6 @@ import org.apache.polygene.library.logging.trace.TraceAllConcern; public class TraceAll { public void assemble( ModuleAssembly module ) - throws AssemblyException { ServiceDeclaration decl = module.addServices( PinSearchService.class ); if( Boolean.getBoolean( "trace.all" ) ) http://git-wip-us.apache.org/repos/asf/polygene-java/blob/342ee70d/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/AccidentValue.java ---------------------------------------------------------------------- diff --git a/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/AccidentValue.java b/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/AccidentValue.java index bb98738..abc320a 100644 --- a/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/AccidentValue.java +++ b/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/AccidentValue.java @@ -22,7 +22,7 @@ package org.apache.polygene.manual.recipes.createEntity; import org.apache.polygene.api.value.ValueComposite; // START SNIPPET: composite -public interface AccidentValue extends Accident, ValueComposite +public interface AccidentValue extends Accident {} // END SNIPPET: composite \ No newline at end of file http://git-wip-us.apache.org/repos/asf/polygene-java/blob/342ee70d/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/CarEntity.java ---------------------------------------------------------------------- diff --git a/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/CarEntity.java b/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/CarEntity.java index 1c35f17..e93fcc6 100644 --- a/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/CarEntity.java +++ b/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/CarEntity.java @@ -19,10 +19,10 @@ */ package org.apache.polygene.manual.recipes.createEntity; -import org.apache.polygene.api.entity.EntityComposite; +import org.apache.polygene.api.identity.HasIdentity; // START SNIPPET: composite -public interface CarEntity extends Car, EntityComposite +public interface CarEntity extends HasIdentity, Car {} // END SNIPPET: composite \ No newline at end of file http://git-wip-us.apache.org/repos/asf/polygene-java/blob/342ee70d/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/CarEntityFactoryService.java ---------------------------------------------------------------------- diff --git a/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/CarEntityFactoryService.java b/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/CarEntityFactoryService.java index f2a6ece..18a535a 100644 --- a/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/CarEntityFactoryService.java +++ b/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/CarEntityFactoryService.java @@ -20,11 +20,10 @@ package org.apache.polygene.manual.recipes.createEntity; import org.apache.polygene.api.mixin.Mixins; -import org.apache.polygene.api.service.ServiceComposite; // START SNIPPET: carFactoryService @Mixins( { CarEntityFactoryMixin.class } ) public interface CarEntityFactoryService - extends CarEntityFactory, ServiceComposite + extends CarEntityFactory {} // END SNIPPET: carFactoryService http://git-wip-us.apache.org/repos/asf/polygene-java/blob/342ee70d/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/Main.java ---------------------------------------------------------------------- diff --git a/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/Main.java b/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/Main.java index 21370bc..69a3cff 100644 --- a/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/Main.java +++ b/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/Main.java @@ -30,14 +30,8 @@ public class Main Energy4Java polygene = new Energy4Java(); // Instantiate the Application Model. - Application application = polygene.newApplication( new ApplicationAssembler() - { - @Override - public ApplicationAssembly assemble(ApplicationAssemblyFactory applicationFactory) throws AssemblyException - { - return applicationFactory.newApplicationAssembly( new MyAssembler()) ; - } - }); + Application application = polygene.newApplication( + factory -> factory.newApplicationAssembly( new MyAssembler()) ); application.activate(); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/342ee70d/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/ManufacturerEntity.java ---------------------------------------------------------------------- diff --git a/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/ManufacturerEntity.java b/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/ManufacturerEntity.java index 772435b..19bfe0c 100644 --- a/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/ManufacturerEntity.java +++ b/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/ManufacturerEntity.java @@ -19,10 +19,10 @@ */ package org.apache.polygene.manual.recipes.createEntity; -import org.apache.polygene.api.entity.EntityComposite; +import org.apache.polygene.api.identity.HasIdentity; // START SNIPPET: composite -public interface ManufacturerEntity extends Manufacturer, EntityComposite +public interface ManufacturerEntity extends HasIdentity, Manufacturer {} // END SNIPPET: composite \ No newline at end of file http://git-wip-us.apache.org/repos/asf/polygene-java/blob/342ee70d/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/ManufacturerRepositoryMixin.java ---------------------------------------------------------------------- diff --git a/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/ManufacturerRepositoryMixin.java b/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/ManufacturerRepositoryMixin.java index 145bb3f..c70af1f 100644 --- a/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/ManufacturerRepositoryMixin.java +++ b/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/ManufacturerRepositoryMixin.java @@ -32,7 +32,7 @@ import static org.apache.polygene.api.query.QueryExpressions.templateFor; // START SNIPPET: repo public class ManufacturerRepositoryMixin - implements ManufacturerRepository + implements ManufacturerRepository { @Structure private UnitOfWorkFactory uowf; http://git-wip-us.apache.org/repos/asf/polygene-java/blob/342ee70d/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/ManufacturerRepositoryService.java ---------------------------------------------------------------------- diff --git a/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/ManufacturerRepositoryService.java b/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/ManufacturerRepositoryService.java index 56ed113..83943a8 100644 --- a/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/ManufacturerRepositoryService.java +++ b/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/ManufacturerRepositoryService.java @@ -20,11 +20,10 @@ package org.apache.polygene.manual.recipes.createEntity; import org.apache.polygene.api.mixin.Mixins; -import org.apache.polygene.api.service.ServiceComposite; // START SNIPPET: manufacturerRepositoryService @Mixins( ManufacturerRepositoryMixin.class ) public interface ManufacturerRepositoryService - extends ManufacturerRepository, ServiceComposite + extends ManufacturerRepository {} // END SNIPPET: manufacturerRepositoryService http://git-wip-us.apache.org/repos/asf/polygene-java/blob/342ee70d/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/MyAssembler.java ---------------------------------------------------------------------- diff --git a/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/MyAssembler.java b/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/MyAssembler.java index e29ea18..ed5b1b1 100644 --- a/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/MyAssembler.java +++ b/manual/src/main/java/org/apache/polygene/manual/recipes/createEntity/MyAssembler.java @@ -26,7 +26,7 @@ import org.apache.polygene.bootstrap.ModuleAssembly; // START SNIPPET: assembler2 // START SNIPPET: assembler1 public class MyAssembler - implements Assembler + implements Assembler { public void assemble( ModuleAssembly module ) { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/342ee70d/manual/src/main/java/org/apache/polygene/manual/recipes/sideeffects/OrderEntity.java ---------------------------------------------------------------------- diff --git a/manual/src/main/java/org/apache/polygene/manual/recipes/sideeffects/OrderEntity.java b/manual/src/main/java/org/apache/polygene/manual/recipes/sideeffects/OrderEntity.java index 526fb1c..cfd32ab 100644 --- a/manual/src/main/java/org/apache/polygene/manual/recipes/sideeffects/OrderEntity.java +++ b/manual/src/main/java/org/apache/polygene/manual/recipes/sideeffects/OrderEntity.java @@ -19,14 +19,14 @@ */ package org.apache.polygene.manual.recipes.sideeffects; -import org.apache.polygene.api.entity.EntityComposite; +import org.apache.polygene.api.identity.HasIdentity; import org.apache.polygene.api.sideeffect.SideEffects; // START SNIPPET: body @SideEffects( MailNotifySideEffect.class ) public interface OrderEntity extends Order, HasSequenceNumber, HasCustomer, - HasLineItems, Confirmable, EntityComposite + HasLineItems, Confirmable, HasIdentity { } // END SNIPPET: body http://git-wip-us.apache.org/repos/asf/polygene-java/blob/342ee70d/manual/src/main/java/org/apache/polygene/manual/travel/Main.java ---------------------------------------------------------------------- diff --git a/manual/src/main/java/org/apache/polygene/manual/travel/Main.java b/manual/src/main/java/org/apache/polygene/manual/travel/Main.java index b419c28..244e0ac 100644 --- a/manual/src/main/java/org/apache/polygene/manual/travel/Main.java +++ b/manual/src/main/java/org/apache/polygene/manual/travel/Main.java @@ -19,7 +19,6 @@ */ package org.apache.polygene.manual.travel; -import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.bootstrap.SingletonAssembler; @@ -30,9 +29,9 @@ public class Main { SingletonAssembler singleton = new SingletonAssembler() { + // START SNIPPET: assemble @Override -// START SNIPPET: assemble - public void assemble(ModuleAssembly module) throws AssemblyException + public void assemble(ModuleAssembly module) { module.addServices(TravelPlanService.class) .instantiateOnStartup() @@ -42,7 +41,7 @@ public class Main .instantiateOnStartup() .identifiedBy("OrbitzService"); } -// END SNIPPET: assemble + // END SNIPPET: assemble }; } @@ -50,13 +49,13 @@ public class Main { SingletonAssembler singleton = new SingletonAssembler() { + // START SNIPPET: simple @Override -// START SNIPPET: simple - public void assemble(ModuleAssembly module) throws AssemblyException + public void assemble(ModuleAssembly module) { module.addServices(TravelPlanService.class).instantiateOnStartup(); } -// END SNIPPET: simple + // END SNIPPET: simple }; } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/342ee70d/manual/src/main/java/org/apache/polygene/manual/travel/TravelPlanService.java ---------------------------------------------------------------------- diff --git a/manual/src/main/java/org/apache/polygene/manual/travel/TravelPlanService.java b/manual/src/main/java/org/apache/polygene/manual/travel/TravelPlanService.java index 1f48558..9398fe5 100644 --- a/manual/src/main/java/org/apache/polygene/manual/travel/TravelPlanService.java +++ b/manual/src/main/java/org/apache/polygene/manual/travel/TravelPlanService.java @@ -23,10 +23,9 @@ package org.apache.polygene.manual.travel; // END SNIPPET: serviceComposite import org.apache.polygene.api.mixin.Mixins; -import org.apache.polygene.api.service.ServiceComposite; // START SNIPPET: serviceComposite @Mixins( { TravelPlanMixin.class } ) -public interface TravelPlanService extends TravelPlan, ServiceComposite +public interface TravelPlanService extends TravelPlan {} // END SNIPPET: serviceComposite \ No newline at end of file
