Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: java package name #107

Merged
merged 5 commits into from
Jul 31, 2024
Merged

fix: java package name #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ba7d491
fix: java package name
nitin-vavdiya Jul 5, 2024
c843ef7
fix: deleted files
nitin-vavdiya Jul 5, 2024
8830aed
fix: year in copyeright
nitin-vavdiya Jul 5, 2024
a652160
fix: year in copyeright header
nitin-vavdiya Jul 5, 2024
dde05f7
fix: backend package name
nitin-vavdiya Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DEPENDENCIES_BACKEND
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...DemandCapacityMgmtBackendApplication.java → ...DemandCapacityMgmtBackendApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...gmtbackend/appinfo/InfoConfiguration.java → ...gm/backend/appinfo/InfoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...ackend/config/GlobalExceptionHandler.java → ...ackend/config/GlobalExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 5 additions & 4 deletions ...backend/config/openapi/OpenApiConfig.java → ...backend/config/openapi/OpenApiConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down
21 changes: 10 additions & 11 deletions ...nd/controllers/AddressBookController.java → ...nd/controllers/AddressBookController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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 {
Expand Down
23 changes: 12 additions & 11 deletions ...d/controllers/AdminRulesetController.java → ...d/controllers/AdminRulesetController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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 {
Expand Down
18 changes: 11 additions & 7 deletions ...tbackend/controllers/AlertController.java → .../backend/controllers/AlertController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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")
Expand Down
13 changes: 6 additions & 7 deletions ...llers/CapacityGroupRuleSetController.java → ...llers/CapacityGroupRuleSetController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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;

Expand Down
17 changes: 9 additions & 8 deletions ...controllers/CapacityGroupsController.java → ...controllers/CapacityGroupsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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 {
Expand Down
15 changes: 7 additions & 8 deletions ...ackend/controllers/CompanyController.java → ...ackend/controllers/CompanyController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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 {
Expand Down
12 changes: 6 additions & 6 deletions ...controllers/CompanyRuleSetController.java → ...controllers/CompanyRuleSetController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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;

Expand Down
13 changes: 7 additions & 6 deletions ...controllers/DemandCategoryController.java → ...controllers/DemandCategoryController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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 {
Expand Down
Loading
Loading