Merge pull request #181 from offa/deprecations

Replace deprecated API calls
jenkinsci · Jan 4, 2023 · 7e729d0 · 7e729d0
2 parents 8f4e7ab + dea9b3e
commit 7e729d0
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 25 deletions.
diff --git a/src/main/java/jenkins/scm/api/SCMEvent.java b/src/main/java/jenkins/scm/api/SCMEvent.java
@@ -33,6 +33,7 @@
 import hudson.model.Run;
 import hudson.model.TaskListener;
 import hudson.security.ACL;
+import hudson.security.ACLContext;
 import hudson.util.ClassLoaderSanityThreadFactory;
 import hudson.util.DaemonThreadFactory;
 import hudson.util.NamingThreadFactory;
@@ -47,8 +48,6 @@
 import javax.servlet.http.HttpServletRequest;
 import jenkins.security.ImpersonatingScheduledExecutorService;
 import jenkins.util.SystemProperties;
-import org.acegisecurity.context.SecurityContext;
-import org.acegisecurity.context.SecurityContextHolder;
 import org.apache.commons.lang.StringUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -541,17 +540,16 @@ public void run() {
                         event.getClass(), event.getTimestamp(), oldName)
                 );
                 for (final SCMEventListener l : ExtensionList.lookup(SCMEventListener.class)) {
-                    SecurityContext context = ACL.impersonate(ACL.SYSTEM);
-                    try {
-                        fire(l, event);
-                    } catch (LinkageError e) {
-                        log(l, e);
-                    } catch (Error e) {
-                        throw e;
-                    } catch (Throwable e) {
-                        log(l, e);
-                    } finally {
-                        SecurityContextHolder.setContext(context);
+                    try (ACLContext ctx = ACL.as2(ACL.SYSTEM2)) {
+                        try {
+                            fire(l, event);
+                        } catch (LinkageError e) {
+                            log(l, e);
+                        } catch (Error e) {
+                            throw e;
+                        } catch (Throwable e) {
+                            log(l, e);
+                        }
                     }
                 }
             } finally {

diff --git a/src/main/java/jenkins/scm/api/SCMHeadMixinEqualityGenerator.java b/src/main/java/jenkins/scm/api/SCMHeadMixinEqualityGenerator.java
@@ -243,8 +243,8 @@ private SCMHeadMixin.Equality create(@NonNull Class<? extends SCMHead> type) {
                 SCMHeadMixin.Equality.class);
 
         try {
-            return c.newInstance();
-        } catch (InstantiationException | IllegalAccessException e) {
+            return c.getDeclaredConstructor().newInstance();
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
             // fallback to reflection
         }
         return new ReflectiveEquality(properties.values().toArray(new Method[0]));

diff --git a/src/test/java/jenkins/scm/api/SCMHeadObserverTest.java b/src/test/java/jenkins/scm/api/SCMHeadObserverTest.java
@@ -29,14 +29,14 @@
 import org.hamcrest.Matchers;
 import org.junit.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

diff --git a/src/test/java/jenkins/scm/api/SCMNameTest.java b/src/test/java/jenkins/scm/api/SCMNameTest.java
@@ -26,9 +26,9 @@
 
 import org.junit.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.*;
 
 public class SCMNameTest {
     @Test

diff --git a/src/test/java/jenkins/scm/api/SCMRevisionActionTest.java b/src/test/java/jenkins/scm/api/SCMRevisionActionTest.java
@@ -8,8 +8,8 @@
 import jenkins.scm.impl.mock.MockSCMSource;
 import org.junit.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.*;
 
 public class SCMRevisionActionTest {
     @Test

diff --git a/src/test/java/jenkins/scm/impl/ChangeRequestSCMHeadCategoryTest.java b/src/test/java/jenkins/scm/impl/ChangeRequestSCMHeadCategoryTest.java
@@ -32,8 +32,8 @@
 import org.junit.experimental.theories.Theory;
 import org.junit.runner.RunWith;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.*;
 
 @RunWith(Theories.class)
 public class ChangeRequestSCMHeadCategoryTest {

diff --git a/src/test/java/jenkins/scm/impl/avatars/AvatarCacheTest.java b/src/test/java/jenkins/scm/impl/avatars/AvatarCacheTest.java
@@ -243,7 +243,7 @@ public String getUrlName() {
         }
 
         public HttpResponse doIndex() {
-            return HttpResponses.plainText(AvatarCache.buildUrl(url, size));
+            return HttpResponses.text(AvatarCache.buildUrl(url, size));
         }
     }
 

diff --git a/src/test/java/jenkins/scm/impl/mock/AbstractSampleDVCSRepoRule.java b/src/test/java/jenkins/scm/impl/mock/AbstractSampleDVCSRepoRule.java
@@ -59,7 +59,7 @@ protected void before() throws Throwable {
      * @param text text to write
      */
     public final void write(String rel, String text) throws IOException {
-        FileUtils.write(new File(sampleRepo, rel), text);
+        FileUtils.write(new File(sampleRepo, rel), text, StandardCharsets.UTF_8);
     }
 
     /**
@@ -91,7 +91,7 @@ protected final void run(String tool, String... cmds) throws Exception {
      * Like {@link #fileUrl} but expressed only as a path, not a URL with protocol.
      */
     public final String bareUrl() throws UnsupportedEncodingException {
-        return URLEncoder.encode(toString(), StandardCharsets.UTF_8.name());
+        return URLEncoder.encode(toString(), StandardCharsets.UTF_8);
     }
 
     /**

diff --git a/src/test/java/jenkins/scm/impl/mock/AbstractSampleRepoRule.java b/src/test/java/jenkins/scm/impl/mock/AbstractSampleRepoRule.java
@@ -30,8 +30,9 @@
 import hudson.util.StreamTaskListener;
 import java.io.File;
 import java.util.Arrays;
+
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.AssumptionViolatedException;
 import org.junit.Rule;
@@ -60,7 +61,7 @@ public static void run(boolean probing, File cwd, String... cmds) throws Excepti
             if (probing) {
                 Assume.assumeThat(message, r, is(0));
             } else {
-                Assert.assertThat(message, r, is(0));
+                assertThat(message, r, is(0));
             }
         } catch (Exception x) {
             if (probing) {

diff --git a/src/test/java/jenkins/scm/impl/trait/WildcardSCMHeadFilterTraitTest.java b/src/test/java/jenkins/scm/impl/trait/WildcardSCMHeadFilterTraitTest.java
@@ -37,8 +37,8 @@
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.junit.Assert.*;
 
 public class WildcardSCMHeadFilterTraitTest {
     @ClassRule