Merge pull request #107 from smartSenseSolutions/main

fix: java package name
eclipse-tractusx · Jul 31, 2024 · 553bc55 · 553bc55
2 parents 65069f4 + dde05f7
commit 553bc55
Show file tree

Hide file tree

Showing 163 changed files with 1,540 additions and 1,534 deletions.
diff --git a/DEPENDENCIES_BACKEND b/DEPENDENCIES_BACKEND
@@ -65,7 +65,7 @@ maven/mavencentral/org.antlr/antlr4-runtime/4.13.0, BSD-3-Clause, approved, #107
 maven/mavencentral/org.apache.commons/commons-lang3/3.14.0, Apache-2.0, approved, #11677
 maven/mavencentral/org.apache.logging.log4j/log4j-api/2.21.1, Apache-2.0 AND (Apache-2.0 AND LGPL-2.0-or-later), approved, #11079
 maven/mavencentral/org.apache.logging.log4j/log4j-to-slf4j/2.21.1, Apache-2.0, approved, #15262
-maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/10.1.20, Apache-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND (CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND W3C AND CC0-1.0, approved, #5949
+maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/10.1.20, Apache-2.0 AND (EPL-2.0 OR (GPL-2.0 WITH Classpath-exception-2.0)) AND CDDL-1.0 AND (CDDL-1.1 OR (GPL-2.0-only WITH Classpath-exception-2.0)) AND EPL-2.0, approved, #15195
 maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/10.1.20, Apache-2.0, approved, #6997
 maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/10.1.20, Apache-2.0, approved, #7920
 maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, clearlydefined
@@ -99,7 +99,7 @@ maven/mavencentral/org.objenesis/objenesis/3.3, Apache-2.0, approved, clearlydef
 maven/mavencentral/org.openapitools/jackson-databind-nullable/0.2.0, Apache-2.0, approved, #3294
 maven/mavencentral/org.opentest4j/opentest4j/1.3.0, Apache-2.0, approved, #9713
 maven/mavencentral/org.ow2.asm/asm/9.6, BSD-3-Clause, approved, #10776
-maven/mavencentral/org.postgresql/postgresql/42.6.2, BSD-2-Clause AND Apache-2.0, approved, #9159
+maven/mavencentral/org.postgresql/postgresql/42.6.2, BSD-2-Clause AND Apache-2.0, approved, #15238
 maven/mavencentral/org.projectlombok/lombok/1.18.32, MIT, approved, #15192
 maven/mavencentral/org.reactivestreams/reactive-streams/1.0.4, CC0-1.0, approved, CQ16332
 maven/mavencentral/org.skyscreamer/jsonassert/1.5.1, Apache-2.0, approved, clearlydefined

diff --git a/...DemandCapacityMgmtBackendApplication.java → ...DemandCapacityMgmtBackendApplication.java b/...DemandCapacityMgmtBackendApplication.java → ...DemandCapacityMgmtBackendApplication.java
@@ -1,7 +1,7 @@
 /*
  *  *******************************************************************************
  *  Copyright (c) 2023 BMW AG
- *  Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *  Copyright (c) 2023, 2024 Contributors to the Eclipse Foundation
  *
  *    See the NOTICE file(s) distributed with this work for additional
  *    information regarding copyright ownership.
@@ -20,7 +20,7 @@
  *    ********************************************************************************
  */
 
-package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend;
+package org.eclipse.tractusx.demandcapacitymgm.backend;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/...gmtbackend/appinfo/InfoConfiguration.java → ...gm/backend/appinfo/InfoConfiguration.java b/...gmtbackend/appinfo/InfoConfiguration.java → ...gm/backend/appinfo/InfoConfiguration.java
@@ -19,7 +19,7 @@
  * *******************************************************************************
  */
 
-package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.appinfo;
+package org.eclipse.tractusx.demandcapacitymgm.backend.appinfo;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

diff --git a/...ackend/config/GlobalExceptionHandler.java → ...ackend/config/GlobalExceptionHandler.java b/...ackend/config/GlobalExceptionHandler.java → ...ackend/config/GlobalExceptionHandler.java
@@ -19,7 +19,7 @@
  *    ********************************************************************************
  */
 
-package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.config;
+package org.eclipse.tractusx.demandcapacitymgm.backend.config;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.exception.ExceptionUtils;

diff --git a/...backend/config/openapi/OpenApiConfig.java → ...backend/config/openapi/OpenApiConfig.java b/...backend/config/openapi/OpenApiConfig.java → ...backend/config/openapi/OpenApiConfig.java
@@ -19,7 +19,7 @@
  * *******************************************************************************
  */
 
-package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.config.openapi;
+package org.eclipse.tractusx.demandcapacitymgm.backend.config.openapi;
 
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
@@ -28,14 +28,15 @@
 import io.swagger.v3.oas.models.security.OAuthFlows;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
-import java.util.Collections;
 import lombok.AllArgsConstructor;
-import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.appinfo.InfoConfiguration;
-import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.security.AppSecurityConfigProperties;
+import org.eclipse.tractusx.demandcapacitymgm.backend.appinfo.InfoConfiguration;
+import org.eclipse.tractusx.demandcapacitymgm.backend.security.AppSecurityConfigProperties;
 import org.springdoc.core.models.GroupedOpenApi;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.Collections;
+
 @Configuration
 @AllArgsConstructor
 public class OpenApiConfig {

diff --git a/...nd/controllers/AddressBookController.java → ...nd/controllers/AddressBookController.java b/...nd/controllers/AddressBookController.java → ...nd/controllers/AddressBookController.java
@@ -1,7 +1,7 @@
 /*
  * ******************************************************************************
  * Copyright (c) 2023 BMW AG
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ * Copyright (c) 2023, 2024 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -20,23 +20,22 @@
  * *******************************************************************************
  */
 
-package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
+package org.eclipse.tractusx.demandcapacitymgm.backend.controllers;
 
-import eclipse.tractusx.demand_capacity_mgmt_specification.api.AddressBookApi;
-import eclipse.tractusx.demand_capacity_mgmt_specification.model.AddressBookRequest;
-import eclipse.tractusx.demand_capacity_mgmt_specification.model.AddressBookResponse;
-import eclipse.tractusx.demand_capacity_mgmt_specification.model.StatusRequest;
-import eclipse.tractusx.demand_capacity_mgmt_specification.model.StatusesResponse;
+import eclipse.tractusx.demandcapacitymgm.specification.api.AddressBookApi;
+import eclipse.tractusx.demandcapacitymgm.specification.model.AddressBookRequest;
+import eclipse.tractusx.demandcapacitymgm.specification.model.AddressBookResponse;
 import jakarta.servlet.http.HttpServletRequest;
-import java.util.List;
 import lombok.AllArgsConstructor;
-import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.enums.Role;
-import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.AddressBookService;
-import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.utils.UserUtil;
+import org.eclipse.tractusx.demandcapacitymgm.backend.entities.enums.Role;
+import org.eclipse.tractusx.demandcapacitymgm.backend.services.AddressBookService;
+import org.eclipse.tractusx.demandcapacitymgm.backend.utils.UserUtil;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @AllArgsConstructor
 public class AddressBookController implements AddressBookApi {

diff --git a/...d/controllers/AdminRulesetController.java → ...d/controllers/AdminRulesetController.java b/...d/controllers/AdminRulesetController.java → ...d/controllers/AdminRulesetController.java
@@ -1,7 +1,7 @@
 /*
  *  *******************************************************************************
  *  Copyright (c) 2023 BMW AG
- *  Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *  Copyright (c) 2023, 2024 Contributors to the Eclipse Foundation
  *
  *    See the NOTICE file(s) distributed with this work for additional
  *    information regarding copyright ownership.
@@ -20,22 +20,23 @@
  *    ********************************************************************************
  */
 
-package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
+package org.eclipse.tractusx.demandcapacitymgm.backend.controllers;
 
-import eclipse.tractusx.demand_capacity_mgmt_specification.api.RulesApi;
-import eclipse.tractusx.demand_capacity_mgmt_specification.model.AddRuleRequest;
-import eclipse.tractusx.demand_capacity_mgmt_specification.model.RuleRequest;
-import eclipse.tractusx.demand_capacity_mgmt_specification.model.RuleResponse;
+import eclipse.tractusx.demandcapacitymgm.specification.api.RulesApi;
+import eclipse.tractusx.demandcapacitymgm.specification.model.AddRuleRequest;
+import eclipse.tractusx.demandcapacitymgm.specification.model.RuleRequest;
+import eclipse.tractusx.demandcapacitymgm.specification.model.RuleResponse;
 import jakarta.servlet.http.HttpServletRequest;
-import java.util.List;
-import java.util.Objects;
 import lombok.AllArgsConstructor;
-import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.enums.Role;
-import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.RulesetService;
-import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.utils.UserUtil;
+import org.eclipse.tractusx.demandcapacitymgm.backend.entities.enums.Role;
+import org.eclipse.tractusx.demandcapacitymgm.backend.services.RulesetService;
+import org.eclipse.tractusx.demandcapacitymgm.backend.utils.UserUtil;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+import java.util.Objects;
+
 @RestController
 @AllArgsConstructor
 public class AdminRulesetController implements RulesApi {

diff --git a/...tbackend/controllers/AlertController.java → .../backend/controllers/AlertController.java b/...tbackend/controllers/AlertController.java → .../backend/controllers/AlertController.java
@@ -1,7 +1,7 @@
 /*
  * ******************************************************************************
  * Copyright (c) 2023 BMW AG
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ * Copyright (c) 2023, 2024 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -19,19 +19,23 @@
  * SPDX-License-Identifier: Apache-2.0
  * *******************************************************************************
  */
-package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
+package org.eclipse.tractusx.demandcapacitymgm.backend.controllers;
 
-import eclipse.tractusx.demand_capacity_mgmt_specification.api.AlertsApi;
-import eclipse.tractusx.demand_capacity_mgmt_specification.model.*;
+import eclipse.tractusx.demandcapacitymgm.specification.api.AlertsApi;
+import eclipse.tractusx.demandcapacitymgm.specification.model.AlertRequest;
+import eclipse.tractusx.demandcapacitymgm.specification.model.AlertResponse;
+import eclipse.tractusx.demandcapacitymgm.specification.model.TriggeredAlertRequest;
+import eclipse.tractusx.demandcapacitymgm.specification.model.TriggeredAlertResponse;
 import jakarta.servlet.http.HttpServletRequest;
-import java.util.List;
 import lombok.AllArgsConstructor;
-import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.AlertService;
-import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.utils.UserUtil;
+import org.eclipse.tractusx.demandcapacitymgm.backend.services.AlertService;
+import org.eclipse.tractusx.demandcapacitymgm.backend.utils.UserUtil;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @AllArgsConstructor
 //@RequestMapping("/alerts")

diff --git a/...llers/CapacityGroupRuleSetController.java → ...llers/CapacityGroupRuleSetController.java b/...llers/CapacityGroupRuleSetController.java → ...llers/CapacityGroupRuleSetController.java
@@ -1,7 +1,7 @@
 /*
  *  *******************************************************************************
  *  Copyright (c) 2023 BMW AG
- *  Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *  Copyright (c) 2023, 2024 Contributors to the Eclipse Foundation
  *
  *    See the NOTICE file(s) distributed with this work for additional
  *    information regarding copyright ownership.
@@ -20,14 +20,13 @@
  *    ********************************************************************************
  */
 
-package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
+package org.eclipse.tractusx.demandcapacitymgm.backend.controllers;
 
-import eclipse.tractusx.demand_capacity_mgmt_specification.api.CgRulesetApi;
-import eclipse.tractusx.demand_capacity_mgmt_specification.model.CGRulesetRequest;
-import eclipse.tractusx.demand_capacity_mgmt_specification.model.CGRulesetResponse;
-import java.util.UUID;
+import eclipse.tractusx.demandcapacitymgm.specification.api.CgRulesetApi;
+import eclipse.tractusx.demandcapacitymgm.specification.model.CGRulesetRequest;
+import eclipse.tractusx.demandcapacitymgm.specification.model.CGRulesetResponse;
 import lombok.AllArgsConstructor;
-import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.CapacityGroupRuleSetService;
+import org.eclipse.tractusx.demandcapacitymgm.backend.services.CapacityGroupRuleSetService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
 

diff --git a/...controllers/CapacityGroupsController.java → ...controllers/CapacityGroupsController.java b/...controllers/CapacityGroupsController.java → ...controllers/CapacityGroupsController.java
@@ -1,7 +1,7 @@
 /*
  * ******************************************************************************
  * Copyright (c) 2023 BMW AG
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ * Copyright (c) 2023, 2024 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -20,20 +20,21 @@
  * *******************************************************************************
  */
 
-package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
+package org.eclipse.tractusx.demandcapacitymgm.backend.controllers;
 
-import eclipse.tractusx.demand_capacity_mgmt_specification.api.CapacityGroupApi;
-import eclipse.tractusx.demand_capacity_mgmt_specification.model.*;
+import eclipse.tractusx.demandcapacitymgm.specification.api.CapacityGroupApi;
+import eclipse.tractusx.demandcapacitymgm.specification.model.*;
 import jakarta.servlet.http.HttpServletRequest;
-import java.util.List;
 import lombok.AllArgsConstructor;
-import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.enums.Role;
-import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.CapacityGroupService;
-import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.utils.UserUtil;
+import org.eclipse.tractusx.demandcapacitymgm.backend.entities.enums.Role;
+import org.eclipse.tractusx.demandcapacitymgm.backend.services.CapacityGroupService;
+import org.eclipse.tractusx.demandcapacitymgm.backend.utils.UserUtil;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @AllArgsConstructor
 public class CapacityGroupsController implements CapacityGroupApi {

diff --git a/...ackend/controllers/CompanyController.java → ...ackend/controllers/CompanyController.java b/...ackend/controllers/CompanyController.java → ...ackend/controllers/CompanyController.java
@@ -1,7 +1,7 @@
 /*
  *  *******************************************************************************
  *  Copyright (c) 2023 BMW AG
- *  Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *  Copyright (c) 2023, 2024 Contributors to the Eclipse Foundation
  *
  *    See the NOTICE file(s) distributed with this work for additional
  *    information regarding copyright ownership.
@@ -20,19 +20,18 @@
  *    ********************************************************************************
  */
 
-package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
+package org.eclipse.tractusx.demandcapacitymgm.backend.controllers;
 
-import eclipse.tractusx.demand_capacity_mgmt_specification.api.CompanyApi;
-import eclipse.tractusx.demand_capacity_mgmt_specification.model.CompanyDto;
-import java.util.List;
-import java.util.UUID;
+import eclipse.tractusx.demandcapacitymgm.specification.api.CompanyApi;
+import eclipse.tractusx.demandcapacitymgm.specification.model.CompanyDto;
 import lombok.AllArgsConstructor;
-import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.CompanyService;
-import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.utils.UserUtil;
+import org.eclipse.tractusx.demandcapacitymgm.backend.services.CompanyService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @AllArgsConstructor
 public class CompanyController implements CompanyApi {

diff --git a/...controllers/CompanyRuleSetController.java → ...controllers/CompanyRuleSetController.java b/...controllers/CompanyRuleSetController.java → ...controllers/CompanyRuleSetController.java
@@ -1,7 +1,7 @@
 /*
  *  *******************************************************************************
  *  Copyright (c) 2023 BMW AG
- *  Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *  Copyright (c) 2023, 2024 Contributors to the Eclipse Foundation
  *
  *    See the NOTICE file(s) distributed with this work for additional
  *    information regarding copyright ownership.
@@ -20,13 +20,13 @@
  *    ********************************************************************************
  */
 
-package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
+package org.eclipse.tractusx.demandcapacitymgm.backend.controllers;
 
-import eclipse.tractusx.demand_capacity_mgmt_specification.api.CdRulesetApi;
-import eclipse.tractusx.demand_capacity_mgmt_specification.model.CDRulesetRequest;
-import eclipse.tractusx.demand_capacity_mgmt_specification.model.CDRulesetResponse;
+import eclipse.tractusx.demandcapacitymgm.specification.api.CdRulesetApi;
+import eclipse.tractusx.demandcapacitymgm.specification.model.CDRulesetRequest;
+import eclipse.tractusx.demandcapacitymgm.specification.model.CDRulesetResponse;
 import lombok.AllArgsConstructor;
-import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.CompanyRuleSetService;
+import org.eclipse.tractusx.demandcapacitymgm.backend.services.CompanyRuleSetService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
 

diff --git a/...controllers/DemandCategoryController.java → ...controllers/DemandCategoryController.java b/...controllers/DemandCategoryController.java → ...controllers/DemandCategoryController.java
@@ -1,7 +1,7 @@
 /*
  *  *******************************************************************************
  *  Copyright (c) 2023 BMW AG
- *  Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *  Copyright (c) 2023, 2024 Contributors to the Eclipse Foundation
  *
  *    See the NOTICE file(s) distributed with this work for additional
  *    information regarding copyright ownership.
@@ -20,17 +20,18 @@
  *    ********************************************************************************
  */
 
-package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
+package org.eclipse.tractusx.demandcapacitymgm.backend.controllers;
 
-import eclipse.tractusx.demand_capacity_mgmt_specification.api.DemandCategoryApi;
-import eclipse.tractusx.demand_capacity_mgmt_specification.model.DemandCategoryResponse;
-import java.util.List;
+import eclipse.tractusx.demandcapacitymgm.specification.api.DemandCategoryApi;
+import eclipse.tractusx.demandcapacitymgm.specification.model.DemandCategoryResponse;
 import lombok.AllArgsConstructor;
-import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.DemandCategoryService;
+import org.eclipse.tractusx.demandcapacitymgm.backend.services.DemandCategoryService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @AllArgsConstructor
 public class DemandCategoryController implements DemandCategoryApi {