Refactor pom.xml and remove unused dependencies

2024-10-21 13:43:37 +02:00
parent e6f2b2c4ca
commit 9139a169d4
15 changed files with 25 additions and 76 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -117,11 +117,7 @@
 				<artifactId>gson</artifactId>
 				<version>2.8.8</version>
 		</dependency>
-		<dependency>
-			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-			<version>2.5.0</version>
-		</dependency>
+		
 		<dependency>
 			<groupId>com.olympus</groupId>
 			<artifactId>common</artifactId>
--- 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;

--- 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 {
--- 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;

--- a/src/main/java/com/olympus/hermione/models/Application.java
+++ b/src/main/java/com/olympus/hermione/models/Application.java
@@ -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;
-    
-}
--- a/src/main/java/com/olympus/hermione/models/Project.java
+++ b/src/main/java/com/olympus/hermione/models/Project.java
@@ -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<Application> lstApplications;
-    
-}
--- 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<ScenarioStep> steps;
    private List<ScenarioInputs> inputs;
    private String modelId;
+
+
    @DocumentReference
    private List<Project> availableForProjects;
    @DocumentReference
--- 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<Application, String> {
--- 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<Project, String> {
--- 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;
--- 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;
--- 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
--- 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 {
--- 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;

--- 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