fix: optimize imports

terrestris · Sep 2, 2023 · 6351b66 · 6351b66
1 parent 2642672
commit 6351b66
Show file tree

Hide file tree

Showing 33 changed files with 42 additions and 64 deletions.
diff --git a/shogun-config/src/main/java/de/terrestris/shogun/config/DefaultWebSecurityConfig.java b/shogun-config/src/main/java/de/terrestris/shogun/config/DefaultWebSecurityConfig.java
@@ -19,7 +19,6 @@
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
-import org.springframework.security.web.csrf.CsrfTokenRequestAttributeHandler;
 
 public interface DefaultWebSecurityConfig extends WebSecurityConfig {
 

diff --git a/...main/java/de/terrestris/shogun/interceptor/controller/GeoServerInterceptorController.java b/...main/java/de/terrestris/shogun/interceptor/controller/GeoServerInterceptorController.java
@@ -19,6 +19,7 @@
 import de.terrestris.shogun.interceptor.exception.InterceptorException;
 import de.terrestris.shogun.interceptor.service.GeoServerInterceptorService;
 import de.terrestris.shogun.lib.dto.HttpResponse;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.log4j.Log4j2;
 import org.apache.hc.core5.http.HttpException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +32,6 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ResponseStatusException;
 
-import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Optional;

diff --git a/shogun-gs-interceptor/src/main/java/de/terrestris/shogun/interceptor/message/OgcMessage.java b/shogun-gs-interceptor/src/main/java/de/terrestris/shogun/interceptor/message/OgcMessage.java
@@ -18,13 +18,12 @@
 
 import de.terrestris.shogun.interceptor.enumeration.InterceptorEnum;
 import de.terrestris.shogun.interceptor.enumeration.OgcEnum;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-
 public class OgcMessage {
 
     /**

diff --git a/...-gs-interceptor/src/main/java/de/terrestris/shogun/interceptor/model/InterceptorRule.java b/...-gs-interceptor/src/main/java/de/terrestris/shogun/interceptor/model/InterceptorRule.java
@@ -20,12 +20,12 @@
 import de.terrestris.shogun.interceptor.enumeration.InterceptorEnum;
 import de.terrestris.shogun.interceptor.enumeration.OgcEnum;
 import de.terrestris.shogun.lib.model.BaseEntity;
+import jakarta.persistence.*;
 import lombok.*;
 import org.hibernate.Hibernate;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
-import jakarta.persistence.*;
 import java.util.Objects;
 
 @Entity

diff --git a/.../src/main/java/de/terrestris/shogun/interceptor/repository/InterceptorRuleRepository.java b/.../src/main/java/de/terrestris/shogun/interceptor/repository/InterceptorRuleRepository.java
@@ -21,12 +21,12 @@
 import de.terrestris.shogun.interceptor.enumeration.OgcEnum;
 import de.terrestris.shogun.interceptor.model.InterceptorRule;
 import de.terrestris.shogun.lib.repository.BaseCrudRepository;
+import jakarta.persistence.QueryHint;
 import org.hibernate.jpa.AvailableHints;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.QueryHints;
 import org.springframework.stereotype.Repository;
 
-import jakarta.persistence.QueryHint;
 import java.util.List;
 import java.util.Optional;
 

diff --git a/...r/src/main/java/de/terrestris/shogun/interceptor/service/GeoServerInterceptorService.java b/...r/src/main/java/de/terrestris/shogun/interceptor/service/GeoServerInterceptorService.java
@@ -28,6 +28,7 @@
 import de.terrestris.shogun.interceptor.util.OgcXmlUtil;
 import de.terrestris.shogun.lib.dto.HttpResponse;
 import de.terrestris.shogun.lib.util.HttpUtil;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hc.core5.http.ContentType;
@@ -41,7 +42,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
 
-import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;

diff --git a/...ptor/src/main/java/de/terrestris/shogun/interceptor/servlet/CachedServletInputStream.java b/...ptor/src/main/java/de/terrestris/shogun/interceptor/servlet/CachedServletInputStream.java
@@ -18,6 +18,7 @@
 
 import jakarta.servlet.ReadListener;
 import jakarta.servlet.ServletInputStream;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 

diff --git a/...tor/src/main/java/de/terrestris/shogun/interceptor/servlet/MutableHttpServletRequest.java b/...tor/src/main/java/de/terrestris/shogun/interceptor/servlet/MutableHttpServletRequest.java
@@ -19,14 +19,14 @@
 import de.terrestris.shogun.interceptor.enumeration.OgcEnum;
 import de.terrestris.shogun.interceptor.exception.InterceptorException;
 import de.terrestris.shogun.interceptor.util.OgcXmlUtil;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.w3c.dom.Document;
 
-import jakarta.servlet.ServletInputStream;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletRequestWrapper;
 import java.io.*;
 import java.net.URI;
 import java.util.Arrays;

diff --git a/shogun-gs-interceptor/src/main/java/de/terrestris/shogun/interceptor/util/OgcXmlUtil.java b/shogun-gs-interceptor/src/main/java/de/terrestris/shogun/interceptor/util/OgcXmlUtil.java
@@ -18,6 +18,8 @@
 
 import de.terrestris.shogun.interceptor.exception.InterceptorException;
 import de.terrestris.shogun.interceptor.servlet.MutableHttpServletRequest;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.StreamUtils;
@@ -27,8 +29,6 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import jakarta.servlet.ServletInputStream;
-import jakarta.servlet.http.HttpServletRequest;
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;

diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/config/AuditConfig.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/config/AuditConfig.java
@@ -16,13 +16,12 @@
  */
 package de.terrestris.shogun.lib.config;
 
+import jakarta.persistence.EntityManagerFactory;
 import org.hibernate.envers.AuditReader;
 import org.hibernate.envers.AuditReaderFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import jakarta.persistence.EntityManagerFactory;
-
 @Configuration
 public class AuditConfig {
 

diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/config/JacksonConfig.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/config/JacksonConfig.java
@@ -24,6 +24,7 @@
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import de.terrestris.shogun.lib.annotation.JsonSuperType;
 import io.hypersistence.utils.hibernate.type.util.ObjectMapperSupplier;
+import jakarta.annotation.PostConstruct;
 import lombok.extern.log4j.Log4j2;
 import org.locationtech.jts.geom.GeometryFactory;
 import org.locationtech.jts.geom.PrecisionModel;
@@ -35,7 +36,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import jakarta.annotation.PostConstruct;
 import java.util.HashMap;
 import java.util.Map;
 

diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/dto/PermissionCollectionTypeDto.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/dto/PermissionCollectionTypeDto.java
@@ -22,11 +22,6 @@
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
-import jakarta.validation.constraints.AssertTrue;
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/dto/RegisterUserDto.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/dto/RegisterUserDto.java
@@ -16,15 +16,14 @@
  */
 package de.terrestris.shogun.lib.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-
 import jakarta.validation.constraints.AssertTrue;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @Data
 @AllArgsConstructor

diff --git a/.../main/java/de/terrestris/shogun/lib/envers/ShogunEnversRevisionRepositoryFactoryBean.java b/.../main/java/de/terrestris/shogun/lib/envers/ShogunEnversRevisionRepositoryFactoryBean.java
@@ -17,6 +17,7 @@
 package de.terrestris.shogun.lib.envers;
 
 import de.terrestris.shogun.lib.repository.impl.ShogunRevisionRepositoryImpl;
+import jakarta.persistence.EntityManager;
 import org.hibernate.envers.DefaultRevisionEntity;
 import org.springframework.data.envers.repository.support.EnversRevisionRepositoryFactoryBean;
 import org.springframework.data.envers.repository.support.ReflectionRevisionEntityInformation;
@@ -27,7 +28,6 @@
 import org.springframework.data.repository.history.RevisionRepository;
 import org.springframework.data.repository.history.support.RevisionEntityInformation;
 
-import jakarta.persistence.EntityManager;
 import java.util.Optional;
 
 public class ShogunEnversRevisionRepositoryFactoryBean<T extends RevisionRepository<S, ID, N>, S, ID, N extends Number & Comparable<N>>

diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/Application.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/Application.java
@@ -23,11 +23,12 @@
 import io.hypersistence.utils.hibernate.type.json.JsonBinaryType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
-import jakarta.persistence.Table;
 import lombok.*;
 import org.hibernate.Hibernate;
-import org.hibernate.annotations.*;
 import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Type;
 import org.hibernate.envers.AuditTable;
 import org.hibernate.envers.Audited;
 

diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/Layer.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/Layer.java
@@ -22,12 +22,13 @@
 import io.hypersistence.utils.hibernate.type.json.JsonBinaryType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
-import jakarta.persistence.Table;
 import lombok.*;
 import org.geojson.GeoJsonObject;
 import org.hibernate.Hibernate;
-import org.hibernate.annotations.*;
 import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Type;
 import org.hibernate.envers.AuditTable;
 import org.hibernate.envers.Audited;
 

diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/User.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/User.java
@@ -21,11 +21,12 @@
 import io.hypersistence.utils.hibernate.type.json.JsonBinaryType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
-import jakarta.persistence.Table;
 import lombok.*;
 import org.hibernate.Hibernate;
-import org.hibernate.annotations.*;
 import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Type;
 import org.hibernate.envers.AuditTable;
 import org.hibernate.envers.Audited;
 

diff --git a/...rc/main/java/de/terrestris/shogun/lib/model/security/permission/PermissionCollection.java b/...rc/main/java/de/terrestris/shogun/lib/model/security/permission/PermissionCollection.java
@@ -21,14 +21,13 @@
 import de.terrestris.shogun.lib.enumeration.PermissionCollectionType;
 import de.terrestris.shogun.lib.enumeration.PermissionType;
 import de.terrestris.shogun.lib.model.BaseEntity;
+import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.*;
 import org.hibernate.Hibernate;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.*;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import jakarta.persistence.*;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;

diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/repository/ApplicationRepository.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/repository/ApplicationRepository.java
@@ -17,14 +17,12 @@
 package de.terrestris.shogun.lib.repository;
 
 import de.terrestris.shogun.lib.model.Application;
-import java.util.Optional;
 import jakarta.persistence.QueryHint;
 import org.hibernate.jpa.AvailableHints;
 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

diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/repository/BaseFileRepository.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/repository/BaseFileRepository.java
@@ -16,14 +16,11 @@
  */
 package de.terrestris.shogun.lib.repository;
 
-import java.util.Optional;
-import java.util.UUID;
 import jakarta.persistence.QueryHint;
 import org.hibernate.jpa.AvailableHints;
 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;
 

diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/repository/GroupRepository.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/repository/GroupRepository.java
@@ -17,12 +17,12 @@
 package de.terrestris.shogun.lib.repository;
 
 import de.terrestris.shogun.lib.model.Group;
+import jakarta.persistence.QueryHint;
 import org.hibernate.jpa.AvailableHints;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.QueryHints;
 import org.springframework.stereotype.Repository;
 
-import jakarta.persistence.QueryHint;
 import java.util.Optional;
 
 @Repository

diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/repository/UserRepository.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/repository/UserRepository.java
@@ -17,12 +17,12 @@
 package de.terrestris.shogun.lib.repository;
 
 import de.terrestris.shogun.lib.model.User;
+import jakarta.persistence.QueryHint;
 import org.hibernate.jpa.AvailableHints;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.QueryHints;
 import org.springframework.stereotype.Repository;
 
-import jakarta.persistence.QueryHint;
 import java.util.Optional;
 
 @Repository

diff --git a/.../src/main/java/de/terrestris/shogun/lib/repository/impl/ShogunRevisionRepositoryImpl.java b/.../src/main/java/de/terrestris/shogun/lib/repository/impl/ShogunRevisionRepositoryImpl.java
@@ -19,6 +19,7 @@
 import de.terrestris.shogun.lib.envers.ShogunAnnotationRevisionMetadata;
 import de.terrestris.shogun.lib.envers.ShogunRevisionMetadata;
 import de.terrestris.shogun.lib.repository.ShogunRevisionRepository;
+import jakarta.persistence.EntityManager;
 import org.hibernate.envers.*;
 import org.hibernate.envers.query.AuditEntity;
 import org.springframework.data.envers.repository.support.EnversRevisionRepositoryImpl;
@@ -30,7 +31,6 @@
 import org.springframework.data.repository.history.support.RevisionEntityInformation;
 import org.springframework.util.Assert;
 
-import jakarta.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;

diff --git a/.../terrestris/shogun/lib/repository/security/permission/GroupClassPermissionRepository.java b/.../terrestris/shogun/lib/repository/security/permission/GroupClassPermissionRepository.java
@@ -18,16 +18,13 @@
 
 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 jakarta.persistence.QueryHint;
 import org.hibernate.jpa.AvailableHints;
 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;
 

diff --git a/...rrestris/shogun/lib/repository/security/permission/GroupInstancePermissionRepository.java b/...rrestris/shogun/lib/repository/security/permission/GroupInstancePermissionRepository.java
@@ -18,16 +18,13 @@
 
 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 jakarta.persistence.QueryHint;
 import org.hibernate.jpa.AvailableHints;
 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;
 

diff --git a/.../terrestris/shogun/lib/repository/security/permission/PermissionCollectionRepository.java b/.../terrestris/shogun/lib/repository/security/permission/PermissionCollectionRepository.java
@@ -18,14 +18,12 @@
 
 import de.terrestris.shogun.lib.enumeration.PermissionCollectionType;
 import de.terrestris.shogun.lib.model.security.permission.PermissionCollection;
-import java.util.Optional;
 import jakarta.persistence.QueryHint;
 import org.hibernate.jpa.AvailableHints;
 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