Skip to content

Commit

Permalink
fix: removed outdated attributes from edcadapterservice
Browse files Browse the repository at this point in the history
  • Loading branch information
eschrewe committed Aug 28, 2023
1 parent 679a07f commit 9834bb6
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 25 deletions.
1 change: 1 addition & 0 deletions DEPENDENCIES_BACKEND
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,4 @@ maven/mavencentral/org.springframework/spring-webmvc/6.0.4, Apache-2.0, approved
maven/mavencentral/org.webjars/swagger-ui/4.18.2, Apache-2.0, approved, #7850
maven/mavencentral/org.yaml/snakeyaml/1.33, Apache-2.0, approved, clearlydefined


Original file line number Diff line number Diff line change
Expand Up @@ -65,27 +65,15 @@ public class EdcAdapterService {
@Value("${edc.controlplane.data.port}")
private Integer dataPort;

@Value("${edc.backend.url}")
private String backendUrl;

@Value("${edc.controlplane.key}")
private String edcApiKey;

@Value("${server.port}")
private String serverPort;

@Value("${edc.dataplane.public.port}")
private String dataplanePort;

@Value("${minikube.ip}")
private String minikubeIp;

@Value("${request.serverendpoint}")
private String requestServerEndpointURL;

@Value("${response.serverendpoint}")
private String responseServerEndpointURL;

private ObjectMapper objectMapper;

@Autowired
Expand Down Expand Up @@ -504,7 +492,6 @@ public String[] getContractForResponseApi(String partnerIdsUrl) {
*/
public String[] getContractForRequestOrResponseApiApi(String partnerIdsUrl, Map<String, String> filter) {
try {
// String catalog = getCatalog(partnerIdsUrl, Optional.of(filter));
JsonNode objectNode = getCatalogFilteredByAssetPropertyObjectFilter(partnerIdsUrl, filter);
JsonNode contractOffer = objectNode.get("contractOffers").get(0);
String assetApi = contractOffer.get("asset").get("id").asText();
Expand Down
29 changes: 17 additions & 12 deletions backend/src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Server Config
server.port=${SERVER_PORT:8081}
my.base.url=http://localhost
my.base.url=http://host.minikube.internal
request.serverendpoint=${my.base.url}:${server.port}/catena/product-stock/request
request.apiassetid=product-stock-request-api
response.serverendpoint=${my.base.url}:${server.port}/catena/product-stock/response
Expand All @@ -12,34 +12,39 @@ spring.datasource.url=${DATASOURCE_URL:jdbc:hsqldb:mem:testdb;DB_CLOSE_DELAY=-1}
spring.datasource.username=${DATASOURCE_USERNAME:sa}
spring.datasource.password=${DATASOURCE_PASSWORD:}
spring.jpa.hibernate.ddl-auto=create

# API Root
server.servlet.context-path=${API_ROOTDIR:/catena}

# EDC Config
edc.controlplane.host=${EDC_CONTROLPLANE_HOST:172.17.0.2}
edc.controlplane.data.port=${EDC_CONTROLPLANE_DATA_PORT:31960}
edc.controlplane.host=${EDC_CONTROLPLANE_HOST:192.168.49.2}
edc.controlplane.data.port=${EDC_CONTROLPLANE_DATA_PORT:31944}
edc.controlplane.key=${EDC_CONTROLPLANE_KEY:password}
edc.backend.url=${EDC_BACKEND_URL:http://172.17.0.2:31048}
minikube.ip=${MINIKUBE_IP:host.minikube.internal}

edc.applydataplaneworkaround=true
edc.dataplane.public.port=30784

edc.dataplane.public.port=30703
minikube.ip=${MINIKUBE_IP:host.minikube.internal}
# Jackson (JSON)
#spring.jackson.default-property-inclusion=non_empty
#logging.level.org.hibernate.SQL=DEBUG
#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true


# Own EDC-IDS-URL
edc.idsUrl=${EDC_IDSURL:http://plato-controlplane:8084/api/v1/ids}
own.bpnl=${OWN_BPNL:BPNL1234567890ZZ}
own.bpns=${OWN_BPNS:BPNS1234567890ZZ}
edc.idsUrl=${EDC_IDSURL:http://sokrates-controlplane:8084/api/v1/ids}
own.bpnl=${OWN_BPNL:BPNL4444444444XX}
own.name=${OWN_NAME:Scenario Customer}
own.default.bpns=${OWN_BPNS:BPNS4444444444XY}
own.default.site.name=${OWN_SITE:Hauptwerk Musterhausen}
own.default.bpna=${OWN_BPNS:BPNA4444444444ZZ}
own.default.streetandnumber=${OWN_STREETANDNUMBER:Musterstrasse 35b}
own.default.zipcodeandcity=${OWN_ZIPCODEANDCITY:77777 Musterhausen}
own.default.country=${OWN_COUNTRY:Germany}

# The number of minutes before received authentication data
# in the context of a consumer pull is removed from memory
own.edr.deletiontimer=2

puris.apiversion=1.0.0
puris.demonstrator.role=customer
# run with:
# mvn spring-boot:run -Dspring-boot.run.arguments=--spring.profiles.active=customer

0 comments on commit 9834bb6

Please sign in to comment.