From d92fd4cc63e19c60e374e45e045dcdce2d91e951 Mon Sep 17 00:00:00 2001
From: Stephen Connolly <stephen.alan.connolly@gmail.com>
Date: Thu, 28 Jul 2016 16:30:17 +0100
Subject: [PATCH] [JENKINS-37041] Address Code review comments

---
 .../main/java/hudson/ClassicPluginStrategy.java  | 16 ++++++----------
 core/src/main/java/hudson/PluginManager.java     |  6 +++---
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
index 9bfa1e951f..ff933347c3 100644
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -57,17 +57,13 @@ import java.io.FileInputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URI;
 import java.net.URL;
-import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashSet;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.Vector;
@@ -277,7 +273,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
             }
             // some earlier versions of maven-hpi-plugin apparently puts "null" as a literal in Hudson-Version. watch out for them.
             if (jenkinsVersion == null || jenkinsVersion.equals("null") || new VersionNumber(jenkinsVersion).compareTo(detached.splitWhen) <= 0) {
-                out.add(new PluginWrapper.Dependency(detached.shortName + ':' + detached.requireVersion));
+                out.add(new PluginWrapper.Dependency(detached.shortName + ':' + detached.requiredVersion));
                 LOGGER.log(Level.FINE, "adding implicit dependency {0} → {1} because of {2}", new Object[] {pluginName, detached.shortName, jenkinsVersion});
             }
         }
@@ -378,12 +374,12 @@ public class ClassicPluginStrategy implements PluginStrategy {
          * be "1.123.*" (because 1.124 will be the first version that doesn't include the removed code.)
          */
         private final VersionNumber splitWhen;
-        private final String requireVersion;
+        private final String requiredVersion;
 
-        private DetachedPlugin(String shortName, String splitWhen, String requireVersion) {
+        private DetachedPlugin(String shortName, String splitWhen, String requiredVersion) {
             this.shortName = shortName;
             this.splitWhen = new VersionNumber(splitWhen);
-            this.requireVersion = requireVersion;
+            this.requiredVersion = requiredVersion;
         }
 
         /**
@@ -408,8 +404,8 @@ public class ClassicPluginStrategy implements PluginStrategy {
          * @return the minimum required version for the current version of Jenkins.
          * @sice 2.16
          */
-        public VersionNumber getRequireVersion() {
-            return new VersionNumber(requireVersion);
+        public VersionNumber getRequiredVersion() {
+            return new VersionNumber(requiredVersion);
         }
     }
 
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index 4a6ed440c5..de0cb06b2a 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -720,11 +720,11 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
             final Set<ClassicPluginStrategy.DetachedPlugin> forceUpgrade = new HashSet<>();
             for (ClassicPluginStrategy.DetachedPlugin p : ClassicPluginStrategy.getDetachedPlugins()) {
                 VersionNumber installedVersion = getPluginVersion(rootDir, p.getShortName());
-                VersionNumber requireVersion = p.getRequireVersion();
-                if (installedVersion != null && installedVersion.isOlderThan(requireVersion)) {
+                VersionNumber requiredVersion = p.getRequiredVersion();
+                if (installedVersion != null && installedVersion.isOlderThan(requiredVersion)) {
                     LOGGER.log(Level.WARNING,
                             "Detached plugin {0} found at version {1}, required minimum version is {2}",
-                            new Object[]{p.getShortName(), installedVersion, requireVersion});
+                            new Object[]{p.getShortName(), installedVersion, requiredVersion});
                     forceUpgrade.add(p);
                 }
             }
-- 
GitLab