From d3d5f6d3315d7b4a78070b72fcad8c24cceeb31f Mon Sep 17 00:00:00 2001
From: Marsel AB <marsel@accelbyte.net>
Date: Mon, 30 Sep 2024 17:14:43 +0800
Subject: [PATCH 1/2] chore: Handle Data Generation error message properly when
 failed to upload zip file

---
 CHANGELOG.md                                       |  4 ++++
 .../java/net/accelbyte/gdpr/sdk/GDPRService.java   | 12 +++++++++---
 .../net/accelbyte/gdpr/sdk/utils/HttpHelper.java   | 14 ++++++++------
 version.json                                       |  2 +-
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ece214f..0a18ab6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.1] - 2024-09-30
+### Changed
+- Handle Data Generation error message properly when failed to upload zip file
+
 ## [1.0.0] - 2023-08-29
 ### Added
 - Initial GDPR Java SDK implementation
diff --git a/src/main/java/net/accelbyte/gdpr/sdk/GDPRService.java b/src/main/java/net/accelbyte/gdpr/sdk/GDPRService.java
index 4b55b2c..6dda650 100644
--- a/src/main/java/net/accelbyte/gdpr/sdk/GDPRService.java
+++ b/src/main/java/net/accelbyte/gdpr/sdk/GDPRService.java
@@ -40,7 +40,7 @@ public void dataGeneration(DataGenerationRequest request, StreamObserver<DataGen
             log.info("[GDPRService.dataGeneration] start executing for namespace [{}] userId [{}]", request.getNamespace(), request.getUserId());
             try {
                 DataGenerationResult result = handler.ProcessDataGeneration(request.getNamespace(), request.getUserId(), request.getIsPublisherNamespace());
-                if (result == null || result.getData().size() == 0) {
+                if (result == null || result.getData().isEmpty()) {
                     log.info("[GDPRService.dataGeneration] result is empty for namespace [{}] userId [{}]", request.getNamespace(), request.getUserId());
                     responseBuilder.setSuccess(true);
                 } else {
@@ -49,8 +49,14 @@ public void dataGeneration(DataGenerationRequest request, StreamObserver<DataGen
                         log.info("[GDPRService.dataGeneration] result is empty for namespace [{}] userId [{}]", request.getNamespace(), request.getUserId());
                         responseBuilder.setSuccess(true);
                     } else {
-                        boolean successUpload = HttpHelper.uploadFile(request.getUploadUrl(), zipFileBytes);
-                        responseBuilder.setSuccess(successUpload);
+                        String errorMessage = HttpHelper.uploadFile(request.getUploadUrl(), zipFileBytes);
+                        if (Strings.isNullOrEmpty(errorMessage)) {
+                            log.debug("Success upload file to uploadUrl [{}]", request.getUploadUrl());
+                            responseBuilder.setSuccess(true);
+                        } else {
+                            log.error("[GDPRService.dataGeneration] error: {}", errorMessage);
+                            responseBuilder.setSuccess(false).setMessage(errorMessage);
+                        }
                     }
                 }
             } catch (Exception ex) {
diff --git a/src/main/java/net/accelbyte/gdpr/sdk/utils/HttpHelper.java b/src/main/java/net/accelbyte/gdpr/sdk/utils/HttpHelper.java
index 83622e6..ecfa15d 100644
--- a/src/main/java/net/accelbyte/gdpr/sdk/utils/HttpHelper.java
+++ b/src/main/java/net/accelbyte/gdpr/sdk/utils/HttpHelper.java
@@ -12,13 +12,14 @@
 import org.apache.http.client.entity.EntityBuilder;
 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
 
 import java.io.IOException;
 
 @Slf4j
 public class HttpHelper {
 
-    public static boolean uploadFile(String uploadUrl, byte[] data) throws IOException {
+    public static String uploadFile(String uploadUrl, byte[] data) throws IOException {
         HttpClient httpClient = HttpClients.custom().build();
         HttpPut put = new HttpPut(uploadUrl);
         HttpEntity entity = EntityBuilder.create()
@@ -28,12 +29,13 @@ public static boolean uploadFile(String uploadUrl, byte[] data) throws IOExcepti
         put.setHeader("Content-Type","application/zip");
 
         HttpResponse response = httpClient.execute(put);
-        if (response.getStatusLine().getStatusCode() == 200) {
-            log.debug("Success upload file to uploadUrl [{}]", uploadUrl);
-            return true;
+        int responseCode = response.getStatusLine().getStatusCode();
+        if (responseCode == 200) {
+            return "";
         } else {
-            log.debug("Failed upload file to uploadUrl [{}]. Response code [{}]", uploadUrl, response.getStatusLine().getStatusCode());
-            return false;
+            String responseBody = response.getEntity() != null ? EntityUtils.toString(response.getEntity()): "";
+            return String.format("Failed upload file to uploadUrl [%s], Response code [%d], Response body: %s",
+                    uploadUrl, responseCode, responseBody.replaceAll("[\n\r\t]", ""));
         }
     }
 }
diff --git a/version.json b/version.json
index 1587a66..ca84e70 100644
--- a/version.json
+++ b/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.0.0"
+  "version": "1.0.1"
 }

From f71d3669f8c17815960fee37f0796e69eb726f3b Mon Sep 17 00:00:00 2001
From: Marsel AB <marsel@accelbyte.net>
Date: Mon, 30 Sep 2024 17:44:25 +0800
Subject: [PATCH 2/2] chore: update readme

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index d17f012..094f04f 100644
--- a/README.md
+++ b/README.md
@@ -90,9 +90,9 @@ GDPRService.SetHandler(myGDPRHandler);
 
 Start gRPC Server with [GDPRService](src/main/java/net/accelbyte/gdpr/sdk/GDPRService.java) class:
 ```java
-Server server = ServerBuilder
-        .forPort(8081)
-        .addService(new GDPRService()).build();
-server.start();
+ServerBuilder<?> serverBuilder = Grpc.newServerBuilderForPort(8081, InsecureServerCredentials.create());
+serverBuilder.addService(new GDPRService()).addService(ProtoReflectionService.newInstance());
+
+Server server = serverBuilder.build().start();
 server.awaitTermination();
 ```