remove autograder-hotswap/autograder-utils in favor of Feuermagier#568

autograder-cmd/src/main/java/de/firemage/autograder/cmd/Application.java

@@ -5,16 +5,16 @@
 import de.firemage.autograder.cmd.output.Annotation;
 import de.firemage.autograder.core.ArtemisUtil;
 import de.firemage.autograder.core.CheckConfiguration;
-import de.firemage.autograder.utils.CodePosition;
+import de.firemage.autograder.core.CodePosition;
 import de.firemage.autograder.core.Linter;
 import de.firemage.autograder.core.LinterConfigurationException;
-import de.firemage.autograder.utils.LinterException;
-import de.firemage.autograder.utils.LinterStatus;
+import de.firemage.autograder.core.LinterException;
+import de.firemage.autograder.core.LinterStatus;
 import de.firemage.autograder.core.Problem;
-import de.firemage.autograder.utils.compiler.CompilationFailureException;
-import de.firemage.autograder.utils.JavaVersion;
-import de.firemage.autograder.utils.TempLocation;
-import de.firemage.autograder.utils.file.UploadedFile;
+import de.firemage.autograder.core.compiler.CompilationFailureException;
+import de.firemage.autograder.core.JavaVersion;
+import de.firemage.autograder.core.file.TempLocation;
+import de.firemage.autograder.core.file.UploadedFile;
 import de.firemage.autograder.span.Formatter;
 import de.firemage.autograder.span.Highlight;
 import de.firemage.autograder.span.Position;

autograder-core/pom.xml

@@ -15,11 +15,6 @@
     <url>https://github.com/Feuermagier/autograder/autograder-core</url>
 
     <dependencies>
-        <dependency>
-            <groupId>de.firemage.autograder</groupId>
-            <artifactId>autograder-utils</artifactId>
-        </dependency>
-
         <!-- Spoon -->
         <dependency>
             <groupId>fr.inria.gforge.spoon</groupId>
@@ -63,6 +58,13 @@
             <version>${slf4j.version}</version>
         </dependency>
 
+        <!-- Charsets -->
+        <dependency>
+            <groupId>com.github.albfernandez</groupId>
+            <artifactId>juniversalchardet</artifactId>
+            <version>2.5.0</version>
+        </dependency>
+
         <!-- Translation -->
         <dependency>
             <groupId>net.xyzsd.fluent</groupId>

autograder-core/src/main/java/de/firemage/autograder/core/CodeLinter.java

@@ -1,9 +1,8 @@
 package de.firemage.autograder.core;
 
 import de.firemage.autograder.core.check.Check;
-import de.firemage.autograder.utils.LinterStatus;
-import de.firemage.autograder.utils.TempLocation;
-import de.firemage.autograder.utils.file.UploadedFile;
+import de.firemage.autograder.core.file.TempLocation;
+import de.firemage.autograder.core.file.UploadedFile;
 
 import java.io.IOException;
 import java.util.List;

autograder-utils/src/main/java/de/firemage/autograder/utils/CodeModel.java → autograder-core/src/main/java/de/firemage/autograder/core/CodeModel.java

@@ -1,10 +1,10 @@
-package de.firemage.autograder.utils;
+package de.firemage.autograder.core;
 
-import de.firemage.autograder.utils.file.SourceInfo;
-import de.firemage.autograder.utils.integrated.MethodHierarchy;
-import de.firemage.autograder.utils.integrated.MethodUtil;
-import de.firemage.autograder.utils.integrated.ModelBuildException;
-import de.firemage.autograder.utils.integrated.UsesFinder;
+import de.firemage.autograder.core.file.SourceInfo;
+import de.firemage.autograder.core.integrated.MethodHierarchy;
+import de.firemage.autograder.core.integrated.MethodUtil;
+import de.firemage.autograder.core.integrated.ModelBuildException;
+import de.firemage.autograder.core.integrated.UsesFinder;
 import spoon.Launcher;
 import spoon.compiler.Environment;
 import spoon.compiler.ModelBuildingException;

autograder-utils/src/main/java/de/firemage/autograder/utils/CodePosition.java → autograder-core/src/main/java/de/firemage/autograder/core/CodePosition.java

@@ -1,7 +1,7 @@
-package de.firemage.autograder.utils;
+package de.firemage.autograder.core;
 
-import de.firemage.autograder.utils.file.SourceInfo;
-import de.firemage.autograder.utils.file.SourcePath;
+import de.firemage.autograder.core.file.SourceInfo;
+import de.firemage.autograder.core.file.SourcePath;
 import spoon.reflect.code.CtAbstractSwitch;
 import spoon.reflect.code.CtLoop;
 import spoon.reflect.cu.SourcePosition;

autograder-utils/src/main/java/de/firemage/autograder/utils/JavaVersion.java → autograder-core/src/main/java/de/firemage/autograder/core/JavaVersion.java

@@ -1,4 +1,4 @@
-package de.firemage.autograder.utils;
+package de.firemage.autograder.core;
 
 import java.util.Arrays;
 import java.util.Comparator;

autograder-core/src/main/java/de/firemage/autograder/core/Linter.java

@@ -2,12 +2,8 @@
 
 import de.firemage.autograder.core.check.Check;
 import de.firemage.autograder.core.check.ExecutableCheck;
-import de.firemage.autograder.utils.JavaVersion;
-import de.firemage.autograder.utils.LinterException;
-import de.firemage.autograder.utils.LinterStatus;
-import de.firemage.autograder.utils.TempLocation;
-import de.firemage.autograder.utils.Translatable;
-import de.firemage.autograder.utils.file.UploadedFile;
+import de.firemage.autograder.core.file.TempLocation;
+import de.firemage.autograder.core.file.UploadedFile;
 import de.firemage.autograder.core.parallel.AnalysisResult;
 import de.firemage.autograder.core.parallel.AnalysisScheduler;
 import fluent.bundle.FluentBundle;

autograder-core/src/main/java/de/firemage/autograder/core/LinterConfigurationException.java

@@ -1,7 +1,5 @@
 package de.firemage.autograder.core;
 
-import de.firemage.autograder.utils.LinterException;
-
 public class LinterConfigurationException extends LinterException {
     public LinterConfigurationException(String message) {
         super(message);

autograder-utils/src/main/java/de/firemage/autograder/utils/LinterException.java → autograder-core/src/main/java/de/firemage/autograder/core/LinterException.java

@@ -1,4 +1,4 @@
-package de.firemage.autograder.utils;
+package de.firemage.autograder.core;
 
 public class LinterException extends Exception {
     public LinterException() {

autograder-utils/src/main/java/de/firemage/autograder/utils/LinterStatus.java → autograder-core/src/main/java/de/firemage/autograder/core/LinterStatus.java

@@ -1,4 +1,4 @@
-package de.firemage.autograder.utils;
+package de.firemage.autograder.core;
 
 public enum LinterStatus {
     COMPILING(new LocalizedMessage("status-compiling")),

autograder-utils/src/main/java/de/firemage/autograder/utils/LocalizedMessage.java → autograder-core/src/main/java/de/firemage/autograder/core/LocalizedMessage.java

@@ -1,4 +1,4 @@
-package de.firemage.autograder.utils;
+package de.firemage.autograder.core;
 
 import fluent.bundle.FluentBundle;
 

autograder-core/src/main/java/de/firemage/autograder/core/MultiInCodeProblem.java

@@ -1,9 +1,6 @@
 package de.firemage.autograder.core;
 
-import de.firemage.autograder.utils.CodePosition;
-import de.firemage.autograder.utils.LocalizedMessage;
-import de.firemage.autograder.utils.Translatable;
-import de.firemage.autograder.utils.file.SourcePath;
+import de.firemage.autograder.core.file.SourcePath;
 import org.apache.commons.io.FilenameUtils;
 
 import java.util.Collection;

autograder-core/src/main/java/de/firemage/autograder/core/Problem.java

@@ -1,8 +1,6 @@
 package de.firemage.autograder.core;
 
 import de.firemage.autograder.core.check.Check;
-import de.firemage.autograder.utils.CodePosition;
-import de.firemage.autograder.utils.Translatable;
 
 public interface Problem {
     Check getCheck();

autograder-core/src/main/java/de/firemage/autograder/core/ProblemImpl.java

@@ -1,8 +1,6 @@
 package de.firemage.autograder.core;
 
 import de.firemage.autograder.core.check.Check;
-import de.firemage.autograder.utils.CodePosition;
-import de.firemage.autograder.utils.Translatable;
 
 /**
  * Contains the default implementation of most {@link Problem} methods.

autograder-utils/src/main/java/de/firemage/autograder/utils/SerializableCharset.java → autograder-core/src/main/java/de/firemage/autograder/core/SerializableCharset.java

@@ -1,6 +1,6 @@
-package de.firemage.autograder.utils;
+package de.firemage.autograder.core;
 
-import de.firemage.autograder.utils.file.SourceInfo;
+import de.firemage.autograder.core.file.SourceInfo;
 
 import java.io.Serializable;
 import java.nio.charset.Charset;

autograder-utils/src/main/java/de/firemage/autograder/utils/Translatable.java → autograder-core/src/main/java/de/firemage/autograder/core/Translatable.java

@@ -1,4 +1,4 @@
-package de.firemage.autograder.utils;
+package de.firemage.autograder.core;
 
 import fluent.bundle.FluentBundle;
 

autograder-core/src/main/java/de/firemage/autograder/core/check/Check.java

@@ -1,7 +1,7 @@
 package de.firemage.autograder.core.check;
 
 import de.firemage.autograder.core.Problem;
-import de.firemage.autograder.utils.LocalizedMessage;
+import de.firemage.autograder.core.LocalizedMessage;
 import de.firemage.autograder.core.MultiInCodeProblem;
 
 import java.util.ArrayList;

autograder-core/src/main/java/de/firemage/autograder/core/check/api/AvoidStringConcat.java

@@ -1,16 +1,10 @@
 package de.firemage.autograder.core.check.api;
 
 
-import de.firemage.autograder.utils.LocalizedMessage;
 import de.firemage.autograder.core.ProblemType;
 import de.firemage.autograder.core.check.ExecutableCheck;
 import de.firemage.autograder.core.integrated.IntegratedCheck;
 import de.firemage.autograder.core.integrated.StaticAnalysis;
-import de.firemage.autograder.utils.integrated.MethodUtil;
-import spoon.processing.AbstractProcessor;
-import spoon.reflect.code.CtInvocation;
-
-import java.util.Map;
 
 @ExecutableCheck(reportedProblems = { ProblemType.AVOID_STRING_CONCAT })
 public class AvoidStringConcat extends IntegratedCheck {

autograder-core/src/main/java/de/firemage/autograder/core/check/api/CharRange.java

@@ -1,13 +1,13 @@
 package de.firemage.autograder.core.check.api;
 
-import de.firemage.autograder.utils.LocalizedMessage;
+import de.firemage.autograder.core.LocalizedMessage;
 import de.firemage.autograder.core.ProblemType;
 import de.firemage.autograder.core.check.ExecutableCheck;
 import de.firemage.autograder.core.integrated.CtRange;
 import de.firemage.autograder.core.integrated.IntegratedCheck;
 import de.firemage.autograder.core.integrated.SpoonUtil;
 import de.firemage.autograder.core.integrated.StaticAnalysis;
-import de.firemage.autograder.utils.integrated.TypeUtil;
+import de.firemage.autograder.core.integrated.TypeUtil;
 import org.apache.commons.lang3.Range;
 import spoon.processing.AbstractProcessor;
 import spoon.reflect.code.BinaryOperatorKind;

autograder-core/src/main/java/de/firemage/autograder/core/check/api/CheckIterableDuplicates.java

@@ -1,12 +1,12 @@
 package de.firemage.autograder.core.check.api;
 
-import de.firemage.autograder.utils.LocalizedMessage;
+import de.firemage.autograder.core.LocalizedMessage;
 import de.firemage.autograder.core.ProblemType;
 import de.firemage.autograder.core.check.ExecutableCheck;
 import de.firemage.autograder.core.integrated.IntegratedCheck;
 import de.firemage.autograder.core.integrated.SpoonUtil;
 import de.firemage.autograder.core.integrated.StaticAnalysis;
-import de.firemage.autograder.utils.integrated.TypeUtil;
+import de.firemage.autograder.core.integrated.TypeUtil;
 import spoon.processing.AbstractProcessor;
 import spoon.reflect.code.CtAssignment;
 import spoon.reflect.code.CtBreak;

autograder-core/src/main/java/de/firemage/autograder/core/check/api/CollectionAddAll.java

@@ -1,14 +1,14 @@
 package de.firemage.autograder.core.check.api;
 
-import de.firemage.autograder.utils.LocalizedMessage;
+import de.firemage.autograder.core.LocalizedMessage;
 import de.firemage.autograder.core.ProblemType;
 import de.firemage.autograder.core.check.ExecutableCheck;
 import de.firemage.autograder.core.integrated.IntegratedCheck;
 import de.firemage.autograder.core.integrated.SpoonUtil;
 import de.firemage.autograder.core.integrated.StaticAnalysis;
 import de.firemage.autograder.core.check.api.UseEnumValues.CtEnumFieldRead;
-import de.firemage.autograder.utils.integrated.MethodUtil;
-import de.firemage.autograder.utils.integrated.TypeUtil;
+import de.firemage.autograder.core.integrated.MethodUtil;
+import de.firemage.autograder.core.integrated.TypeUtil;
 import spoon.reflect.code.CtBlock;
 import spoon.reflect.code.CtExpression;
 import spoon.reflect.code.CtForEach;

autograder-core/src/main/java/de/firemage/autograder/core/check/api/CollectionsNCopies.java

@@ -1,13 +1,13 @@
 package de.firemage.autograder.core.check.api;
 
-import de.firemage.autograder.utils.LocalizedMessage;
+import de.firemage.autograder.core.LocalizedMessage;
 import de.firemage.autograder.core.ProblemType;
 import de.firemage.autograder.core.check.ExecutableCheck;
 import de.firemage.autograder.core.integrated.ForLoopRange;
 import de.firemage.autograder.core.integrated.IntegratedCheck;
 import de.firemage.autograder.core.integrated.SpoonUtil;
 import de.firemage.autograder.core.integrated.StaticAnalysis;
-import de.firemage.autograder.utils.integrated.TypeUtil;
+import de.firemage.autograder.core.integrated.TypeUtil;
 import spoon.processing.AbstractProcessor;
 import spoon.reflect.code.CtExpression;
 import spoon.reflect.code.CtFor;

autograder-core/src/main/java/de/firemage/autograder/core/check/api/EqualsHashCodeComparableContract.java

@@ -1,6 +1,6 @@
 package de.firemage.autograder.core.check.api;
 
-import de.firemage.autograder.utils.LocalizedMessage;
+import de.firemage.autograder.core.LocalizedMessage;
 import de.firemage.autograder.core.ProblemType;
 import de.firemage.autograder.core.check.ExecutableCheck;
 import de.firemage.autograder.core.integrated.IntegratedCheck;

autograder-core/src/main/java/de/firemage/autograder/core/check/api/ImplementComparable.java

@@ -1,11 +1,11 @@
 package de.firemage.autograder.core.check.api;
 
-import de.firemage.autograder.utils.LocalizedMessage;
+import de.firemage.autograder.core.LocalizedMessage;
 import de.firemage.autograder.core.ProblemType;
 import de.firemage.autograder.core.check.ExecutableCheck;
 import de.firemage.autograder.core.integrated.IntegratedCheck;
 import de.firemage.autograder.core.integrated.StaticAnalysis;
-import de.firemage.autograder.utils.integrated.TypeUtil;
+import de.firemage.autograder.core.integrated.TypeUtil;
 import spoon.processing.AbstractProcessor;
 import spoon.reflect.declaration.CtClass;
 import spoon.reflect.declaration.CtType;

autograder-core/src/main/java/de/firemage/autograder/core/check/api/IsEmptyReimplementationCheck.java

@@ -1,13 +1,13 @@
 package de.firemage.autograder.core.check.api;
 
-import de.firemage.autograder.utils.LocalizedMessage;
+import de.firemage.autograder.core.LocalizedMessage;
 import de.firemage.autograder.core.ProblemType;
 import de.firemage.autograder.core.check.ExecutableCheck;
 import de.firemage.autograder.core.integrated.IntegratedCheck;
 import de.firemage.autograder.core.integrated.SpoonUtil;
 import de.firemage.autograder.core.integrated.StaticAnalysis;
-import de.firemage.autograder.utils.integrated.MethodUtil;
-import de.firemage.autograder.utils.integrated.TypeUtil;
+import de.firemage.autograder.core.integrated.MethodUtil;
+import de.firemage.autograder.core.integrated.TypeUtil;
 import spoon.processing.AbstractProcessor;
 import spoon.reflect.code.CtBinaryOperator;
 import spoon.reflect.code.CtExpression;

autograder-core/src/main/java/de/firemage/autograder/core/check/api/MathReimplementation.java

@@ -1,13 +1,13 @@
 package de.firemage.autograder.core.check.api;
 
-import de.firemage.autograder.utils.LocalizedMessage;
+import de.firemage.autograder.core.LocalizedMessage;
 import de.firemage.autograder.core.ProblemType;
 import de.firemage.autograder.core.check.ExecutableCheck;
 import de.firemage.autograder.core.integrated.IntegratedCheck;
 import de.firemage.autograder.core.integrated.SpoonUtil;
 import de.firemage.autograder.core.integrated.StaticAnalysis;
-import de.firemage.autograder.utils.integrated.MethodUtil;
-import de.firemage.autograder.utils.integrated.TypeUtil;
+import de.firemage.autograder.core.integrated.MethodUtil;
+import de.firemage.autograder.core.integrated.TypeUtil;
 import spoon.reflect.code.BinaryOperatorKind;
 import spoon.reflect.code.CtAssignment;
 import spoon.reflect.code.CtBinaryOperator;

autograder-core/src/main/java/de/firemage/autograder/core/check/api/OldCollectionCheck.java

@@ -1,6 +1,6 @@
 package de.firemage.autograder.core.check.api;
 
-import de.firemage.autograder.utils.LocalizedMessage;
+import de.firemage.autograder.core.LocalizedMessage;
 import de.firemage.autograder.core.ProblemType;
 import de.firemage.autograder.core.check.ExecutableCheck;
 import de.firemage.autograder.core.integrated.IntegratedCheck;

autograder-core/src/main/java/de/firemage/autograder/core/check/api/OptionalBadPractices.java

@@ -1,6 +1,6 @@
 package de.firemage.autograder.core.check.api;
 
-import de.firemage.autograder.utils.LocalizedMessage;
+import de.firemage.autograder.core.LocalizedMessage;
 import de.firemage.autograder.core.ProblemType;
 import de.firemage.autograder.core.check.ExecutableCheck;
 import de.firemage.autograder.core.integrated.IntegratedCheck;

autograder-core/src/main/java/de/firemage/autograder/core/check/api/SimplifyArraysFill.java

@@ -1,12 +1,12 @@
 package de.firemage.autograder.core.check.api;
 
-import de.firemage.autograder.utils.LocalizedMessage;
+import de.firemage.autograder.core.LocalizedMessage;
 import de.firemage.autograder.core.ProblemType;
 import de.firemage.autograder.core.check.ExecutableCheck;
 import de.firemage.autograder.core.integrated.IntegratedCheck;
 import de.firemage.autograder.core.integrated.SpoonUtil;
 import de.firemage.autograder.core.integrated.StaticAnalysis;
-import de.firemage.autograder.utils.integrated.TypeUtil;
+import de.firemage.autograder.core.integrated.TypeUtil;
 import spoon.processing.AbstractProcessor;
 import spoon.reflect.code.CtExpression;
 import spoon.reflect.code.CtFieldAccess;

autograder-core/src/main/java/de/firemage/autograder/core/check/api/StringRepeat.java

@@ -1,14 +1,14 @@
 package de.firemage.autograder.core.check.api;
 
-import de.firemage.autograder.utils.LocalizedMessage;
+import de.firemage.autograder.core.LocalizedMessage;
 import de.firemage.autograder.core.ProblemType;
 import de.firemage.autograder.core.check.ExecutableCheck;
 
 import de.firemage.autograder.core.integrated.ForLoopRange;
 import de.firemage.autograder.core.integrated.IntegratedCheck;
 import de.firemage.autograder.core.integrated.SpoonUtil;
 import de.firemage.autograder.core.integrated.StaticAnalysis;
-import de.firemage.autograder.utils.integrated.TypeUtil;
+import de.firemage.autograder.core.integrated.TypeUtil;
 import spoon.processing.AbstractProcessor;
 import spoon.reflect.code.BinaryOperatorKind;
 import spoon.reflect.code.CtExpression;

autograder-core/src/main/java/de/firemage/autograder/core/check/api/UseArrayCopy.java

@@ -1,6 +1,6 @@
 package de.firemage.autograder.core.check.api;
 
-import de.firemage.autograder.utils.LocalizedMessage;
+import de.firemage.autograder.core.LocalizedMessage;
 import de.firemage.autograder.core.ProblemType;
 import de.firemage.autograder.core.check.ExecutableCheck;
 

autograder-core/src/main/java/de/firemage/autograder/core/check/api/UseArraysFill.java

@@ -1,13 +1,13 @@
 package de.firemage.autograder.core.check.api;
 
-import de.firemage.autograder.utils.LocalizedMessage;
+import de.firemage.autograder.core.LocalizedMessage;
 import de.firemage.autograder.core.ProblemType;
 import de.firemage.autograder.core.check.ExecutableCheck;
 import de.firemage.autograder.core.integrated.ForLoopRange;
 import de.firemage.autograder.core.integrated.IntegratedCheck;
 import de.firemage.autograder.core.integrated.SpoonUtil;
 import de.firemage.autograder.core.integrated.StaticAnalysis;
-import de.firemage.autograder.utils.integrated.UsesFinder;
+import de.firemage.autograder.core.integrated.UsesFinder;
 import spoon.processing.AbstractProcessor;
 import spoon.reflect.code.CtArrayWrite;
 import spoon.reflect.code.CtAssignment;