Move ParsingContextImpl to prism-impl

Evolveum · Nov 17, 2018 · fcd4faa · fcd4faa
1 parent 16fc75b
commit fcd4faa
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 24 deletions.
diff --git a/...um/midpoint/prism/ParsingContextImpl.java → ...um/midpoint/prism/ParsingContextImpl.java b/...um/midpoint/prism/ParsingContextImpl.java → ...um/midpoint/prism/ParsingContextImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2017 Evolveum
+ * Copyright (c) 2010-2018 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,6 +35,27 @@ public class ParsingContextImpl implements ParsingContext {
 	ParsingContextImpl() {
 	}
 
+	static ParsingContext allowMissingRefTypes() {
+		ParsingContextImpl pc = new ParsingContextImpl();
+		pc.setAllowMissingRefTypes(true);
+		return pc;
+	}
+
+
+	public static ParsingContext createForCompatibilityMode() {
+		return forMode(XNodeProcessorEvaluationMode.COMPAT);
+	}
+
+	static ParsingContext forMode(XNodeProcessorEvaluationMode mode) {
+		ParsingContextImpl pc = new ParsingContextImpl();
+		pc.setEvaluationMode(mode);
+		return pc;
+	}
+
+	public static ParsingContext createDefault() {
+		return new ParsingContextImpl();
+	}
+
 	@SuppressWarnings("SameParameterValue")
 	void setAllowMissingRefTypes(boolean allowMissingRefTypes) {
 		this.allowMissingRefTypes = allowMissingRefTypes;

diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/PrismContextImpl.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/PrismContextImpl.java
@@ -510,4 +510,19 @@ public boolean relationMatches(QName relationQuery, QName relation) {
 	public boolean relationMatches(@NotNull List<QName> relationQuery, QName relation) {
 		return relationQuery.stream().anyMatch(rq -> relationMatches(rq, relation));
 	}
+
+	@Override
+	public ParsingContext getDefaultParsingContext() {
+		return ParsingContextImpl.createDefault();
+	}
+
+	@Override
+	public ParsingContext createParsingContextForAllowMissingRefTypes() {
+		return ParsingContextImpl.allowMissingRefTypes();
+	}
+
+	@Override
+	public ParsingContext createParsingContextForCompatibilityMode() {
+		return ParsingContextImpl.createForCompatibilityMode();
+	}
 }
diff --git a/...a/prism-impl/src/main/java/com/evolveum/midpoint/prism/marshaller/QueryConverterImpl.java b/...a/prism-impl/src/main/java/com/evolveum/midpoint/prism/marshaller/QueryConverterImpl.java
@@ -494,7 +494,7 @@ private <C extends Containerable> RefFilter parseRefFilter(MapXNode clauseXMap,
 			Item<?,?> item = prismContext.parserFor(valueRoot)
 					.name(itemName)
 					.definition(itemDefinition)
-					.context(ParsingContext.allowMissingRefTypes())
+					.context(prismContext.createParsingContextForAllowMissingRefTypes())
 					.parseItem();
 			if (!(item instanceof PrismReference)) {
 				throw new IllegalStateException("Expected PrismReference, got " + item);
@@ -688,7 +688,7 @@ private Item parseItem(RootXNode root, QName itemName, ItemDefinition itemDefini
 		item = prismContext.parserFor(root)
 				.name(itemName)
 				.definition(itemDefinition)
-				.context(ParsingContext.allowMissingRefTypes())
+				.context(prismContext.createParsingContextForAllowMissingRefTypes())
 				.parseItem();
 
 		if (item.getValues().size() < 1 ) {

diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/ParsingContext.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/ParsingContext.java
@@ -16,11 +16,9 @@
 
 package com.evolveum.midpoint.prism;
 
-import com.evolveum.midpoint.prism.marshaller.XNodeProcessorEvaluationMode;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.util.logging.Trace;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -30,24 +28,6 @@ public interface ParsingContext extends Cloneable {
 
 	boolean isAllowMissingRefTypes();
 
-	XNodeProcessorEvaluationMode getEvaluationMode();
-
-	static ParsingContext forMode(XNodeProcessorEvaluationMode mode) {
-		ParsingContextImpl pc = new ParsingContextImpl();
-		pc.setEvaluationMode(mode);
-		return pc;
-	}
-
-	static ParsingContext allowMissingRefTypes() {
-		ParsingContextImpl pc = new ParsingContextImpl();
-		pc.setAllowMissingRefTypes(true);
-		return pc;
-	}
-
-	static ParsingContext createDefault() {
-		return new ParsingContextImpl();
-	}
-
 	boolean isCompat();
 
 	boolean isStrict();

diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
@@ -291,4 +291,9 @@ <C extends Containerable, O extends Objectable> void adopt(PrismContainerValue<C
 	 */
 	boolean relationMatches(@NotNull List<QName> relationQuery, QName relation);
 
+	ParsingContext getDefaultParsingContext();
+
+	ParsingContext createParsingContextForAllowMissingRefTypes();
+
+	ParsingContext createParsingContextForCompatibilityMode();
 }
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
@@ -510,7 +510,7 @@ private <T extends ObjectType> PrismObject<T> updateLoadedObject(GetObjectResult
         PrismObject<T> prismObject;
         try {
             // "Postel mode": be tolerant what you read. We need this to tolerate (custom) schema changes
-			ParsingContext parsingContext = ParsingContext.forMode(XNodeProcessorEvaluationMode.COMPAT);
+			ParsingContext parsingContext = prismContext.createParsingContextForCompatibilityMode();
             prismObject = prismContext.parserFor(xml).context(parsingContext).parse();
 			if (parsingContext.hasWarnings()) {
 				LOGGER.warn("Object {} parsed with {} warnings", ObjectTypeUtil.toShortString(prismObject), parsingContext.getWarnings().size());