From 9ca29d8872608456d2bb8c27377848ce43fc7884 Mon Sep 17 00:00:00 2001 From: france193 Date: Tue, 24 Oct 2017 12:43:28 +0200 Subject: [PATCH 1/4] fixed #47 Signed-off-by: france193 --- src/main/java/jota/IotaAPICore.java | 30 +++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/main/java/jota/IotaAPICore.java b/src/main/java/jota/IotaAPICore.java index dc5e2d1..1061068 100644 --- a/src/main/java/jota/IotaAPICore.java +++ b/src/main/java/jota/IotaAPICore.java @@ -5,7 +5,9 @@ import jota.dto.response.*; import jota.error.InvalidTrytesException; import jota.model.Transaction; import jota.utils.InputValidator; +import okhttp3.Interceptor; import okhttp3.OkHttpClient; +import okhttp3.Request; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import retrofit2.Call; @@ -84,17 +86,37 @@ public class IotaAPICore { } /** - * + * added in postConstruct the header for IRI 1.4.1 */ private void postConstruct() { final String nodeUrl = protocol + "://" + host + ":" + port; - final OkHttpClient client = new OkHttpClient.Builder() + // Create OkHttpBuilder + final OkHttpClient.Builder okhttpBuilder = new OkHttpClient.Builder() .readTimeout(5000, TimeUnit.SECONDS) - .connectTimeout(5000, TimeUnit.SECONDS) - .build(); + .connectTimeout(5000, TimeUnit.SECONDS); + // add an Interceptor in order to add the requested header + okhttpBuilder.addNetworkInterceptor( + new Interceptor() { + @Override + public okhttp3.Response intercept(Chain chain) throws IOException { + Request request = chain.request(); + Request newRequest; + + newRequest = request.newBuilder() + .addHeader("X-IOTA-API-VERSION", "1.4.1") + .build(); + + return chain.proceed(newRequest); + } + }); + + // create client + final OkHttpClient client = okhttpBuilder.build(); + + // use client to create Retrofit service final Retrofit retrofit = new Retrofit.Builder() .baseUrl(nodeUrl) .addConverterFactory(GsonConverterFactory.create()) From 41322956ca7b07e978c70bcc0641455a85a7d4fe Mon Sep 17 00:00:00 2001 From: france193 Date: Tue, 24 Oct 2017 13:04:06 +0200 Subject: [PATCH 2/4] fixed #47 Signed-off-by: france193 --- .gitignore | 1 + src/main/java/jota/IotaAPICore.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0400add..e429fbc 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ *.class target/* +src/main/java/france193/ \ No newline at end of file diff --git a/src/main/java/jota/IotaAPICore.java b/src/main/java/jota/IotaAPICore.java index 1061068..453126a 100644 --- a/src/main/java/jota/IotaAPICore.java +++ b/src/main/java/jota/IotaAPICore.java @@ -86,7 +86,7 @@ public class IotaAPICore { } /** - * added in postConstruct the header for IRI 1.4.1 + * added header for IRI 1.4.1 */ private void postConstruct() { From e21cd1e8601a5622ddff7799ada1005a6faa2a98 Mon Sep 17 00:00:00 2001 From: france193 Date: Tue, 24 Oct 2017 14:35:33 +0200 Subject: [PATCH 3/4] fixed #47 Added static string on top Signed-off-by: france193 --- src/main/java/jota/IotaAPICore.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/jota/IotaAPICore.java b/src/main/java/jota/IotaAPICore.java index 453126a..4adec7a 100644 --- a/src/main/java/jota/IotaAPICore.java +++ b/src/main/java/jota/IotaAPICore.java @@ -29,6 +29,10 @@ import java.util.concurrent.TimeUnit; */ public class IotaAPICore { + // version header + private static final String X_IOTA_API_VERSION_HEADER_NAME = "X-IOTA-API-Version"; + private static final String X_IOTA_API_VERSION_HEADER_VALUE = "1"; + private static final Logger log = LoggerFactory.getLogger(IotaAPICore.class); private IotaAPIService service; @@ -106,7 +110,7 @@ public class IotaAPICore { Request newRequest; newRequest = request.newBuilder() - .addHeader("X-IOTA-API-VERSION", "1.4.1") + .addHeader(X_IOTA_API_VERSION_HEADER_NAME, X_IOTA_API_VERSION_HEADER_VALUE) .build(); return chain.proceed(newRequest); From e45da9104361e20f402d00c361c0ac3aace9c0b3 Mon Sep 17 00:00:00 2001 From: france193 Date: Tue, 24 Oct 2017 16:04:38 +0200 Subject: [PATCH 4/4] fixed #47 Signed-off-by: france193 --- .gitignore | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e429fbc..bd0ceec 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,4 @@ .classpath .project *.class -target/* - -src/main/java/france193/ \ No newline at end of file +target/* \ No newline at end of file