Fixed compilation errors and minor bugs.

Evolveum · Oct 4, 2016 · a9bd233 · a9bd233
1 parent 0385315
commit a9bd233
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 30 deletions.
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/QNameSerializer.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/QNameSerializer.java
@@ -11,38 +11,17 @@
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 
-public class QNameSerializer extends JsonSerializer<QName>{
+public class QNameSerializer extends JsonSerializer<QName> {
 
 	@Override
-	public void serialize(QName value, JsonGenerator jgen, SerializerProvider provider) throws IOException,
-			JsonProcessingException {
-		//System.out.println("wualaaa QName serialization");
-		jgen.writeString(QNameUtil.qNameToUri(value));
-//		jgen.writeString(value.toString());
-//		jgen.writeStartObject();
-//		jgen.writeStringField("@namespace", value.getNamespaceURI());
-//		jgen.writeStringField("@localPart", value.getLocalPart());
-//		jgen.writeEndObject();
+	public void serialize(QName value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
+		jgen.writeString(QNameUtil.qNameToUri(value, false));
 	}
 
 	@Override
 	public void serializeWithType(QName value, JsonGenerator jgen, SerializerProvider provider,
-			TypeSerializer typeSer) throws IOException, JsonProcessingException {
-		// TODO Auto-generated method stub
-		//System.out.println("QName serialization with type");
-
-//		jgen.writeStartObject();
-//		typeSer.writeCustomTypePrefixForObject(value, jgen, "qname");
-//		typeSer.writeCustomTypePrefixForArray(value, jgen, "qname");
-//		typeSer.writeCustomTypePrefixForScalar(value, jgen, "qname");
+			TypeSerializer typeSer) throws IOException {
 		serialize(value, jgen, provider);
-//		typeSer.writeCustomTypeSuffixForScalar(value, jgen, "tra");
-//		typeSer.writeCustomTypeSuffixForArray(value, jgen, "qname");
-//		typeSer.writeCustomTypeSuffixForObject(value, jgen, "bla");
-//		jgen.writeTypeId("http://qname");
-//		jgen.writeObject(value.toString());
-//		jgen.writeEndObject();
-
 	}
 
 }
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
@@ -81,9 +81,9 @@ public XNode put(Map.Entry<QName, XNode> entry) {
     }
 
 	public XNode put(QName key, XNode value) {
-		removeEntry(key);
+		XNode previous = removeEntry(key);
 		subnodes.add(new Entry(key, value));
-		return value;
+		return previous;
 	}
 
 	public Entry putReturningEntry(QName key, XNode value) {
@@ -362,14 +362,15 @@ public void qualifyKey(QName key, String newNamespace) {
 		}
 	}
 
-	public void replace(QName key, XNode value) {
+	public XNode replace(QName key, XNode value) {
 		for (Entry entry : subnodes) {
 			if (entry.getKey().equals(key)) {
+				XNode previous = entry.getValue();
 				entry.setValue(value);
-				return;
+				return previous;
 			}
 		}
-		put(key, value);
+		return put(key, value);
 	}
 
 	private class Entry implements Map.Entry<QName, XNode>, Serializable {