Replace usages of deprecated types and methods (#24)

Replace usages of deprecated types and methods
jenkinsci · Nov 4, 2022 · f0d0de2 · f0d0de2
2 parents d59c9c0 + 282a9f6
commit f0d0de2
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 43 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/negotiatesso-plugin</gitHubRepo>
-    <jenkins.version>2.181</jenkins.version>
+    <jenkins.version>2.266</jenkins.version>
     <java.level>8</java.level>
     <waffle.version>2.0.0</waffle.version>
     <jna.version>5.3.1</jna.version>

diff --git a/src/main/java/com/github/farmgeek4life/jenkins/negotiatesso/NegSecFilter.java b/src/main/java/com/github/farmgeek4life/jenkins/negotiatesso/NegSecFilter.java
@@ -47,7 +47,7 @@
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.security.core.context.SecurityContextHolder;
 
 import com.google.common.annotations.VisibleForTesting;
 import jenkins.model.Jenkins;

diff --git a/src/main/java/com/github/farmgeek4life/jenkins/negotiatesso/NegSecUserSeedFilter.java b/src/main/java/com/github/farmgeek4life/jenkins/negotiatesso/NegSecUserSeedFilter.java
@@ -45,9 +45,9 @@
 import jenkins.model.Jenkins;
 import jenkins.security.SecurityListener;
 import jenkins.security.seed.UserSeedProperty;
-import org.acegisecurity.Authentication;
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import org.acegisecurity.userdetails.UserDetails;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.kohsuke.accmod.restrictions.suppressions.SuppressRestrictedWarnings;
 
 /**
@@ -85,12 +85,12 @@ private void authenticateJenkins(WindowsPrincipal principal, HttpServletRequest
         }
         Jenkins jenkins = Jenkins.get();
         SecurityRealm realm = jenkins.getSecurityRealm();
-        UserDetails userDetails = realm.loadUserByUsername(principalName);
+        UserDetails userDetails = realm.loadUserByUsername2(principalName);
         Authentication authToken = new UsernamePasswordAuthenticationToken(
                         userDetails.getUsername(),
                         userDetails.getPassword(),
                         userDetails.getAuthorities());
-        ACL.as(authToken);
+        ACL.as2(authToken);
         populateUserSeed(httpRequest, userDetails.getUsername());              
         SecurityListener.fireLoggedIn(userDetails.getUsername());
     }

diff --git a/src/test/java/com/github/farmgeek4life/jenkins/negotiatesso/NegotiateConfigTests.java b/src/test/java/com/github/farmgeek4life/jenkins/negotiatesso/NegotiateConfigTests.java
@@ -35,6 +35,7 @@
 import org.junit.Test;
 import org.junit.runners.model.Statement;
 import org.jvnet.hudson.test.RestartableJenkinsRule;
+import org.jvnet.hudson.test.RestartableJenkinsRule.Step;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -69,12 +70,10 @@ private boolean IsWindowsOS() {
      */
     @Test
     public void testNegotiateHasConfigPage() {
-        rule.addStep(new Statement() {
-            @Override public void evaluate() throws Throwable {
-                HtmlPage currentPage = rule.j.createWebClient().goTo("configureSecurity");
-                HtmlElement enabled = currentPage.getElementByName("_.enabled");
-                assertNotNull("Negotiate configuration page missing.", enabled);
-            }
+        rule.then(r -> {
+            HtmlPage currentPage = rule.j.createWebClient().goTo("configureSecurity");
+            HtmlElement enabled = currentPage.getElementByName("_.enabled");
+            assertNotNull("Negotiate configuration page missing.", enabled);            
         });
 
     }
@@ -84,13 +83,11 @@ public void testNegotiateHasConfigPage() {
      */
     @Test
     public void testEnableNegotiate() {
-        rule.addStep(new Statement() {
-            @Override public void evaluate() throws Throwable {
-                HtmlPage currentPage = rule.j.createWebClient().goTo("configureSecurity");
-                HtmlElement enabled = currentPage.getElementByName("_.enabled");
-                enabled.fireEvent("click");
-                assertNotNull("Optional block wasn't expanded.", currentPage.getElementByName("_.redirectEnabled"));
-            }
+        rule.then(r -> {
+            HtmlPage currentPage = rule.j.createWebClient().goTo("configureSecurity");
+            HtmlElement enabled = currentPage.getElementByName("_.enabled");
+            enabled.fireEvent("click");
+            assertNotNull("Optional block wasn't expanded.", currentPage.getElementByName("_.redirectEnabled"));
         });
     }
 
@@ -100,32 +97,30 @@ public void testEnableNegotiate() {
      */
     @Test
     public void testIfConfigCanBeUpdated() throws Exception {
-        rule.addStep(new Statement() {
-            @Override public void evaluate() throws Throwable {
-                assertFalse("Plugin already enabled", NegotiateSSO.getInstance().getEnabled());
-
-                HtmlPage currentPage = rule.j.createWebClient().goTo("configureSecurity");
-                HtmlForm form = currentPage.getFormByName("config");
-                assertNotNull(form);
+        rule.then(r -> {
+            assertFalse("Plugin already enabled", NegotiateSSO.getInstance().getEnabled());
 
-                form.getInputByName("_.enabled").click();
-                form.getSelectByName("_.principalFormat").setSelectedAttribute("both", true);
-                form.getSelectByName("_.roleFormat").setSelectedAttribute("sid", true);
+            HtmlPage currentPage = rule.j.createWebClient().goTo("configureSecurity");
+            HtmlForm form = currentPage.getFormByName("config");
+            assertNotNull(form);
 
-                try {
-                    rule.j.submit(form);
-                    // CS IGNORE EmptyBlock FOR NEXT 3 LINES. REASON: Mocks Tests.
-                } catch (FailingHttpStatusCodeException e) {
-                    // Expected since filter cannot be added to Jenkins rule.
-                }
+            form.getInputByName("_.enabled").click();
+            form.getSelectByName("_.principalFormat").setSelectedAttribute("both", true);
+            form.getSelectByName("_.roleFormat").setSelectedAttribute("sid", true);
 
-                boolean wasEnabled = NegotiateSSO.getInstance().getEnabled();
-                if (IsWindowsOS()) {
-                    assertTrue("Plugin wasn't enabled after saving the new config", wasEnabled);
-                }
-                else {
-                    assertFalse("Plugin was enabled on a non-Windows OS", wasEnabled);
-                }
+            try {
+                rule.j.submit(form);
+                // CS IGNORE EmptyBlock FOR NEXT 3 LINES. REASON: Mocks Tests.
+            } catch (FailingHttpStatusCodeException e) {
+                // Expected since filter cannot be added to Jenkins rule.
+            }
+
+            boolean wasEnabled = NegotiateSSO.getInstance().getEnabled();
+            if (IsWindowsOS()) {
+                assertTrue("Plugin wasn't enabled after saving the new config", wasEnabled);
+            }
+            else {
+                assertFalse("Plugin was enabled on a non-Windows OS", wasEnabled);
             }
         });
     }