Rename globalConfigDataForSonarInstance to sonarInstance

src/main/java/org/quality/gates/jenkins/plugin/BuildDecision.java

@@ -8,30 +8,29 @@ public class BuildDecision {
 
     private final QualityGatesProvider qualityGatesProvider;
 
-    public BuildDecision(SonarInstance globalConfigDataForSonarInstance) {
-        qualityGatesProvider = new QualityGatesProvider(globalConfigDataForSonarInstance);
+    public BuildDecision(SonarInstance sonarInstance) {
+        qualityGatesProvider = new QualityGatesProvider(sonarInstance);
     }
 
     public BuildDecision(QualityGatesProvider qualityGatesProvider) {
         this.qualityGatesProvider = qualityGatesProvider;
     }
 
-    public boolean getStatus(
-            SonarInstance globalConfigDataForSonarInstance, JobConfigData jobConfigData, BuildListener listener)
+    public boolean getStatus(SonarInstance sonarInstance, JobConfigData jobConfigData, BuildListener listener)
             throws QGException {
         try {
             return qualityGatesProvider
-                    .getAPIResultsForQualityGates(jobConfigData, globalConfigDataForSonarInstance, listener)
+                    .getAPIResultsForQualityGates(jobConfigData, sonarInstance, listener)
                     .hasStatusGreen();
         } catch (JSONException | InterruptedException e) {
             throw new QGException("Please check your credentials or your Project Key", e);
         }
     }
 
     SonarInstance chooseSonarInstance(GlobalSonarQualityGatesConfiguration globalConfig, JobConfigData jobConfigData) {
-        if (globalConfig.fetchListOfGlobalConfigData().isEmpty()) {
+        if (globalConfig.fetchSonarInstances().isEmpty()) {
             return noSonarInstance(jobConfigData);
-        } else if (globalConfig.fetchListOfGlobalConfigData().size() == 1) {
+        } else if (globalConfig.fetchSonarInstances().size() == 1) {
             return singleSonarInstance(globalConfig, jobConfigData);
         }
 
@@ -45,11 +44,10 @@ private SonarInstance noSonarInstance(JobConfigData jobConfigData) {
 
     private SonarInstance singleSonarInstance(
             GlobalSonarQualityGatesConfiguration globalConfig, JobConfigData jobConfigData) {
-        var globalConfigDataForSonarInstance =
-                globalConfig.fetchListOfGlobalConfigData().get(0);
-        jobConfigData.setSonarInstanceName(globalConfigDataForSonarInstance.getName());
+        var sonarInstance = globalConfig.fetchSonarInstances().get(0);
+        jobConfigData.setSonarInstanceName(sonarInstance.getName());
 
-        return globalConfigDataForSonarInstance;
+        return sonarInstance;
     }
 
     public SonarInstance multipleSonarInstances(

src/main/java/org/quality/gates/jenkins/plugin/GlobalConfigurationService.java

@@ -19,7 +19,7 @@ public void setListOfGlobalConfigInstances(List<SonarInstance> listOfGlobalConfi
 
     protected List<SonarInstance> instantiateGlobalConfigData(JSONObject json) {
         listOfGlobalConfigInstances = new ArrayList<>();
-        var globalDataConfigs = (JSON) json.opt("listOfGlobalConfigData");
+        var globalDataConfigs = (JSON) json.opt("sonarInstances");
 
         if (globalDataConfigs == null) {
             globalDataConfigs = new JSONArray();
@@ -61,17 +61,17 @@ protected void addGlobalConfigDataForSonarInstance(JSONObject globalConfigData)
         var url = globalConfigData.optString("url");
 
         if (!"".equals(name)) {
-            SonarInstance globalConfigDataForSonarInstance;
+            SonarInstance sonarInstance;
             var token = globalConfigData.optString("token");
             if (StringUtils.isNotEmpty(token)) {
-                globalConfigDataForSonarInstance = new SonarInstance(
+                sonarInstance = new SonarInstance(
                         name,
                         url,
                         Secret.fromString(Util.fixEmptyAndTrim(globalConfigData.optString("token"))),
                         timeToWait,
                         maxWaitTime);
             } else {
-                globalConfigDataForSonarInstance = new SonarInstance(
+                sonarInstance = new SonarInstance(
                         name,
                         url,
                         globalConfigData.optString("account"),
@@ -81,7 +81,7 @@ protected void addGlobalConfigDataForSonarInstance(JSONObject globalConfigData)
             }
 
             if (!containsGlobalConfigWithName(name)) {
-                listOfGlobalConfigInstances.add(globalConfigDataForSonarInstance);
+                listOfGlobalConfigInstances.add(sonarInstance);
             }
         }
     }

src/main/java/org/quality/gates/jenkins/plugin/GlobalSonarQualityGatesConfiguration.java

@@ -14,7 +14,7 @@
 @Symbol("sonarQualityGates")
 public class GlobalSonarQualityGatesConfiguration extends GlobalConfiguration {
 
-    private List<SonarInstance> listOfGlobalConfigData;
+    private List<SonarInstance> sonarInstances;
 
     private final GlobalConfigurationService globalConfigurationService;
 
@@ -24,28 +24,29 @@ public GlobalSonarQualityGatesConfiguration() {
     }
 
     public GlobalSonarQualityGatesConfiguration(
-            List<SonarInstance> listOfGlobalConfigData, GlobalConfigurationService globalConfigurationService) {
-        this.listOfGlobalConfigData = listOfGlobalConfigData;
+            List<SonarInstance> sonarInstances, GlobalConfigurationService globalConfigurationService) {
+        this.sonarInstances = sonarInstances;
         this.globalConfigurationService = globalConfigurationService;
     }
 
-    public List<SonarInstance> getListOfGlobalConfigData() {
+    public List<SonarInstance> getSonarInstances() {
         load();
-        return listOfGlobalConfigData;
+        return sonarInstances;
     }
 
-    public List<SonarInstance> fetchListOfGlobalConfigData() {
-        return listOfGlobalConfigData;
+    public List<SonarInstance> fetchSonarInstances() {
+        return sonarInstances;
     }
 
     @DataBoundSetter
-    public void setGlobalConfigDataForSonarInstances(List<SonarInstance> globalConfigDataForSonarInstances) {
-        this.listOfGlobalConfigData = globalConfigDataForSonarInstances;
+    public void setSonarInstances(List<SonarInstance> globalConfigDataForSonarInstances) {
+        this.sonarInstances = globalConfigDataForSonarInstances;
     }
 
     @Override
     public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
-        listOfGlobalConfigData = globalConfigurationService.instantiateGlobalConfigData(json);
+        sonarInstances = globalConfigurationService.instantiateGlobalConfigData(json);
+        req.bindJSON(this, json);
         save();
 
         return true;
@@ -60,9 +61,9 @@ public FormValidation doCheckName(@QueryParameter String name) {
     }
 
     public SonarInstance getSonarInstanceByName(String name) {
-        for (SonarInstance globalConfigDataForSonarInstance : listOfGlobalConfigData) {
-            if (name.equals(globalConfigDataForSonarInstance.getName())) {
-                return globalConfigDataForSonarInstance;
+        for (SonarInstance sonarInstance : sonarInstances) {
+            if (name.equals(sonarInstance.getName())) {
+                return sonarInstance;
             }
         }
 

src/main/java/org/quality/gates/jenkins/plugin/JobConfigurationService.java

@@ -20,8 +20,8 @@ public class JobConfigurationService {
     public ListBoxModel getListOfSonarInstanceNames(GlobalSonarQualityGatesConfiguration globalConfig) {
         var listBoxModel = new ListBoxModel();
 
-        for (SonarInstance globalConfigDataForSonarInstance : globalConfig.fetchListOfGlobalConfigData()) {
-            listBoxModel.add(globalConfigDataForSonarInstance.getName());
+        for (SonarInstance sonarInstance : globalConfig.fetchSonarInstances()) {
+            listBoxModel.add(sonarInstance.getName());
         }
 
         return listBoxModel;
@@ -37,7 +37,7 @@ public JobConfigData createJobConfigData(JSONObject formData, GlobalSonarQuality
 
         var name = "";
 
-        if (!globalConfig.fetchListOfGlobalConfigData().isEmpty()) {
+        if (!globalConfig.fetchSonarInstances().isEmpty()) {
             name = hasFormDataKey(formData, globalConfig);
         }
 
@@ -53,7 +53,7 @@ protected String hasFormDataKey(JSONObject formData, GlobalSonarQualityGatesConf
             return formData.getString("sonarInstancesName");
         }
 
-        return globalConfig.fetchListOfGlobalConfigData().get(0).getName();
+        return globalConfig.fetchSonarInstances().get(0).getName();
     }
 
     public JobConfigData checkProjectKeyIfVariable(

src/main/java/org/quality/gates/jenkins/plugin/QGBuilder.java

@@ -18,28 +18,28 @@ public class QGBuilder extends Builder {
 
     private final JobExecutionService jobExecutionService;
 
-    private SonarInstance globalConfigDataForSonarInstance;
+    private SonarInstance sonarInstance;
 
     @DataBoundConstructor
-    public QGBuilder(JobConfigData jobConfigData, SonarInstance globalConfigDataForSonarInstance) {
+    public QGBuilder(JobConfigData jobConfigData, SonarInstance sonarInstance) {
         this.jobConfigData = jobConfigData;
-        this.buildDecision = new BuildDecision(globalConfigDataForSonarInstance);
+        this.buildDecision = new BuildDecision(sonarInstance);
         this.jobExecutionService = new JobExecutionService();
         this.jobConfigurationService = new JobConfigurationService();
-        this.globalConfigDataForSonarInstance = null;
+        this.sonarInstance = null;
     }
 
     protected QGBuilder(
             JobConfigData jobConfigData,
             BuildDecision buildDecision,
             JobExecutionService jobExecutionService,
             JobConfigurationService jobConfigurationService,
-            SonarInstance globalConfigDataForSonarInstance) {
+            SonarInstance sonarInstance) {
         this.jobConfigData = jobConfigData;
         this.buildDecision = buildDecision;
         this.jobExecutionService = jobExecutionService;
         this.jobConfigurationService = jobConfigurationService;
-        this.globalConfigDataForSonarInstance = globalConfigDataForSonarInstance;
+        this.sonarInstance = sonarInstance;
     }
 
     public JobConfigData getJobConfigData() {
@@ -48,10 +48,9 @@ public JobConfigData getJobConfigData() {
 
     @Override
     public boolean prebuild(AbstractBuild<?, ?> build, BuildListener listener) {
-        globalConfigDataForSonarInstance =
-                buildDecision.chooseSonarInstance(jobExecutionService.getGlobalConfigData(), jobConfigData);
+        sonarInstance = buildDecision.chooseSonarInstance(jobExecutionService.getGlobalConfigData(), jobConfigData);
 
-        if (globalConfigDataForSonarInstance == null) {
+        if (sonarInstance == null) {
             listener.error(
                     JobExecutionService.GLOBAL_CONFIG_NO_LONGER_EXISTS_ERROR, jobConfigData.getSonarInstanceName());
             return false;
@@ -73,7 +72,7 @@ public boolean perform(AbstractBuild build, Launcher launcher, BuildListener lis
         try {
             var checkedJobConfigData =
                     jobConfigurationService.checkProjectKeyIfVariable(jobConfigData, build, listener);
-            buildHasPassed = buildDecision.getStatus(globalConfigDataForSonarInstance, checkedJobConfigData, listener);
+            buildHasPassed = buildDecision.getStatus(sonarInstance, checkedJobConfigData, listener);
             if ("".equals(jobConfigData.getSonarInstanceName())) {
                 listener.getLogger().println(JobExecutionService.DEFAULT_CONFIGURATION_WARNING);
             }

src/main/java/org/quality/gates/jenkins/plugin/QGBuilderDescriptor.java

@@ -36,7 +36,7 @@ public QGBuilderDescriptor(
         this.jobExecutionService = jobExecutionService;
     }
 
-    public ListBoxModel doFillListOfGlobalConfigDataItems() {
+    public ListBoxModel doFillSonarInstancesItems() {
         return jobConfigurationService.getListOfSonarInstanceNames(jobExecutionService.getGlobalConfigData());
     }
 
@@ -75,10 +75,10 @@ public boolean configure(StaplerRequest staplerRequest, JSONObject json) throws
     public QGBuilder newInstance(StaplerRequest req, JSONObject formData) throws QGException {
         var firstInstanceJobConfigData =
                 jobConfigurationService.createJobConfigData(formData, jobExecutionService.getGlobalConfigData());
-        var globalConfigDataForSonarInstance = jobExecutionService
+        var sonarInstance = jobExecutionService
                 .getGlobalConfigData()
                 .getSonarInstanceByName(firstInstanceJobConfigData.getSonarInstanceName());
 
-        return new QGBuilder(firstInstanceJobConfigData, globalConfigDataForSonarInstance);
+        return new QGBuilder(firstInstanceJobConfigData, sonarInstance);
     }
 }

src/main/java/org/quality/gates/jenkins/plugin/QGPublisher.java

@@ -19,28 +19,28 @@ public class QGPublisher extends Recorder {
 
     private final JobExecutionService jobExecutionService;
 
-    private SonarInstance globalConfigDataForSonarInstance;
+    private SonarInstance sonarInstance;
 
     @DataBoundConstructor
-    public QGPublisher(JobConfigData jobConfigData, SonarInstance globalConfigDataForSonarInstance) {
+    public QGPublisher(JobConfigData jobConfigData, SonarInstance sonarInstance) {
         this.jobConfigData = jobConfigData;
-        this.buildDecision = new BuildDecision(globalConfigDataForSonarInstance);
+        this.buildDecision = new BuildDecision(sonarInstance);
         this.jobExecutionService = new JobExecutionService();
         this.jobConfigurationService = new JobConfigurationService();
-        this.globalConfigDataForSonarInstance = null;
+        this.sonarInstance = null;
     }
 
     public QGPublisher(
             JobConfigData jobConfigData,
             BuildDecision buildDecision,
             JobExecutionService jobExecutionService,
             JobConfigurationService jobConfigurationService,
-            SonarInstance globalConfigDataForSonarInstance) {
+            SonarInstance sonarInstance) {
         this.jobConfigData = jobConfigData;
         this.buildDecision = buildDecision;
         this.jobConfigurationService = jobConfigurationService;
         this.jobExecutionService = jobExecutionService;
-        this.globalConfigDataForSonarInstance = globalConfigDataForSonarInstance;
+        this.sonarInstance = sonarInstance;
     }
 
     public JobConfigData getJobConfigData() {
@@ -59,10 +59,9 @@ public BuildStepMonitor getRequiredMonitorService() {
 
     @Override
     public boolean prebuild(AbstractBuild<?, ?> build, BuildListener listener) {
-        globalConfigDataForSonarInstance =
-                buildDecision.chooseSonarInstance(jobExecutionService.getGlobalConfigData(), jobConfigData);
+        sonarInstance = buildDecision.chooseSonarInstance(jobExecutionService.getGlobalConfigData(), jobConfigData);
 
-        if (globalConfigDataForSonarInstance == null) {
+        if (sonarInstance == null) {
             listener.error(
                     JobExecutionService.GLOBAL_CONFIG_NO_LONGER_EXISTS_ERROR, jobConfigData.getSonarInstanceName());
             return false;
@@ -85,7 +84,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
         try {
             var checkedJobConfigData =
                     jobConfigurationService.checkProjectKeyIfVariable(jobConfigData, build, listener);
-            buildHasPassed = buildDecision.getStatus(globalConfigDataForSonarInstance, checkedJobConfigData, listener);
+            buildHasPassed = buildDecision.getStatus(sonarInstance, checkedJobConfigData, listener);
 
             if ("".equals(jobConfigData.getSonarInstanceName())) {
                 listener.getLogger().println(JobExecutionService.DEFAULT_CONFIGURATION_WARNING);

src/main/java/org/quality/gates/jenkins/plugin/QGPublisherDescriptor.java

@@ -39,7 +39,7 @@ public JobExecutionService getJobExecutionService() {
         return jobExecutionService;
     }
 
-    public ListBoxModel doFillListOfGlobalConfigDataItems() {
+    public ListBoxModel doFillSonarInstancesItems() {
         return jobConfigurationService.getListOfSonarInstanceNames(jobExecutionService.getGlobalConfigData());
     }
 
@@ -78,10 +78,10 @@ public boolean configure(StaplerRequest req, JSONObject json) throws FormExcepti
     public QGPublisher newInstance(StaplerRequest req, JSONObject formData) throws QGException {
         var firstInstanceJobConfigData =
                 jobConfigurationService.createJobConfigData(formData, jobExecutionService.getGlobalConfigData());
-        var globalConfigDataForSonarInstance = jobExecutionService
+        var sonarInstance = jobExecutionService
                 .getGlobalConfigData()
                 .getSonarInstanceByName(firstInstanceJobConfigData.getSonarInstanceName());
 
-        return new QGPublisher(firstInstanceJobConfigData, globalConfigDataForSonarInstance);
+        return new QGPublisher(firstInstanceJobConfigData, sonarInstance);
     }
 }