GPU-2187: JSON type

cms-core/pom.xml

@@ -436,6 +436,12 @@
 			<artifactId>handlebars</artifactId>
 		</dependency>
 
+		<!-- JSON -->
+		<dependency>
+			<groupId>com.jayway.jsonpath</groupId>
+			<artifactId>json-path</artifactId>
+		</dependency>
+
 		<!-- Test dependencies -->
 		<dependency>
 			<groupId>org.glassfish.jersey.containers</groupId>

cms-core/src/main/java/com/gentics/contentnode/devtools/ConstructSynchronizer.java

@@ -447,6 +447,9 @@ protected Part transform(PartModel from, Part to) throws NodeException {
 		to.setExternalEditorUrl(from.getExternalEditorUrl());
 
 		switch (to.getPartTypeId()) {
+		case Part.JSON:
+			to.setInfoText(from.getHtmlClass());
+			// fallthrough
 		case Part.TEXT:
 		case Part.TEXTHMTL:
 		case Part.HTML:
@@ -455,11 +458,6 @@ protected Part transform(PartModel from, Part to) throws NodeException {
 		case Part.HTMLLONG:
 			to.setInfoInt(from.getRegexId());
 			break;
-		default:
-			break;
-		}
-
-		switch (to.getPartTypeId()) {
 		case Part.LIST:
 		case Part.LISTORDERED:
 		case Part.LISTUNORDERED:

cms-core/src/main/java/com/gentics/contentnode/factory/object/ContentRepositoryFactory.java

@@ -1532,6 +1532,10 @@ private static class FactoryTagmapEntry extends TagmapEntry {
 		@Updateable
 		protected String micronodeFilter;
 
+		@DataField("json_schema_filter")
+		@Updateable
+		protected String jsonSchemaFilter;
+
 		/**
 		 * Create an empty instance
 		 * @param info info
@@ -1678,6 +1682,11 @@ public String getMicronodeFilter() {
 			return micronodeFilter;
 		}
 
+		@Override
+		public String getJSONSchemaFilter() {
+			return jsonSchemaFilter;
+		}
+
 		@Override
 		public void delete(boolean force) throws InsufficientPrivilegesException,
 					NodeException {
@@ -1887,6 +1896,14 @@ public void setMicronodeFilter(String micronodeFilter) throws ReadOnlyException
 			}
 		}
 
+		@Override
+		public void setJSONSchemaFilter(String jsonSchemaFilter) throws ReadOnlyException {
+			if (!StringUtils.isEqual(this.jsonSchemaFilter, jsonSchemaFilter)) {
+				this.jsonSchemaFilter = jsonSchemaFilter;
+				this.modified = true;
+			}
+		}
+
 		@Override
 		public boolean save() throws InsufficientPrivilegesException,
 					NodeException {
@@ -2224,7 +2241,7 @@ private static class FactoryCrFragmentEntry extends AbstractContentObject implem
 		protected int crFragmentId;
 
 		@RestModel(update = { "tagname", "mapname", "obj_type", "attribute_type", "multivalue", "optimized", "filesystem", "target_type",
-				"foreignlink_attribute", "foreignlink_attribute_rule", "category", "displayfield", "segmentfield", "urlfield", "no_index", "elasticsearch", "micronode_filter" })
+				"foreignlink_attribute", "foreignlink_attribute_rule", "category", "displayfield", "segmentfield", "urlfield", "no_index", "elasticsearch", "micronode_filter", "json_schema_filter" })
 		protected ContentRepositoryFragmentEntryModel model;
 
 		protected AttributeType attributeType;
@@ -2385,6 +2402,11 @@ public String getMicronodeFilter() {
 			return model.getMicronodeFilter();
 		}
 
+		@Override
+		public String getJsonSchemaFilter() {
+			return model.getJSONSchemaFilter();
+		}
+
 		@Override
 		public ContentRepositoryFragmentEntryModel getModel() {
 			return model;
@@ -2500,6 +2522,14 @@ public void setMicronodeFilter(String micronodeFilter) throws ReadOnlyException
 			}
 		}
 
+		@Override
+		public void setJSONSchemaFilter(String jsonSchemaFilter) throws ReadOnlyException {
+			if (!StringUtils.isEqual(model.getJSONSchemaFilter(), jsonSchemaFilter)) {
+				model.setJSONSchemaFilter(jsonSchemaFilter);
+				this.modified = true;
+			}
+		}
+
 		@Override
 		public void setFilesystem(boolean filesystem) throws ReadOnlyException {
 			if (isFilesystem() != filesystem) {

cms-core/src/main/java/com/gentics/contentnode/factory/object/TagFactory.java

@@ -9,6 +9,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -25,6 +26,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import org.apache.commons.lang3.tuple.Pair;
 
@@ -75,9 +77,13 @@
 import com.gentics.contentnode.runtime.NodeConfigRuntimeConfiguration;
 import com.gentics.lib.db.SQLExecutor;
 import com.gentics.lib.etc.StringUtils;
+import com.gentics.mesh.core.rest.JsonSchema;
+import com.gentics.mesh.core.rest.node.field.JsonContent;
+import com.gentics.mesh.json.JsonUtil;
 
 import io.reactivex.Observable;
 import io.reactivex.functions.Consumer;
+import io.vertx.core.json.JsonArray;
 
 /**
  * An objectfactory which can create {@link ContentTag}, {@link TemplateTag}
@@ -156,6 +162,10 @@ public class TagFactory extends AbstractFactory {
 	 */
 	public final static String SYNC_RUNNING_ATTRIBUTENAME = "objtag.sync_running";
 
+	/**
+	 * Error log
+	 */
+	public final static String LOG_JSON_VALIDATION_ERROR = "JSON Validation error";
 	/**
 	 * Implementation class for a ContentTag
 	 */
@@ -1553,6 +1563,7 @@ public boolean save() throws InsufficientPrivilegesException, NodeException {
 			if (valueIds != null) {
 				valueIdsToRemove.addAll(valueIds);
 			}
+			validateObjectTagObject(this);
 			for (Value value : values) {
 				value.setContainer(this);
 				isModified |= value.save();
@@ -1931,6 +1942,50 @@ private static void saveTemplateTagObject(EditableFactoryTemplateTag tag) throws
 		}
 	}
 
+	/**
+	 * Perform the validation of a value a tag, where applicable.
+	 * 
+	 * @param tag
+	 * @throws NodeException
+	 */
+	private static void validateObjectTagObject(EditableFactoryObjectTag tag) throws NodeException {
+		for (Part part: tag.getConstruct().getParts()) {
+			if (part.getPartTypeId() == Part.JSON) {
+				Object value = tag.get(part.getKeyname());
+				if (value == null || !(value instanceof Value val)) {
+					continue;
+				}
+				String stringValue = val.getValueText();
+				if (StringUtils.isEmpty(stringValue)) {
+					continue;
+				}
+				JsonContent jsonContent = JsonContent.fromString(stringValue);
+				if (jsonContent == null) {
+					throw new ObjectModificationException(tag.getName(), LOG_JSON_VALIDATION_ERROR + " for "
+							+ "tag {" + tag.getId() + " " + tag.getName() + "}"
+							+ ", part {" + part.getKeyname() + "}."
+							+ " Reason: not a JSON value", "json_validation_failed");
+				}
+				if (!StringUtils.isEmpty(part.getInfoText())) {
+					JsonContent jsonSchemaContent = JsonContent.fromString(part.getInfoText());
+					JsonSchema[] allowedSchemas = null;
+					if (jsonSchemaContent.isArray()) {
+						JsonArray jsonSchemas = jsonSchemaContent.getArray();
+						allowedSchemas = IntStream.range(0, jsonSchemas.size()).mapToObj(jsonSchemas::getJsonObject).map(JsonSchema::new).toArray(size -> new JsonSchema[size]);
+					} else {
+						allowedSchemas = new JsonSchema[] { new JsonSchema(jsonSchemaContent.getObject()) };
+					}
+					if (allowedSchemas != null && Arrays.asList(allowedSchemas).stream().noneMatch(schema1 -> JsonUtil.newJsonSchemaValidator(schema1.getVertxSchema()).validate(jsonContent.getContent()).getValid() == Boolean.TRUE)) {
+						throw new ObjectModificationException(tag.getName(), LOG_JSON_VALIDATION_ERROR + " for {"
+								+ "tag {" + tag.getId() + " " + tag.getName() + "}"
+								+ ", part {" + part.getKeyname() + "}}"
+								+ " Reason: the JSON contents does not match any of allowed schemas", "json_validation_failed");
+					}
+				}
+			}
+		}
+	}
+
 	/**
 	 * Save the given objecttag object
 	 * @param tag tag

cms-core/src/main/java/com/gentics/contentnode/migration/MigrationPartMapper.java

@@ -11,6 +11,7 @@
 import static com.gentics.contentnode.object.Part.HTMLCUSTOMFORM;
 import static com.gentics.contentnode.object.Part.HTMLLONG;
 import static com.gentics.contentnode.object.Part.JAVAEDITOR;
+import static com.gentics.contentnode.object.Part.JSON;
 import static com.gentics.contentnode.object.Part.LIST;
 import static com.gentics.contentnode.object.Part.LISTORDERED;
 import static com.gentics.contentnode.object.Part.LISTUNORDERED;
@@ -194,6 +195,7 @@ private static boolean hasPartMappableValue(Part part) {
 		case TEXTHTMLLONG:
 		case TEXTCUSTOMFORM:
 		case HTML:
+		case JSON:
 		case LIST:
 		case LISTORDERED:
 		case LISTUNORDERED:

cms-core/src/main/java/com/gentics/contentnode/object/ContentRepository.java

@@ -1125,6 +1125,8 @@ protected String[] getCheckedAttributes(AttributeType attrType) throws NodeExcep
 			default:
 				throw new NodeException();
 			}
+		case json:
+			return new String[] { "tagname", "mapname", "object", "attributeType", "multivalue", "segmentfield", "displayfield", "urlfield", "noIndex", "elasticsearch", "jsonSchemaFilter" };
 		case micronode:
 			return new String[] { "tagname", "mapname", "object", "attributeType", "multivalue", "segmentfield", "displayfield", "urlfield", "micronodeFilter", "elasticsearch" };
 		case link:

cms-core/src/main/java/com/gentics/contentnode/object/Part.java

@@ -7,6 +7,8 @@
 
 import java.net.URI;
 
+import org.apache.commons.lang3.StringUtils;
+
 import com.gentics.api.lib.etc.ObjectTransformer;
 import com.gentics.api.lib.exception.NodeException;
 import com.gentics.api.lib.exception.ReadOnlyException;
@@ -70,6 +72,10 @@ public abstract class Part extends AbstractContentObject implements I18nNamedNod
 	public static final int FILEUPLOAD = 38;
 	public static final int FOLDERUPLOAD = 39;
 	public static final int NODE = 40;
+	public static final int FORM = 41;
+	public static final int CMSFORM = 42;
+	public static final int HANDLEBARS = 43;
+	public static final int JSON = 44;
 
 	/**
 	 * The ttype of the part object.
@@ -106,6 +112,9 @@ public abstract class Part extends AbstractContentObject implements I18nNamedNod
 		to.setExternalEditorUrl(from.getExternalEditorUrl());
 
 		switch (to.getPartTypeId()) {
+		case Part.JSON:
+			to.setInfoText(from.getJSONSchema());
+			// fallthrough
 		case Part.TEXT:
 		case Part.TEXTHMTL:
 		case Part.HTML:
@@ -116,11 +125,6 @@ public abstract class Part extends AbstractContentObject implements I18nNamedNod
 				to.setInfoInt(from.getRegex().getId());
 			}
 			break;
-		default:
-			break;
-		}
-
-		switch (to.getPartTypeId()) {
 		case Part.LIST:
 		case Part.LISTORDERED:
 		case Part.LISTUNORDERED:
@@ -185,6 +189,9 @@ public abstract class Part extends AbstractContentObject implements I18nNamedNod
 		to.setTypeId(from.getPartTypeId());
 
 		switch (from.getPartTypeId()) {
+		case Part.JSON:
+			to.setJSONSchema(from.getInfoText());
+			// fallthrough
 		case Part.TEXT:
 		case Part.TEXTHMTL:
 		case Part.HTML:
@@ -243,6 +250,9 @@ public abstract class Part extends AbstractContentObject implements I18nNamedNod
 		to.setExternalEditorUrl(from.getExternalEditorUrl());
 
 		switch (from.getPartTypeId()) {
+		case Part.JSON:
+			to.setHtmlClass(from.getInfoText());
+			// fallthrough
 		case Part.TEXT:
 		case Part.TEXTHMTL:
 		case Part.HTML:
@@ -251,11 +261,6 @@ public abstract class Part extends AbstractContentObject implements I18nNamedNod
 		case Part.HTMLLONG:
 			to.setRegexId(from.getInfoInt());
 			break;
-		default:
-			break;
-		}
-
-		switch (from.getPartTypeId()) {
 		case Part.LIST:
 		case Part.LISTORDERED:
 		case Part.LISTUNORDERED:

cms-core/src/main/java/com/gentics/contentnode/object/TagmapEntry.java

@@ -65,6 +65,7 @@ public abstract class TagmapEntry extends AbstractContentObject implements Named
 				}
 			}
 			entry.setMicronodeFilter(nodeEntry.getMicronodeFilter());
+			entry.setJSONSchemaFilter(nodeEntry.getJSONSchemaFilter());
 		}
 		CrFragment fragment = nodeEntry.getContentRepositoryFragment();
 		if (fragment != null) {
@@ -128,6 +129,9 @@ public abstract class TagmapEntry extends AbstractContentObject implements Named
 		if (entry.getMicronodeFilter() != null) {
 			nodeEntry.setMicronodeFilter(entry.getMicronodeFilter());
 		}
+		if (entry.getJSONSchemaFilter() != null) {
+			nodeEntry.setJSONSchemaFilter(entry.getJSONSchemaFilter());
+		}
 		if (entry.getNoIndex() != null) {
 			nodeEntry.setNoIndex(entry.getNoIndex());
 		}
@@ -166,6 +170,7 @@ public abstract class TagmapEntry extends AbstractContentObject implements Named
 		resolvableProperties.put("urlfield", new NodeObjectProperty<>((o, key) -> o.isUrlfield()));
 		resolvableProperties.put("fragmentName", new NodeObjectProperty<>((o, key) -> o.getContentRepositoryFragmentName()));
 		resolvableProperties.put("micronodeFilter", new NodeObjectProperty<>((o, key) -> o.getMicronodeFilter()));
+		resolvableProperties.put("jsonSchemaFilter", new NodeObjectProperty<>((o, key) -> o.getJSONSchemaFilter()));
 		resolvableProperties.put("elasticsearch", new NodeObjectProperty<>((o, key) -> o.getElasticsearch()));
 		resolvableProperties.put("noIndex", new NodeObjectProperty<>((o, key) -> o.isNoIndex()));
 	}
@@ -549,6 +554,23 @@ public void setMicronodeFilter(String micronodeFilter) throws ReadOnlyException
 		failReadOnly();
 	}
 
+	/**
+	 * Get the JSON schema filter for entries of type {@link AttributeType#json}
+	 * @return filter
+	 */
+	@FieldGetter("json_schema_filter")
+	public abstract String getJSONSchemaFilter();
+
+	/**
+	 * Set the JSON schema filter for entries of type {@link AttributeType#json}
+	 * @param jsonSchemaFilter filter
+	 * @throws ReadOnlyException
+	 */
+	@FieldSetter("json_schema_filter")
+	public void setJSONSchemaFilter(String jsonSchemaFilter) throws ReadOnlyException {
+		failReadOnly();
+	}
+
 	@Override
 	public String getName() {
 		return getMapname();
@@ -563,6 +585,9 @@ public String toString() {
 		case foreignlink:
 			return String.format("%d: %s -> %s (%s from %d.%s, mul: %b, stat: %b, opt: %b, fs: %b, cat: %s)", getObject(), getTagname(), getMapname(),
 					getAttributetype(), getTargetType(), getForeignlinkAttribute(), isMultivalue(), isStatic(), isOptimized(), isFilesystem(), getCategory());
+		case json:
+			return String.format("%d: %s -> %s (mul: %b, stat: %b, opt: %b, fs: %b, cat: %s, schema: %s)", getObject(), getTagname(), getMapname(),
+					isMultivalue(), isStatic(), isOptimized(), isFilesystem(), getCategory(), getJSONSchemaFilter());
 		default:
 			return String.format("%d: %s -> %s (%s, mul: %b, stat: %b, opt: %b, fs: %b, cat: %s)", getObject(), getTagname(), getMapname(), getAttributetype(),
 					isMultivalue(), isStatic(), isOptimized(), isFilesystem(), getCategory());
@@ -621,7 +646,12 @@ public static enum AttributeType {
 		/**
 		 * Micronode
 		 */
-		micronode(12, ContentRepositoryModel.Type.mesh);
+		micronode(12, ContentRepositoryModel.Type.mesh),
+
+		/**
+		 * JSON
+		 */
+		json(13, ContentRepositoryModel.Type.mesh);
 
 		/**
 		 * numerical type