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

[Minor] Find dependency by String as well as Interpretation and UOM

This commit is contained in:
Robert von Burg 2018-07-03 15:26:12 +02:00
parent c9d1dce065
commit 2d7ade06a8
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
li.strolch.service/src/main/java/li/strolch/report/policy/GenericReport.java
View File

@ -495,11 +495,13 @@ public class GenericReport extends ReportPolicy {
"Invalid join definition value: " + joinP.getValue() + " on: " + joinP.getLocator() + " as "
+ dependency.getLocator() + " has no ParameterBag " + BAG_RELATIONS);
List<Parameter<?>> relationParams = relationsBag.getParametersByInterpretationAndUom(interpretation, joinType);
List<Parameter<?>> relationParams = relationsBag.getParametersByInterpretationAndUom(interpretation, joinType)
.stream().filter(p -> p.getValueType() == StrolchValueType.STRING).collect(Collectors.toList());
if (relationParams.isEmpty()) {
throw new IllegalStateException(
"Found no relation parameters with UOM " + joinType + " on dependency " + dependency.getLocator());
"Found no relation parameters with UOM " + joinType + " of type " + StrolchValueType.STRING
.getType() + " on dependency " + dependency.getLocator());
}
if (relationParams.size() > 1) {
throw new IllegalStateException(
@ -508,12 +510,6 @@ public class GenericReport extends ReportPolicy {
}
Parameter<?> relationParam = relationParams.get(0);
if (!relationParam.getType().equals(StrolchValueType.STRING.getType())) {
throw new IllegalStateException(
"Expect to find relation parameter of type " + StrolchValueType.STRING.getType() + " but found "
+ relationParam.getType() + " for " + relationParam.getLocator());
}
StringParameter relationP = (StringParameter) relationParam;
if (relationP.getValue().isEmpty() && optional) {
return null;