-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #169 from eclipse-tractusx/feat/add-controller-for…
…-negotiation Add new controller for negotiation endpoint
- Loading branch information
Showing
14 changed files
with
895 additions
and
313 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
backend/src/main/java/org/eclipse/tractusx/valueaddedservice/config/EdcProperties.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /******************************************************************************** | ||
| * Copyright (c) 2022,2024 BMW Group AG | ||
| * Copyright (c) 2022,2024 Contributors to the Eclipse Foundation | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Apache License, Version 2.0 which is available at | ||
| * https://www.apache.org/licenses/LICENSE-2.0. | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations | ||
| * under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| ********************************************************************************/ | ||
| package org.eclipse.tractusx.valueaddedservice.config; | ||
|
|
||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
| import org.springframework.boot.context.properties.ConfigurationProperties; | ||
| import org.springframework.context.annotation.Configuration; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| @Setter | ||
| @Getter | ||
| @Configuration | ||
| @ConfigurationProperties(prefix = "application.edc") | ||
| public class EdcProperties { | ||
|
|
||
| private List<String> providers; | ||
|
|
||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
backend/src/main/java/org/eclipse/tractusx/valueaddedservice/dto/edc/CatalogItemDTO.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /******************************************************************************** | ||
| * Copyright (c) 2022,2024 BMW Group AG | ||
| * Copyright (c) 2022,2024 Contributors to the Eclipse Foundation | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Apache License, Version 2.0 which is available at | ||
| * https://www.apache.org/licenses/LICENSE-2.0. | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations | ||
| * under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| ********************************************************************************/ | ||
| package org.eclipse.tractusx.valueaddedservice.dto.edc; | ||
|
|
||
| import io.swagger.v3.oas.annotations.media.Schema; | ||
| import lombok.*; | ||
|
|
||
| @Setter | ||
| @Getter | ||
| @ToString | ||
| @AllArgsConstructor | ||
| @NoArgsConstructor | ||
| @Schema(description = "Represents a catalog item available for negotiation") | ||
| public class CatalogItemDTO { | ||
|
|
||
| @Schema(description = "Unique identifier of the catalog item", example = "1", required = true) | ||
| private String id; | ||
|
|
||
| @Schema(description = "Identifier of the offer associated with the catalog item", example = "offer123", required = true) | ||
| private String offerId; | ||
|
|
||
| @Schema(description = "Provider of the catalog item", example = "Provider A") | ||
| private String provider; | ||
|
|
||
| @Schema(description = "Subject of the catalog item", example = "cx-taxo:ReadAccessPoolForCatenaXMember") | ||
| private String subject; | ||
|
|
||
| @Schema(description = "Description of the catalog item", example = "Grants the Catena-X Member read access to the Pool API...") | ||
| private String description; | ||
| } | ||
|
|
33 changes: 33 additions & 0 deletions
33
backend/src/main/java/org/eclipse/tractusx/valueaddedservice/dto/edc/EDRResponseDTO.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /******************************************************************************** | ||
| * Copyright (c) 2022,2024 BMW Group AG | ||
| * Copyright (c) 2022,2024 Contributors to the Eclipse Foundation | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Apache License, Version 2.0 which is available at | ||
| * https://www.apache.org/licenses/LICENSE-2.0. | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations | ||
| * under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| ********************************************************************************/ | ||
| package org.eclipse.tractusx.valueaddedservice.dto.edc; | ||
|
|
||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
| import lombok.ToString; | ||
|
|
||
| @Setter | ||
| @Getter | ||
| @ToString | ||
| public class EDRResponseDTO { | ||
|
|
||
| private String authCode; | ||
| private String endpoint; | ||
| } |
39 changes: 39 additions & 0 deletions
39
...d/src/main/java/org/eclipse/tractusx/valueaddedservice/dto/edc/NegotiationRequestDTO.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /******************************************************************************** | ||
| * Copyright (c) 2022,2024 BMW Group AG | ||
| * Copyright (c) 2022,2024 Contributors to the Eclipse Foundation | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Apache License, Version 2.0 which is available at | ||
| * https://www.apache.org/licenses/LICENSE-2.0. | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations | ||
| * under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| ********************************************************************************/ | ||
| package org.eclipse.tractusx.valueaddedservice.dto.edc; | ||
|
|
||
| import io.swagger.v3.oas.annotations.media.Schema; | ||
| import lombok.*; | ||
|
|
||
| @Setter | ||
| @Getter | ||
| @ToString | ||
| @AllArgsConstructor | ||
| @NoArgsConstructor | ||
| @Schema(description = "Data Transfer Object for initiating a negotiation request") | ||
| public class NegotiationRequestDTO { | ||
|
|
||
| @Schema(description = "Unique identifier of the catalog item", example = "1", required = true) | ||
| private String id; | ||
|
|
||
| @Schema(description = "Identifier of the offer associated with the catalog item", example = "offer123", required = true) | ||
| private String offerId; | ||
|
|
||
| } |
53 changes: 53 additions & 0 deletions
53
.../src/main/java/org/eclipse/tractusx/valueaddedservice/dto/edc/NegotiationResponseDTO.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /******************************************************************************** | ||
| * Copyright (c) 2022,2024 BMW Group AG | ||
| * Copyright (c) 2022,2024 Contributors to the Eclipse Foundation | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Apache License, Version 2.0 which is available at | ||
| * https://www.apache.org/licenses/LICENSE-2.0. | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations | ||
| * under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| ********************************************************************************/ | ||
| package org.eclipse.tractusx.valueaddedservice.dto.edc; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonIgnore; | ||
| import io.swagger.v3.oas.annotations.media.Schema; | ||
| import lombok.*; | ||
|
|
||
| @Setter | ||
| @Getter | ||
| @ToString | ||
| @AllArgsConstructor | ||
| @NoArgsConstructor | ||
| @Schema(description = "Data Transfer Object with negotiation status") | ||
| public class NegotiationResponseDTO { | ||
|
|
||
| @Schema(description = "Unique identifier of the catalog item", example = "1", required = true) | ||
| private String id; | ||
|
|
||
| @Schema(description = "Identifier of the offer associated with the catalog item", example = "offer123", required = true) | ||
| private String offerId; | ||
|
|
||
| @Schema(description = "Provider of the catalog item", example = "Provider A") | ||
| private String provider; | ||
|
|
||
| @Schema(description = "Status of negotiation of the catalog item", example = "Negotiated") | ||
| private String status; | ||
|
|
||
| @JsonIgnore | ||
| @Schema(description = "Auth Code for requesting the endpoint", example = "utasdbvhsarpoausighasd") | ||
| private String authCode; | ||
|
|
||
| @JsonIgnore | ||
| @Schema(description = "Endpoint for the Final Request", example = "http://localhost:80/finalRequest") | ||
| private String endpoint; | ||
| } |
Oops, something went wrong.