From d7b40ff7cfb2528ee416afdd6281033d0fa32806 Mon Sep 17 00:00:00 2001 From: Mathias Schmoigl Date: Mon, 11 Nov 2019 11:01:25 +0100 Subject: [PATCH 1/5] added ID of product, originating from the business process --- .../datachannel/controller/ChannelController.java | 3 ++- .../datachannel/entity/ChannelConfiguration.java | 14 +++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/data-channel-service/src/main/java/eu/nimble/service/datachannel/controller/ChannelController.java b/data-channel-service/src/main/java/eu/nimble/service/datachannel/controller/ChannelController.java index f645452..a21da96 100755 --- a/data-channel-service/src/main/java/eu/nimble/service/datachannel/controller/ChannelController.java +++ b/data-channel-service/src/main/java/eu/nimble/service/datachannel/controller/ChannelController.java @@ -110,7 +110,8 @@ public ResponseEntity createChannel( createChannelRequest.getBusinessProcessID(), createChannelRequest.getSellerCompanyID(), createChannelRequest.getBuyerCompanyID(), - createChannelRequest.getDescription()); + createChannelRequest.getDescription(), + createChannelRequest.getProductID()); config = channelConfigurationRepository.save(config); logger.info("Company {} opened channel ", createChannelRequest.getSellerCompanyID()); diff --git a/data-channel-service/src/main/java/eu/nimble/service/datachannel/entity/ChannelConfiguration.java b/data-channel-service/src/main/java/eu/nimble/service/datachannel/entity/ChannelConfiguration.java index e8281ef..4702583 100644 --- a/data-channel-service/src/main/java/eu/nimble/service/datachannel/entity/ChannelConfiguration.java +++ b/data-channel-service/src/main/java/eu/nimble/service/datachannel/entity/ChannelConfiguration.java @@ -32,6 +32,9 @@ public class ChannelConfiguration { @ApiModelProperty(value = "ID of originating business process") private String businessProcessID; + @ApiModelProperty(value = "ID of product, originating from the business process") + private String productID; + @ApiModelProperty(value = "Description and purpose of data channel") private String description; @@ -82,11 +85,12 @@ public class ChannelConfiguration { public ChannelConfiguration() { } - public ChannelConfiguration(String businessProcessID, String sellerCompanyID, String buyerCompanyID, String description) { + public ChannelConfiguration(String businessProcessID, String sellerCompanyID, String buyerCompanyID, String description, String productID) { setSellerCompanyID(sellerCompanyID); setBuyerCompanyID(buyerCompanyID); setDescription(description); setBusinessProcessID(businessProcessID); + setProductID(productID); } public Long getId() { @@ -107,6 +111,14 @@ public void setSellerCompanyID(String sellerCompanyID) { this.sellerCompanyID = sellerCompanyID; } + public String getProductID() { + return productID; + } + + public void setProductID(String productID) { + this.productID = productID; + } + public String getBuyerCompanyID() { return buyerCompanyID; } From b18592b6d45560452b532d552b383e70878f2327 Mon Sep 17 00:00:00 2001 From: Akayeshmantha Date: Mon, 11 Nov 2019 11:21:45 +0100 Subject: [PATCH 2/5] commons change --- libs/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common b/libs/common index ca7f8f9..1984a9b 160000 --- a/libs/common +++ b/libs/common @@ -1 +1 @@ -Subproject commit ca7f8f96e81958d0483a0ad074ee15628363a187 +Subproject commit 1984a9bea08afb2099ecbcb7ecde655378d6ca31 From a7c5692e996cf1406aa2c44ead2a1f0d760ccc55 Mon Sep 17 00:00:00 2001 From: Akayeshmantha Date: Mon, 9 Dec 2019 15:41:59 +0100 Subject: [PATCH 3/5] Revert "added ID of product, originating from the business process" This reverts commit d7b40ff7cfb2528ee416afdd6281033d0fa32806. --- .../datachannel/controller/ChannelController.java | 3 +-- .../datachannel/entity/ChannelConfiguration.java | 14 +------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/data-channel-service/src/main/java/eu/nimble/service/datachannel/controller/ChannelController.java b/data-channel-service/src/main/java/eu/nimble/service/datachannel/controller/ChannelController.java index a21da96..f645452 100755 --- a/data-channel-service/src/main/java/eu/nimble/service/datachannel/controller/ChannelController.java +++ b/data-channel-service/src/main/java/eu/nimble/service/datachannel/controller/ChannelController.java @@ -110,8 +110,7 @@ public ResponseEntity createChannel( createChannelRequest.getBusinessProcessID(), createChannelRequest.getSellerCompanyID(), createChannelRequest.getBuyerCompanyID(), - createChannelRequest.getDescription(), - createChannelRequest.getProductID()); + createChannelRequest.getDescription()); config = channelConfigurationRepository.save(config); logger.info("Company {} opened channel ", createChannelRequest.getSellerCompanyID()); diff --git a/data-channel-service/src/main/java/eu/nimble/service/datachannel/entity/ChannelConfiguration.java b/data-channel-service/src/main/java/eu/nimble/service/datachannel/entity/ChannelConfiguration.java index 4702583..e8281ef 100644 --- a/data-channel-service/src/main/java/eu/nimble/service/datachannel/entity/ChannelConfiguration.java +++ b/data-channel-service/src/main/java/eu/nimble/service/datachannel/entity/ChannelConfiguration.java @@ -32,9 +32,6 @@ public class ChannelConfiguration { @ApiModelProperty(value = "ID of originating business process") private String businessProcessID; - @ApiModelProperty(value = "ID of product, originating from the business process") - private String productID; - @ApiModelProperty(value = "Description and purpose of data channel") private String description; @@ -85,12 +82,11 @@ public class ChannelConfiguration { public ChannelConfiguration() { } - public ChannelConfiguration(String businessProcessID, String sellerCompanyID, String buyerCompanyID, String description, String productID) { + public ChannelConfiguration(String businessProcessID, String sellerCompanyID, String buyerCompanyID, String description) { setSellerCompanyID(sellerCompanyID); setBuyerCompanyID(buyerCompanyID); setDescription(description); setBusinessProcessID(businessProcessID); - setProductID(productID); } public Long getId() { @@ -111,14 +107,6 @@ public void setSellerCompanyID(String sellerCompanyID) { this.sellerCompanyID = sellerCompanyID; } - public String getProductID() { - return productID; - } - - public void setProductID(String productID) { - this.productID = productID; - } - public String getBuyerCompanyID() { return buyerCompanyID; } From bc576b218f45f0f47409ece35db81e81658c4324 Mon Sep 17 00:00:00 2001 From: Akayeshmantha Date: Mon, 9 Dec 2019 15:43:12 +0100 Subject: [PATCH 4/5] Revert "commons change" This reverts commit b18592b6d45560452b532d552b383e70878f2327. --- libs/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common b/libs/common index 1984a9b..ca7f8f9 160000 --- a/libs/common +++ b/libs/common @@ -1 +1 @@ -Subproject commit 1984a9bea08afb2099ecbcb7ecde655378d6ca31 +Subproject commit ca7f8f96e81958d0483a0ad074ee15628363a187 From 334b8352120ccbb23eca7d15c1f05203d6a5e6a6 Mon Sep 17 00:00:00 2001 From: dogukan10 Date: Thu, 7 May 2020 13:25:57 +0300 Subject: [PATCH 5/5] fixed the port --- data-channel-service/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data-channel-service/src/main/resources/application.properties b/data-channel-service/src/main/resources/application.properties index 3f09e41..4dfffae 100755 --- a/data-channel-service/src/main/resources/application.properties +++ b/data-channel-service/src/main/resources/application.properties @@ -11,4 +11,4 @@ spring.jackson.date-format=com.fasterxml.jackson.databind.util.ISO8601DateFormat spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false # Only for local development - do not release this code -server.port=8888 \ No newline at end of file +server.port=9099 \ No newline at end of file