diff --git a/.yo-rc.json b/.yo-rc.json index 5d353ae9..c24c1e94 100644 --- a/.yo-rc.json +++ b/.yo-rc.json @@ -24,7 +24,7 @@ "microfrontend": null, "microfrontends": [], "nativeLanguage": "en", - "packageName": "de.tum.cit.ase", + "packageName": "de.tum.cit.aet", "prodDatabaseType": "mysql", "reactive": false, "searchEngine": false, diff --git a/build.gradle b/build.gradle index 4e5d1d33..198a68ac 100644 --- a/build.gradle +++ b/build.gradle @@ -85,7 +85,7 @@ eclipse { defaultTasks "bootRun" springBoot { - mainClass = "de.tum.cit.ase.ArtemisBenchmarkingApp" + mainClass = "de.tum.cit.aet.ArtemisBenchmarkingApp" } test { diff --git a/gradle/liquibase.gradle b/gradle/liquibase.gradle index c1cf11d4..bc285075 100644 --- a/gradle/liquibase.gradle +++ b/gradle/liquibase.gradle @@ -32,7 +32,7 @@ liquibase { url "jdbc:mysql://localhost:3306/artemis-benchmarking" username "root" changelogFile project.ext.diffChangelogFile - referenceUrl "hibernate:spring:de.tum.cit.ase.domain?dialect=org.hibernate.dialect.MySQL8Dialect&hibernate.physical_naming_strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy&hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy" + referenceUrl "hibernate:spring:de.tum.cit.aet.domain?dialect=org.hibernate.dialect.MySQL8Dialect&hibernate.physical_naming_strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy&hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy" logLevel "debug" classpath "$buildDir/classes/java/main" } diff --git a/gradle/swagger.gradle b/gradle/swagger.gradle index 2f2a7c8f..24749971 100644 --- a/gradle/swagger.gradle +++ b/gradle/swagger.gradle @@ -8,8 +8,8 @@ openApiGenerate { generatorName = "spring" inputSpec = "$rootDir/src/main/resources/swagger/api.yml".toString() outputDir = "$buildDir/openapi".toString() - apiPackage = "de.tum.cit.ase.web.api" - modelPackage = "de.tum.cit.ase.service.api.dto" + apiPackage = "de.tum.cit.aet.web.api" + modelPackage = "de.tum.cit.aet.service.api.dto" apiFilesConstrainedTo = [""] modelFilesConstrainedTo = [""] supportingFilesConstrainedTo = ["ApiUtil.java"] diff --git a/gradle/war.gradle b/gradle/war.gradle index 28c0706e..bcb7ba73 100644 --- a/gradle/war.gradle +++ b/gradle/war.gradle @@ -1,7 +1,7 @@ apply plugin: "war" bootWar { - mainClass = "de.tum.cit.ase.ArtemisBenchmarkingApp" + mainClass = "de.tum.cit.aet.ArtemisBenchmarkingApp" includes = ["WEB-INF/**", "META-INF/**"] webXml = file("${project.rootDir}/src/main/webapp/WEB-INF/web.xml") } diff --git a/package.json b/package.json index a8a4790e..fcc0b419 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "backend:info": "./gradlew -v", "backend:nohttp:test": "./gradlew checkstyleNohttp -x webapp -x webapp_test", "backend:start": "./gradlew -x webapp -x webapp_test", - "backend:unit:test": "./gradlew test integrationTest -x webapp -x webapp_test -Dlogging.level.ROOT=OFF -Dlogging.level.tech.jhipster=OFF -Dlogging.level.de.tum.cit.ase=OFF -Dlogging.level.org.springframework=OFF -Dlogging.level.org.springframework.web=OFF -Dlogging.level.org.springframework.security=OFF", + "backend:unit:test": "./gradlew test integrationTest -x webapp -x webapp_test -Dlogging.level.ROOT=OFF -Dlogging.level.tech.jhipster=OFF -Dlogging.level.de.tum.cit.aet=OFF -Dlogging.level.org.springframework=OFF -Dlogging.level.org.springframework.web=OFF -Dlogging.level.org.springframework.security=OFF", "prebuild": "node prebuild.mjs", "build": "npm run webapp:prod --", "build-watch": "concurrently 'npm run webapp:build:dev -- --watch' npm:backend:start", @@ -27,7 +27,7 @@ "ci:e2e:prepare": "npm run ci:e2e:prepare:docker", "ci:e2e:prepare:docker": "npm run services:up --if-present && docker ps -a", "preci:e2e:server:start": "npm run services:db:await --if-present && npm run services:others:await --if-present", - "ci:e2e:server:start": "java -jar e2e.$npm_package_config_packaging --spring.profiles.active=e2e,$npm_package_config_default_environment -Dlogging.level.ROOT=OFF -Dlogging.level.tech.jhipster=OFF -Dlogging.level.de.tum.cit.ase=OFF -Dlogging.level.org.springframework=OFF -Dlogging.level.org.springframework.web=OFF -Dlogging.level.org.springframework.security=OFF --logging.level.org.springframework.web=ERROR", + "ci:e2e:server:start": "java -jar e2e.$npm_package_config_packaging --spring.profiles.active=e2e,$npm_package_config_default_environment -Dlogging.level.ROOT=OFF -Dlogging.level.tech.jhipster=OFF -Dlogging.level.de.tum.cit.aet=OFF -Dlogging.level.org.springframework=OFF -Dlogging.level.org.springframework.web=OFF -Dlogging.level.org.springframework.security=OFF --logging.level.org.springframework.web=ERROR", "ci:e2e:teardown": "npm run ci:e2e:teardown:docker --if-present", "ci:e2e:teardown:docker": "docker compose -f src/main/docker/services.yml down -v && docker ps -a", "ci:frontend:build": "npm run webapp:build:$npm_package_config_default_environment", diff --git a/src/main/docker/jib/entrypoint.sh b/src/main/docker/jib/entrypoint.sh index 7af656e6..2e98bbb1 100644 --- a/src/main/docker/jib/entrypoint.sh +++ b/src/main/docker/jib/entrypoint.sh @@ -36,4 +36,4 @@ file_env 'SPRING_LIQUIBASE_USER' file_env 'SPRING_LIQUIBASE_PASSWORD' file_env 'JHIPSTER_REGISTRY_PASSWORD' -exec java ${JAVA_OPTS} -noverify -XX:+AlwaysPreTouch -Djava.security.egd=file:/dev/./urandom -cp /app/resources/:/app/classes/:/app/libs/* "de.tum.cit.ase.ArtemisBenchmarkingApp" "$@" +exec java ${JAVA_OPTS} -noverify -XX:+AlwaysPreTouch -Djava.security.egd=file:/dev/./urandom -cp /app/resources/:/app/classes/:/app/libs/* "de.tum.cit.aet.ArtemisBenchmarkingApp" "$@" diff --git a/src/main/java/de/tum/cit/aet/aop/logging/LoggingAspect.java b/src/main/java/de/tum/cit/aet/aop/logging/LoggingAspect.java index 3cf66143..e5db3b4f 100644 --- a/src/main/java/de/tum/cit/aet/aop/logging/LoggingAspect.java +++ b/src/main/java/de/tum/cit/aet/aop/logging/LoggingAspect.java @@ -42,7 +42,7 @@ public void springBeanPointcut() { /** * Pointcut that matches all Spring beans in the application's main packages. */ - @Pointcut("within(de.tum.cit.ase.repository..*)" + " || within(de.tum.cit.ase.service..*)" + " || within(de.tum.cit.ase.web.rest..*)") + @Pointcut("within(de.tum.cit.aet.repository..*)" + " || within(de.tum.cit.aet.service..*)" + " || within(de.tum.cit.aet.web.rest..*)") public void applicationPackagePointcut() { // Method is empty as this is just a Pointcut, the implementations are in the advices. } diff --git a/src/main/java/de/tum/cit/aet/config/CacheConfiguration.java b/src/main/java/de/tum/cit/aet/config/CacheConfiguration.java index c3f85ac2..6b7d48c9 100644 --- a/src/main/java/de/tum/cit/aet/config/CacheConfiguration.java +++ b/src/main/java/de/tum/cit/aet/config/CacheConfiguration.java @@ -103,7 +103,7 @@ private MapConfig initializeDefaultMapConfig(JHipsterProperties jHipsterProperti } private MapConfig initializeDomainMapConfig(JHipsterProperties jHipsterProperties) { - MapConfig mapConfig = new MapConfig("de.tum.cit.ase.domain.*"); + MapConfig mapConfig = new MapConfig("de.tum.cit.aet.domain.*"); mapConfig.setTimeToLiveSeconds(jHipsterProperties.getCache().getHazelcast().getTimeToLiveSeconds()); return mapConfig; } diff --git a/src/main/java/de/tum/cit/aet/config/OpenApiConfiguration.java b/src/main/java/de/tum/cit/aet/config/OpenApiConfiguration.java index 40d4da7e..8b71f464 100644 --- a/src/main/java/de/tum/cit/aet/config/OpenApiConfiguration.java +++ b/src/main/java/de/tum/cit/aet/config/OpenApiConfiguration.java @@ -13,7 +13,7 @@ @Profile(JHipsterConstants.SPRING_PROFILE_API_DOCS) public class OpenApiConfiguration { - public static final String API_FIRST_PACKAGE = "de.tum.cit.ase.web.api"; + public static final String API_FIRST_PACKAGE = "de.tum.cit.aet.web.api"; @Bean @ConditionalOnMissingBean(name = "apiFirstGroupedOpenAPI") diff --git a/src/main/java/de/tum/cit/aet/web/rest/errors/ExceptionTranslator.java b/src/main/java/de/tum/cit/aet/web/rest/errors/ExceptionTranslator.java index de1fc84c..e45e0ab9 100644 --- a/src/main/java/de/tum/cit/aet/web/rest/errors/ExceptionTranslator.java +++ b/src/main/java/de/tum/cit/aet/web/rest/errors/ExceptionTranslator.java @@ -245,6 +245,6 @@ private boolean isCasualChainEnabled() { private boolean containsPackageName(String message) { // This list is for sure not complete - return StringUtils.containsAny(message, "org.", "java.", "net.", "jakarta.", "javax.", "com.", "io.", "de.", "de.tum.cit.ase"); + return StringUtils.containsAny(message, "org.", "java.", "net.", "jakarta.", "javax.", "com.", "io.", "de.", "de.tum.cit.aet"); } } diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml index f1eebb20..62bd3360 100644 --- a/src/main/resources/config/application-dev.yml +++ b/src/main/resources/config/application-dev.yml @@ -18,7 +18,7 @@ logging: ROOT: INFO tech.jhipster: INFO org.hibernate.SQL: INFO - de.tum.cit.ase: INFO + de.tum.cit.aet: INFO com.hazelcast: WARN spring: diff --git a/src/main/resources/config/application-prod.yml b/src/main/resources/config/application-prod.yml index 0272684a..3b5932d1 100644 --- a/src/main/resources/config/application-prod.yml +++ b/src/main/resources/config/application-prod.yml @@ -17,7 +17,7 @@ logging: level: ROOT: INFO tech.jhipster: INFO - de.tum.cit.ase: INFO + de.tum.cit.aet: INFO management: prometheus: diff --git a/src/test/resources/junit-platform.properties b/src/test/resources/junit-platform.properties index 714da79d..0cb0e1a5 100644 --- a/src/test/resources/junit-platform.properties +++ b/src/test/resources/junit-platform.properties @@ -1,4 +1,4 @@ junit.jupiter.execution.timeout.default = 15 s junit.jupiter.execution.timeout.testable.method.default = 15 s junit.jupiter.execution.timeout.beforeall.method.default = 60 s -junit.jupiter.testclass.order.default=de.tum.cit.ase.config.SpringBootTestClassOrderer +junit.jupiter.testclass.order.default=de.tum.cit.aet.config.SpringBootTestClassOrderer