From bf7b7d4152ecb203e84bb67ddd5e55ba3d8c1b88 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Sat, 22 Apr 2017 05:01:00 +0200
Subject: [PATCH] Fix java warnings introduced in 4c4acd679

Change-Id: I12b2f7ad5f30640f293363ee67be185f3023dae7
---
 .../main/java/com/google/gerrit/server/DynamicOptions.java  | 3 ++-
 .../google/gerrit/server/plugins/DelegatingClassLoader.java | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/DynamicOptions.java b/gerrit-server/src/main/java/com/google/gerrit/server/DynamicOptions.java
index c80c0acda4..6267dcad0b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/DynamicOptions.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/DynamicOptions.java
@@ -104,7 +104,7 @@ public class DynamicOptions {
   public DynamicOptions(Object bean, Injector injector, DynamicMap<DynamicBean> dynamicBeans) {
     this.bean = bean;
     this.injector = injector;
-    beansByPlugin = new HashMap<String, DynamicBean>();
+    beansByPlugin = new HashMap<>();
     for (String plugin : dynamicBeans.plugins()) {
       Provider<DynamicBean> provider =
           dynamicBeans.byPlugin(plugin).get(bean.getClass().getCanonicalName());
@@ -114,6 +114,7 @@ public class DynamicOptions {
     }
   }
 
+  @SuppressWarnings("unchecked")
   public DynamicBean getDynamicBean(Object bean, DynamicBean dynamicBean) {
     ClassLoader coreCl = getClass().getClassLoader();
     ClassLoader beanCl = bean.getClass().getClassLoader();
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/DelegatingClassLoader.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/DelegatingClassLoader.java
index f0f9284888..3908b72201 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/DelegatingClassLoader.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/DelegatingClassLoader.java
@@ -15,8 +15,6 @@
 package com.google.gerrit.server.plugins;
 
 import com.google.common.io.ByteStreams;
-
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -30,6 +28,7 @@ public class DelegatingClassLoader extends ClassLoader {
     this.target = target;
   }
 
+  @Override
   public Class<?> findClass(String name) throws ClassNotFoundException {
     String path = name.replace('.', '/') + ".class";
     InputStream resource = target.getResourceAsStream(path);
@@ -43,6 +42,7 @@ public class DelegatingClassLoader extends ClassLoader {
     throw new ClassNotFoundException(name);
   }
 
+  @Override
   public URL getResource(String name) {
     URL rtn = getParent().getResource(name);
     if (rtn == null) {
@@ -51,6 +51,7 @@ public class DelegatingClassLoader extends ClassLoader {
     return rtn;
   }
 
+  @Override
   public Enumeration<URL> getResources(String name) throws IOException {
     Enumeration<URL> rtn = getParent().getResources(name);
     if (rtn == null) {
@@ -59,6 +60,7 @@ public class DelegatingClassLoader extends ClassLoader {
     return rtn;
   }
 
+  @Override
   public InputStream getResourceAsStream(String name) {
     InputStream rtn = getParent().getResourceAsStream(name);
     if (rtn == null) {