[Minor] Find dependency by String as well as Interpretation and UOM
This commit is contained in:
parent
c9d1dce065
commit
2d7ade06a8
|
@ -495,11 +495,13 @@ public class GenericReport extends ReportPolicy {
|
||||||
"Invalid join definition value: " + joinP.getValue() + " on: " + joinP.getLocator() + " as "
|
"Invalid join definition value: " + joinP.getValue() + " on: " + joinP.getLocator() + " as "
|
||||||
+ dependency.getLocator() + " has no ParameterBag " + BAG_RELATIONS);
|
+ 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()) {
|
if (relationParams.isEmpty()) {
|
||||||
throw new IllegalStateException(
|
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) {
|
if (relationParams.size() > 1) {
|
||||||
throw new IllegalStateException(
|
throw new IllegalStateException(
|
||||||
|
@ -508,12 +510,6 @@ public class GenericReport extends ReportPolicy {
|
||||||
}
|
}
|
||||||
|
|
||||||
Parameter<?> relationParam = relationParams.get(0);
|
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;
|
StringParameter relationP = (StringParameter) relationParam;
|
||||||
if (relationP.getValue().isEmpty() && optional) {
|
if (relationP.getValue().isEmpty() && optional) {
|
||||||
return null;
|
return null;
|
||||||
|
|
Loading…
Reference in New Issue