Remove ValueSerialization “type finder” concept as there’s no implementation behind it

eskatos · eskatos · commit b675c1a5cb0d · 2017-01-15T20:02:24.000+01:00
No use of the meta info Function at all.

ValueDeserializer API takes the module to use as a parameter.
diff --git a/core/api/src/test/java/org/apache/polygene/api/value/DocumentationSupport.java b/core/api/src/test/java/org/apache/polygene/api/value/DocumentationSupport.java
@@ -229,17 +229,7 @@ public void assembledWithValuesModuleSerialization()
                         {
                             servicesModule -> {
                                 servicesModule.setName( "SERVICES-Module" );
-
-                                Function<Application, Module> valuesModuleFinder = new Function<Application, Module>()
-                                {
-                                    @Override
-                                    public Module apply( Application app1 )
-                                    {
-                                        return app1.findModule( "SINGLE-Layer", "VALUES-Module" );
-                                    }
-                                };
                                 new OrgJsonValueSerializationAssembler().
-                                    withValuesModuleFinder( valuesModuleFinder ).
                                     assemble( servicesModule );
                             }
                         }
diff --git a/extensions/valueserialization-jackson/src/main/java/org/apache/polygene/valueserialization/jackson/JacksonValueSerializationAssembler.java b/extensions/valueserialization-jackson/src/main/java/org/apache/polygene/valueserialization/jackson/JacksonValueSerializationAssembler.java
@@ -19,9 +19,6 @@
  */
 package org.apache.polygene.valueserialization.jackson;
 
-import java.util.function.Function;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Module;
 import org.apache.polygene.api.value.ValueSerialization;
 import org.apache.polygene.bootstrap.Assemblers;
 import org.apache.polygene.bootstrap.AssemblyException;
@@ -33,30 +30,12 @@
 public class JacksonValueSerializationAssembler
     extends Assemblers.Visibility<JacksonValueSerializationAssembler>
 {
-    private Function<Application, Module> valuesModuleFinder;
-
-    public JacksonValueSerializationAssembler withValuesModuleFinder( Function<Application, Module> valuesModuleFinder )
-    {
-        this.valuesModuleFinder = valuesModuleFinder;
-        return this;
-    }
-
     @Override
     public void assemble( ModuleAssembly module )
         throws AssemblyException
     {
-        if( valuesModuleFinder == null )
-        {
-            module.services( JacksonValueSerializationService.class ).
-                visibleIn( visibility() ).
-                taggedWith( ValueSerialization.Formats.JSON );
-        }
-        else
-        {
-            module.services( JacksonValueSerializationService.class ).
-                visibleIn( visibility() ).
-                taggedWith( ValueSerialization.Formats.JSON ).
-                setMetaInfo( valuesModuleFinder );
-        }
+        module.services( JacksonValueSerializationService.class ).
+            visibleIn( visibility() ).
+                  taggedWith( ValueSerialization.Formats.JSON );
     }
 }
diff --git a/extensions/valueserialization-orgjson/src/main/java/org/apache/polygene/valueserialization/orgjson/OrgJsonValueSerializationAssembler.java b/extensions/valueserialization-orgjson/src/main/java/org/apache/polygene/valueserialization/orgjson/OrgJsonValueSerializationAssembler.java
@@ -19,9 +19,6 @@
  */
 package org.apache.polygene.valueserialization.orgjson;
 
-import java.util.function.Function;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Module;
 import org.apache.polygene.api.value.ValueSerialization;
 import org.apache.polygene.bootstrap.Assemblers;
 import org.apache.polygene.bootstrap.AssemblyException;
@@ -33,30 +30,12 @@
 public class OrgJsonValueSerializationAssembler
     extends Assemblers.Visibility<OrgJsonValueSerializationAssembler>
 {
-    private Function<Application, Module> valuesModuleFinder;
-
-    public OrgJsonValueSerializationAssembler withValuesModuleFinder( Function<Application, Module> valuesModuleFinder )
-    {
-        this.valuesModuleFinder = valuesModuleFinder;
-        return this;
-    }
-
     @Override
     public void assemble( ModuleAssembly module )
         throws AssemblyException
     {
-        if( valuesModuleFinder == null )
-        {
-            module.services( OrgJsonValueSerializationService.class ).
-                visibleIn( visibility() ).
-                taggedWith( ValueSerialization.Formats.JSON );
-        }
-        else
-        {
-            module.services( OrgJsonValueSerializationService.class ).
-                visibleIn( visibility() ).
-                taggedWith( ValueSerialization.Formats.JSON ).
-                setMetaInfo( valuesModuleFinder );
-        }
+        module.services( OrgJsonValueSerializationService.class ).
+            visibleIn( visibility() ).
+                  taggedWith( ValueSerialization.Formats.JSON );
     }
 }
diff --git a/extensions/valueserialization-stax/src/main/java/org/apache/polygene/valueserialization/stax/StaxValueSerializationAssembler.java b/extensions/valueserialization-stax/src/main/java/org/apache/polygene/valueserialization/stax/StaxValueSerializationAssembler.java
@@ -19,9 +19,6 @@
  */
 package org.apache.polygene.valueserialization.stax;
 
-import java.util.function.Function;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Module;
 import org.apache.polygene.api.value.ValueSerialization;
 import org.apache.polygene.bootstrap.Assemblers;
 import org.apache.polygene.bootstrap.AssemblyException;
@@ -33,30 +30,12 @@
 public class StaxValueSerializationAssembler
     extends Assemblers.Visibility<StaxValueSerializationAssembler>
 {
-    private Function<Application, Module> valuesModuleFinder;
-
-    public StaxValueSerializationAssembler withValuesModuleFinder( Function<Application, Module> valuesModuleFinder )
-    {
-        this.valuesModuleFinder = valuesModuleFinder;
-        return this;
-    }
-
     @Override
     public void assemble( ModuleAssembly module )
         throws AssemblyException
     {
-        if( valuesModuleFinder == null )
-        {
-            module.services( StaxValueSerializationService.class ).
-                visibleIn( visibility() ).
-                taggedWith( ValueSerialization.Formats.XML );
-        }
-        else
-        {
-            module.services( StaxValueSerializationService.class ).
-                visibleIn( visibility() ).
-                taggedWith( ValueSerialization.Formats.XML ).
-                setMetaInfo( valuesModuleFinder );
-        }
+        module.services( StaxValueSerializationService.class ).
+            visibleIn( visibility() ).
+                  taggedWith( ValueSerialization.Formats.XML );
     }
 }
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/domain/DomainLayer.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/domain/DomainLayer.java
@@ -19,9 +19,6 @@
  */
 package org.apache.polygene.library.restlet.assembly.domain;
 
-import java.util.function.Function;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Module;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.LayerAssembly;
 import org.apache.polygene.bootstrap.layered.LayerAssembler;
@@ -39,9 +36,4 @@ public LayerAssembly assemble( LayerAssembly layer )
         createModule( layer, CrudModule.class );
         return layer;
     }
-
-    public static Function<Application, Module> typeFinder()
-    {
-        return application -> application.findModule( "Domain Layer", "TypeFinder Module" );
-    }
 }
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/InfrastructureLayer.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/InfrastructureLayer.java
@@ -20,44 +20,37 @@
 
 package org.apache.polygene.library.restlet.assembly.infrastructue;
 
-import java.util.function.Function;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Module;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.LayerAssembly;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.bootstrap.layered.LayerAssembler;
 import org.apache.polygene.bootstrap.layered.LayeredLayerAssembler;
 import org.apache.polygene.library.restlet.assembly.configuration.ConfigurationLayer;
 import org.apache.polygene.library.restlet.assembly.configuration.ConfigurationModule;
-import org.apache.polygene.library.restlet.assembly.domain.DomainLayer;
 
 public class InfrastructureLayer extends LayeredLayerAssembler
     implements LayerAssembler
 {
     public static final String NAME = "Infrastructure Layer";
     private final ModuleAssembly configModule;
-    private final Function<Application, Module> typeFinder;
 
     public static InfrastructureLayer create( LayerAssembly layer )
     {
-        Function<Application, Module> typeFinder = DomainLayer.typeFinder();
         ModuleAssembly config = layer.application().layer( ConfigurationLayer.NAME ).module( ConfigurationModule.NAME );
-        return new InfrastructureLayer( config, typeFinder );
+        return new InfrastructureLayer( config );
     }
 
-    public InfrastructureLayer( ModuleAssembly configModule, Function<Application, Module> typeFinder )
+    public InfrastructureLayer( ModuleAssembly configModule )
     {
         this.configModule = configModule;
-        this.typeFinder = typeFinder;
     }
 
     @Override
     public LayerAssembly assemble( LayerAssembly layer )
         throws AssemblyException
     {
         new IndexingModule( configModule ).assemble( layer, layer.module( IndexingModule.NAME ) );
-        new SerializationModule( typeFinder ).assemble( layer, layer.module( SerializationModule.NAME ) );
+        new SerializationModule().assemble( layer, layer.module( SerializationModule.NAME ) );
         return layer;
     }
 }
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/SerializationModule.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/SerializationModule.java
@@ -20,10 +20,7 @@
 
 package org.apache.polygene.library.restlet.assembly.infrastructue;
 
-import java.util.function.Function;
 import org.apache.polygene.api.common.Visibility;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Module;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.LayerAssembly;
 import org.apache.polygene.bootstrap.ModuleAssembly;
@@ -34,20 +31,13 @@ public class SerializationModule
     implements ModuleAssembler
 {
     public static final String NAME = "Serialization Module";
-    private final Function<Application, Module> typeFinder;
-
-    public SerializationModule( Function<Application, Module> typeFinder )
-    {
-        this.typeFinder = typeFinder;
-    }
 
     @Override
     public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
         throws AssemblyException
     {
         new JacksonValueSerializationAssembler()
             .visibleIn( Visibility.layer )
-            .withValuesModuleFinder( typeFinder )
             .assemble( module );
         return module;
     }
diff --git a/samples/forum/src/main/java/org/apache/polygene/sample/forum/assembler/ForumAssembler.java b/samples/forum/src/main/java/org/apache/polygene/sample/forum/assembler/ForumAssembler.java
@@ -85,7 +85,6 @@ public ApplicationAssembly assemble( ApplicationAssemblyFactory applicationFacto
             ModuleAssembly serialization = infrastructure.module( "Serialization" );
             new OrgJsonValueSerializationAssembler().
                 visibleIn( Visibility.application ).
-                withValuesModuleFinder( app -> app.findModule( "REST", "Values" ) ).
                 assemble( serialization );
 
             ModuleAssembly entityStore = infrastructure.module( "EntityStore" );
diff --git a/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/assembly/StorageModule.java b/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/assembly/StorageModule.java
@@ -37,7 +37,6 @@ public void assemble( ModuleAssembly module )
         module.services( MemoryEntityStoreService.class ).visibleIn( Visibility.application );
         new OrgJsonValueSerializationAssembler().
             visibleIn( Visibility.application ).
-            withValuesModuleFinder( app -> app.findModule( "DomainLayer", "RentalModule" ) ).
             assemble( module );
     }
 }
diff --git a/tools/generator-polygene/app/templates/DomainLayer/bootstrap.tmpl b/tools/generator-polygene/app/templates/DomainLayer/bootstrap.tmpl
@@ -19,9 +19,6 @@
 -%>
 package <%= packageName %>.bootstrap.domain;
 
-import java.util.function.Function;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Module;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.LayerAssembly;
 import org.apache.polygene.bootstrap.layered.LayerAssembler;
@@ -38,9 +35,4 @@ public class DomainLayer extends LayeredLayerAssembler
         createModule( layer, SecurityModule.class );
         return layer;
     }
-
-    public static Function<Application, Module> typeFinder()
-    {
-        return application -> application.findModule( "Domain Layer", "Assets Module" );
-    }
 }
diff --git a/tools/generator-polygene/app/templates/Heroes/bootstrap.tmpl b/tools/generator-polygene/app/templates/Heroes/bootstrap.tmpl
@@ -23,10 +23,6 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.function.Function;
-
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Module;
 
 import org.apache.polygene.bootstrap.ApplicationAssembly;
 import org.apache.polygene.bootstrap.AssemblyException;
@@ -57,8 +53,7 @@ public class HeroesApplicationAssembler extends LayeredApplicationAssembler
         LayerAssembly configLayer = createLayer( ConfigurationLayer.class );
         ModuleAssembly configModule = assemblerOf( ConfigurationLayer.class ).configModule();
         LayerAssembly domainLayer = createLayer( DomainLayer.class );
-        Function<Application, Module> typeFinder = DomainLayer.typeFinder();
-        LayerAssembly infraLayer = new InfrastructureLayer( configModule, typeFinder ).assemble( assembly.layer( InfrastructureLayer.NAME ) );
+        LayerAssembly infraLayer = new InfrastructureLayer( configModule ).assemble( assembly.layer( InfrastructureLayer.NAME ) );
         LayerAssembly connectivityLayer = createLayer( ConnectivityLayer.class );
         connectivityLayer.uses( domainLayer );
         domainLayer.uses( infraLayer );
diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/bootstrap.tmpl b/tools/generator-polygene/app/templates/InfrastructureLayer/bootstrap.tmpl
@@ -19,9 +19,6 @@
 -%>
 package <%= packageName %>.bootstrap.infrastructure;
 
-import java.util.function.Function;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Module;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.LayerAssembly;
 import org.apache.polygene.bootstrap.ModuleAssembly;
@@ -33,12 +30,10 @@ public class InfrastructureLayer extends LayeredLayerAssembler
 {
     public static final String NAME = "Infrastructure Layer";
     private final ModuleAssembly configModule;
-    private final Function<Application, Module> typeFinder;
 
-    public InfrastructureLayer( ModuleAssembly configModule, Function<Application, Module> typeFinder )
+    public InfrastructureLayer( ModuleAssembly configModule )
     {
         this.configModule = configModule;
-        this.typeFinder = typeFinder;
     }
 
     @Override
@@ -49,7 +44,7 @@ public class InfrastructureLayer extends LayeredLayerAssembler
 
         new <%= polygene.entitystore %>StorageModule( configModule ).assemble( layer, layer.module( <%= polygene.entitystore %>StorageModule.NAME ) );
         new <%= polygene.indexing %>IndexingModule( configModule ).assemble( layer, layer.module( <%= polygene.indexing %>IndexingModule.NAME ) );
-        new <%= polygene.serialization %>SerializationModule( typeFinder ).assemble( layer, layer.module( <%= polygene.serialization %>SerializationModule.NAME ) );
+        new <%= polygene.serialization %>SerializationModule().assemble( layer, layer.module( <%= polygene.serialization %>SerializationModule.NAME ) );
         return layer;
     }
 }
diff --git a/tools/generator-polygene/app/templates/JacksonSerializationModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/JacksonSerializationModule/bootstrap.tmpl
@@ -19,10 +19,7 @@
 -%>
 package <%= packageName %>.bootstrap.infrastructure;
 
-import java.util.function.Function;
 import org.apache.polygene.api.common.Visibility;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Module;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.LayerAssembly;
 import org.apache.polygene.bootstrap.ModuleAssembly;
@@ -33,20 +30,13 @@ public class JacksonSerializationModule
     implements ModuleAssembler
 {
     public static final String NAME = "Jackson Serialization Module";
-    private final Function<Application, Module> typeFinder;
-
-    public JacksonSerializationModule( Function<Application, Module> typeFinder )
-    {
-        this.typeFinder = typeFinder;
-    }
 
     @Override
     public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
         throws AssemblyException
     {
         new JacksonValueSerializationAssembler()
             .visibleIn( Visibility.application )
-            .withValuesModuleFinder( typeFinder )
             .assemble( module );
         return module;
     }
diff --git a/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/ApplicationAssemblerWriter.java b/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/ApplicationAssemblerWriter.java
@@ -43,10 +43,7 @@ public void writeClass( Map<String, String> properties )
             pw.println( "import java.nio.file.Files;" );
             pw.println( "import java.nio.file.Path;" );
             pw.println( "import java.nio.file.Paths;" );
-            pw.println( "import java.util.function.Function;" );
             pw.println();
-            pw.println( "import org.apache.polygene.api.structure.Application;" );
-            pw.println( "import org.apache.polygene.api.structure.Module;\n" );
             pw.println( "import org.apache.polygene.bootstrap.ApplicationAssembly;" );
             pw.println( "import org.apache.polygene.bootstrap.AssemblyException;" );
             pw.println( "import org.apache.polygene.bootstrap.LayerAssembly;" );
@@ -82,8 +79,7 @@ public void writeClass( Map<String, String> properties )
             pw.println( "        LayerAssembly configLayer = createLayer( ConfigurationLayer.class );" );
             pw.println( "        ModuleAssembly configModule = assemblerOf( ConfigurationLayer.class ).configModule();" );
             pw.println( "        LayerAssembly domainLayer = createLayer( DomainLayer.class );" );
-            pw.println( "        Function<Application, Module> typeFinder = DomainLayer.typeFinder();" );
-            pw.println( "        LayerAssembly infraLayer = new InfrastructureLayer( configModule, typeFinder ).assemble( assembly.layer( InfrastructureLayer.NAME ) );" );
+            pw.println( "        LayerAssembly infraLayer = new InfrastructureLayer( configModule ).assemble( assembly.layer( InfrastructureLayer.NAME ) );" );
             pw.println( "        LayerAssembly connectivityLayer = createLayer( ConnectivityLayer.class );" );
             pw.println( "        connectivityLayer.uses( domainLayer );" );
             pw.println( "        domainLayer.uses( infraLayer );" );
diff --git a/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/DomainLayerWriter.java b/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/DomainLayerWriter.java
diff --git a/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/InfrastructureLayerWriter.java b/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/InfrastructureLayerWriter.java
diff --git a/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/SerializationModuleWriter.java b/tools/shell/src/main/java/org/apache/polygene/tools/shell/create/project/common/SerializationModuleWriter.java

Original file line number	Diff line number	Diff line change
`@@ -229,17 +229,7 @@ public void assembledWithValuesModuleSerialization()`
`229`	`229`	`{`
`230`	`230`	`servicesModule -> {`
`231`	`231`	`servicesModule.setName( "SERVICES-Module" );`
`232`		`-`
`233`		`- Function<Application, Module> valuesModuleFinder = new Function<Application, Module>()`
`234`		`- {`
`235`		`- @Override`
`236`		`- public Module apply( Application app1 )`
`237`		`- {`
`238`		`- return app1.findModule( "SINGLE-Layer", "VALUES-Module" );`
`239`		`- }`
`240`		`- };`
`241`	`232`	`new OrgJsonValueSerializationAssembler().`
`242`		`- withValuesModuleFinder( valuesModuleFinder ).`
`243`	`233`	`assemble( servicesModule );`
`244`	`234`	`}`
`245`	`235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,44 +20,37 @@`
`20`	`20`
`21`	`21`	`package org.apache.polygene.library.restlet.assembly.infrastructue;`
`22`	`22`
`23`		`-import java.util.function.Function;`
`24`		`-import org.apache.polygene.api.structure.Application;`
`25`		`-import org.apache.polygene.api.structure.Module;`
`26`	`23`	`import org.apache.polygene.bootstrap.AssemblyException;`
`27`	`24`	`import org.apache.polygene.bootstrap.LayerAssembly;`
`28`	`25`	`import org.apache.polygene.bootstrap.ModuleAssembly;`
`29`	`26`	`import org.apache.polygene.bootstrap.layered.LayerAssembler;`
`30`	`27`	`import org.apache.polygene.bootstrap.layered.LayeredLayerAssembler;`
`31`	`28`	`import org.apache.polygene.library.restlet.assembly.configuration.ConfigurationLayer;`
`32`	`29`	`import org.apache.polygene.library.restlet.assembly.configuration.ConfigurationModule;`
`33`		`-import org.apache.polygene.library.restlet.assembly.domain.DomainLayer;`
`34`	`30`
`35`	`31`	`public class InfrastructureLayer extends LayeredLayerAssembler`
`36`	`32`	`implements LayerAssembler`
`37`	`33`	`{`
`38`	`34`	`public static final String NAME = "Infrastructure Layer";`
`39`	`35`	`private final ModuleAssembly configModule;`
`40`		`- private final Function<Application, Module> typeFinder;`
`41`	`36`
`42`	`37`	`public static InfrastructureLayer create( LayerAssembly layer )`
`43`	`38`	`{`
`44`		`- Function<Application, Module> typeFinder = DomainLayer.typeFinder();`
`45`	`39`	`ModuleAssembly config = layer.application().layer( ConfigurationLayer.NAME ).module( ConfigurationModule.NAME );`
`46`		`- return new InfrastructureLayer( config, typeFinder );`
	`40`	`+ return new InfrastructureLayer( config );`
`47`	`41`	`}`
`48`	`42`
`49`		`- public InfrastructureLayer( ModuleAssembly configModule, Function<Application, Module> typeFinder )`
	`43`	`+ public InfrastructureLayer( ModuleAssembly configModule )`
`50`	`44`	`{`
`51`	`45`	`this.configModule = configModule;`
`52`		`- this.typeFinder = typeFinder;`
`53`	`46`	`}`
`54`	`47`
`55`	`48`	`@Override`
`56`	`49`	`public LayerAssembly assemble( LayerAssembly layer )`
`57`	`50`	`throws AssemblyException`
`58`	`51`	`{`
`59`	`52`	`new IndexingModule( configModule ).assemble( layer, layer.module( IndexingModule.NAME ) );`
`60`		`- new SerializationModule( typeFinder ).assemble( layer, layer.module( SerializationModule.NAME ) );`
	`53`	`+ new SerializationModule().assemble( layer, layer.module( SerializationModule.NAME ) );`
`61`	`54`	`return layer;`
`62`	`55`	`}`
`63`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ public void assemble( ModuleAssembly module )`
`37`	`37`	`module.services( MemoryEntityStoreService.class ).visibleIn( Visibility.application );`
`38`	`38`	`new OrgJsonValueSerializationAssembler().`
`39`	`39`	`visibleIn( Visibility.application ).`
`40`		`- withValuesModuleFinder( app -> app.findModule( "DomainLayer", "RentalModule" ) ).`
`41`	`40`	`assemble( module );`
`42`	`41`	`}`
`43`	`42`	`}`