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

[Minor] Code cleanup

This commit is contained in:
Robert von Burg 2022-06-14 11:53:13 +02:00
parent 4b8b5a08af
commit 7251a4fe19
Signed by: eitch
GPG Key ID: 75DB9C85C74331F7
2 changed files with 486 additions and 760 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

674
li.strolch.model/src/main/java/li/strolch/model/GroupedParameterizedElement.java
View File

@ -15,22 +15,22 @@
*/
package li.strolch.model;
import static java.util.Collections.*;
import static java.util.stream.Collectors.toList;
import static li.strolch.model.StrolchModelConstants.*;
import static java.util.Collections.emptySet;
import static li.strolch.model.StrolchModelConstants.BAG_PARAMETERS;
import static li.strolch.model.StrolchModelConstants.BAG_RELATIONS;
import static li.strolch.utils.helper.StringHelper.isEmpty;
import java.text.MessageFormat;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.*;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.stream.Stream;
import li.strolch.exception.StrolchException;
import li.strolch.exception.StrolchModelException;
import li.strolch.model.parameter.*;
import li.strolch.utils.iso8601.ISO8601;
import li.strolch.utils.time.PeriodDuration;
import li.strolch.model.parameter.Parameter;
import li.strolch.model.parameter.StringParameter;
/**
* @author Robert von Burg <eitch@eitchnet.ch>
@ -84,558 +84,6 @@ public abstract class GroupedParameterizedElement extends AbstractStrolchElement
this.type = type;
}
///
///
@Override
public String getString(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, false);
return bag == null ? "" : bag.getString(paramKey);
}
@Override
public String getString(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, false);
return bag == null ? "" : bag.getString(paramKey);
}
@Override
public boolean getBoolean(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, false);
return bag != null && bag.getBoolean(paramKey);
}
@Override
public boolean getBoolean(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, false);
return bag != null && bag.getBoolean(paramKey);
}
@Override
public int getInteger(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, false);
return bag == null ? 0 : bag.getInteger(paramKey);
}
@Override
public int getInteger(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, false);
return bag == null ? 0 : bag.getInteger(paramKey);
}
@Override
public double getDouble(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, false);
return bag == null ? 0 : bag.getDouble(paramKey);
}
@Override
public double getDouble(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, false);
return bag.getDouble(paramKey);
}
@Override
public long getLong(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, false);
return bag == null ? 0L : bag.getLong(paramKey);
}
@Override
public long getLong(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, false);
return bag == null ? 0L : bag.getLong(paramKey);
}
@Override
public ZonedDateTime getDate(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, false);
return bag == null ? ISO8601.EMPTY_VALUE_ZONED_DATE : bag.getDate(paramKey);
}
@Override
public ZonedDateTime getDate(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, false);
return bag == null ? ISO8601.EMPTY_VALUE_ZONED_DATE : bag.getDate(paramKey);
}
@Override
public LocalDateTime getLocalDate(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, false);
return bag == null ? ISO8601.EMPTY_VALUE_LOCAL_DATE : bag.getLocalDate(paramKey);
}
@Override
public LocalDateTime getLocalDate(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, false);
return bag == null ? ISO8601.EMPTY_VALUE_LOCAL_DATE : bag.getLocalDate(paramKey);
}
@Override
public String getText(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, false);
return bag == null ? "" : bag.getText(paramKey);
}
@Override
public String getText(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, false);
return bag == null ? "" : bag.getText(paramKey);
}
@Override
public PeriodDuration getDuration(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, false);
return bag == null ? PeriodDuration.ZERO : bag.getDuration(paramKey);
}
@Override
public PeriodDuration getDuration(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, false);
return bag == null ? PeriodDuration.ZERO : bag.getDuration(paramKey);
}
@Override
public List<String> getStringList(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, false);
return bag == null ? emptyList() : bag.getStringList(paramKey);
}
@Override
public List<String> getStringList(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, false);
return bag == null ? emptyList() : bag.getStringList(paramKey);
}
@Override
public List<Integer> getIntegerList(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, false);
return bag == null ? emptyList() : bag.getIntegerList(paramKey);
}
@Override
public List<Integer> getIntegerList(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, false);
return bag == null ? emptyList() : bag.getIntegerList(paramKey);
}
@Override
public List<Double> getDoubleList(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, false);
return bag == null ? emptyList() : bag.getDoubleList(paramKey);
}
@Override
public List<Double> getDoubleList(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, false);
return bag == null ? emptyList() : bag.getDoubleList(paramKey);
}
@Override
public List<Long> getLongList(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, false);
return bag == null ? emptyList() : bag.getLongList(paramKey);
}
@Override
public List<Long> getLongList(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, false);
return bag == null ? emptyList() : bag.getLongList(paramKey);
}
//
@Override
public void setString(String paramKey, String value) throws StrolchModelException {
defaultBag().setString(paramKey, value);
}
@Override
public void setString(String paramKey, Enum<?> value) throws StrolchModelException {
defaultBag().setString(paramKey, value.name());
}
@Override
public void setString(String bagKey, String paramKey, Enum<?> value) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
bag.setString(paramKey, value.name());
}
@Override
public void setString(String bagKey, String paramKey, String value) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
bag.setString(paramKey, value);
}
@Override
public void setBoolean(String paramKey, boolean value) throws StrolchModelException {
ParameterBag bag = defaultBag();
BooleanParameter param = bag.getParameter(paramKey);
if (param != null) {
param.setValue(value);
} else {
bag.addParameter(new BooleanParameter(paramKey, paramKey, value));
}
}
@Override
public void setBoolean(String bagKey, String paramKey, boolean value) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
bag.setBoolean(paramKey, value);
}
@Override
public void setInteger(String paramKey, int value) throws StrolchModelException {
ParameterBag bag = defaultBag();
IntegerParameter param = bag.getParameter(paramKey);
if (param != null) {
param.setValue(value);
} else {
bag.addParameter(new IntegerParameter(paramKey, paramKey, value));
}
}
@Override
public void setInteger(String bagKey, String paramKey, int value) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
bag.setInteger(paramKey, value);
}
@Override
public void setDouble(String paramKey, double value) throws StrolchModelException {
ParameterBag bag = defaultBag();
FloatParameter param = bag.getParameter(paramKey);
if (param != null) {
param.setValue(value);
} else {
bag.addParameter(new FloatParameter(paramKey, paramKey, value));
}
}
@Override
public void setDouble(String bagKey, String paramKey, double value) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
bag.setDouble(paramKey, value);
}
@Override
public void setLong(String paramKey, long value) throws StrolchModelException {
ParameterBag bag = defaultBag();
LongParameter param = bag.getParameter(paramKey);
if (param != null) {
param.setValue(value);
} else {
bag.addParameter(new LongParameter(paramKey, paramKey, value));
}
}
@Override
public void setLong(String bagKey, String paramKey, long value) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
bag.setLong(paramKey, value);
}
@Override
public void setDate(String paramKey, ZonedDateTime value) throws StrolchModelException {
ParameterBag bag = defaultBag();
DateParameter param = bag.getParameter(paramKey);
if (param != null) {
param.setValueFromZonedDateTime(value);
} else {
bag.addParameter(new DateParameter(paramKey, paramKey, value));
}
}
@Override
public void setDate(String bagKey, String paramKey, ZonedDateTime value) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
bag.setDate(paramKey, value);
}
@Override
public void setDate(String paramKey, LocalDateTime value) throws StrolchModelException {
ParameterBag bag = defaultBag();
DateParameter param = bag.getParameter(paramKey);
if (param != null) {
param.setValueFromLocalDateTime(value);
} else {
bag.addParameter(new DateParameter(paramKey, paramKey, value));
}
}
@Override
public void setDate(String bagKey, String paramKey, LocalDateTime value) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
bag.setDate(paramKey, value);
}
@Override
public void setText(String paramKey, String value) throws StrolchModelException {
ParameterBag bag = defaultBag();
TextParameter param = bag.getParameter(paramKey);
if (param != null) {
param.setValue(value);
} else {
bag.addParameter(new TextParameter(paramKey, paramKey, value));
}
}
@Override
public void setText(String bagKey, String paramKey, String value) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
bag.setText(paramKey, value);
}
@Override
public void setDuration(String paramKey, PeriodDuration value) throws StrolchModelException {
ParameterBag bag = defaultBag();
DurationParameter param = bag.getParameter(paramKey);
if (param != null) {
param.setValue(value);
} else {
bag.addParameter(new DurationParameter(paramKey, paramKey, value));
}
}
@Override
public void setDuration(String bagKey, String paramKey, PeriodDuration value) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
bag.setDuration(paramKey, value);
}
@Override
public void setStringList(String paramKey, List<String> value) throws StrolchModelException {
ParameterBag bag = defaultBag();
StringListParameter param = bag.getParameter(paramKey);
if (param != null) {
param.setValue(value);
} else {
bag.addParameter(new StringListParameter(paramKey, paramKey, value));
}
}
@Override
public void setStringList(String bagKey, String paramKey, List<String> value) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
bag.setStringList(paramKey, value);
}
@Override
public void setIntegerList(String paramKey, List<Integer> value) throws StrolchModelException {
ParameterBag bag = defaultBag();
IntegerListParameter param = bag.getParameter(paramKey);
if (param != null) {
param.setValue(value);
} else {
bag.addParameter(new IntegerListParameter(paramKey, paramKey, value));
}
}
@Override
public void setIntegerList(String bagKey, String paramKey, List<Integer> value) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
bag.setIntegerList(paramKey, value);
}
@Override
public void setDoubleList(String paramKey, List<Double> value) throws StrolchModelException {
ParameterBag bag = defaultBag();
FloatListParameter param = bag.getParameter(paramKey);
if (param != null) {
param.setValue(value);
} else {
bag.addParameter(new FloatListParameter(paramKey, paramKey, value));
}
}
@Override
public void setDoubleList(String bagKey, String paramKey, List<Double> value) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
bag.setDoubleList(paramKey, value);
}
@Override
public void setLongList(String paramKey, List<Long> value) throws StrolchModelException {
ParameterBag bag = defaultBag();
LongListParameter param = bag.getParameter(paramKey);
if (param != null) {
param.setValue(value);
} else {
bag.addParameter(new LongListParameter(paramKey, paramKey, value));
}
}
@Override
public void setLongList(String bagKey, String paramKey, List<Long> value) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
bag.setLongList(paramKey, value);
}
protected ParameterBag defaultBag() {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, false);
if (bag == null) {
bag = new ParameterBag(BAG_PARAMETERS, TYPE_PARAMETERS, TYPE_PARAMETERS);
addParameterBag(bag);
}
return bag;
}
protected ParameterBag relationsBag() {
ParameterBag bag = getParameterBag(BAG_RELATIONS, false);
if (bag == null) {
bag = new ParameterBag(BAG_RELATIONS, TYPE_RELATIONS, TYPE_RELATIONS);
addParameterBag(bag);
}
return bag;
}
///
///
@Override
public StringParameter getStringP(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, true);
return bag.getStringP(paramKey);
}
@Override
public StringParameter getStringP(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
return bag.getStringP(paramKey);
}
@Override
public BooleanParameter getBooleanP(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, true);
return bag.getBooleanP(paramKey);
}
@Override
public BooleanParameter getBooleanP(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
return bag.getBooleanP(paramKey);
}
@Override
public IntegerParameter getIntegerP(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, true);
return bag.getIntegerP(paramKey);
}
@Override
public IntegerParameter getIntegerP(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
return bag.getIntegerP(paramKey);
}
@Override
public FloatParameter getDoubleP(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, true);
return bag.getDoubleP(paramKey);
}
@Override
public FloatParameter getDoubleP(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
return bag.getDoubleP(paramKey);
}
@Override
public LongParameter getLongP(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, true);
return bag.getLongP(paramKey);
}
@Override
public LongParameter getLongP(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
return bag.getLongP(paramKey);
}
@Override
public DateParameter getDateP(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, true);
return bag.getDateP(paramKey);
}
@Override
public DateParameter getDateP(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
return bag.getDateP(paramKey);
}
@Override
public TextParameter getTextP(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, true);
return bag.getTextP(paramKey);
}
@Override
public TextParameter getTextP(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
return bag.getTextP(paramKey);
}
@Override
public DurationParameter getDurationP(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, true);
return bag.getDurationP(paramKey);
}
@Override
public DurationParameter getDurationP(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
return bag.getDurationP(paramKey);
}
@Override
public StringListParameter getStringListP(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, true);
return bag.getStringListP(paramKey);
}
@Override
public StringListParameter getStringListP(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
return bag.getStringListP(paramKey);
}
@Override
public IntegerListParameter getIntegerListP(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, true);
return bag.getIntegerListP(paramKey);
}
@Override
public IntegerListParameter getIntegerListP(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
return bag.getIntegerListP(paramKey);
}
@Override
public FloatListParameter getDoubleListP(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, true);
return bag.getDoubleListP(paramKey);
}
@Override
public FloatListParameter getDoubleListP(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
return bag.getDoubleListP(paramKey);
}
@Override
public LongListParameter getLongListP(String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(BAG_PARAMETERS, true);
return bag.getLongListP(paramKey);
}
@Override
public LongListParameter getLongListP(String bagKey, String paramKey) throws StrolchModelException {
ParameterBag bag = getParameterBag(bagKey, true);
return bag.getLongListP(paramKey);
}
@Override
public <U, T extends Parameter<U>> T getParameter(String bagKey, String paramKey) {
return getParameter(bagKey, paramKey, false);
@ -682,105 +130,6 @@ public abstract class GroupedParameterizedElement extends AbstractStrolchElement
return getParameter(BAG_PARAMETERS, paramKey, assertExists);
}
@Override
public String getRelationId(String paramKey) throws StrolchModelException {
ParameterBag relationsBag = getParameterBag(BAG_RELATIONS, false);
if (relationsBag == null)
return "";
return relationsBag.getString(paramKey);
}
@Override
public List<String> getRelationIds(String paramKey) throws StrolchModelException {
ParameterBag relationsBag = getParameterBag(BAG_RELATIONS, false);
if (relationsBag == null)
return List.of();
return relationsBag.getStringList(paramKey);
}
@Override
public Stream<String> streamRelationIds(String paramKey) throws StrolchModelException {
ParameterBag relationsBag = getParameterBag(BAG_RELATIONS, false);
if (relationsBag == null)
return Stream.empty();
return relationsBag.streamStringList(paramKey);
}
@Override
public void setRelationId(String paramKey, String id) throws StrolchModelException {
getRelationParam(paramKey, true).setValue(id);
}
@Override
public void setRelationIds(String paramKey, List<String> ids) throws StrolchModelException {
getRelationsParam(paramKey, true).setValue(ids);
}
@Override
public StringParameter getRelationParam(String paramKey) {
return getParameter(BAG_RELATIONS, paramKey, false);
}
@Override
public StringParameter getRelationP(String paramKey) {
return getParameter(BAG_RELATIONS, paramKey, true);
}
@Override
public StringParameter getRelationParam(String paramKey, boolean assertExists) {
return getParameter(BAG_RELATIONS, paramKey, assertExists);
}
@Override
public StringListParameter getRelationsParam(String paramKey) {
return getParameter(BAG_RELATIONS, paramKey, false);
}
@Override
public StringListParameter getRelationsP(String paramKey) {
return getParameter(BAG_RELATIONS, paramKey, true);
}
@Override
public StringListParameter getRelationsParam(String paramKey, boolean assertExists) {
return getParameter(BAG_RELATIONS, paramKey, assertExists);
}
@Override
public Stream<Parameter<?>> streamOfParameters(String bagKey) {
ParameterBag bag = getParameterBag(bagKey);
if (bag == null)
return Stream.empty();
return bag.streamOfParameters();
}
@Override
public Stream<Parameter<?>> streamOfParametersByInterpretation(String bagKey, String interpretation) {
ParameterBag bag = getParameterBag(bagKey);
if (bag == null)
return Stream.empty();
return bag.streamOfParametersByInterpretation(interpretation);
}
@Override
public Stream<Parameter<?>> streamOfParametersByInterpretationAndUom(String bagKey, String interpretation,
String uom) {
ParameterBag bag = getParameterBag(bagKey);
if (bag == null)
return Stream.empty();
return bag.streamOfParametersByInterpretationAndUom(interpretation, uom);
}
@Override
public List<Parameter<?>> getParametersByInterpretation(String bagKey, String interpretation) {
return streamOfParametersByInterpretation(bagKey, interpretation).collect(toList());
}
@Override
public List<Parameter<?>> getParametersByInterpretationAndUom(String bagKey, String interpretation, String uom) {
return streamOfParametersByInterpretationAndUom(bagKey, interpretation, uom).collect(toList());
}
@Override
public void addParameter(Parameter<?> parameter) throws StrolchException {
assertNotReadonly();
@ -880,11 +229,6 @@ public abstract class GroupedParameterizedElement extends AbstractStrolchElement
.filter(map -> map.getType().equals(type));
}
@Override
public List<ParameterBag> getParameterBagsByType(String type) {
return streamOfParameterBagsByType(type).collect(toList());
}
@Override
public void addParameterBag(ParameterBag bag) {
assertNotReadonly();

572
li.strolch.model/src/main/java/li/strolch/model/ParameterBagContainer.java
View File

File diff suppressed because it is too large Load Diff