update to current 2.0.0-SNAPSHOT of ardoco (II)

dfuchss · dfuchss · commit c92ca8c80ce4 · 2026-01-09T01:51:05.000+01:00
diff --git a/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/rest/api/controller/AbstractController.java b/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/rest/api/controller/AbstractController.java
@@ -1,4 +1,4 @@
-/* Licensed under MIT 2024-2025. */
+/* Licensed under MIT 2024-2026. */
 package edu.kit.kastel.mcse.ardoco.tlr.rest.api.controller;
 
 import java.io.File;
@@ -18,7 +18,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import edu.kit.kastel.mcse.ardoco.core.execution.runner.ArDoCoRunner;
+import edu.kit.kastel.mcse.ardoco.core.execution.runner.ArdocoRunner;
 import edu.kit.kastel.mcse.ardoco.tlr.rest.api.api_response.ArDoCoApiResult;
 import edu.kit.kastel.mcse.ardoco.tlr.rest.api.api_response.ArdocoResultResponse;
 import edu.kit.kastel.mcse.ardoco.tlr.rest.api.api_response.TraceLinkType;
@@ -75,14 +75,14 @@ public AbstractController(AbstractRunnerTLRService service, TraceLinkType traceL
     /**
      * Handles the process of running a pipeline and building a response based on the result status.
      *
-     * @param runner     the {@link ArDoCoRunner} instance to execute
+     * @param runner     the {@link ArdocoRunner} instance to execute
      * @param requestId  the unique request ID associated with the pipeline run
      * @param inputFiles the list of input files for the pipeline run
      * @return a {@link ResponseEntity} containing the {@link ArdocoResultResponse} with the status and result message
      * @throws FileNotFoundException   if any of the input files cannot be found
      * @throws FileConversionException if there's an error converting any file during the pipeline process
      */
-    protected ResponseEntity<ArdocoResultResponse> handleRunPipeLineResult(ArDoCoRunner runner, String requestId, List<File> inputFiles)
+    protected ResponseEntity<ArdocoResultResponse> handleRunPipeLineResult(ArdocoRunner runner, String requestId, List<File> inputFiles)
             throws FileNotFoundException, FileConversionException {
         Optional<ArDoCoApiResult> result = service.runPipeline(runner, requestId, inputFiles);
         ArdocoResultResponse response;
@@ -103,7 +103,7 @@ protected ResponseEntity<ArdocoResultResponse> handleRunPipeLineResult(ArDoCoRun
      * @return a {@link ResponseEntity} containing the {@link ArdocoResultResponse} with the status and result message
      * @throws ArdocoException if an error occurs during the pipeline process or waiting for the result
      */
-    protected ResponseEntity<ArdocoResultResponse> handleRunPipelineAndWaitForResult(ArDoCoRunner runner, String requestId, List<File> inputFiles)
+    protected ResponseEntity<ArdocoResultResponse> handleRunPipelineAndWaitForResult(ArdocoRunner runner, String requestId, List<File> inputFiles)
             throws ArdocoException {
         Optional<ArDoCoApiResult> result = service.runPipeline(runner, requestId, inputFiles);
         if (result.isEmpty()) {
diff --git a/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/rest/api/controller/InconsistencyController.java b/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/rest/api/controller/InconsistencyController.java
@@ -112,7 +112,7 @@ public ResponseEntity<ArdocoResultResponse> runPipelineAndWaitForResult(
         SortedMap<String, String> additionalConfigs = parseAdditionalConfigs(additionalConfigsJson);
 
         String id = generateRequestId(inputFiles, projectName);
-        ArDoCoForInconsistencyDetection runner = setUpRunner(inputFileMap, modelType, projectName, additionalConfigs);
+        InconsistencyDetection runner = setUpRunner(inputFileMap, modelType, projectName, additionalConfigs);
 
         return handleRunPipelineAndWaitForResult(runner, id, inputFiles);
     }
diff --git a/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/rest/api/service/ArCoTLService.java b/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/rest/api/service/ArCoTLService.java
@@ -1,4 +1,4 @@
-/* Licensed under MIT 2025. */
+/* Licensed under MIT 2025-2026. */
 package edu.kit.kastel.mcse.ardoco.tlr.rest.api.service;
 
 import org.eclipse.collections.api.list.ImmutableList;
@@ -8,7 +8,7 @@
 
 import edu.kit.kastel.mcse.ardoco.core.api.entity.ArchitectureEntity;
 import edu.kit.kastel.mcse.ardoco.core.api.entity.ModelEntity;
-import edu.kit.kastel.mcse.ardoco.core.api.output.ArDoCoResult;
+import edu.kit.kastel.mcse.ardoco.core.api.output.ArdocoResult;
 import edu.kit.kastel.mcse.ardoco.core.api.tracelink.TraceLink;
 import edu.kit.kastel.mcse.ardoco.tlr.rest.api.api_response.ArDoCoApiResult;
 import edu.kit.kastel.mcse.ardoco.tlr.rest.api.api_response.TraceLinkType;
@@ -30,7 +30,7 @@ public ArCoTLService() {
     }
 
     @Override
-    protected ArDoCoApiResult convertResultToJsonString(ArDoCoResult result) throws JsonProcessingException {
+    protected ArDoCoApiResult convertResultToJsonString(ArdocoResult result) throws JsonProcessingException {
         ImmutableList<TraceLink<? extends ArchitectureEntity, ? extends ModelEntity>> traceLinks = result.getSamCodeTraceLinks();
         String traceLinkJson = TraceLinkConverter.convertListOfSamCodeTraceLinksToJsonString(traceLinks);
         return new ArDoCoApiResult(traceLinkJson);
diff --git a/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/rest/api/service/ArDoCodeService.java b/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/rest/api/service/ArDoCodeService.java
@@ -1,4 +1,4 @@
-/* Licensed under MIT 2025. */
+/* Licensed under MIT 2025-2026. */
 package edu.kit.kastel.mcse.ardoco.tlr.rest.api.service;
 
 import org.eclipse.collections.api.list.ImmutableList;
@@ -7,7 +7,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 
 import edu.kit.kastel.mcse.ardoco.core.api.entity.ModelEntity;
-import edu.kit.kastel.mcse.ardoco.core.api.output.ArDoCoResult;
+import edu.kit.kastel.mcse.ardoco.core.api.output.ArdocoResult;
 import edu.kit.kastel.mcse.ardoco.core.api.text.SentenceEntity;
 import edu.kit.kastel.mcse.ardoco.core.api.tracelink.TraceLink;
 import edu.kit.kastel.mcse.ardoco.tlr.rest.api.api_response.ArDoCoApiResult;
@@ -30,7 +30,7 @@ public ArDoCodeService() {
     }
 
     @Override
-    protected ArDoCoApiResult convertResultToJsonString(ArDoCoResult result) throws JsonProcessingException {
+    protected ArDoCoApiResult convertResultToJsonString(ArdocoResult result) throws JsonProcessingException {
         ImmutableList<TraceLink<SentenceEntity, ? extends ModelEntity>> traceLinks = result.getSadCodeTraceLinks();
         String traceLinksJson = TraceLinkConverter.convertListOfSadCodeTraceLinksToJsonString(traceLinks);
         return new ArDoCoApiResult(traceLinksJson);
diff --git a/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/rest/api/service/InconsistencyService.java b/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/rest/api/service/InconsistencyService.java
@@ -1,4 +1,4 @@
-/* Licensed under MIT 2025. */
+/* Licensed under MIT 2025-2026. */
 package edu.kit.kastel.mcse.ardoco.tlr.rest.api.service;
 
 import org.eclipse.collections.api.list.ImmutableList;
@@ -7,7 +7,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 
 import edu.kit.kastel.mcse.ardoco.core.api.entity.ModelEntity;
-import edu.kit.kastel.mcse.ardoco.core.api.output.ArDoCoResult;
+import edu.kit.kastel.mcse.ardoco.core.api.output.ArdocoResult;
 import edu.kit.kastel.mcse.ardoco.core.api.stage.inconsistency.Inconsistency;
 import edu.kit.kastel.mcse.ardoco.core.api.text.SentenceEntity;
 import edu.kit.kastel.mcse.ardoco.core.api.tracelink.TraceLink;
@@ -24,7 +24,7 @@ public InconsistencyService() {
     }
 
     @Override
-    protected ArDoCoApiResult convertResultToJsonString(ArDoCoResult result) throws JsonProcessingException {
+    protected ArDoCoApiResult convertResultToJsonString(ArdocoResult result) throws JsonProcessingException {
         // traceLinks
         ImmutableList<TraceLink<SentenceEntity, ModelEntity>> traceLinks = result.getArchitectureTraceLinks();
         String traceLinksJson = TraceLinkConverter.convertListOfSadSamTraceLinksToJsonString(traceLinks);
diff --git a/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/rest/api/service/SwattrService.java b/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/rest/api/service/SwattrService.java
@@ -1,4 +1,4 @@
-/* Licensed under MIT 2025. */
+/* Licensed under MIT 2025-2026. */
 package edu.kit.kastel.mcse.ardoco.tlr.rest.api.service;
 
 import org.eclipse.collections.api.list.ImmutableList;
@@ -7,7 +7,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 
 import edu.kit.kastel.mcse.ardoco.core.api.entity.ModelEntity;
-import edu.kit.kastel.mcse.ardoco.core.api.output.ArDoCoResult;
+import edu.kit.kastel.mcse.ardoco.core.api.output.ArdocoResult;
 import edu.kit.kastel.mcse.ardoco.core.api.text.SentenceEntity;
 import edu.kit.kastel.mcse.ardoco.core.api.tracelink.TraceLink;
 import edu.kit.kastel.mcse.ardoco.tlr.rest.api.api_response.ArDoCoApiResult;
@@ -30,7 +30,7 @@ public SwattrService() {
     }
 
     @Override
-    protected ArDoCoApiResult convertResultToJsonString(ArDoCoResult result) throws JsonProcessingException {
+    protected ArDoCoApiResult convertResultToJsonString(ArdocoResult result) throws JsonProcessingException {
         ImmutableList<TraceLink<SentenceEntity, ModelEntity>> traceLinks = result.getArchitectureTraceLinks();
         String traceLinksJson = TraceLinkConverter.convertListOfSadSamTraceLinksToJsonString(traceLinks);
         return new ArDoCoApiResult(traceLinksJson);
diff --git a/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/rest/api/service/TransArCService.java b/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/rest/api/service/TransArCService.java
@@ -1,4 +1,4 @@
-/* Licensed under MIT 2025. */
+/* Licensed under MIT 2025-2026. */
 package edu.kit.kastel.mcse.ardoco.tlr.rest.api.service;
 
 import org.eclipse.collections.api.list.ImmutableList;
@@ -7,7 +7,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 
 import edu.kit.kastel.mcse.ardoco.core.api.entity.ModelEntity;
-import edu.kit.kastel.mcse.ardoco.core.api.output.ArDoCoResult;
+import edu.kit.kastel.mcse.ardoco.core.api.output.ArdocoResult;
 import edu.kit.kastel.mcse.ardoco.core.api.text.SentenceEntity;
 import edu.kit.kastel.mcse.ardoco.core.api.tracelink.TraceLink;
 import edu.kit.kastel.mcse.ardoco.tlr.rest.api.api_response.ArDoCoApiResult;
@@ -30,7 +30,7 @@ public TransArCService() {
     }
 
     @Override
-    protected ArDoCoApiResult convertResultToJsonString(ArDoCoResult result) throws JsonProcessingException {
+    protected ArDoCoApiResult convertResultToJsonString(ArdocoResult result) throws JsonProcessingException {
         ImmutableList<TraceLink<SentenceEntity, ? extends ModelEntity>> traceLinks = result.getSadCodeTraceLinks();
         String traceLinksJson = TraceLinkConverter.convertListOfSadCodeTraceLinksToJsonString(traceLinks);
         return new ArDoCoApiResult(traceLinksJson);

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public ResponseEntity<ArdocoResultResponse> runPipelineAndWaitForResult(`
`112`	`112`	`SortedMap<String, String> additionalConfigs = parseAdditionalConfigs(additionalConfigsJson);`
`113`	`113`
`114`	`114`	`String id = generateRequestId(inputFiles, projectName);`
`115`		`- ArDoCoForInconsistencyDetection runner = setUpRunner(inputFileMap, modelType, projectName, additionalConfigs);`
	`115`	`+ InconsistencyDetection runner = setUpRunner(inputFileMap, modelType, projectName, additionalConfigs);`
`116`	`116`
`117`	`117`	`return handleRunPipelineAndWaitForResult(runner, id, inputFiles);`
`118`	`118`	`}`