Cleaning compiler warnings

fcrepo · Dec 12, 2013 · 85d3560 · 85d3560
1 parent 10a89f2
commit 85d3560
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 64 deletions.
diff --git a/fcrepo-auth-common/src/main/java/org/fcrepo/auth/FedoraUserSecurityContext.java b/fcrepo-auth-common/src/main/java/org/fcrepo/auth/FedoraUserSecurityContext.java
@@ -44,8 +44,6 @@ public class FedoraUserSecurityContext implements SecurityContext,
 
     private Principal userPrincipal = null;
 
-    private ServletCredentials credentials = null;
-
     private FedoraPolicyEnforcementPoint pep = null;
 
     private boolean loggedIn = true;
@@ -61,7 +59,6 @@ protected FedoraUserSecurityContext(
             final ServletCredentials credentials,
             final Set<Principal> principals,
             final FedoraPolicyEnforcementPoint pep) {
-        this.credentials = credentials;
         this.principals = principals;
         this.pep = pep;
         if (credentials.getRequest() != null) {

diff --git a/fcrepo-auth-common/src/main/java/org/fcrepo/auth/HTTPHeaderPrincipalFactory.java b/fcrepo-auth-common/src/main/java/org/fcrepo/auth/HTTPHeaderPrincipalFactory.java
@@ -16,33 +16,30 @@
 
 package org.fcrepo.auth;
 
+import static java.util.Collections.emptySet;
+
 import java.security.Principal;
-import java.util.Collections;
-import java.util.Map;
 import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 
 /**
  * An example principal factory that extracts groups principals from request
  * headers.
- * 
+ *
  * @author Gregory Jansen
  */
 public class HTTPHeaderPrincipalFactory implements HTTPPrincipalFactory {
 
-    private Map<String, Map<String, String>> principalConfigs;
-
     /*
      * (non-Javadoc)
      * @see
      * org.fcrepo.auth.GroupPrincipalFactory#getGroupPrincipals(javax.servlet
      * .http.HttpServletRequest)
      */
     @Override
-    public Set<Principal>
-    getGroupPrincipals(final HttpServletRequest request) {
-        return Collections.EMPTY_SET;
+    public Set<Principal> getGroupPrincipals(final HttpServletRequest request) {
+        return emptySet();
     }
 
 }
diff --git a/fcrepo-auth-common/src/test/java/org/fcrepo/auth/integration/AbstractResourceIT.java b/fcrepo-auth-common/src/test/java/org/fcrepo/auth/integration/AbstractResourceIT.java
@@ -18,16 +18,14 @@
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.util.concurrent.TimeUnit;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.impl.conn.PoolingClientConnectionManager;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
 import org.junit.Before;
 import org.junit.runner.RunWith;
@@ -55,16 +53,12 @@ public void setLogger() {
     protected static final String serverAddress = "http://" + HOSTNAME +
             ":" + SERVER_PORT + "/";
 
-    protected final PoolingClientConnectionManager connectionManager =
-            new PoolingClientConnectionManager();
-
     protected static HttpClient client;
 
     public AbstractResourceIT() {
-        connectionManager.setMaxTotal(Integer.MAX_VALUE);
-        connectionManager.setDefaultMaxPerRoute(5);
-        connectionManager.closeIdleConnections(3, TimeUnit.SECONDS);
-        client = new DefaultHttpClient(connectionManager);
+        client =
+            HttpClientBuilder.create().setMaxConnPerRoute(5).setMaxConnTotal(
+                    Integer.MAX_VALUE).build();
     }
 
     protected static HttpPost postObjMethod(final String pid) {

diff --git a/...o-auth-common/src/test/java/org/fcrepo/auth/integration/ModeShapeHonorsPEPResponseIT.java b/...o-auth-common/src/test/java/org/fcrepo/auth/integration/ModeShapeHonorsPEPResponseIT.java
@@ -36,7 +36,6 @@
 import org.apache.http.auth.BasicUserPrincipal;
 import org.fcrepo.auth.FedoraPolicyEnforcementPoint;
 import org.fcrepo.auth.ServletContainerAuthenticationProvider;
-import org.fcrepo.kernel.FedoraObject;
 import org.fcrepo.kernel.services.ObjectService;
 import org.junit.Assert;
 import org.junit.Before;
@@ -111,7 +110,7 @@ public void testPermissivePEP() throws RepositoryException {
             logger.debug("got priv: " + p.getName());
         }
         final ObjectService os = new ObjectService();
-        final FedoraObject fo = os.createObject(session, "/myobject");
+        os.createObject(session, "/myobject");
         verify(pep, times(5)).hasModeShapePermission(any(Path.class),
                 any(String[].class), Matchers.<Set<Principal>> any(),
                 any(Principal.class));
@@ -138,7 +137,7 @@ public void testRestrictivePEP() throws RepositoryException {
         final ServletCredentials credentials = new ServletCredentials(request);
         final Session session = repo.login(credentials);
         final ObjectService os = new ObjectService();
-        final FedoraObject fo = os.createObject(session, "/myobject");
+        os.createObject(session, "/myobject");
         verify(pep, times(5)).hasModeShapePermission(any(Path.class),
                 any(String[].class), Matchers.<Set<Principal>> any(),
                 any(Principal.class));

diff --git a/...les-basic/src/test/java/org/fcrepo/auth/roles/basic/integration/AbstractBasicRolesIT.java b/...les-basic/src/test/java/org/fcrepo/auth/roles/basic/integration/AbstractBasicRolesIT.java
@@ -16,22 +16,17 @@
 package org.fcrepo.auth.roles.basic.integration;
 
 import static org.fcrepo.auth.ServletContainerAuthenticationProvider.EVERYONE_NAME;
-import static org.slf4j.LoggerFactory.getLogger;
-
 import java.util.ArrayList;
 import java.util.List;
 
 import org.fcrepo.auth.roles.common.integration.AbstractRolesIT;
 import org.fcrepo.auth.roles.common.integration.RolesPepTestObjectBean;
-import org.slf4j.Logger;
 
 /**
  * @author Scott Prater
  */
 public abstract class AbstractBasicRolesIT extends AbstractRolesIT {
 
-    private static Logger logger = getLogger(AbstractBasicRolesIT.class);
-
     protected final static List<RolesPepTestObjectBean> test_objs =
             defineTestObjects();
 

diff --git a/...-roles-basic/src/test/java/org/fcrepo/auth/roles/basic/integration/BasicRolesAdminIT.java b/...-roles-basic/src/test/java/org/fcrepo/auth/roles/basic/integration/BasicRolesAdminIT.java
@@ -29,8 +29,6 @@
 import org.apache.http.client.ClientProtocolException;
 import org.fcrepo.auth.roles.common.integration.RolesPepTestObjectBean;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Verifies that role for admins is properly enforced.
@@ -40,9 +38,6 @@
  */
 public class BasicRolesAdminIT extends AbstractBasicRolesIT {
 
-    private static final Logger log = LoggerFactory
-            .getLogger(BasicRolesAdminIT.class);
-
     private final static String TESTDS = "admintestds";
 
     @Override

diff --git a/...test/java/org/fcrepo/auth/roles/basic/integration/BasicRolesPepUnauthenticatedUserIT.java b/...test/java/org/fcrepo/auth/roles/basic/integration/BasicRolesPepUnauthenticatedUserIT.java
@@ -26,20 +26,15 @@
 import org.apache.http.client.ClientProtocolException;
 import org.fcrepo.auth.roles.common.integration.RolesPepTestObjectBean;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Verifies that role for unauthenticated users is properly enforced.
- * 
+ *
  * @author Scott Prater
  * @author Gregory Jansen
  */
 public class BasicRolesPepUnauthenticatedUserIT extends AbstractBasicRolesIT {
 
-    private static final Logger log = LoggerFactory
-            .getLogger(BasicRolesPepUnauthenticatedUserIT.class);
-
     private final static String TESTDS = "uutestds";
 
     @Override

diff --git a/...roles-basic/src/test/java/org/fcrepo/auth/roles/basic/integration/BasicRolesReaderIT.java b/...roles-basic/src/test/java/org/fcrepo/auth/roles/basic/integration/BasicRolesReaderIT.java
@@ -26,20 +26,15 @@
 import org.apache.http.client.ClientProtocolException;
 import org.fcrepo.auth.roles.common.integration.RolesPepTestObjectBean;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Verifies that role for readers is properly enforced.
- * 
+ *
  * @author Scott Prater
  * @author Gregory Jansen
  */
 public class BasicRolesReaderIT extends AbstractBasicRolesIT {
 
-    private static final Logger log = LoggerFactory
-            .getLogger(BasicRolesReaderIT.class);
-
     private final static String TESTDS = "readertestds";
 
     @Override

diff --git a/...roles-basic/src/test/java/org/fcrepo/auth/roles/basic/integration/BasicRolesWriterIT.java b/...roles-basic/src/test/java/org/fcrepo/auth/roles/basic/integration/BasicRolesWriterIT.java
@@ -30,8 +30,6 @@
 import org.apache.http.client.ClientProtocolException;
 import org.fcrepo.auth.roles.common.integration.RolesPepTestObjectBean;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Verifies that role for writers is properly enforced.
@@ -41,9 +39,6 @@
  */
 public class BasicRolesWriterIT extends AbstractBasicRolesIT {
 
-    private static final Logger log = LoggerFactory
-            .getLogger(BasicRolesWriterIT.class);
-
     private final static String TESTDS = "writertestds";
 
     @Override

diff --git a/...-common/src/test/java/org/fcrepo/auth/roles/common/integration/AbstractCommonRolesIT.java b/...-common/src/test/java/org/fcrepo/auth/roles/common/integration/AbstractCommonRolesIT.java
@@ -15,23 +15,17 @@
  */
 package org.fcrepo.auth.roles.common.integration;
 
-import static org.slf4j.LoggerFactory.getLogger;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.slf4j.Logger;
-
 /**
  * @author Scott Prater
  */
 public abstract class AbstractCommonRolesIT extends AbstractRolesIT {
 
-    private static Logger logger = getLogger(AbstractCommonRolesIT.class);
-
     protected final static List<RolesPepTestObjectBean> test_objs =
             defineTestObjects();
 

diff --git a/...-roles-common/src/test/java/org/fcrepo/auth/roles/common/integration/AbstractRolesIT.java b/...-roles-common/src/test/java/org/fcrepo/auth/roles/common/integration/AbstractRolesIT.java
@@ -46,6 +46,7 @@
 import org.apache.http.message.AbstractHttpMessage;
 import org.apache.http.util.EntityUtils;
 import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.type.TypeReference;
 import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -360,7 +361,8 @@ protected Map<String, List<String>> getRoles(final String path)
         logger.debug("content: {}", content);
         final ObjectMapper mapper = new ObjectMapper();
         final Map<String, List<String>> result =
-                mapper.readValue(content, Map.class);
+            mapper.readValue(content,
+                    new TypeReference<Map<String, List<String>>>() {});
         return result;
     }
 
@@ -377,7 +379,8 @@ protected Map<String, List<String>> getEffectiveRoles(final String path)
         logger.debug("content: {}", content);
         final ObjectMapper mapper = new ObjectMapper();
         final Map<String, List<String>> result =
-                mapper.readValue(content, Map.class);
+            mapper.readValue(content,
+                    new TypeReference<Map<String, List<String>>>() {});
         return result;
     }
 

diff --git a/...th-roles-common/src/test/java/org/fcrepo/auth/roles/common/integration/AccessRolesIT.java b/...th-roles-common/src/test/java/org/fcrepo/auth/roles/common/integration/AccessRolesIT.java
@@ -27,18 +27,13 @@
 import org.apache.http.client.ClientProtocolException;
 import org.fcrepo.auth.roles.common.AccessRolesProvider;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * @author Gregory Jansen
  * @author Scott Prater
  */
 public class AccessRolesIT extends AbstractCommonRolesIT {
 
-    private static final Logger logger = LoggerFactory
-            .getLogger(AccessRolesIT.class);
-
     @Override
     protected List<RolesPepTestObjectBean> getTestObjs() {
         return test_objs;