Merge branch 'feature/api_key-1' into develop

dermatologist · Apr 25, 2021 · a627758 · a627758
2 parents 77347dd + bfef668
commit a627758
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -1,9 +1,8 @@
 name: Java Publish
 
 on:
-  push:
-    branches:
-      - master
+  release:
+    types: [published]
 
 jobs:
   build:

diff --git a/application/pom.xml b/application/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.canehealth.ckblib</groupId>
 	<artifactId>ckblib-application</artifactId>
-	<version>0.10.0</version>
+	<version>0.11.0</version>
 	<name>ckblib-application</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>

diff --git a/graph/pom.xml b/graph/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.canehealth.ckblib</groupId>
 	<artifactId>graph</artifactId>
-	<version>0.10.0</version>
+	<version>0.11.0</version>
 	<name>ckblib-graph</name>
 	<description>Demo project for Spring Boot</description>
 

diff --git a/library/pom.xml b/library/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.canehealth.ckblib</groupId>
 	<artifactId>library</artifactId>
-	<version>0.10.0</version>
+	<version>0.11.0</version>
 	<name>ckblib-library</name>
 	<description>Demo project for Spring Boot</description>
 

diff --git a/library/src/main/java/com/canehealth/ckblib/library/model/BaseQuery.java b/library/src/main/java/com/canehealth/ckblib/library/model/BaseQuery.java
@@ -13,6 +13,7 @@ public class BaseQuery {
     private int retmax = 10;
     private int reldate = 0;
     private int retstart = 0;
+    private String api_key = "";
 
     public String getQuery() {
         String query = "?retmode=json&db=" + db + "&term=" + term + "&retmax=" + Integer.toString(retmax);
@@ -22,6 +23,9 @@ public String getQuery() {
         if (retstart > 0) {
             query += "&retstart=" + Integer.toString(retstart);
         }
+        if(!"".equals(api_key)){
+            query += "&api_key=" + api_key;
+        }
         return query.replace(" ", "+");
     }
 

diff --git a/library/src/main/java/com/canehealth/ckblib/library/service/CkbEfetch.java b/library/src/main/java/com/canehealth/ckblib/library/service/CkbEfetch.java
@@ -17,6 +17,7 @@
 import org.w3c.dom.Node;
 
 import lombok.Getter;
+import lombok.Setter;
 import reactor.core.publisher.Mono;
 
 @Service
@@ -31,10 +32,12 @@ public class CkbEfetch {
 
     private WebClient webClient;
 
+    @Setter
     List<EsearchResultRoot> esearch_results = new ArrayList<EsearchResultRoot>();
 
 
     @Getter
+    @Setter
     List<String> results = new ArrayList<String>();
 
     public CkbEfetch() {

diff --git a/library/src/main/java/com/canehealth/ckblib/library/service/CkbEsearch.java b/library/src/main/java/com/canehealth/ckblib/library/service/CkbEsearch.java
@@ -27,6 +27,7 @@ public class CkbEsearch {
     private WebClient webClient;
 
     @Getter
+    @Setter
     List<EsearchResultRoot> results = new ArrayList<EsearchResultRoot>();
 
     public CkbEsearch() {

diff --git a/pom-deploy.xml b/pom-deploy.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.canehealth.ckblib</groupId>
     <artifactId>cklib-core</artifactId>
-    <version>0.10.0</version>
+    <version>0.11.0</version>
     <packaging>pom</packaging>
 
     <modules>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.canehealth.ckblib</groupId>
     <artifactId>cklib-core</artifactId>
-    <version>0.10.0</version>
+    <version>0.11.0</version>
     <packaging>pom</packaging>
 
     <modules>

diff --git a/qtakes/pom.xml b/qtakes/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.canehealth.ckblib</groupId>
 	<artifactId>qtakes</artifactId>
-	<version>0.10.0</version>
+	<version>0.11.0</version>
 	<name>ckblib-qtakes</name>
 	<description>Demo project for Spring Boot</description>
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,7 @@ public class CkbEsearch { @@
         private WebClient webClient;
         @Getter
+        @Setter
         List<EsearchResultRoot> results = new ArrayList<EsearchResultRoot>();
         public CkbEsearch() {
@@ Expand Down @@