From 7460352d8b9f14011db13c92fb93ea3c953d265e Mon Sep 17 00:00:00 2001 From: PradnyaC11 Date: Thu, 25 Jul 2024 16:48:13 -0700 Subject: [PATCH 1/3] [CITE-223] Changed doi to DOI as per JSON --- .../org/springframework/social/zotero/api/Data.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java b/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java index 24aa9bf..7c41eb2 100644 --- a/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java +++ b/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java @@ -35,7 +35,7 @@ public class Data { private String seriesText; private String journalAbbreviation; private String language; - private String doi; + private String DOI; private String issn; private String shortTitle; private String archive; @@ -216,11 +216,13 @@ public String getLanguage() { public void setLanguage(String language) { this.language = language; } - public String getDoi() { - return doi; + public String getDOI() { + System.out.println("====================== in get " + DOI); + return DOI; } - public void setDoi(String doi) { - this.doi = doi; + public void setDOI(String dOI) { + System.out.println("====================== in set " + dOI); + DOI = dOI; } public String getIssn() { return issn; From f2a9fcab549701efcaa02b58e8ee42d7907bc815 Mon Sep 17 00:00:00 2001 From: PradnyaC11 Date: Fri, 26 Jul 2024 16:39:34 -0700 Subject: [PATCH 2/3] [CITE-223] Added JSONProperty to DOI & ISSN --- .../java/org/springframework/social/zotero/api/Data.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java b/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java index 7c41eb2..5815507 100644 --- a/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java +++ b/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java @@ -3,6 +3,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonFilter; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonFilter("dataFilter") public class Data { @@ -35,7 +36,9 @@ public class Data { private String seriesText; private String journalAbbreviation; private String language; + @JsonProperty("DOI") private String DOI; + @JsonProperty("ISSN") private String issn; private String shortTitle; private String archive; @@ -217,11 +220,9 @@ public void setLanguage(String language) { this.language = language; } public String getDOI() { - System.out.println("====================== in get " + DOI); return DOI; } public void setDOI(String dOI) { - System.out.println("====================== in set " + dOI); DOI = dOI; } public String getIssn() { From dd03c1190edb913484032e6570285060e1327e47 Mon Sep 17 00:00:00 2001 From: PradnyaC11 Date: Tue, 24 Sep 2024 11:37:52 -0700 Subject: [PATCH 3/3] [CITE-223] Addressed PR comments --- .../org/springframework/social/zotero/api/Data.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java b/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java index 5815507..4233ec8 100644 --- a/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java +++ b/spring-social-zotero/src/main/java/org/springframework/social/zotero/api/Data.java @@ -37,7 +37,7 @@ public class Data { private String journalAbbreviation; private String language; @JsonProperty("DOI") - private String DOI; + private String doi; @JsonProperty("ISSN") private String issn; private String shortTitle; @@ -219,11 +219,11 @@ public String getLanguage() { public void setLanguage(String language) { this.language = language; } - public String getDOI() { - return DOI; + public String getDoi() { + return doi; } - public void setDOI(String dOI) { - DOI = dOI; + public void setDoi(String doi) { + this.doi = doi; } public String getIssn() { return issn;