use okhttp-sse and drop jersey dependency

build.gradle

@@ -1,4 +1,5 @@
 buildscript {
+  ext.okhttpclientVersion="3.11.0"
   repositories {
     jcenter()
   }
@@ -38,18 +39,17 @@ repositories {
 }
 
 dependencies {
-    compile 'com.squareup.okhttp3:okhttp:3.11.0'
+    compile "com.squareup.okhttp3:okhttp:${okhttpclientVersion}"
+    compile "com.squareup.okhttp3:okhttp-sse:${okhttpclientVersion}"
     compile 'com.moandjiezana.toml:toml4j:0.7.2'
     // use the android version because we don't want java 8 stuff
     compile 'com.google.guava:guava:26.0-android'
     compile 'com.google.code.gson:gson:2.8.5'
     compile 'commons-io:commons-io:2.6'
-    compile 'org.glassfish.jersey.core:jersey-client:2.27'
-    compile 'org.glassfish.jersey.media:jersey-media-sse:2.27'
     compile 'net.i2p.crypto:eddsa:0.3.0'
 
     testCompile 'org.mockito:mockito-core:2.21.0'
-    testCompile 'com.squareup.okhttp3:mockwebserver:3.11.0'
+    testCompile "com.squareup.okhttp3:mockwebserver:${okhttpclientVersion}"
     testCompile 'junit:junit:4.12'
 }
 
@@ -78,21 +78,11 @@ shadowJar {
    archiveName 'stellar-sdk.jar' 
    relocate 'com','shadow.com'
    relocate 'net','shadow.net'
-   relocate 'org.glassfish','shadow.org.glassfish'
-   relocate 'org.mockito','shadow.org.mockito'
-   relocate 'org.aopalliance','shadow.org.aopalliance'
+   relocate 'javax.annotation', 'shadow.javax.annotation'
    relocate 'org.apache','shadow.org.apache'
    relocate 'org.jvnet','shadow.org.jvnet'
-   relocate 'org.objenesis','shadow.org.objenesis'
    relocate 'org.codehaus','shadow.org.codehaus'
    relocate 'org.checkerframework','shadow.org.checkerframework'
-   relocate 'javassist','shadow.javassist'
-   relocate 'javax.validation', 'shadow.javax.validation'
-   relocate 'javax.annotation', 'shadow.javax.annotation'
-   relocate 'javax.inject', 'shadow.javax.inject'
-   relocate 'javax.ws', 'shadow.javax.inject'
-   relocate 'commons-io', 'shadow.commons-io'
-   relocate 'jersey', 'shadow.jersey'
    relocate 'okhttp3','shadow.okhttp3'
    relocate 'okio','shadow.okio'
 }

src/main/java/org/stellar/sdk/requests/AccountsRequestBuilder.java

@@ -1,25 +1,16 @@
 package org.stellar.sdk.requests;
 
 import com.google.gson.reflect.TypeToken;
-
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.glassfish.jersey.media.sse.EventSource;
-import org.glassfish.jersey.media.sse.InboundEvent;
-import org.glassfish.jersey.media.sse.SseFeature;
 import org.stellar.sdk.KeyPair;
 import org.stellar.sdk.responses.AccountResponse;
-import org.stellar.sdk.responses.GsonSingleton;
 import org.stellar.sdk.responses.Page;
 
 import java.io.IOException;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-
 /**
  * Builds requests connected to accounts.
  */
@@ -81,21 +72,9 @@ public static Page<AccountResponse> execute(OkHttpClient httpClient, HttpUrl uri
    * @param listener {@link EventListener} implementation with {@link AccountResponse} type
    * @return EventSource object, so you can <code>close()</code> connection when not needed anymore
    */
-  public EventSource stream(final EventListener<AccountResponse> listener) {
-    Client client = ClientBuilder.newBuilder().register(SseFeature.class).build();
-    WebTarget target = client.target(this.buildUri().uri());
-    EventSource eventSource = new EventSource(target) {
-      @Override
-      public void onEvent(InboundEvent inboundEvent) {
-        String data = inboundEvent.readData(String.class);
-        if (data.equals("\"hello\"")) {
-          return;
-        }
-        AccountResponse account = GsonSingleton.getInstance().fromJson(data, AccountResponse.class);
-        listener.onEvent(account);
-      }
-    };
-    return eventSource;
+  public SSEStream<AccountResponse> stream(final EventListener<AccountResponse> listener) {
+
+    return SSEStream.create(httpClient,this,AccountResponse.class,listener);
   }
 
   /**

src/main/java/org/stellar/sdk/requests/EffectsRequestBuilder.java

@@ -1,25 +1,16 @@
 package org.stellar.sdk.requests;
 
 import com.google.gson.reflect.TypeToken;
-
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.glassfish.jersey.media.sse.EventSource;
-import org.glassfish.jersey.media.sse.InboundEvent;
-import org.glassfish.jersey.media.sse.SseFeature;
 import org.stellar.sdk.KeyPair;
-import org.stellar.sdk.responses.GsonSingleton;
 import org.stellar.sdk.responses.Page;
 import org.stellar.sdk.responses.effects.EffectResponse;
 
 import java.io.IOException;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
@@ -99,21 +90,8 @@ public static Page<EffectResponse> execute(OkHttpClient httpClient, HttpUrl uri)
    * @param listener {@link EventListener} implementation with {@link EffectResponse} type
    * @return EventSource object, so you can <code>close()</code> connection when not needed anymore
    */
-  public EventSource stream(final EventListener<EffectResponse> listener) {
-    Client client = ClientBuilder.newBuilder().register(SseFeature.class).build();
-    WebTarget target = client.target(this.buildUri().uri());
-    EventSource eventSource = new EventSource(target) {
-      @Override
-      public void onEvent(InboundEvent inboundEvent) {
-        String data = inboundEvent.readData(String.class);
-        if (data.equals("\"hello\"")) {
-          return;
-        }
-        EffectResponse effect = GsonSingleton.getInstance().fromJson(data, EffectResponse.class);
-        listener.onEvent(effect);
-      }
-    };
-    return eventSource;
+  public SSEStream<EffectResponse> stream(final EventListener<EffectResponse> listener) {
+    return SSEStream.create(httpClient,this,EffectResponse.class,listener);
   }
 
   /**

src/main/java/org/stellar/sdk/requests/LedgersRequestBuilder.java

@@ -1,24 +1,15 @@
 package org.stellar.sdk.requests;
 
 import com.google.gson.reflect.TypeToken;
-
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.glassfish.jersey.media.sse.EventSource;
-import org.glassfish.jersey.media.sse.InboundEvent;
-import org.glassfish.jersey.media.sse.SseFeature;
-import org.stellar.sdk.responses.GsonSingleton;
 import org.stellar.sdk.responses.LedgerResponse;
 import org.stellar.sdk.responses.Page;
 
 import java.io.IOException;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-
 /**
  * Builds requests connected to ledgers.
  */
@@ -80,21 +71,9 @@ public static Page<LedgerResponse> execute(OkHttpClient httpClient, HttpUrl uri)
    * @param listener {@link EventListener} implementation with {@link LedgerResponse} type
    * @return EventSource object, so you can <code>close()</code> connection when not needed anymore
    */
-  public EventSource stream(final EventListener<LedgerResponse> listener) {
-    Client client = ClientBuilder.newBuilder().register(SseFeature.class).build();
-    WebTarget target = client.target(this.buildUri().uri());
-    EventSource eventSource = new EventSource(target) {
-      @Override
-      public void onEvent(InboundEvent inboundEvent) {
-        String data = inboundEvent.readData(String.class);
-        if (data.equals("\"hello\"")) {
-          return;
-        }
-        LedgerResponse ledger = GsonSingleton.getInstance().fromJson(data, LedgerResponse.class);
-        listener.onEvent(ledger);
-      }
-    };
-    return eventSource;
+
+  public SSEStream<LedgerResponse> stream(final EventListener<LedgerResponse> listener) {
+    return SSEStream.create(httpClient,this,LedgerResponse.class,listener);
   }
 
   /**

src/main/java/org/stellar/sdk/requests/OffersRequestBuilder.java

@@ -1,23 +1,14 @@
 package org.stellar.sdk.requests;
 
 import com.google.gson.reflect.TypeToken;
-
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.glassfish.jersey.media.sse.EventSource;
-import org.glassfish.jersey.media.sse.InboundEvent;
-import org.glassfish.jersey.media.sse.SseFeature;
 import org.stellar.sdk.KeyPair;
-import org.stellar.sdk.responses.GsonSingleton;
 import org.stellar.sdk.responses.OfferResponse;
 import org.stellar.sdk.responses.Page;
-import org.stellar.sdk.responses.operations.OperationResponse;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
 import java.io.IOException;
 
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -58,6 +49,8 @@ public static Page<OfferResponse> execute(OkHttpClient httpClient, HttpUrl uri)
     return responseHandler.handleResponse(response);
   }
 
+
+
   /**
    * Build and execute request.
    * @return {@link Page} of {@link OfferResponse}

src/main/java/org/stellar/sdk/requests/OperationsRequestBuilder.java

@@ -1,22 +1,14 @@
 package org.stellar.sdk.requests;
 
 import com.google.gson.reflect.TypeToken;
-
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.glassfish.jersey.media.sse.EventSource;
-import org.glassfish.jersey.media.sse.InboundEvent;
-import org.glassfish.jersey.media.sse.SseFeature;
 import org.stellar.sdk.KeyPair;
-import org.stellar.sdk.responses.GsonSingleton;
 import org.stellar.sdk.responses.Page;
 import org.stellar.sdk.responses.operations.OperationResponse;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
 import java.io.IOException;
 
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -114,21 +106,8 @@ public static Page<OperationResponse> execute(OkHttpClient httpClient, HttpUrl u
    * @param listener {@link OperationResponse} implementation with {@link OperationResponse} type
    * @return EventSource object, so you can <code>close()</code> connection when not needed anymore
    */
-  public EventSource stream(final EventListener<OperationResponse> listener) {
-    Client client = ClientBuilder.newBuilder().register(SseFeature.class).build();
-    WebTarget target = client.target(this.buildUri().uri());
-    EventSource eventSource = new EventSource(target) {
-      @Override
-      public void onEvent(InboundEvent inboundEvent) {
-        String data = inboundEvent.readData(String.class);
-        if (data.equals("\"hello\"")) {
-          return;
-        }
-        OperationResponse operation = GsonSingleton.getInstance().fromJson(data, OperationResponse.class);
-        listener.onEvent(operation);
-      }
-    };
-    return eventSource;
+  public SSEStream<OperationResponse> stream(final EventListener<OperationResponse> listener) {
+    return SSEStream.create(httpClient,this,OperationResponse.class,listener);
   }
 
   /**

src/main/java/org/stellar/sdk/requests/OrderBookRequestBuilder.java

@@ -1,23 +1,14 @@
 package org.stellar.sdk.requests;
 
 import com.google.gson.reflect.TypeToken;
-
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.glassfish.jersey.media.sse.EventSource;
-import org.glassfish.jersey.media.sse.InboundEvent;
-import org.glassfish.jersey.media.sse.SseFeature;
 import org.stellar.sdk.Asset;
 import org.stellar.sdk.AssetTypeCreditAlphaNum;
-import org.stellar.sdk.responses.GsonSingleton;
-import org.stellar.sdk.responses.OfferResponse;
 import org.stellar.sdk.responses.OrderBookResponse;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
 import java.io.IOException;
 
 /**
@@ -68,21 +59,8 @@ public static OrderBookResponse execute(OkHttpClient httpClient, HttpUrl uri) th
    * @param listener {@link OrderBookResponse} implementation with {@link OrderBookResponse} type
    * @return EventSource object, so you can <code>close()</code> connection when not needed anymore
    */
-  public EventSource stream(final EventListener<OrderBookResponse> listener) {
-    Client client = ClientBuilder.newBuilder().register(SseFeature.class).build();
-    WebTarget target = client.target(this.buildUri().uri());
-    EventSource eventSource = new EventSource(target) {
-      @Override
-      public void onEvent(InboundEvent inboundEvent) {
-        String data = inboundEvent.readData(String.class);
-        if (data.equals("\"hello\"")) {
-          return;
-        }
-        OrderBookResponse orderBook = GsonSingleton.getInstance().fromJson(data, OrderBookResponse.class);
-        listener.onEvent(orderBook);
-      }
-    };
-    return eventSource;
+  public SSEStream<OrderBookResponse> stream(final EventListener<OrderBookResponse> listener) {
+    return SSEStream.create(httpClient,this,OrderBookResponse.class,listener);
   }
 
   public OrderBookResponse execute() throws IOException, TooManyRequestsException {

src/main/java/org/stellar/sdk/requests/PaymentsRequestBuilder.java

@@ -1,25 +1,16 @@
 package org.stellar.sdk.requests;
 
 import com.google.gson.reflect.TypeToken;
-
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.glassfish.jersey.media.sse.EventSource;
-import org.glassfish.jersey.media.sse.InboundEvent;
-import org.glassfish.jersey.media.sse.SseFeature;
 import org.stellar.sdk.KeyPair;
-import org.stellar.sdk.responses.GsonSingleton;
 import org.stellar.sdk.responses.Page;
 import org.stellar.sdk.responses.operations.OperationResponse;
 
 import java.io.IOException;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
@@ -89,21 +80,8 @@ public static Page<OperationResponse> execute(OkHttpClient httpClient, HttpUrl u
    * @param listener {@link EventListener} implementation with {@link OperationResponse} type
    * @return EventSource object, so you can <code>close()</code> connection when not needed anymore
    */
-  public EventSource stream(final EventListener<OperationResponse> listener) {
-    Client client = ClientBuilder.newBuilder().register(SseFeature.class).build();
-    WebTarget target = client.target(this.buildUri().uri());
-    EventSource eventSource = new EventSource(target) {
-      @Override
-      public void onEvent(InboundEvent inboundEvent) {
-        String data = inboundEvent.readData(String.class);
-        if (data.equals("\"hello\"")) {
-          return;
-        }
-        OperationResponse payment = GsonSingleton.getInstance().fromJson(data, OperationResponse.class);
-        listener.onEvent(payment);
-      }
-    };
-    return eventSource;
+  public SSEStream<OperationResponse> stream(final EventListener<OperationResponse> listener) {
+    return SSEStream.create(httpClient,this,OperationResponse.class,listener);
   }
 
   /**