Move entity

ArDoCo · Nov 29, 2024 · fa8aaf7 · fa8aaf7
1 parent 6c9a186
commit fa8aaf7
Show file tree

Hide file tree

Showing 20 changed files with 20 additions and 20 deletions.
diff --git a/...main/java/edu/kit/kastel/mcse/ardoco/core/api/codetraceability/CodeTraceabilityState.java b/...main/java/edu/kit/kastel/mcse/ardoco/core/api/codetraceability/CodeTraceabilityState.java
@@ -5,8 +5,8 @@
 
 import org.eclipse.collections.api.set.ImmutableSet;
 
+import edu.kit.kastel.mcse.ardoco.core.api.entity.ArchitectureEntity;
 import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeCompilationUnit;
-import edu.kit.kastel.mcse.ardoco.core.api.models.entity.ArchitectureEntity;
 import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.SadCodeTraceLink;
 import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.SamCodeTraceLink;
 import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.TraceLink;

diff --git a/...rc/main/java/edu/kit/kastel/mcse/ardoco/core/api/connectiongenerator/ConnectionState.java b/...rc/main/java/edu/kit/kastel/mcse/ardoco/core/api/connectiongenerator/ConnectionState.java
@@ -6,8 +6,8 @@
 import org.eclipse.collections.api.set.ImmutableSet;
 import org.eclipse.collections.api.set.MutableSet;
 
+import edu.kit.kastel.mcse.ardoco.core.api.entity.ArchitectureEntity;
 import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.legacy.ModelInstance;
-import edu.kit.kastel.mcse.ardoco.core.api.models.entity.ArchitectureEntity;
 import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.SadSamTraceLink;
 import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.TraceLink;
 import edu.kit.kastel.mcse.ardoco.core.api.recommendationgenerator.RecommendedInstance;

diff --git a/...api/models/entity/ArchitectureEntity.java → ...o/core/api/entity/ArchitectureEntity.java b/...api/models/entity/ArchitectureEntity.java → ...o/core/api/entity/ArchitectureEntity.java
@@ -1,5 +1,5 @@
 /* Licensed under MIT 2024. */
-package edu.kit.kastel.mcse.ardoco.core.api.models.entity;
+package edu.kit.kastel.mcse.ardoco.core.api.entity;
 
 public abstract non-sealed class ArchitectureEntity extends Entity {
     private static final long serialVersionUID = 5118724938904048363L;

diff --git a/...co/core/api/models/entity/CodeEntity.java → ...se/ardoco/core/api/entity/CodeEntity.java b/...co/core/api/models/entity/CodeEntity.java → ...se/ardoco/core/api/entity/CodeEntity.java
@@ -1,5 +1,5 @@
 /* Licensed under MIT 2024. */
-package edu.kit.kastel.mcse.ardoco.core.api.models.entity;
+package edu.kit.kastel.mcse.ardoco.core.api.entity;
 
 public non-sealed class CodeEntity extends Entity {
     private static final long serialVersionUID = 5520572653996476974L;

diff --git a/...ardoco/core/api/models/entity/Entity.java → ...l/mcse/ardoco/core/api/entity/Entity.java b/...ardoco/core/api/models/entity/Entity.java → ...l/mcse/ardoco/core/api/entity/Entity.java
@@ -1,5 +1,5 @@
 /* Licensed under MIT 2023-2024. */
-package edu.kit.kastel.mcse.ardoco.core.api.models.entity;
+package edu.kit.kastel.mcse.ardoco.core.api.entity;
 
 import java.io.Serializable;
 import java.util.Objects;

diff --git a/...co/core/api/models/entity/TextEntity.java → ...se/ardoco/core/api/entity/TextEntity.java b/...co/core/api/models/entity/TextEntity.java → ...se/ardoco/core/api/entity/TextEntity.java
@@ -1,5 +1,5 @@
 /* Licensed under MIT 2024. */
-package edu.kit.kastel.mcse.ardoco.core.api.models.entity;
+package edu.kit.kastel.mcse.ardoco.core.api.entity;
 
 public non-sealed class TextEntity extends Entity {
     private static final long serialVersionUID = 7693834560590279832L;

diff --git a/...ork/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/arcotl/CodeModel.java b/...ork/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/arcotl/CodeModel.java
@@ -11,11 +11,11 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import edu.kit.kastel.mcse.ardoco.core.api.entity.Entity;
 import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeCompilationUnit;
 import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeItem;
 import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeItemRepository;
 import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodePackage;
-import edu.kit.kastel.mcse.ardoco.core.api.models.entity.Entity;
 
 /**
  * A code model that is a CMTL instance.

diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/arcotl/Model.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/arcotl/Model.java
@@ -3,7 +3,7 @@
 
 import java.util.List;
 
-import edu.kit.kastel.mcse.ardoco.core.api.models.entity.Entity;
+import edu.kit.kastel.mcse.ardoco.core.api.entity.Entity;
 import edu.kit.kastel.mcse.ardoco.core.common.IdentifierProvider;
 
 public abstract sealed class Model permits ArchitectureModel, CodeModel {

diff --git a/...java/edu/kit/kastel/mcse/ardoco/core/api/models/arcotl/architecture/ArchitectureItem.java b/...java/edu/kit/kastel/mcse/ardoco/core/api/models/arcotl/architecture/ArchitectureItem.java
@@ -1,7 +1,7 @@
 /* Licensed under MIT 2023-2024. */
 package edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture;
 
-import edu.kit.kastel.mcse.ardoco.core.api.models.entity.ArchitectureEntity;
+import edu.kit.kastel.mcse.ardoco.core.api.entity.ArchitectureEntity;
 
 /**
  * An architecture item of an architecture model. A possible candidate for the

diff --git a/.../edu/kit/kastel/mcse/ardoco/core/api/models/arcotl/architecture/legacy/ModelInstance.java b/.../edu/kit/kastel/mcse/ardoco/core/api/models/arcotl/architecture/legacy/ModelInstance.java
@@ -3,7 +3,7 @@
 
 import org.eclipse.collections.api.list.ImmutableList;
 
-import edu.kit.kastel.mcse.ardoco.core.api.models.entity.ArchitectureEntity;
+import edu.kit.kastel.mcse.ardoco.core.api.entity.ArchitectureEntity;
 
 /**
  * The Interface IModelInstance defines instances from models.

diff --git a/...common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/arcotl/code/CodeItem.java b/...common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/arcotl/code/CodeItem.java
@@ -11,7 +11,7 @@
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
-import edu.kit.kastel.mcse.ardoco.core.api.models.entity.CodeEntity;
+import edu.kit.kastel.mcse.ardoco.core.api.entity.CodeEntity;
 
 /**
  * A code item of a code model.

diff --git a/.../src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/SadSamTraceLink.java b/.../src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/SadSamTraceLink.java
@@ -4,8 +4,8 @@
 import java.util.Objects;
 
 import edu.kit.kastel.mcse.ardoco.core.api.connectiongenerator.InstanceLink;
+import edu.kit.kastel.mcse.ardoco.core.api.entity.ArchitectureEntity;
 import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.legacy.ModelInstance;
-import edu.kit.kastel.mcse.ardoco.core.api.models.entity.ArchitectureEntity;
 import edu.kit.kastel.mcse.ardoco.core.api.text.Sentence;
 import edu.kit.kastel.mcse.ardoco.core.api.text.SentenceEntity;
 import edu.kit.kastel.mcse.ardoco.core.api.text.Word;

diff --git a/...src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/SamCodeTraceLink.java b/...src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/SamCodeTraceLink.java
@@ -3,9 +3,9 @@
 
 import java.util.Objects;
 
+import edu.kit.kastel.mcse.ardoco.core.api.entity.ArchitectureEntity;
 import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.ArchitectureItem;
 import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeCompilationUnit;
-import edu.kit.kastel.mcse.ardoco.core.api.models.entity.ArchitectureEntity;
 
 /**
  * A trace link between exactly one architecture endpoint and exactly one code

diff --git a/...common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/TraceLink.java b/...common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/TraceLink.java
@@ -5,7 +5,7 @@
 import java.io.Serializable;
 import java.util.Objects;
 
-import edu.kit.kastel.mcse.ardoco.core.api.models.entity.Entity;
+import edu.kit.kastel.mcse.ardoco.core.api.entity.Entity;
 import edu.kit.kastel.mcse.ardoco.core.common.tuple.Pair;
 
 public abstract class TraceLink<E1 extends Entity, E2 extends Entity> implements Serializable {

diff --git a/.../main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/TransitiveTraceLink.java b/.../main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/TransitiveTraceLink.java
@@ -4,7 +4,7 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import edu.kit.kastel.mcse.ardoco.core.api.models.entity.Entity;
+import edu.kit.kastel.mcse.ardoco.core.api.entity.Entity;
 
 public final class TransitiveTraceLink<A extends Entity, M extends Entity, B extends Entity> extends TraceLink<A, B> {
 

diff --git a/...java/edu/kit/kastel/mcse/ardoco/core/api/recommendationgenerator/RecommendedInstance.java b/...java/edu/kit/kastel/mcse/ardoco/core/api/recommendationgenerator/RecommendedInstance.java
@@ -4,7 +4,7 @@
 import org.eclipse.collections.api.list.ImmutableList;
 import org.eclipse.collections.api.set.sorted.ImmutableSortedSet;
 
-import edu.kit.kastel.mcse.ardoco.core.api.models.entity.TextEntity;
+import edu.kit.kastel.mcse.ardoco.core.api.entity.TextEntity;
 import edu.kit.kastel.mcse.ardoco.core.api.textextraction.NounMapping;
 import edu.kit.kastel.mcse.ardoco.core.pipeline.agent.Claimant;
 

diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/text/SentenceEntity.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/text/SentenceEntity.java
@@ -3,7 +3,7 @@
 
 import java.util.Objects;
 
-import edu.kit.kastel.mcse.ardoco.core.api.models.entity.TextEntity;
+import edu.kit.kastel.mcse.ardoco.core.api.entity.TextEntity;
 
 public final class SentenceEntity extends TextEntity {
 

diff --git a/.../common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/TraceLinkUtilities.java b/.../common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/TraceLinkUtilities.java
@@ -5,8 +5,8 @@
 import org.eclipse.collections.api.list.ImmutableList;
 import org.eclipse.collections.api.list.MutableList;
 
+import edu.kit.kastel.mcse.ardoco.core.api.entity.ArchitectureEntity;
 import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeCompilationUnit;
-import edu.kit.kastel.mcse.ardoco.core.api.models.entity.ArchitectureEntity;
 import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.TraceLink;
 import edu.kit.kastel.mcse.ardoco.core.api.text.SentenceEntity;
 import edu.kit.kastel.mcse.ardoco.core.common.tuple.Pair;

diff --git a/pipeline-core/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/output/ArDoCoResult.java b/pipeline-core/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/output/ArDoCoResult.java
@@ -19,6 +19,7 @@
 import edu.kit.kastel.mcse.ardoco.core.api.PreprocessingData;
 import edu.kit.kastel.mcse.ardoco.core.api.codetraceability.CodeTraceabilityState;
 import edu.kit.kastel.mcse.ardoco.core.api.connectiongenerator.ConnectionState;
+import edu.kit.kastel.mcse.ardoco.core.api.entity.ArchitectureEntity;
 import edu.kit.kastel.mcse.ardoco.core.api.inconsistency.Inconsistency;
 import edu.kit.kastel.mcse.ardoco.core.api.inconsistency.InconsistencyState;
 import edu.kit.kastel.mcse.ardoco.core.api.inconsistency.InconsistentSentence;
@@ -29,7 +30,6 @@
 import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.legacy.LegacyModelExtractionState;
 import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.legacy.ModelInstance;
 import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeCompilationUnit;
-import edu.kit.kastel.mcse.ardoco.core.api.models.entity.ArchitectureEntity;
 import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.SadSamTraceLink;
 import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.SamCodeTraceLink;
 import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.TraceLink;

diff --git a/pipeline-core/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/FilePrinter.java b/pipeline-core/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/FilePrinter.java
@@ -34,14 +34,14 @@
 
 import edu.kit.kastel.mcse.ardoco.core.api.connectiongenerator.ConnectionState;
 import edu.kit.kastel.mcse.ardoco.core.api.connectiongenerator.InstanceLink;
+import edu.kit.kastel.mcse.ardoco.core.api.entity.ArchitectureEntity;
 import edu.kit.kastel.mcse.ardoco.core.api.inconsistency.Inconsistency;
 import edu.kit.kastel.mcse.ardoco.core.api.inconsistency.InconsistencyState;
 import edu.kit.kastel.mcse.ardoco.core.api.inconsistency.InconsistentSentence;
 import edu.kit.kastel.mcse.ardoco.core.api.inconsistency.ModelInconsistency;
 import edu.kit.kastel.mcse.ardoco.core.api.models.Metamodel;
 import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.legacy.LegacyModelExtractionState;
 import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.architecture.legacy.ModelInstance;
-import edu.kit.kastel.mcse.ardoco.core.api.models.entity.ArchitectureEntity;
 import edu.kit.kastel.mcse.ardoco.core.api.models.tracelinks.TraceLink;
 import edu.kit.kastel.mcse.ardoco.core.api.output.ArDoCoResult;
 import edu.kit.kastel.mcse.ardoco.core.api.recommendationgenerator.RecommendationState;