Skip to content
This repository has been archived by the owner on Jan 20, 2025. It is now read-only.

refactor: simplify and align java package names #76

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* ********************************************************************************
*/

package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend;
package org.eclipse.tractusx.demandcapacitymgmt.backend;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,17 @@
* *******************************************************************************
*/

package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
package org.eclipse.tractusx.demandcapacitymgmt.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.demandcapacitymgmt.specification.api.AddressBookApi;
import eclipse.tractusx.demandcapacitymgmt.specification.model.AddressBookRequest;
import eclipse.tractusx.demandcapacitymgmt.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.demandcapacitymgmt.backend.entities.enums.Role;
import org.eclipse.tractusx.demandcapacitymgmt.backend.services.AddressBookService;
import org.eclipse.tractusx.demandcapacitymgmt.backend.utils.UserUtil;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@
* ********************************************************************************
*/

package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
package org.eclipse.tractusx.demandcapacitymgmt.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.demandcapacitymgmt.specification.api.RulesApi;
import eclipse.tractusx.demandcapacitymgmt.specification.model.AddRuleRequest;
import eclipse.tractusx.demandcapacitymgmt.specification.model.RuleRequest;
import eclipse.tractusx.demandcapacitymgmt.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.demandcapacitymgmt.backend.entities.enums.Role;
import org.eclipse.tractusx.demandcapacitymgmt.backend.services.RulesetService;
import org.eclipse.tractusx.demandcapacitymgmt.backend.utils.UserUtil;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
* SPDX-License-Identifier: Apache-2.0
* *******************************************************************************
*/
package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
package org.eclipse.tractusx.demandcapacitymgmt.backend.controllers;

import eclipse.tractusx.demand_capacity_mgmt_specification.api.AlertsApi;
import eclipse.tractusx.demand_capacity_mgmt_specification.model.*;
import eclipse.tractusx.demandcapacitymgmt.specification.api.AlertsApi;
import eclipse.tractusx.demandcapacitymgmt.specification.model.*;
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.demandcapacitymgmt.backend.services.AlertService;
import org.eclipse.tractusx.demandcapacitymgmt.backend.utils.UserUtil;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,13 @@
* ********************************************************************************
*/

package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
package org.eclipse.tractusx.demandcapacitymgmt.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.demandcapacitymgmt.specification.api.CgRulesetApi;
import eclipse.tractusx.demandcapacitymgmt.specification.model.CGRulesetRequest;
import eclipse.tractusx.demandcapacitymgmt.specification.model.CGRulesetResponse;
import lombok.AllArgsConstructor;
import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.CapacityGroupRuleSetService;
import org.eclipse.tractusx.demandcapacitymgmt.backend.services.CapacityGroupRuleSetService;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
* *******************************************************************************
*/

package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
package org.eclipse.tractusx.demandcapacitymgmt.backend.controllers;

import eclipse.tractusx.demand_capacity_mgmt_specification.api.CapacityGroupApi;
import eclipse.tractusx.demand_capacity_mgmt_specification.model.*;
import eclipse.tractusx.demandcapacitymgmt.specification.api.CapacityGroupApi;
import eclipse.tractusx.demandcapacitymgmt.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.demandcapacitymgmt.backend.entities.enums.Role;
import org.eclipse.tractusx.demandcapacitymgmt.backend.services.CapacityGroupService;
import org.eclipse.tractusx.demandcapacitymgmt.backend.utils.UserUtil;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,13 @@
* ********************************************************************************
*/

package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
package org.eclipse.tractusx.demandcapacitymgmt.backend.controllers;

import eclipse.tractusx.demand_capacity_mgmt_specification.api.CompanyApi;
import eclipse.tractusx.demand_capacity_mgmt_specification.model.CompanyDto;
import eclipse.tractusx.demandcapacitymgmt.specification.api.CompanyApi;
import eclipse.tractusx.demandcapacitymgmt.specification.model.CompanyDto;
import java.util.List;
import java.util.UUID;
import lombok.AllArgsConstructor;
import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.CompanyService;
import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.utils.UserUtil;
import org.eclipse.tractusx.demandcapacitymgmt.backend.services.CompanyService;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
* ********************************************************************************
*/

package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
package org.eclipse.tractusx.demandcapacitymgmt.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.demandcapacitymgmt.specification.api.CdRulesetApi;
import eclipse.tractusx.demandcapacitymgmt.specification.model.CDRulesetRequest;
import eclipse.tractusx.demandcapacitymgmt.specification.model.CDRulesetResponse;
import lombok.AllArgsConstructor;
import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.CompanyRuleSetService;
import org.eclipse.tractusx.demandcapacitymgmt.backend.services.CompanyRuleSetService;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
* ********************************************************************************
*/

package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
package org.eclipse.tractusx.demandcapacitymgmt.backend.controllers;

import eclipse.tractusx.demand_capacity_mgmt_specification.api.DemandCategoryApi;
import eclipse.tractusx.demand_capacity_mgmt_specification.model.DemandCategoryResponse;
import eclipse.tractusx.demandcapacitymgmt.specification.api.DemandCategoryApi;
import eclipse.tractusx.demandcapacitymgmt.specification.model.DemandCategoryResponse;
import java.util.List;
import lombok.AllArgsConstructor;
import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.DemandCategoryService;
import org.eclipse.tractusx.demandcapacitymgmt.backend.services.DemandCategoryService;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
* ********************************************************************************
*/

package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
package org.eclipse.tractusx.demandcapacitymgmt.backend.controllers;

import eclipse.tractusx.demand_capacity_mgmt_specification.api.DemandApi;
import eclipse.tractusx.demand_capacity_mgmt_specification.model.*;
import eclipse.tractusx.demandcapacitymgmt.specification.api.DemandApi;
import eclipse.tractusx.demandcapacitymgmt.specification.model.*;
import jakarta.servlet.http.HttpServletRequest;
import java.util.List;
import lombok.AllArgsConstructor;
import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.DemandService;
import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.utils.UserUtil;
import org.eclipse.tractusx.demandcapacitymgmt.backend.services.DemandService;
import org.eclipse.tractusx.demandcapacitymgmt.backend.utils.UserUtil;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,15 @@
* ********************************************************************************
*/

package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
package org.eclipse.tractusx.demandcapacitymgmt.backend.controllers;

import eclipse.tractusx.demand_capacity_mgmt_specification.api.EdcApi;
import eclipse.tractusx.demand_capacity_mgmt_specification.model.*;
import eclipse.tractusx.demandcapacitymgmt.specification.api.EdcApi;
import eclipse.tractusx.demandcapacitymgmt.specification.model.*;
import java.util.List;
import lombok.AllArgsConstructor;
import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.EDCService;
import org.eclipse.tractusx.demandcapacitymgmt.backend.services.EDCService;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;
import reactor.core.publisher.Flux;

@RestController
@AllArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
* *******************************************************************************
*/

package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
package org.eclipse.tractusx.demandcapacitymgmt.backend.controllers;

import eclipse.tractusx.demand_capacity_mgmt_specification.api.FavoriteApi;
import eclipse.tractusx.demand_capacity_mgmt_specification.model.FavoriteRequest;
import eclipse.tractusx.demand_capacity_mgmt_specification.model.FavoriteResponse;
import eclipse.tractusx.demandcapacitymgmt.specification.api.FavoriteApi;
import eclipse.tractusx.demandcapacitymgmt.specification.model.FavoriteRequest;
import eclipse.tractusx.demandcapacitymgmt.specification.model.FavoriteResponse;
import jakarta.servlet.http.HttpServletRequest;
import lombok.AllArgsConstructor;
import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.enums.FavoriteType;
import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.FavoriteService;
import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.utils.UserUtil;
import org.eclipse.tractusx.demandcapacitymgmt.backend.entities.enums.FavoriteType;
import org.eclipse.tractusx.demandcapacitymgmt.backend.services.FavoriteService;
import org.eclipse.tractusx.demandcapacitymgmt.backend.utils.UserUtil;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
* ********************************************************************************
*/

package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
package org.eclipse.tractusx.demandcapacitymgmt.backend.controllers;

import eclipse.tractusx.demand_capacity_mgmt_specification.api.LoggingHistoryApi;
import eclipse.tractusx.demand_capacity_mgmt_specification.model.ArchivedLoggingHistoryResponse;
import eclipse.tractusx.demand_capacity_mgmt_specification.model.LoggingHistoryRequest;
import eclipse.tractusx.demand_capacity_mgmt_specification.model.LoggingHistoryResponse;
import eclipse.tractusx.demandcapacitymgmt.specification.api.LoggingHistoryApi;
import eclipse.tractusx.demandcapacitymgmt.specification.model.ArchivedLoggingHistoryResponse;
import eclipse.tractusx.demandcapacitymgmt.specification.model.LoggingHistoryRequest;
import eclipse.tractusx.demandcapacitymgmt.specification.model.LoggingHistoryResponse;
import jakarta.servlet.http.HttpServletRequest;
import java.util.List;
import lombok.AllArgsConstructor;
import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.LoggingHistoryService;
import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.utils.UserUtil;
import org.eclipse.tractusx.demandcapacitymgmt.backend.services.LoggingHistoryService;
import org.eclipse.tractusx.demandcapacitymgmt.backend.utils.UserUtil;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;
Expand Down Expand Up @@ -86,9 +86,9 @@ public ResponseEntity<List<LoggingHistoryResponse>> filterLogs(
String materialDemandId,
String capacityGroupId
) throws Exception {
return ResponseEntity
.status(HttpStatus.OK)
.body(loggingHistoryService.filterLog(capacityGroupId, materialDemandId, event, startTime, endTime));
return ResponseEntity.status(HttpStatus.OK).body(
loggingHistoryService.filterLog(capacityGroupId, materialDemandId, event, startTime, endTime)
);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
* *******************************************************************************
*/

package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
package org.eclipse.tractusx.demandcapacitymgmt.backend.controllers;

import eclipse.tractusx.demand_capacity_mgmt_specification.api.KeycloakApi;
import eclipse.tractusx.demand_capacity_mgmt_specification.model.IntrospectTokenResponse;
import eclipse.tractusx.demand_capacity_mgmt_specification.model.User;
import eclipse.tractusx.demandcapacitymgmt.specification.api.KeycloakApi;
import eclipse.tractusx.demandcapacitymgmt.specification.model.IntrospectTokenResponse;
import eclipse.tractusx.demandcapacitymgmt.specification.model.User;
import lombok.AllArgsConstructor;
import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.SecurityTokenService;
import org.eclipse.tractusx.demandcapacitymgmt.backend.services.SecurityTokenService;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
* ********************************************************************************
*/

package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
package org.eclipse.tractusx.demandcapacitymgmt.backend.controllers;

import eclipse.tractusx.demand_capacity_mgmt_specification.api.StatusesApi;
import eclipse.tractusx.demand_capacity_mgmt_specification.model.StatusRequest;
import eclipse.tractusx.demand_capacity_mgmt_specification.model.StatusesResponse;
import eclipse.tractusx.demandcapacitymgmt.specification.api.StatusesApi;
import eclipse.tractusx.demandcapacitymgmt.specification.model.StatusRequest;
import eclipse.tractusx.demandcapacitymgmt.specification.model.StatusesResponse;
import jakarta.servlet.http.HttpServletRequest;
import lombok.AllArgsConstructor;
import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.StatusesService;
import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.utils.UserUtil;
import org.eclipse.tractusx.demandcapacitymgmt.backend.services.StatusesService;
import org.eclipse.tractusx.demandcapacitymgmt.backend.utils.UserUtil;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
* ********************************************************************************
*/

package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
package org.eclipse.tractusx.demandcapacitymgmt.backend.controllers;

import eclipse.tractusx.demand_capacity_mgmt_specification.api.UnitMeasureApi;
import eclipse.tractusx.demand_capacity_mgmt_specification.model.UnitMeasure;
import eclipse.tractusx.demandcapacitymgmt.specification.api.UnitMeasureApi;
import eclipse.tractusx.demandcapacitymgmt.specification.model.UnitMeasure;
import java.util.List;
import java.util.UUID;
import lombok.AllArgsConstructor;
import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.UnityOfMeasureService;
import org.eclipse.tractusx.demandcapacitymgmt.backend.services.UnityOfMeasureService;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;
Expand Down
Loading
Loading