KNOX-3223: Suppress cleanup, removed deprecations (#1133)

Author: hanicz

gateway-adapter/src/test/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealmTest.java

@@ -30,35 +30,35 @@ public class KnoxLdapRealmTest {
   public void setGetSearchBase() {
     KnoxLdapRealm realm = new KnoxLdapRealm();
     realm.setSearchBase("dc=hadoop,dc=apache,dc=org");
-    assertEquals(realm.getSearchBase(), "dc=hadoop,dc=apache,dc=org");
+    assertEquals("dc=hadoop,dc=apache,dc=org", realm.getSearchBase());
   }
 
   @Test
   public void setGetGroupObjectClass() {
     KnoxLdapRealm realm = new KnoxLdapRealm();
     realm.setGroupObjectClass("groupOfMembers");
-    assertEquals(realm.getGroupObjectClass(), "groupOfMembers");
+    assertEquals("groupOfMembers", realm.getGroupObjectClass());
   }
 
   @Test
   public void setGetUniqueMemberAttribute() {
     KnoxLdapRealm realm = new KnoxLdapRealm();
     realm.setMemberAttribute("member");
-    assertEquals(realm.getMemberAttribute(), "member");
+    assertEquals("member", realm.getMemberAttribute());
   }
 
   @Test
   public void setGetUserSearchAttributeName() {
     KnoxLdapRealm realm = new KnoxLdapRealm();
     realm.setUserSearchAttributeName("uid");
-    assertEquals(realm.getUserSearchAttributeName(), "uid");
+    assertEquals("uid", realm.getUserSearchAttributeName());
   }
 
   @Test
   public void setGetUserObjectClass() {
     KnoxLdapRealm realm = new KnoxLdapRealm();
     realm.setUserObjectClass("inetuser");
-    assertEquals(realm.getUserObjectClass(), "inetuser");
+    assertEquals("inetuser", realm.getUserObjectClass());
   }
 
   @Test
@@ -74,7 +74,7 @@ public void setGetGroupSearchBase() {
     KnoxLdapRealm realm = new KnoxLdapRealm();
     realm.setSearchBase("dc=example,dc=com");
     realm.setGroupSearchBase("dc=knox,dc=example,dc=com");
-    assertEquals(realm.getGroupSearchBase(), "dc=knox,dc=example,dc=com");
+    assertEquals("dc=knox,dc=example,dc=com", realm.getGroupSearchBase());
   }
 
   @Test
@@ -86,20 +86,20 @@ public void verifyDefaultUserSearchAttributeName() {
   @Test
   public void verifyDefaultGetUserObjectClass() {
     KnoxLdapRealm realm = new KnoxLdapRealm();
-    assertEquals(realm.getUserObjectClass(), "person");
+    assertEquals("person", realm.getUserObjectClass());
   }
 
   @Test
   public void verifyDefaultUserSearchBase() {
     KnoxLdapRealm realm = new KnoxLdapRealm();
     realm.setSearchBase("dc=knox,dc=example,dc=com");
-    assertEquals(realm.getUserSearchBase(), "dc=knox,dc=example,dc=com");
+    assertEquals("dc=knox,dc=example,dc=com", realm.getUserSearchBase());
   }
 
   @Test
   public void verifyDefaultGroupSearchBase() {
     KnoxLdapRealm realm = new KnoxLdapRealm();
     realm.setSearchBase("dc=knox,dc=example,dc=com");
-    assertEquals(realm.getGroupSearchBase(), "dc=knox,dc=example,dc=com");
+    assertEquals("dc=knox,dc=example,dc=com", realm.getGroupSearchBase());
   }
 }

gateway-adapter/src/test/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealmTest.java

@@ -37,7 +37,7 @@ public class KnoxPamRealmTest {
   public void setService() {
     KnoxPamRealm realm = new KnoxPamRealm();
     realm.setService("knox-pam-os-service");
-    assertEquals(realm.getService(), "knox-pam-os-service");
+    assertEquals("knox-pam-os-service", realm.getService());
   }
 
   @Test

gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/monitor/PollingConfigurationAnalyzer.java

@@ -521,7 +521,6 @@ private List<RelevantEvent> getRelevantEvents(final String address, final String
     return relevantEvents;
   }
 
-  @SuppressWarnings("unchecked")
   private boolean isStartEvent(ApiEvent event) {
     final Map<String, Object> attributeMap = getAttributeMap(event.getAttributes());
     final String command = getAttribute(attributeMap, COMMAND);

gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/AbstractIdentityAssertionFilter.java

@@ -18,7 +18,6 @@
 package org.apache.knox.gateway.identityasserter.common.filter;
 
 import java.io.IOException;
-import java.security.AccessController;
 import java.security.Principal;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
@@ -52,8 +51,6 @@
 import org.apache.knox.gateway.security.PrimaryPrincipal;
 import org.apache.knox.gateway.security.SubjectUtils;
 
-import de.thetaphi.forbiddenapis.SuppressForbidden;
-
 public abstract class AbstractIdentityAssertionFilter extends
   AbstractIdentityAssertionBase implements Filter {
 
@@ -89,7 +86,6 @@ public AbstractIdentityAssertionFilter() {
    */
   public abstract String mapUserPrincipal(String principalName);
 
-  @SuppressForbidden
   protected void continueChainAsPrincipal(HttpServletRequestWrapper request, ServletResponse response,
       FilterChain chain, String mappedPrincipalName, String[] groups) throws IOException,
       ServletException {
@@ -102,7 +98,7 @@ protected void continueChainAsPrincipal(HttpServletRequestWrapper request, Servl
         boolean groupsMapped;
 
         // look up the current Java Subject and assosciated group principals
-        Subject currentSubject = Subject.getSubject(AccessController.getContext());
+        Subject currentSubject = SubjectUtils.getCurrentSubject();
         if (currentSubject == null) {
           LOG.subjectNotAvailable();
           throw new IllegalStateException("Required Subject Missing");

gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/CommonIdentityAssertionFilter.java

@@ -23,7 +23,6 @@
 import static org.apache.knox.gateway.util.AuthFilterUtils.PROXYGROUP_PREFIX;
 
 import java.io.IOException;
-import java.security.AccessController;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -45,7 +44,6 @@
 import javax.servlet.http.HttpServletRequestWrapper;
 import javax.servlet.http.HttpServletResponse;
 
-import de.thetaphi.forbiddenapis.SuppressForbidden;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.knox.gateway.IdentityAsserterMessages;
@@ -222,11 +220,10 @@ public void destroy() {
      * to the identity to be asserted as appropriate and create the provider specific
      * assertion token. Add the assertion token to the request.
      */
-    @SuppressForbidden
     @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
             throws IOException, ServletException {
-        Subject subject = Subject.getSubject(AccessController.getContext());
+        Subject subject = SubjectUtils.getCurrentSubject();
 
         if (subject == null) {
             LOG.subjectNotAvailable();

gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/common/filter/VirtualGroupMapperTest.java

@@ -39,7 +39,6 @@
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 
-@SuppressWarnings("PMD.NonStaticInitializer")
 public class VirtualGroupMapperTest {
     private Parser parser = new Parser();
     private VirtualGroupMapper mapper;
@@ -159,4 +158,4 @@ private Set<String> virtualGroups(String user1, List<String> ldapGroups, Servlet
     private static Set<String> setOf(String... strings) {
         return new HashSet<>(Arrays.asList(strings));
     }
-}
+}

gateway-provider-identity-assertion-hadoop-groups/src/test/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderFilterTest.java

@@ -142,7 +142,6 @@ public void testUnknownUser() throws ServletException {
    * {@link LdapGroupsMapping} and in case of bad config we get empty groups
    * (Hadoop way).
    */
-  @SuppressWarnings({ "unchecked", "rawtypes" })
   @Test
   public void badConfigTest() throws ServletException {
 

gateway-provider-rewrite-common/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRulesDescriptorImpl.java

@@ -91,14 +91,12 @@ public <T extends UrlRewriteFunctionDescriptor<?>> T getFunction( String name )
   }
 
   @Override
-  @SuppressWarnings("unchecked")
   public <T extends UrlRewriteFunctionDescriptor<?>> T addFunction( String name ) {
     T descriptor = newFunction( name );
     addFunction( descriptor );
     return descriptor;
   }
 
-  @SuppressWarnings("unchecked")
   protected <T extends UrlRewriteFunctionDescriptor<?>> T newFunction( String name ) {
     return UrlRewriteFunctionDescriptorFactory.create( name );
   }

gateway-provider-rewrite-common/src/main/java/org/apache/knox/gateway/filter/rewrite/spi/UrlRewriteFlowDescriptorBase.java

@@ -105,7 +105,6 @@ public List<UrlRewriteStepDescriptor> steps() {
 //    return step;
 //  }
 
-  @SuppressWarnings( "unchecked" )
   @Override
   public <T extends UrlRewriteStepDescriptor<?>> T addStep( String type ) {
     T step = UrlRewriteStepDescriptorFactory.create( type );

gateway-provider-security-hadoopauth/src/test/java/org/apache/knox/gateway/hadoopauth/HadoopAuthDeploymentContributorTest.java

@@ -46,11 +46,10 @@
 
 public class HadoopAuthDeploymentContributorTest {
 
-  @SuppressWarnings("rawtypes")
   @Test
   public void testServiceLoader() {
-    ServiceLoader loader = ServiceLoader.load( ProviderDeploymentContributor.class );
-    Iterator iterator = loader.iterator();
+    ServiceLoader<ProviderDeploymentContributor> loader = ServiceLoader.load( ProviderDeploymentContributor.class );
+    Iterator<ProviderDeploymentContributor> iterator = loader.iterator();
     assertThat( "Service iterator empty.", iterator.hasNext() );
     while( iterator.hasNext() ) {
       Object object = iterator.next();