From fa809d540907ad105dbed576aa7925d9d76f05d6 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Thu, 18 Jul 2024 15:59:17 +0200 Subject: [PATCH] chore: xxx fix security findings, remove unused imports --- .../mapper/AssetAsBuiltResponseMapper.java | 1 - .../asbuilt/rest/AssetAsBuiltController.java | 8 +++++++- .../mapper/AssetAsPlannedResponseMapper.java | 1 - .../asplanned/rest/AssetAsPlannedController.java | 8 +++++++- .../importpoc/rest/ImportController.java | 1 - .../base/service/AbstractAssetBaseService.java | 6 +++++- .../dashboard/service/DashboardServiceImpl.java | 2 +- .../service/EdcAssetCreationService.java | 4 ++-- .../asbuilt/model/AssetAsBuiltEntity.java | 2 ++ .../repository/AssetAsBuiltRepositoryImpl.java | 1 - .../asplanned/model/AssetAsPlannedEntity.java | 3 ++- .../base/irs/JobRepositoryImpl.java | 2 -- .../base/irs/mapper/TombstoneMapper.java | 1 - .../SingleLevelUsageAsBuiltSubmodelMapper.java | 1 - .../ManufacturingInformation.java | 1 - .../model/response/semanticdatamodel/Site.java | 1 - .../semanticdatamodel/ValidityPeriod.java | 1 - .../base/model/AssetBaseEntity.java | 2 ++ .../common/config/ApplicationStartupConfig.java | 9 --------- .../common/config/PolicyStartUpConfig.java | 5 ++--- .../common/config/TrustedEndpointsFilter.java | 1 - .../common/mapper/NotificationMessageMapper.java | 1 - .../application/service/ContractService.java | 3 --- .../service/AbstractContractBaseService.java | 6 ------ .../model/ContractAgreementBaseEntity.java | 5 ++--- .../model/ContractAgreementViewEntity.java | 1 - .../ContractNotificationRepositoryImpl.java | 2 +- .../mapper/NotificationMessageMapper.java | 10 +++++----- .../rest/NotificationController.java | 16 ++++++++++++++-- .../service/NotificationService.java | 4 ++-- .../validation/UpdateNotificationValidator.java | 2 +- .../domain/base/model/NotificationMessage.java | 2 +- .../domain/base/model/NotificationSeverity.java | 1 - .../AbstractNotificationReceiverService.java | 2 +- .../service/AbstractNotificationService.java | 8 +++++++- .../service/NotificationPublisherService.java | 1 - .../base/service/NotificationsEDCFacade.java | 1 - .../notification/model/StartNotification.java | 2 +- .../model/NotificationMessageBaseEntity.java | 2 -- .../model/NotificationSeverityBaseEntity.java | 1 - .../application/mapper/PolicyMapper.java | 8 ++++---- .../application/RegistryController.java | 2 +- .../repository/SubmodelClient.java | 4 +--- .../InvestigationNotificationsSupport.java | 2 -- 44 files changed, 71 insertions(+), 76 deletions(-) diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asbuilt/mapper/AssetAsBuiltResponseMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asbuilt/mapper/AssetAsBuiltResponseMapper.java index 900518cefe..3bac937369 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asbuilt/mapper/AssetAsBuiltResponseMapper.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asbuilt/mapper/AssetAsBuiltResponseMapper.java @@ -22,7 +22,6 @@ import org.eclipse.tractusx.traceability.assets.application.base.mapper.AssetBaseResponseMapper; import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; import org.eclipse.tractusx.traceability.common.model.PageResult; -import org.eclipse.tractusx.traceability.contracts.domain.model.ContractAgreement; import java.util.List; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asbuilt/rest/AssetAsBuiltController.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asbuilt/rest/AssetAsBuiltController.java index b952503acb..3234e83360 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asbuilt/rest/AssetAsBuiltController.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asbuilt/rest/AssetAsBuiltController.java @@ -47,7 +47,13 @@ import org.eclipse.tractusx.traceability.common.request.SearchCriteriaRequestParam; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.Map; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asplanned/mapper/AssetAsPlannedResponseMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asplanned/mapper/AssetAsPlannedResponseMapper.java index d7511fbaf3..8bce3e5ef1 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asplanned/mapper/AssetAsPlannedResponseMapper.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asplanned/mapper/AssetAsPlannedResponseMapper.java @@ -22,7 +22,6 @@ import org.eclipse.tractusx.traceability.assets.application.base.mapper.AssetBaseResponseMapper; import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; import org.eclipse.tractusx.traceability.common.model.PageResult; -import org.eclipse.tractusx.traceability.contracts.domain.model.ContractAgreement; import java.util.List; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asplanned/rest/AssetAsPlannedController.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asplanned/rest/AssetAsPlannedController.java index 165d8c9365..ffe318cb45 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asplanned/rest/AssetAsPlannedController.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asplanned/rest/AssetAsPlannedController.java @@ -45,7 +45,13 @@ import org.eclipse.tractusx.traceability.common.request.SearchCriteriaRequestParam; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/importpoc/rest/ImportController.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/importpoc/rest/ImportController.java index ec24900205..fefa9b10eb 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/importpoc/rest/ImportController.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/importpoc/rest/ImportController.java @@ -33,7 +33,6 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.ws.rs.PathParam; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.eclipse.tractusx.traceability.assets.application.importpoc.ImportService; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/base/service/AbstractAssetBaseService.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/base/service/AbstractAssetBaseService.java index 4b186474df..3142067b0d 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/base/service/AbstractAssetBaseService.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/base/service/AbstractAssetBaseService.java @@ -22,7 +22,11 @@ import org.eclipse.tractusx.traceability.assets.application.base.service.AssetBaseService; import org.eclipse.tractusx.traceability.assets.domain.base.AssetRepository; import org.eclipse.tractusx.traceability.assets.domain.base.JobRepository; -import org.eclipse.tractusx.traceability.assets.domain.base.model.*; +import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; +import org.eclipse.tractusx.traceability.assets.domain.base.model.ImportState; +import org.eclipse.tractusx.traceability.assets.domain.base.model.Owner; +import org.eclipse.tractusx.traceability.assets.domain.base.model.QualityType; +import org.eclipse.tractusx.traceability.assets.domain.base.model.SemanticDataModel; import org.eclipse.tractusx.traceability.assets.infrastructure.asbuilt.model.ManufacturingInfo; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.request.BomLifecycle; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.Direction; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/dashboard/service/DashboardServiceImpl.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/dashboard/service/DashboardServiceImpl.java index 487f300f99..aa5ed47b09 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/dashboard/service/DashboardServiceImpl.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/dashboard/service/DashboardServiceImpl.java @@ -27,9 +27,9 @@ import org.eclipse.tractusx.traceability.assets.domain.asplanned.repository.AssetAsPlannedRepository; import org.eclipse.tractusx.traceability.assets.domain.base.model.Owner; import org.eclipse.tractusx.traceability.assets.domain.dashboard.model.Dashboard; -import org.eclipse.tractusx.traceability.notification.domain.notification.repository.NotificationRepository; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSide; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationType; +import org.eclipse.tractusx.traceability.notification.domain.notification.repository.NotificationRepository; import org.springframework.stereotype.Component; import java.util.List; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/EdcAssetCreationService.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/EdcAssetCreationService.java index d85fb1f48b..a28b4c9638 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/EdcAssetCreationService.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/EdcAssetCreationService.java @@ -19,7 +19,6 @@ package org.eclipse.tractusx.traceability.assets.domain.importpoc.service; -import policies.response.PolicyResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.eclipse.tractusx.irs.edc.client.asset.EdcAssetService; @@ -30,10 +29,11 @@ import org.eclipse.tractusx.irs.edc.client.policy.model.exception.CreateEdcPolicyDefinitionException; import org.eclipse.tractusx.irs.edc.client.policy.model.exception.EdcPolicyDefinitionAlreadyExists; import org.eclipse.tractusx.irs.edc.client.policy.service.EdcPolicyDefinitionService; -import org.eclipse.tractusx.traceability.policies.application.service.PolicyService; import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; +import org.eclipse.tractusx.traceability.policies.application.service.PolicyService; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import policies.response.PolicyResponse; import java.util.UUID; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/model/AssetAsBuiltEntity.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/model/AssetAsBuiltEntity.java index 97abf0baca..7fa815e2df 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/model/AssetAsBuiltEntity.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/model/AssetAsBuiltEntity.java @@ -38,6 +38,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import lombok.ToString; import lombok.experimental.SuperBuilder; import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; import org.eclipse.tractusx.traceability.assets.domain.base.model.Descriptions; @@ -63,6 +64,7 @@ @NoArgsConstructor @Entity @SuperBuilder +@ToString @Table(name = "assets_as_built") public class AssetAsBuiltEntity extends AssetBaseEntity { diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/repository/AssetAsBuiltRepositoryImpl.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/repository/AssetAsBuiltRepositoryImpl.java index cda7ac8079..530cbe7632 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/repository/AssetAsBuiltRepositoryImpl.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/repository/AssetAsBuiltRepositoryImpl.java @@ -31,7 +31,6 @@ import org.eclipse.tractusx.traceability.assets.domain.base.model.ImportState; import org.eclipse.tractusx.traceability.assets.domain.base.model.Owner; import org.eclipse.tractusx.traceability.assets.infrastructure.asbuilt.model.AssetAsBuiltEntity; -import org.eclipse.tractusx.traceability.assets.infrastructure.asplanned.model.AssetAsPlannedEntity; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.AssetCallbackRepository; import org.eclipse.tractusx.traceability.assets.infrastructure.base.model.AssetBaseEntity; import org.eclipse.tractusx.traceability.common.repository.CriteriaUtility; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asplanned/model/AssetAsPlannedEntity.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asplanned/model/AssetAsPlannedEntity.java index 50fae795dd..8d29483826 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asplanned/model/AssetAsPlannedEntity.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asplanned/model/AssetAsPlannedEntity.java @@ -32,6 +32,7 @@ import lombok.Data; import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.ToString; import lombok.experimental.SuperBuilder; import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; import org.eclipse.tractusx.traceability.assets.domain.base.model.Descriptions; @@ -39,7 +40,6 @@ import org.eclipse.tractusx.traceability.assets.infrastructure.base.model.AssetBaseEntity; import org.eclipse.tractusx.traceability.assets.infrastructure.base.model.SemanticDataModelEntity; import org.eclipse.tractusx.traceability.contracts.domain.model.ContractAgreement; -import org.eclipse.tractusx.traceability.contracts.domain.model.ContractType; import org.eclipse.tractusx.traceability.contracts.infrastructure.model.ContractAgreementAsPlannedEntity; import org.eclipse.tractusx.traceability.submodel.infrastructure.model.SubmodelPayloadEntity; @@ -52,6 +52,7 @@ @NoArgsConstructor @Entity @SuperBuilder +@ToString @Table(name = "assets_as_planned") public class AssetAsPlannedEntity extends AssetBaseEntity { diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/JobRepositoryImpl.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/JobRepositoryImpl.java index fbbaf2248d..a3d030234f 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/JobRepositoryImpl.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/JobRepositoryImpl.java @@ -35,8 +35,6 @@ import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; import org.eclipse.tractusx.traceability.contracts.domain.model.ContractAgreement; import org.eclipse.tractusx.traceability.contracts.domain.model.ContractType; -import org.eclipse.tractusx.traceability.contracts.infrastructure.repository.ContractAsBuiltRepositoryImpl; -import org.eclipse.tractusx.traceability.contracts.infrastructure.repository.ContractAsPlannedRepositoryImpl; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.stereotype.Service; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/mapper/TombstoneMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/mapper/TombstoneMapper.java index 022ee7ea7a..26ada396f1 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/mapper/TombstoneMapper.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/mapper/TombstoneMapper.java @@ -31,7 +31,6 @@ import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.JobStatus; import java.util.List; -import java.util.stream.Collectors; @Slf4j public class TombstoneMapper { diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/relationship/SingleLevelUsageAsBuiltSubmodelMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/relationship/SingleLevelUsageAsBuiltSubmodelMapper.java index d034667460..d0042e61e8 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/relationship/SingleLevelUsageAsBuiltSubmodelMapper.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/mapping/submodel/relationship/SingleLevelUsageAsBuiltSubmodelMapper.java @@ -21,7 +21,6 @@ import org.eclipse.tractusx.irs.component.enums.Direction; import org.eclipse.tractusx.traceability.assets.domain.base.model.Descriptions; import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IrsSubmodel; -import org.eclipse.tractusx.traceability.generated.SingleLevelBomAsBuilt300Schema; import org.eclipse.tractusx.traceability.generated.SingleLevelUsageAsBuilt300Schema; import org.eclipse.tractusx.traceability.generated.UrnSammIoCatenaxSingleLevelUsageAsBuilt300ParentData; import org.springframework.stereotype.Component; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/semanticdatamodel/ManufacturingInformation.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/semanticdatamodel/ManufacturingInformation.java index f0fb5446e1..f8519a51d7 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/semanticdatamodel/ManufacturingInformation.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/semanticdatamodel/ManufacturingInformation.java @@ -22,7 +22,6 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.eclipse.tractusx.traceability.common.date.CustomOffSetDateTimeNullOnException; - import java.time.OffsetDateTime; public record ManufacturingInformation( diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/semanticdatamodel/Site.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/semanticdatamodel/Site.java index 09ee75b457..14c371ea3d 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/semanticdatamodel/Site.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/semanticdatamodel/Site.java @@ -22,7 +22,6 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.eclipse.tractusx.traceability.common.date.CustomOffSetDateTimeNullOnException; - import java.time.OffsetDateTime; public record Site( diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/semanticdatamodel/ValidityPeriod.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/semanticdatamodel/ValidityPeriod.java index d89a1439ba..66603d2acd 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/semanticdatamodel/ValidityPeriod.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/model/response/semanticdatamodel/ValidityPeriod.java @@ -21,7 +21,6 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.eclipse.tractusx.traceability.common.date.CustomOffSetDateTimeNullOnException; - import java.time.OffsetDateTime; public record ValidityPeriod( diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/model/AssetBaseEntity.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/model/AssetBaseEntity.java index 1f20d05675..6cb9686a0a 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/model/AssetBaseEntity.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/model/AssetBaseEntity.java @@ -25,6 +25,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import lombok.ToString; import lombok.experimental.SuperBuilder; import org.eclipse.tractusx.traceability.assets.domain.base.model.ImportState; import org.eclipse.tractusx.traceability.assets.domain.base.model.Owner; @@ -35,6 +36,7 @@ @Setter @SuperBuilder @MappedSuperclass +@ToString public class AssetBaseEntity { @Id diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/ApplicationStartupConfig.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/ApplicationStartupConfig.java index e8f244df41..4418a5312f 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/ApplicationStartupConfig.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/ApplicationStartupConfig.java @@ -20,14 +20,6 @@ package org.eclipse.tractusx.traceability.common.config; import lombok.extern.slf4j.Slf4j; -import org.eclipse.tractusx.traceability.assets.application.base.service.AssetBaseService; -import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase; -import org.eclipse.tractusx.traceability.contracts.application.service.ContractService; -import org.eclipse.tractusx.traceability.contracts.domain.model.ContractAgreement; -import org.eclipse.tractusx.traceability.contracts.domain.model.ContractType; -import org.eclipse.tractusx.traceability.notification.application.contract.model.CreateNotificationContractRequest; -import org.eclipse.tractusx.traceability.notification.application.contract.model.NotificationMethod; -import org.eclipse.tractusx.traceability.notification.application.contract.model.NotificationType; import org.eclipse.tractusx.traceability.notification.domain.contract.EdcNotificationContractService; import org.eclipse.tractusx.traceability.policies.domain.PolicyRepository; import org.springframework.beans.factory.annotation.Autowired; @@ -36,7 +28,6 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; -import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/PolicyStartUpConfig.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/PolicyStartUpConfig.java index 9d7f57c812..819bb5267a 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/PolicyStartUpConfig.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/PolicyStartUpConfig.java @@ -34,9 +34,8 @@ import org.eclipse.tractusx.irs.edc.client.policy.Permission; import org.eclipse.tractusx.irs.edc.client.policy.Policy; import org.eclipse.tractusx.irs.edc.client.policy.PolicyType; -import org.eclipse.tractusx.traceability.policies.domain.PolicyRepository; -import policies.response.IrsPolicyResponse; import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; +import org.eclipse.tractusx.traceability.policies.domain.PolicyRepository; import org.jetbrains.annotations.NotNull; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationPropertiesScan; @@ -46,13 +45,13 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import policies.response.IrsPolicyResponse; import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.UUID; -import java.util.stream.Collectors; @Configuration @ConfigurationPropertiesScan(basePackages = "org.eclipse.tractusx.traceability.*") diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/TrustedEndpointsFilter.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/TrustedEndpointsFilter.java index bdafef57dc..9e6ac7964b 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/TrustedEndpointsFilter.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/TrustedEndpointsFilter.java @@ -28,7 +28,6 @@ import jakarta.servlet.http.HttpServletResponseWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.eclipse.tractusx.irs.common.ApiConstants; import org.springframework.context.annotation.Profile; import java.io.IOException; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/mapper/NotificationMessageMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/mapper/NotificationMessageMapper.java index 3156e850ff..fe8780e074 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/mapper/NotificationMessageMapper.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/mapper/NotificationMessageMapper.java @@ -23,7 +23,6 @@ import lombok.RequiredArgsConstructor; import org.eclipse.tractusx.traceability.bpn.infrastructure.repository.BpnRepository; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationMessage; -import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSeverity; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationType; import org.eclipse.tractusx.traceability.notification.infrastructure.edc.model.EDCNotification; import org.springframework.stereotype.Component; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/application/service/ContractService.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/application/service/ContractService.java index 1240960771..fcee575746 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/application/service/ContractService.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/application/service/ContractService.java @@ -19,9 +19,6 @@ package org.eclipse.tractusx.traceability.contracts.application.service; import org.eclipse.tractusx.irs.edc.client.contract.model.exception.ContractAgreementException; -import org.eclipse.tractusx.traceability.common.model.PageResult; -import org.eclipse.tractusx.traceability.common.request.PageableFilterRequest; -import org.eclipse.tractusx.traceability.contracts.domain.model.Contract; import org.eclipse.tractusx.traceability.contracts.domain.model.ContractAgreement; import org.eclipse.tractusx.traceability.contracts.domain.model.ContractType; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/domain/service/AbstractContractBaseService.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/domain/service/AbstractContractBaseService.java index 0ce47f35e8..5fbda25526 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/domain/service/AbstractContractBaseService.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/domain/service/AbstractContractBaseService.java @@ -19,17 +19,11 @@ package org.eclipse.tractusx.traceability.contracts.domain.service; import org.eclipse.tractusx.irs.edc.client.contract.model.exception.ContractAgreementException; -import org.eclipse.tractusx.traceability.common.model.PageResult; -import org.eclipse.tractusx.traceability.common.model.SearchCriteria; -import org.eclipse.tractusx.traceability.common.request.OwnPageable; -import org.eclipse.tractusx.traceability.common.request.PageableFilterRequest; import org.eclipse.tractusx.traceability.contracts.application.mapper.ContractFieldMapper; import org.eclipse.tractusx.traceability.contracts.application.service.ContractService; -import org.eclipse.tractusx.traceability.contracts.domain.model.Contract; import org.eclipse.tractusx.traceability.contracts.domain.model.ContractAgreement; import org.eclipse.tractusx.traceability.contracts.domain.model.ContractType; import org.eclipse.tractusx.traceability.contracts.domain.repository.ContractRepository; -import org.springframework.data.domain.Pageable; import java.util.List; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/infrastructure/model/ContractAgreementBaseEntity.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/infrastructure/model/ContractAgreementBaseEntity.java index 04cf268817..09258bf80b 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/infrastructure/model/ContractAgreementBaseEntity.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/infrastructure/model/ContractAgreementBaseEntity.java @@ -21,25 +21,24 @@ import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.MappedSuperclass; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.eclipse.tractusx.traceability.contracts.domain.model.ContractAgreement; import org.eclipse.tractusx.traceability.contracts.domain.model.ContractType; import org.hibernate.annotations.GenericGenerator; import java.time.Instant; -import java.util.List; @Getter @Setter @NoArgsConstructor @SuperBuilder @MappedSuperclass +@ToString public class ContractAgreementBaseEntity { @Id diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/infrastructure/model/ContractAgreementViewEntity.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/infrastructure/model/ContractAgreementViewEntity.java index d0cec3cded..167ff1c200 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/infrastructure/model/ContractAgreementViewEntity.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/infrastructure/model/ContractAgreementViewEntity.java @@ -25,7 +25,6 @@ import lombok.Setter; import lombok.experimental.SuperBuilder; import org.eclipse.tractusx.traceability.contracts.domain.model.Contract; -import org.eclipse.tractusx.traceability.contracts.domain.model.ContractAgreement; import org.eclipse.tractusx.traceability.contracts.domain.model.ContractType; import java.time.Instant; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/infrastructure/repository/ContractNotificationRepositoryImpl.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/infrastructure/repository/ContractNotificationRepositoryImpl.java index 1c7e92b3d1..8849ae41a1 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/infrastructure/repository/ContractNotificationRepositoryImpl.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/contracts/infrastructure/repository/ContractNotificationRepositoryImpl.java @@ -37,7 +37,7 @@ public class ContractNotificationRepositoryImpl extends ContractRepositoryImplBa private final JpaContractAgreementNotificationRepository contractAgreementRepository; - public ContractNotificationRepositoryImpl(EdcContractAgreementService edcContractAgreementService, ObjectMapper objectMapper, EdcContractAgreementService edcContractAgreementService1, JpaContractAgreementNotificationRepository contractAgreementRepository) { + public ContractNotificationRepositoryImpl(EdcContractAgreementService edcContractAgreementService, ObjectMapper objectMapper, JpaContractAgreementNotificationRepository contractAgreementRepository) { super(edcContractAgreementService, objectMapper); this.contractAgreementRepository = contractAgreementRepository; } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/mapper/NotificationMessageMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/mapper/NotificationMessageMapper.java index 14c49830f8..7cb8fb52f1 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/mapper/NotificationMessageMapper.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/mapper/NotificationMessageMapper.java @@ -20,16 +20,16 @@ package org.eclipse.tractusx.traceability.notification.application.notification.mapper; import lombok.experimental.UtilityClass; -import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationMessage; -import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSeverity; -import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSide; -import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationStatus; -import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationType; import notification.response.NotificationMessageResponse; import notification.response.NotificationSeverityResponse; import notification.response.NotificationSideResponse; import notification.response.NotificationStatusResponse; import notification.response.NotificationTypeResponse; +import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationMessage; +import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSeverity; +import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSide; +import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationStatus; +import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationType; import java.util.List; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/rest/NotificationController.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/rest/NotificationController.java index dc2790e4b6..27c4f8ca1c 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/rest/NotificationController.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/rest/NotificationController.java @@ -31,7 +31,12 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; -import notification.request.*; +import notification.request.CloseNotificationRequest; +import notification.request.EditNotificationRequest; +import notification.request.NotificationStatusRequest; +import notification.request.SearchableNotificationsRequest; +import notification.request.StartNotificationRequest; +import notification.request.UpdateNotificationStatusTransitionRequest; import notification.response.NotificationIdResponse; import notification.response.NotificationResponse; import org.eclipse.tractusx.traceability.common.model.BaseRequestFieldMapper; @@ -48,7 +53,14 @@ import org.springframework.http.HttpStatus; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/service/NotificationService.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/service/NotificationService.java index e095647082..e486e0d45e 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/service/NotificationService.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/service/NotificationService.java @@ -21,11 +21,11 @@ import org.eclipse.tractusx.traceability.common.model.PageResult; import org.eclipse.tractusx.traceability.common.model.SearchCriteria; import org.eclipse.tractusx.traceability.notification.domain.base.model.Notification; -import org.eclipse.tractusx.traceability.notification.domain.notification.model.EditNotification; -import org.eclipse.tractusx.traceability.notification.domain.notification.model.StartNotification; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationId; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSide; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationStatus; +import org.eclipse.tractusx.traceability.notification.domain.notification.model.EditNotification; +import org.eclipse.tractusx.traceability.notification.domain.notification.model.StartNotification; import org.springframework.data.domain.Pageable; import java.util.List; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/validation/UpdateNotificationValidator.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/validation/UpdateNotificationValidator.java index ba074cb7d9..e5b8070b14 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/validation/UpdateNotificationValidator.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/application/notification/validation/UpdateNotificationValidator.java @@ -22,8 +22,8 @@ package org.eclipse.tractusx.traceability.notification.application.notification.validation; import lombok.experimental.UtilityClass; -import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationStatus; import notification.request.UpdateNotificationStatusTransitionRequest; +import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationStatus; import java.util.Set; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/model/NotificationMessage.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/model/NotificationMessage.java index 116b7969f8..fd86a8b6ff 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/model/NotificationMessage.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/model/NotificationMessage.java @@ -65,7 +65,7 @@ public void changeStatusTo(NotificationStatus to) { this.notificationStatus = to; } - public static NotificationMessage create(BPN applicationBpn, String receiverBpn, String description, NotificationType notificationType, Map.Entry> asset, String creator, String sendToName) { + public static NotificationMessage create(BPN applicationBpn, String receiverBpn, NotificationType notificationType, Map.Entry> asset, String creator, String sendToName) { final String notificationId = UUID.randomUUID().toString(); final String messageId = UUID.randomUUID().toString(); return NotificationMessage.builder() diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/model/NotificationSeverity.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/model/NotificationSeverity.java index 2615802169..c28a771ecf 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/model/NotificationSeverity.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/model/NotificationSeverity.java @@ -20,7 +20,6 @@ package org.eclipse.tractusx.traceability.notification.domain.base.model; import io.swagger.annotations.ApiModel; -import lombok.Getter; import notification.request.NotificationSeverityRequest; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/AbstractNotificationReceiverService.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/AbstractNotificationReceiverService.java index 0bbe6fb521..bd63c8810a 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/AbstractNotificationReceiverService.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/AbstractNotificationReceiverService.java @@ -19,8 +19,8 @@ package org.eclipse.tractusx.traceability.notification.domain.base.service; import lombok.extern.slf4j.Slf4j; -import org.eclipse.tractusx.traceability.common.mapper.NotificationMessageMapper; import org.eclipse.tractusx.traceability.common.mapper.NotificationMapper; +import org.eclipse.tractusx.traceability.common.mapper.NotificationMessageMapper; import org.eclipse.tractusx.traceability.common.model.BPN; import org.eclipse.tractusx.traceability.notification.domain.base.model.Notification; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationId; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/AbstractNotificationService.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/AbstractNotificationService.java index ab6488de7b..acdb1960b6 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/AbstractNotificationService.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/AbstractNotificationService.java @@ -29,7 +29,13 @@ import org.eclipse.tractusx.traceability.common.properties.TraceabilityProperties; import org.eclipse.tractusx.traceability.notification.application.notification.service.NotificationService; import org.eclipse.tractusx.traceability.notification.domain.base.exception.SendNotificationException; -import org.eclipse.tractusx.traceability.notification.domain.base.model.*; +import org.eclipse.tractusx.traceability.notification.domain.base.model.Notification; +import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationId; +import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationMessage; +import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSeverity; +import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSide; +import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationStatus; +import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationType; import org.eclipse.tractusx.traceability.notification.domain.notification.exception.NotificationSenderAndReceiverBPNEqualException; import org.eclipse.tractusx.traceability.notification.domain.notification.model.EditNotification; import org.eclipse.tractusx.traceability.notification.domain.notification.model.StartNotification; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/NotificationPublisherService.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/NotificationPublisherService.java index 61d93f15eb..d418abf21c 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/NotificationPublisherService.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/NotificationPublisherService.java @@ -83,7 +83,6 @@ private void createMessages(Notification notification, BPN applicationBPN, Asset return NotificationMessage.create( applicationBPN, firstReceiverBpn, - notification.getDescription(), notification.getNotificationType(), it, creator, diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/NotificationsEDCFacade.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/NotificationsEDCFacade.java index 881b292509..5aa0863938 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/NotificationsEDCFacade.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/base/service/NotificationsEDCFacade.java @@ -24,7 +24,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.transaction.Transactional; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.eclipse.edc.catalog.spi.CatalogRequest; import org.eclipse.edc.spi.query.Criterion; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/model/StartNotification.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/model/StartNotification.java index 1dd7a694d7..8fb0d34848 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/model/StartNotification.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/domain/notification/model/StartNotification.java @@ -22,9 +22,9 @@ import lombok.Builder; import lombok.Data; import lombok.Getter; +import notification.request.StartNotificationRequest; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSeverity; import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationType; -import notification.request.StartNotificationRequest; import java.time.Instant; import java.util.List; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/notification/model/NotificationMessageBaseEntity.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/notification/model/NotificationMessageBaseEntity.java index 7e5ea5c0a3..0cd6c3f9da 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/notification/model/NotificationMessageBaseEntity.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/notification/model/NotificationMessageBaseEntity.java @@ -26,9 +26,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSeverity; -import java.time.Instant; import java.time.LocalDateTime; @SuperBuilder diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/notification/model/NotificationSeverityBaseEntity.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/notification/model/NotificationSeverityBaseEntity.java index 7c69063783..1842798c16 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/notification/model/NotificationSeverityBaseEntity.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/notification/infrastructure/notification/model/NotificationSeverityBaseEntity.java @@ -19,7 +19,6 @@ package org.eclipse.tractusx.traceability.notification.infrastructure.notification.model; -import io.swagger.annotations.ApiModel; import notification.request.NotificationSeverityRequest; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/policies/application/mapper/PolicyMapper.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/policies/application/mapper/PolicyMapper.java index 5ebb14424b..c9abfe62a1 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/policies/application/mapper/PolicyMapper.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/policies/application/mapper/PolicyMapper.java @@ -18,10 +18,6 @@ ********************************************************************************/ package org.eclipse.tractusx.traceability.policies.application.mapper; -import policies.response.ConstraintResponse; -import policies.response.ConstraintsResponse; -import policies.response.PermissionResponse; -import policies.response.PolicyResponse; import lombok.experimental.UtilityClass; import org.eclipse.tractusx.irs.edc.client.asset.model.Context; import org.eclipse.tractusx.irs.edc.client.contract.model.EdcOperator; @@ -30,6 +26,10 @@ import org.eclipse.tractusx.irs.edc.client.policy.model.EdcPolicyPermission; import org.eclipse.tractusx.irs.edc.client.policy.model.EdcPolicyPermissionConstraint; import org.eclipse.tractusx.irs.edc.client.policy.model.EdcPolicyPermissionConstraintExpression; +import policies.response.ConstraintResponse; +import policies.response.ConstraintsResponse; +import policies.response.PermissionResponse; +import policies.response.PolicyResponse; import java.util.List; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/shelldescriptor/application/RegistryController.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/shelldescriptor/application/RegistryController.java index 393a2ea7a5..bf33ef894b 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/shelldescriptor/application/RegistryController.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/shelldescriptor/application/RegistryController.java @@ -21,6 +21,7 @@ package org.eclipse.tractusx.traceability.shelldescriptor.application; +import assets.importpoc.ErrorResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; @@ -29,7 +30,6 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import assets.importpoc.ErrorResponse; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/submodel/infrastructure/repository/SubmodelClient.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/submodel/infrastructure/repository/SubmodelClient.java index 23c618a03b..5d1b17035d 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/submodel/infrastructure/repository/SubmodelClient.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/submodel/infrastructure/repository/SubmodelClient.java @@ -19,18 +19,16 @@ package org.eclipse.tractusx.traceability.submodel.infrastructure.repository; import lombok.extern.slf4j.Slf4j; -import notification.response.NotificationResponse; import org.awaitility.Durations; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; import org.springframework.stereotype.Component; import org.springframework.web.client.RestTemplate; -import static org.awaitility.Awaitility.await; -import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; +import static org.awaitility.Awaitility.await; import static org.eclipse.tractusx.traceability.common.config.RestTemplateConfiguration.SUBMODEL_REST_TEMPLATE; @Slf4j diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/InvestigationNotificationsSupport.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/InvestigationNotificationsSupport.java index ad5f533742..efb994ac60 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/InvestigationNotificationsSupport.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/InvestigationNotificationsSupport.java @@ -20,7 +20,6 @@ package org.eclipse.tractusx.traceability.integration.common.support; import org.eclipse.tractusx.traceability.assets.infrastructure.asbuilt.repository.JpaAssetAsBuiltRepository; -import org.eclipse.tractusx.traceability.notification.domain.base.model.NotificationSeverity; import org.eclipse.tractusx.traceability.notification.infrastructure.notification.model.NotificationEntity; import org.eclipse.tractusx.traceability.notification.infrastructure.notification.model.NotificationMessageEntity; import org.eclipse.tractusx.traceability.notification.infrastructure.notification.model.NotificationSeverityBaseEntity; @@ -79,7 +78,6 @@ public void assertNotificationsSize(int size) { private void storeCreatedInvestigations() { Instant now = Instant.parse("2023-10-10T10:10:10.00Z"); - Instant monthFromNow = Instant.parse("2023-11-10T10:10:10.00Z"); LocalDate specificDate = LocalDate.of(2023, 11, 11); ZonedDateTime zonedDateTime = specificDate.atStartOfDay(ZoneId.systemDefault()); Instant instant = zonedDateTime.toInstant();