From 72aa1417f30b9083edabd27ac670ece7a13c231a Mon Sep 17 00:00:00 2001 From: Francesco Date: Fri, 22 Sep 2023 16:55:50 +0200 Subject: [PATCH] WIP --- .../ailef/dbadmin/{ => external}/DbAdmin.java | 16 ++++++------ .../DbAdminAutoConfiguration.java | 8 +++--- .../{ => external}/DbAdminProperties.java | 2 +- .../annotations/ComputedColumn.java | 2 +- .../annotations/DisplayFormat.java | 2 +- .../annotations/DisplayImage.java | 2 +- .../annotations/DisplayName.java | 2 +- .../annotations/Filterable.java | 2 +- .../controller/DefaultDbAdminController.java | 26 +++++++++---------- .../controller/DownloadController.java | 14 +++++----- .../controller/GlobalController.java | 4 +-- .../rest/AutocompleteController.java | 10 +++---- .../rest/DefaultDbAdminRestController.java | 14 +++++----- .../dbmapping/AdvancedJpaRepository.java | 8 +++--- .../dbmapping/DbAdminRepository.java | 12 ++++----- .../{ => external}/dbmapping/DbField.java | 4 +-- .../{ => external}/dbmapping/DbFieldType.java | 6 ++--- .../dbmapping/DbFieldValue.java | 2 +- .../{ => external}/dbmapping/DbObject.java | 8 +++--- .../dbmapping/DbObjectSchema.java | 12 ++++----- .../dto/AutocompleteSearchResult.java | 4 +-- .../{ => external}/dto/CompareOperator.java | 2 +- .../{ => external}/dto/ListModelRequest.java | 1 + .../{ => external}/dto/PaginatedResult.java | 4 +-- .../{ => external}/dto/PaginationInfo.java | 4 +-- .../{ => external}/dto/QueryFilter.java | 2 +- .../exceptions/DbAdminException.java | 2 +- .../exceptions/InvalidPageException.java | 2 +- .../dbadmin/{ => external}/misc/Utils.java | 8 +++--- .../dbadmin/internal/model}/Action.java | 2 +- .../repository}/ActionRepository.java | 3 ++- 31 files changed, 96 insertions(+), 94 deletions(-) rename src/main/java/tech/ailef/dbadmin/{ => external}/DbAdmin.java (95%) rename src/main/java/tech/ailef/dbadmin/{ => external}/DbAdminAutoConfiguration.java (91%) rename src/main/java/tech/ailef/dbadmin/{ => external}/DbAdminProperties.java (97%) rename src/main/java/tech/ailef/dbadmin/{ => external}/annotations/ComputedColumn.java (90%) rename src/main/java/tech/ailef/dbadmin/{ => external}/annotations/DisplayFormat.java (89%) rename src/main/java/tech/ailef/dbadmin/{ => external}/annotations/DisplayImage.java (88%) rename src/main/java/tech/ailef/dbadmin/{ => external}/annotations/DisplayName.java (89%) rename src/main/java/tech/ailef/dbadmin/{ => external}/annotations/Filterable.java (92%) rename src/main/java/tech/ailef/dbadmin/{ => external}/controller/DefaultDbAdminController.java (95%) rename src/main/java/tech/ailef/dbadmin/{ => external}/controller/DownloadController.java (88%) rename src/main/java/tech/ailef/dbadmin/{ => external}/controller/GlobalController.java (91%) rename src/main/java/tech/ailef/dbadmin/{ => external}/controller/rest/AutocompleteController.java (80%) rename src/main/java/tech/ailef/dbadmin/{ => external}/controller/rest/DefaultDbAdminRestController.java (89%) rename src/main/java/tech/ailef/dbadmin/{ => external}/dbmapping/AdvancedJpaRepository.java (96%) rename src/main/java/tech/ailef/dbadmin/{ => external}/dbmapping/DbAdminRepository.java (95%) rename src/main/java/tech/ailef/dbadmin/{ => external}/dbmapping/DbField.java (95%) rename src/main/java/tech/ailef/dbadmin/{ => external}/dbmapping/DbFieldType.java (97%) rename src/main/java/tech/ailef/dbadmin/{ => external}/dbmapping/DbFieldValue.java (94%) rename src/main/java/tech/ailef/dbadmin/{ => external}/dbmapping/DbObject.java (96%) rename src/main/java/tech/ailef/dbadmin/{ => external}/dbmapping/DbObjectSchema.java (94%) rename src/main/java/tech/ailef/dbadmin/{ => external}/dto/AutocompleteSearchResult.java (82%) rename src/main/java/tech/ailef/dbadmin/{ => external}/dto/CompareOperator.java (94%) rename src/main/java/tech/ailef/dbadmin/{ => external}/dto/ListModelRequest.java (95%) rename src/main/java/tech/ailef/dbadmin/{ => external}/dto/PaginatedResult.java (82%) rename src/main/java/tech/ailef/dbadmin/{ => external}/dto/PaginationInfo.java (97%) rename src/main/java/tech/ailef/dbadmin/{ => external}/dto/QueryFilter.java (96%) rename src/main/java/tech/ailef/dbadmin/{ => external}/exceptions/DbAdminException.java (85%) rename src/main/java/tech/ailef/dbadmin/{ => external}/exceptions/InvalidPageException.java (90%) rename src/main/java/tech/ailef/dbadmin/{ => external}/misc/Utils.java (93%) rename src/main/java/tech/{repo => ailef/dbadmin/internal/model}/Action.java (93%) rename src/main/java/tech/{repo => ailef/dbadmin/internal/repository}/ActionRepository.java (79%) diff --git a/src/main/java/tech/ailef/dbadmin/DbAdmin.java b/src/main/java/tech/ailef/dbadmin/external/DbAdmin.java similarity index 95% rename from src/main/java/tech/ailef/dbadmin/DbAdmin.java rename to src/main/java/tech/ailef/dbadmin/external/DbAdmin.java index 78e7f15..d39ea13 100644 --- a/src/main/java/tech/ailef/dbadmin/DbAdmin.java +++ b/src/main/java/tech/ailef/dbadmin/external/DbAdmin.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin; +package tech.ailef.dbadmin.external; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -28,13 +28,13 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.OneToOne; import jakarta.persistence.PersistenceContext; -import tech.ailef.dbadmin.annotations.DisplayFormat; -import tech.ailef.dbadmin.dbmapping.AdvancedJpaRepository; -import tech.ailef.dbadmin.dbmapping.DbField; -import tech.ailef.dbadmin.dbmapping.DbFieldType; -import tech.ailef.dbadmin.dbmapping.DbObjectSchema; -import tech.ailef.dbadmin.exceptions.DbAdminException; -import tech.ailef.dbadmin.misc.Utils; +import tech.ailef.dbadmin.external.annotations.DisplayFormat; +import tech.ailef.dbadmin.external.dbmapping.AdvancedJpaRepository; +import tech.ailef.dbadmin.external.dbmapping.DbField; +import tech.ailef.dbadmin.external.dbmapping.DbFieldType; +import tech.ailef.dbadmin.external.dbmapping.DbObjectSchema; +import tech.ailef.dbadmin.external.exceptions.DbAdminException; +import tech.ailef.dbadmin.external.misc.Utils; /** * The main DbAdmin class responsible for the initialization phase. This class scans diff --git a/src/main/java/tech/ailef/dbadmin/DbAdminAutoConfiguration.java b/src/main/java/tech/ailef/dbadmin/external/DbAdminAutoConfiguration.java similarity index 91% rename from src/main/java/tech/ailef/dbadmin/DbAdminAutoConfiguration.java rename to src/main/java/tech/ailef/dbadmin/external/DbAdminAutoConfiguration.java index 26aa3e5..98ba0f1 100644 --- a/src/main/java/tech/ailef/dbadmin/DbAdminAutoConfiguration.java +++ b/src/main/java/tech/ailef/dbadmin/external/DbAdminAutoConfiguration.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin; +package tech.ailef.dbadmin.external; import java.util.Properties; @@ -21,7 +21,7 @@ import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; import jakarta.persistence.EntityManager; -import tech.repo.Action; +import tech.ailef.dbadmin.internal.model.Action; @ConditionalOnProperty(name = "dbadmin.enabled", matchIfMissing = true) @ComponentScan @@ -30,7 +30,7 @@ import tech.repo.Action; @EnableJpaRepositories( entityManagerFactoryRef = "internalEntityManagerFactory", transactionManagerRef = "internalTransactionManager", - basePackages = { "tech.repo" } + basePackages = { "tech.ailef.dbadmin.internal.repository" } ) @EnableTransactionManagement public class DbAdminAutoConfiguration { @@ -52,7 +52,7 @@ public class DbAdminAutoConfiguration { LocalContainerEntityManagerFactoryBean factoryBean = new LocalContainerEntityManagerFactoryBean(); factoryBean.setDataSource(internalDataSource()); factoryBean.setPersistenceUnitName("internal"); - factoryBean.setPackagesToScan("tech.repo"); // , "tech.ailef.dbadmin.repository"); + factoryBean.setPackagesToScan("tech.ailef.dbadmin.internal.model"); // , "tech.ailef.dbadmin.repository"); factoryBean.setJpaVendorAdapter(new HibernateJpaVendorAdapter()); Properties properties = new Properties(); properties.setProperty("hibernate.dialect", "org.hibernate.dialect.H2Dialect"); diff --git a/src/main/java/tech/ailef/dbadmin/DbAdminProperties.java b/src/main/java/tech/ailef/dbadmin/external/DbAdminProperties.java similarity index 97% rename from src/main/java/tech/ailef/dbadmin/DbAdminProperties.java rename to src/main/java/tech/ailef/dbadmin/external/DbAdminProperties.java index 6ccfe69..eeef629 100644 --- a/src/main/java/tech/ailef/dbadmin/DbAdminProperties.java +++ b/src/main/java/tech/ailef/dbadmin/external/DbAdminProperties.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin; +package tech.ailef.dbadmin.external; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/tech/ailef/dbadmin/annotations/ComputedColumn.java b/src/main/java/tech/ailef/dbadmin/external/annotations/ComputedColumn.java similarity index 90% rename from src/main/java/tech/ailef/dbadmin/annotations/ComputedColumn.java rename to src/main/java/tech/ailef/dbadmin/external/annotations/ComputedColumn.java index 3ddd1d9..5c759da 100644 --- a/src/main/java/tech/ailef/dbadmin/annotations/ComputedColumn.java +++ b/src/main/java/tech/ailef/dbadmin/external/annotations/ComputedColumn.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.annotations; +package tech.ailef.dbadmin.external.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/tech/ailef/dbadmin/annotations/DisplayFormat.java b/src/main/java/tech/ailef/dbadmin/external/annotations/DisplayFormat.java similarity index 89% rename from src/main/java/tech/ailef/dbadmin/annotations/DisplayFormat.java rename to src/main/java/tech/ailef/dbadmin/external/annotations/DisplayFormat.java index 4f5637c..7e7641e 100644 --- a/src/main/java/tech/ailef/dbadmin/annotations/DisplayFormat.java +++ b/src/main/java/tech/ailef/dbadmin/external/annotations/DisplayFormat.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.annotations; +package tech.ailef.dbadmin.external.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/tech/ailef/dbadmin/annotations/DisplayImage.java b/src/main/java/tech/ailef/dbadmin/external/annotations/DisplayImage.java similarity index 88% rename from src/main/java/tech/ailef/dbadmin/annotations/DisplayImage.java rename to src/main/java/tech/ailef/dbadmin/external/annotations/DisplayImage.java index 6daee38..00898dc 100644 --- a/src/main/java/tech/ailef/dbadmin/annotations/DisplayImage.java +++ b/src/main/java/tech/ailef/dbadmin/external/annotations/DisplayImage.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.annotations; +package tech.ailef.dbadmin.external.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/tech/ailef/dbadmin/annotations/DisplayName.java b/src/main/java/tech/ailef/dbadmin/external/annotations/DisplayName.java similarity index 89% rename from src/main/java/tech/ailef/dbadmin/annotations/DisplayName.java rename to src/main/java/tech/ailef/dbadmin/external/annotations/DisplayName.java index 9a6030f..dbe43c1 100644 --- a/src/main/java/tech/ailef/dbadmin/annotations/DisplayName.java +++ b/src/main/java/tech/ailef/dbadmin/external/annotations/DisplayName.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.annotations; +package tech.ailef.dbadmin.external.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/tech/ailef/dbadmin/annotations/Filterable.java b/src/main/java/tech/ailef/dbadmin/external/annotations/Filterable.java similarity index 92% rename from src/main/java/tech/ailef/dbadmin/annotations/Filterable.java rename to src/main/java/tech/ailef/dbadmin/external/annotations/Filterable.java index 1792021..2f40d79 100644 --- a/src/main/java/tech/ailef/dbadmin/annotations/Filterable.java +++ b/src/main/java/tech/ailef/dbadmin/external/annotations/Filterable.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.annotations; +package tech.ailef.dbadmin.external.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/tech/ailef/dbadmin/controller/DefaultDbAdminController.java b/src/main/java/tech/ailef/dbadmin/external/controller/DefaultDbAdminController.java similarity index 95% rename from src/main/java/tech/ailef/dbadmin/controller/DefaultDbAdminController.java rename to src/main/java/tech/ailef/dbadmin/external/controller/DefaultDbAdminController.java index 16c8d2b..fa30a6c 100644 --- a/src/main/java/tech/ailef/dbadmin/controller/DefaultDbAdminController.java +++ b/src/main/java/tech/ailef/dbadmin/external/controller/DefaultDbAdminController.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.controller; +package tech.ailef.dbadmin.external.controller; import java.util.ArrayList; import java.util.HashMap; @@ -32,18 +32,18 @@ import jakarta.persistence.PersistenceContext; import jakarta.persistence.PersistenceUnit; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import tech.ailef.dbadmin.DbAdmin; -import tech.ailef.dbadmin.DbAdminProperties; -import tech.ailef.dbadmin.dbmapping.DbAdminRepository; -import tech.ailef.dbadmin.dbmapping.DbObject; -import tech.ailef.dbadmin.dbmapping.DbObjectSchema; -import tech.ailef.dbadmin.dto.CompareOperator; -import tech.ailef.dbadmin.dto.PaginatedResult; -import tech.ailef.dbadmin.dto.QueryFilter; -import tech.ailef.dbadmin.exceptions.InvalidPageException; -import tech.ailef.dbadmin.misc.Utils; -import tech.repo.Action; -import tech.repo.ActionRepository; +import tech.ailef.dbadmin.external.DbAdmin; +import tech.ailef.dbadmin.external.DbAdminProperties; +import tech.ailef.dbadmin.external.dbmapping.DbAdminRepository; +import tech.ailef.dbadmin.external.dbmapping.DbObject; +import tech.ailef.dbadmin.external.dbmapping.DbObjectSchema; +import tech.ailef.dbadmin.external.dto.CompareOperator; +import tech.ailef.dbadmin.external.dto.PaginatedResult; +import tech.ailef.dbadmin.external.dto.QueryFilter; +import tech.ailef.dbadmin.external.exceptions.InvalidPageException; +import tech.ailef.dbadmin.external.misc.Utils; +import tech.ailef.dbadmin.internal.model.Action; +import tech.ailef.dbadmin.internal.repository.ActionRepository; /** * The main DbAdmin controller that register most of the routes of the web interface. diff --git a/src/main/java/tech/ailef/dbadmin/controller/DownloadController.java b/src/main/java/tech/ailef/dbadmin/external/controller/DownloadController.java similarity index 88% rename from src/main/java/tech/ailef/dbadmin/controller/DownloadController.java rename to src/main/java/tech/ailef/dbadmin/external/controller/DownloadController.java index aef8b27..36c8863 100644 --- a/src/main/java/tech/ailef/dbadmin/controller/DownloadController.java +++ b/src/main/java/tech/ailef/dbadmin/external/controller/DownloadController.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.controller; +package tech.ailef.dbadmin.external.controller; import java.util.Optional; @@ -17,12 +17,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.server.ResponseStatusException; -import tech.ailef.dbadmin.DbAdmin; -import tech.ailef.dbadmin.dbmapping.DbAdminRepository; -import tech.ailef.dbadmin.dbmapping.DbFieldValue; -import tech.ailef.dbadmin.dbmapping.DbObject; -import tech.ailef.dbadmin.dbmapping.DbObjectSchema; -import tech.ailef.dbadmin.exceptions.DbAdminException; +import tech.ailef.dbadmin.external.DbAdmin; +import tech.ailef.dbadmin.external.dbmapping.DbAdminRepository; +import tech.ailef.dbadmin.external.dbmapping.DbFieldValue; +import tech.ailef.dbadmin.external.dbmapping.DbObject; +import tech.ailef.dbadmin.external.dbmapping.DbObjectSchema; +import tech.ailef.dbadmin.external.exceptions.DbAdminException; /** * Controller to serve file or images (`@DisplayImage`) diff --git a/src/main/java/tech/ailef/dbadmin/controller/GlobalController.java b/src/main/java/tech/ailef/dbadmin/external/controller/GlobalController.java similarity index 91% rename from src/main/java/tech/ailef/dbadmin/controller/GlobalController.java rename to src/main/java/tech/ailef/dbadmin/external/controller/GlobalController.java index d90239a..7d8640c 100644 --- a/src/main/java/tech/ailef/dbadmin/controller/GlobalController.java +++ b/src/main/java/tech/ailef/dbadmin/external/controller/GlobalController.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.controller; +package tech.ailef.dbadmin.external.controller; import java.util.Map; @@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ModelAttribute; import jakarta.servlet.http.HttpServletRequest; -import tech.ailef.dbadmin.DbAdminProperties; +import tech.ailef.dbadmin.external.DbAdminProperties; /** * This class registers some ModelAttribute objects that are diff --git a/src/main/java/tech/ailef/dbadmin/controller/rest/AutocompleteController.java b/src/main/java/tech/ailef/dbadmin/external/controller/rest/AutocompleteController.java similarity index 80% rename from src/main/java/tech/ailef/dbadmin/controller/rest/AutocompleteController.java rename to src/main/java/tech/ailef/dbadmin/external/controller/rest/AutocompleteController.java index a1e2f6f..7f42dca 100644 --- a/src/main/java/tech/ailef/dbadmin/controller/rest/AutocompleteController.java +++ b/src/main/java/tech/ailef/dbadmin/external/controller/rest/AutocompleteController.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.controller.rest; +package tech.ailef.dbadmin.external.controller.rest; import java.util.List; import java.util.stream.Collectors; @@ -11,10 +11,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import tech.ailef.dbadmin.DbAdmin; -import tech.ailef.dbadmin.dbmapping.DbAdminRepository; -import tech.ailef.dbadmin.dbmapping.DbObjectSchema; -import tech.ailef.dbadmin.dto.AutocompleteSearchResult; +import tech.ailef.dbadmin.external.DbAdmin; +import tech.ailef.dbadmin.external.dbmapping.DbAdminRepository; +import tech.ailef.dbadmin.external.dbmapping.DbObjectSchema; +import tech.ailef.dbadmin.external.dto.AutocompleteSearchResult; /** * API controller for autocomplete results diff --git a/src/main/java/tech/ailef/dbadmin/controller/rest/DefaultDbAdminRestController.java b/src/main/java/tech/ailef/dbadmin/external/controller/rest/DefaultDbAdminRestController.java similarity index 89% rename from src/main/java/tech/ailef/dbadmin/controller/rest/DefaultDbAdminRestController.java rename to src/main/java/tech/ailef/dbadmin/external/controller/rest/DefaultDbAdminRestController.java index 83410d7..45bc7f2 100644 --- a/src/main/java/tech/ailef/dbadmin/controller/rest/DefaultDbAdminRestController.java +++ b/src/main/java/tech/ailef/dbadmin/external/controller/rest/DefaultDbAdminRestController.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.controller.rest; +package tech.ailef.dbadmin.external.controller.rest; import java.util.HashMap; import java.util.List; @@ -14,12 +14,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import tech.ailef.dbadmin.DbAdmin; -import tech.ailef.dbadmin.DbAdminProperties; -import tech.ailef.dbadmin.dbmapping.DbAdminRepository; -import tech.ailef.dbadmin.dbmapping.DbObjectSchema; -import tech.ailef.dbadmin.dto.PaginatedResult; -import tech.ailef.dbadmin.exceptions.DbAdminException; +import tech.ailef.dbadmin.external.DbAdmin; +import tech.ailef.dbadmin.external.DbAdminProperties; +import tech.ailef.dbadmin.external.dbmapping.DbAdminRepository; +import tech.ailef.dbadmin.external.dbmapping.DbObjectSchema; +import tech.ailef.dbadmin.external.dto.PaginatedResult; +import tech.ailef.dbadmin.external.exceptions.DbAdminException; @RestController @RequestMapping(value = {"/${dbadmin.baseUrl}/api", "/${dbadmin.baseUrl}/api/"}) diff --git a/src/main/java/tech/ailef/dbadmin/dbmapping/AdvancedJpaRepository.java b/src/main/java/tech/ailef/dbadmin/external/dbmapping/AdvancedJpaRepository.java similarity index 96% rename from src/main/java/tech/ailef/dbadmin/dbmapping/AdvancedJpaRepository.java rename to src/main/java/tech/ailef/dbadmin/external/dbmapping/AdvancedJpaRepository.java index 9904b2d..e08efd0 100644 --- a/src/main/java/tech/ailef/dbadmin/dbmapping/AdvancedJpaRepository.java +++ b/src/main/java/tech/ailef/dbadmin/external/dbmapping/AdvancedJpaRepository.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.dbmapping; +package tech.ailef.dbadmin.external.dbmapping; import java.io.IOException; import java.time.LocalDate; @@ -21,9 +21,9 @@ import jakarta.persistence.criteria.CriteriaUpdate; import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; -import tech.ailef.dbadmin.dto.CompareOperator; -import tech.ailef.dbadmin.dto.QueryFilter; -import tech.ailef.dbadmin.exceptions.DbAdminException; +import tech.ailef.dbadmin.external.dto.CompareOperator; +import tech.ailef.dbadmin.external.dto.QueryFilter; +import tech.ailef.dbadmin.external.exceptions.DbAdminException; @SuppressWarnings("rawtypes") public class AdvancedJpaRepository extends SimpleJpaRepository { diff --git a/src/main/java/tech/ailef/dbadmin/dbmapping/DbAdminRepository.java b/src/main/java/tech/ailef/dbadmin/external/dbmapping/DbAdminRepository.java similarity index 95% rename from src/main/java/tech/ailef/dbadmin/dbmapping/DbAdminRepository.java rename to src/main/java/tech/ailef/dbadmin/external/dbmapping/DbAdminRepository.java index d33efea..8126c77 100644 --- a/src/main/java/tech/ailef/dbadmin/dbmapping/DbAdminRepository.java +++ b/src/main/java/tech/ailef/dbadmin/external/dbmapping/DbAdminRepository.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.dbmapping; +package tech.ailef.dbadmin.external.dbmapping; import java.io.IOException; import java.util.ArrayList; @@ -21,11 +21,11 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import tech.ailef.dbadmin.dto.PaginatedResult; -import tech.ailef.dbadmin.dto.PaginationInfo; -import tech.ailef.dbadmin.dto.QueryFilter; -import tech.ailef.dbadmin.exceptions.DbAdminException; -import tech.ailef.dbadmin.exceptions.InvalidPageException; +import tech.ailef.dbadmin.external.dto.PaginatedResult; +import tech.ailef.dbadmin.external.dto.PaginationInfo; +import tech.ailef.dbadmin.external.dto.QueryFilter; +import tech.ailef.dbadmin.external.exceptions.DbAdminException; +import tech.ailef.dbadmin.external.exceptions.InvalidPageException; /** * Implements the basic CRUD operations (and some more) diff --git a/src/main/java/tech/ailef/dbadmin/dbmapping/DbField.java b/src/main/java/tech/ailef/dbadmin/external/dbmapping/DbField.java similarity index 95% rename from src/main/java/tech/ailef/dbadmin/dbmapping/DbField.java rename to src/main/java/tech/ailef/dbadmin/external/dbmapping/DbField.java index 752fdf0..60acb03 100644 --- a/src/main/java/tech/ailef/dbadmin/dbmapping/DbField.java +++ b/src/main/java/tech/ailef/dbadmin/external/dbmapping/DbField.java @@ -1,10 +1,10 @@ -package tech.ailef.dbadmin.dbmapping; +package tech.ailef.dbadmin.external.dbmapping; import java.lang.reflect.Field; import com.fasterxml.jackson.annotation.JsonIgnore; -import tech.ailef.dbadmin.annotations.DisplayImage; +import tech.ailef.dbadmin.external.annotations.DisplayImage; public class DbField { protected String dbName; diff --git a/src/main/java/tech/ailef/dbadmin/dbmapping/DbFieldType.java b/src/main/java/tech/ailef/dbadmin/external/dbmapping/DbFieldType.java similarity index 97% rename from src/main/java/tech/ailef/dbadmin/dbmapping/DbFieldType.java rename to src/main/java/tech/ailef/dbadmin/external/dbmapping/DbFieldType.java index 389b5a2..05bb705 100644 --- a/src/main/java/tech/ailef/dbadmin/dbmapping/DbFieldType.java +++ b/src/main/java/tech/ailef/dbadmin/external/dbmapping/DbFieldType.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.dbmapping; +package tech.ailef.dbadmin.external.dbmapping; import java.io.IOException; import java.math.BigDecimal; @@ -11,8 +11,8 @@ import org.springframework.web.multipart.MultipartFile; import jakarta.persistence.ManyToMany; import jakarta.persistence.OneToMany; import jakarta.persistence.OneToOne; -import tech.ailef.dbadmin.dto.CompareOperator; -import tech.ailef.dbadmin.exceptions.DbAdminException; +import tech.ailef.dbadmin.external.dto.CompareOperator; +import tech.ailef.dbadmin.external.exceptions.DbAdminException; public enum DbFieldType { INTEGER { diff --git a/src/main/java/tech/ailef/dbadmin/dbmapping/DbFieldValue.java b/src/main/java/tech/ailef/dbadmin/external/dbmapping/DbFieldValue.java similarity index 94% rename from src/main/java/tech/ailef/dbadmin/dbmapping/DbFieldValue.java rename to src/main/java/tech/ailef/dbadmin/external/dbmapping/DbFieldValue.java index 82d68a9..0dd7918 100644 --- a/src/main/java/tech/ailef/dbadmin/dbmapping/DbFieldValue.java +++ b/src/main/java/tech/ailef/dbadmin/external/dbmapping/DbFieldValue.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.dbmapping; +package tech.ailef.dbadmin.external.dbmapping; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/tech/ailef/dbadmin/dbmapping/DbObject.java b/src/main/java/tech/ailef/dbadmin/external/dbmapping/DbObject.java similarity index 96% rename from src/main/java/tech/ailef/dbadmin/dbmapping/DbObject.java rename to src/main/java/tech/ailef/dbadmin/external/dbmapping/DbObject.java index f4dc026..0da11bc 100644 --- a/src/main/java/tech/ailef/dbadmin/dbmapping/DbObject.java +++ b/src/main/java/tech/ailef/dbadmin/external/dbmapping/DbObject.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.dbmapping; +package tech.ailef.dbadmin.external.dbmapping; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -11,9 +11,9 @@ import jakarta.persistence.ManyToMany; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.OneToOne; -import tech.ailef.dbadmin.annotations.DisplayName; -import tech.ailef.dbadmin.exceptions.DbAdminException; -import tech.ailef.dbadmin.misc.Utils; +import tech.ailef.dbadmin.external.annotations.DisplayName; +import tech.ailef.dbadmin.external.exceptions.DbAdminException; +import tech.ailef.dbadmin.external.misc.Utils; public class DbObject { private Object instance; diff --git a/src/main/java/tech/ailef/dbadmin/dbmapping/DbObjectSchema.java b/src/main/java/tech/ailef/dbadmin/external/dbmapping/DbObjectSchema.java similarity index 94% rename from src/main/java/tech/ailef/dbadmin/dbmapping/DbObjectSchema.java rename to src/main/java/tech/ailef/dbadmin/external/dbmapping/DbObjectSchema.java index 0578909..89b2c7e 100644 --- a/src/main/java/tech/ailef/dbadmin/dbmapping/DbObjectSchema.java +++ b/src/main/java/tech/ailef/dbadmin/external/dbmapping/DbObjectSchema.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.dbmapping; +package tech.ailef.dbadmin.external.dbmapping; import java.lang.reflect.Method; import java.util.ArrayList; @@ -16,11 +16,11 @@ import jakarta.persistence.ManyToMany; import jakarta.persistence.OneToMany; import jakarta.persistence.OneToOne; import jakarta.persistence.Table; -import tech.ailef.dbadmin.DbAdmin; -import tech.ailef.dbadmin.annotations.ComputedColumn; -import tech.ailef.dbadmin.annotations.Filterable; -import tech.ailef.dbadmin.exceptions.DbAdminException; -import tech.ailef.dbadmin.misc.Utils; +import tech.ailef.dbadmin.external.DbAdmin; +import tech.ailef.dbadmin.external.annotations.ComputedColumn; +import tech.ailef.dbadmin.external.annotations.Filterable; +import tech.ailef.dbadmin.external.exceptions.DbAdminException; +import tech.ailef.dbadmin.external.misc.Utils; public class DbObjectSchema { /** diff --git a/src/main/java/tech/ailef/dbadmin/dto/AutocompleteSearchResult.java b/src/main/java/tech/ailef/dbadmin/external/dto/AutocompleteSearchResult.java similarity index 82% rename from src/main/java/tech/ailef/dbadmin/dto/AutocompleteSearchResult.java rename to src/main/java/tech/ailef/dbadmin/external/dto/AutocompleteSearchResult.java index 0cf2f55..a714bd0 100644 --- a/src/main/java/tech/ailef/dbadmin/dto/AutocompleteSearchResult.java +++ b/src/main/java/tech/ailef/dbadmin/external/dto/AutocompleteSearchResult.java @@ -1,6 +1,6 @@ -package tech.ailef.dbadmin.dto; +package tech.ailef.dbadmin.external.dto; -import tech.ailef.dbadmin.dbmapping.DbObject; +import tech.ailef.dbadmin.external.dbmapping.DbObject; public class AutocompleteSearchResult { private Object id; diff --git a/src/main/java/tech/ailef/dbadmin/dto/CompareOperator.java b/src/main/java/tech/ailef/dbadmin/external/dto/CompareOperator.java similarity index 94% rename from src/main/java/tech/ailef/dbadmin/dto/CompareOperator.java rename to src/main/java/tech/ailef/dbadmin/external/dto/CompareOperator.java index 6f850e7..fbeb373 100644 --- a/src/main/java/tech/ailef/dbadmin/dto/CompareOperator.java +++ b/src/main/java/tech/ailef/dbadmin/external/dto/CompareOperator.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.dto; +package tech.ailef.dbadmin.external.dto; public enum CompareOperator { GT { diff --git a/src/main/java/tech/ailef/dbadmin/dto/ListModelRequest.java b/src/main/java/tech/ailef/dbadmin/external/dto/ListModelRequest.java similarity index 95% rename from src/main/java/tech/ailef/dbadmin/dto/ListModelRequest.java rename to src/main/java/tech/ailef/dbadmin/external/dto/ListModelRequest.java index 7e9e82e..4fb3463 100644 --- a/src/main/java/tech/ailef/dbadmin/dto/ListModelRequest.java +++ b/src/main/java/tech/ailef/dbadmin/external/dto/ListModelRequest.java @@ -1,3 +1,4 @@ +package tech.ailef.dbadmin.external.dto; //package tech.ailef.dbadmin.dto; // //import java.util.Set; diff --git a/src/main/java/tech/ailef/dbadmin/dto/PaginatedResult.java b/src/main/java/tech/ailef/dbadmin/external/dto/PaginatedResult.java similarity index 82% rename from src/main/java/tech/ailef/dbadmin/dto/PaginatedResult.java rename to src/main/java/tech/ailef/dbadmin/external/dto/PaginatedResult.java index 9e2085c..8f2def9 100644 --- a/src/main/java/tech/ailef/dbadmin/dto/PaginatedResult.java +++ b/src/main/java/tech/ailef/dbadmin/external/dto/PaginatedResult.java @@ -1,8 +1,8 @@ -package tech.ailef.dbadmin.dto; +package tech.ailef.dbadmin.external.dto; import java.util.List; -import tech.ailef.dbadmin.dbmapping.DbObject; +import tech.ailef.dbadmin.external.dbmapping.DbObject; public class PaginatedResult { private PaginationInfo pagination; diff --git a/src/main/java/tech/ailef/dbadmin/dto/PaginationInfo.java b/src/main/java/tech/ailef/dbadmin/external/dto/PaginationInfo.java similarity index 97% rename from src/main/java/tech/ailef/dbadmin/dto/PaginationInfo.java rename to src/main/java/tech/ailef/dbadmin/external/dto/PaginationInfo.java index 11cc31a..4d0dcb8 100644 --- a/src/main/java/tech/ailef/dbadmin/dto/PaginationInfo.java +++ b/src/main/java/tech/ailef/dbadmin/external/dto/PaginationInfo.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.dto; +package tech.ailef.dbadmin.external.dto; import java.util.ArrayList; import java.util.List; @@ -8,7 +8,7 @@ import java.util.stream.IntStream; import org.springframework.util.MultiValueMap; -import tech.ailef.dbadmin.misc.Utils; +import tech.ailef.dbadmin.external.misc.Utils; /** * Attached as output to requests that have a paginated response, diff --git a/src/main/java/tech/ailef/dbadmin/dto/QueryFilter.java b/src/main/java/tech/ailef/dbadmin/external/dto/QueryFilter.java similarity index 96% rename from src/main/java/tech/ailef/dbadmin/dto/QueryFilter.java rename to src/main/java/tech/ailef/dbadmin/external/dto/QueryFilter.java index 2d52b3c..63a77e9 100644 --- a/src/main/java/tech/ailef/dbadmin/dto/QueryFilter.java +++ b/src/main/java/tech/ailef/dbadmin/external/dto/QueryFilter.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.dto; +package tech.ailef.dbadmin.external.dto; import java.util.Objects; diff --git a/src/main/java/tech/ailef/dbadmin/exceptions/DbAdminException.java b/src/main/java/tech/ailef/dbadmin/external/exceptions/DbAdminException.java similarity index 85% rename from src/main/java/tech/ailef/dbadmin/exceptions/DbAdminException.java rename to src/main/java/tech/ailef/dbadmin/external/exceptions/DbAdminException.java index 08c52b1..4c97285 100644 --- a/src/main/java/tech/ailef/dbadmin/exceptions/DbAdminException.java +++ b/src/main/java/tech/ailef/dbadmin/external/exceptions/DbAdminException.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.exceptions; +package tech.ailef.dbadmin.external.exceptions; public class DbAdminException extends RuntimeException { private static final long serialVersionUID = 8120227031645804467L; diff --git a/src/main/java/tech/ailef/dbadmin/exceptions/InvalidPageException.java b/src/main/java/tech/ailef/dbadmin/external/exceptions/InvalidPageException.java similarity index 90% rename from src/main/java/tech/ailef/dbadmin/exceptions/InvalidPageException.java rename to src/main/java/tech/ailef/dbadmin/external/exceptions/InvalidPageException.java index c71f367..325efc8 100644 --- a/src/main/java/tech/ailef/dbadmin/exceptions/InvalidPageException.java +++ b/src/main/java/tech/ailef/dbadmin/external/exceptions/InvalidPageException.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.exceptions; +package tech.ailef.dbadmin.external.exceptions; /** * Thrown during the computation of pagination if the requested diff --git a/src/main/java/tech/ailef/dbadmin/misc/Utils.java b/src/main/java/tech/ailef/dbadmin/external/misc/Utils.java similarity index 93% rename from src/main/java/tech/ailef/dbadmin/misc/Utils.java rename to src/main/java/tech/ailef/dbadmin/external/misc/Utils.java index 06f3632..93a2357 100644 --- a/src/main/java/tech/ailef/dbadmin/misc/Utils.java +++ b/src/main/java/tech/ailef/dbadmin/external/misc/Utils.java @@ -1,4 +1,4 @@ -package tech.ailef.dbadmin.misc; +package tech.ailef.dbadmin.external.misc; import java.util.ArrayList; import java.util.HashSet; @@ -8,9 +8,9 @@ import java.util.Set; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import tech.ailef.dbadmin.dto.CompareOperator; -import tech.ailef.dbadmin.dto.QueryFilter; -import tech.ailef.dbadmin.exceptions.DbAdminException; +import tech.ailef.dbadmin.external.dto.CompareOperator; +import tech.ailef.dbadmin.external.dto.QueryFilter; +import tech.ailef.dbadmin.external.exceptions.DbAdminException; public interface Utils { public static String camelToSnake(String v) { diff --git a/src/main/java/tech/repo/Action.java b/src/main/java/tech/ailef/dbadmin/internal/model/Action.java similarity index 93% rename from src/main/java/tech/repo/Action.java rename to src/main/java/tech/ailef/dbadmin/internal/model/Action.java index 288b9d6..ddc4494 100644 --- a/src/main/java/tech/repo/Action.java +++ b/src/main/java/tech/ailef/dbadmin/internal/model/Action.java @@ -1,4 +1,4 @@ -package tech.repo; +package tech.ailef.dbadmin.internal.model; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/tech/repo/ActionRepository.java b/src/main/java/tech/ailef/dbadmin/internal/repository/ActionRepository.java similarity index 79% rename from src/main/java/tech/repo/ActionRepository.java rename to src/main/java/tech/ailef/dbadmin/internal/repository/ActionRepository.java index 287ba81..fa9d71f 100644 --- a/src/main/java/tech/repo/ActionRepository.java +++ b/src/main/java/tech/ailef/dbadmin/internal/repository/ActionRepository.java @@ -1,4 +1,4 @@ -package tech.repo; +package tech.ailef.dbadmin.internal.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.support.SimpleJpaRepository; @@ -6,6 +6,7 @@ import org.springframework.stereotype.Component; import org.springframework.stereotype.Repository; import jakarta.persistence.EntityManager; +import tech.ailef.dbadmin.internal.model.Action; @Repository public interface ActionRepository extends JpaRepository {