diff --git a/Dockerfile b/Dockerfile index 5e939e9..472ce44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,4 +21,4 @@ ARG DEPENDENCY=/workspace/app/build/dependency COPY --from=build ${DEPENDENCY}/BOOT-INF/lib /app/lib COPY --from=build ${DEPENDENCY}/META-INF /app/META-INF COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /app -ENTRYPOINT ["java","-cp","app:app/lib/*","de.unistuttgart.iste.meitrex.template.TemplateForMicroservicesApplication"] \ No newline at end of file +ENTRYPOINT ["java","-cp","app:app/lib/*","de.unistuttgart.iste.meitrex.assignment_service.AssignmentServiceApplication"] \ No newline at end of file diff --git a/README.md b/README.md index 0abd8d2..e01fa9b 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ This package contains the GraphQL controllers (and other types of controllers if In some services, there is also a class called SubscriptionController which handles all dapr event subscriptions. More information can be found in -the [Controller package](src/main/java/de/unistuttgart/iste/meitrex/template/controller/package-info.java). +the [Controller package](src/main/java/de/unistuttgart/iste/meitrex/assignment_service/controller/package-info.java). ### Dapr package @@ -64,7 +64,7 @@ The DTOs are used to transfer data between the GraphQL controller and the servic This package is used for exception handling. Note that with GraphQL, the exceptions are not thrown directly, but are wrapped in a `GraphQLException`, which is different that from the usual Spring Boot approach. More information can be found in -the [Exception package](src/main/java/de/unistuttgart/iste/meitrex/template/exception/package-info.java). +the [Exception package](src/main/java/de/unistuttgart/iste/meitrex/assignment_service/exception/package-info.java). ### Persistence package @@ -87,8 +87,8 @@ The 'mapper' package is responsible for the mapping logic between the database e This structure helps organize the database-related components of the project, making it easier to manage and maintain. More information can be found in -the [Entity package](src/main/java/de/unistuttgart/iste/meitrex/template/persistence/entity/package-info.java) and -the [Repository package](src/main/java/de/unistuttgart/iste/meitrex/template/persistence/repository/package-info.java). +the [Entity package](src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/entity/package-info.java) and +the [Repository package](src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/repository/package-info.java). ### Service package @@ -97,7 +97,7 @@ the [Repository package](src/main/java/de/unistuttgart/iste/meitrex/template/per This package contains all classes that are used to handle the business logic of the microservice. Services are annotated with the `@Service` annotation. Services contain only business logic and delegate the data access to the persistence layer (repositories). More information can be found in -the [Service package](src/main/java/de/unistuttgart/iste/meitrex/template/service/package-info.java). +the [Service package](src/main/java/de/unistuttgart/iste/meitrex/assignment_service/service/package-info.java). ### Validation package diff --git a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/config/GraphQlScalarsAndValidationConfiguration.java b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/config/GraphQlScalarsAndValidationConfiguration.java index fab8829..753cb9f 100644 --- a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/config/GraphQlScalarsAndValidationConfiguration.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/config/GraphQlScalarsAndValidationConfiguration.java @@ -1,4 +1,4 @@ -package de.unistuttgart.iste.meitrex.template.config; +package de.unistuttgart.iste.meitrex.assignment_service.config; import graphql.scalars.ExtendedScalars; import graphql.validation.rules.OnValidationErrorStrategy; diff --git a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/config/ModelMapperConfiguration.java b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/config/ModelMapperConfiguration.java index d01831b..82df368 100644 --- a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/config/ModelMapperConfiguration.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/config/ModelMapperConfiguration.java @@ -1,4 +1,4 @@ -package de.unistuttgart.iste.meitrex.template.config; +package de.unistuttgart.iste.meitrex.assignment_service.config; import org.modelmapper.ModelMapper; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/config/package-info.java b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/config/package-info.java index 01d0a9b..8f1e7e8 100644 --- a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/config/package-info.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/config/package-info.java @@ -1,4 +1,4 @@ /** * This package should contain any classes that are used to configure the application. */ -package de.unistuttgart.iste.meitrex.template.config; \ No newline at end of file +package de.unistuttgart.iste.meitrex.assignment_service.config; \ No newline at end of file diff --git a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/controller/TemplateController.java b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/controller/TemplateController.java index 4acff08..85f0a23 100644 --- a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/controller/TemplateController.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/controller/TemplateController.java @@ -1,7 +1,7 @@ -package de.unistuttgart.iste.meitrex.template.controller; +package de.unistuttgart.iste.meitrex.assignment_service.controller; import de.unistuttgart.iste.meitrex.generated.dto.Template; -import de.unistuttgart.iste.meitrex.template.service.TemplateService; +import de.unistuttgart.iste.meitrex.assignment_service.service.TemplateService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.graphql.data.method.annotation.QueryMapping; diff --git a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/controller/package-info.java b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/controller/package-info.java index d77a3c1..8ae2ede 100644 --- a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/controller/package-info.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/controller/package-info.java @@ -10,4 +10,4 @@ * An example of our dummy backend would be * this controller. */ -package de.unistuttgart.iste.meitrex.template.controller; \ No newline at end of file +package de.unistuttgart.iste.meitrex.assignment_service.controller; \ No newline at end of file diff --git a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/dapr/package-info.java b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/dapr/package-info.java index 91e30e9..463b72d 100644 --- a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/dapr/package-info.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/dapr/package-info.java @@ -1,4 +1,4 @@ /** * This package should contain all classes that are used to communicate with Dapr, e.g. using pub sub. */ -package de.unistuttgart.iste.meitrex.template.dapr; \ No newline at end of file +package de.unistuttgart.iste.meitrex.assignment_service.dapr; \ No newline at end of file diff --git a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/exception/ExceptionResolver.java b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/exception/ExceptionResolver.java index d686e0f..02b1c8b 100644 --- a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/exception/ExceptionResolver.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/exception/ExceptionResolver.java @@ -1,4 +1,4 @@ -package de.unistuttgart.iste.meitrex.template.exception; +package de.unistuttgart.iste.meitrex.assignment_service.exception; import de.unistuttgart.iste.meitrex.common.exception.ExceptionToGraphQlErrorConverter; import graphql.GraphQLError; diff --git a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/exception/package-info.java b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/exception/package-info.java index df4684a..ca634fd 100644 --- a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/exception/package-info.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/exception/package-info.java @@ -3,4 +3,4 @@ * More info about exception handling with GraphQL can be found here: * https://www.baeldung.com/spring-graphql-error-handling */ -package de.unistuttgart.iste.meitrex.template.exception; \ No newline at end of file +package de.unistuttgart.iste.meitrex.assignment_service.exception; \ No newline at end of file diff --git a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/entity/TemplateEntity.java b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/entity/TemplateEntity.java index 63e50fb..dabe1dd 100644 --- a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/entity/TemplateEntity.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/entity/TemplateEntity.java @@ -1,4 +1,4 @@ -package de.unistuttgart.iste.meitrex.template.persistence.entity; +package de.unistuttgart.iste.meitrex.assignment_service.persistence.entity; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/entity/package-info.java b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/entity/package-info.java index 527facf..d2ad6c2 100644 --- a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/entity/package-info.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/entity/package-info.java @@ -10,4 +10,4 @@ * To avoid having to implement getters, setters, builders, etc. we use Lombok. * The Lombok annotations (e.g. {@code @Data}) should be used in the entities. */ -package de.unistuttgart.iste.meitrex.template.persistence.entity; \ No newline at end of file +package de.unistuttgart.iste.meitrex.assignment_service.persistence.entity; \ No newline at end of file diff --git a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/mapper/TemplateMapper.java b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/mapper/TemplateMapper.java index d7be171..8a2245a 100644 --- a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/mapper/TemplateMapper.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/mapper/TemplateMapper.java @@ -1,7 +1,7 @@ -package de.unistuttgart.iste.meitrex.template.persistence.mapper; +package de.unistuttgart.iste.meitrex.assignment_service.persistence.mapper; import de.unistuttgart.iste.meitrex.generated.dto.Template; -import de.unistuttgart.iste.meitrex.template.persistence.entity.TemplateEntity; +import de.unistuttgart.iste.meitrex.assignment_service.persistence.entity.TemplateEntity; import lombok.RequiredArgsConstructor; import org.modelmapper.ModelMapper; import org.springframework.stereotype.Component; diff --git a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/mapper/package-info.java b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/mapper/package-info.java index cf3f9b3..1a89478 100644 --- a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/mapper/package-info.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/mapper/package-info.java @@ -1,4 +1,4 @@ /** * This package contains all the mapper classes that map between DTOs and entities. */ -package de.unistuttgart.iste.meitrex.template.persistence.mapper; \ No newline at end of file +package de.unistuttgart.iste.meitrex.assignment_service.persistence.mapper; \ No newline at end of file diff --git a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/repository/TemplateRepository.java b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/repository/TemplateRepository.java index 0854469..7dee408 100644 --- a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/repository/TemplateRepository.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/repository/TemplateRepository.java @@ -1,6 +1,6 @@ -package de.unistuttgart.iste.meitrex.template.persistence.repository; +package de.unistuttgart.iste.meitrex.assignment_service.persistence.repository; -import de.unistuttgart.iste.meitrex.template.persistence.entity.TemplateEntity; +import de.unistuttgart.iste.meitrex.assignment_service.persistence.entity.TemplateEntity; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/repository/package-info.java b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/repository/package-info.java index feb884d..0ee9aea 100644 --- a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/repository/package-info.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/persistence/repository/package-info.java @@ -7,4 +7,4 @@ * For more information, see this tutorial * or the official documentation. */ -package de.unistuttgart.iste.meitrex.template.persistence.repository; \ No newline at end of file +package de.unistuttgart.iste.meitrex.assignment_service.persistence.repository; \ No newline at end of file diff --git a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/service/TemplateService.java b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/service/TemplateService.java index 5be9606..551495c 100644 --- a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/service/TemplateService.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/service/TemplateService.java @@ -1,9 +1,9 @@ -package de.unistuttgart.iste.meitrex.template.service; +package de.unistuttgart.iste.meitrex.assignment_service.service; import de.unistuttgart.iste.meitrex.generated.dto.Template; -import de.unistuttgart.iste.meitrex.template.persistence.entity.TemplateEntity; -import de.unistuttgart.iste.meitrex.template.persistence.mapper.TemplateMapper; -import de.unistuttgart.iste.meitrex.template.persistence.repository.TemplateRepository; +import de.unistuttgart.iste.meitrex.assignment_service.persistence.entity.TemplateEntity; +import de.unistuttgart.iste.meitrex.assignment_service.persistence.mapper.TemplateMapper; +import de.unistuttgart.iste.meitrex.assignment_service.persistence.repository.TemplateRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/service/package-info.java b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/service/package-info.java index aec2768..3aa73db 100644 --- a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/service/package-info.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/service/package-info.java @@ -2,4 +2,4 @@ * The service classes implement the actual business logic. This usually includes the interaction with the * repositories and the mapping of the entities to DTOs. */ -package de.unistuttgart.iste.meitrex.template.service; \ No newline at end of file +package de.unistuttgart.iste.meitrex.assignment_service.service; \ No newline at end of file diff --git a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/validation/TemplateValidator.java b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/validation/TemplateValidator.java index ac54ac6..e4755eb 100644 --- a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/validation/TemplateValidator.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/validation/TemplateValidator.java @@ -1,4 +1,4 @@ -package de.unistuttgart.iste.meitrex.template.validation; +package de.unistuttgart.iste.meitrex.assignment_service.validation; import de.unistuttgart.iste.meitrex.generated.dto.Template; import org.springframework.stereotype.Component; diff --git a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/validation/package-info.java b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/validation/package-info.java index 5f496e3..63e3047 100644 --- a/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/validation/package-info.java +++ b/src/main/java/de/unistuttgart/iste/meitrex/assignment_service/validation/package-info.java @@ -1,4 +1,4 @@ /** * Put class level validation logic in this package. */ -package de.unistuttgart.iste.meitrex.template.validation; \ No newline at end of file +package de.unistuttgart.iste.meitrex.assignment_service.validation; \ No newline at end of file diff --git a/src/test/java/de/unistuttgart/iste/meitrex/template/TemplateForMicroservicesApplicationTests.java b/src/test/java/de/unistuttgart/iste/meitrex/assignment_service/TemplateForMicroservicesApplicationTests.java similarity index 75% rename from src/test/java/de/unistuttgart/iste/meitrex/template/TemplateForMicroservicesApplicationTests.java rename to src/test/java/de/unistuttgart/iste/meitrex/assignment_service/TemplateForMicroservicesApplicationTests.java index d3742d7..139a719 100644 --- a/src/test/java/de/unistuttgart/iste/meitrex/template/TemplateForMicroservicesApplicationTests.java +++ b/src/test/java/de/unistuttgart/iste/meitrex/assignment_service/TemplateForMicroservicesApplicationTests.java @@ -1,4 +1,4 @@ -package de.unistuttgart.iste.meitrex.template; +package de.unistuttgart.iste.meitrex.assignment_service; import org.springframework.boot.test.context.SpringBootTest;