opendev/gerrit
Code Issues Proposed changes

Fix java warnings introduced in 4c4acd679

Browse Source 
Change-Id: I12b2f7ad5f30640f293363ee67be185f3023dae7
This commit is contained in:
David Ostrovsky
2017-04-22 05:01:00 +02:00
parent 4c4acd6796
commit bf7b7d4152
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-server/src/main/java/com/google/gerrit/server/DynamicOptions.java
View File

@@ -104,7 +104,7 @@ public class DynamicOptions {
public DynamicOptions(Object bean, Injector injector, DynamicMap<DynamicBean> dynamicBeans) { public DynamicOptions(Object bean, Injector injector, DynamicMap<DynamicBean> dynamicBeans) {
this.bean = bean; this.bean = bean;
this.injector = injector; this.injector = injector;
beansByPlugin = new HashMap<String, DynamicBean>(); beansByPlugin = new HashMap<>();
for (String plugin : dynamicBeans.plugins()) { for (String plugin : dynamicBeans.plugins()) {
Provider<DynamicBean> provider = Provider<DynamicBean> provider =
dynamicBeans.byPlugin(plugin).get(bean.getClass().getCanonicalName()); dynamicBeans.byPlugin(plugin).get(bean.getClass().getCanonicalName());
@@ -114,6 +114,7 @@ public class DynamicOptions {
} }
} }
@SuppressWarnings("unchecked")
public DynamicBean getDynamicBean(Object bean, DynamicBean dynamicBean) { public DynamicBean getDynamicBean(Object bean, DynamicBean dynamicBean) {
ClassLoader coreCl = getClass().getClassLoader(); ClassLoader coreCl = getClass().getClassLoader();
ClassLoader beanCl = bean.getClass().getClassLoader(); ClassLoader beanCl = bean.getClass().getClassLoader();

6
gerrit-server/src/main/java/com/google/gerrit/server/plugins/DelegatingClassLoader.java
View File

@@ -15,8 +15,6 @@
package com.google.gerrit.server.plugins; package com.google.gerrit.server.plugins;
import com.google.common.io.ByteStreams; import com.google.common.io.ByteStreams;
import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URL; import java.net.URL;
@@ -30,6 +28,7 @@ public class DelegatingClassLoader extends ClassLoader {
this.target = target; this.target = target;
} }
@Override
public Class<?> findClass(String name) throws ClassNotFoundException { public Class<?> findClass(String name) throws ClassNotFoundException {
String path = name.replace('.', '/') + ".class"; String path = name.replace('.', '/') + ".class";
InputStream resource = target.getResourceAsStream(path); InputStream resource = target.getResourceAsStream(path);
@@ -43,6 +42,7 @@ public class DelegatingClassLoader extends ClassLoader {
throw new ClassNotFoundException(name); throw new ClassNotFoundException(name);
} }
@Override
public URL getResource(String name) { public URL getResource(String name) {
URL rtn = getParent().getResource(name); URL rtn = getParent().getResource(name);
if (rtn == null) { if (rtn == null) {
@@ -51,6 +51,7 @@ public class DelegatingClassLoader extends ClassLoader {
return rtn; return rtn;
} }
@Override
public Enumeration<URL> getResources(String name) throws IOException { public Enumeration<URL> getResources(String name) throws IOException {
Enumeration<URL> rtn = getParent().getResources(name); Enumeration<URL> rtn = getParent().getResources(name);
if (rtn == null) { if (rtn == null) {
@@ -59,6 +60,7 @@ public class DelegatingClassLoader extends ClassLoader {
return rtn; return rtn;
} }
@Override
public InputStream getResourceAsStream(String name) { public InputStream getResourceAsStream(String name) {
InputStream rtn = getParent().getResourceAsStream(name); InputStream rtn = getParent().getResourceAsStream(name);
if (rtn == null) { if (rtn == null) {