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/26 15:03:53 UTC
[1/4] polygene-java git commit: Minor enhancement in documentation
Repository: polygene-java
Updated Branches:
refs/heads/serialization-3.0 fb0418d31 -> 324be8faf
Minor enhancement in documentation
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/fdb9e971
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/fdb9e971
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/fdb9e971
Branch: refs/heads/serialization-3.0
Commit: fdb9e971d7afb53d09aeb5b5d868e3f165826ec8
Parents: fb0418d
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Mar 26 16:49:17 2017 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Mar 26 16:49:17 2017 +0200
----------------------------------------------------------------------
core/api/src/docs/serialization.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/fdb9e971/core/api/src/docs/serialization.txt
----------------------------------------------------------------------
diff --git a/core/api/src/docs/serialization.txt b/core/api/src/docs/serialization.txt
index 68939f9..07b2459 100644
--- a/core/api/src/docs/serialization.txt
+++ b/core/api/src/docs/serialization.txt
@@ -22,12 +22,12 @@ TIP: +Serialization extends Serializer, Deserializer+. See the <<javadocs>> for
The Serialization mechanism apply to the following object types :
* ValueComposite,
- * EntityReference,
- * Iterable & Stream,
+ * EntityReference & Identity,
+ * Array, Iterable & Stream,
* Map,
* Plain Values.
-Nested Plain Values, EntityReferences, Iterables, Streams, Maps, ValueComposites are supported.
+Nested Plain Values, EntityReferences, Identities, Arrays, Iterables, Streams, Maps, ValueComposites are supported.
EntityComposites and EntityReferences are serialized as their identity string.
Plain Values can be one of :
[4/4] polygene-java git commit: Fix value type lookup in elastic
search indexer
Posted by pa...@apache.org.
Fix value type lookup in elastic search indexer
POLYGENE-105
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/324be8fa
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/324be8fa
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/324be8fa
Branch: refs/heads/serialization-3.0
Commit: 324be8faf7b333c604018420915a00751847f878
Parents: 82a0039
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Mar 26 17:02:50 2017 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Mar 26 17:02:50 2017 +0200
----------------------------------------------------------------------
.../polygene/index/elasticsearch/ElasticSearchIndexer.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/324be8fa/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexer.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexer.java b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexer.java
index ad023bd..344f9d7 100644
--- a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexer.java
+++ b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexer.java
@@ -234,7 +234,7 @@ public interface ElasticSearchIndexer extends StateChangeListener
else
{
EntityReference reference = EntityReference.create( associated.identity() );
- EntityState assocState = uow.entityStateOf( module, reference );
+ EntityState assocState = uow.entityStateOf( entityType.module(), reference );
builder.add( key,
Json.createReader( new StringReader(
toJSON( assocState, newStates, uow )
@@ -273,7 +273,7 @@ public interface ElasticSearchIndexer extends StateChangeListener
else
{
EntityReference reference = EntityReference.create( associated.identity() );
- EntityState assocState = uow.entityStateOf( module, reference );
+ EntityState assocState = uow.entityStateOf( entityType.module(), reference );
assBuilder.add(
Json.createReader( new StringReader(
toJSON( assocState, newStates, uow )
@@ -318,7 +318,7 @@ public interface ElasticSearchIndexer extends StateChangeListener
else
{
EntityReference reference = EntityReference.create( identity );
- EntityState assocState = uow.entityStateOf( module, reference );
+ EntityState assocState = uow.entityStateOf( entityType.module(), reference );
assBuilder.add(
JavaxJson.toBuilder(
Json.createReader( new StringReader(
[3/4] polygene-java git commit: Fix value type lookup in JSON entity
store helpers
Posted by pa...@apache.org.
Fix value type lookup in JSON entity store helpers
POLYGENE-105
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/82a00392
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/82a00392
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/82a00392
Branch: refs/heads/serialization-3.0
Commit: 82a003924c7592b253e0c8b4781d1d1e56583a4a
Parents: 7bd93ad
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Mar 26 17:02:31 2017 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Mar 26 17:02:31 2017 +0200
----------------------------------------------------------------------
.../apache/polygene/spi/entitystore/helpers/JSONEntityState.java | 4 +++-
.../spi/entitystore/helpers/JSONMapEntityStoreMixin.java | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/82a00392/core/spi/src/main/java/org/apache/polygene/spi/entitystore/helpers/JSONEntityState.java
----------------------------------------------------------------------
diff --git a/core/spi/src/main/java/org/apache/polygene/spi/entitystore/helpers/JSONEntityState.java b/core/spi/src/main/java/org/apache/polygene/spi/entitystore/helpers/JSONEntityState.java
index e4b5c05..151f144 100644
--- a/core/spi/src/main/java/org/apache/polygene/spi/entitystore/helpers/JSONEntityState.java
+++ b/core/spi/src/main/java/org/apache/polygene/spi/entitystore/helpers/JSONEntityState.java
@@ -120,6 +120,7 @@ public final class JSONEntityState
// TODO This rely on _type explicitely :(
// Needed because of this mess that is JsonEntityState
ValueType propertyValueType = null;
+ ModuleDescriptor propertyModule = module;
if( json.getValueType() == JsonValue.ValueType.OBJECT )
{
String typeInfo = ( (JsonObject) json ).getString( "_type", null );
@@ -129,6 +130,7 @@ public final class JSONEntityState
if( valueDescriptor != null )
{
propertyValueType = valueDescriptor.valueType();
+ propertyModule = valueDescriptor.module();
}
}
}
@@ -145,7 +147,7 @@ public final class JSONEntityState
{
return null;
}
- return serialization.fromJson( module, propertyValueType, json );
+ return serialization.fromJson( propertyModule, propertyValueType, json );
}
}
catch( SerializationException e )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/82a00392/core/spi/src/main/java/org/apache/polygene/spi/entitystore/helpers/JSONMapEntityStoreMixin.java
----------------------------------------------------------------------
diff --git a/core/spi/src/main/java/org/apache/polygene/spi/entitystore/helpers/JSONMapEntityStoreMixin.java b/core/spi/src/main/java/org/apache/polygene/spi/entitystore/helpers/JSONMapEntityStoreMixin.java
index a7f7690..2a0ddc3 100644
--- a/core/spi/src/main/java/org/apache/polygene/spi/entitystore/helpers/JSONMapEntityStoreMixin.java
+++ b/core/spi/src/main/java/org/apache/polygene/spi/entitystore/helpers/JSONMapEntityStoreMixin.java
@@ -453,7 +453,7 @@ public class JSONMapEntityStoreMixin
throw new NoSuchEntityTypeException( type, module.name(), module.typeLookup() );
}
- return new JSONEntityState( module, serialization,
+ return new JSONEntityState( entityDescriptor.module(), serialization,
version, modified,
EntityReference.create( identity ),
status, entityDescriptor,
@@ -502,7 +502,7 @@ public class JSONMapEntityStoreMixin
EntityDescriptor entityDescriptor = module.entityDescriptor( type );
String version = data.getString( JSONKeys.VERSION );
Instant lastModified = Instant.ofEpochMilli( data.getJsonNumber( JSONKeys.MODIFIED ).longValueExact() );
- return new JSONEntityState( module, serialization,
+ return new JSONEntityState( entityDescriptor.module(), serialization,
version, lastModified,
reference,
EntityStatus.LOADED, entityDescriptor,
[2/4] polygene-java git commit: Fix value type lookup in serialization
Posted by pa...@apache.org.
Fix value type lookup in serialization
POLYGENE-105
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/7bd93ad6
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/7bd93ad6
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/7bd93ad6
Branch: refs/heads/serialization-3.0
Commit: 7bd93ad6b499dbc57cdb9ad56600513816707a35
Parents: fdb9e97
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Mar 26 17:02:06 2017 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Mar 26 17:02:06 2017 +0200
----------------------------------------------------------------------
.../apache/polygene/api/type/ValueCompositeType.java | 6 ++++++
.../serialization/javaxjson/JavaxJsonDeserializer.java | 12 +++++++-----
.../serialization/javaxxml/JavaxXmlDeserializer.java | 10 +++++-----
.../messagepack/MessagePackDeserializer.java | 12 +++++++-----
4 files changed, 25 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7bd93ad6/core/api/src/main/java/org/apache/polygene/api/type/ValueCompositeType.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/polygene/api/type/ValueCompositeType.java b/core/api/src/main/java/org/apache/polygene/api/type/ValueCompositeType.java
index 9190e68..bbeaf06 100644
--- a/core/api/src/main/java/org/apache/polygene/api/type/ValueCompositeType.java
+++ b/core/api/src/main/java/org/apache/polygene/api/type/ValueCompositeType.java
@@ -24,6 +24,7 @@ import java.util.Objects;
import java.util.stream.Stream;
import org.apache.polygene.api.association.AssociationDescriptor;
import org.apache.polygene.api.property.PropertyDescriptor;
+import org.apache.polygene.api.structure.ModuleDescriptor;
import org.apache.polygene.api.util.Classes;
import org.apache.polygene.api.value.ValueComposite;
import org.apache.polygene.api.value.ValueDescriptor;
@@ -53,6 +54,11 @@ public final class ValueCompositeType extends ValueType
this.model = model;
}
+ public ModuleDescriptor module()
+ {
+ return model.module();
+ }
+
public Stream<? extends PropertyDescriptor> properties()
{
return model.state().properties();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7bd93ad6/core/spi/src/main/java/org/apache/polygene/serialization/javaxjson/JavaxJsonDeserializer.java
----------------------------------------------------------------------
diff --git a/core/spi/src/main/java/org/apache/polygene/serialization/javaxjson/JavaxJsonDeserializer.java b/core/spi/src/main/java/org/apache/polygene/serialization/javaxjson/JavaxJsonDeserializer.java
index 4eb7a69..43765c9 100644
--- a/core/spi/src/main/java/org/apache/polygene/serialization/javaxjson/JavaxJsonDeserializer.java
+++ b/core/spi/src/main/java/org/apache/polygene/serialization/javaxjson/JavaxJsonDeserializer.java
@@ -152,7 +152,9 @@ public class JavaxJsonDeserializer extends AbstractTextDeserializer implements J
ValueDescriptor valueDescriptor = module.valueDescriptor( typeInfo );
if( valueDescriptor != null )
{
- return (T) deserializeValueComposite( module, valueDescriptor.valueType(), object );
+ return (T) deserializeValueComposite( valueDescriptor.module(),
+ valueDescriptor.valueType(),
+ object );
}
case STRING:
byte[] bytes = Base64.getDecoder().decode( asString( json ).getBytes( UTF_8 ) );
@@ -218,10 +220,10 @@ public class JavaxJsonDeserializer extends AbstractTextDeserializer implements J
}
ValueBuilder builder = module.instance().newValueBuilderWithState(
valueType.primaryType(),
- propertyFunction( module, json ),
- associationFunction( module, json ),
- manyAssociationFunction( module, json ),
- namedAssociationFunction( module, json ) );
+ propertyFunction( valueType.module(), json ),
+ associationFunction( valueType.module(), json ),
+ manyAssociationFunction( valueType.module(), json ),
+ namedAssociationFunction( valueType.module(), json ) );
return builder.newInstance();
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7bd93ad6/extensions/serialization-javaxxml/src/main/java/org/apache/polygene/serialization/javaxxml/JavaxXmlDeserializer.java
----------------------------------------------------------------------
diff --git a/extensions/serialization-javaxxml/src/main/java/org/apache/polygene/serialization/javaxxml/JavaxXmlDeserializer.java b/extensions/serialization-javaxxml/src/main/java/org/apache/polygene/serialization/javaxxml/JavaxXmlDeserializer.java
index 95da377..8c6bc7b 100644
--- a/extensions/serialization-javaxxml/src/main/java/org/apache/polygene/serialization/javaxxml/JavaxXmlDeserializer.java
+++ b/extensions/serialization-javaxxml/src/main/java/org/apache/polygene/serialization/javaxxml/JavaxXmlDeserializer.java
@@ -148,10 +148,10 @@ public class JavaxXmlDeserializer extends AbstractTextDeserializer implements Xm
}
ValueBuilder builder = module.instance().newValueBuilderWithState(
valueType.primaryType(),
- propertyFunction( module, xml ),
- associationFunction( module, xml ),
- manyAssociationFunction( module, xml ),
- namedAssociationFunction( module, xml ) );
+ propertyFunction( valueType.module(), xml ),
+ associationFunction( valueType.module(), xml ),
+ manyAssociationFunction( valueType.module(), xml ),
+ namedAssociationFunction( valueType.module(), xml ) );
return builder.newInstance();
}
@@ -307,7 +307,7 @@ public class JavaxXmlDeserializer extends AbstractTextDeserializer implements Xm
ValueDescriptor valueDescriptor = module.valueDescriptor( typeInfo.get() );
if( valueDescriptor != null )
{
- return deserializeValueComposite( module, valueDescriptor.valueType(), xml );
+ return deserializeValueComposite( valueDescriptor.module(), valueDescriptor.valueType(), xml );
}
}
if( xml.getNodeType() == Node.CDATA_SECTION_NODE )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7bd93ad6/extensions/serialization-messagepack/src/main/java/org/apache/polygene/serialization/messagepack/MessagePackDeserializer.java
----------------------------------------------------------------------
diff --git a/extensions/serialization-messagepack/src/main/java/org/apache/polygene/serialization/messagepack/MessagePackDeserializer.java b/extensions/serialization-messagepack/src/main/java/org/apache/polygene/serialization/messagepack/MessagePackDeserializer.java
index 12cba93..402f9bc 100644
--- a/extensions/serialization-messagepack/src/main/java/org/apache/polygene/serialization/messagepack/MessagePackDeserializer.java
+++ b/extensions/serialization-messagepack/src/main/java/org/apache/polygene/serialization/messagepack/MessagePackDeserializer.java
@@ -210,10 +210,10 @@ public interface MessagePackDeserializer extends Deserializer
ValueBuilder builder = module.instance().newValueBuilderWithState(
valueType.primaryType(),
- propertyFunction( module, namedValues ),
- associationFunction( module, namedValues ),
- manyAssociationFunction( module, namedValues ),
- namedAssociationFunction( module, namedValues ) );
+ propertyFunction( valueType.module(), namedValues ),
+ associationFunction( valueType.module(), namedValues ),
+ manyAssociationFunction( valueType.module(), namedValues ),
+ namedAssociationFunction( valueType.module(), namedValues ) );
return builder.newInstance();
}
@@ -301,7 +301,9 @@ public interface MessagePackDeserializer extends Deserializer
ValueDescriptor valueDescriptor = module.valueDescriptor( typeInfo.get() );
if( valueDescriptor != null )
{
- return deserializeValueComposite( module, valueDescriptor.valueType(), mapValue );
+ return deserializeValueComposite( valueDescriptor.module(),
+ valueDescriptor.valueType(),
+ mapValue );
}
}
default: