Merge pull request #728 from marcjansen/optimize-imports

Optimize imports

shogun-boot/src/main/java/de/terrestris/shogun/boot/config/ApplicationConfig.java

@@ -24,7 +24,6 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 

shogun-boot/src/main/java/de/terrestris/shogun/boot/controller/ResourceController.java

@@ -22,7 +22,6 @@
 import org.springframework.boot.info.BuildProperties;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 
 @Controller

shogun-boot/src/test/java/de/terrestris/shogun/boot/architecture/DependencyRulesTest.java

@@ -16,7 +16,6 @@
  */
 package de.terrestris.shogun.boot.architecture;
 
-import com.tngtech.archunit.base.DescribedPredicate;
 import com.tngtech.archunit.core.importer.ImportOption;
 import com.tngtech.archunit.junit.AnalyzeClasses;
 import com.tngtech.archunit.junit.ArchTest;
@@ -31,7 +30,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RestController;
 
-import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.*;
+import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;
 
 @AnalyzeClasses(packages = "de.terrestris", importOptions = { ImportOption.DoNotIncludeTests.class })
 public class DependencyRulesTest {

shogun-boot/src/test/java/de/terrestris/shogun/boot/controller/ApplicationControllerTest.java

@@ -18,7 +18,6 @@
 
 import de.terrestris.shogun.lib.controller.ApplicationController;
 import de.terrestris.shogun.lib.model.Application;
-import de.terrestris.shogun.lib.model.Group;
 import de.terrestris.shogun.lib.repository.ApplicationRepository;
 
 import java.util.ArrayList;

shogun-boot/src/test/java/de/terrestris/shogun/boot/flyway/FlywayMigrationsTest.java

@@ -16,14 +16,12 @@
  */
 package de.terrestris.shogun.boot.flyway;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.matchesPattern;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.matchesPattern;
 
 public class FlywayMigrationsTest {
 

shogun-config/src/main/java/de/terrestris/shogun/properties/FileUploadProperties.java

@@ -18,9 +18,7 @@
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
 

shogun-gs-interceptor/src/main/java/de/terrestris/shogun/interceptor/controller/GeoServerInterceptorController.java

@@ -26,7 +26,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;

shogun-lib/src/main/java/de/terrestris/shogun/lib/config/MethodSecurityConfig.java

@@ -18,7 +18,6 @@
 
 import de.terrestris.shogun.lib.security.access.BasePermissionEvaluator;
 import de.terrestris.shogun.lib.security.access.entity.BaseEntityPermissionEvaluator;
-import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Configuration;
@@ -27,6 +26,8 @@
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.method.configuration.GlobalMethodSecurityConfiguration;
 
+import java.util.List;
+
 @Configuration
 @EnableGlobalMethodSecurity(prePostEnabled = true)
 public class MethodSecurityConfig extends GlobalMethodSecurityConfiguration {

shogun-lib/src/main/java/de/terrestris/shogun/lib/controller/BaseController.java

@@ -19,12 +19,10 @@
 import com.github.fge.jsonpatch.mergepatch.JsonMergePatch;
 import de.terrestris.shogun.lib.controller.security.permission.BasePermissionController;
 import de.terrestris.shogun.lib.model.BaseEntity;
-import de.terrestris.shogun.lib.model.User;
 import de.terrestris.shogun.lib.service.BaseService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -45,9 +43,7 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
-import java.lang.reflect.ParameterizedType;
 import java.time.OffsetDateTime;
-import java.util.List;
 import java.util.Optional;
 
 // TODO Specify and type extension of BaseService

shogun-lib/src/main/java/de/terrestris/shogun/lib/controller/BaseFileController.java

@@ -35,7 +35,6 @@
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.server.ResponseStatusException;
 
-import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 

shogun-lib/src/main/java/de/terrestris/shogun/lib/dto/PermissionCollectionTypeDto.java

@@ -22,11 +22,6 @@
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

shogun-lib/src/main/java/de/terrestris/shogun/lib/exception/security/permission/EntityAccessDeniedException.java

@@ -18,13 +18,14 @@
 
 package de.terrestris.shogun.lib.exception.security.permission;
 
-import java.io.Serializable;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.server.ResponseStatusException;
 
+import java.io.Serializable;
+
 @Log4j2
 public final class EntityAccessDeniedException extends ResponseStatusException {
 

shogun-lib/src/main/java/de/terrestris/shogun/lib/exception/security/permission/EntityNotFoundException.java

@@ -18,13 +18,14 @@
 
 package de.terrestris.shogun.lib.exception.security.permission;
 
-import java.io.Serializable;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.server.ResponseStatusException;
 
+import java.io.Serializable;
+
 @Log4j2
 public final class EntityNotFoundException extends ResponseStatusException {
 

shogun-lib/src/main/java/de/terrestris/shogun/lib/exception/security/permission/EntityPermissionNotFoundException.java

@@ -18,13 +18,14 @@
 
 package de.terrestris.shogun.lib.exception.security.permission;
 
-import java.io.Serializable;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.server.ResponseStatusException;
 
+import java.io.Serializable;
+
 @Log4j2
 public final class EntityPermissionNotFoundException extends ResponseStatusException {
 

shogun-lib/src/main/java/de/terrestris/shogun/lib/exception/security/permission/UserNotFoundException.java

@@ -18,7 +18,6 @@
 
 package de.terrestris.shogun.lib.exception.security.permission;
 
-import java.io.Serializable;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;

shogun-lib/src/main/java/de/terrestris/shogun/lib/graphql/dto/MutateGroup.java

@@ -22,7 +22,6 @@
 import lombok.Setter;
 
 import java.io.Serializable;
-import java.util.HashMap;
 
 @Getter
 @Setter

shogun-lib/src/main/java/de/terrestris/shogun/lib/graphql/scalar/DateTimeScalar.java

@@ -19,25 +19,20 @@
 import graphql.Internal;
 import graphql.language.StringValue;
 import graphql.language.Value;
-import graphql.schema.Coercing;
-import graphql.schema.CoercingParseLiteralException;
-import graphql.schema.CoercingParseValueException;
-import graphql.schema.CoercingSerializeException;
-import graphql.schema.GraphQLScalarType;
+import graphql.schema.*;
 
-import java.time.*;
+import java.time.DateTimeException;
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.format.DateTimeParseException;
 import java.util.function.Function;
 
 import static graphql.scalars.util.Kit.typeName;
 import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE;
-import static java.time.temporal.ChronoField.HOUR_OF_DAY;
-import static java.time.temporal.ChronoField.MINUTE_OF_HOUR;
-import static java.time.temporal.ChronoField.NANO_OF_SECOND;
-import static java.time.temporal.ChronoField.OFFSET_SECONDS;
-import static java.time.temporal.ChronoField.SECOND_OF_MINUTE;
+import static java.time.temporal.ChronoField.*;
 
 /**
  * Access this via {@link graphql.scalars.ExtendedScalars#DateTime}

shogun-lib/src/main/java/de/terrestris/shogun/lib/model/security/permission/BasePermission.java

@@ -27,7 +27,6 @@
 import javax.persistence.FetchType;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.OneToOne;
-
 import java.util.Objects;
 
 import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED;

shogun-lib/src/main/java/de/terrestris/shogun/lib/repository/ApplicationRepository.java

@@ -17,12 +17,13 @@
 package de.terrestris.shogun.lib.repository;
 
 import de.terrestris.shogun.lib.model.Application;
-import java.util.Optional;
-import javax.persistence.QueryHint;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.QueryHints;
 import org.springframework.stereotype.Repository;
 
+import javax.persistence.QueryHint;
+import java.util.Optional;
+
 @Repository
 public interface ApplicationRepository extends BaseCrudRepository<Application, Long>, JpaSpecificationExecutor<Application> {
 

shogun-lib/src/main/java/de/terrestris/shogun/lib/repository/BaseFileRepository.java

@@ -16,12 +16,13 @@
  */
 package de.terrestris.shogun.lib.repository;
 
-import java.util.Optional;
-import java.util.UUID;
-import javax.persistence.QueryHint;
 import org.springframework.data.jpa.repository.QueryHints;
 import org.springframework.data.repository.NoRepositoryBean;
 
+import javax.persistence.QueryHint;
+import java.util.Optional;
+import java.util.UUID;
+
 @NoRepositoryBean
 public interface BaseFileRepository<T, ID> extends BaseCrudRepository<T, ID> {
 

shogun-lib/src/main/java/de/terrestris/shogun/lib/repository/security/permission/GroupClassPermissionRepository.java

@@ -18,14 +18,15 @@
 
 import de.terrestris.shogun.lib.model.Group;
 import de.terrestris.shogun.lib.model.security.permission.GroupClassPermission;
-import java.util.List;
-import java.util.Optional;
-import javax.persistence.QueryHint;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.jpa.repository.QueryHints;
 import org.springframework.stereotype.Repository;
 
+import javax.persistence.QueryHint;
+import java.util.List;
+import java.util.Optional;
+
 @Repository
 public interface GroupClassPermissionRepository extends BasePermissionRepository<GroupClassPermission, Long>,
     JpaSpecificationExecutor<GroupClassPermission> {

shogun-lib/src/main/java/de/terrestris/shogun/lib/repository/security/permission/GroupInstancePermissionRepository.java

@@ -18,14 +18,15 @@
 
 import de.terrestris.shogun.lib.model.Group;
 import de.terrestris.shogun.lib.model.security.permission.GroupInstancePermission;
-import java.util.List;
-import java.util.Optional;
-import javax.persistence.QueryHint;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.jpa.repository.QueryHints;
 import org.springframework.stereotype.Repository;
 
+import javax.persistence.QueryHint;
+import java.util.List;
+import java.util.Optional;
+
 @Repository
 public interface GroupInstancePermissionRepository extends BasePermissionRepository<GroupInstancePermission, Long>,
     JpaSpecificationExecutor<GroupInstancePermission> {

shogun-lib/src/main/java/de/terrestris/shogun/lib/repository/security/permission/PermissionCollectionRepository.java

@@ -18,12 +18,13 @@
 
 import de.terrestris.shogun.lib.enumeration.PermissionCollectionType;
 import de.terrestris.shogun.lib.model.security.permission.PermissionCollection;
-import java.util.Optional;
-import javax.persistence.QueryHint;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.QueryHints;
 import org.springframework.stereotype.Repository;
 
+import javax.persistence.QueryHint;
+import java.util.Optional;
+
 @Repository
 public interface PermissionCollectionRepository extends BasePermissionRepository<PermissionCollection, Long>,
     JpaSpecificationExecutor<PermissionCollection> {

shogun-lib/src/main/java/de/terrestris/shogun/lib/security/access/entity/BaseEntityPermissionEvaluator.java

@@ -25,20 +25,17 @@
 import de.terrestris.shogun.lib.model.security.permission.PermissionCollection;
 import de.terrestris.shogun.lib.model.security.permission.UserClassPermission;
 import de.terrestris.shogun.lib.repository.BaseCrudRepository;
-import de.terrestris.shogun.lib.service.BaseService;
 import de.terrestris.shogun.lib.service.security.permission.GroupClassPermissionService;
 import de.terrestris.shogun.lib.service.security.permission.GroupInstancePermissionService;
 import de.terrestris.shogun.lib.service.security.permission.UserClassPermissionService;
 import de.terrestris.shogun.lib.service.security.permission.UserInstancePermissionService;
 import de.terrestris.shogun.lib.service.security.provider.GroupProviderService;
-import de.terrestris.shogun.lib.service.security.provider.UserProviderService;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 import org.keycloak.representations.idm.GroupRepresentation;
 import org.keycloak.representations.idm.UserRepresentation;
 import org.springframework.aop.framework.AopProxyUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.core.GenericTypeResolver;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

shogun-lib/src/main/java/de/terrestris/shogun/lib/service/ApplicationService.java

@@ -16,8 +16,8 @@
  */
 package de.terrestris.shogun.lib.service;
 
-import de.terrestris.shogun.lib.repository.ApplicationRepository;
 import de.terrestris.shogun.lib.model.Application;
+import de.terrestris.shogun.lib.repository.ApplicationRepository;
 import org.springframework.stereotype.Service;
 
 @Service