json -> XNode parser/serializer

Evolveum · Jan 29, 2014 · 3584d3f · 3584d3f
1 parent 905e922
commit 3584d3f
Show file tree

Hide file tree

Showing 12 changed files with 1,183 additions and 41 deletions.
diff --git a/infra/prism/pom.xml b/infra/prism/pom.xml
@@ -77,10 +77,17 @@
   <version>2.3.1</version>
 </dependency>
 <dependency>
+<!--  <groupId>com.fasterxml.jackson.datatype</groupId>
+  <artifactId>jackson-module-jsonSchema</artifactId>
+  <version>2.3.0</version>
+</dependency>
+<dependency> -->
   <groupId>com.fasterxml.jackson.module</groupId>
   <artifactId>jackson-module-jaxb-annotations</artifactId>
   <version>2.2.0</version>
 </dependency>
+
+<!-- ::2.1.0 -->
 
         <!-- TEST -->
         <dependency>

diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/json/JaxbElementDeserializer.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/json/JaxbElementDeserializer.java
@@ -147,11 +147,11 @@ private void iterate(JsonNode node, JsonParser jp) throws JsonProcessingExceptio
     	if (expectedJavaType == null){
     		continue;
     	}
-    		if (prismSchema.getPrismContext().getPrismJaxbProcessor().canConvert(expectedJavaType)){
-    			this.setExpectedClass(expectedJavaType);
-    			this.node = field.getValue();
-    			jp.readValueAs(JAXBElement.class);
-    		}
+//    		if (prismSchema.getPrismContext().getPrismJaxbProcessor().canConvert(expectedJavaType)){
+//    			this.setExpectedClass(expectedJavaType);
+//    			this.node = field.getValue();
+//    			jp.readValueAs(JAXBElement.class);
+//    		}
 //    		jp.readValueAs(expectedJavaType);
     	}
 		}

diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PolyStringSerializer.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PolyStringSerializer.java
@@ -14,10 +14,10 @@ public class PolyStringSerializer extends JsonSerializer<PolyString>{
 	public void serialize(PolyString value, JsonGenerator jgen, SerializerProvider provider)
 			throws IOException, JsonProcessingException {
 		System.out.println("wualaaaa polystring serialization");
-		jgen.writeStartObject();
-		jgen.writeStringField("orig", value.getOrig());
-		jgen.writeStringField("norm", value.getNorm());
-		jgen.writeEndObject();
+//		jgen.writeStartObject();
+		jgen.writeString(value.getOrig());
+//		jgen.writeStringField("norm", value.getNorm());
+//		jgen.writeEndObject();
 
 	}
 

diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.java
@@ -636,7 +636,7 @@ public <T> T parsePrismPropertyRealValue(JsonNode valueElement, PrismPropertyDef
 //	    	mapper.configure(Feature.USE_GETTERS_AS_SETTERS, true);
 
 	    	System.out.println("expected java type: " + expectedJavaType.getSimpleName());
-	    	PrismJaxbProcessor jaxbProcessor = prismContext.getPrismJaxbProcessor();
+//	    	PrismJaxbProcessor jaxbProcessor = prismContext.getPrismJaxbProcessor();
 
 //	    	mapper.getTypeFactory().