From a7c7573592ba65aee6281373fd25de922a56c045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=CC=88rg=20Prante?= <joergprante@gmail.com>
Date: Fri, 20 Apr 2018 00:03:33 +0200
Subject: [PATCH] add TooManyRequests exception, update gradle

---
 gradle.properties                             |   2 +-
 gradle/wrapper/gradle-wrapper.jar             | Bin 54333 -> 54329 bytes
 gradle/wrapper/gradle-wrapper.properties      |   3 +--
 .../xbib/oai/client/AbstractOAIRequest.java   |   9 +++++++++
 .../oai/client/TooManyRequestsException.java  |   7 +++++++
 .../listrecords/ListRecordsResponse.java      |   4 ++++
 .../org/xbib/oai/client/DOAJClientTest.java   |  15 ++++++++++-----
 7 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 oai-client/src/main/java/org/xbib/oai/client/TooManyRequestsException.java

diff --git a/gradle.properties b/gradle.properties
index c6863a3..eecb243 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 group = org.xbib
 name = oai
-version = 1.2.0
+version = 1.2.1
 
 xbib-content.version = 1.3.0
 xbib-marc.version = 1.1.0
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index c44b679acd3f794ddbb3aa5e919244914911014a..f6b961fd5a86aa5fbfe90f707c3138408be7c718 100644
GIT binary patch
delta 757
zcmY+CUr3Wt7{+&AW7C-VS!CNcr4&o~L{lkNk~%LkW0;eMX_UJtQ_yA@6BN7{7(@fv
zcr37JCEXarC;}s-BKOa2&dpgDb!E_vP@r@Z1<~oSzVg7~Jiq6C&dcHDyqe2-IhW%#
z=T){xzBg+$8oSS8*KUn$jWCT@em4K>?d}|n&8o}YXqx`Eht~`FMoX|5pBJnCU4kKa
zmfgiru#UZkKX{BbH1I|C;%iW$VkTq<lkqq#p*ti~msVISdAaa~>Zw7eqDyDQ&yYg*
z^0L-0<VPi(56iT%Pfe8@ig+)DJ{W|hHy*&wh(b5_b2Ond(!>tK8#zZM)uL{zF5q1h
z($xq&6Fp9*qeA+lW}0Xd@@bo%H<6ILB$H$n)`O*d*sKQhE-56pXRStRwF^0BFM$+O
z=unTqo*o&49O;6<C$VN$fG;r{bD}YRg5Ae>yq78mu+V3OW1t*?xP*#?Ovxd*oyBk@
zTG%DbCb}p%j8DUryqAQJE=kYlon3L4NN$emaBaDc=0~$wiuGlMtm9eK<4Dp>mI*cN
zO`fDlw~9ZK9dvL~MdwN@IXo&p^q6pKMZ%7hOc$qA+dsvhm{O?Ir&@uOh5Dye^iOFK
zm@ecg2@PqPF5lT!^3G^+BV9|UXSUhvX$vbu>8gW`!M!>}FJ`l4Egpr7P?3@8_H%d^
z%FvgorK<~E)`-!(&&cdLHZ%R~6uQ^0@Xz&Tt={ziFE#v~n>Yude^;dqE&hSu9GWc-

delta 705
zcmYL{-%Ha`7{+(rjm?$j*GjXaTd)e{D~3xfrA01^mTOixDlKYW%oMDZpcjQmAYF7}
zlSc~EjINT1VkqRYY;&8=`Ey%dMEwKRMHJLc5FJmp&dvEe&-1=7oWmO&)xH_k`u7`q
zHjI_nH5$#C{#tj|=k4D+zI8B-p9jW&hx1k|b(&L7Lzb!?I-4(QwjexR_rC*MBModA
ztr05=;X$ODeZh5o0X{`kGBbpu`EW6grwIk_D5rCJVVU9A8_+nbz+q4}ijnKbhETMb
z9vVf73AM3`wNbH)>;qO}9(D)TnI^JY<VcTY8-g<`?I@SBzC0JkS(S`?q^z5*Aybva
z6ID5QB9b15l+PX6n44Fii*wrSl$O(#gL-Enn&K)IyQDP~KS&O@#INyVRN5%fHFtz`
z7uL~$7jxB==S7)!H#Q|yb`3QN8$I$O=&gi5t>9IHGZm|eR$6X{y|)<W=k4UZD)IGH
zuB>@K&nf1U)-PW+ObaS4bPBl>?F&|#=#u!Oi{qn6TsNdFTeQ*PZizkJMIuq~a*@;R
zThjWuc#=wb1s=lNq=I`(oHZk`)JB*3WbW_R<LGiNHT18`0)&=TY8%L;&j#{j>%JAv
zT5x*BL(aiW*f+RVuYi)Ab`4A0o;*M|M<h;+m_@5f!N)>ckdvyQ`(p@<mEv+rCEuh#
z3;sS-K{Caua|(B-Z1O8=(wrTKJKe&HF`3?5l-V}18-@QCMBZ1B^{z}GpI#Gx0Ifw7
AtpET3

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cad203e..bf3de21 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Feb 07 09:29:06 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip
diff --git a/oai-client/src/main/java/org/xbib/oai/client/AbstractOAIRequest.java b/oai-client/src/main/java/org/xbib/oai/client/AbstractOAIRequest.java
index b9d7caf..03647b8 100644
--- a/oai-client/src/main/java/org/xbib/oai/client/AbstractOAIRequest.java
+++ b/oai-client/src/main/java/org/xbib/oai/client/AbstractOAIRequest.java
@@ -135,6 +135,15 @@ public abstract class AbstractOAIRequest implements OAIRequest {
         return retry;
     }
 
+    @Override
+    public String toString() {
+        return "[request:metadataPrefix=" + getMetadataPrefix()
+                + ",set=" + getSet()
+                + ",from=" + getFrom()
+                + ",until=" + getUntil()
+                + "]";
+    }
+
     class GetRecord extends AbstractOAIRequest {
 
         public GetRecord() {
diff --git a/oai-client/src/main/java/org/xbib/oai/client/TooManyRequestsException.java b/oai-client/src/main/java/org/xbib/oai/client/TooManyRequestsException.java
new file mode 100644
index 0000000..0669569
--- /dev/null
+++ b/oai-client/src/main/java/org/xbib/oai/client/TooManyRequestsException.java
@@ -0,0 +1,7 @@
+package org.xbib.oai.client;
+
+import java.io.IOException;
+
+@SuppressWarnings("serial")
+public class TooManyRequestsException extends IOException {
+}
diff --git a/oai-client/src/main/java/org/xbib/oai/client/listrecords/ListRecordsResponse.java b/oai-client/src/main/java/org/xbib/oai/client/listrecords/ListRecordsResponse.java
index 86d2d67..e6e5052 100644
--- a/oai-client/src/main/java/org/xbib/oai/client/listrecords/ListRecordsResponse.java
+++ b/oai-client/src/main/java/org/xbib/oai/client/listrecords/ListRecordsResponse.java
@@ -6,6 +6,7 @@ import org.xbib.content.xml.transform.TransformerURIResolver;
 import org.xbib.content.xml.util.XMLUtil;
 import org.xbib.helianthus.common.http.AggregatedHttpMessage;
 import org.xbib.oai.client.AbstractOAIResponse;
+import org.xbib.oai.client.TooManyRequestsException;
 import org.xbib.oai.exceptions.BadArgumentException;
 import org.xbib.oai.exceptions.BadResumptionTokenException;
 import org.xbib.oai.exceptions.NoRecordsMatchException;
@@ -109,6 +110,9 @@ public class ListRecordsResponse extends AbstractOAIResponse {
             }
             return;
         }
+        if (status == 429) {
+            throw new TooManyRequestsException();
+        }
         if (status != 200) {
             throw new IOException("status  = " + status + " response = " + content);
         }
diff --git a/oai-client/src/test/java/org/xbib/oai/client/DOAJClientTest.java b/oai-client/src/test/java/org/xbib/oai/client/DOAJClientTest.java
index 4d14a79..ecf57ac 100644
--- a/oai-client/src/test/java/org/xbib/oai/client/DOAJClientTest.java
+++ b/oai-client/src/test/java/org/xbib/oai/client/DOAJClientTest.java
@@ -32,7 +32,6 @@ import java.util.concurrent.atomic.AtomicLong;
 /**
  *
  */
-@Ignore
 public class DOAJClientTest {
 
     private static final Logger logger = LogManager.getLogger(DOAJClientTest.class.getName());
@@ -64,21 +63,23 @@ public class DOAJClientTest {
                     DateTimeFormatter.ofPattern("yyyy-MM-dd").withZone(ZoneId.of("GMT")) : null;
             ListRecordsRequest listRecordsRequest = oaiClient.newListRecordsRequest();
             listRecordsRequest.setDateTimeFormatter(dateTimeFormatter);
-            listRecordsRequest.setFrom(Instant.parse("2017-01-01T00:00:00Z"));
+            listRecordsRequest.setFrom(Instant.parse("2008-01-01T00:00:00Z"));
             listRecordsRequest.setUntil(Instant.parse("2018-01-01T00:00:00Z"));
             listRecordsRequest.setMetadataPrefix("oai_dc");
             Handler handler = new Handler();
-            File file =  File.createTempFile("doaj.", ".xml");
+            File file = File.createTempFile("doaj.", ".xml");
             file.deleteOnExit();
             FileWriter fileWriter = new FileWriter(file);
+            ListRecordsResponse listRecordsResponse = null;
             while (listRecordsRequest != null) {
                 try {
-                    ListRecordsResponse listRecordsResponse = new ListRecordsResponse(listRecordsRequest);
+                    logger.debug("request = {}", listRecordsRequest);
+                    listRecordsResponse = new ListRecordsResponse(listRecordsRequest);
                     logger.debug("response = {}", response.headers());
                     listRecordsRequest.addHandler(handler);
                     client = oaiClient.getHttpClient();
                     response = client.execute(HttpHeaders.of(HttpMethod.GET, listRecordsRequest.getPath())
-                                    .set(HttpHeaderNames.ACCEPT, "utf-8")).aggregate().get();
+                            .set(HttpHeaderNames.ACCEPT, "utf-8")).aggregate().get();
                     // follow a maximum of 10 HTTP redirects
                     max = 10;
                     while (response.followUrl() != null && max-- > 0) {
@@ -89,6 +90,10 @@ public class DOAJClientTest {
                     }
                     listRecordsResponse.receivedResponse(response, fileWriter);
                     listRecordsRequest = oaiClient.resume(listRecordsRequest, listRecordsResponse.getResumptionToken());
+                } catch (TooManyRequestsException e) {
+                    logger.error(e.getMessage(), e);
+                    Thread.sleep(10000L);
+                    listRecordsRequest = oaiClient.resume(listRecordsRequest, listRecordsResponse.getResumptionToken());
                 } catch (IOException e) {
                     logger.error(e.getMessage(), e);
                     listRecordsRequest = null;