You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by pa...@apache.org on 2017/03/13 10:35:09 UTC
[17/50] [abbrv] polygene-java git commit: New (de)serialization API
and SPI & new implementations
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c9dd7229/tools/generator-polygene/app/templates/ConfigurationLayer/ConfigModule/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/ConfigurationLayer/ConfigModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/ConfigurationLayer/ConfigModule/bootstrap.tmpl
index 37eecfa..7aee6a8 100644
--- a/tools/generator-polygene/app/templates/ConfigurationLayer/ConfigModule/bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/ConfigurationLayer/ConfigModule/bootstrap.tmpl
@@ -25,7 +25,6 @@ import org.apache.polygene.bootstrap.LayerAssembly;
import org.apache.polygene.bootstrap.ModuleAssembly;
import org.apache.polygene.bootstrap.layered.ModuleAssembler;
import org.apache.polygene.entitystore.memory.MemoryEntityStoreService;
-import org.apache.polygene.valueserialization.jackson.assembly.JacksonValueSerializationAssembler;
public class ConfigModule
implements ModuleAssembler
@@ -35,7 +34,6 @@ public class ConfigModule
throws AssemblyException
{
module.services( MemoryEntityStoreService.class ).visibleIn( Visibility.layer );
- new JacksonValueSerializationAssembler().visibleIn( Visibility.layer ).assemble( module );
return module;
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c9dd7229/tools/generator-polygene/app/templates/InfrastructureLayer/SerializationModule/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/SerializationModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/InfrastructureLayer/SerializationModule/bootstrap.tmpl
index f75dc3a..7ff8b96 100644
--- a/tools/generator-polygene/app/templates/InfrastructureLayer/SerializationModule/bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/InfrastructureLayer/SerializationModule/bootstrap.tmpl
@@ -24,9 +24,9 @@ import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.LayerAssembly;
import org.apache.polygene.bootstrap.ModuleAssembly;
import org.apache.polygene.bootstrap.layered.ModuleAssembler;
-import org.apache.polygene.valueserialization.<%- polygene.serialization.toLowerCase() %>.assembly.<%- polygene.serialization %>ValueSerializationAssembler;
+import org.apache.polygene.serialization.<%- polygene.serialization.toLowerCase() %>.assembly.<%- polygene.serialization %>SerializationAssembler;
-public class <%- polygene.serialization %>ValueSerializationModule
+public class <%- polygene.serialization %>SerializationModule
implements ModuleAssembler
{
public static final String NAME = "<%- polygene.serialization %> Serialization Module";
@@ -35,7 +35,7 @@ public class <%- polygene.serialization %>ValueSerializationModule
public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
throws AssemblyException
{
- new <%- polygene.serialization %>ValueSerializationAssembler()
+ new <%- polygene.serialization %>SerializationAssembler()
.visibleIn( Visibility.application )
.assemble( module );
return module;
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c9dd7229/tools/generator-polygene/app/templates/InfrastructureLayer/SerializationModule/module.js
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/SerializationModule/module.js b/tools/generator-polygene/app/templates/InfrastructureLayer/SerializationModule/module.js
index 7e60e99..4264bd4 100644
--- a/tools/generator-polygene/app/templates/InfrastructureLayer/SerializationModule/module.js
+++ b/tools/generator-polygene/app/templates/InfrastructureLayer/SerializationModule/module.js
@@ -3,6 +3,6 @@ module.exports = {
write: function (p) {
p.copyTemplate(p.ctx,
'InfrastructureLayer/SerializationModule/bootstrap.tmpl',
- 'bootstrap/src/main/java/' + p.javaPackageDir + '/bootstrap/infrastructure/' + p.serialization + 'ValueSerializationModule.java');
+ 'bootstrap/src/main/java/' + p.javaPackageDir + '/bootstrap/infrastructure/' + p.serialization + 'SerializationModule.java');
}
};
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c9dd7229/tools/generator-polygene/app/templates/InfrastructureLayer/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/bootstrap.tmpl b/tools/generator-polygene/app/templates/InfrastructureLayer/bootstrap.tmpl
index cead6b3..1ba3098 100644
--- a/tools/generator-polygene/app/templates/InfrastructureLayer/bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/InfrastructureLayer/bootstrap.tmpl
@@ -41,7 +41,7 @@ public class InfrastructureLayer extends LayeredLayerAssembler
throws AssemblyException
{
createModule( layer, FileConfigurationModule.class );
- createModule( layer, <%= polygene.serialization %>ValueSerializationModule.class );
+ createModule( layer, <%= polygene.serialization %>SerializationModule.class );
<% if( polygene.metrics !== "None" ) { %>
createModule( layer, <%= polygene.metrics %>MetricsModule.class );
<% } %>
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c9dd7229/tools/generator-polygene/app/templates/buildtool/gradle-bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/buildtool/gradle-bootstrap.tmpl b/tools/generator-polygene/app/templates/buildtool/gradle-bootstrap.tmpl
index fa3630a..5815660 100644
--- a/tools/generator-polygene/app/templates/buildtool/gradle-bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/buildtool/gradle-bootstrap.tmpl
@@ -31,7 +31,7 @@ dependencies {
<% } %>
compile "org.apache.polygene.extensions:org.apache.polygene.extension.entitystore-<%= polygene.entitystore.toLowerCase() %>:$polygeneVersion"
compile "org.apache.polygene.extensions:org.apache.polygene.extension.indexing-<%= polygene.indexing.toLowerCase() %>:$polygeneVersion"
- compile "org.apache.polygene.extensions:org.apache.polygene.extension.valueserialization-<%= polygene.serialization.toLowerCase() %>:$polygeneVersion"
+ compile "org.apache.polygene.extensions:org.apache.polygene.extension.serialization-<%= polygene.serialization.toLowerCase() %>:$polygeneVersion"
<% if( polygene.caching !== "None" ) { %>
compile "org.apache.polygene.extensions:org.apache.polygene.extension.cache-<%= polygene.caching.toLowerCase() %>:$polygeneVersion"
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c9dd7229/tools/generator-polygene/test/generator_test.js
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/test/generator_test.js b/tools/generator-polygene/test/generator_test.js
index d5f2b58..0d0b938 100644
--- a/tools/generator-polygene/test/generator_test.js
+++ b/tools/generator-polygene/test/generator_test.js
@@ -38,9 +38,8 @@ var cachings = [
];
var serializations = [
- 'Jackson',
- // 'Johnzon',
- 'Stax'
+ 'JavaxJson',
+ 'JavaxXml'
];
var metricses = [
@@ -56,11 +55,11 @@ var featuresset = [
];
entityStores.forEach(function (entityStore) {
- test(entityStore, "Rdf", "Jackson", "Memcache", "Codahale", "[]");
+ test(entityStore, "Rdf", "JavaxJson", "Memcache", "Codahale", "[]");
});
indexings.forEach(function (indexing) {
- test("Memory", indexing, "Jackson", "Memcache", "Codahale", "[]");
+ test("Memory", indexing, "JavaxJson", "Memcache", "Codahale", "[]");
});
serializations.forEach(function (serialization) {
@@ -68,15 +67,15 @@ serializations.forEach(function (serialization) {
});
cachings.forEach(function (caching) {
- test("Memory", "Rdf", "Jackson", caching, "Codahale", "[]");
+ test("Memory", "Rdf", "JavaxJson", caching, "Codahale", "[]");
});
metricses.forEach(function (metrics) {
- test("Memory", "Rdf", "Jackson", "Memcache", metrics, "[]");
+ test("Memory", "Rdf", "JavaxJson", "Memcache", metrics, "[]");
});
featuresset.forEach(function (feature) {
- test("Memory", "Rdf", "Jackson", "Memcache", "Codahale", feature);
+ test("Memory", "Rdf", "JavaxJson", "Memcache", "Codahale", feature);
});
// All Tests !!!!
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c9dd7229/tools/model-detail/src/test/java/org/apache/polygene/tools/model/VisitableDetailTest.java
----------------------------------------------------------------------
diff --git a/tools/model-detail/src/test/java/org/apache/polygene/tools/model/VisitableDetailTest.java b/tools/model-detail/src/test/java/org/apache/polygene/tools/model/VisitableDetailTest.java
index d6af619..d06bc96 100644
--- a/tools/model-detail/src/test/java/org/apache/polygene/tools/model/VisitableDetailTest.java
+++ b/tools/model-detail/src/test/java/org/apache/polygene/tools/model/VisitableDetailTest.java
@@ -22,6 +22,7 @@ package org.apache.polygene.tools.model;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.apache.polygene.api.service.ServiceActivation;
import org.apache.polygene.tools.model.descriptor.ServiceDetailDescriptor;
import org.apache.polygene.tools.model.descriptor.TransientDetailDescriptor;
import org.junit.Test;
@@ -82,6 +83,7 @@ public class VisitableDetailTest
// Module
"visitEnter( ModuleName )",
"visit( " + ModuleActivator.class.getName() + " )",
+ "visit( " + ServiceActivation.ServiceActivator.class.getName() + " )",
// Leaving Structure
"visitLeave( ModuleName )",
"visitLeave( LayerName )",