From 508ad8686b63da90d4af74569ff89bd9128d74d6 Mon Sep 17 00:00:00 2001
From: Yusra Haider <yhaider@ebi.ac.uk>
Date: Thu, 16 Apr 2020 12:41:42 +0100
Subject: [PATCH 1/3] added code for querying the Content Service for static
 citation

---
 .../client/common/ContentClientHandler.java   |  5 ++++
 .../model/client/content/ContentClient.java   |  7 ++++++
 .../web/pwp/model/test/WidgetTest.java        | 24 +++++++++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/src/main/java/org/reactome/web/pwp/model/client/common/ContentClientHandler.java b/src/main/java/org/reactome/web/pwp/model/client/common/ContentClientHandler.java
index 97d6c2d..16f59d1 100755
--- a/src/main/java/org/reactome/web/pwp/model/client/common/ContentClientHandler.java
+++ b/src/main/java/org/reactome/web/pwp/model/client/common/ContentClientHandler.java
@@ -42,4 +42,9 @@ interface AncestorsLoaded extends ContentClientHandler {
     interface DatabaseInfo extends ContentClientHandler {
         void onDatabaseInfoLoaded(DBInfo dbInfo);
     }
+
+    interface Citation extends ContentClientHandler {
+        void onCitationTextLoaded(String citation);
+    }
+
 }
diff --git a/src/main/java/org/reactome/web/pwp/model/client/content/ContentClient.java b/src/main/java/org/reactome/web/pwp/model/client/content/ContentClient.java
index 180c899..c700256 100644
--- a/src/main/java/org/reactome/web/pwp/model/client/content/ContentClient.java
+++ b/src/main/java/org/reactome/web/pwp/model/client/content/ContentClient.java
@@ -175,4 +175,11 @@ public static void getDatabaseInformation(ContentClientHandler.DatabaseInfo hand
             });
         }
     }
+
+    public static void getStaticCitation(String id, ContentClientHandler.Citation handler) {
+        request("citation/static/" + id, handler, body -> {
+            String citation = body;
+            handler.onCitationTextLoaded(citation);
+        });
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/reactome/web/pwp/model/test/WidgetTest.java b/src/main/java/org/reactome/web/pwp/model/test/WidgetTest.java
index 56ccc94..156e910 100644
--- a/src/main/java/org/reactome/web/pwp/model/test/WidgetTest.java
+++ b/src/main/java/org/reactome/web/pwp/model/test/WidgetTest.java
@@ -31,6 +31,7 @@ public void onModuleLoad() {
             addDatabaseName();
             addSpecies();
             addTopLvelPathway();
+            getCitation("31691815");
 //                //RAF/MAP -> 109869 (for v52)
 //                DatabaseObjectFactory.get(109869L, new DatabaseObjectCreatedHandler() {
 //                    @Override
@@ -147,4 +148,27 @@ public void onContentClientError(ContentClientError error) {
             }
         });
     }
+
+    private void getCitation(String id) {
+        ContentClient.getStaticCitation(id, new ContentClientHandler.Citation() {
+            @Override
+            public void onCitationTextLoaded(String citation) {
+                container.add(new Label(citation));
+            }
+
+            @Override
+            public void onContentClientException(Type type, String message) {
+                container.add(new Label("in content client exception"));
+                container.add(new Label(type.toString()));
+                container.add(new Label(message));
+            }
+
+            @Override
+            public void onContentClientError(ContentClientError error) {
+                container.add(new Label("in content client error"));
+                container.add(new Label(error.toString()));
+            }
+        });
+    }
+
 }
\ No newline at end of file

From 811f5bb76b03093aee4a9559ceb8bb652bd365d3 Mon Sep 17 00:00:00 2001
From: Yusra Haider <yhaider@ebi.ac.uk>
Date: Wed, 22 Apr 2020 09:44:44 +0100
Subject: [PATCH 2/3] updated snapshot version to `2.1.21-SNAPSHOT`

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 39db41a..9a7fd20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <groupId>org.reactome.web.pwp</groupId>
     <artifactId>model</artifactId>
     <packaging>jar</packaging>
-    <version>2.1.20-SNAPSHOT</version>
+    <version>2.1.21-SNAPSHOT</version>
     <name>Reactome Data Model</name>
 
     <description>

From 309ce226575d6481d19d0332fcae4ebfba786664 Mon Sep 17 00:00:00 2001
From: Yusra Haider <yhaider@ebi.ac.uk>
Date: Wed, 22 Apr 2020 17:19:57 +0100
Subject: [PATCH 3/3] specified the accept parameter

---
 .../reactome/web/pwp/model/client/content/ContentClient.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/reactome/web/pwp/model/client/content/ContentClient.java b/src/main/java/org/reactome/web/pwp/model/client/content/ContentClient.java
index c700256..77c9e2c 100644
--- a/src/main/java/org/reactome/web/pwp/model/client/content/ContentClient.java
+++ b/src/main/java/org/reactome/web/pwp/model/client/content/ContentClient.java
@@ -177,7 +177,7 @@ public static void getDatabaseInformation(ContentClientHandler.DatabaseInfo hand
     }
 
     public static void getStaticCitation(String id, ContentClientHandler.Citation handler) {
-        request("citation/static/" + id, handler, body -> {
+        request("citation/static/" + id, Accept.TEXT_PLAIN, handler, body -> {
             String citation = body;
             handler.onCitationTextLoaded(citation);
         });