From a8d9d8b9b6440ce4c818bdbdfee3cfe40ff46b17 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 19 Aug 2014 21:45:23 +0200 Subject: [PATCH] fix/suppress compiler warnings --- .../src/main/java/sonia/scm/i18n/I18nMessages.java | 1 + .../scm/repository/AbstractRepositoryManager.java | 11 ----------- .../src/test/java/sonia/scm/plugin/ScmModuleTest.java | 1 + .../src/main/java/sonia/scm/maven/ClassLoaders.java | 3 ++- .../java/sonia/scm/repository/SvnBlameHandler.java | 3 ++- .../java/sonia/scm/repository/spi/SvnLogCommand.java | 1 + .../main/java/sonia/scm/cache/MapCacheManager.java | 2 +- .../scm/repository/client/SvnRepositoryClient.java | 3 ++- .../api/rest/resources/AbstractManagerResource.java | 1 + .../java/sonia/scm/plugin/DefaultPluginLoader.java | 1 + .../main/java/sonia/scm/plugin/ExtensionBinder.java | 1 + .../sonia/scm/cache/CacheConfigurationTestLoader.java | 6 +++++- .../sonia/scm/plugin/MultiParentClassLoaderTest.java | 1 + 13 files changed, 19 insertions(+), 16 deletions(-) diff --git a/scm-core/src/main/java/sonia/scm/i18n/I18nMessages.java b/scm-core/src/main/java/sonia/scm/i18n/I18nMessages.java index 0c11066f82..9c4a9353be 100644 --- a/scm-core/src/main/java/sonia/scm/i18n/I18nMessages.java +++ b/scm-core/src/main/java/sonia/scm/i18n/I18nMessages.java @@ -116,6 +116,7 @@ public final class I18nMessages * * @return instance of message class */ + @SuppressWarnings("unchecked") public synchronized static T get(Class msgClass, Locale locale) { CacheKey ck = new CacheKey(locale, msgClass); diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryManager.java b/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryManager.java index 3ef7aa9544..d6da4ec43c 100644 --- a/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryManager.java +++ b/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryManager.java @@ -35,11 +35,6 @@ package sonia.scm.repository; //~--- non-JDK imports -------------------------------------------------------- -import com.google.common.collect.Maps; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import sonia.scm.HandlerEventType; import sonia.scm.event.ScmEventBus; import sonia.scm.util.AssertUtil; @@ -54,12 +49,6 @@ import sonia.scm.util.AssertUtil; public abstract class AbstractRepositoryManager implements RepositoryManager { - /** the logger for AbstractRepositoryManager */ - private static final Logger logger = - LoggerFactory.getLogger(AbstractRepositoryManager.class); - - //~--- methods -------------------------------------------------------------- - /** * Sends a {@link RepositoryHookEvent} to each registered * {@link RepositoryHook} and sends the {@link RepositoryHookEvent} to diff --git a/scm-core/src/test/java/sonia/scm/plugin/ScmModuleTest.java b/scm-core/src/test/java/sonia/scm/plugin/ScmModuleTest.java index adecb22101..1e46e721be 100644 --- a/scm-core/src/test/java/sonia/scm/plugin/ScmModuleTest.java +++ b/scm-core/src/test/java/sonia/scm/plugin/ScmModuleTest.java @@ -59,6 +59,7 @@ public class ScmModuleTest * */ @Test + @SuppressWarnings("unchecked") public void testUnmarshall() { URL resource = Resources.getResource("sonia/scm/plugin/module.xml"); diff --git a/scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/ClassLoaders.java b/scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/ClassLoaders.java index 1068a1032f..4ac3ec50c0 100644 --- a/scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/ClassLoaders.java +++ b/scm-maven-plugins/scm-maven-plugin/src/main/java/sonia/scm/maven/ClassLoaders.java @@ -75,10 +75,11 @@ public final class ClassLoaders * @throws DependencyResolutionRequiredException * @throws MalformedURLException */ + @SuppressWarnings("unchecked") public static ClassLoader createRuntimeClassLoader(MavenProject project) throws DependencyResolutionRequiredException, MalformedURLException { - Set urls = new HashSet(); + Set urls = new HashSet<>(); append(urls, project.getRuntimeClasspathElements()); append(urls, project.getCompileClasspathElements()); diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnBlameHandler.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnBlameHandler.java index 7eabf39ab1..c19020b3bc 100644 --- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnBlameHandler.java +++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnBlameHandler.java @@ -59,6 +59,7 @@ import java.util.Map; * * @author Sebastian Sdorra */ +@SuppressWarnings("deprecation") public class SvnBlameHandler implements ISVNAnnotateHandler { @@ -230,7 +231,7 @@ public class SvnBlameHandler implements ISVNAnnotateHandler private final List blameLines; /** Field description */ - private final Map descriptionCache = new HashMap(); + private final Map descriptionCache = new HashMap<>(); /** Field description */ private final String path; diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLogCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLogCommand.java index dc0ab774dc..b1024ec5b4 100644 --- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLogCommand.java +++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLogCommand.java @@ -270,6 +270,7 @@ public class SvnLogCommand extends AbstractSvnCommand implements LogCommand * * @throws SVNException */ + @SuppressWarnings("unchecked") private ChangesetPagingResult getChangesets(SVNRepository repo, long startRevision, long endRevision, int start, int limit, String[] path) throws SVNException diff --git a/scm-test/src/main/java/sonia/scm/cache/MapCacheManager.java b/scm-test/src/main/java/sonia/scm/cache/MapCacheManager.java index 3fa19565d3..0e4faddb4a 100644 --- a/scm-test/src/main/java/sonia/scm/cache/MapCacheManager.java +++ b/scm-test/src/main/java/sonia/scm/cache/MapCacheManager.java @@ -48,6 +48,7 @@ import java.util.Map; * @author Sebastian Sdorra * @since 1.17 */ +@SuppressWarnings("unchecked") public class MapCacheManager implements CacheManager, org.apache.shiro.cache.CacheManager { @@ -94,6 +95,5 @@ public class MapCacheManager //~--- fields --------------------------------------------------------------- /** Field description */ - @SuppressWarnings("unchecked") private final Map cacheMap = Maps.newHashMap(); } diff --git a/scm-test/src/main/java/sonia/scm/repository/client/SvnRepositoryClient.java b/scm-test/src/main/java/sonia/scm/repository/client/SvnRepositoryClient.java index d4147637a6..dd7cc9d5cd 100644 --- a/scm-test/src/main/java/sonia/scm/repository/client/SvnRepositoryClient.java +++ b/scm-test/src/main/java/sonia/scm/repository/client/SvnRepositoryClient.java @@ -54,6 +54,7 @@ import java.io.File; import java.util.ArrayList; import java.util.List; +import org.tmatesoft.svn.core.internal.util.SVNURLUtil; /** * @@ -93,7 +94,7 @@ public class SvnRepositoryClient extends AbstractRepositoryClient client = SVNClientManager.newInstance(options); } - remoteRepositoryURL = SVNURL.parseURIDecoded(remoteRepository); + remoteRepositoryURL = SVNURL.parseURIEncoded(remoteRepository); DAVRepositoryFactory.setup(); } diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractManagerResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractManagerResource.java index dfee98f1f1..065f73b119 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractManagerResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AbstractManagerResource.java @@ -660,6 +660,7 @@ public abstract class AbstractManagerResource Set getInstalled(ClassLoader classLoader, JAXBContext context, String path) throws IOException, JAXBException diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/ExtensionBinder.java b/scm-webapp/src/main/java/sonia/scm/plugin/ExtensionBinder.java index 42b3751759..2f938f6f56 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/ExtensionBinder.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/ExtensionBinder.java @@ -59,6 +59,7 @@ import javax.ws.rs.ext.Provider; * * @author Sebastian Sdorra */ +@SuppressWarnings("unchecked") public final class ExtensionBinder { diff --git a/scm-webapp/src/test/java/sonia/scm/cache/CacheConfigurationTestLoader.java b/scm-webapp/src/test/java/sonia/scm/cache/CacheConfigurationTestLoader.java index 9937b50ae5..8efd40465e 100644 --- a/scm-webapp/src/test/java/sonia/scm/cache/CacheConfigurationTestLoader.java +++ b/scm-webapp/src/test/java/sonia/scm/cache/CacheConfigurationTestLoader.java @@ -34,8 +34,11 @@ package sonia.scm.cache; //~--- non-JDK imports -------------------------------------------------------- +import com.google.common.base.Charsets; import com.google.common.base.Function; import com.google.common.collect.Iterators; +import com.google.common.io.ByteSource; +import com.google.common.io.CharSource; import com.google.common.io.Files; import com.google.common.io.Resources; @@ -168,7 +171,8 @@ public class CacheConfigurationTestLoader implements CacheConfigurationLoader URL manual = getResource(manualConfiguration); - Files.copy(Resources.newInputStreamSupplier(manual), file); + ByteSource source = Resources.asByteSource(manual); + source.copyTo(Files.asByteSink(file)); } catch (IOException ex) { diff --git a/scm-webapp/src/test/java/sonia/scm/plugin/MultiParentClassLoaderTest.java b/scm-webapp/src/test/java/sonia/scm/plugin/MultiParentClassLoaderTest.java index d16160ce3e..89e5e8a2c8 100644 --- a/scm-webapp/src/test/java/sonia/scm/plugin/MultiParentClassLoaderTest.java +++ b/scm-webapp/src/test/java/sonia/scm/plugin/MultiParentClassLoaderTest.java @@ -72,6 +72,7 @@ public class MultiParentClassLoaderTest classLoader = new MultiParentClassLoader(parent1, parent2); } + @SuppressWarnings("unchecked") @Test(expected = ClassNotFoundException.class) public void testClassNotFoundException() throws ClassNotFoundException {