prepare 2.0.0 release

.ldrelease/config.yml

@@ -2,6 +2,12 @@ repo:
   public: okhttp-eventsource
   private: okhttp-eventsource-private
 
+releasableBranches:
+  - name: master
+    description: 2.x - for Java SDK 5.0+
+  - name: 1.x
+    description: for Java SDK <5.0
+
 publications:
   - url: https://oss.sonatype.org/content/groups/public/com/launchdarkly/okhttp-eventsource/
     description: Sonatype

README.md

@@ -8,3 +8,5 @@ Project Information
 -----------
 
 This library allows Java developers to consume Server Sent Events from a remote API. The server sent events spec is defined here: [https://html.spec.whatwg.org/multipage/server-sent-events.html](https://html.spec.whatwg.org/multipage/server-sent-events.html#server-sent-events)
+
+Starting in version 2.0, this library uses OkHttp 4.x and requires Java 8+. If you need support for OkHttp 3.x or Java 7, use the latest 1.x version.

build.gradle

@@ -14,16 +14,16 @@ repositories {
 allprojects {
     group = 'com.launchdarkly'
     version = "${version}"
-    sourceCompatibility = 1.7
-    targetCompatibility = 1.7
+    sourceCompatibility = 1.8
+    targetCompatibility = 1.8
 }
 
 dependencies {
-    compile "com.squareup.okhttp3:okhttp:3.8.1"
+    compile "com.squareup.okhttp3:okhttp:4.3.1"
     compile "org.slf4j:slf4j-api:1.7.22"
     testRuntime "ch.qos.logback:logback-classic:1.1.9"
     testCompile "org.mockito:mockito-core:1.10.19"
-    testCompile "com.squareup.okhttp3:mockwebserver:3.10.0"
+    testCompile "com.squareup.okhttp3:mockwebserver:4.3.1"
     testCompile "junit:junit:4.11"
 }
 

src/main/java/com/launchdarkly/eventsource/AsyncEventHandler.java

@@ -16,60 +16,50 @@ class AsyncEventHandler implements EventHandler {
   }
 
   public void onOpen() {
-    executor.execute(new Runnable() {
-      public void run() {
-        try {
-          eventSourceHandler.onOpen();
-        } catch (Exception e) {
-          onError(e);
-        }
+    executor.execute(() -> {
+      try {
+        eventSourceHandler.onOpen();
+      } catch (Exception e) {
+        onError(e);
       }
     });
   }
 
   public void onClosed() {
-    executor.execute(new Runnable() {
-      public void run() {
-        try {
-          eventSourceHandler.onClosed();
-        } catch (Exception e) {
-          onError(e);
-        }
+    executor.execute(() -> {
+      try {
+        eventSourceHandler.onClosed();
+      } catch (Exception e) {
+        onError(e);
       }
     });
   }
 
   public void onComment(final String comment) {
-    executor.execute(new Runnable() {
-      public void run() {
-        try {
-          eventSourceHandler.onComment(comment);
-        } catch (Exception e) {
-          onError(e);
-        }
+    executor.execute(() -> {
+      try {
+        eventSourceHandler.onComment(comment);
+      } catch (Exception e) {
+        onError(e);
       }
     });
   }
 
   public void onMessage(final String event, final MessageEvent messageEvent) {
-    executor.execute(new Runnable() {
-      public void run() {
-        try {
-          eventSourceHandler.onMessage(event, messageEvent);
-        } catch (Exception e) {
-          onError(e);
-        }
+    executor.execute(() -> {
+      try {
+        eventSourceHandler.onMessage(event, messageEvent);
+      } catch (Exception e) {
+        onError(e);
       }
     });
   }
 
   public void onError(final Throwable error) {
-    executor.execute(new Runnable() {
-      public void run() {
-        try {
-          eventSourceHandler.onError(error);
-        } catch (Throwable ignored) {
-        }
+    executor.execute(() -> {
+      try {
+        eventSourceHandler.onError(error);
+      } catch (Throwable ignored) {
       }
     });
   }

src/main/java/com/launchdarkly/eventsource/ConnectionHandler.java

@@ -1,6 +1,8 @@
 package com.launchdarkly.eventsource;
 
+import java.time.Duration;
+
 interface ConnectionHandler {
-  void setReconnectionTimeMs(long reconnectionTimeMs);
+  void setReconnectionTime(Duration reconnectionTime);
   void setLastEventId(String lastEventId);
 }

src/main/java/com/launchdarkly/eventsource/EventParser.java

@@ -4,6 +4,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.net.URI;
+import java.time.Duration;
 import java.util.regex.Pattern;
 
 /**
@@ -74,7 +75,7 @@ private void processField(String field, String value) {
     } else if (EVENT.equals(field)) {
       eventName = value;
     } else if (RETRY.equals(field) && isNumber(value)) {
-      connectionHandler.setReconnectionTimeMs(Long.parseLong(value));
+      connectionHandler.setReconnectionTime(Duration.ofMillis(Long.parseLong(value)));
     }
   }