LPS-81687 Semver

modules/apps/dynamic-data-mapping/dynamic-data-mapping-api/src/main/java/com/liferay/dynamic/data/mapping/constants/DDMConstants.java

@@ -19,6 +19,10 @@
  */
 public class DDMConstants {
 
+	public static final String EXPRESSION_FUNCTION_FACTORY_NAME =
+		"com.liferay.dynamic.data.mapping.expression." +
+			"DDMExpressionFunctionFactory";
+
 	public static final String RESOURCE_NAME =
 		"com.liferay.dynamic.data.mapping";
 

modules/apps/dynamic-data-mapping/dynamic-data-mapping-api/src/main/java/com/liferay/dynamic/data/mapping/data/provider/DDMDataProviderRequest.java

@@ -41,7 +41,7 @@ public Locale getLocale() {
 		return _locale;
 	}
 
-	public <T> Optional<T> getParameter(String name, Class<?> clazz) {
+	public <T> Optional<T> getParameterOptional(String name, Class<?> clazz) {
 		Object value = _parameters.get(name);
 
 		if (value == null) {

modules/apps/dynamic-data-mapping/dynamic-data-mapping-api/src/main/java/com/liferay/dynamic/data/mapping/data/provider/DDMDataProviderResponse.java

@@ -25,7 +25,7 @@
  */
 public final class DDMDataProviderResponse implements Serializable {
 
-	public <T> Optional<T> getOutput(String name, Class<?> clazz) {
+	public <T> Optional<T> getOutputOptional(String name, Class<?> clazz) {
 		Object value = _ddmDataProviderResponseOutputs.get(name);
 
 		if (value == null) {

modules/apps/dynamic-data-mapping/dynamic-data-mapping-api/src/main/java/com/liferay/dynamic/data/mapping/expression/CreateExpressionRequest.java

@@ -0,0 +1,106 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.dynamic.data.mapping.expression;
+
+/**
+ * @author Leonardo Barros
+ */
+public final class CreateExpressionRequest {
+
+	public DDMExpressionActionHandler getDDMExpressionActionHandler() {
+		return _ddmExpressionActionHandler;
+	}
+
+	public DDMExpressionFieldAccessor getDDMExpressionFieldAccessor() {
+		return _ddmExpressionFieldAccessor;
+	}
+
+	public DDMExpressionObserver getDDMExpressionObserver() {
+		return _ddmExpressionObserver;
+	}
+
+	public DDMExpressionParameterAccessor getDDMExpressionParameterAccessor() {
+		return _ddmExpressionParameterAccessor;
+	}
+
+	public String getExpression() {
+		return _expression;
+	}
+
+	public static class Builder {
+
+		public static Builder newBuilder(String expression) {
+			return new Builder(expression);
+		}
+
+		public CreateExpressionRequest build() {
+			return _createExpressionRequest;
+		}
+
+		public Builder withDDMExpressionActionHandler(
+			DDMExpressionActionHandler ddmExpressionActionHandler) {
+
+			_createExpressionRequest._ddmExpressionActionHandler =
+				ddmExpressionActionHandler;
+
+			return this;
+		}
+
+		public Builder withDDMExpressionFieldAccessor(
+			DDMExpressionFieldAccessor ddmExpressionFieldAccessor) {
+
+			_createExpressionRequest._ddmExpressionFieldAccessor =
+				ddmExpressionFieldAccessor;
+
+			return this;
+		}
+
+		public Builder withDDMExpressionObserver(
+			DDMExpressionObserver ddmExpressionObserver) {
+
+			_createExpressionRequest._ddmExpressionObserver =
+				ddmExpressionObserver;
+
+			return this;
+		}
+
+		public Builder withDDMExpressionParameterAccessor(
+			DDMExpressionParameterAccessor ddmExpressionParameterAccessor) {
+
+			_createExpressionRequest._ddmExpressionParameterAccessor =
+				ddmExpressionParameterAccessor;
+
+			return this;
+		}
+
+		private Builder(String expression) {
+			_createExpressionRequest._expression = expression;
+		}
+
+		private final CreateExpressionRequest _createExpressionRequest =
+			new CreateExpressionRequest();
+
+	}
+
+	private CreateExpressionRequest() {
+	}
+
+	private DDMExpressionActionHandler _ddmExpressionActionHandler;
+	private DDMExpressionFieldAccessor _ddmExpressionFieldAccessor;
+	private DDMExpressionObserver _ddmExpressionObserver;
+	private DDMExpressionParameterAccessor _ddmExpressionParameterAccessor;
+	private String _expression;
+
+}

modules/apps/dynamic-data-mapping/dynamic-data-mapping-api/src/main/java/com/liferay/dynamic/data/mapping/expression/DDMExpression.java

@@ -18,8 +18,7 @@
 
 import com.liferay.dynamic.data.mapping.expression.model.Expression;
 
-import java.math.MathContext;
-
+import java.util.Collections;
 import java.util.Map;
 
 /**
@@ -32,42 +31,116 @@ public interface DDMExpression<T> {
 
 	public Expression getModel();
 
-	public Map<String, VariableDependencies> getVariableDependenciesMap()
-		throws DDMExpressionException;
+	/**
+	 * @deprecated As of Judson (7.1.x), with no direct replacement
+	 */
+	@Deprecated
+	public default Map<String, VariableDependencies>
+			getVariableDependenciesMap()
+		throws DDMExpressionException {
 
-	public void setBooleanVariableValue(
-		String variableName, Boolean variableValue);
+		return Collections.emptyMap();
+	}
 
-	public void setDDMExpressionFunction(
-		String functionName, DDMExpressionFunction ddmExpressionFunction);
+	/**
+	 * @deprecated As of Judson (7.1.x), with no direct replacement
+	 */
+	@Deprecated
+	public default void setBooleanVariableValue(
+		String variableName, Boolean variableValue) {
+
+		setVariable(variableName, variableValue);
+	}
 
-	public void setDoubleVariableValue(
-		String variableName, Double variableValue);
+	/**
+	 * @deprecated As of Judson (7.1.x), with no direct replacement
+	 */
+	@Deprecated
+	public default void setDDMExpressionFunction(
+		String functionName, DDMExpressionFunction ddmExpressionFunction) {
+	}
 
-	public void setExpressionStringVariableValue(
-		String variableName, String variableValue);
+	/**
+	 * @deprecated As of Judson (7.1.x), with no direct replacement
+	 */
+	@Deprecated
+	public default void setDoubleVariableValue(
+		String variableName, Double variableValue) {
 
-	public void setFloatVariableValue(String variableName, Float variableValue);
+		setVariable(variableName, variableValue);
+	}
 
-	public void setIntegerVariableValue(
-		String variableName, Integer variableValue);
+	/**
+	 * @deprecated As of Judson (7.1.x), with no direct replacement
+	 */
+	@Deprecated
+	public default void setExpressionStringVariableValue(
+		String variableName, String variableValue) {
 
-	public void setLongVariableValue(String variableName, Long variableValue);
+		setVariable(variableName, variableValue);
+	}
 
 	/**
 	 * @deprecated As of Judson (7.1.x), with no direct replacement
 	 */
 	@Deprecated
-	public void setMathContext(MathContext mathContext);
+	public default void setFloatVariableValue(
+		String variableName, Float variableValue) {
 
-	public void setNumberVariableValue(
-		String variableName, Number variableValue);
+		setVariable(variableName, variableValue);
+	}
 
-	public void setObjectVariableValue(
-		String variableName, Object variableValue);
+	/**
+	 * @deprecated As of Judson (7.1.x), with no direct replacement
+	 */
+	@Deprecated
+	public default void setIntegerVariableValue(
+		String variableName, Integer variableValue) {
 
-	public void setStringVariableValue(
+		setVariable(variableName, variableValue);
+	}
+
+	/**
+	 * @deprecated As of Judson (7.1.x), with no direct replacement
+	 */
+	@Deprecated
+	public default void setLongVariableValue(
+		String variableName, Long variableValue) {
+
+		setVariable(variableName, variableValue);
+	}
+
+	/**
+	 * @deprecated As of Judson (7.1.x), with no direct replacement
+	 */
+	@Deprecated
+	public default void setNumberVariableValue(
+		String variableName, Number variableValue) {
+
+		setVariable(variableName, variableValue);
+	}
+
+	/**
+	 * @deprecated As of Judson (7.1.x), with no direct replacement
+	 */
+	@Deprecated
+	public default void setObjectVariableValue(
+		String variableName, Object variableValue) {
+
+		setVariable(variableName, variableValue);
+	}
+
+	/**
+	 * @deprecated As of Judson (7.1.x), with no direct replacement
+	 */
+	@Deprecated
+	public default void setStringVariableValue(
 			String variableName, String variableValue)
-		throws DDMExpressionException;
+		throws DDMExpressionException {
+
+		setVariable(variableName, variableValue);
+	}
+
+	public void setVariable(String name, Object value);
 
 }

modules/apps/dynamic-data-mapping/dynamic-data-mapping-api/src/main/java/com/liferay/dynamic/data/mapping/expression/DDMExpressionActionHandler.java

@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.dynamic.data.mapping.expression;
+
+import aQute.bnd.annotation.ProviderType;
+
+/**
+ * @author Leonardo Barros
+ */
+@ProviderType
+public interface DDMExpressionActionHandler {
+
+	public ExecuteActionResponse executeAction(
+		ExecuteActionRequest executeActionRequest);
+
+}

modules/apps/dynamic-data-mapping/dynamic-data-mapping-api/src/main/java/com/liferay/dynamic/data/mapping/expression/DDMExpressionActionHandlerAware.java

@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.dynamic.data.mapping.expression;
+
+import aQute.bnd.annotation.ProviderType;
+
+/**
+ * @author Leonardo Barros
+ */
+@ProviderType
+public interface DDMExpressionActionHandlerAware {
+
+	public void setDDMExpressionActionHandler(
+		DDMExpressionActionHandler ddmExpressionActionHandler);
+
+}

modules/apps/dynamic-data-mapping/dynamic-data-mapping-api/src/main/java/com/liferay/dynamic/data/mapping/expression/DDMExpressionException.java

@@ -39,28 +39,6 @@ public DDMExpressionException(Throwable cause) {
 		super(cause);
 	}
 
-	/**
-	 * @deprecated As of Judson (7.1.x), with no direct replacement
-	 */
-	@Deprecated
-	public static class FunctionNotAllowed extends DDMExpressionException {
-
-		public FunctionNotAllowed(String functionName) {
-			super(
-				String.format(
-					"The function name \"%s\" is not allowed", functionName));
-
-			_functionName = functionName;
-		}
-
-		public String getFunctionName() {
-			return _functionName;
-		}
-
-		private final String _functionName;
-
-	}
-
 	public static class FunctionNotDefined extends DDMExpressionException {
 
 		public FunctionNotDefined(Set<String> undefinedFunctionNames) {