Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[New] Added new ParameterizedElement.setParamFromFlatJson() and .setParamFromFlatJson()

This commit is contained in:
Robert von Burg 2022-07-06 17:16:18 +02:00
parent 2bb66ad679
commit eb48d9a174
Signed by: eitch
GPG Key ID: 75DB9C85C74331F7
2 changed files with 98 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
li.strolch.model/src/main/java/li/strolch/model/ParameterizedElement.java
View File

@ -17,6 +17,8 @@ package li.strolch.model;
import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toMap;
import static li.strolch.model.StrolchModelConstants.INTERPRETATION_NONE;
import static li.strolch.model.StrolchModelConstants.UOM_NONE;
import static li.strolch.model.builder.BuilderHelper.buildParamName;
import static li.strolch.utils.helper.StringHelper.isEmpty;
@ -27,9 +29,11 @@ import java.util.*;
import java.util.function.Function;
import java.util.stream.Stream;
import com.google.gson.JsonObject;
import li.strolch.exception.StrolchException;
import li.strolch.exception.StrolchModelException;
import li.strolch.model.Locator.LocatorBuilder;
import li.strolch.model.json.SetParameterValueFromJsonVisitor;
import li.strolch.model.parameter.*;
import li.strolch.utils.helper.StringHelper;
import li.strolch.utils.iso8601.ISO8601;
@ -1014,6 +1018,99 @@ public abstract class ParameterizedElement extends AbstractStrolchElement {
return new HashSet<>(this.parameterMap.keySet());
}
/**
* Set or add a parameter to this element from a {@link JsonObject}
*
* @param jsonObject
* the object from which to get the value
* @param paramId
* the ID of the parameter on which to set the value, and also the Json reference ID
* @param paramName
* the name of the parameter, if the parameter is to be created
* @param type
* the type of Parameter to create
* @param ignoreOnEmpty
* if true, and the json object is missing the field, then the parameter is not changed, otherwise the parameter
* is cleared if the json field is missing or null
*/
public void setOrAddParamFromFlatJson(JsonObject jsonObject, String paramId, String paramName,
StrolchValueType type, boolean ignoreOnEmpty) {
setOrAddParamFromFlatJson(jsonObject, paramId, paramName, INTERPRETATION_NONE, UOM_NONE, type, ignoreOnEmpty);
}
/**
* Set or add a parameter to this element from a {@link JsonObject}
*
* @param jsonObject
* the object from which to get the value
* @param paramId
* the ID of the parameter on which to set the value, and also the Json reference ID
* @param paramName
* the name of the parameter, if the parameter is to be created
* @param interpretation
* the interpretation
* @param uom
* the uom
* @param type
* the type of Parameter to create
* @param ignoreOnEmpty
* if true, and the json object is missing the field, then the parameter is not changed, otherwise the parameter
* is cleared if the json field is missing or null
*/
public void setOrAddParamFromFlatJson(JsonObject jsonObject, String paramId, String paramName,
String interpretation, String uom, StrolchValueType type, boolean ignoreOnEmpty) {
if (!jsonObject.has(paramId) && ignoreOnEmpty)
return;
Parameter<?> param = getParameter(paramId);
boolean valueNotSet = !jsonObject.has(paramId) || jsonObject.get(paramId).isJsonNull();
if (param == null && valueNotSet)
return;
if (param == null) {
param = type.parameterInstance();
param.setId(paramId);
param.setName(paramName);
param.setInterpretation(interpretation);
param.setUom(uom);
addParameter(param);
}
accept(new SetParameterValueFromJsonVisitor(jsonObject, ignoreOnEmpty));
}
/**
* Set a parameter on this element from a {@link JsonObject}
*
* @param jsonObject
* the object from which to get the value
* @param paramId
* the ID of the parameter on which to set the value, and also the Json reference ID
*/
public void setParamFromFlatJson(JsonObject jsonObject, String paramId) {
Parameter<?> param = getParameter(paramId);
param.accept(new SetParameterValueFromJsonVisitor(jsonObject, false));
}
/**
* Set a parameter on this element from a {@link JsonObject}
*
* @param jsonObject
* the object from which to get the value
* @param paramId
* the ID of the parameter on which to set the value, and also the Json reference ID
* @param ignoreOnEmpty
* if true, and the json object is missing the field, then the parameter is not changed, otherwise the parameter
* is cleared if the json field is missing or null
*/
public void setParamFromFlatJson(JsonObject jsonObject, String paramId, boolean ignoreOnEmpty) {
if (!jsonObject.has(paramId) && ignoreOnEmpty)
return;
Parameter<?> param = getParameter(paramId);
param.accept(new SetParameterValueFromJsonVisitor(jsonObject, ignoreOnEmpty));
}
/**
* Returns a simple map where the keys are the IDs of the parameters and the values are the values of the
* Parameters

20
li.strolch.model/src/main/java/li/strolch/model/StrolchRootElement.java
View File

@ -339,25 +339,7 @@ public interface StrolchRootElement extends StrolchElement, PolicyContainer, Par
addParameterBag(bag);
}
Parameter<?> param = bag.getParameter(paramId);
boolean valueNotSet = !jsonObject.has(paramId) || jsonObject.get(paramId).isJsonNull();
if (param == null && valueNotSet)
return;
if (param == null) {
param = type.parameterInstance();
param.setId(paramId);
param.setName(paramName);
param.setInterpretation(interpretation);
param.setUom(uom);
bag.addParameter(param);
}
if (valueNotSet) {
param.clear();
} else {
param.setValueFromString(jsonObject.get(paramId).getAsString());
}
bag.setOrAddParamFromFlatJson(jsonObject, paramId, paramName, interpretation, uom, type, ignoreOnEmpty);
}
/**