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

Fix VDmnFunctions, no public constructor

parent 7d734227
No related branches found
No related tags found
No related merge requests found
...@@ -21,6 +21,7 @@ import org.apache.commons.lang3.Validate; ...@@ -21,6 +21,7 @@ import org.apache.commons.lang3.Validate;
*/ */
public class VDmnFunctions { public class VDmnFunctions {
private VDmnFunctions() {}
/** /**
* Generate a list of {@link VDmnColumn}, which are in the {@link VDmnDefinition} and has the * Generate a list of {@link VDmnColumn}, which are in the {@link VDmnDefinition} and has the
* defined type ({@link VTypeRef}). * defined type ({@link VTypeRef}).
...@@ -223,7 +224,7 @@ public class VDmnFunctions { ...@@ -223,7 +224,7 @@ public class VDmnFunctions {
* @param column the {@link VDmnColumn} * @param column the {@link VDmnColumn}
* @return a string, representing the "name" of the column * @return a string, representing the "name" of the column
*/ */
public String getColumnStringName(VDmnColumn column) { public static String getColumnStringName(VDmnColumn column) {
Validate.notNull(column); Validate.notNull(column);
return column.getLabel().isPresent() return column.getLabel().isPresent()
? column.getLabel().get().toString() ? column.getLabel().get().toString()
...@@ -238,7 +239,7 @@ public class VDmnFunctions { ...@@ -238,7 +239,7 @@ public class VDmnFunctions {
* @param column the {@link VDmnColumn} * @param column the {@link VDmnColumn}
* @return a string, representing the "name" of the column + "name" * @return a string, representing the "name" of the column + "name"
*/ */
public String getColumnStringNameWithDoubleQuotes(VDmnColumn column) { public static String getColumnStringNameWithDoubleQuotes(VDmnColumn column) {
Validate.notNull(column); Validate.notNull(column);
return "\"" + getColumnStringName(column) + "\""; return "\"" + getColumnStringName(column) + "\"";
} }
......
package de.unikoblenz.fgbks.core.dmn.verification.verifier.impl; package de.unikoblenz.fgbks.core.dmn.verification.verifier.impl;
import static de.unikoblenz.fgbks.core.dmn.domain.vdmn.utils.VDmnFunctions.getColumnStringNameWithDoubleQuotes;
import static de.unikoblenz.fgbks.core.dmn.verification.result.actions.VerificationFix.SHOW_INPUT_ENTRIES; import static de.unikoblenz.fgbks.core.dmn.verification.result.actions.VerificationFix.SHOW_INPUT_ENTRIES;
import static de.unikoblenz.fgbks.core.dmn.verification.result.actions.VerificationFix.SHOW_OUTPUT_ENTRIES; import static de.unikoblenz.fgbks.core.dmn.verification.result.actions.VerificationFix.SHOW_OUTPUT_ENTRIES;
...@@ -80,7 +81,8 @@ public class PredefinedExistingValueVerifier extends AbstractVerifier { ...@@ -80,7 +81,8 @@ public class PredefinedExistingValueVerifier extends AbstractVerifier {
stringValue.isInputValue() ? SHOW_INPUT_ENTRIES : SHOW_OUTPUT_ENTRIES); stringValue.isInputValue() ? SHOW_INPUT_ENTRIES : SHOW_OUTPUT_ENTRIES);
vreFactory.addToEntry( vreFactory.addToEntry(
VerificationClassification.WARNING, VerificationClassification.WARNING,
"String value \"%s\" was not found in the list of predefined values.", "String value \"%s\" was not found in the list of predefined values of column %s.",
missingStringValue); missingStringValue,
getColumnStringNameWithDoubleQuotes(stringValue.getDmnColumn()));
} }
} }
package de.unikoblenz.fgbks.core.dmn.verification.verifier.impl; package de.unikoblenz.fgbks.core.dmn.verification.verifier.impl;
import static de.unikoblenz.fgbks.core.dmn.domain.vdmn.utils.VDmnFunctions.getColumnStringNameWithDoubleQuotes;
import static de.unikoblenz.fgbks.core.dmn.verification.result.actions.VerificationFix.SHOW_INPUT_COLUMNS; import static de.unikoblenz.fgbks.core.dmn.verification.result.actions.VerificationFix.SHOW_INPUT_COLUMNS;
import static de.unikoblenz.fgbks.core.dmn.verification.result.actions.VerificationFix.SHOW_OUTPUT_COLUMNS; import static de.unikoblenz.fgbks.core.dmn.verification.result.actions.VerificationFix.SHOW_OUTPUT_COLUMNS;
...@@ -58,8 +59,8 @@ public class PredefinedMissingValueVerifier extends AbstractVerifier { ...@@ -58,8 +59,8 @@ public class PredefinedMissingValueVerifier extends AbstractVerifier {
} }
// get all missing strings // get all missing strings
Set<String> missingStrings = new HashSet<>(); Set<String> missingStrings = new HashSet<>();
for (String s : stringValuesInColumn) { for (String s : predefinedValues) {
if (!predefinedValues.contains(s)) { if (!stringValuesInColumn.contains(s)) {
missingStrings.add(s); missingStrings.add(s);
} }
} }
...@@ -86,8 +87,11 @@ public class PredefinedMissingValueVerifier extends AbstractVerifier { ...@@ -86,8 +87,11 @@ public class PredefinedMissingValueVerifier extends AbstractVerifier {
vreFactory.addVerificationFix( vreFactory.addVerificationFix(
stringColumn.isInputColumn() ? SHOW_INPUT_COLUMNS : SHOW_OUTPUT_COLUMNS); stringColumn.isInputColumn() ? SHOW_INPUT_COLUMNS : SHOW_OUTPUT_COLUMNS);
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("In column ");
sb.append(getColumnStringNameWithDoubleQuotes(stringColumn));
sb.append(". ");
sb.append(missingStringValues.size() > 1 ? "These string values are" : "This string value is"); sb.append(missingStringValues.size() > 1 ? "These string values are" : "This string value is");
sb.append(" not present in the predefined values of the column: "); sb.append(" not used: ");
sb.append( sb.append(
missingStringValues.stream().map(v -> '"' + v + '"').collect(Collectors.joining(","))); missingStringValues.stream().map(v -> '"' + v + '"').collect(Collectors.joining(",")));
vreFactory.addToEntry(VerificationClassification.WARNING, sb.toString()); vreFactory.addToEntry(VerificationClassification.WARNING, sb.toString());
......
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