Skip to content

Commit

Permalink
Fix issues after package rename
Browse files Browse the repository at this point in the history
  • Loading branch information
krusche committed Dec 22, 2024
1 parent ab4b73a commit ca94268
Show file tree
Hide file tree
Showing 14 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .yo-rc.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ eclipse {
defaultTasks "bootRun"

springBoot {
mainClass = "de.tum.cit.ase.ArtemisBenchmarkingApp"
mainClass = "de.tum.cit.aet.ArtemisBenchmarkingApp"
}

test {
Expand Down
2 changes: 1 addition & 1 deletion gradle/liquibase.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/swagger.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion gradle/war.gradle
Original file line number Diff line number Diff line change
@@ -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")
}
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/jib/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" "$@"
Original file line number Diff line number Diff line change
Expand Up @@ -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.
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
2 changes: 1 addition & 1 deletion src/main/resources/config/application-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/config/application-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ logging:
level:
ROOT: INFO
tech.jhipster: INFO
de.tum.cit.ase: INFO
de.tum.cit.aet: INFO

management:
prometheus:
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/junit-platform.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit ca94268

Please sign in to comment.