From 5db371faebfc7b4371dea415f2e9c9218e40f861 Mon Sep 17 00:00:00 2001
From: Jing Tao <tao@nceas.ucsb.edu>
Date: Mon, 14 Feb 2022 19:14:56 -0800
Subject: [PATCH] Refactor the error message.

---
 .../java/edu/ucsb/nceas/osti_elink/OSTIElinkClient.java    | 2 +-
 .../edu/ucsb/nceas/osti_elink/OSTIElinkErrorAgent.java     | 4 ++--
 .../java/edu/ucsb/nceas/osti_elink/OSTIElinkService.java   | 2 ++
 .../edu/ucsb/nceas/osti_elink/OSTIElinkServiceRequest.java | 7 +++++--
 .../edu/ucsb/nceas/osti_elink/StringElinkErrorAgent.java   | 4 ++--
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/edu/ucsb/nceas/osti_elink/OSTIElinkClient.java b/src/main/java/edu/ucsb/nceas/osti_elink/OSTIElinkClient.java
index 17c2cfc..c47455a 100644
--- a/src/main/java/edu/ucsb/nceas/osti_elink/OSTIElinkClient.java
+++ b/src/main/java/edu/ucsb/nceas/osti_elink/OSTIElinkClient.java
@@ -82,7 +82,7 @@ public String mintIdentifier(String siteCode) throws OSTIElinkException {
             identifier = service.mintIdentifier(siteCode);
         } catch (OSTIElinkException e) {
             if (errorAgent != null) {
-                errorAgent.notify(e);
+                errorAgent.notify(e.getMessage());
             }
             throw e;
         }
diff --git a/src/main/java/edu/ucsb/nceas/osti_elink/OSTIElinkErrorAgent.java b/src/main/java/edu/ucsb/nceas/osti_elink/OSTIElinkErrorAgent.java
index be39050..95daf9f 100644
--- a/src/main/java/edu/ucsb/nceas/osti_elink/OSTIElinkErrorAgent.java
+++ b/src/main/java/edu/ucsb/nceas/osti_elink/OSTIElinkErrorAgent.java
@@ -27,8 +27,8 @@ public interface OSTIElinkErrorAgent {
 
     /**
      * Send the caught exceptions to the users
-     * @param e  the exception happened during the 
+     * @param error  the error message happened during the 
      * interaction between OSTIElinkClinet and Elink in another thread.
      */
-    public void notify(Exception e);
+    public void notify(String error);
 }
diff --git a/src/main/java/edu/ucsb/nceas/osti_elink/OSTIElinkService.java b/src/main/java/edu/ucsb/nceas/osti_elink/OSTIElinkService.java
index 7b1f554..7309da3 100644
--- a/src/main/java/edu/ucsb/nceas/osti_elink/OSTIElinkService.java
+++ b/src/main/java/edu/ucsb/nceas/osti_elink/OSTIElinkService.java
@@ -64,6 +64,8 @@
  */
 public class OSTIElinkService {
     public static final String DOI = "doi";
+    public static final String SAVED = "Saved";
+    public static final String PENDING = "Pending";
     
     private static final int GET = 1;
     private static final int PUT = 2;
diff --git a/src/main/java/edu/ucsb/nceas/osti_elink/OSTIElinkServiceRequest.java b/src/main/java/edu/ucsb/nceas/osti_elink/OSTIElinkServiceRequest.java
index 31758ff..285033e 100644
--- a/src/main/java/edu/ucsb/nceas/osti_elink/OSTIElinkServiceRequest.java
+++ b/src/main/java/edu/ucsb/nceas/osti_elink/OSTIElinkServiceRequest.java
@@ -94,9 +94,12 @@ public void run() {
                     break;
             }
         } catch (Exception e) {
-            log.error("OSTIElinkServiceRequest - Failed request " + method + " for " + identifier + " since: " + e.getMessage());
+            String error = "OSTIElinkServiceRequest.run - the request to OSTI for " + identifier + " failed:\n" + metadata + 
+                           "\n *************************************************************\n The response from OSIT is:\n " + 
+                            e.getMessage();
+            log.error(error);
             if (errorAgent != null) {
-                errorAgent.notify(e);
+                errorAgent.notify(error);
             }
         }
     }
diff --git a/src/test/java/edu/ucsb/nceas/osti_elink/StringElinkErrorAgent.java b/src/test/java/edu/ucsb/nceas/osti_elink/StringElinkErrorAgent.java
index 6f90ac0..8a30b23 100644
--- a/src/test/java/edu/ucsb/nceas/osti_elink/StringElinkErrorAgent.java
+++ b/src/test/java/edu/ucsb/nceas/osti_elink/StringElinkErrorAgent.java
@@ -28,8 +28,8 @@ public class StringElinkErrorAgent implements OSTIElinkErrorAgent {
     String error = "";
     
     @Override
-    public void notify(Exception e) {
-        error = error + " " + e.getMessage();
+    public void notify(String errorMessage) {
+        error = error + " " + errorMessage;
     }
     
     /**