diff --git a/pom.xml b/pom.xml index 867d227..b97f1b4 100644 --- a/pom.xml +++ b/pom.xml @@ -117,11 +117,7 @@ gson 2.8.8 - - org.springdoc - springdoc-openapi-starter-webmvc-ui - 2.5.0 - + com.olympus common diff --git a/src/main/java/com/olympus/hermione/controllers/ApplicationController.java b/src/main/java/com/olympus/hermione/controllers/ApplicationController.java index 408737c..b76a5a2 100644 --- a/src/main/java/com/olympus/hermione/controllers/ApplicationController.java +++ b/src/main/java/com/olympus/hermione/controllers/ApplicationController.java @@ -1,18 +1,15 @@ package com.olympus.hermione.controllers; -import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.olympus.hermione.models.Application; -import com.olympus.hermione.models.Project; import com.olympus.hermione.repository.ApplicationRepository; import com.olympus.hermione.repository.ProjectRepository; import com.olympus.hermione.services.ApplicationService; -import com.olympus.hermione.services.ProjectService; +import com.olympus.model.Application; +import com.olympus.model.Project; + import java.util.List; import java.util.ArrayList; diff --git a/src/main/java/com/olympus/hermione/controllers/ProjectController.java b/src/main/java/com/olympus/hermione/controllers/ProjectController.java index 232c015..d5622c7 100644 --- a/src/main/java/com/olympus/hermione/controllers/ProjectController.java +++ b/src/main/java/com/olympus/hermione/controllers/ProjectController.java @@ -6,9 +6,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.olympus.hermione.models.Project; + import com.olympus.hermione.repository.ProjectRepository; import com.olympus.hermione.services.ProjectService; +import com.olympus.model.Project; @RestController public class ProjectController { diff --git a/src/main/java/com/olympus/hermione/controllers/ScenarioController.java b/src/main/java/com/olympus/hermione/controllers/ScenarioController.java index dbdf9e0..787697f 100644 --- a/src/main/java/com/olympus/hermione/controllers/ScenarioController.java +++ b/src/main/java/com/olympus/hermione/controllers/ScenarioController.java @@ -8,14 +8,14 @@ import org.springframework.web.bind.annotation.RestController; import com.olympus.hermione.dto.ScenarioExecutionInput; import com.olympus.hermione.dto.ScenarioOutput; -import com.olympus.hermione.models.Application; -import com.olympus.hermione.models.Project; import com.olympus.hermione.models.Scenario; import com.olympus.hermione.models.ScenarioExecution; import com.olympus.hermione.repository.ScenarioRepository; import com.olympus.hermione.repository.ScenarioExecutionRepository; import com.olympus.hermione.services.ScenarioExecutionService; import com.olympus.hermione.services.ScenarioService; +import com.olympus.model.Application; +import com.olympus.model.Project; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/olympus/hermione/models/Application.java b/src/main/java/com/olympus/hermione/models/Application.java deleted file mode 100644 index a3c1765..0000000 --- a/src/main/java/com/olympus/hermione/models/Application.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.olympus.hermione.models; - -import org.bson.types.ObjectId; -import org.springframework.data.annotation.Id; -import org.springframework.data.mongodb.core.mapping.Document; -import org.springframework.data.mongodb.core.mapping.DocumentReference; -import org.springframework.data.mongodb.core.mapping.Field; -import org.springframework.data.mongodb.core.mapping.FieldType; - -import lombok.Getter; -import lombok.Setter; - -@Document(collection = "applications") -@Getter @Setter -public class Application { - - @Id - @Field(targetType = FieldType.OBJECT_ID) - private String id; - private String internal_name; - private String FE_name; - private String description; - -} diff --git a/src/main/java/com/olympus/hermione/models/Project.java b/src/main/java/com/olympus/hermione/models/Project.java deleted file mode 100644 index 40b759a..0000000 --- a/src/main/java/com/olympus/hermione/models/Project.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.olympus.hermione.models; - -import java.util.List; - -import org.bson.types.ObjectId; -import org.springframework.data.annotation.Id; -import org.springframework.data.mongodb.core.mapping.Document; -import org.springframework.data.mongodb.core.mapping.DocumentReference; -import org.springframework.data.mongodb.core.mapping.Field; -import org.springframework.data.mongodb.core.mapping.FieldType; - -import lombok.Getter; -import lombok.Setter; - -@Document(collection = "projects") -@Getter @Setter -public class Project { - - @Id - @Field(targetType = FieldType.OBJECT_ID) - private String id; - private String internal_name; - private String FE_name; - private String description; - @DocumentReference - private List lstApplications; - -} diff --git a/src/main/java/com/olympus/hermione/models/Scenario.java b/src/main/java/com/olympus/hermione/models/Scenario.java index 9515ffd..18efdbe 100644 --- a/src/main/java/com/olympus/hermione/models/Scenario.java +++ b/src/main/java/com/olympus/hermione/models/Scenario.java @@ -8,6 +8,8 @@ import org.springframework.data.mongodb.core.mapping.DocumentReference; import org.springframework.data.mongodb.core.mapping.Field; import org.springframework.data.mongodb.core.mapping.FieldType; +import com.olympus.model.Project; + import lombok.Getter; import lombok.Setter; @@ -23,6 +25,8 @@ public class Scenario { private List steps; private List inputs; private String modelId; + + @DocumentReference private List availableForProjects; @DocumentReference diff --git a/src/main/java/com/olympus/hermione/repository/ApplicationRepository.java b/src/main/java/com/olympus/hermione/repository/ApplicationRepository.java index 7f99abf..5bf7aa4 100644 --- a/src/main/java/com/olympus/hermione/repository/ApplicationRepository.java +++ b/src/main/java/com/olympus/hermione/repository/ApplicationRepository.java @@ -3,9 +3,10 @@ package com.olympus.hermione.repository; import org.bson.types.ObjectId; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.stereotype.Repository; -import java.util.List; -import com.olympus.hermione.models.Application; +import com.olympus.model.Application; + +import java.util.List; @Repository public interface ApplicationRepository extends MongoRepository { diff --git a/src/main/java/com/olympus/hermione/repository/ProjectRepository.java b/src/main/java/com/olympus/hermione/repository/ProjectRepository.java index d47001d..ca75b26 100644 --- a/src/main/java/com/olympus/hermione/repository/ProjectRepository.java +++ b/src/main/java/com/olympus/hermione/repository/ProjectRepository.java @@ -5,7 +5,7 @@ import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.stereotype.Repository; import com.olympus.hermione.dto.ScenarioOutput; -import com.olympus.hermione.models.Project; +import com.olympus.model.Project; @Repository public interface ProjectRepository extends MongoRepository { diff --git a/src/main/java/com/olympus/hermione/security/dto/AuthenticationResponse.java b/src/main/java/com/olympus/hermione/security/dto/AuthenticationResponse.java index 4f2bd25..3d3a06a 100644 --- a/src/main/java/com/olympus/hermione/security/dto/AuthenticationResponse.java +++ b/src/main/java/com/olympus/hermione/security/dto/AuthenticationResponse.java @@ -2,8 +2,8 @@ package com.olympus.hermione.security.dto; import java.util.List; -import com.olympus.hermione.models.Project; import com.olympus.hermione.security.entity.User; +import com.olympus.model.Project; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/olympus/hermione/security/entity/User.java b/src/main/java/com/olympus/hermione/security/entity/User.java index 6c9b7eb..c73ef46 100644 --- a/src/main/java/com/olympus/hermione/security/entity/User.java +++ b/src/main/java/com/olympus/hermione/security/entity/User.java @@ -9,7 +9,7 @@ import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; -import com.olympus.hermione.models.Project; +import com.olympus.model.Project; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/olympus/hermione/services/ApplicationService.java b/src/main/java/com/olympus/hermione/services/ApplicationService.java index 5560d3c..0d320ed 100644 --- a/src/main/java/com/olympus/hermione/services/ApplicationService.java +++ b/src/main/java/com/olympus/hermione/services/ApplicationService.java @@ -7,11 +7,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; -import com.olympus.hermione.models.Project; import com.olympus.hermione.repository.ApplicationRepository; import com.olympus.hermione.repository.ProjectRepository; import com.olympus.hermione.security.entity.User; -import com.olympus.hermione.models.Application; +import com.olympus.model.Application; +import com.olympus.model.Project; + import java.util.List; @Service diff --git a/src/main/java/com/olympus/hermione/services/ProjectService.java b/src/main/java/com/olympus/hermione/services/ProjectService.java index 3f8f3a6..762ef38 100644 --- a/src/main/java/com/olympus/hermione/services/ProjectService.java +++ b/src/main/java/com/olympus/hermione/services/ProjectService.java @@ -16,11 +16,11 @@ import org.springframework.stereotype.Service; import com.fasterxml.jackson.databind.ObjectMapper; import com.olympus.hermione.dto.ScenarioOutput; -import com.olympus.hermione.models.Project; import com.olympus.hermione.models.ScenarioExecution; import com.olympus.hermione.repository.ProjectRepository; import com.olympus.hermione.security.entity.User; import com.olympus.hermione.security.repository.UserRepository; +import com.olympus.model.Project; @Service public class ProjectService { diff --git a/src/main/java/com/olympus/hermione/services/ScenarioService.java b/src/main/java/com/olympus/hermione/services/ScenarioService.java index 8d18a9c..3d22e95 100644 --- a/src/main/java/com/olympus/hermione/services/ScenarioService.java +++ b/src/main/java/com/olympus/hermione/services/ScenarioService.java @@ -6,11 +6,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; -import com.olympus.hermione.models.Project; import com.olympus.hermione.models.Scenario; import com.olympus.hermione.repository.ProjectRepository; import com.olympus.hermione.repository.ScenarioRepository; import com.olympus.hermione.security.entity.User; +import com.olympus.model.Project; + import java.util.List; import org.bson.types.ObjectId; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index e66f654..92c72a6 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -33,6 +33,6 @@ logging.level.org.springframework.ai.chat.client.advisor=DEBUG eureka.client.serviceUrl.defaultZone: ${EUREKA_URI:http://localhost:8761/eureka} eureka.instance.preferIpAddress: true -hermione.fe.url = +hermione.fe.url = http://127.0.0.1:5173/ java-parser-module.url: http://java-parser-module-service.olympus.svc.cluster.local:8080 \ No newline at end of file