From e4ea60fd8594d7a504f9de392ab09b3be6784eec Mon Sep 17 00:00:00 2001 From: dalbodeule <11470513+dalbodeule@users.noreply.github.com> Date: Wed, 14 May 2025 21:24:41 +0900 Subject: [PATCH] Migrate build system from Maven to Gradle Replaced Maven with Gradle by introducing a Gradle build structure, updating dependencies, and configuration files. Additionally, refactored package structure from `tech.ailef` to `space.mori.dalbodeule` for consistency. --- .gitignore | 1 + build.gradle.kts | 72 +++++ gradle.properties | 7 + gradle/libs.versions.toml | 30 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 251 ++++++++++++++++++ gradlew.bat | 94 +++++++ pom.xml | 150 ----------- settings.gradle.kts | 7 + .../snapadmin/external/SnapAdmin.java | 32 +-- .../external/SnapAdminAutoConfiguration.java | 4 +- .../external/SnapAdminMvcConfig.java | 2 +- .../external/SnapAdminProperties.java | 2 +- .../external/StartupAuthCheckRunner.java | 4 +- .../snapadmin/external/ThymeleafUtils.java | 7 + .../external/annotations/ComputedColumn.java | 2 +- .../external/annotations/Disable.java | 2 +- .../external/annotations/DisableCreate.java | 2 +- .../external/annotations/DisableDelete.java | 2 +- .../external/annotations/DisableEdit.java | 2 +- .../external/annotations/DisableExport.java | 2 +- .../external/annotations/DisplayFormat.java | 2 +- .../external/annotations/DisplayImage.java | 2 +- .../external/annotations/DisplayName.java | 2 +- .../external/annotations/Filterable.java | 2 +- .../external/annotations/FilterableType.java | 2 +- .../external/annotations/HiddenColumn.java | 2 +- .../external/annotations/ReadOnly.java | 2 +- .../external/annotations/package-info.java | 2 +- .../controller/DataExportController.java | 60 +++-- .../controller/FileDownloadController.java | 14 +- .../external/controller/GlobalController.java | 15 +- .../controller/SnapAdminController.java | 62 +++-- .../external/controller/package-info.java | 2 +- .../rest/AutocompleteController.java | 10 +- .../controller/rest/package-info.java | 4 + .../dbmapping/CustomJpaRepository.java | 14 +- .../external/dbmapping/DbFieldValue.java | 4 +- .../external/dbmapping/DbObject.java | 10 +- .../external/dbmapping/DbObjectSchema.java | 26 +- .../dbmapping/SnapAdminRepository.java | 26 +- .../dbmapping/fields/BigDecimalFieldType.java | 4 +- .../dbmapping/fields/BigIntegerFieldType.java | 4 +- .../dbmapping/fields/BooleanFieldType.java | 4 +- .../dbmapping/fields/ByteArrayFieldType.java | 6 +- .../dbmapping/fields/ByteFieldType.java | 6 +- .../dbmapping/fields/CharFieldType.java | 4 +- .../dbmapping/fields/ComputedFieldType.java | 6 +- .../dbmapping/fields/DateFieldType.java | 6 +- .../external/dbmapping/fields/DbField.java | 16 +- .../dbmapping/fields/DbFieldType.java | 8 +- .../dbmapping/fields/DoubleFieldType.java | 4 +- .../dbmapping/fields/EnumFieldType.java | 6 +- .../dbmapping/fields/FloatFieldType.java | 4 +- .../dbmapping/fields/InstantFieldType.java | 4 +- .../dbmapping/fields/IntegerFieldType.java | 4 +- .../dbmapping/fields/LocalDateFieldType.java | 4 +- .../fields/LocalDateTimeFieldType.java | 4 +- .../dbmapping/fields/LongFieldType.java | 4 +- .../dbmapping/fields/ManyToManyFieldType.java | 6 +- .../fields/OffsetDateTimeFieldType.java | 4 +- .../dbmapping/fields/OneToManyFieldType.java | 6 +- .../dbmapping/fields/OneToOneFieldType.java | 6 +- .../dbmapping/fields/ShortFieldType.java | 4 +- .../dbmapping/fields/StringFieldType.java | 4 +- .../dbmapping/fields/TextFieldType.java | 4 +- .../dbmapping/fields/UUIDFieldType.java | 4 +- .../external/dbmapping/package-info.java | 2 +- .../dbmapping/query/DbQueryOutputField.java | 14 +- .../dbmapping/query/DbQueryResult.java | 2 +- .../dbmapping/query/DbQueryResultRow.java | 4 +- .../dto/AutocompleteSearchResult.java | 6 +- .../external/dto/CompareOperator.java | 2 +- .../external/dto/DataExportFormat.java | 2 +- .../external/dto/FacetedSearchRequest.java | 2 +- .../snapadmin/external/dto/FilterRequest.java | 2 +- .../external/dto/LogsSearchRequest.java | 2 +- .../snapadmin/external/dto/MappingError.java | 2 +- .../external/dto/PaginatedResult.java | 2 +- .../external/dto/PaginationInfo.java | 4 +- .../snapadmin/external/dto/QueryFilter.java | 6 +- .../dto/ValidationErrorsContainer.java | 2 +- .../snapadmin/external/dto/package-info.java | 2 +- .../exceptions/InvalidPageException.java | 2 +- .../exceptions/SnapAdminException.java | 2 +- .../SnapAdminNotFoundException.java | 2 +- .../UnsupportedFieldTypeException.java | 2 +- .../external/exceptions/package-info.java | 2 +- .../snapadmin/external/misc/Utils.java | 12 +- .../snapadmin/external/misc/package-info.java | 2 +- .../snapadmin/external/package-info.java | 4 +- .../InternalSnapAdminConfiguration.java | 2 +- .../snapadmin/internal/UserConfiguration.java | 8 +- .../internal/model/ConsoleQuery.java | 2 +- .../snapadmin/internal/model/UserAction.java | 2 +- .../snapadmin/internal/model/UserSetting.java | 2 +- .../internal/model/package-info.java | 2 +- .../snapadmin/internal/package-info.java | 4 +- .../repository/ConsoleQueryRepository.java | 4 +- .../repository/CustomActionRepository.java | 6 +- .../CustomActionRepositoryImpl.java | 6 +- .../repository/UserActionRepository.java | 4 +- .../repository/UserSettingsRepository.java | 4 +- .../internal/repository/package-info.java | 2 +- .../internal/service/ConsoleQueryService.java | 6 +- .../internal/service/UserActionService.java | 14 +- .../internal/service/UserSettingsService.java | 6 +- .../internal/service/package-info.java | 2 +- .../controller/rest/package-info.java | 4 - .../templates/snapadmin/model/create.html | 4 +- .../templates/snapadmin/model/list.html | 4 +- .../templates/snapadmin/model/schema.html | 4 +- .../templates/snapadmin/model/show.html | 2 +- .../SpringBootSnapAdminApplicationTests.java | 10 +- 115 files changed, 808 insertions(+), 461 deletions(-) create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat delete mode 100644 pom.xml create mode 100644 settings.gradle.kts rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/SnapAdmin.java (92%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/SnapAdminAutoConfiguration.java (97%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/SnapAdminMvcConfig.java (96%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/SnapAdminProperties.java (98%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/StartupAuthCheckRunner.java (95%) create mode 100644 src/main/java/space/mori/dalbodeule/snapadmin/external/ThymeleafUtils.java rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/annotations/ComputedColumn.java (95%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/annotations/Disable.java (94%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/annotations/DisableCreate.java (94%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/annotations/DisableDelete.java (94%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/annotations/DisableEdit.java (94%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/annotations/DisableExport.java (94%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/annotations/DisplayFormat.java (95%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/annotations/DisplayImage.java (94%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/annotations/DisplayName.java (95%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/annotations/Filterable.java (96%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/annotations/FilterableType.java (96%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/annotations/HiddenColumn.java (96%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/annotations/ReadOnly.java (95%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/annotations/package-info.java (93%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/controller/DataExportController.java (88%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/controller/FileDownloadController.java (90%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/controller/GlobalController.java (87%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/controller/SnapAdminController.java (90%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/controller/package-info.java (93%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/controller/rest/AutocompleteController.java (86%) create mode 100644 src/main/java/space/mori/dalbodeule/snapadmin/external/controller/rest/package-info.java rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/CustomJpaRepository.java (94%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/DbFieldValue.java (95%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/DbObject.java (96%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/DbObjectSchema.java (93%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/SnapAdminRepository.java (91%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/BigDecimalFieldType.java (90%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/BigIntegerFieldType.java (90%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/BooleanFieldType.java (90%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/ByteArrayFieldType.java (87%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/ByteFieldType.java (85%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/CharFieldType.java (90%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/ComputedFieldType.java (85%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/DateFieldType.java (88%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/DbField.java (92%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/DbFieldType.java (94%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/DoubleFieldType.java (90%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/EnumFieldType.java (92%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/FloatFieldType.java (90%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/InstantFieldType.java (91%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/IntegerFieldType.java (90%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/LocalDateFieldType.java (90%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/LocalDateTimeFieldType.java (91%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/LongFieldType.java (90%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/ManyToManyFieldType.java (86%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/OffsetDateTimeFieldType.java (91%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/OneToManyFieldType.java (86%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/OneToOneFieldType.java (86%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/ShortFieldType.java (90%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/StringFieldType.java (90%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/TextFieldType.java (90%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/fields/UUIDFieldType.java (90%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/package-info.java (93%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/query/DbQueryOutputField.java (90%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/query/DbQueryResult.java (95%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dbmapping/query/DbQueryResultRow.java (93%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dto/AutocompleteSearchResult.java (86%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dto/CompareOperator.java (96%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dto/DataExportFormat.java (93%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dto/FacetedSearchRequest.java (97%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dto/FilterRequest.java (96%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dto/LogsSearchRequest.java (98%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dto/MappingError.java (95%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dto/PaginatedResult.java (97%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dto/PaginationInfo.java (97%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dto/QueryFilter.java (92%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dto/ValidationErrorsContainer.java (97%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/dto/package-info.java (94%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/exceptions/InvalidPageException.java (95%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/exceptions/SnapAdminException.java (95%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/exceptions/SnapAdminNotFoundException.java (95%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/exceptions/UnsupportedFieldTypeException.java (94%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/exceptions/package-info.java (93%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/misc/Utils.java (90%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/misc/package-info.java (93%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/external/package-info.java (87%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/internal/InternalSnapAdminConfiguration.java (96%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/internal/UserConfiguration.java (88%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/internal/model/ConsoleQuery.java (97%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/internal/model/UserAction.java (98%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/internal/model/UserSetting.java (96%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/internal/model/package-info.java (94%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/internal/package-info.java (88%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/internal/repository/ConsoleQueryRepository.java (88%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/internal/repository/CustomActionRepository.java (83%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/internal/repository/CustomActionRepositoryImpl.java (96%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/internal/repository/UserActionRepository.java (90%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/internal/repository/UserSettingsRepository.java (88%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/internal/repository/package-info.java (93%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/internal/service/ConsoleQueryService.java (88%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/internal/service/UserActionService.java (81%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/internal/service/UserSettingsService.java (85%) rename src/main/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/internal/service/package-info.java (93%) delete mode 100644 src/main/java/tech/ailef/snapadmin/external/controller/rest/package-info.java rename src/test/java/{tech/ailef => space/mori/dalbodeule}/snapadmin/SpringBootSnapAdminApplicationTests.java (91%) diff --git a/.gitignore b/.gitignore index 4ff2217..e13f34b 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ build/ ### VS Code ### .vscode/ +.env diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..413b166 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,72 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This project uses @Incubating APIs which are subject to change. + */ + +plugins { + `java-library` + `maven-publish` + id("co.uzzu.dotenv.gradle") version "4.0.0" +} + +repositories { + mavenLocal() + maven { + url = uri("https://repo.maven.apache.org/maven2/") + } +} + +publishing { + repositories { + maven { + name = "Gitea" + url = uri( + "https://git.mori.space/api/packages/${env.GITEA_USERNAME.value}/maven" + ) + + credentials(HttpHeaderCredentials::class) { + name = "Authorization" + value = "token ${env.GITEA_TOKEN.value}" + } + + authentication { + create("header") + } + } + } +} + +dependencies { + api(libs.org.apache.poi.poi) + api(libs.org.apache.poi.poi.ooxml) + api(libs.org.apache.tika.tika.core) + api(libs.org.springframework.boot.spring.boot.starter.data.jpa) + api(libs.org.springframework.boot.spring.boot.starter.thymeleaf) + api(libs.org.springframework.boot.spring.boot.starter.jdbc) + api(libs.com.h2database.h2) + api(libs.org.apache.commons.commons.csv) + api(libs.org.springframework.boot.spring.boot.starter.validation) + api(libs.org.springframework.boot.spring.boot.starter.web) + api(libs.org.springframework.boot.spring.boot.configuration.processor) + testImplementation(libs.org.springframework.boot.spring.boot.starter.test) +} + +group = "space.mori.dalbodeule" +version = "0.4.1" +description = "SnapAdmin" +java.sourceCompatibility = JavaVersion.VERSION_17 + +publishing { + publications.create("maven") { + from(components["java"]) + } +} + +tasks.withType() { + options.encoding = "UTF-8" +} + +tasks.withType() { + options.encoding = "UTF-8" +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..5154008 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,7 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties + +org.gradle.configuration-cache=true +org.gradle.parallel=true +org.gradle.caching=true + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..4c5cf57 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,30 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format + +[versions] +com-h2database-h2 = "2.3.232" +org-apache-commons-commons-csv = "1.14.0" +org-apache-poi-poi = "5.4.1" +org-apache-poi-poi-ooxml = "5.4.1" +org-apache-tika-tika-core = "3.1.0" +org-springframework-boot-spring-boot-configuration-processor = "3.4.5" +org-springframework-boot-spring-boot-starter-data-jpa = "3.4.5" +org-springframework-boot-spring-boot-starter-jdbc = "3.4.5" +org-springframework-boot-spring-boot-starter-test = "3.4.5" +org-springframework-boot-spring-boot-starter-thymeleaf = "3.4.5" +org-springframework-boot-spring-boot-starter-validation = "3.4.5" +org-springframework-boot-spring-boot-starter-web = "3.4.5" + +[libraries] +com-h2database-h2 = { module = "com.h2database:h2", version.ref = "com-h2database-h2" } +org-apache-commons-commons-csv = { module = "org.apache.commons:commons-csv", version.ref = "org-apache-commons-commons-csv" } +org-apache-poi-poi = { module = "org.apache.poi:poi", version.ref = "org-apache-poi-poi" } +org-apache-poi-poi-ooxml = { module = "org.apache.poi:poi-ooxml", version.ref = "org-apache-poi-poi-ooxml" } +org-apache-tika-tika-core = { module = "org.apache.tika:tika-core", version.ref = "org-apache-tika-tika-core" } +org-springframework-boot-spring-boot-configuration-processor = { module = "org.springframework.boot:spring-boot-configuration-processor", version.ref = "org-springframework-boot-spring-boot-configuration-processor" } +org-springframework-boot-spring-boot-starter-data-jpa = { module = "org.springframework.boot:spring-boot-starter-data-jpa", version.ref = "org-springframework-boot-spring-boot-starter-data-jpa" } +org-springframework-boot-spring-boot-starter-jdbc = { module = "org.springframework.boot:spring-boot-starter-jdbc", version.ref = "org-springframework-boot-spring-boot-starter-jdbc" } +org-springframework-boot-spring-boot-starter-test = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "org-springframework-boot-spring-boot-starter-test" } +org-springframework-boot-spring-boot-starter-thymeleaf = { module = "org.springframework.boot:spring-boot-starter-thymeleaf", version.ref = "org-springframework-boot-spring-boot-starter-thymeleaf" } +org-springframework-boot-spring-boot-starter-validation = { module = "org.springframework.boot:spring-boot-starter-validation", version.ref = "org-springframework-boot-spring-boot-starter-validation" } +org-springframework-boot-spring-boot-starter-web = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "org-springframework-boot-spring-boot-starter-web" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..1b33c55baabb587c669f562ae36f953de2481846 GIT binary patch literal 43764 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 3ca5499..0000000 --- a/pom.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 3.1.5 - - - tech.ailef - snap-admin - 0.2.2 - SnapAdmin - SnapAdmin is an auto-generated CRUD admin panel for Spring Boot/JPA apps - - 17 - - - - MIT License - https://opensource.org/license/mit - - - - - - release - - - - org.jreleaser - jreleaser-maven-plugin - 1.3.1 - - - - ALWAYS - true - - - - - - ALWAYS - https://s01.oss.sonatype.org/service/local - true - true - target/staging-deploy - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.4.1 - - - attach-javadoc - - jar - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.2.1 - - - - attach-source - - jar - - - - - - - - - - - - org.apache.poi - poi - 5.2.4 - - - - org.apache.poi - poi-ooxml - 5.2.4 - - - - - org.apache.tika - tika-core - 2.9.0 - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-jdbc - - - com.h2database - h2 - - - - org.apache.commons - commons-csv - 1.10.0 - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-configuration-processor - true - - - diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..3b6483c --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,7 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This project uses @Incubating APIs which are subject to change. + */ + +rootProject.name = "snap-admin" diff --git a/src/main/java/tech/ailef/snapadmin/external/SnapAdmin.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/SnapAdmin.java similarity index 92% rename from src/main/java/tech/ailef/snapadmin/external/SnapAdmin.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/SnapAdmin.java index c1fd547..66df475 100644 --- a/src/main/java/tech/ailef/snapadmin/external/SnapAdmin.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/SnapAdmin.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external; +package space.mori.dalbodeule.snapadmin.external; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -50,20 +50,20 @@ import jakarta.persistence.ManyToMany; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.OneToOne; -import tech.ailef.snapadmin.external.annotations.Disable; -import tech.ailef.snapadmin.external.annotations.DisplayFormat; -import tech.ailef.snapadmin.external.dbmapping.CustomJpaRepository; -import tech.ailef.snapadmin.external.dbmapping.DbObjectSchema; -import tech.ailef.snapadmin.external.dbmapping.fields.DbField; -import tech.ailef.snapadmin.external.dbmapping.fields.DbFieldType; -import tech.ailef.snapadmin.external.dbmapping.fields.EnumFieldType; -import tech.ailef.snapadmin.external.dbmapping.fields.StringFieldType; -import tech.ailef.snapadmin.external.dbmapping.fields.TextFieldType; -import tech.ailef.snapadmin.external.dto.MappingError; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; -import tech.ailef.snapadmin.external.exceptions.SnapAdminNotFoundException; -import tech.ailef.snapadmin.external.exceptions.UnsupportedFieldTypeException; -import tech.ailef.snapadmin.external.misc.Utils; +import space.mori.dalbodeule.snapadmin.external.annotations.Disable; +import space.mori.dalbodeule.snapadmin.external.annotations.DisplayFormat; +import space.mori.dalbodeule.snapadmin.external.dbmapping.CustomJpaRepository; +import space.mori.dalbodeule.snapadmin.external.dbmapping.DbObjectSchema; +import space.mori.dalbodeule.snapadmin.external.dbmapping.fields.DbField; +import space.mori.dalbodeule.snapadmin.external.dbmapping.fields.DbFieldType; +import space.mori.dalbodeule.snapadmin.external.dbmapping.fields.EnumFieldType; +import space.mori.dalbodeule.snapadmin.external.dbmapping.fields.StringFieldType; +import space.mori.dalbodeule.snapadmin.external.dbmapping.fields.TextFieldType; +import space.mori.dalbodeule.snapadmin.external.dto.MappingError; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminNotFoundException; +import space.mori.dalbodeule.snapadmin.external.exceptions.UnsupportedFieldTypeException; +import space.mori.dalbodeule.snapadmin.external.misc.Utils; /** * The main SnapAdmin class is responsible for the initialization phase. This class scans @@ -88,7 +88,7 @@ public class SnapAdmin { private boolean authenticated; - private static final String VERSION = "0.2.0"; + private static final String VERSION = "0.4.1"; /** * Builds the SnapAdmin instance by scanning the `@Entity` beans and loading diff --git a/src/main/java/tech/ailef/snapadmin/external/SnapAdminAutoConfiguration.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/SnapAdminAutoConfiguration.java similarity index 97% rename from src/main/java/tech/ailef/snapadmin/external/SnapAdminAutoConfiguration.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/SnapAdminAutoConfiguration.java index 63529af..2cd0cb3 100644 --- a/src/main/java/tech/ailef/snapadmin/external/SnapAdminAutoConfiguration.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/SnapAdminAutoConfiguration.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external; +package space.mori.dalbodeule.snapadmin.external; import java.util.Properties; @@ -39,7 +39,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionTemplate; -import tech.ailef.snapadmin.internal.InternalSnapAdminConfiguration; +import space.mori.dalbodeule.snapadmin.internal.InternalSnapAdminConfiguration; /** * The configuration class for "internal" data source. This is not the diff --git a/src/main/java/tech/ailef/snapadmin/external/SnapAdminMvcConfig.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/SnapAdminMvcConfig.java similarity index 96% rename from src/main/java/tech/ailef/snapadmin/external/SnapAdminMvcConfig.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/SnapAdminMvcConfig.java index ec306be..b706245 100644 --- a/src/main/java/tech/ailef/snapadmin/external/SnapAdminMvcConfig.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/SnapAdminMvcConfig.java @@ -18,7 +18,7 @@ */ -package tech.ailef.snapadmin.external; +package space.mori.dalbodeule.snapadmin.external; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/tech/ailef/snapadmin/external/SnapAdminProperties.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/SnapAdminProperties.java similarity index 98% rename from src/main/java/tech/ailef/snapadmin/external/SnapAdminProperties.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/SnapAdminProperties.java index 37094ad..b495c39 100644 --- a/src/main/java/tech/ailef/snapadmin/external/SnapAdminProperties.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/SnapAdminProperties.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external; +package space.mori.dalbodeule.snapadmin.external; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/tech/ailef/snapadmin/external/StartupAuthCheckRunner.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/StartupAuthCheckRunner.java similarity index 95% rename from src/main/java/tech/ailef/snapadmin/external/StartupAuthCheckRunner.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/StartupAuthCheckRunner.java index c9ffede..0f1d5f9 100644 --- a/src/main/java/tech/ailef/snapadmin/external/StartupAuthCheckRunner.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/StartupAuthCheckRunner.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external; +package space.mori.dalbodeule.snapadmin.external; import java.io.IOException; import java.net.HttpURLConnection; @@ -30,7 +30,7 @@ import org.springframework.context.ApplicationListener; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; /** * Runs at startup to determine if SnapAdmin is protected with authentication. diff --git a/src/main/java/space/mori/dalbodeule/snapadmin/external/ThymeleafUtils.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/ThymeleafUtils.java new file mode 100644 index 0000000..0e5a954 --- /dev/null +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/ThymeleafUtils.java @@ -0,0 +1,7 @@ +package space.mori.dalbodeule.snapadmin.external; + +public class ThymeleafUtils { + public String getSimpleName(Class clazz) { + return clazz.getSimpleName(); + } +} diff --git a/src/main/java/tech/ailef/snapadmin/external/annotations/ComputedColumn.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/ComputedColumn.java similarity index 95% rename from src/main/java/tech/ailef/snapadmin/external/annotations/ComputedColumn.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/ComputedColumn.java index e37d35d..8521034 100644 --- a/src/main/java/tech/ailef/snapadmin/external/annotations/ComputedColumn.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/ComputedColumn.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.annotations; +package space.mori.dalbodeule.snapadmin.external.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/tech/ailef/snapadmin/external/annotations/Disable.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/Disable.java similarity index 94% rename from src/main/java/tech/ailef/snapadmin/external/annotations/Disable.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/Disable.java index 61fb395..04a5471 100644 --- a/src/main/java/tech/ailef/snapadmin/external/annotations/Disable.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/Disable.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.annotations; +package space.mori.dalbodeule.snapadmin.external.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/tech/ailef/snapadmin/external/annotations/DisableCreate.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/DisableCreate.java similarity index 94% rename from src/main/java/tech/ailef/snapadmin/external/annotations/DisableCreate.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/DisableCreate.java index c080d85..26db2d5 100644 --- a/src/main/java/tech/ailef/snapadmin/external/annotations/DisableCreate.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/DisableCreate.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.annotations; +package space.mori.dalbodeule.snapadmin.external.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/tech/ailef/snapadmin/external/annotations/DisableDelete.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/DisableDelete.java similarity index 94% rename from src/main/java/tech/ailef/snapadmin/external/annotations/DisableDelete.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/DisableDelete.java index 6d58fa9..ba88060 100644 --- a/src/main/java/tech/ailef/snapadmin/external/annotations/DisableDelete.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/DisableDelete.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.annotations; +package space.mori.dalbodeule.snapadmin.external.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/tech/ailef/snapadmin/external/annotations/DisableEdit.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/DisableEdit.java similarity index 94% rename from src/main/java/tech/ailef/snapadmin/external/annotations/DisableEdit.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/DisableEdit.java index 3b23704..b08c8df 100644 --- a/src/main/java/tech/ailef/snapadmin/external/annotations/DisableEdit.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/DisableEdit.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.annotations; +package space.mori.dalbodeule.snapadmin.external.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/tech/ailef/snapadmin/external/annotations/DisableExport.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/DisableExport.java similarity index 94% rename from src/main/java/tech/ailef/snapadmin/external/annotations/DisableExport.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/DisableExport.java index 5f75aee..97bc420 100644 --- a/src/main/java/tech/ailef/snapadmin/external/annotations/DisableExport.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/DisableExport.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.annotations; +package space.mori.dalbodeule.snapadmin.external.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/tech/ailef/snapadmin/external/annotations/DisplayFormat.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/DisplayFormat.java similarity index 95% rename from src/main/java/tech/ailef/snapadmin/external/annotations/DisplayFormat.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/DisplayFormat.java index 6d5d6b6..41eec31 100644 --- a/src/main/java/tech/ailef/snapadmin/external/annotations/DisplayFormat.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/DisplayFormat.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.annotations; +package space.mori.dalbodeule.snapadmin.external.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/tech/ailef/snapadmin/external/annotations/DisplayImage.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/DisplayImage.java similarity index 94% rename from src/main/java/tech/ailef/snapadmin/external/annotations/DisplayImage.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/DisplayImage.java index 09636f8..785f9a8 100644 --- a/src/main/java/tech/ailef/snapadmin/external/annotations/DisplayImage.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/DisplayImage.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.annotations; +package space.mori.dalbodeule.snapadmin.external.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/tech/ailef/snapadmin/external/annotations/DisplayName.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/DisplayName.java similarity index 95% rename from src/main/java/tech/ailef/snapadmin/external/annotations/DisplayName.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/DisplayName.java index 3a49ee5..b9e8981 100644 --- a/src/main/java/tech/ailef/snapadmin/external/annotations/DisplayName.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/DisplayName.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.annotations; +package space.mori.dalbodeule.snapadmin.external.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/tech/ailef/snapadmin/external/annotations/Filterable.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/Filterable.java similarity index 96% rename from src/main/java/tech/ailef/snapadmin/external/annotations/Filterable.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/Filterable.java index 9e050d3..8a6fc2e 100644 --- a/src/main/java/tech/ailef/snapadmin/external/annotations/Filterable.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/Filterable.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.annotations; +package space.mori.dalbodeule.snapadmin.external.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/tech/ailef/snapadmin/external/annotations/FilterableType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/FilterableType.java similarity index 96% rename from src/main/java/tech/ailef/snapadmin/external/annotations/FilterableType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/FilterableType.java index 20de822..3a6ebc0 100644 --- a/src/main/java/tech/ailef/snapadmin/external/annotations/FilterableType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/FilterableType.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.annotations; +package space.mori.dalbodeule.snapadmin.external.annotations; /** * Type of filters that can be used in the faceted search. diff --git a/src/main/java/tech/ailef/snapadmin/external/annotations/HiddenColumn.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/HiddenColumn.java similarity index 96% rename from src/main/java/tech/ailef/snapadmin/external/annotations/HiddenColumn.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/HiddenColumn.java index 6bd26ce..f411ed1 100644 --- a/src/main/java/tech/ailef/snapadmin/external/annotations/HiddenColumn.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/HiddenColumn.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.annotations; +package space.mori.dalbodeule.snapadmin.external.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/tech/ailef/snapadmin/external/annotations/ReadOnly.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/ReadOnly.java similarity index 95% rename from src/main/java/tech/ailef/snapadmin/external/annotations/ReadOnly.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/ReadOnly.java index 69771d0..c3da1f7 100644 --- a/src/main/java/tech/ailef/snapadmin/external/annotations/ReadOnly.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/ReadOnly.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.annotations; +package space.mori.dalbodeule.snapadmin.external.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/tech/ailef/snapadmin/external/annotations/package-info.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/package-info.java similarity index 93% rename from src/main/java/tech/ailef/snapadmin/external/annotations/package-info.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/package-info.java index 2e7b8d6..b947199 100644 --- a/src/main/java/tech/ailef/snapadmin/external/annotations/package-info.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/annotations/package-info.java @@ -19,4 +19,4 @@ /** * Annotations defined to allow user customization */ -package tech.ailef.snapadmin.external.annotations; \ No newline at end of file +package space.mori.dalbodeule.snapadmin.external.annotations; \ No newline at end of file diff --git a/src/main/java/tech/ailef/snapadmin/external/controller/DataExportController.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/controller/DataExportController.java similarity index 88% rename from src/main/java/tech/ailef/snapadmin/external/controller/DataExportController.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/controller/DataExportController.java index 30c3325..2aece67 100644 --- a/src/main/java/tech/ailef/snapadmin/external/controller/DataExportController.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/controller/DataExportController.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.controller; +package space.mori.dalbodeule.snapadmin.external.controller; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -41,6 +41,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Import; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; @@ -54,38 +55,43 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import tech.ailef.snapadmin.external.SnapAdmin; -import tech.ailef.snapadmin.external.dbmapping.DbFieldValue; -import tech.ailef.snapadmin.external.dbmapping.DbObject; -import tech.ailef.snapadmin.external.dbmapping.DbObjectSchema; -import tech.ailef.snapadmin.external.dbmapping.SnapAdminRepository; -import tech.ailef.snapadmin.external.dbmapping.fields.DbField; -import tech.ailef.snapadmin.external.dbmapping.query.DbQueryResult; -import tech.ailef.snapadmin.external.dbmapping.query.DbQueryResultRow; -import tech.ailef.snapadmin.external.dto.DataExportFormat; -import tech.ailef.snapadmin.external.dto.QueryFilter; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; -import tech.ailef.snapadmin.external.exceptions.SnapAdminNotFoundException; -import tech.ailef.snapadmin.external.misc.Utils; -import tech.ailef.snapadmin.internal.model.ConsoleQuery; -import tech.ailef.snapadmin.internal.repository.ConsoleQueryRepository; +import space.mori.dalbodeule.snapadmin.external.SnapAdmin; +import space.mori.dalbodeule.snapadmin.external.dbmapping.DbFieldValue; +import space.mori.dalbodeule.snapadmin.external.dbmapping.DbObject; +import space.mori.dalbodeule.snapadmin.external.dbmapping.DbObjectSchema; +import space.mori.dalbodeule.snapadmin.external.dbmapping.SnapAdminRepository; +import space.mori.dalbodeule.snapadmin.external.dbmapping.fields.DbField; +import space.mori.dalbodeule.snapadmin.external.dbmapping.query.DbQueryResult; +import space.mori.dalbodeule.snapadmin.external.dbmapping.query.DbQueryResultRow; +import space.mori.dalbodeule.snapadmin.external.dto.DataExportFormat; +import space.mori.dalbodeule.snapadmin.external.dto.QueryFilter; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminNotFoundException; +import space.mori.dalbodeule.snapadmin.external.misc.Utils; +import space.mori.dalbodeule.snapadmin.internal.model.ConsoleQuery; +import space.mori.dalbodeule.snapadmin.internal.repository.ConsoleQueryRepository; @Controller @RequestMapping(value = { "/${snapadmin.baseUrl}/", "/${snapadmin.baseUrl}" }) +@Import(ObjectMapper.class) public class DataExportController { private static final Logger logger = LoggerFactory.getLogger(DataExportFormat.class); - - @Autowired - private SnapAdmin snapAdmin; + private final SnapAdmin snapAdmin; + private final SnapAdminRepository repository; + private final ConsoleQueryRepository queryRepository; + private final ObjectMapper mapper; - @Autowired - private SnapAdminRepository repository; - - @Autowired - private ConsoleQueryRepository queryRepository; - - @Autowired - private ObjectMapper mapper; + public DataExportController( + @Autowired SnapAdmin snapAdmin, + @Autowired SnapAdminRepository repository, + @Autowired ConsoleQueryRepository queryRepository, + @Autowired ObjectMapper mapper + ) { + this.snapAdmin = snapAdmin; + this.repository = repository; + this.queryRepository = queryRepository; + this.mapper = mapper; + } @GetMapping("/console/export/{queryId}") public ResponseEntity export(@PathVariable String queryId, @RequestParam String format, diff --git a/src/main/java/tech/ailef/snapadmin/external/controller/FileDownloadController.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/controller/FileDownloadController.java similarity index 90% rename from src/main/java/tech/ailef/snapadmin/external/controller/FileDownloadController.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/controller/FileDownloadController.java index e719130..53aaf07 100644 --- a/src/main/java/tech/ailef/snapadmin/external/controller/FileDownloadController.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/controller/FileDownloadController.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.controller; +package space.mori.dalbodeule.snapadmin.external.controller; import java.util.Optional; @@ -36,12 +36,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.server.ResponseStatusException; -import tech.ailef.snapadmin.external.SnapAdmin; -import tech.ailef.snapadmin.external.dbmapping.DbFieldValue; -import tech.ailef.snapadmin.external.dbmapping.DbObject; -import tech.ailef.snapadmin.external.dbmapping.DbObjectSchema; -import tech.ailef.snapadmin.external.dbmapping.SnapAdminRepository; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.SnapAdmin; +import space.mori.dalbodeule.snapadmin.external.dbmapping.DbFieldValue; +import space.mori.dalbodeule.snapadmin.external.dbmapping.DbObject; +import space.mori.dalbodeule.snapadmin.external.dbmapping.DbObjectSchema; +import space.mori.dalbodeule.snapadmin.external.dbmapping.SnapAdminRepository; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; /** * Controller to serve file or images (`@DisplayImage`) diff --git a/src/main/java/tech/ailef/snapadmin/external/controller/GlobalController.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/controller/GlobalController.java similarity index 87% rename from src/main/java/tech/ailef/snapadmin/external/controller/GlobalController.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/controller/GlobalController.java index f50d988..59b1073 100644 --- a/src/main/java/tech/ailef/snapadmin/external/controller/GlobalController.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/controller/GlobalController.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.controller; +package space.mori.dalbodeule.snapadmin.external.controller; import java.security.Principal; import java.util.Map; @@ -30,11 +30,12 @@ import org.springframework.web.bind.annotation.ModelAttribute; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import tech.ailef.snapadmin.external.SnapAdmin; -import tech.ailef.snapadmin.external.SnapAdminProperties; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; -import tech.ailef.snapadmin.external.exceptions.SnapAdminNotFoundException; -import tech.ailef.snapadmin.internal.UserConfiguration; +import space.mori.dalbodeule.snapadmin.external.SnapAdmin; +import space.mori.dalbodeule.snapadmin.external.SnapAdminProperties; +import space.mori.dalbodeule.snapadmin.external.ThymeleafUtils; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminNotFoundException; +import space.mori.dalbodeule.snapadmin.internal.UserConfiguration; /** * This class registers some global ModelAttributes and exception handlers. @@ -61,6 +62,7 @@ public class GlobalController { model.addAttribute("snapadmin_baseUrl", getBaseUrl()); model.addAttribute("snapadmin_version", snapAdmin.getVersion()); model.addAttribute("snapadmin_properties", props); + model.addAttribute("utils", new ThymeleafUtils()); return "snapadmin/other/error"; } @@ -73,6 +75,7 @@ public class GlobalController { model.addAttribute("snapadmin_baseUrl", getBaseUrl()); model.addAttribute("snapadmin_version", snapAdmin.getVersion()); model.addAttribute("snapadmin_properties", props); + model.addAttribute("utils", new ThymeleafUtils()); response.setStatus(404); return "snapadmin/other/error"; } diff --git a/src/main/java/tech/ailef/snapadmin/external/controller/SnapAdminController.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/controller/SnapAdminController.java similarity index 90% rename from src/main/java/tech/ailef/snapadmin/external/controller/SnapAdminController.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/controller/SnapAdminController.java index 254b26b..5058658 100644 --- a/src/main/java/tech/ailef/snapadmin/external/controller/SnapAdminController.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/controller/SnapAdminController.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.controller; +package space.mori.dalbodeule.snapadmin.external.controller; import java.security.Principal; import java.text.DecimalFormat; @@ -56,29 +56,30 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.ConstraintViolationException; -import tech.ailef.snapadmin.external.SnapAdmin; -import tech.ailef.snapadmin.external.SnapAdminProperties; -import tech.ailef.snapadmin.external.dbmapping.DbObject; -import tech.ailef.snapadmin.external.dbmapping.DbObjectSchema; -import tech.ailef.snapadmin.external.dbmapping.SnapAdminRepository; -import tech.ailef.snapadmin.external.dbmapping.query.DbQueryResult; -import tech.ailef.snapadmin.external.dto.CompareOperator; -import tech.ailef.snapadmin.external.dto.FacetedSearchRequest; -import tech.ailef.snapadmin.external.dto.LogsSearchRequest; -import tech.ailef.snapadmin.external.dto.PaginatedResult; -import tech.ailef.snapadmin.external.dto.PaginationInfo; -import tech.ailef.snapadmin.external.dto.QueryFilter; -import tech.ailef.snapadmin.external.dto.ValidationErrorsContainer; -import tech.ailef.snapadmin.external.exceptions.InvalidPageException; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; -import tech.ailef.snapadmin.external.exceptions.SnapAdminNotFoundException; -import tech.ailef.snapadmin.external.misc.Utils; -import tech.ailef.snapadmin.internal.model.ConsoleQuery; -import tech.ailef.snapadmin.internal.model.UserAction; -import tech.ailef.snapadmin.internal.model.UserSetting; -import tech.ailef.snapadmin.internal.service.ConsoleQueryService; -import tech.ailef.snapadmin.internal.service.UserActionService; -import tech.ailef.snapadmin.internal.service.UserSettingsService; +import space.mori.dalbodeule.snapadmin.external.SnapAdmin; +import space.mori.dalbodeule.snapadmin.external.SnapAdminProperties; +import space.mori.dalbodeule.snapadmin.external.ThymeleafUtils; +import space.mori.dalbodeule.snapadmin.external.dbmapping.DbObject; +import space.mori.dalbodeule.snapadmin.external.dbmapping.DbObjectSchema; +import space.mori.dalbodeule.snapadmin.external.dbmapping.SnapAdminRepository; +import space.mori.dalbodeule.snapadmin.external.dbmapping.query.DbQueryResult; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.dto.FacetedSearchRequest; +import space.mori.dalbodeule.snapadmin.external.dto.LogsSearchRequest; +import space.mori.dalbodeule.snapadmin.external.dto.PaginatedResult; +import space.mori.dalbodeule.snapadmin.external.dto.PaginationInfo; +import space.mori.dalbodeule.snapadmin.external.dto.QueryFilter; +import space.mori.dalbodeule.snapadmin.external.dto.ValidationErrorsContainer; +import space.mori.dalbodeule.snapadmin.external.exceptions.InvalidPageException; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminNotFoundException; +import space.mori.dalbodeule.snapadmin.external.misc.Utils; +import space.mori.dalbodeule.snapadmin.internal.model.ConsoleQuery; +import space.mori.dalbodeule.snapadmin.internal.model.UserAction; +import space.mori.dalbodeule.snapadmin.internal.model.UserSetting; +import space.mori.dalbodeule.snapadmin.internal.service.ConsoleQueryService; +import space.mori.dalbodeule.snapadmin.internal.service.UserActionService; +import space.mori.dalbodeule.snapadmin.internal.service.UserSettingsService; /** * The main SnapAdmin controller that register most of the routes of the web interface. @@ -222,6 +223,7 @@ public class SnapAdminController { model.addAttribute("query", query); model.addAttribute("sortOrder", sortOrder); model.addAttribute("activeFilters", queryFilters); + model.addAttribute("utils", new ThymeleafUtils()); return "snapadmin/model/list"; } catch (InvalidPageException e) { @@ -235,6 +237,7 @@ public class SnapAdminController { model.addAttribute("query", query); model.addAttribute("sortOrder", sortOrder); model.addAttribute("activeFilters", queryFilters); + model.addAttribute("utils", new ThymeleafUtils()); return "snapadmin/model/list"; } } @@ -251,6 +254,7 @@ public class SnapAdminController { model.addAttribute("activePage", "entities"); model.addAttribute("schema", schema); + model.addAttribute("utils", new ThymeleafUtils()); return "snapadmin/model/schema"; } @@ -278,6 +282,7 @@ public class SnapAdminController { model.addAttribute("object", object); model.addAttribute("activePage", "entities"); model.addAttribute("schema", schema); + model.addAttribute("utils", new ThymeleafUtils()); return "snapadmin/model/show"; } @@ -298,6 +303,7 @@ public class SnapAdminController { model.addAttribute("title", "Entities | " + schema.getJavaClass().getSimpleName() + " | Create"); model.addAttribute("activePage", "entities"); model.addAttribute("create", true); + model.addAttribute("utils", new ThymeleafUtils()); return "snapadmin/model/create"; } @@ -326,6 +332,7 @@ public class SnapAdminController { model.addAttribute("schema", schema); model.addAttribute("activePage", "entities"); model.addAttribute("create", false); + model.addAttribute("utils", new ThymeleafUtils()); return "snapadmin/model/create"; } @@ -543,6 +550,7 @@ public class SnapAdminController { model.addAttribute("title", "Action logs"); model.addAttribute("schemas", snapAdmin.getSchemas()); model.addAttribute("searchRequest", searchRequest); + model.addAttribute("utils", new ThymeleafUtils()); return "snapadmin/logs"; } @@ -551,6 +559,7 @@ public class SnapAdminController { public String settings(Model model) { model.addAttribute("title", "Settings"); model.addAttribute("activePage", "settings"); + model.addAttribute("utils", new ThymeleafUtils()); return "snapadmin/settings/settings"; } @@ -558,6 +567,7 @@ public class SnapAdminController { public String help(Model model) { model.addAttribute("title", "Help"); model.addAttribute("activePage", "help"); + model.addAttribute("utils", new ThymeleafUtils()); return "snapadmin/help"; } @@ -664,6 +674,7 @@ public class SnapAdminController { model.addAttribute("title", "SQL Console | " + activeQuery.getTitle()); double elapsedTime = (System.currentTimeMillis() - startTime) / 1000.0; model.addAttribute("elapsedTime", new DecimalFormat("0.0#").format(elapsedTime)); + model.addAttribute("utils", new ThymeleafUtils()); return "snapadmin/console"; } @@ -671,6 +682,7 @@ public class SnapAdminController { @GetMapping("/settings/appearance") public String settingsAppearance(Model model) { model.addAttribute("activePage", "settings"); + model.addAttribute("utils", new ThymeleafUtils()); return "snapadmin/settings/appearance"; } @@ -679,6 +691,7 @@ public class SnapAdminController { model.addAttribute("error", "Forbidden"); model.addAttribute("status", "403"); model.addAttribute("message", "You don't have the privileges to perform this action"); + model.addAttribute("utils", new ThymeleafUtils()); return "snapadmin/other/error"; } @@ -692,6 +705,7 @@ public class SnapAdminController { userSettingsService.save(new UserSetting(paramName, params.get(paramName))); } model.addAttribute("activePage", "settings"); + model.addAttribute("utils", new ThymeleafUtils()); return next; } diff --git a/src/main/java/tech/ailef/snapadmin/external/controller/package-info.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/controller/package-info.java similarity index 93% rename from src/main/java/tech/ailef/snapadmin/external/controller/package-info.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/controller/package-info.java index cebd789..360eaa8 100644 --- a/src/main/java/tech/ailef/snapadmin/external/controller/package-info.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/controller/package-info.java @@ -20,4 +20,4 @@ /** * Controllers registered for the web UI */ -package tech.ailef.snapadmin.external.controller; \ No newline at end of file +package space.mori.dalbodeule.snapadmin.external.controller; \ No newline at end of file diff --git a/src/main/java/tech/ailef/snapadmin/external/controller/rest/AutocompleteController.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/controller/rest/AutocompleteController.java similarity index 86% rename from src/main/java/tech/ailef/snapadmin/external/controller/rest/AutocompleteController.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/controller/rest/AutocompleteController.java index 464c6e8..fe2c652 100644 --- a/src/main/java/tech/ailef/snapadmin/external/controller/rest/AutocompleteController.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/controller/rest/AutocompleteController.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.controller.rest; +package space.mori.dalbodeule.snapadmin.external.controller.rest; import java.util.List; import java.util.stream.Collectors; @@ -30,10 +30,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.snapadmin.external.SnapAdmin; -import tech.ailef.snapadmin.external.dbmapping.DbObjectSchema; -import tech.ailef.snapadmin.external.dbmapping.SnapAdminRepository; -import tech.ailef.snapadmin.external.dto.AutocompleteSearchResult; +import space.mori.dalbodeule.snapadmin.external.SnapAdmin; +import space.mori.dalbodeule.snapadmin.external.dbmapping.DbObjectSchema; +import space.mori.dalbodeule.snapadmin.external.dbmapping.SnapAdminRepository; +import space.mori.dalbodeule.snapadmin.external.dto.AutocompleteSearchResult; /** * API controller for autocomplete results diff --git a/src/main/java/space/mori/dalbodeule/snapadmin/external/controller/rest/package-info.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/controller/rest/package-info.java new file mode 100644 index 0000000..a7129ef --- /dev/null +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/controller/rest/package-info.java @@ -0,0 +1,4 @@ +/** + * Rest controllers + */ +package space.mori.dalbodeule.snapadmin.external.controller.rest; \ No newline at end of file diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/CustomJpaRepository.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/CustomJpaRepository.java similarity index 94% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/CustomJpaRepository.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/CustomJpaRepository.java index 7f236cb..e85b190 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/CustomJpaRepository.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/CustomJpaRepository.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.dbmapping; +package space.mori.dalbodeule.snapadmin.external.dbmapping; import java.io.IOException; import java.time.LocalDate; @@ -40,12 +40,12 @@ import jakarta.persistence.criteria.CriteriaUpdate; import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; -import tech.ailef.snapadmin.external.dbmapping.fields.DbField; -import tech.ailef.snapadmin.external.dbmapping.fields.StringFieldType; -import tech.ailef.snapadmin.external.dbmapping.fields.TextFieldType; -import tech.ailef.snapadmin.external.dto.CompareOperator; -import tech.ailef.snapadmin.external.dto.QueryFilter; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.dbmapping.fields.DbField; +import space.mori.dalbodeule.snapadmin.external.dbmapping.fields.StringFieldType; +import space.mori.dalbodeule.snapadmin.external.dbmapping.fields.TextFieldType; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.dto.QueryFilter; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; @SuppressWarnings("rawtypes") public class CustomJpaRepository extends SimpleJpaRepository { diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/DbFieldValue.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/DbFieldValue.java similarity index 95% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/DbFieldValue.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/DbFieldValue.java index 1291014..bd479fb 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/DbFieldValue.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/DbFieldValue.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.dbmapping; +package space.mori.dalbodeule.snapadmin.external.dbmapping; import java.time.Instant; import java.time.LocalDateTime; @@ -27,7 +27,7 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnore; -import tech.ailef.snapadmin.external.dbmapping.fields.DbField; +import space.mori.dalbodeule.snapadmin.external.dbmapping.fields.DbField; /** * Wrapper for the value of a field diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/DbObject.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/DbObject.java similarity index 96% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/DbObject.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/DbObject.java index 7f04306..450b219 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/DbObject.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/DbObject.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.dbmapping; +package space.mori.dalbodeule.snapadmin.external.dbmapping; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -34,10 +34,10 @@ import jakarta.persistence.ManyToMany; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.OneToOne; -import tech.ailef.snapadmin.external.annotations.DisplayName; -import tech.ailef.snapadmin.external.dbmapping.fields.BooleanFieldType; -import tech.ailef.snapadmin.external.dbmapping.fields.DbField; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.annotations.DisplayName; +import space.mori.dalbodeule.snapadmin.external.dbmapping.fields.BooleanFieldType; +import space.mori.dalbodeule.snapadmin.external.dbmapping.fields.DbField; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; /** * Wrapper for all objects retrieved from the database. diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/DbObjectSchema.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/DbObjectSchema.java similarity index 93% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/DbObjectSchema.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/DbObjectSchema.java index 8001166..e61136d 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/DbObjectSchema.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/DbObjectSchema.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.dbmapping; +package space.mori.dalbodeule.snapadmin.external.dbmapping; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -39,18 +39,18 @@ import jakarta.persistence.ManyToMany; import jakarta.persistence.OneToMany; import jakarta.persistence.OneToOne; import jakarta.persistence.Table; -import tech.ailef.snapadmin.external.SnapAdmin; -import tech.ailef.snapadmin.external.annotations.ComputedColumn; -import tech.ailef.snapadmin.external.annotations.DisableCreate; -import tech.ailef.snapadmin.external.annotations.DisableDelete; -import tech.ailef.snapadmin.external.annotations.DisableEdit; -import tech.ailef.snapadmin.external.annotations.DisableExport; -import tech.ailef.snapadmin.external.annotations.HiddenColumn; -import tech.ailef.snapadmin.external.dbmapping.fields.DbField; -import tech.ailef.snapadmin.external.dto.MappingError; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; -import tech.ailef.snapadmin.external.exceptions.SnapAdminNotFoundException; -import tech.ailef.snapadmin.external.misc.Utils; +import space.mori.dalbodeule.snapadmin.external.SnapAdmin; +import space.mori.dalbodeule.snapadmin.external.annotations.ComputedColumn; +import space.mori.dalbodeule.snapadmin.external.annotations.DisableCreate; +import space.mori.dalbodeule.snapadmin.external.annotations.DisableDelete; +import space.mori.dalbodeule.snapadmin.external.annotations.DisableEdit; +import space.mori.dalbodeule.snapadmin.external.annotations.DisableExport; +import space.mori.dalbodeule.snapadmin.external.annotations.HiddenColumn; +import space.mori.dalbodeule.snapadmin.external.dbmapping.fields.DbField; +import space.mori.dalbodeule.snapadmin.external.dto.MappingError; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminNotFoundException; +import space.mori.dalbodeule.snapadmin.external.misc.Utils; /** * A class that represents a table/`@Entity` as reconstructed from the diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/SnapAdminRepository.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/SnapAdminRepository.java similarity index 91% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/SnapAdminRepository.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/SnapAdminRepository.java index cf088b3..f127539 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/SnapAdminRepository.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/SnapAdminRepository.java @@ -18,7 +18,7 @@ */ -package tech.ailef.snapadmin.external.dbmapping; +package space.mori.dalbodeule.snapadmin.external.dbmapping; import java.sql.ResultSetMetaData; import java.util.ArrayList; @@ -46,18 +46,18 @@ import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; import jakarta.validation.Validation; import jakarta.validation.Validator; -import tech.ailef.snapadmin.external.SnapAdmin; -import tech.ailef.snapadmin.external.annotations.ReadOnly; -import tech.ailef.snapadmin.external.dbmapping.fields.DbField; -import tech.ailef.snapadmin.external.dbmapping.query.DbQueryOutputField; -import tech.ailef.snapadmin.external.dbmapping.query.DbQueryResult; -import tech.ailef.snapadmin.external.dbmapping.query.DbQueryResultRow; -import tech.ailef.snapadmin.external.dto.FacetedSearchRequest; -import tech.ailef.snapadmin.external.dto.PaginatedResult; -import tech.ailef.snapadmin.external.dto.PaginationInfo; -import tech.ailef.snapadmin.external.dto.QueryFilter; -import tech.ailef.snapadmin.external.exceptions.InvalidPageException; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.SnapAdmin; +import space.mori.dalbodeule.snapadmin.external.annotations.ReadOnly; +import space.mori.dalbodeule.snapadmin.external.dbmapping.fields.DbField; +import space.mori.dalbodeule.snapadmin.external.dbmapping.query.DbQueryOutputField; +import space.mori.dalbodeule.snapadmin.external.dbmapping.query.DbQueryResult; +import space.mori.dalbodeule.snapadmin.external.dbmapping.query.DbQueryResultRow; +import space.mori.dalbodeule.snapadmin.external.dto.FacetedSearchRequest; +import space.mori.dalbodeule.snapadmin.external.dto.PaginatedResult; +import space.mori.dalbodeule.snapadmin.external.dto.PaginationInfo; +import space.mori.dalbodeule.snapadmin.external.dto.QueryFilter; +import space.mori.dalbodeule.snapadmin.external.exceptions.InvalidPageException; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; /** * Implements the basic CRUD operations (and some more) diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/BigDecimalFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/BigDecimalFieldType.java similarity index 90% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/BigDecimalFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/BigDecimalFieldType.java index 055d83b..a4fe5a6 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/BigDecimalFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/BigDecimalFieldType.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.math.BigDecimal; import java.util.List; -import tech.ailef.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; public class BigDecimalFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/BigIntegerFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/BigIntegerFieldType.java similarity index 90% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/BigIntegerFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/BigIntegerFieldType.java index f9a9959..f4bce2f 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/BigIntegerFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/BigIntegerFieldType.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.math.BigInteger; import java.util.List; -import tech.ailef.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; public class BigIntegerFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/BooleanFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/BooleanFieldType.java similarity index 90% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/BooleanFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/BooleanFieldType.java index b53d469..547ecf2 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/BooleanFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/BooleanFieldType.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.util.List; -import tech.ailef.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; public class BooleanFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/ByteArrayFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/ByteArrayFieldType.java similarity index 87% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/ByteArrayFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/ByteArrayFieldType.java index c0d0449..dfcc178 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/ByteArrayFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/ByteArrayFieldType.java @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.io.IOException; import java.util.List; import org.springframework.web.multipart.MultipartFile; -import tech.ailef.snapadmin.external.dto.CompareOperator; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; public class ByteArrayFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/ByteFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/ByteFieldType.java similarity index 85% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/ByteFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/ByteFieldType.java index 633223c..82679e1 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/ByteFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/ByteFieldType.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.util.List; -import tech.ailef.snapadmin.external.dto.CompareOperator; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; public class ByteFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/CharFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/CharFieldType.java similarity index 90% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/CharFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/CharFieldType.java index 51f2738..9cd4c12 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/CharFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/CharFieldType.java @@ -17,11 +17,11 @@ */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.util.List; -import tech.ailef.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; public class CharFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/ComputedFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/ComputedFieldType.java similarity index 85% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/ComputedFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/ComputedFieldType.java index e5ce453..97947bf 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/ComputedFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/ComputedFieldType.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.util.List; -import tech.ailef.snapadmin.external.dto.CompareOperator; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; public class ComputedFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/DateFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/DateFieldType.java similarity index 88% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/DateFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/DateFieldType.java index c62e6ac..7a4c2a9 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/DateFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/DateFieldType.java @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.sql.Date; import java.time.LocalDate; import java.time.format.DateTimeParseException; import java.util.List; -import tech.ailef.snapadmin.external.dto.CompareOperator; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; public class DateFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/DbField.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/DbField.java similarity index 92% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/DbField.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/DbField.java index e2ca7a0..7f00c28 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/DbField.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/DbField.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.lang.reflect.Field; import java.util.List; @@ -32,13 +32,13 @@ import jakarta.persistence.ManyToMany; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.OneToOne; -import tech.ailef.snapadmin.external.annotations.DisplayImage; -import tech.ailef.snapadmin.external.annotations.Filterable; -import tech.ailef.snapadmin.external.annotations.FilterableType; -import tech.ailef.snapadmin.external.annotations.ReadOnly; -import tech.ailef.snapadmin.external.dbmapping.DbFieldValue; -import tech.ailef.snapadmin.external.dbmapping.DbObject; -import tech.ailef.snapadmin.external.dbmapping.DbObjectSchema; +import space.mori.dalbodeule.snapadmin.external.annotations.DisplayImage; +import space.mori.dalbodeule.snapadmin.external.annotations.Filterable; +import space.mori.dalbodeule.snapadmin.external.annotations.FilterableType; +import space.mori.dalbodeule.snapadmin.external.annotations.ReadOnly; +import space.mori.dalbodeule.snapadmin.external.dbmapping.DbFieldValue; +import space.mori.dalbodeule.snapadmin.external.dbmapping.DbObject; +import space.mori.dalbodeule.snapadmin.external.dbmapping.DbObjectSchema; /** * Represent a field on the database, generated from an Entity class instance variable. diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/DbFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/DbFieldType.java similarity index 94% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/DbFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/DbFieldType.java index ee218cc..b2f09bc 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/DbFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/DbFieldType.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.math.BigDecimal; import java.math.BigInteger; @@ -27,9 +27,9 @@ import java.time.LocalDateTime; import java.time.OffsetDateTime; import java.util.List; -import tech.ailef.snapadmin.external.dto.CompareOperator; -import tech.ailef.snapadmin.external.exceptions.UnsupportedFieldTypeException; -import tech.ailef.snapadmin.external.misc.Utils; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.exceptions.UnsupportedFieldTypeException; +import space.mori.dalbodeule.snapadmin.external.misc.Utils; public abstract class DbFieldType { diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/DoubleFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/DoubleFieldType.java similarity index 90% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/DoubleFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/DoubleFieldType.java index f277f52..0499e71 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/DoubleFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/DoubleFieldType.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.util.List; -import tech.ailef.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; public class DoubleFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/EnumFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/EnumFieldType.java similarity index 92% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/EnumFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/EnumFieldType.java index 98fbaf3..7e9db05 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/EnumFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/EnumFieldType.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -25,8 +25,8 @@ import java.util.List; import java.util.stream.Collectors; import jakarta.persistence.EnumType; -import tech.ailef.snapadmin.external.dto.CompareOperator; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; public class EnumFieldType extends DbFieldType { diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/FloatFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/FloatFieldType.java similarity index 90% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/FloatFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/FloatFieldType.java index 0940754..662b4e5 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/FloatFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/FloatFieldType.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.util.List; -import tech.ailef.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; public class FloatFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/InstantFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/InstantFieldType.java similarity index 91% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/InstantFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/InstantFieldType.java index 13e2e88..8782983 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/InstantFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/InstantFieldType.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.List; -import tech.ailef.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; public class InstantFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/IntegerFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/IntegerFieldType.java similarity index 90% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/IntegerFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/IntegerFieldType.java index ae62989..f8eacc2 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/IntegerFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/IntegerFieldType.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.util.List; -import tech.ailef.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; public class IntegerFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/LocalDateFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/LocalDateFieldType.java similarity index 90% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/LocalDateFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/LocalDateFieldType.java index 88a3e62..0e9e473 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/LocalDateFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/LocalDateFieldType.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.time.LocalDate; import java.util.List; -import tech.ailef.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; public class LocalDateFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/LocalDateTimeFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/LocalDateTimeFieldType.java similarity index 91% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/LocalDateTimeFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/LocalDateTimeFieldType.java index 653e808..4ab07a6 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/LocalDateTimeFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/LocalDateTimeFieldType.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.time.LocalDateTime; import java.util.List; -import tech.ailef.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; public class LocalDateTimeFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/LongFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/LongFieldType.java similarity index 90% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/LongFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/LongFieldType.java index 434b987..679f839 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/LongFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/LongFieldType.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.util.List; -import tech.ailef.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; public class LongFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/ManyToManyFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/ManyToManyFieldType.java similarity index 86% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/ManyToManyFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/ManyToManyFieldType.java index c5374ab..ba512aa 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/ManyToManyFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/ManyToManyFieldType.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.util.List; import jakarta.persistence.ManyToMany; -import tech.ailef.snapadmin.external.dto.CompareOperator; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; public class ManyToManyFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/OffsetDateTimeFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/OffsetDateTimeFieldType.java similarity index 91% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/OffsetDateTimeFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/OffsetDateTimeFieldType.java index 1818b00..f714fe7 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/OffsetDateTimeFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/OffsetDateTimeFieldType.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.time.OffsetDateTime; import java.util.List; -import tech.ailef.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; public class OffsetDateTimeFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/OneToManyFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/OneToManyFieldType.java similarity index 86% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/OneToManyFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/OneToManyFieldType.java index d5f8e6f..06ed803 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/OneToManyFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/OneToManyFieldType.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.util.List; import jakarta.persistence.OneToMany; -import tech.ailef.snapadmin.external.dto.CompareOperator; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; public class OneToManyFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/OneToOneFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/OneToOneFieldType.java similarity index 86% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/OneToOneFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/OneToOneFieldType.java index 4d84274..a750a70 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/OneToOneFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/OneToOneFieldType.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.util.List; import jakarta.persistence.OneToOne; -import tech.ailef.snapadmin.external.dto.CompareOperator; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; public class OneToOneFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/ShortFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/ShortFieldType.java similarity index 90% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/ShortFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/ShortFieldType.java index 4f223ed..8a20124 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/ShortFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/ShortFieldType.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.util.List; -import tech.ailef.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; public class ShortFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/StringFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/StringFieldType.java similarity index 90% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/StringFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/StringFieldType.java index 083b8d7..684cdb6 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/StringFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/StringFieldType.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.util.List; -import tech.ailef.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; public class StringFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/TextFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/TextFieldType.java similarity index 90% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/TextFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/TextFieldType.java index 9aa3df8..2dfc64b 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/TextFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/TextFieldType.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.util.List; -import tech.ailef.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; public class TextFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/UUIDFieldType.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/UUIDFieldType.java similarity index 90% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/UUIDFieldType.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/UUIDFieldType.java index 30b8675..d323f98 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/UUIDFieldType.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/fields/UUIDFieldType.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dbmapping.fields; +package space.mori.dalbodeule.snapadmin.external.dbmapping.fields; import java.util.List; -import tech.ailef.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; public class UUIDFieldType extends DbFieldType { @Override diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/package-info.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/package-info.java similarity index 93% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/package-info.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/package-info.java index 9409142..e788e45 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/package-info.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/package-info.java @@ -20,4 +20,4 @@ /** * Representation of the user database and repository classes. */ -package tech.ailef.snapadmin.external.dbmapping; \ No newline at end of file +package space.mori.dalbodeule.snapadmin.external.dbmapping; \ No newline at end of file diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/query/DbQueryOutputField.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/query/DbQueryOutputField.java similarity index 90% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/query/DbQueryOutputField.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/query/DbQueryOutputField.java index 16e4b11..919547a 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/query/DbQueryOutputField.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/query/DbQueryOutputField.java @@ -18,17 +18,17 @@ */ -package tech.ailef.snapadmin.external.dbmapping.query; +package space.mori.dalbodeule.snapadmin.external.dbmapping.query; import java.lang.reflect.InvocationTargetException; import java.util.Objects; -import tech.ailef.snapadmin.external.SnapAdmin; -import tech.ailef.snapadmin.external.dbmapping.DbObjectSchema; -import tech.ailef.snapadmin.external.dbmapping.fields.DbField; -import tech.ailef.snapadmin.external.dbmapping.fields.DbFieldType; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; -import tech.ailef.snapadmin.external.exceptions.UnsupportedFieldTypeException; +import space.mori.dalbodeule.snapadmin.external.SnapAdmin; +import space.mori.dalbodeule.snapadmin.external.dbmapping.DbObjectSchema; +import space.mori.dalbodeule.snapadmin.external.dbmapping.fields.DbField; +import space.mori.dalbodeule.snapadmin.external.dbmapping.fields.DbFieldType; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.exceptions.UnsupportedFieldTypeException; /* * A class that holds output fields from a user-provided SQL query diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/query/DbQueryResult.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/query/DbQueryResult.java similarity index 95% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/query/DbQueryResult.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/query/DbQueryResult.java index 0c005b7..98551f4 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/query/DbQueryResult.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/query/DbQueryResult.java @@ -18,7 +18,7 @@ */ -package tech.ailef.snapadmin.external.dbmapping.query; +package space.mori.dalbodeule.snapadmin.external.dbmapping.query; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/query/DbQueryResultRow.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/query/DbQueryResultRow.java similarity index 93% rename from src/main/java/tech/ailef/snapadmin/external/dbmapping/query/DbQueryResultRow.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/query/DbQueryResultRow.java index 75e588e..e07460a 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/query/DbQueryResultRow.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dbmapping/query/DbQueryResultRow.java @@ -18,13 +18,13 @@ */ -package tech.ailef.snapadmin.external.dbmapping.query; +package space.mori.dalbodeule.snapadmin.external.dbmapping.query; import java.util.HashMap; import java.util.List; import java.util.Map; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; /** * A single row of results coming from a user-provided SQL query diff --git a/src/main/java/tech/ailef/snapadmin/external/dto/AutocompleteSearchResult.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/AutocompleteSearchResult.java similarity index 86% rename from src/main/java/tech/ailef/snapadmin/external/dto/AutocompleteSearchResult.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dto/AutocompleteSearchResult.java index c8c5cc1..9f638a5 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dto/AutocompleteSearchResult.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/AutocompleteSearchResult.java @@ -17,10 +17,10 @@ */ -package tech.ailef.snapadmin.external.dto; +package space.mori.dalbodeule.snapadmin.external.dto; -import tech.ailef.snapadmin.external.controller.rest.AutocompleteController; -import tech.ailef.snapadmin.external.dbmapping.DbObject; +import space.mori.dalbodeule.snapadmin.external.controller.rest.AutocompleteController; +import space.mori.dalbodeule.snapadmin.external.dbmapping.DbObject; /** * An object to hold autocomplete results returned from the {@linkplain AutocompleteController}. diff --git a/src/main/java/tech/ailef/snapadmin/external/dto/CompareOperator.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/CompareOperator.java similarity index 96% rename from src/main/java/tech/ailef/snapadmin/external/dto/CompareOperator.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dto/CompareOperator.java index af46992..c62c830 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dto/CompareOperator.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/CompareOperator.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.dto; +package space.mori.dalbodeule.snapadmin.external.dto; /** * A list of operators that are used in faceted search. diff --git a/src/main/java/tech/ailef/snapadmin/external/dto/DataExportFormat.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/DataExportFormat.java similarity index 93% rename from src/main/java/tech/ailef/snapadmin/external/dto/DataExportFormat.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dto/DataExportFormat.java index cdeae3e..147bf94 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dto/DataExportFormat.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/DataExportFormat.java @@ -18,7 +18,7 @@ */ -package tech.ailef.snapadmin.external.dto; +package space.mori.dalbodeule.snapadmin.external.dto; public enum DataExportFormat { CSV, diff --git a/src/main/java/tech/ailef/snapadmin/external/dto/FacetedSearchRequest.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/FacetedSearchRequest.java similarity index 97% rename from src/main/java/tech/ailef/snapadmin/external/dto/FacetedSearchRequest.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dto/FacetedSearchRequest.java index 4247c77..9be9ce9 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dto/FacetedSearchRequest.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/FacetedSearchRequest.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.dto; +package space.mori.dalbodeule.snapadmin.external.dto; import java.util.ArrayList; import java.util.Set; diff --git a/src/main/java/tech/ailef/snapadmin/external/dto/FilterRequest.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/FilterRequest.java similarity index 96% rename from src/main/java/tech/ailef/snapadmin/external/dto/FilterRequest.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dto/FilterRequest.java index e389e1b..88b44ee 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dto/FilterRequest.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/FilterRequest.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.dto; +package space.mori.dalbodeule.snapadmin.external.dto; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; diff --git a/src/main/java/tech/ailef/snapadmin/external/dto/LogsSearchRequest.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/LogsSearchRequest.java similarity index 98% rename from src/main/java/tech/ailef/snapadmin/external/dto/LogsSearchRequest.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dto/LogsSearchRequest.java index 7b910b6..9d004b9 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dto/LogsSearchRequest.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/LogsSearchRequest.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.dto; +package space.mori.dalbodeule.snapadmin.external.dto; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; diff --git a/src/main/java/tech/ailef/snapadmin/external/dto/MappingError.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/MappingError.java similarity index 95% rename from src/main/java/tech/ailef/snapadmin/external/dto/MappingError.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dto/MappingError.java index 48b2e40..4c95745 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dto/MappingError.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/MappingError.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dto; +package space.mori.dalbodeule.snapadmin.external.dto; /** * A wrapper class for information about mapping errors, i.e. errors that happen diff --git a/src/main/java/tech/ailef/snapadmin/external/dto/PaginatedResult.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/PaginatedResult.java similarity index 97% rename from src/main/java/tech/ailef/snapadmin/external/dto/PaginatedResult.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dto/PaginatedResult.java index a0b0e18..04cc905 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dto/PaginatedResult.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/PaginatedResult.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.dto; +package space.mori.dalbodeule.snapadmin.external.dto; import java.util.List; diff --git a/src/main/java/tech/ailef/snapadmin/external/dto/PaginationInfo.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/PaginationInfo.java similarity index 97% rename from src/main/java/tech/ailef/snapadmin/external/dto/PaginationInfo.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dto/PaginationInfo.java index 165ec27..e9c25a9 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dto/PaginationInfo.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/PaginationInfo.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.dto; +package space.mori.dalbodeule.snapadmin.external.dto; import java.util.ArrayList; import java.util.List; @@ -26,7 +26,7 @@ import java.util.stream.IntStream; import org.springframework.util.MultiValueMap; -import tech.ailef.snapadmin.external.misc.Utils; +import space.mori.dalbodeule.snapadmin.external.misc.Utils; /** * Attached as output to requests that have a paginated response, diff --git a/src/main/java/tech/ailef/snapadmin/external/dto/QueryFilter.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/QueryFilter.java similarity index 92% rename from src/main/java/tech/ailef/snapadmin/external/dto/QueryFilter.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dto/QueryFilter.java index d33db3b..68e0568 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dto/QueryFilter.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/QueryFilter.java @@ -17,12 +17,12 @@ */ -package tech.ailef.snapadmin.external.dto; +package space.mori.dalbodeule.snapadmin.external.dto; import java.util.Objects; -import tech.ailef.snapadmin.external.dbmapping.fields.DbField; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.dbmapping.fields.DbField; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; /** * A single filter in a FacetedSearchRequest. This describes a diff --git a/src/main/java/tech/ailef/snapadmin/external/dto/ValidationErrorsContainer.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/ValidationErrorsContainer.java similarity index 97% rename from src/main/java/tech/ailef/snapadmin/external/dto/ValidationErrorsContainer.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dto/ValidationErrorsContainer.java index 6165756..ffc6427 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dto/ValidationErrorsContainer.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/ValidationErrorsContainer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.dto; +package space.mori.dalbodeule.snapadmin.external.dto; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/tech/ailef/snapadmin/external/dto/package-info.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/package-info.java similarity index 94% rename from src/main/java/tech/ailef/snapadmin/external/dto/package-info.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/dto/package-info.java index 89751a8..c467f64 100644 --- a/src/main/java/tech/ailef/snapadmin/external/dto/package-info.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/dto/package-info.java @@ -20,4 +20,4 @@ /** * Data objects used in primarily in requests and responses */ -package tech.ailef.snapadmin.external.dto; \ No newline at end of file +package space.mori.dalbodeule.snapadmin.external.dto; \ No newline at end of file diff --git a/src/main/java/tech/ailef/snapadmin/external/exceptions/InvalidPageException.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/exceptions/InvalidPageException.java similarity index 95% rename from src/main/java/tech/ailef/snapadmin/external/exceptions/InvalidPageException.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/exceptions/InvalidPageException.java index 312fd16..f97045d 100644 --- a/src/main/java/tech/ailef/snapadmin/external/exceptions/InvalidPageException.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/exceptions/InvalidPageException.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.exceptions; +package space.mori.dalbodeule.snapadmin.external.exceptions; /** * Thrown during the computation of pagination if the requested diff --git a/src/main/java/tech/ailef/snapadmin/external/exceptions/SnapAdminException.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/exceptions/SnapAdminException.java similarity index 95% rename from src/main/java/tech/ailef/snapadmin/external/exceptions/SnapAdminException.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/exceptions/SnapAdminException.java index 9362002..c40532b 100644 --- a/src/main/java/tech/ailef/snapadmin/external/exceptions/SnapAdminException.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/exceptions/SnapAdminException.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.exceptions; +package space.mori.dalbodeule.snapadmin.external.exceptions; /** * Generic top-level exception for everything thrown by us diff --git a/src/main/java/tech/ailef/snapadmin/external/exceptions/SnapAdminNotFoundException.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/exceptions/SnapAdminNotFoundException.java similarity index 95% rename from src/main/java/tech/ailef/snapadmin/external/exceptions/SnapAdminNotFoundException.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/exceptions/SnapAdminNotFoundException.java index 05ddd08..2a7e3d6 100644 --- a/src/main/java/tech/ailef/snapadmin/external/exceptions/SnapAdminNotFoundException.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/exceptions/SnapAdminNotFoundException.java @@ -18,7 +18,7 @@ */ -package tech.ailef.snapadmin.external.exceptions; +package space.mori.dalbodeule.snapadmin.external.exceptions; import org.springframework.http.HttpStatus; import org.springframework.web.server.ResponseStatusException; diff --git a/src/main/java/tech/ailef/snapadmin/external/exceptions/UnsupportedFieldTypeException.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/exceptions/UnsupportedFieldTypeException.java similarity index 94% rename from src/main/java/tech/ailef/snapadmin/external/exceptions/UnsupportedFieldTypeException.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/exceptions/UnsupportedFieldTypeException.java index 7cce221..7096adb 100644 --- a/src/main/java/tech/ailef/snapadmin/external/exceptions/UnsupportedFieldTypeException.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/exceptions/UnsupportedFieldTypeException.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.external.exceptions; +package space.mori.dalbodeule.snapadmin.external.exceptions; /** * Thrown when a field of an `@Entity` class has a type that is not diff --git a/src/main/java/tech/ailef/snapadmin/external/exceptions/package-info.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/exceptions/package-info.java similarity index 93% rename from src/main/java/tech/ailef/snapadmin/external/exceptions/package-info.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/exceptions/package-info.java index b268f6f..9d59935 100644 --- a/src/main/java/tech/ailef/snapadmin/external/exceptions/package-info.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/exceptions/package-info.java @@ -20,4 +20,4 @@ /** * Exception classes */ -package tech.ailef.snapadmin.external.exceptions; \ No newline at end of file +package space.mori.dalbodeule.snapadmin.external.exceptions; \ No newline at end of file diff --git a/src/main/java/tech/ailef/snapadmin/external/misc/Utils.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/misc/Utils.java similarity index 90% rename from src/main/java/tech/ailef/snapadmin/external/misc/Utils.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/misc/Utils.java index 22e110a..ffe2872 100644 --- a/src/main/java/tech/ailef/snapadmin/external/misc/Utils.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/misc/Utils.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.external.misc; +package space.mori.dalbodeule.snapadmin.external.misc; import java.util.ArrayList; import java.util.HashSet; @@ -26,11 +26,11 @@ import java.util.Set; import org.springframework.util.MultiValueMap; -import tech.ailef.snapadmin.external.dbmapping.DbObjectSchema; -import tech.ailef.snapadmin.external.dbmapping.fields.DbField; -import tech.ailef.snapadmin.external.dto.CompareOperator; -import tech.ailef.snapadmin.external.dto.QueryFilter; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.external.dbmapping.DbObjectSchema; +import space.mori.dalbodeule.snapadmin.external.dbmapping.fields.DbField; +import space.mori.dalbodeule.snapadmin.external.dto.CompareOperator; +import space.mori.dalbodeule.snapadmin.external.dto.QueryFilter; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; /** * Collection of utility functions used across the project diff --git a/src/main/java/tech/ailef/snapadmin/external/misc/package-info.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/misc/package-info.java similarity index 93% rename from src/main/java/tech/ailef/snapadmin/external/misc/package-info.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/misc/package-info.java index 73584a6..ab135ad 100644 --- a/src/main/java/tech/ailef/snapadmin/external/misc/package-info.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/misc/package-info.java @@ -21,4 +21,4 @@ * Miscellaneous utility classes. */ -package tech.ailef.snapadmin.external.misc; \ No newline at end of file +package space.mori.dalbodeule.snapadmin.external.misc; \ No newline at end of file diff --git a/src/main/java/tech/ailef/snapadmin/external/package-info.java b/src/main/java/space/mori/dalbodeule/snapadmin/external/package-info.java similarity index 87% rename from src/main/java/tech/ailef/snapadmin/external/package-info.java rename to src/main/java/space/mori/dalbodeule/snapadmin/external/package-info.java index ff2417a..b00f21c 100644 --- a/src/main/java/tech/ailef/snapadmin/external/package-info.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/external/package-info.java @@ -20,6 +20,6 @@ * Root package of SnapAdmin. * * It contains the configuration class which handles the initialization - * and the main {@link tech.ailef.snapadmin.external.SnapAdmin} class. + * and the main {@link space.mori.dalbodeule.snapadmin.external.SnapAdmin} class. */ -package tech.ailef.snapadmin.external; \ No newline at end of file +package space.mori.dalbodeule.snapadmin.external; \ No newline at end of file diff --git a/src/main/java/tech/ailef/snapadmin/internal/InternalSnapAdminConfiguration.java b/src/main/java/space/mori/dalbodeule/snapadmin/internal/InternalSnapAdminConfiguration.java similarity index 96% rename from src/main/java/tech/ailef/snapadmin/internal/InternalSnapAdminConfiguration.java rename to src/main/java/space/mori/dalbodeule/snapadmin/internal/InternalSnapAdminConfiguration.java index 330e437..cc55917 100644 --- a/src/main/java/tech/ailef/snapadmin/internal/InternalSnapAdminConfiguration.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/internal/InternalSnapAdminConfiguration.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.internal; +package space.mori.dalbodeule.snapadmin.internal; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.ComponentScan; diff --git a/src/main/java/tech/ailef/snapadmin/internal/UserConfiguration.java b/src/main/java/space/mori/dalbodeule/snapadmin/internal/UserConfiguration.java similarity index 88% rename from src/main/java/tech/ailef/snapadmin/internal/UserConfiguration.java rename to src/main/java/space/mori/dalbodeule/snapadmin/internal/UserConfiguration.java index e87e608..ecc7a14 100644 --- a/src/main/java/tech/ailef/snapadmin/internal/UserConfiguration.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/internal/UserConfiguration.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.internal; +package space.mori.dalbodeule.snapadmin.internal; import java.util.HashMap; import java.util.Map; @@ -26,9 +26,9 @@ import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import tech.ailef.snapadmin.external.exceptions.SnapAdminException; -import tech.ailef.snapadmin.internal.model.UserSetting; -import tech.ailef.snapadmin.internal.repository.UserSettingsRepository; +import space.mori.dalbodeule.snapadmin.external.exceptions.SnapAdminException; +import space.mori.dalbodeule.snapadmin.internal.model.UserSetting; +import space.mori.dalbodeule.snapadmin.internal.repository.UserSettingsRepository; /** * Wrapper class for the UserSettingsRepository that provides a better diff --git a/src/main/java/tech/ailef/snapadmin/internal/model/ConsoleQuery.java b/src/main/java/space/mori/dalbodeule/snapadmin/internal/model/ConsoleQuery.java similarity index 97% rename from src/main/java/tech/ailef/snapadmin/internal/model/ConsoleQuery.java rename to src/main/java/space/mori/dalbodeule/snapadmin/internal/model/ConsoleQuery.java index d08002f..c4ec1d1 100644 --- a/src/main/java/tech/ailef/snapadmin/internal/model/ConsoleQuery.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/internal/model/ConsoleQuery.java @@ -18,7 +18,7 @@ */ -package tech.ailef.snapadmin.internal.model; +package space.mori.dalbodeule.snapadmin.internal.model; import java.time.LocalDateTime; diff --git a/src/main/java/tech/ailef/snapadmin/internal/model/UserAction.java b/src/main/java/space/mori/dalbodeule/snapadmin/internal/model/UserAction.java similarity index 98% rename from src/main/java/tech/ailef/snapadmin/internal/model/UserAction.java rename to src/main/java/space/mori/dalbodeule/snapadmin/internal/model/UserAction.java index 5facb62..7ced690 100644 --- a/src/main/java/tech/ailef/snapadmin/internal/model/UserAction.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/internal/model/UserAction.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.internal.model; +package space.mori.dalbodeule.snapadmin.internal.model; import java.time.LocalDateTime; diff --git a/src/main/java/tech/ailef/snapadmin/internal/model/UserSetting.java b/src/main/java/space/mori/dalbodeule/snapadmin/internal/model/UserSetting.java similarity index 96% rename from src/main/java/tech/ailef/snapadmin/internal/model/UserSetting.java rename to src/main/java/space/mori/dalbodeule/snapadmin/internal/model/UserSetting.java index d9cdc17..d8b855e 100644 --- a/src/main/java/tech/ailef/snapadmin/internal/model/UserSetting.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/internal/model/UserSetting.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.internal.model; +package space.mori.dalbodeule.snapadmin.internal.model; import jakarta.persistence.Entity; import jakarta.persistence.Id; diff --git a/src/main/java/tech/ailef/snapadmin/internal/model/package-info.java b/src/main/java/space/mori/dalbodeule/snapadmin/internal/model/package-info.java similarity index 94% rename from src/main/java/tech/ailef/snapadmin/internal/model/package-info.java rename to src/main/java/space/mori/dalbodeule/snapadmin/internal/model/package-info.java index 0e53786..260ce0f 100644 --- a/src/main/java/tech/ailef/snapadmin/internal/model/package-info.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/internal/model/package-info.java @@ -20,4 +20,4 @@ /** * Entity classes for the internal data source (action logs and user settings). */ -package tech.ailef.snapadmin.internal.model; \ No newline at end of file +package space.mori.dalbodeule.snapadmin.internal.model; \ No newline at end of file diff --git a/src/main/java/tech/ailef/snapadmin/internal/package-info.java b/src/main/java/space/mori/dalbodeule/snapadmin/internal/package-info.java similarity index 88% rename from src/main/java/tech/ailef/snapadmin/internal/package-info.java rename to src/main/java/space/mori/dalbodeule/snapadmin/internal/package-info.java index dc53711..cd637fa 100644 --- a/src/main/java/tech/ailef/snapadmin/internal/package-info.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/internal/package-info.java @@ -23,7 +23,7 @@ * Boot Database Admin in order to save information. * * Due to the way Spring Boot component scanning works, it is needed to create this package and the - * respective {@link tech.ailef.snapadmin.internal.InternalSnapAdminConfiguration} in order to + * respective {@link space.mori.dalbodeule.snapadmin.internal.InternalSnapAdminConfiguration} in order to * have the component scanning only pick the correct entities/repositories. */ -package tech.ailef.snapadmin.internal; +package space.mori.dalbodeule.snapadmin.internal; diff --git a/src/main/java/tech/ailef/snapadmin/internal/repository/ConsoleQueryRepository.java b/src/main/java/space/mori/dalbodeule/snapadmin/internal/repository/ConsoleQueryRepository.java similarity index 88% rename from src/main/java/tech/ailef/snapadmin/internal/repository/ConsoleQueryRepository.java rename to src/main/java/space/mori/dalbodeule/snapadmin/internal/repository/ConsoleQueryRepository.java index ec42592..57e9f03 100644 --- a/src/main/java/tech/ailef/snapadmin/internal/repository/ConsoleQueryRepository.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/internal/repository/ConsoleQueryRepository.java @@ -17,12 +17,12 @@ */ -package tech.ailef.snapadmin.internal.repository; +package space.mori.dalbodeule.snapadmin.internal.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import tech.ailef.snapadmin.internal.model.ConsoleQuery; +import space.mori.dalbodeule.snapadmin.internal.model.ConsoleQuery; @Repository public interface ConsoleQueryRepository extends JpaRepository, CustomActionRepository { diff --git a/src/main/java/tech/ailef/snapadmin/internal/repository/CustomActionRepository.java b/src/main/java/space/mori/dalbodeule/snapadmin/internal/repository/CustomActionRepository.java similarity index 83% rename from src/main/java/tech/ailef/snapadmin/internal/repository/CustomActionRepository.java rename to src/main/java/space/mori/dalbodeule/snapadmin/internal/repository/CustomActionRepository.java index b8b8ee0..e0aec4e 100644 --- a/src/main/java/tech/ailef/snapadmin/internal/repository/CustomActionRepository.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/internal/repository/CustomActionRepository.java @@ -17,12 +17,12 @@ */ -package tech.ailef.snapadmin.internal.repository; +package space.mori.dalbodeule.snapadmin.internal.repository; import java.util.List; -import tech.ailef.snapadmin.external.dto.LogsSearchRequest; -import tech.ailef.snapadmin.internal.model.UserAction; +import space.mori.dalbodeule.snapadmin.external.dto.LogsSearchRequest; +import space.mori.dalbodeule.snapadmin.internal.model.UserAction; public interface CustomActionRepository { public List findActions(LogsSearchRequest r); diff --git a/src/main/java/tech/ailef/snapadmin/internal/repository/CustomActionRepositoryImpl.java b/src/main/java/space/mori/dalbodeule/snapadmin/internal/repository/CustomActionRepositoryImpl.java similarity index 96% rename from src/main/java/tech/ailef/snapadmin/internal/repository/CustomActionRepositoryImpl.java rename to src/main/java/space/mori/dalbodeule/snapadmin/internal/repository/CustomActionRepositoryImpl.java index f1a4c2d..f506265 100644 --- a/src/main/java/tech/ailef/snapadmin/internal/repository/CustomActionRepositoryImpl.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/internal/repository/CustomActionRepositoryImpl.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.internal.repository; +package space.mori.dalbodeule.snapadmin.internal.repository; import java.util.ArrayList; import java.util.List; @@ -31,8 +31,8 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; -import tech.ailef.snapadmin.external.dto.LogsSearchRequest; -import tech.ailef.snapadmin.internal.model.UserAction; +import space.mori.dalbodeule.snapadmin.external.dto.LogsSearchRequest; +import space.mori.dalbodeule.snapadmin.internal.model.UserAction; /** * A repository that provides custom queries for UserActions diff --git a/src/main/java/tech/ailef/snapadmin/internal/repository/UserActionRepository.java b/src/main/java/space/mori/dalbodeule/snapadmin/internal/repository/UserActionRepository.java similarity index 90% rename from src/main/java/tech/ailef/snapadmin/internal/repository/UserActionRepository.java rename to src/main/java/space/mori/dalbodeule/snapadmin/internal/repository/UserActionRepository.java index c99a770..fa756cc 100644 --- a/src/main/java/tech/ailef/snapadmin/internal/repository/UserActionRepository.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/internal/repository/UserActionRepository.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.internal.repository; +package space.mori.dalbodeule.snapadmin.internal.repository; import java.util.List; @@ -25,7 +25,7 @@ import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import tech.ailef.snapadmin.internal.model.UserAction; +import space.mori.dalbodeule.snapadmin.internal.model.UserAction; @Repository public interface UserActionRepository extends JpaRepository, CustomActionRepository { diff --git a/src/main/java/tech/ailef/snapadmin/internal/repository/UserSettingsRepository.java b/src/main/java/space/mori/dalbodeule/snapadmin/internal/repository/UserSettingsRepository.java similarity index 88% rename from src/main/java/tech/ailef/snapadmin/internal/repository/UserSettingsRepository.java rename to src/main/java/space/mori/dalbodeule/snapadmin/internal/repository/UserSettingsRepository.java index 6f8f651..3571eec 100644 --- a/src/main/java/tech/ailef/snapadmin/internal/repository/UserSettingsRepository.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/internal/repository/UserSettingsRepository.java @@ -17,12 +17,12 @@ */ -package tech.ailef.snapadmin.internal.repository; +package space.mori.dalbodeule.snapadmin.internal.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import tech.ailef.snapadmin.internal.model.UserSetting; +import space.mori.dalbodeule.snapadmin.internal.model.UserSetting; @Repository public interface UserSettingsRepository extends JpaRepository { diff --git a/src/main/java/tech/ailef/snapadmin/internal/repository/package-info.java b/src/main/java/space/mori/dalbodeule/snapadmin/internal/repository/package-info.java similarity index 93% rename from src/main/java/tech/ailef/snapadmin/internal/repository/package-info.java rename to src/main/java/space/mori/dalbodeule/snapadmin/internal/repository/package-info.java index 9bf0436..fc468b0 100644 --- a/src/main/java/tech/ailef/snapadmin/internal/repository/package-info.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/internal/repository/package-info.java @@ -19,4 +19,4 @@ /** * Repositories for the internal data source. */ -package tech.ailef.snapadmin.internal.repository; \ No newline at end of file +package space.mori.dalbodeule.snapadmin.internal.repository; \ No newline at end of file diff --git a/src/main/java/tech/ailef/snapadmin/internal/service/ConsoleQueryService.java b/src/main/java/space/mori/dalbodeule/snapadmin/internal/service/ConsoleQueryService.java similarity index 88% rename from src/main/java/tech/ailef/snapadmin/internal/service/ConsoleQueryService.java rename to src/main/java/space/mori/dalbodeule/snapadmin/internal/service/ConsoleQueryService.java index ec4f41f..d15eb35 100644 --- a/src/main/java/tech/ailef/snapadmin/internal/service/ConsoleQueryService.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/internal/service/ConsoleQueryService.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.internal.service; +package space.mori.dalbodeule.snapadmin.internal.service; import java.util.List; import java.util.Optional; @@ -25,8 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.support.TransactionTemplate; -import tech.ailef.snapadmin.internal.model.ConsoleQuery; -import tech.ailef.snapadmin.internal.repository.ConsoleQueryRepository; +import space.mori.dalbodeule.snapadmin.internal.model.ConsoleQuery; +import space.mori.dalbodeule.snapadmin.internal.repository.ConsoleQueryRepository; @Service public class ConsoleQueryService { diff --git a/src/main/java/tech/ailef/snapadmin/internal/service/UserActionService.java b/src/main/java/space/mori/dalbodeule/snapadmin/internal/service/UserActionService.java similarity index 81% rename from src/main/java/tech/ailef/snapadmin/internal/service/UserActionService.java rename to src/main/java/space/mori/dalbodeule/snapadmin/internal/service/UserActionService.java index 9817487..0c33cc4 100644 --- a/src/main/java/tech/ailef/snapadmin/internal/service/UserActionService.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/internal/service/UserActionService.java @@ -17,7 +17,7 @@ */ -package tech.ailef.snapadmin.internal.service; +package space.mori.dalbodeule.snapadmin.internal.service; import java.util.List; @@ -26,12 +26,12 @@ import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import org.springframework.transaction.support.TransactionTemplate; -import tech.ailef.snapadmin.external.dto.LogsSearchRequest; -import tech.ailef.snapadmin.external.dto.PaginatedResult; -import tech.ailef.snapadmin.external.dto.PaginationInfo; -import tech.ailef.snapadmin.internal.model.UserAction; -import tech.ailef.snapadmin.internal.repository.CustomActionRepositoryImpl; -import tech.ailef.snapadmin.internal.repository.UserActionRepository; +import space.mori.dalbodeule.snapadmin.external.dto.LogsSearchRequest; +import space.mori.dalbodeule.snapadmin.external.dto.PaginatedResult; +import space.mori.dalbodeule.snapadmin.external.dto.PaginationInfo; +import space.mori.dalbodeule.snapadmin.internal.model.UserAction; +import space.mori.dalbodeule.snapadmin.internal.repository.CustomActionRepositoryImpl; +import space.mori.dalbodeule.snapadmin.internal.repository.UserActionRepository; /** * Service class to retrieve user actions through the {@link CustomActionRepositoryImpl}. diff --git a/src/main/java/tech/ailef/snapadmin/internal/service/UserSettingsService.java b/src/main/java/space/mori/dalbodeule/snapadmin/internal/service/UserSettingsService.java similarity index 85% rename from src/main/java/tech/ailef/snapadmin/internal/service/UserSettingsService.java rename to src/main/java/space/mori/dalbodeule/snapadmin/internal/service/UserSettingsService.java index 81aec6f..42252f5 100644 --- a/src/main/java/tech/ailef/snapadmin/internal/service/UserSettingsService.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/internal/service/UserSettingsService.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package tech.ailef.snapadmin.internal.service; +package space.mori.dalbodeule.snapadmin.internal.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.support.TransactionTemplate; -import tech.ailef.snapadmin.internal.model.UserSetting; -import tech.ailef.snapadmin.internal.repository.UserSettingsRepository; +import space.mori.dalbodeule.snapadmin.internal.model.UserSetting; +import space.mori.dalbodeule.snapadmin.internal.repository.UserSettingsRepository; @Service public class UserSettingsService { diff --git a/src/main/java/tech/ailef/snapadmin/internal/service/package-info.java b/src/main/java/space/mori/dalbodeule/snapadmin/internal/service/package-info.java similarity index 93% rename from src/main/java/tech/ailef/snapadmin/internal/service/package-info.java rename to src/main/java/space/mori/dalbodeule/snapadmin/internal/service/package-info.java index 6f7a3b1..a44d6c1 100644 --- a/src/main/java/tech/ailef/snapadmin/internal/service/package-info.java +++ b/src/main/java/space/mori/dalbodeule/snapadmin/internal/service/package-info.java @@ -19,4 +19,4 @@ /** * Service classes for the internal data source. */ -package tech.ailef.snapadmin.internal.service; \ No newline at end of file +package space.mori.dalbodeule.snapadmin.internal.service; \ No newline at end of file diff --git a/src/main/java/tech/ailef/snapadmin/external/controller/rest/package-info.java b/src/main/java/tech/ailef/snapadmin/external/controller/rest/package-info.java deleted file mode 100644 index 0489a73..0000000 --- a/src/main/java/tech/ailef/snapadmin/external/controller/rest/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Rest controllers - */ -package tech.ailef.snapadmin.external.controller.rest; \ No newline at end of file diff --git a/src/main/resources/templates/snapadmin/model/create.html b/src/main/resources/templates/snapadmin/model/create.html index aa09675..b3827c4 100644 --- a/src/main/resources/templates/snapadmin/model/create.html +++ b/src/main/resources/templates/snapadmin/model/create.html @@ -16,7 +16,7 @@ Entities - [[ ${schema.getJavaClass().getSimpleName()} ]] + [[ ${utils.getSimpleName(schema.getJavaClass())} ]] @@ -27,7 +27,7 @@
-

+

Entities - [[ ${schema.getJavaClass().getSimpleName()} ]] + [[ ${utils.getSimpleName(schema.getJavaClass())} ]]
@@ -147,7 +147,7 @@

- [[ ${schema.getJavaClass().getSimpleName()} ]] + [[ ${utils.getSimpleName(schema.getJavaClass())} ]] [[ ${schema.getTableName()} ]] diff --git a/src/main/resources/templates/snapadmin/model/schema.html b/src/main/resources/templates/snapadmin/model/schema.html index 71ab655..b8af5a0 100644 --- a/src/main/resources/templates/snapadmin/model/schema.html +++ b/src/main/resources/templates/snapadmin/model/schema.html @@ -12,7 +12,7 @@

Entities - [[ ${schema.getJavaClass().getSimpleName()} ]] + [[ ${utils.getSimpleName(schema.getJavaClass())} ]] Schema

@@ -34,7 +34,7 @@

- [[ ${schema.getJavaClass().getSimpleName()} ]] + [[ ${utils.getSimpleName(schema.getJavaClass())} ]] [[ ${schema.getTableName()} ]] diff --git a/src/main/resources/templates/snapadmin/model/show.html b/src/main/resources/templates/snapadmin/model/show.html index 42dc380..95476ea 100644 --- a/src/main/resources/templates/snapadmin/model/show.html +++ b/src/main/resources/templates/snapadmin/model/show.html @@ -13,7 +13,7 @@ Entities - [[ ${schema.getJavaClass().getSimpleName()} ]] + [[ ${utils.getSimpleName(schema.getJavaClass())} ]] [[ ${object.getDisplayName()} ]]

diff --git a/src/test/java/tech/ailef/snapadmin/SpringBootSnapAdminApplicationTests.java b/src/test/java/space/mori/dalbodeule/snapadmin/SpringBootSnapAdminApplicationTests.java similarity index 91% rename from src/test/java/tech/ailef/snapadmin/SpringBootSnapAdminApplicationTests.java rename to src/test/java/space/mori/dalbodeule/snapadmin/SpringBootSnapAdminApplicationTests.java index 11a5005..b8f0418 100644 --- a/src/test/java/tech/ailef/snapadmin/SpringBootSnapAdminApplicationTests.java +++ b/src/test/java/space/mori/dalbodeule/snapadmin/SpringBootSnapAdminApplicationTests.java @@ -17,16 +17,14 @@ */ -package tech.ailef.snapadmin; +package space.mori.dalbodeule.snapadmin; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest class SpringBootSnapAdminApplicationTests { - - @Test - void contextLoads() { - } - + @Test + void contextLoads() { + } }