Reformat with new spotless rule that is closer to IDE behavior

See diffplug/spotless#522 and
diffplug/spotless#522 (comment)
This fits both Eclipse and IntelliJ better.

This was done with:
- Eclipse organize imports with the import order for spotless
- IntelliJ organize imports, this only changes 4 files
- Running spotlessApply, which changes two files "back to Eclipse"

artemis-spotless.importorder

@@ -1,6 +1,7 @@
 #Organize Import Order
 #Thu Mar 28 17:21:31 CET 2019
-3=com
-2=org
-1=javax
 0=java
+1=javax
+2=org
+3=com
+4=

src/main/java/de/tum/in/www1/artemis/config/LiquibaseConfiguration.java

@@ -2,8 +2,6 @@
 
 import javax.sql.DataSource;
 
-import liquibase.integration.spring.SpringLiquibase;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.ObjectProvider;
@@ -17,6 +15,7 @@
 
 import io.github.jhipster.config.JHipsterConstants;
 import io.github.jhipster.config.liquibase.SpringLiquibaseUtil;
+import liquibase.integration.spring.SpringLiquibase;
 
 @Configuration
 public class LiquibaseConfiguration {

src/main/java/de/tum/in/www1/artemis/config/LoggingConfiguration.java

@@ -9,10 +9,10 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
-import ch.qos.logback.classic.LoggerContext;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
+import ch.qos.logback.classic.LoggerContext;
 import io.github.jhipster.config.JHipsterProperties;
 
 /*

src/main/java/de/tum/in/www1/artemis/domain/Authority.java

@@ -12,6 +12,7 @@
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import de.tum.in.www1.artemis.security.Role;
 
 /**

src/main/java/de/tum/in/www1/artemis/domain/DomainObject.java

@@ -8,6 +8,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonView;
+
 import de.tum.in.www1.artemis.domain.view.QuizView;
 
 /**

src/main/java/de/tum/in/www1/artemis/domain/ExampleSubmission.java

@@ -10,6 +10,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import de.tum.in.www1.artemis.domain.participation.TutorParticipation;
 
 /**

src/main/java/de/tum/in/www1/artemis/domain/FeedbackConflict.java

@@ -8,6 +8,7 @@
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import de.tum.in.www1.artemis.domain.enumeration.FeedbackConflictType;
 
 /**

src/main/java/de/tum/in/www1/artemis/domain/LearningGoal.java

@@ -9,6 +9,7 @@
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import de.tum.in.www1.artemis.domain.lecture.LectureUnit;
 
 @Entity

src/main/java/de/tum/in/www1/artemis/domain/Lecture.java

@@ -10,6 +10,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import de.tum.in.www1.artemis.domain.lecture.LectureUnit;
 
 /**

src/main/java/de/tum/in/www1/artemis/domain/ProgrammingExerciseTestCase.java

@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import de.tum.in.www1.artemis.domain.enumeration.Visibility;
 
 /**

src/main/java/de/tum/in/www1/artemis/domain/ProgrammingSubmission.java

@@ -10,6 +10,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import de.tum.in.www1.artemis.domain.enumeration.SubmissionType;
 
 /**

src/main/java/de/tum/in/www1/artemis/domain/StaticCodeAnalysisCategory.java

@@ -7,6 +7,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import de.tum.in.www1.artemis.domain.enumeration.CategoryState;
 
 /**

src/main/java/de/tum/in/www1/artemis/domain/Team.java

@@ -13,6 +13,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import de.tum.in.www1.artemis.domain.participation.Participant;
 
 /**

src/main/java/de/tum/in/www1/artemis/domain/TeamAssignmentConfig.java

@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import de.tum.in.www1.artemis.validation.constraints.TeamAssignmentConfigConstraints;
 
 /**

src/main/java/de/tum/in/www1/artemis/domain/TextExercise.java

@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import de.tum.in.www1.artemis.domain.enumeration.AssessmentType;
 
 /**

src/main/java/de/tum/in/www1/artemis/domain/TextSubmission.java

@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import de.tum.in.www1.artemis.domain.enumeration.Language;
 
 /**

src/main/java/de/tum/in/www1/artemis/domain/lecture/AttachmentUnit.java

@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import de.tum.in.www1.artemis.domain.Attachment;
 
 @Entity

src/main/java/de/tum/in/www1/artemis/domain/lecture/ExerciseUnit.java

@@ -6,6 +6,7 @@
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import de.tum.in.www1.artemis.domain.Exercise;
 
 @Entity

src/main/java/de/tum/in/www1/artemis/domain/modeling/ModelingSubmission.java

@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import de.tum.in.www1.artemis.domain.Submission;
 
 /**

src/main/java/de/tum/in/www1/artemis/domain/notification/SystemNotification.java

@@ -5,6 +5,7 @@
 import javax.persistence.*;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import de.tum.in.www1.artemis.domain.enumeration.SystemNotificationType;
 
 /**

src/main/java/de/tum/in/www1/artemis/domain/participation/Participant.java

@@ -3,6 +3,7 @@
 import java.util.Set;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import de.tum.in.www1.artemis.domain.User;
 
 public interface Participant {

src/main/java/de/tum/in/www1/artemis/domain/participation/SolutionProgrammingExerciseParticipation.java

@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
 
 @Entity

src/main/java/de/tum/in/www1/artemis/domain/participation/TemplateProgrammingExerciseParticipation.java

@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
 
 @Entity

src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismComparison.java

@@ -5,12 +5,11 @@
 
 import javax.persistence.*;
 
-import jplag.JPlagComparison;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import de.tum.in.www1.artemis.domain.DomainObject;
 import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement;
+import jplag.JPlagComparison;
 
 /**
  * Pair of compared student submissions whose similarity is above a certain threshold.

src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismSubmission.java

@@ -7,8 +7,6 @@
 
 import javax.persistence.*;
 
-import jplag.Submission;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -17,6 +15,7 @@
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingSubmissionElement;
 import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement;
+import jplag.Submission;
 
 @Entity
 @Table(name = "plagiarism_submission")

src/main/java/de/tum/in/www1/artemis/domain/plagiarism/text/TextPlagiarismResult.java

@@ -5,9 +5,9 @@
 
 import javax.persistence.Entity;
 
-import jplag.JPlagResult;
 import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison;
 import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismResult;
+import jplag.JPlagResult;
 
 /**
  * Result of the automatic plagiarism detection for text or programming exercises.

src/main/java/de/tum/in/www1/artemis/domain/plagiarism/text/TextSubmissionElement.java

@@ -3,8 +3,8 @@
 import javax.persistence.Column;
 import javax.persistence.Entity;
 
-import jplag.Token;
 import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmissionElement;
+import jplag.Token;
 
 @Entity
 public class TextSubmissionElement extends PlagiarismSubmissionElement {

src/main/java/de/tum/in/www1/artemis/domain/quiz/DragAndDropSubmittedAnswer.java

@@ -11,6 +11,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonView;
+
 import de.tum.in.www1.artemis.domain.view.QuizView;
 
 /**

src/main/java/de/tum/in/www1/artemis/domain/quiz/MultipleChoiceSubmittedAnswer.java

@@ -12,6 +12,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonView;
+
 import de.tum.in.www1.artemis.domain.view.QuizView;
 
 /**

src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizStatistic.java

@@ -7,6 +7,7 @@
 import org.hibernate.annotations.DiscriminatorOptions;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import de.tum.in.www1.artemis.domain.DomainObject;
 
 /**

src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizStatisticCounter.java

@@ -7,6 +7,7 @@
 import org.hibernate.annotations.DiscriminatorOptions;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import de.tum.in.www1.artemis.domain.DomainObject;
 
 /**

src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerSubmittedAnswer.java

@@ -11,6 +11,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonView;
+
 import de.tum.in.www1.artemis.domain.view.QuizView;
 
 /**

src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerSubmittedText.java

@@ -4,8 +4,6 @@
 
 import javax.persistence.*;
 
-import me.xdrop.fuzzywuzzy.FuzzySearch;
-
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
@@ -15,6 +13,7 @@
 
 import de.tum.in.www1.artemis.domain.DomainObject;
 import de.tum.in.www1.artemis.domain.view.QuizView;
+import me.xdrop.fuzzywuzzy.FuzzySearch;
 
 /**
  * A ShortAnswerSubmittedText.

src/main/java/de/tum/in/www1/artemis/domain/scores/StudentScore.java

@@ -3,6 +3,7 @@
 import javax.persistence.*;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import de.tum.in.www1.artemis.domain.User;
 
 @Entity

src/main/java/de/tum/in/www1/artemis/domain/scores/TeamScore.java

@@ -3,6 +3,7 @@
 import javax.persistence.*;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import de.tum.in.www1.artemis.domain.Team;
 
 @Entity

src/main/java/de/tum/in/www1/artemis/service/PlantUmlService.java

@@ -4,12 +4,12 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
+import org.springframework.stereotype.Service;
+
 import net.sourceforge.plantuml.FileFormat;
 import net.sourceforge.plantuml.FileFormatOption;
 import net.sourceforge.plantuml.SourceStringReader;
 
-import org.springframework.stereotype.Service;
-
 @Service
 public class PlantUmlService {
 

src/main/java/de/tum/in/www1/artemis/service/QuizMessagingService.java

@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import de.tum.in.www1.artemis.domain.quiz.QuizExercise;
 
 @Service

src/main/java/de/tum/in/www1/artemis/service/connectors/athene/AtheneHealthIndicator.java

@@ -11,6 +11,7 @@
 import org.springframework.web.client.RestTemplate;
 
 import com.fasterxml.jackson.databind.JsonNode;
+
 import de.tum.in.www1.artemis.service.connectors.ConnectorHealth;
 
 @Component

src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabService.java

@@ -27,10 +27,9 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 
+import de.tum.in.www1.artemis.domain.*;
 import de.tum.in.www1.artemis.domain.Commit;
-import de.tum.in.www1.artemis.domain.ProgrammingExercise;
 import de.tum.in.www1.artemis.domain.User;
-import de.tum.in.www1.artemis.domain.VcsRepositoryUrl;
 import de.tum.in.www1.artemis.domain.enumeration.InitializationState;
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation;
 import de.tum.in.www1.artemis.exception.VersionControlException;

src/main/java/de/tum/in/www1/artemis/service/dto/FeedbackConflictResponseDTO.java

@@ -1,6 +1,7 @@
 package de.tum.in.www1.artemis.service.dto;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import de.tum.in.www1.artemis.domain.enumeration.FeedbackConflictType;
 
 /**

src/main/java/de/tum/in/www1/artemis/service/dto/StaticCodeAnalysisReportDTO.java

@@ -5,6 +5,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import de.tum.in.www1.artemis.domain.enumeration.StaticCodeAnalysisTool;
 
 @JsonIgnoreProperties(ignoreUnknown = true)

src/main/java/de/tum/in/www1/artemis/service/feature/FeatureToggleService.java

@@ -7,6 +7,7 @@
 import org.springframework.stereotype.Service;
 
 import com.hazelcast.core.HazelcastInstance;
+
 import de.tum.in.www1.artemis.service.WebsocketMessagingService;
 
 @Service