polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From paulmer...@apache.org
Subject [42/48] polygene-java git commit: Rename Serialization.Formats to Serialization.Format
Date Mon, 13 Mar 2017 15:29:05 GMT
Rename Serialization.Formats to Serialization.Format

POLYGENE-231


Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/4e3e6830
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/4e3e6830
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/4e3e6830

Branch: refs/heads/serialization-3.0
Commit: 4e3e6830553c4782b0f02c9c9bd7ec9c1cca9b67
Parents: 9e8d37a
Author: Paul Merlin <paulmerlin@apache.org>
Authored: Mon Mar 13 11:38:51 2017 +0100
Committer: Paul Merlin <paulmerlin@apache.org>
Committed: Mon Mar 13 16:27:47 2017 +0100

----------------------------------------------------------------------
 .../org/apache/polygene/api/configuration/Configuration.java   | 6 +++---
 .../org/apache/polygene/api/serialization/Serialization.java   | 2 +-
 .../bootstrap/serialization/DefaultSerializationAssembler.java | 2 +-
 .../org/apache/polygene/spi/entitystore/Polygene142Test.java   | 2 +-
 .../javaxjson/JavaxJsonSerializationAssembler.java             | 2 +-
 .../serialization/javaxxml/JavaxXmlSerializationAssembler.java | 2 +-
 .../rest/client/requestwriter/ValueCompositeRequestWriter.java | 2 +-
 .../server/restlet/requestreader/DefaultRequestReader.java     | 2 +-
 .../restlet/responsewriter/ValueCompositeResponseWriter.java   | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/polygene-java/blob/4e3e6830/core/api/src/main/java/org/apache/polygene/api/configuration/Configuration.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/polygene/api/configuration/Configuration.java
b/core/api/src/main/java/org/apache/polygene/api/configuration/Configuration.java
index 1cd32cf..a7c4dd1 100644
--- a/core/api/src/main/java/org/apache/polygene/api/configuration/Configuration.java
+++ b/core/api/src/main/java/org/apache/polygene/api/configuration/Configuration.java
@@ -366,7 +366,7 @@ public interface Configuration<T>
                                                               Identity identity
         )
         {
-            return readConfig( uow, compositeType, configType, identity, Serialization.Formats.JSON,
".json" );
+            return readConfig( uow, compositeType, configType, identity, Serialization.Format.JSON,
".json" );
         }
 
         private <C, V extends HasIdentity> V tryLoadYamlFile( UnitOfWork uow,
@@ -375,7 +375,7 @@ public interface Configuration<T>
                                                               Identity identity
         )
         {
-            return readConfig( uow, compositeType, configType, identity, Serialization.Formats.YAML,
".yaml" );
+            return readConfig( uow, compositeType, configType, identity, Serialization.Format.YAML,
".yaml" );
         }
 
         private <C, V extends HasIdentity> V tryLoadXmlFile( UnitOfWork uow,
@@ -384,7 +384,7 @@ public interface Configuration<T>
                                                              Identity identity
         )
         {
-            return readConfig( uow, compositeType, configType, identity, Serialization.Formats.XML,
".xml" );
+            return readConfig( uow, compositeType, configType, identity, Serialization.Format.XML,
".xml" );
         }
 
         private <C, V extends HasIdentity> V readConfig( UnitOfWork uow,

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/4e3e6830/core/api/src/main/java/org/apache/polygene/api/serialization/Serialization.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/polygene/api/serialization/Serialization.java
b/core/api/src/main/java/org/apache/polygene/api/serialization/Serialization.java
index 8bf005b..74b7330 100644
--- a/core/api/src/main/java/org/apache/polygene/api/serialization/Serialization.java
+++ b/core/api/src/main/java/org/apache/polygene/api/serialization/Serialization.java
@@ -28,7 +28,7 @@ public interface Serialization extends Serializer, Deserializer
      * Serialization implementations should be tagged with theses at assembly time so that
consumers can
      * specify which format they need.
      */
-    interface Formats
+    interface Format
     {
         /**
          * Tag a Serialization service that support the JSON format.

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/4e3e6830/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/serialization/DefaultSerializationAssembler.java
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/serialization/DefaultSerializationAssembler.java
b/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/serialization/DefaultSerializationAssembler.java
index 9b877cc..a4bcc0c 100644
--- a/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/serialization/DefaultSerializationAssembler.java
+++ b/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/serialization/DefaultSerializationAssembler.java
@@ -37,6 +37,6 @@ public class DefaultSerializationAssembler
         module.services( JavaxJsonSerializationService.class )
               .withTypes( Serialization.class, Serializer.class, Deserializer.class,
                           JsonSerialization.class, JsonSerializer.class, JsonDeserializer.class
)
-              .taggedWith( Serialization.Formats.JSON );
+              .taggedWith( Serialization.Format.JSON );
     }
 }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/4e3e6830/core/spi/src/test/java/org/apache/polygene/spi/entitystore/Polygene142Test.java
----------------------------------------------------------------------
diff --git a/core/spi/src/test/java/org/apache/polygene/spi/entitystore/Polygene142Test.java
b/core/spi/src/test/java/org/apache/polygene/spi/entitystore/Polygene142Test.java
index 831cc45..935d2ee 100644
--- a/core/spi/src/test/java/org/apache/polygene/spi/entitystore/Polygene142Test.java
+++ b/core/spi/src/test/java/org/apache/polygene/spi/entitystore/Polygene142Test.java
@@ -43,7 +43,7 @@ public class Polygene142Test extends AbstractPolygeneTest
     }
 
     @Service
-    @Tagged( Serialization.Formats.JSON )
+    @Tagged( Serialization.Format.JSON )
     private Serialization serialization;
 
     @Test

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/4e3e6830/extensions/serialization-javaxjson/src/main/java/org/apache/polygene/serialization/javaxjson/JavaxJsonSerializationAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/serialization-javaxjson/src/main/java/org/apache/polygene/serialization/javaxjson/JavaxJsonSerializationAssembler.java
b/extensions/serialization-javaxjson/src/main/java/org/apache/polygene/serialization/javaxjson/JavaxJsonSerializationAssembler.java
index 84022e1..4a041dd 100644
--- a/extensions/serialization-javaxjson/src/main/java/org/apache/polygene/serialization/javaxjson/JavaxJsonSerializationAssembler.java
+++ b/extensions/serialization-javaxjson/src/main/java/org/apache/polygene/serialization/javaxjson/JavaxJsonSerializationAssembler.java
@@ -45,7 +45,7 @@ public class JavaxJsonSerializationAssembler extends Assemblers.VisibilityIdenti
                                                            Serializer.class, Deserializer.class,
                                                            JsonSerialization.class,
                                                            JsonSerializer.class, JsonDeserializer.class
)
-                                               .taggedWith( Serialization.Formats.JSON )
+                                               .taggedWith( Serialization.Format.JSON )
                                                .visibleIn( visibility() );
         if( hasIdentity() )
         {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/4e3e6830/extensions/serialization-javaxxml/src/main/java/org/apache/polygene/serialization/javaxxml/JavaxXmlSerializationAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/serialization-javaxxml/src/main/java/org/apache/polygene/serialization/javaxxml/JavaxXmlSerializationAssembler.java
b/extensions/serialization-javaxxml/src/main/java/org/apache/polygene/serialization/javaxxml/JavaxXmlSerializationAssembler.java
index e402a9f..63ed345 100644
--- a/extensions/serialization-javaxxml/src/main/java/org/apache/polygene/serialization/javaxxml/JavaxXmlSerializationAssembler.java
+++ b/extensions/serialization-javaxxml/src/main/java/org/apache/polygene/serialization/javaxxml/JavaxXmlSerializationAssembler.java
@@ -45,7 +45,7 @@ public class JavaxXmlSerializationAssembler extends Assemblers.VisibilityIdentit
                                                            Serializer.class, Deserializer.class,
                                                            XmlSerialization.class,
                                                            XmlSerializer.class, XmlDeserializer.class
)
-                                               .taggedWith( Serialization.Formats.XML )
+                                               .taggedWith( Serialization.Format.XML )
                                                .visibleIn( visibility() );
         if( hasIdentity() )
         {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/4e3e6830/libraries/rest-client/src/main/java/org/apache/polygene/library/rest/client/requestwriter/ValueCompositeRequestWriter.java
----------------------------------------------------------------------
diff --git a/libraries/rest-client/src/main/java/org/apache/polygene/library/rest/client/requestwriter/ValueCompositeRequestWriter.java
b/libraries/rest-client/src/main/java/org/apache/polygene/library/rest/client/requestwriter/ValueCompositeRequestWriter.java
index 8a77d40..8eebc7a 100644
--- a/libraries/rest-client/src/main/java/org/apache/polygene/library/rest/client/requestwriter/ValueCompositeRequestWriter.java
+++ b/libraries/rest-client/src/main/java/org/apache/polygene/library/rest/client/requestwriter/ValueCompositeRequestWriter.java
@@ -51,7 +51,7 @@ public class ValueCompositeRequestWriter
    private PolygeneSPI spi;
 
    @Service
-   @Tagged( Serialization.Formats.JSON )
+   @Tagged( Serialization.Format.JSON )
    private Serializer serializer;
 
     @Override

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/4e3e6830/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/requestreader/DefaultRequestReader.java
----------------------------------------------------------------------
diff --git a/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/requestreader/DefaultRequestReader.java
b/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/requestreader/DefaultRequestReader.java
index 48c32b0..eea0994 100644
--- a/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/requestreader/DefaultRequestReader.java
+++ b/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/requestreader/DefaultRequestReader.java
@@ -86,7 +86,7 @@ public class DefaultRequestReader
     private ValueBuilderFactory vbf;
 
     @Service
-    @Tagged( Serialization.Formats.JSON )
+    @Tagged( Serialization.Format.JSON )
     private Deserializer deserializer;
 
     @Override

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/4e3e6830/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/ValueCompositeResponseWriter.java
----------------------------------------------------------------------
diff --git a/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/ValueCompositeResponseWriter.java
b/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/ValueCompositeResponseWriter.java
index a50e9ca..5d8685d 100644
--- a/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/ValueCompositeResponseWriter.java
+++ b/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/ValueCompositeResponseWriter.java
@@ -53,7 +53,7 @@ public class ValueCompositeResponseWriter extends AbstractResponseWriter
     private Configuration cfg;
 
     @Service
-    @Tagged( Serialization.Formats.JSON )
+    @Tagged( Serialization.Format.JSON )
     private Serializer serializer;
 
     @Override


Mime
View raw message