Fix issues that are not related to deprecation

ArDoCo · Nov 28, 2023 · f0357f2 · f0357f2
1 parent 11ae34e
commit f0357f2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 31 deletions.
diff --git a/.../src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/LegacyModelExtractionState.java b/.../src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/LegacyModelExtractionState.java
@@ -8,8 +8,10 @@
 
 /**
  * The Interface IModelState defines the information directly extracted from the models.
+ * 
+ * @deprecated use {@link ModelStates#getModel(String)}
  */
-@Deprecated
+@Deprecated(since = "0.32.0")
 public interface LegacyModelExtractionState extends IConfigurable {
     /**
      * Returns the unique id of the model

diff --git a/...ava/edu/kit/kastel/mcse/ardoco/core/execution/runner/ArDoCoForInconsistencyDetection.java b/...ava/edu/kit/kastel/mcse/ardoco/core/execution/runner/ArDoCoForInconsistencyDetection.java
@@ -2,7 +2,6 @@
 package edu.kit.kastel.mcse.ardoco.core.execution.runner;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.SortedMap;
 
 import org.slf4j.Logger;
@@ -28,13 +27,7 @@ public ArDoCoForInconsistencyDetection(String projectName) {
 
     public void setUp(File inputText, File inputModelArchitecture, ArchitectureModelType inputArchitectureModelType,
             SortedMap<String, String> additionalConfigs, File outputDir) {
-        try {
-            definePipeline(inputText, inputModelArchitecture, inputArchitectureModelType, additionalConfigs);
-        } catch (IOException e) {
-            logger.error("Problem in initialising pipeline when loading data (IOException)", e.getCause());
-            isSetUp = false;
-            return;
-        }
+        definePipeline(inputText, inputModelArchitecture, inputArchitectureModelType, additionalConfigs);
         setOutputDirectory(outputDir);
         isSetUp = true;
     }
@@ -51,10 +44,9 @@ public void setUp(String inputTextLocation, String inputArchitectureModelLocatio
      * @param inputArchitectureModel the input architecture file
      * @param architectureModelType  the type of the architecture (e.g., PCM, UML)
      * @param additionalConfigs      the additional configs
-     * @throws IOException When one of the input files cannot be accessed/loaded
      */
     private void definePipeline(File inputText, File inputArchitectureModel, ArchitectureModelType architectureModelType,
-            SortedMap<String, String> additionalConfigs) throws IOException {
+            SortedMap<String, String> additionalConfigs) {
         ArDoCo arDoCo = getArDoCo();
         var dataRepository = arDoCo.getDataRepository();
         var text = CommonUtilities.readInputText(inputText);

diff --git a/...-lissa/src/main/java/edu/kit/kastel/mcse/ardoco/core/execution/runner/ArDoCoForLiSSA.java b/...-lissa/src/main/java/edu/kit/kastel/mcse/ardoco/core/execution/runner/ArDoCoForLiSSA.java
@@ -2,7 +2,6 @@
 package edu.kit.kastel.mcse.ardoco.core.execution.runner;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.SortedMap;
 
 import org.slf4j.Logger;
@@ -32,13 +31,7 @@ public ArDoCoForLiSSA(String projectName) {
 
     public void setUp(File diagramDirectory, File inputText, File inputModelArchitecture, ArchitectureModelType inputArchitectureModelType,
             SortedMap<String, String> additionalConfigs, File outputDir) {
-        try {
-            definePipeline(diagramDirectory, inputText, inputModelArchitecture, inputArchitectureModelType, additionalConfigs);
-        } catch (IOException e) {
-            logger.error("Problem in initialising pipeline when loading data (IOException)", e.getCause());
-            isSetUp = false;
-            return;
-        }
+        definePipeline(diagramDirectory, inputText, inputModelArchitecture, inputArchitectureModelType, additionalConfigs);
         setOutputDirectory(outputDir);
         isSetUp = true;
     }
@@ -57,10 +50,9 @@ public void setUp(String diagramDirectory, String inputTextLocation, String inpu
      * @param inputArchitectureModel the input architecture file
      * @param architectureModelType  the type of the architecture (e.g., PCM, UML)
      * @param additionalConfigs      the additional configs
-     * @throws IOException When one of the input files cannot be accessed/loaded
      */
     private void definePipeline(File diagramDirectory, File inputText, File inputArchitectureModel, ArchitectureModelType architectureModelType,
-            SortedMap<String, String> additionalConfigs) throws IOException {
+            SortedMap<String, String> additionalConfigs) {
         ArDoCo arDoCo = getArDoCo();
         var dataRepository = arDoCo.getDataRepository();
         var text = CommonUtilities.readInputText(inputText);

diff --git a/...a/edu/kit/kastel/mcse/ardoco/core/execution/ArDoCoForSadCodeTraceabilityLinkRecovery.java b/...a/edu/kit/kastel/mcse/ardoco/core/execution/ArDoCoForSadCodeTraceabilityLinkRecovery.java
@@ -21,7 +21,6 @@ public ArDoCoForSadCodeTraceabilityLinkRecovery(String projectName) {
     }
 
     public void setUp(File inputText, File inputCode, SortedMap<String, String> additionalConfigs, File outputDir) {
-
         definePipeline(inputText, inputCode, additionalConfigs);
         setOutputDirectory(outputDir);
         isSetUp = true;

diff --git a/...va/edu/kit/kastel/mcse/ardoco/core/execution/ArDoCoForSadSamTraceabilityLinkRecovery.java b/...va/edu/kit/kastel/mcse/ardoco/core/execution/ArDoCoForSadSamTraceabilityLinkRecovery.java
@@ -2,7 +2,6 @@
 package edu.kit.kastel.mcse.ardoco.core.execution;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.SortedMap;
 
 import org.slf4j.Logger;
@@ -27,13 +26,7 @@ public ArDoCoForSadSamTraceabilityLinkRecovery(String projectName) {
 
     public void setUp(File inputText, File inputArchitectureModel, ArchitectureModelType architectureModelType, SortedMap<String, String> additionalConfigs,
             File outputDir) {
-        try {
-            definePipeline(inputText, inputArchitectureModel, architectureModelType, additionalConfigs);
-        } catch (IOException e) {
-            logger.error("Problem in initialising pipeline when loading data (IOException)", e.getCause());
-            isSetUp = false;
-            return;
-        }
+        definePipeline(inputText, inputArchitectureModel, architectureModelType, additionalConfigs);
         setOutputDirectory(outputDir);
         isSetUp = true;
     }
@@ -44,7 +37,7 @@ public void setUp(String inputTextLocation, String inputArchitectureModelLocatio
     }
 
     private void definePipeline(File inputText, File inputArchitectureModel, ArchitectureModelType architectureModelType,
-            SortedMap<String, String> additionalConfigs) throws IOException {
+            SortedMap<String, String> additionalConfigs) {
         var dataRepository = this.getArDoCo().getDataRepository();
         var text = CommonUtilities.readInputText(inputText);
         if (text.isBlank()) {