json prune for products

Author: rainer-prosi

src/main/java/org/cip4/lib/jdf/jsonutil/schema/JSONSchemaMerger.java

@@ -44,6 +44,7 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
+import org.cip4.jdflib.core.AttributeName;
 import org.cip4.jdflib.core.StringArray;
 import org.cip4.jdflib.extensions.XJDFConstants;
 import org.cip4.jdflib.jmf.JDFMessage.EnumFamily;
@@ -231,11 +232,40 @@ JSONObject updaterefs(final JSONObject val)
 	void updateAbstractIntent()
 	{
 		final JSONObjHelper h = getHelper("$defs/Intent/properties");
+		final JSONArrayHelper req = getArrayHelper("$defs/Intent/oneOf");
+		for (final JSONObject o : req.getJSONObjects())
+		{
+			final JSONArray reqa = new JSONObjHelper(o).getArray(REQUIRED);
+			if (reqa != null && reqa.contains("IntentResource"))
+			{
+				req.remove(o);
+			}
+			if (reqa == null)
+			{
+				final JSONArrayHelper o2 = new JSONObjHelper(o).getArrayHelper("not/anyOf");
+				if (o2 != null)
+				{
+					for (final JSONObject o3 : o2.getJSONObjects())
+					{
+						final JSONArray reqa3 = new JSONObjHelper(o3).getArray(REQUIRED);
+						if (reqa3 != null && reqa3.contains("IntentResource"))
+						{
+							o2.remove(o3);
+						}
+
+					}
+				}
+			}
+		}
+
 		final List<String> alldefs = getHelper(DEFS).getKeys();
+
 		h.remove(PRODUCT_INTENT);
+		h.remove("IntentResource");
 		for (final String def : alldefs)
 		{
-			if (def.endsWith(XJDFConstants.Intent) && !XJDFConstants.Intent.equals(def) && !PRODUCT_INTENT.equals(def))
+			if (def.endsWith(XJDFConstants.Intent) && !XJDFConstants.Intent.equals(def) && !PRODUCT_INTENT.equals(def)
+					&& !AttributeName.RENDERINGINTENT.equals(def))
 			{
 				h.setString(def + SLASH_REF, HASH_DEFS + def);
 				explicitAbstract.add(def);

src/main/java/org/cip4/lib/jdf/jsonutil/schema/JSONSchemaPrune.java

@@ -201,6 +201,7 @@ public void prune()
 			zapper.addAll(pruneKeys);
 			zapper.walk();
 		}
+		updateXjdfXjmf();
 		jsonSchemaWalker.setJsonCase(getJsonCase());
 		jsonSchemaWalker.setSorted(true);
 		final JSONObjHelper oh = jsonSchemaWalker.walk();
@@ -333,13 +334,13 @@ void collectPrune(final JSONObjHelper root, final HashSet<String> retain)
 		final Map<String, Object> m = cw.getCollected();
 		if (m != null)
 		{
-			final List<String> keyList = new StringArray();
+			final Collection<String> keyList = new HashSet<>();
 			for (final Entry<String, Object> e : m.entrySet())
 			{
 				final Object o = e.getValue();
 				final String s = (String) o;
 				final String token = StringUtil.token(s, -1, JDFConstants.SLASH);
-				if (!pruneType.contains(token))
+				if (!pruneType.contains(token) || retain.contains(token))
 				{
 					keyList.add(token);
 				}
@@ -388,8 +389,8 @@ else if (!roots.isEmpty())
 	@Override
 	public String toString()
 	{
-		return "JSONSchemaPrunee [ pruneRoots=" + pruneRoots + ", allowedMessages=" + allowedMessages + ", allowedResources=" + allowedResources + ", allowedPartitions="
-				+ allowedPartitions + ", pruneMore=" + pruneType + "]";
+		return "JSONSchemaPrunee [ pruneRoots=" + pruneRoots + ", allowedMessages=" + allowedMessages + ", allowedResources=" + allowedResources
+				+ ", allowedPartitions=" + allowedPartitions + ", pruneMore=" + pruneType + "]";
 	}
 
 }

src/test/java/org/cip4/lib/jdf/jsonutil/schema/JSONPruneTest.java

@@ -47,6 +47,7 @@
 
 import org.cip4.jdflib.core.AttributeName;
 import org.cip4.jdflib.core.ElementName;
+import org.cip4.jdflib.extensions.XJDFConstants;
 import org.cip4.jdflib.resource.JDFResource.EnumPartIDKey;
 import org.cip4.jdflib.util.FileUtil;
 import org.cip4.lib.jdf.jsonutil.JSONObjHelper;
@@ -91,6 +92,19 @@ void testJSONSchemaUpdateXJDF() throws URISyntaxException, IOException
 		FileUtil.writeFile(up, new File(sm_dirTestDataTemp + "schema/Version_2_3/xjdfonly.json"));
 	}
 
+	@Test
+	void testJSONSchemaUpdateProduct() throws URISyntaxException, IOException
+	{
+		final JSONSchemaPrune up = getUpdater();
+		up.addPruneRoot("XJDF");
+		up.addPruneMore(XJDFConstants.ResourceSet);
+		up.addPruneMore(ElementName.AUDITPOOL);
+		up.addSingleResource("fnarf");
+		up.prune();
+		FileUtil.writeFile(up, new File(sm_dirTestDataTemp + "schema/Version_2_3/productonly.json"));
+
+	}
+
 	@Test
 	void testJSONSchemaUpdateXJMF() throws URISyntaxException, IOException
 	{