Skip to content
Snippets Groups Projects
Commit d6a94807 authored by Jonas Blatt's avatar Jonas Blatt :ant:
Browse files

Set predefined values as optional value

parent 954cc313
No related branches found
No related tags found
No related merge requests found
package de.unikoblenz.fgbks.core.dmn.domain.vdmn.impl;
import de.unikoblenz.fgbks.core.dmn.domain.ids.ColumnId;
import de.unikoblenz.fgbks.core.dmn.domain.vdmn.VDmnColumn;
import de.unikoblenz.fgbks.core.dmn.domain.vdmn.VDmnDecisionTable;
import de.unikoblenz.fgbks.core.dmn.domain.vdmn.VDmnValue;
......@@ -8,6 +7,7 @@ import de.unikoblenz.fgbks.core.dmn.domain.vdmn.VTypeRef;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
public abstract class VDmnColumnImpl extends AbstractVDmnElement implements VDmnColumn {
......@@ -27,16 +27,11 @@ public abstract class VDmnColumnImpl extends AbstractVDmnElement implements VDmn
}
@Override
public List<String> getPredefinedValues() {
if (!getTypeRef().equals(VTypeRef.STRING)) {
return Collections.emptyList();
public Optional<List<String>> getPredefinedValues() {
if (!getTypeRef().equals(VTypeRef.STRING) || predefinedValues.size() == 0) {
return Optional.empty();
}
return Collections.unmodifiableList(predefinedValues);
}
@Override
public ColumnId getColumnId() {
return (ColumnId) getId();
return Optional.of(Collections.unmodifiableList(predefinedValues));
}
@Override
......
......@@ -6,8 +6,6 @@ import de.unikoblenz.fgbks.core.dmn.domain.vdmn.VDmnDecisionTable;
import de.unikoblenz.fgbks.core.dmn.domain.vdmn.VDmnInputColumn;
import de.unikoblenz.fgbks.core.dmn.domain.vdmn.VDmnInputValue;
import de.unikoblenz.fgbks.core.dmn.domain.vdmn.VTypeRef;
import java.util.Collections;
import java.util.List;
import org.apache.commons.lang3.Validate;
public class VDmnInputColumnImpl extends VDmnColumnImpl implements VDmnInputColumn {
......@@ -22,14 +20,6 @@ public class VDmnInputColumnImpl extends VDmnColumnImpl implements VDmnInputColu
return new VDmnInputColumnImpl().new Builder();
}
@Override
public List<String> getPredefinedValues() {
if (!getTypeRef().equals(VTypeRef.STRING)) {
return Collections.emptyList();
}
return Collections.unmodifiableList(predefinedValues);
}
@Override
public InputExpressionId getInputExpressionId() {
return inputExpressionId;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment