Portability to Java 6 support

This framework should be able to be binary compatible with Java 6 as Netty does. This merge request allows minor changes to be able to be compatible. Also it upgrades dependencies.
cdapio · Jun 18, 2019 · be9bcf5 · be9bcf5
1 parent 02fdbb4
commit be9bcf5
Show file tree

Hide file tree

Showing 22 changed files with 307 additions and 124 deletions.
diff --git a/pom.xml b/pom.xml
@@ -62,14 +62,14 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
 
-    <rs-api.version>2.0</rs-api.version>
-    <netty.version>4.1.16.Final</netty.version>
-    <slf4j.version>1.7.5</slf4j.version>
+    <rs-api.version>2.1.1</rs-api.version>
+    <netty.version>4.1.36.Final</netty.version>
+    <slf4j.version>1.7.26</slf4j.version>
     <findbugs.version>2.0.1</findbugs.version>
     <beanutils.version>1.8.3</beanutils.version>
-    <junit.version>4.11</junit.version>
-    <logback.version>1.0.9</logback.version>
-    <gson.version>2.2.4</gson.version>
+    <junit.version>4.12</junit.version>
+    <logback.version>1.2.3</logback.version>
+    <gson.version>2.8.5</gson.version>
   </properties>
 
   <dependencies>
@@ -174,7 +174,6 @@
           </execution>
         </executions>
       </plugin>
-
       <!-- Checkstyle -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git a/src/main/java/io/cdap/http/AbstractHttpResponder.java b/src/main/java/io/cdap/http/AbstractHttpResponder.java
@@ -27,7 +27,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
+import java.nio.charset.Charset;
 
 /**
  * Base implementation of {@link HttpResponder} to simplify child implementations.
@@ -53,7 +53,7 @@ public void sendString(HttpResponseStatus status, String data, HttpHeaders heade
       sendStatus(status, headers);
       return;
     }
-    ByteBuf buffer = Unpooled.wrappedBuffer(StandardCharsets.UTF_8.encode(data));
+    ByteBuf buffer = Unpooled.wrappedBuffer(Charset.forName("UTF-8").encode(data));
     sendContent(status, buffer, addContentTypeIfMissing(new DefaultHttpHeaders().add(headers),
                                                         "text/plain; charset=utf-8"));
   }

diff --git a/src/main/java/io/cdap/http/NettyHttpService.java b/src/main/java/io/cdap/http/NettyHttpService.java
@@ -129,8 +129,8 @@ private NettyHttpService(String serviceName,
     this.workerThreadPoolSize = workerThreadPoolSize;
     this.execThreadPoolSize = execThreadPoolSize;
     this.execThreadKeepAliveSecs = execThreadKeepAliveSecs;
-    this.channelConfigs = new HashMap<>(channelConfigs);
-    this.childChannelConfigs = new HashMap<>(childChannelConfigs);
+    this.channelConfigs = new HashMap<ChannelOption, Object>(channelConfigs);
+    this.childChannelConfigs = new HashMap<ChannelOption, Object>(childChannelConfigs);
     this.rejectedExecutionHandler = rejectedExecutionHandler;
     this.resourceHandler = new HttpResourceHandler(httpHandlers, handlerHooks, urlRewriter, exceptionHandler);
     this.handlerContext = new BasicHandlerContext(this.resourceHandler);
@@ -193,10 +193,9 @@ public synchronized void start() throws Exception {
           shutdownExecutorGroups(0, 5, TimeUnit.SECONDS, eventExecutorGroup);
         }
       } catch (Throwable t2) {
-        t.addSuppressed(t2);
       }
       state = State.FAILED;
-      throw t;
+      throw (Exception) t;
     }
   }
 
@@ -255,7 +254,7 @@ public synchronized void stop(long quietPeriod, long timeout, TimeUnit unit) thr
       }
     } catch (Throwable t) {
       state = State.FAILED;
-      throw t;
+      throw (Exception) t;
     }
     state = State.STOPPED;
     LOG.debug("Stopped HTTP Service {} on address {}", serviceName, bindAddress);
@@ -370,7 +369,7 @@ protected void initChannel(SocketChannel ch) throws Exception {
    */
   private void shutdownExecutorGroups(long quietPeriod, long timeout, TimeUnit unit, EventExecutorGroup...groups) {
     Exception ex = null;
-    List<Future<?>> futures = new ArrayList<>();
+    List<Future<?>> futures = new ArrayList<Future<?>>();
     for (EventExecutorGroup group : groups) {
       if (group == null) {
         continue;
@@ -385,7 +384,6 @@ private void shutdownExecutorGroups(long quietPeriod, long timeout, TimeUnit uni
         if (ex == null) {
           ex = e;
         } else {
-          ex.addSuppressed(e);
         }
       }
     }
@@ -442,8 +440,8 @@ protected Builder(String serviceName) {
       rejectedExecutionHandler = DEFAULT_REJECTED_EXECUTION_HANDLER;
       httpChunkLimit = DEFAULT_HTTP_CHUNK_LIMIT;
       port = 0;
-      channelConfigs = new HashMap<>();
-      childChannelConfigs = new HashMap<>();
+      channelConfigs = new HashMap<ChannelOption, Object>();
+      childChannelConfigs = new HashMap<ChannelOption, Object>();
       channelConfigs.put(ChannelOption.SO_BACKLOG, DEFAULT_CONNECTION_BACKLOG);
       sslHandlerFactory = null;
       exceptionHandler = new ExceptionHandler();

diff --git a/src/main/java/io/cdap/http/SSLHandlerFactory.java b/src/main/java/io/cdap/http/SSLHandlerFactory.java
@@ -70,10 +70,17 @@ public SSLHandlerFactory(SslContext sslContext) {
   }
 
   private static KeyStore getKeyStore(File keyStore, String keyStorePassword) throws Exception {
-    try (InputStream is = new FileInputStream(keyStore)) {
+    InputStream is = null;
+    try {
+      is = new FileInputStream(keyStore);
       KeyStore ks = KeyStore.getInstance("JKS");
       ks.load(is, keyStorePassword.toCharArray());
+      is.close();
       return ks;
+    } finally {
+      if (is != null) {
+        is.close();
+      }
     }
   }
 

diff --git a/src/main/java/io/cdap/http/internal/BasicHttpResponder.java b/src/main/java/io/cdap/http/internal/BasicHttpResponder.java
@@ -50,7 +50,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
-import java.nio.charset.StandardCharsets;
+import java.nio.charset.Charset;
 import java.util.concurrent.atomic.AtomicBoolean;
 import javax.annotation.Nullable;
 
@@ -136,9 +136,8 @@ public void sendFile(File file, HttpHeaders headers) throws IOException {
       try {
         raf.close();
       } catch (IOException ex) {
-        t.addSuppressed(ex);
       }
-      throw t;
+      throw (IOException) t;
     }
   }
 
@@ -152,7 +151,8 @@ public void sendContent(HttpResponseStatus status, final BodyProducer bodyProduc
       // Response with error and close the connection
       sendContent(
         HttpResponseStatus.INTERNAL_SERVER_ERROR,
-        Unpooled.copiedBuffer("Failed to determined content length. Cause: " + t.getMessage(), StandardCharsets.UTF_8),
+        Unpooled.copiedBuffer("Failed to determined content length. Cause: " + t.getMessage(),
+                Charset.forName("UTF-8")),
         new DefaultHttpHeaders()
           .set(HttpHeaderNames.CONNECTION, HttpHeaderValues.CLOSE)
           .set(HttpHeaderNames.CONTENT_TYPE, "text/plain; charset=utf-8"));
@@ -197,7 +197,7 @@ boolean isResponded() {
   private ChannelFutureListener createBodyProducerCompletionListener(final BodyProducer bodyProducer) {
     return new ChannelFutureListener() {
       @Override
-      public void operationComplete(ChannelFuture future) throws Exception {
+      public void operationComplete(ChannelFuture future) {
         if (!future.isSuccess()) {
           callBodyProducerHandleError(bodyProducer, future.cause());
           channel.close();

diff --git a/src/main/java/io/cdap/http/internal/HandlerException.java b/src/main/java/io/cdap/http/internal/HandlerException.java
@@ -24,7 +24,7 @@
 import io.netty.handler.codec.http.HttpUtil;
 import io.netty.handler.codec.http.HttpVersion;
 
-import java.nio.charset.StandardCharsets;
+import java.nio.charset.Charset;
 
 /**
  *Creating Http Response for Exception messages.
@@ -48,7 +48,7 @@ final class HandlerException extends Exception {
 
   HttpResponse createFailureResponse() {
     FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, failureStatus,
-                                                            Unpooled.copiedBuffer(message, StandardCharsets.UTF_8));
+                                                            Unpooled.copiedBuffer(message, Charset.forName("UTF-8")));
     HttpUtil.setContentLength(response, response.content().readableBytes());
     return response;
   }

diff --git a/src/main/java/io/cdap/http/internal/HttpResourceHandler.java b/src/main/java/io/cdap/http/internal/HttpResourceHandler.java
@@ -44,6 +44,7 @@
 import javax.annotation.Nullable;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
+import javax.ws.rs.OPTIONS;
 import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
@@ -135,7 +136,7 @@ public HttpResourceHandler(Iterable<? extends HttpHandler> handlers, Iterable<?
    * @return String representation of HttpMethod from annotations or emptyString as a default.
    */
   private Set<HttpMethod> getHttpMethods(Method method) {
-    Set<HttpMethod> httpMethods = new HashSet<>();
+    Set<HttpMethod> httpMethods = new HashSet<HttpMethod>();
 
     if (method.isAnnotationPresent(GET.class)) {
       httpMethods.add(HttpMethod.GET);
@@ -149,6 +150,9 @@ private Set<HttpMethod> getHttpMethods(Method method) {
     if (method.isAnnotationPresent(DELETE.class)) {
       httpMethods.add(HttpMethod.DELETE);
     }
+    if (method.isAnnotationPresent(OPTIONS.class)) {
+      httpMethods.add(HttpMethod.OPTIONS);
+    }
 
     return Collections.unmodifiableSet(httpMethods);
   }
@@ -310,7 +314,8 @@ public HttpMethodInfo getDestinationMethod(HttpRequest request, HttpResponder re
 
     LOG.trace("Routable destinations for request {}: {}", requestUri, routableDestinations);
     Iterable<String> requestUriParts = splitAndOmitEmpty(requestUri, '/');
-    List<PatternPathRouterWithGroups.RoutableDestination<HttpResourceModel>> matchedDestinations = new ArrayList<>();
+    List<PatternPathRouterWithGroups.RoutableDestination<HttpResourceModel>> matchedDestinations =
+            new ArrayList<PatternPathRouterWithGroups.RoutableDestination<HttpResourceModel>>();
     long maxScore = 0;
 
     for (PatternPathRouterWithGroups.RoutableDestination<HttpResourceModel> destination : routableDestinations) {
@@ -390,7 +395,7 @@ public void destroy(HandlerContext context) {
   }
 
   private static <T> List<T> copyOf(Iterable<? extends T> iterable) {
-    List<T> list = new ArrayList<>();
+    List<T> list = new ArrayList<T>();
     for (T item : iterable) {
       list.add(item);
     }

diff --git a/src/main/java/io/cdap/http/internal/HttpResourceModel.java b/src/main/java/io/cdap/http/internal/HttpResourceModel.java
@@ -48,7 +48,8 @@
 public final class HttpResourceModel {
 
   private static final Set<Class<? extends Annotation>> SUPPORTED_PARAM_ANNOTATIONS =
-    Collections.unmodifiableSet(new HashSet<>(Arrays.asList(PathParam.class, QueryParam.class, HeaderParam.class)));
+    Collections.unmodifiableSet(new HashSet<Class<? extends Annotation>>
+            (Arrays.asList(PathParam.class, QueryParam.class, HeaderParam.class)));
 
   private final Set<HttpMethod> httpMethods;
   private final String path;
@@ -211,13 +212,15 @@ private List<Map<Class<? extends Annotation>, ParameterInfo<?>>> createParameter
       return Collections.emptyList();
     }
 
-    List<Map<Class<? extends Annotation>, ParameterInfo<?>>> result = new ArrayList<>();
+    List<Map<Class<? extends Annotation>, ParameterInfo<?>>> result =
+            new ArrayList<Map<Class<? extends Annotation>, ParameterInfo<?>>>();
     Type[] parameterTypes = method.getGenericParameterTypes();
     Annotation[][] parameterAnnotations = method.getParameterAnnotations();
 
     for (int i = 2; i < parameterAnnotations.length; i++) {
       Annotation[] annotations = parameterAnnotations[i];
-      Map<Class<? extends Annotation>, ParameterInfo<?>> paramAnnotations = new IdentityHashMap<>();
+      Map<Class<? extends Annotation>, ParameterInfo<?>> paramAnnotations =
+              new IdentityHashMap<Class<? extends Annotation>, ParameterInfo<?>>();
 
       for (Annotation annotation : annotations) {
         Class<? extends Annotation> annotationType = annotation.annotationType();
@@ -266,7 +269,7 @@ private static final class ParameterInfo<T> {
     private final Converter<T, Object> converter;
 
     static <V> ParameterInfo<V> create(Annotation annotation, @Nullable Converter<V, Object> converter) {
-      return new ParameterInfo<>(annotation, converter);
+      return new ParameterInfo<V>(annotation, converter);
     }
 
     private ParameterInfo(Annotation annotation, @Nullable Converter<T, Object> converter) {

diff --git a/src/main/java/io/cdap/http/internal/ImmutablePair.java b/src/main/java/io/cdap/http/internal/ImmutablePair.java
@@ -16,7 +16,7 @@
 
 package io.cdap.http.internal;
 
-import java.util.Objects;
+import java.util.Arrays;
 
 /**
  * An {@link ImmutablePair} consists of two elements within. The elements once set
@@ -44,7 +44,7 @@ final class ImmutablePair<A, B> {
   private final B second;
 
   public static <A, B> ImmutablePair<A, B> of(A first, B second) {
-    return new ImmutablePair<>(first, second);
+    return new ImmutablePair<A, B>(first, second);
   }
 
   /**
@@ -91,7 +91,7 @@ public String toString() {
    */
   @Override
   public int hashCode() {
-    return Objects.hash(first, second);
+    return Arrays.hashCode(new Object[]{first, second});
   }
 
   /**
@@ -108,6 +108,33 @@ public boolean equals(Object o) {
       return false;
     }
     ImmutablePair<?, ?> other = (ImmutablePair<?, ?>) o;
-    return Objects.equals(first, other.first) && Objects.equals(second, other.second);
+
+    boolean fst;
+    if (first == null) {
+      if (other.first == null) {
+        fst = true;
+      } else {
+        return false;
+      }
+    } else if (other.first == null) {
+      return false;
+    } else {
+      fst = first.equals(other.first);
+    }
+
+    boolean snd;
+    if (second == null) {
+      if (other.second == null) {
+        snd = true;
+      } else {
+        return false;
+      }
+    } else if (other.second == null) {
+      return false;
+    } else {
+      snd = second.equals(other.second);
+    }
+
+    return fst && snd;
   }
 }
diff --git a/src/main/java/io/cdap/http/internal/ParamConvertUtils.java b/src/main/java/io/cdap/http/internal/ParamConvertUtils.java
@@ -50,7 +50,7 @@ public final class ParamConvertUtils {
   private static final Map<Class<?>, Object> PRIMITIVE_DEFAULTS;
 
   static {
-    Map<Class<?>, Object> defaults = new IdentityHashMap<>();
+    Map<Class<?>, Object> defaults = new IdentityHashMap<Class<?>, Object>();
     defaults.put(Boolean.TYPE, false);
     defaults.put(Character.TYPE, '\0');
     defaults.put(Byte.TYPE, (byte) 0);
@@ -276,11 +276,11 @@ private static Converter<List<String>, Object> createCollectionConverter(Type re
       public Object convert(List<String> values) throws Exception {
         Collection<? extends Comparable> collection;
         if (rawType == List.class) {
-          collection = new ArrayList<>();
+          collection = new ArrayList<Comparable>();
         } else if (rawType == Set.class) {
-          collection = new LinkedHashSet<>();
+          collection = new LinkedHashSet<Comparable>();
         } else {
-          collection = new TreeSet<>();
+          collection = new TreeSet<Comparable>();
         }
 
         for (String value : values) {