Interim commit.

infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemNameQualificationStrategy.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2010-2016 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.evolveum.midpoint.prism;
+
+/**
+ * @author mederly
+ */
+public enum ItemNameQualificationStrategy {
+
+	ALWAYS_USE_FULL_URI,
+	USE_NS_PROPERTY
+	//UNQUALIFIED_IF_NOT_AMBIGUOUS
+
+}

infra/prism/src/main/java/com/evolveum/midpoint/prism/NameQualificationStrategy.java

@@ -20,8 +20,7 @@
  * @author mederly
  */
 public enum NameQualificationStrategy {
-
 	ALWAYS,
-	ONLY_IF_NOT_COMMON,
-	ONLY_IF_AMBIGUOUS;
+	IF_AMBIGUOUS,
+	IF_NOT_COMMON_OR_AMBIGUOUS;
 }

infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java

@@ -193,17 +193,25 @@ public <D extends ItemDefinition> D findItemDefinition(QName name, Class<D> claz
         return itemDefinition;
     }
 
+    public String getDefaultNamespace() {
+		return complexTypeDefinition != null ? complexTypeDefinition.getDefaultNamespace() : null;
+	}
+
+	public List<String> getIgnoredNamespaces() {
+		return complexTypeDefinition != null ? complexTypeDefinition.getIgnoredNamespaces() : null;
+	}
+
     private <D extends ItemDefinition> D findRuntimeItemDefinition(QName firstName, ItemPath rest, Class<D> clazz) {
         if (prismContext == null) {
             return null;            // should not occur
         }
 		ItemDefinition definition = null;
-		if (StringUtils.isEmpty(firstName.getNamespaceURI()) && StringUtils.isNotEmpty(complexTypeDefinition.getDefaultNamespace())) {
+		if (StringUtils.isEmpty(firstName.getNamespaceURI()) && StringUtils.isNotEmpty(getDefaultNamespace())) {
 			definition = prismContext.getSchemaRegistry().findItemDefinitionByElementName(
-					new QName(complexTypeDefinition.getDefaultNamespace(), firstName.getLocalPart()));
+					new QName(getDefaultNamespace(), firstName.getLocalPart()));
 		}
 		if (definition == null) {
-			definition = prismContext.getSchemaRegistry().findItemDefinitionByElementName(firstName, complexTypeDefinition.getIgnoredNamespaces());
+			definition = prismContext.getSchemaRegistry().findItemDefinitionByElementName(firstName, getIgnoredNamespaces());
 		}
         if (definition == null) {
             return null;

infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java

@@ -561,7 +561,13 @@ public <O extends Objectable> String serializeObjectToString(PrismObject<O> obje
 		RootXNode xroot = xnodeProcessor.serializeObject(object);
 		return parser.serializeToString(xroot, null);
 	}
-
+
+	public <O extends Objectable> String serializeObjectToString(PrismObject<O> object, String language, SerializationOptions options) throws SchemaException {
+		Parser parser = getParserNotNull(language);
+		RootXNode xroot = xnodeProcessor.serializeObject(object);
+		return parser.serializeToString(xroot, SerializationContext.forOptions(options));
+	}
+
 	public <C extends Containerable> String serializeContainerValueToString(PrismContainerValue<C> cval, QName elementName, String language) throws SchemaException {
 		Parser parser = getParserNotNull(language);
 

infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializationContext.java

@@ -41,4 +41,8 @@ public void setOptions(SerializationOptions options) {
     public static boolean isSerializeReferenceNames(SerializationContext ctx) {
         return ctx != null && SerializationOptions.isSerializeReferenceNames(ctx.getOptions());
     }
+
+    public static SerializationContext forOptions(SerializationOptions options) {
+        return new SerializationContext(options);
+    }
 }

infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializationOptions.java

@@ -22,7 +22,7 @@
 public class SerializationOptions {
 
     private boolean serializeReferenceNames;
-	private NameQualificationStrategy itemNameQualificationStrategy;
+	private ItemNameQualificationStrategy itemNameQualificationStrategy;
 	private NameQualificationStrategy itemTypeQualificationStrategy;
 	private NameQualificationStrategy itemPathQualificationStrategy;
 	private NameQualificationStrategy genericQualificationStrategy;
@@ -45,11 +45,11 @@ public static boolean isSerializeReferenceNames(SerializationOptions options) {
         return options != null && options.isSerializeReferenceNames();
     }
 
-	public NameQualificationStrategy getItemNameQualificationStrategy() {
+	public ItemNameQualificationStrategy getItemNameQualificationStrategy() {
 		return itemNameQualificationStrategy;
 	}
 
-	public void setItemNameQualificationStrategy(NameQualificationStrategy itemNameQualificationStrategy) {
+	public void setItemNameQualificationStrategy(ItemNameQualificationStrategy itemNameQualificationStrategy) {
 		this.itemNameQualificationStrategy = itemNameQualificationStrategy;
 	}
 
@@ -76,4 +76,21 @@ public NameQualificationStrategy getGenericQualificationStrategy() {
 	public void setGenericQualificationStrategy(NameQualificationStrategy genericQualificationStrategy) {
 		this.genericQualificationStrategy = genericQualificationStrategy;
 	}
+
+	public static SerializationOptions createQualifiedNames() {
+		SerializationOptions opts = new SerializationOptions();
+		opts.itemNameQualificationStrategy = ItemNameQualificationStrategy.ALWAYS_USE_FULL_URI;
+		opts.itemPathQualificationStrategy = NameQualificationStrategy.ALWAYS;
+		opts.itemTypeQualificationStrategy = NameQualificationStrategy.ALWAYS;
+		opts.genericQualificationStrategy = NameQualificationStrategy.ALWAYS;
+		return opts;
+	}
+
+	public static boolean isFullItemNameUris(SerializationOptions opts) {
+		return opts != null && opts.itemNameQualificationStrategy != ItemNameQualificationStrategy.ALWAYS_USE_FULL_URI;
+	}
+
+	public static boolean isUseNsProperty(SerializationOptions opts) {
+		return opts == null || opts.itemNameQualificationStrategy == null || opts.itemNameQualificationStrategy == ItemNameQualificationStrategy.USE_NS_PROPERTY;
+	}
 }

infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/AbstractJsonParser.java

@@ -24,10 +24,13 @@
 
 import com.evolveum.midpoint.prism.ParsingContext;
 import com.evolveum.midpoint.prism.SerializationContext;
+import com.evolveum.midpoint.prism.SerializationOptions;
 import com.evolveum.midpoint.prism.parser.Parser;
 import com.evolveum.midpoint.prism.parser.ParserUtils;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
+import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.JsonParser;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.jetbrains.annotations.NotNull;
@@ -46,11 +49,6 @@
 import com.evolveum.midpoint.util.QNameUtil;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
@@ -482,12 +480,19 @@ private void serializeFromMap(MapXNode map, JsonSerializationContext ctx) throws
 			writeExplicitType(explicitType, ctx.generator);
 		}
 		for (Entry<QName,XNode> entry : map.entrySet()) {
-			ctx.generator.writeFieldName(QNameUtil.qNameToUri(entry.getKey(), false));
+			ctx.generator.writeFieldName(createKeyUri(entry.getKey(), ctx));
 			serialize(entry.getValue(), ctx);
 		}
 		ctx.generator.writeEndObject();
 	}
 
+	private String createKeyUri(QName key, JsonSerializationContext ctx) {
+		final SerializationOptions opts = ctx.prismSerializationContext.getOptions();
+		if (SerializationOptions.isFullItemNameUris(opts)) {
+			return QNameUtil.qNameToUri(key, false);
+		}
+	}
+
 	private void serializeFromList(ListXNode list, JsonSerializationContext ctx) throws IOException {
 		ctx.generator.writeStartArray();
 		for (XNode item : list) {

infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java

@@ -47,6 +47,7 @@
 import org.apache.xml.resolver.CatalogManager;
 import org.apache.xml.resolver.tools.CatalogResolver;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -1032,7 +1033,7 @@ public ItemDefinition findItemDefinitionByElementName(QName elementName) {
 		return findItemDefinitionByElementName(elementName, null);
     }
 
-	public ItemDefinition findItemDefinitionByElementName(QName elementName, List<String> ignoredNamespaces) {
+	public ItemDefinition findItemDefinitionByElementName(QName elementName, @Nullable List<String> ignoredNamespaces) {
 		if (StringUtils.isEmpty(elementName.getNamespaceURI())) {
 			return resolveGlobalItemDefinitionWithoutNamespace(elementName.getLocalPart(), ItemDefinition.class, true, ignoredNamespaces);
 		}
@@ -1195,7 +1196,7 @@ public ItemDefinition resolveGlobalItemDefinition(QName elementQName, PrismConta
 		String elementNamespace = elementQName.getNamespaceURI();
 		if (StringUtils.isEmpty(elementNamespace)) {
 			List<String> ignoredNamespaces = containerDefinition != null ?
-					containerDefinition.getComplexTypeDefinition().getIgnoredNamespaces() :
+					containerDefinition.getIgnoredNamespaces() :
 					null;
 			return resolveGlobalItemDefinitionWithoutNamespace(elementQName.getLocalPart(), ItemDefinition.class, true, ignoredNamespaces);
 		}
@@ -1211,7 +1212,7 @@ private <T extends ItemDefinition> T resolveGlobalItemDefinitionWithoutNamespace
         return resolveGlobalItemDefinitionWithoutNamespace(localPart, definitionClass, true, null);
     }
 
-    private <T extends ItemDefinition> T resolveGlobalItemDefinitionWithoutNamespace(String localPart, Class<T> definitionClass, boolean exceptionIfAmbiguous, List<String> ignoredNamespaces) {
+    private <T extends ItemDefinition> T resolveGlobalItemDefinitionWithoutNamespace(String localPart, Class<T> definitionClass, boolean exceptionIfAmbiguous, @Nullable List<String> ignoredNamespaces) {
         ItemDefinition found = null;
         for (SchemaDescription schemaDescription : parsedSchemas.values()) {
             PrismSchema schema = schemaDescription.getSchema();
@@ -1238,7 +1239,7 @@ private <T extends ItemDefinition> T resolveGlobalItemDefinitionWithoutNamespace
         return (T) found;
     }
 
-	private boolean namespaceMatches(String namespace, List<String> ignoredNamespaces) {
+	private boolean namespaceMatches(String namespace, @Nullable List<String> ignoredNamespaces) {
 		if (ignoredNamespaces == null) {
 			return false;
 		}

infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java

@@ -184,7 +184,7 @@ private void roundTrip(File file) throws SchemaException, SAXException, IOExcept
 
 		// WHEN
 		// We need to serialize with composite objects during roundtrip, otherwise the result will not be equal
-		String userXml = prismContext.serializeObjectToString(originalUser, getOutputFormat());
+		String userXml = prismContext.serializeObjectToString(originalUser, getOutputFormat(), SerializationOptions.createQualifiedNames());
 
 		// THEN
 		System.out.println("Serialized user:");

infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsingYaml.java

@@ -26,26 +26,5 @@ protected String getFilenameSuffix() {
 	protected String getOutputFormat() {
 		return PrismContext.LANG_YAML;
 	}
-
-	@Test
-	public void test() throws Exception{
-//		File[] files = new File[]{USER_JACK_ADHOC_FILE};
-//		PrismContext prismContext = constructInitializedPrismContext();
-//		for (File f : files){
-//			System.out.println("parsing file" + f.getName());
-//			PrismObject o = prismContext.parseObject(f);
-////			
-//			String s = prismContext.serializeObjectToString(o, PrismContext.LANG_YAML);
-//			System.out.println("parsed: " + s);
-//			String fname = f.getName();
-//			fname = fname.replace(".xml", "123.yaml");
-//			
-//			FileOutputStream bos = (new FileOutputStream(new File("src/test/resources/common/yaml/"+fname)));
-//			byte[] bytes = s.getBytes();
-//			bos.write(bytes);
-//			bos.flush();
-//			bos.close();
-//		}
-	}
 
 }