diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/api/test/GreetingResource.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/api/test/GreetingResource.java index a5d95fef2be5357210c6aec58819d1fecb1d86ad..1a16a2bb69d418313a1648ea608fa74afc5d4ad7 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/api/test/GreetingResource.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/api/test/GreetingResource.java @@ -20,8 +20,7 @@ public class GreetingResource { private static Logger LOGGER = LoggerFactory.getLogger("test"); - @Inject - WordnetServiceX wordnetServiceX; + @Inject WordnetServiceX wordnetServiceX; @ConfigProperty(name = "hello") private String greet; diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/api/test/TestApi.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/api/test/TestApi.java index a5964c648593fc31c73966e3fd670c56ca296d9d..da063f0eda0b5b3a2b184e9a63e6b5be949ab3b1 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/api/test/TestApi.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/api/test/TestApi.java @@ -6,14 +6,12 @@ import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.eclipse.microprofile.config.inject.ConfigProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @Path("/builder") public class TestApi { - private static Logger LOGGER = LoggerFactory.getLogger(TestApi.class.getSimpleName()); @GET diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/UniqueIdGenerator.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/UniqueIdGenerator.java index 6768252126eb4fa15133de80697fdc2200a80722..58fb304e8ad12a5a73bb0c1f18c0b5f4acd776ed 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/UniqueIdGenerator.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/utils/UniqueIdGenerator.java @@ -4,8 +4,7 @@ public class UniqueIdGenerator { private static volatile long id = 0; - private UniqueIdGenerator() { - } + private UniqueIdGenerator() {} public static synchronized long getNextId() { return id++; diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/VerificationGenerator.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/VerificationGenerator.java index 8ece6ef82af2df4ac0b831d7963f2b9e78e959b2..e85edb31f27bed93eba1a476a092ad4460ed0d27 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/VerificationGenerator.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/VerificationGenerator.java @@ -18,9 +18,7 @@ public class VerificationGenerator { public static VerifierResultSet generate() { Config config = ConfigProvider.getConfig(); - Integer maxThreads = config - .getOptionalValue(CONF_VERIFIER_THREADS, Integer.class) - .orElse(1); + Integer maxThreads = config.getOptionalValue(CONF_VERIFIER_THREADS, Integer.class).orElse(1); ExecutorService executor = Executors.newFixedThreadPool(maxThreads); @@ -32,15 +30,16 @@ public class VerificationGenerator { results.add(vType.createNewInstance().verify(executor)); } - results.forEach(r -> { - try { - resultBuilder.addVerifierResult(r.get()); - } catch (InterruptedException e) { - e.printStackTrace(); - } catch (ExecutionException e) { - e.printStackTrace(); - } - }); + results.forEach( + r -> { + try { + resultBuilder.addVerifierResult(r.get()); + } catch (InterruptedException e) { + e.printStackTrace(); + } catch (ExecutionException e) { + e.printStackTrace(); + } + }); return resultBuilder.build(); } diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/VerificationTypeClassification.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/VerificationTypeClassification.java index c2c5874a7c4b7c854ba9b96d2291b247ff1359a1..7eaf523f4720dbcd6977e779a6e692491c39f5dc 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/VerificationTypeClassification.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/VerificationTypeClassification.java @@ -6,7 +6,9 @@ import java.util.HashSet; import java.util.Set; public enum VerificationTypeClassification implements Serializable { - DECISION_LOGIC_LEVEL_VERIFICATION("Decision Logic Verification", "", + DECISION_LOGIC_LEVEL_VERIFICATION( + "Decision Logic Verification", + "", new HashSet<>(Arrays.asList(VerificationType.IDENTICAL_BUSINESS_RULE_VERIFICATION))); private String name; @@ -25,8 +27,8 @@ public enum VerificationTypeClassification implements Serializable { return new HashSet<>(verificationTypes); } - VerificationTypeClassification(String name, String description, - Set<VerificationType> verificationTypes) { + VerificationTypeClassification( + String name, String description, Set<VerificationType> verificationTypes) { this.name = name; this.description = description; this.verificationTypes = verificationTypes; diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/result/VerificationResultEntry.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/result/VerificationResultEntry.java index 053a097ab018d5bdfe1cce74fd1efe254cd8e855..287e719b490f95ebc02315baa5afc011cef6eb68 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/result/VerificationResultEntry.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/result/VerificationResultEntry.java @@ -10,7 +10,10 @@ import org.apache.commons.lang3.Validate; public class VerificationResultEntry extends AbstractResultObject { public enum VerificationClassification { - INFO, WARNING, ERROR, FATAL_ERROR; + INFO, + WARNING, + ERROR, + FATAL_ERROR; } private Set<VerificationResultEntryElement> verificationResultEntryElements; diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/result/VerificationResultEntryElement.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/result/VerificationResultEntryElement.java index fa306010a7c9795a819b2c67eec4d068cda176bc..63e7360e5f45b7b7bae5f4e185c08bea7521c638 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/result/VerificationResultEntryElement.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/result/VerificationResultEntryElement.java @@ -66,9 +66,12 @@ public class VerificationResultEntryElement extends AbstractResultObject { private VerificationResultEntryElement withProperty(String key, String value) { // every properties can only be set once - Validate - .isTrue(!properties.containsKey(key), "Property %s with value %s in %s already set", key, - value, VerificationResultEntryElement.class.getSimpleName()); + Validate.isTrue( + !properties.containsKey(key), + "Property %s with value %s in %s already set", + key, + value, + VerificationResultEntryElement.class.getSimpleName()); properties.put(key, value); return this; } diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/result/VerificationResultEntryFactory.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/result/VerificationResultEntryFactory.java index 4c6b4713005e2646abf85576429ef70a7266edd7..5a57a75380f9bfef9a34ab856318f63c24b70b53 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/result/VerificationResultEntryFactory.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/result/VerificationResultEntryFactory.java @@ -35,9 +35,10 @@ public class VerificationResultEntryFactory { addToEntry(verificationClassification, message, null); } - public void addToEntry(VerificationClassification verificationClassification, String message, - Object... args) { - Validate.notNull(verificationResultEntryBuilder, + public void addToEntry( + VerificationClassification verificationClassification, String message, Object... args) { + Validate.notNull( + verificationResultEntryBuilder, "First call \"addElement\" in VerificationResultEntryFactory before calling \"addToEntry\""); verificationResultEntryBuilder.withClassification(verificationClassification); verificationResultEntryBuilder.withMessage(String.format(Validate.notNull(message), args)); diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/result/VerifierResult.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/result/VerifierResult.java index e69c55e62aa305b46fb64b5d91397c9e8c7627a6..61fc946dd4d5127066390f65e95f36db3f9717f0 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/result/VerifierResult.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/result/VerifierResult.java @@ -29,12 +29,12 @@ public class VerifierResult extends AbstractResultObject { } @JsonbProperty("type_description") - public String getVerificationTypeDescription(){ + public String getVerificationTypeDescription() { return verificationType.getDescription(); } @JsonbProperty("type_classification") - public String getVerificationTypeClassification(){ + public String getVerificationTypeClassification() { return verificationType.getClassification().getName(); } diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/verifier/AbstractVerifier.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/verifier/AbstractVerifier.java index deb2c19f3b35b2af7c2a6508f9fe9fa16834c77a..f88b1d2e817335bb6a839ff24c11e0246ce151db 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/verifier/AbstractVerifier.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/verifier/AbstractVerifier.java @@ -4,9 +4,7 @@ import de.unikoblenz.fgbks.core.dmn.verfication.VerificationType; import de.unikoblenz.fgbks.core.dmn.verfication.result.VerificationResultEntryFactory; import de.unikoblenz.fgbks.core.dmn.verfication.result.VerifierResult; import java.util.Objects; -import java.util.Set; import java.util.concurrent.Callable; -import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/verifier/SampleVerifier.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/verifier/SampleVerifier.java index 0a5de313146b523d15bd6fbc4becec88514304db..6e202dd3a3c031c188c551e8fab9661074653969 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/verifier/SampleVerifier.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/verifier/SampleVerifier.java @@ -13,20 +13,21 @@ public class SampleVerifier extends AbstractVerifier { @Override protected void doVerification() { - vref.addElement(VerificationResultEntryElement.create() - .withDecisionId("hello workd") - .withInputEntryId("adsas") - .withRuleId("asdads")); - vref.addElement(VerificationResultEntryElement.create() - .withDecisionId("hello workd") - .withInputEntryId("adsas") - .withRuleId("asdads")); + vref.addElement( + VerificationResultEntryElement.create() + .withDecisionId("hello workd") + .withInputEntryId("adsas") + .withRuleId("asdads")); + vref.addElement( + VerificationResultEntryElement.create() + .withDecisionId("hello workd") + .withInputEntryId("adsas") + .withRuleId("asdads")); vref.addToEntry(ERROR, "Asd"); try { Thread.sleep(1500); } catch (InterruptedException e) { e.printStackTrace(); } - } } diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/verifier/Verifier.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/verifier/Verifier.java index 279ad8ac4c28a44648755bfc2b13a3b34bb446a7..dbc438c8bf9937a9b5bf759fe5752e611eec5560 100644 --- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/verifier/Verifier.java +++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verfication/verifier/Verifier.java @@ -1,7 +1,6 @@ package de.unikoblenz.fgbks.core.dmn.verfication.verifier; import de.unikoblenz.fgbks.core.dmn.verfication.result.VerifierResult; -import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future;