diff --git a/.github/workflows/generate-intelligence-service-client.yml b/.github/workflows/generate-intelligence-service-client.yml index 6ee8dfa1..8f2a0b73 100644 --- a/.github/workflows/generate-intelligence-service-client.yml +++ b/.github/workflows/generate-intelligence-service-client.yml @@ -9,7 +9,7 @@ on: push: paths: - 'server/intelligence-service/openapi.yaml' - - 'server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/**' + - 'server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/**' branches: [develop] workflow_dispatch: diff --git a/package-lock.json b/package-lock.json index 8d9b6b00..23ea9a38 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@openapitools/openapi-generator-cli": "2.13.5", "rimraf": "6.0.1", - "shx": "^0.3.4" + "shx": "0.3.4" } }, "node_modules/@babel/runtime": { diff --git a/package.json b/package.json index bdeaaa99..086fe497 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ ], "scripts": { "generate:api:application-server:clean": "rimraf webapp/src/app/core/modules/openapi", - "generate:api:intelligence-service:clean": "rimraf server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi", + "generate:api:intelligence-service:clean": "rimraf server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice", "generate:api:clean": "npm run generate:api:intelligence-service:clean && npm run generate:api:application-server:clean", "generate:api:application-server-specs": "cd server/application-server && mvn verify -DskipTests=true -Dapp.profiles=specs", @@ -13,7 +13,7 @@ "generate:api:specs": "npm run generate:api:application-server-specs && npm run generate:api:intelligence-service-specs", "generate:api:application-server-client": "npx openapi-generator-cli generate -i server/application-server/openapi.yaml -g typescript-angular -o webapp/src/app/core/modules/openapi --additional-properties fileNaming=kebab-case,withInterfaces=true --generate-alias-as-model", - "generate:api:intelligence-service-client": "npx openapi-generator-cli generate -i server/intelligence-service/openapi.yaml -g java --library resttemplate --api-package de.tum.in.www1.hephaestus.intelligenceapi.api --model-package de.tum.in.www1.hephaestus.intelligenceapi.model --invoker-package de.tum.in.www1.hephaestus.intelligenceapi --additional-properties useJakartaEe=true,performBeanValidation=true,generateClientAsBean=true --package-name de.tum.in.www1.hephaestus.intelligenceapi -o tmp/java-client && shx cp -r tmp/java-client/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi server/application-server/src/main/java/de/tum/in/www1/hephaestus && rimraf tmp", + "generate:api:intelligence-service-client": "npx openapi-generator-cli generate -i server/intelligence-service/openapi.yaml -g java --library resttemplate --api-package de.tum.in.www1.hephaestus.intelligenceservice.api --model-package de.tum.in.www1.hephaestus.intelligenceservice.model --invoker-package de.tum.in.www1.hephaestus.intelligenceservice --additional-properties useJakartaEe=true,performBeanValidation=true,generateClientAsBean=true,hideGenerationTimestamp=true --package-name de.tum.in.www1.hephaestus.intelligenceservice -o tmp/java-client && shx cp -r tmp/java-client/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice server/application-server/src/main/java/de/tum/in/www1/hephaestus && rimraf tmp", "generate:api:clients": "npm run generate:api:intelligence-service-client && npm run generate:api:application-server-client", "generate:api:application-server": "npm run generate:api:application-server-specs && npm run generate:api:application-server:clean && npm run generate:api:application-server-client", @@ -23,6 +23,6 @@ "devDependencies": { "@openapitools/openapi-generator-cli": "2.13.5", "rimraf": "6.0.1", - "shx": "^0.3.4" + "shx": "0.3.4" } } diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/IntelligenceApiClientConfig.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/IntelligenceApiClientConfig.java deleted file mode 100644 index 575a64ac..00000000 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/IntelligenceApiClientConfig.java +++ /dev/null @@ -1,14 +0,0 @@ -package de.tum.in.www1.hephaestus; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; - -import de.tum.in.www1.hephaestus.intelligenceapi.ApiClient; - -@Configuration -public class IntelligenceApiClientConfig { - @Autowired - public IntelligenceApiClientConfig(ApiClient apiClient) { - apiClient.setBasePath("http://localhost"); - } -} diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/ApiClient.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/ApiClient.java similarity index 98% rename from server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/ApiClient.java rename to server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/ApiClient.java index 7b2f1071..4f663edf 100644 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/ApiClient.java +++ b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/ApiClient.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.hephaestus.intelligenceapi; +package de.tum.in.www1.hephaestus.intelligenceservice; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -56,10 +56,10 @@ import java.util.function.Supplier; import java.time.OffsetDateTime; -import de.tum.in.www1.hephaestus.intelligenceapi.auth.Authentication; +import de.tum.in.www1.hephaestus.intelligenceservice.auth.Authentication; -@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-10-29T19:53:57.523401+01:00[Europe/Berlin]", comments = "Generator version: 7.7.0") -@Component("de.tum.in.www1.hephaestus.intelligenceapi.ApiClient") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") +@Component("de.tum.in.www1.hephaestus.intelligenceservice.ApiClient") public class ApiClient extends JavaTimeFormatter { public enum CollectionFormat { CSV(","), TSV("\t"), SSV(" "), PIPES("|"), MULTI(null); diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/BaseApi.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/BaseApi.java similarity index 94% rename from server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/BaseApi.java rename to server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/BaseApi.java index abcb2ea6..2c4b0c55 100644 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/BaseApi.java +++ b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/BaseApi.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.hephaestus.intelligenceapi; +package de.tum.in.www1.hephaestus.intelligenceservice; import org.springframework.web.client.RestClientException; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; -@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-10-29T19:53:57.523401+01:00[Europe/Berlin]", comments = "Generator version: 7.7.0") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public abstract class BaseApi { protected ApiClient apiClient; diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/BeanValidationException.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/BeanValidationException.java similarity index 92% rename from server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/BeanValidationException.java rename to server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/BeanValidationException.java index 279ceb8f..b80b521c 100644 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/BeanValidationException.java +++ b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/BeanValidationException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.hephaestus.intelligenceapi; +package de.tum.in.www1.hephaestus.intelligenceservice; import java.util.Set; diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/JavaTimeFormatter.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/JavaTimeFormatter.java similarity index 92% rename from server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/JavaTimeFormatter.java rename to server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/JavaTimeFormatter.java index f5be0b8b..504d89cb 100644 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/JavaTimeFormatter.java +++ b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/JavaTimeFormatter.java @@ -10,7 +10,7 @@ * Do not edit the class manually. */ -package de.tum.in.www1.hephaestus.intelligenceapi; +package de.tum.in.www1.hephaestus.intelligenceservice; import java.time.OffsetDateTime; import java.time.format.DateTimeFormatter; @@ -20,7 +20,7 @@ * Class that add parsing/formatting support for Java 8+ {@code OffsetDateTime} class. * It's generated for java clients when {@code AbstractJavaCodegen#dateLibrary} specified as {@code java8}. */ -@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-10-29T19:53:57.523401+01:00[Europe/Berlin]", comments = "Generator version: 7.7.0") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class JavaTimeFormatter { private DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME; diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/RFC3339DateFormat.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/RFC3339DateFormat.java similarity index 89% rename from server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/RFC3339DateFormat.java rename to server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/RFC3339DateFormat.java index 51f04a3b..cd4ed44b 100644 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/RFC3339DateFormat.java +++ b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/RFC3339DateFormat.java @@ -10,7 +10,7 @@ * Do not edit the class manually. */ -package de.tum.in.www1.hephaestus.intelligenceapi; +package de.tum.in.www1.hephaestus.intelligenceservice; import com.fasterxml.jackson.databind.util.StdDateFormat; @@ -22,7 +22,7 @@ import java.util.GregorianCalendar; import java.util.TimeZone; -@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-10-29T19:53:57.523401+01:00[Europe/Berlin]", comments = "Generator version: 7.7.0") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class RFC3339DateFormat extends DateFormat { private static final long serialVersionUID = 1L; private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC"); diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/ServerConfiguration.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/ServerConfiguration.java similarity index 91% rename from server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/ServerConfiguration.java rename to server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/ServerConfiguration.java index 4fcb64c1..6c028d27 100644 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/ServerConfiguration.java +++ b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/ServerConfiguration.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.hephaestus.intelligenceapi; +package de.tum.in.www1.hephaestus.intelligenceservice; import java.util.Map; /** * Representing a Server configuration. */ -@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-10-29T19:53:57.523401+01:00[Europe/Berlin]", comments = "Generator version: 7.7.0") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ServerConfiguration { public String URL; public String description; diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/ServerVariable.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/ServerVariable.java similarity index 81% rename from server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/ServerVariable.java rename to server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/ServerVariable.java index a08397e6..dfffb5c9 100644 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/ServerVariable.java +++ b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/ServerVariable.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.hephaestus.intelligenceapi; +package de.tum.in.www1.hephaestus.intelligenceservice; import java.util.HashSet; /** * Representing a Server Variable for server URL template substitution. */ -@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-10-29T19:53:57.523401+01:00[Europe/Berlin]", comments = "Generator version: 7.7.0") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ServerVariable { public String description; public String defaultValue; diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/api/DefaultApi.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/api/DefaultApi.java similarity index 89% rename from server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/api/DefaultApi.java rename to server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/api/DefaultApi.java index b4d47087..a7dc7925 100644 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/api/DefaultApi.java +++ b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/api/DefaultApi.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.hephaestus.intelligenceapi.api; +package de.tum.in.www1.hephaestus.intelligenceservice.api; -import de.tum.in.www1.hephaestus.intelligenceapi.ApiClient; -import de.tum.in.www1.hephaestus.intelligenceapi.BaseApi; +import de.tum.in.www1.hephaestus.intelligenceservice.ApiClient; +import de.tum.in.www1.hephaestus.intelligenceservice.BaseApi; -import de.tum.in.www1.hephaestus.intelligenceapi.model.ChatRequest; -import de.tum.in.www1.hephaestus.intelligenceapi.model.ChatResponse; -import de.tum.in.www1.hephaestus.intelligenceapi.model.HTTPValidationError; +import de.tum.in.www1.hephaestus.intelligenceservice.model.ChatRequest; +import de.tum.in.www1.hephaestus.intelligenceservice.model.ChatResponse; +import de.tum.in.www1.hephaestus.intelligenceservice.model.HTTPValidationError; import java.util.Collections; import java.util.HashMap; @@ -28,8 +28,8 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-10-29T19:53:57.523401+01:00[Europe/Berlin]", comments = "Generator version: 7.7.0") -@Component("de.tum.in.www1.hephaestus.intelligenceapi.api.DefaultApi") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") +@Component("de.tum.in.www1.hephaestus.intelligenceservice.api.DefaultApi") public class DefaultApi extends BaseApi { public DefaultApi() { diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/auth/ApiKeyAuth.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/auth/ApiKeyAuth.java similarity index 89% rename from server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/auth/ApiKeyAuth.java rename to server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/auth/ApiKeyAuth.java index 8380140e..f6f61277 100644 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/auth/ApiKeyAuth.java +++ b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/auth/ApiKeyAuth.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.hephaestus.intelligenceapi.auth; +package de.tum.in.www1.hephaestus.intelligenceservice.auth; import org.springframework.http.HttpHeaders; import org.springframework.util.MultiValueMap; -@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-10-29T19:53:57.523401+01:00[Europe/Berlin]", comments = "Generator version: 7.7.0") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ApiKeyAuth implements Authentication { private final String location; private final String paramName; diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/auth/Authentication.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/auth/Authentication.java similarity index 90% rename from server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/auth/Authentication.java rename to server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/auth/Authentication.java index 6887e338..0840ad65 100644 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/auth/Authentication.java +++ b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/auth/Authentication.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.hephaestus.intelligenceapi.auth; +package de.tum.in.www1.hephaestus.intelligenceservice.auth; import org.springframework.http.HttpHeaders; import org.springframework.util.MultiValueMap; diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/auth/HttpBasicAuth.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/auth/HttpBasicAuth.java similarity index 86% rename from server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/auth/HttpBasicAuth.java rename to server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/auth/HttpBasicAuth.java index 8029c112..f7cb4e0f 100644 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/auth/HttpBasicAuth.java +++ b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/auth/HttpBasicAuth.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.hephaestus.intelligenceapi.auth; +package de.tum.in.www1.hephaestus.intelligenceservice.auth; import java.nio.charset.StandardCharsets; import java.util.Base64; @@ -6,7 +6,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.util.MultiValueMap; -@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-10-29T19:53:57.523401+01:00[Europe/Berlin]", comments = "Generator version: 7.7.0") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class HttpBasicAuth implements Authentication { private String username; private String password; diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/auth/HttpBearerAuth.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/auth/HttpBearerAuth.java similarity index 91% rename from server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/auth/HttpBearerAuth.java rename to server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/auth/HttpBearerAuth.java index bdf1f859..6cf59a22 100644 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/auth/HttpBearerAuth.java +++ b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/auth/HttpBearerAuth.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.hephaestus.intelligenceapi.auth; +package de.tum.in.www1.hephaestus.intelligenceservice.auth; import java.util.Optional; import java.util.function.Supplier; import org.springframework.http.HttpHeaders; import org.springframework.util.MultiValueMap; -@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-10-29T19:53:57.523401+01:00[Europe/Berlin]", comments = "Generator version: 7.7.0") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class HttpBearerAuth implements Authentication { private final String scheme; private Supplier tokenSupplier; diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/model/ChatRequest.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/model/ChatRequest.java similarity index 93% rename from server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/model/ChatRequest.java rename to server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/model/ChatRequest.java index 2086e0e1..70234d22 100644 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/model/ChatRequest.java +++ b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/model/ChatRequest.java @@ -11,7 +11,7 @@ */ -package de.tum.in.www1.hephaestus.intelligenceapi.model; +package de.tum.in.www1.hephaestus.intelligenceservice.model; import java.util.Objects; import java.util.Arrays; @@ -30,7 +30,7 @@ @JsonPropertyOrder({ ChatRequest.JSON_PROPERTY_MESSAGE }) -@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-10-29T19:53:57.523401+01:00[Europe/Berlin]", comments = "Generator version: 7.7.0") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ChatRequest { public static final String JSON_PROPERTY_MESSAGE = "message"; private String message; diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/model/ChatResponse.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/model/ChatResponse.java similarity index 93% rename from server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/model/ChatResponse.java rename to server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/model/ChatResponse.java index d21b03a3..a601104d 100644 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/model/ChatResponse.java +++ b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/model/ChatResponse.java @@ -11,7 +11,7 @@ */ -package de.tum.in.www1.hephaestus.intelligenceapi.model; +package de.tum.in.www1.hephaestus.intelligenceservice.model; import java.util.Objects; import java.util.Arrays; @@ -30,7 +30,7 @@ @JsonPropertyOrder({ ChatResponse.JSON_PROPERTY_RESPONSE }) -@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-10-29T19:53:57.523401+01:00[Europe/Berlin]", comments = "Generator version: 7.7.0") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ChatResponse { public static final String JSON_PROPERTY_RESPONSE = "response"; private String response; diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/model/HTTPValidationError.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/model/HTTPValidationError.java similarity index 92% rename from server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/model/HTTPValidationError.java rename to server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/model/HTTPValidationError.java index 0f513858..c66ebc68 100644 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/model/HTTPValidationError.java +++ b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/model/HTTPValidationError.java @@ -11,7 +11,7 @@ */ -package de.tum.in.www1.hephaestus.intelligenceapi.model; +package de.tum.in.www1.hephaestus.intelligenceservice.model; import java.util.Objects; import java.util.Arrays; @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import de.tum.in.www1.hephaestus.intelligenceapi.model.ValidationError; +import de.tum.in.www1.hephaestus.intelligenceservice.model.ValidationError; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -34,7 +34,7 @@ @JsonPropertyOrder({ HTTPValidationError.JSON_PROPERTY_DETAIL }) -@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-10-29T19:53:57.523401+01:00[Europe/Berlin]", comments = "Generator version: 7.7.0") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class HTTPValidationError { public static final String JSON_PROPERTY_DETAIL = "detail"; private List detail = new ArrayList<>(); diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/model/ValidationError.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/model/ValidationError.java similarity index 94% rename from server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/model/ValidationError.java rename to server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/model/ValidationError.java index b16bc3e7..458a22e0 100644 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/model/ValidationError.java +++ b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/model/ValidationError.java @@ -11,7 +11,7 @@ */ -package de.tum.in.www1.hephaestus.intelligenceapi.model; +package de.tum.in.www1.hephaestus.intelligenceservice.model; import java.util.Objects; import java.util.Arrays; @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import de.tum.in.www1.hephaestus.intelligenceapi.model.ValidationErrorLocInner; +import de.tum.in.www1.hephaestus.intelligenceservice.model.ValidationErrorLocInner; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -36,7 +36,7 @@ ValidationError.JSON_PROPERTY_MSG, ValidationError.JSON_PROPERTY_TYPE }) -@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-10-29T19:53:57.523401+01:00[Europe/Berlin]", comments = "Generator version: 7.7.0") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ValidationError { public static final String JSON_PROPERTY_LOC = "loc"; private List loc = new ArrayList<>(); diff --git a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/model/ValidationErrorLocInner.java b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/model/ValidationErrorLocInner.java similarity index 89% rename from server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/model/ValidationErrorLocInner.java rename to server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/model/ValidationErrorLocInner.java index 0ec5c292..3f3658e3 100644 --- a/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceapi/model/ValidationErrorLocInner.java +++ b/server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice/model/ValidationErrorLocInner.java @@ -11,7 +11,7 @@ */ -package de.tum.in.www1.hephaestus.intelligenceapi.model; +package de.tum.in.www1.hephaestus.intelligenceservice.model; import java.util.Objects; import java.util.Arrays; @@ -26,7 +26,7 @@ @JsonPropertyOrder({ }) @JsonTypeName("ValidationError_loc_inner") -@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-10-29T19:53:57.523401+01:00[Europe/Berlin]", comments = "Generator version: 7.7.0") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ValidationErrorLocInner { public ValidationErrorLocInner() { }