fix some deprecated warnings

This commit is contained in:
Sebastian Sdorra
2014-01-11 14:40:59 +01:00
parent 66da3a247b
commit a4e001808d
20 changed files with 119 additions and 113 deletions

View File

@@ -30,16 +30,16 @@
*/
package sonia.scm.repository.client.api;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.io.Closeables;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.repository.client.spi.RepositoryClientProvider;
import sonia.scm.util.IOUtil;
//~--- JDK imports ------------------------------------------------------------
@@ -87,7 +87,7 @@ public final class RepositoryClient implements Closeable
logger.trace("close client provider");
}
Closeables.closeQuietly(clientProvider);
IOUtil.close(clientProvider);
}
//~--- get methods ----------------------------------------------------------
@@ -204,5 +204,5 @@ public final class RepositoryClient implements Closeable
//~--- fields ---------------------------------------------------------------
/** Field description */
private RepositoryClientProvider clientProvider;
private final RepositoryClientProvider clientProvider;
}

View File

@@ -35,7 +35,6 @@ package sonia.scm.repository.spi;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.io.Closeables;
import com.google.common.io.Resources;
import org.junit.Before;
@@ -125,8 +124,6 @@ public abstract class ZippedRepositoryTestBase extends AbstractTestBase
*
*
* @return
*
* @throws IOException
*/
protected File createRepositoryDirectory()
{
@@ -190,7 +187,7 @@ public abstract class ZippedRepositoryTestBase extends AbstractTestBase
}
finally
{
Closeables.closeQuietly(output);
IOUtil.close(output);
}
}
@@ -200,7 +197,7 @@ public abstract class ZippedRepositoryTestBase extends AbstractTestBase
}
finally
{
Closeables.closeQuietly(zip);
IOUtil.close(zip);
}
}