You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by dl...@apache.org on 2017/02/17 07:52:44 UTC
svn commit: r1783340 [2/2] - in /felix/trunk/converter/schematizer: ./
src/main/java/org/apache/felix/schematizer/
src/main/java/org/apache/felix/schematizer/impl/
src/main/java/org/apache/felix/serializer/impl/json/
src/test/java/org/apache/felix/sche...
Modified: felix/trunk/converter/schematizer/src/test/java/org/apache/felix/serializer/test/prevayler/DTOSerializer.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/schematizer/src/test/java/org/apache/felix/serializer/test/prevayler/DTOSerializer.java?rev=1783340&r1=1783339&r2=1783340&view=diff
==============================================================================
--- felix/trunk/converter/schematizer/src/test/java/org/apache/felix/serializer/test/prevayler/DTOSerializer.java (original)
+++ felix/trunk/converter/schematizer/src/test/java/org/apache/felix/serializer/test/prevayler/DTOSerializer.java Fri Feb 17 07:52:44 2017
@@ -28,18 +28,17 @@ import java.util.Optional;
import org.apache.felix.schematizer.Schema;
import org.apache.felix.schematizer.Schematizer;
+import org.apache.felix.schematizer.SchematizingConverter;
import org.apache.felix.schematizer.TypeRule;
import org.apache.felix.schematizer.impl.SchematizerImpl;
import org.apache.felix.serializer.impl.json.JsonSerializerImpl;
-import org.osgi.util.converter.Converter;
-import org.osgi.util.converter.StandardConverter;
import org.osgi.util.converter.TypeReference;
public class DTOSerializer<C extends CommandDTO<?>>
{
private static final int MARKER_LENGTH = 10;
- private final Converter converter = new StandardConverter();
+ private final SchematizingConverter converter = new SchematizingConverter();
private final JsonSerializerImpl serializer = new JsonSerializerImpl();
private final List<TypeRule<?>> rules;
private final Map<String, Schema> schemas = new HashMap<>();
@@ -62,8 +61,7 @@ public class DTOSerializer<C extends Com
Schema s = schemas.get( command.name() );
return (C)serializer
.deserialize( CommandDTO.class )
- .with( converter )
- .withContext( s )
+ .with( converter.withSchema( s ) )
.from( in );
}
@@ -96,7 +94,8 @@ public class DTOSerializer<C extends Com
}
out.write( markerFor( command.command ) );
- serializer.serialize( command ).to( out );
+ Schema s = schemas.get( name );
+ serializer.serialize( command ).with( converter.withSchema( s ) ).to( out );
}
private final byte[] markerFor( Command command )