Rename GlobalConfig to GlobalSonarQualityGatesConfiguration

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

@@ -30,7 +30,8 @@ public boolean getStatus(
         }
     }
 
-    GlobalConfigDataForSonarInstance chooseSonarInstance(GlobalConfig globalConfig, JobConfigData jobConfigData) {
+    GlobalConfigDataForSonarInstance chooseSonarInstance(
+            GlobalSonarQualityGatesConfiguration globalConfig, JobConfigData jobConfigData) {
         if (globalConfig.fetchListOfGlobalConfigData().isEmpty()) {
             return noSonarInstance(jobConfigData);
         } else if (globalConfig.fetchListOfGlobalConfigData().size() == 1) {
@@ -46,15 +47,16 @@ private GlobalConfigDataForSonarInstance noSonarInstance(JobConfigData jobConfig
     }
 
     private GlobalConfigDataForSonarInstance singleSonarInstance(
-            GlobalConfig globalConfig, JobConfigData jobConfigData) {
+            GlobalSonarQualityGatesConfiguration globalConfig, JobConfigData jobConfigData) {
         var globalConfigDataForSonarInstance =
                 globalConfig.fetchListOfGlobalConfigData().get(0);
         jobConfigData.setSonarInstanceName(globalConfigDataForSonarInstance.getName());
 
         return globalConfigDataForSonarInstance;
     }
 
-    public GlobalConfigDataForSonarInstance multipleSonarInstances(String instanceName, GlobalConfig globalConfig) {
+    public GlobalConfigDataForSonarInstance multipleSonarInstances(
+            String instanceName, GlobalSonarQualityGatesConfiguration globalConfig) {
         return globalConfig.getSonarInstanceByName(instanceName);
     }
 }

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

@@ -39,7 +39,7 @@ public GlobalConfigDataForSonarInstance() {
         this.pass = "";
     }
 
-	@DataBoundConstructor
+    @DataBoundConstructor
     public GlobalConfigDataForSonarInstance(
             String name, String sonarUrl, String username, Secret secretPass, int timeToWait, int maxWaitTime) {
         this.name = name;
@@ -70,7 +70,7 @@ public String getName() {
         return name;
     }
 
-	@DataBoundSetter
+    @DataBoundSetter
     public void setName(String name) {
         this.name = name;
     }
@@ -79,7 +79,7 @@ public String getUsername() {
         return username;
     }
 
-	@DataBoundSetter
+    @DataBoundSetter
     public void setUsername(String username) {
         this.username = username;
     }
@@ -88,7 +88,7 @@ public Secret getPass() {
         return secretPass != null ? secretPass : Secret.fromString("");
     }
 
-	@DataBoundSetter
+    @DataBoundSetter
     public void setPass(String pass) {
         this.secretPass = Secret.fromString(Util.fixEmptyAndTrim(pass));
     }
@@ -97,7 +97,7 @@ public String getSonarUrl() {
         return sonarUrl;
     }
 
-	@DataBoundSetter
+    @DataBoundSetter
     public void setSonarUrl(String sonarUrl) {
         this.sonarUrl = sonarUrl;
     }

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

@@ -12,18 +12,18 @@
 
 @Extension
 @Symbol("sonarQualityGates")
-public class GlobalConfig extends GlobalConfiguration {
+public class GlobalSonarQualityGatesConfiguration extends GlobalConfiguration {
 
     private List<GlobalConfigDataForSonarInstance> listOfGlobalConfigData;
 
     private final GlobalConfigurationService globalConfigurationService;
 
-    public GlobalConfig() {
+    public GlobalSonarQualityGatesConfiguration() {
         load();
         globalConfigurationService = new GlobalConfigurationService();
     }
 
-    public GlobalConfig(
+    public GlobalSonarQualityGatesConfiguration(
             List<GlobalConfigDataForSonarInstance> listOfGlobalConfigData,
             GlobalConfigurationService globalConfigurationService) {
         this.listOfGlobalConfigData = listOfGlobalConfigData;
@@ -39,7 +39,7 @@ public List<GlobalConfigDataForSonarInstance> fetchListOfGlobalConfigData() {
         return listOfGlobalConfigData;
     }
 
-	@DataBoundSetter
+    @DataBoundSetter
     public void setGlobalConfigDataForSonarInstances(
             List<GlobalConfigDataForSonarInstance> globalConfigDataForSonarInstances) {
         this.listOfGlobalConfigData = globalConfigDataForSonarInstances;

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

@@ -17,7 +17,7 @@ public class JobConfigurationService {
 
     private static final Pattern ENV_VARIABLE_WITHOUT_BRACES_PATTERN = Pattern.compile("(\\$[a-zA-Z0-9_]+)");
 
-    public ListBoxModel getListOfSonarInstanceNames(GlobalConfig globalConfig) {
+    public ListBoxModel getListOfSonarInstanceNames(GlobalSonarQualityGatesConfiguration globalConfig) {
         var listBoxModel = new ListBoxModel();
 
         for (GlobalConfigDataForSonarInstance globalConfigDataForSonarInstance :
@@ -28,7 +28,7 @@ public ListBoxModel getListOfSonarInstanceNames(GlobalConfig globalConfig) {
         return listBoxModel;
     }
 
-    public JobConfigData createJobConfigData(JSONObject formData, GlobalConfig globalConfig) {
+    public JobConfigData createJobConfigData(JSONObject formData, GlobalSonarQualityGatesConfiguration globalConfig) {
         var firstInstanceJobConfigData = new JobConfigData();
         var projectKey = formData.getString("projectKey");
 
@@ -49,7 +49,7 @@ public JobConfigData createJobConfigData(JSONObject formData, GlobalConfig globa
         return firstInstanceJobConfigData;
     }
 
-    protected String hasFormDataKey(JSONObject formData, GlobalConfig globalConfig) {
+    protected String hasFormDataKey(JSONObject formData, GlobalSonarQualityGatesConfiguration globalConfig) {
         if (formData.containsKey("sonarInstancesName")) {
             return formData.getString("sonarInstancesName");
         }

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

@@ -10,11 +10,11 @@ public class JobExecutionService {
     public static final String GLOBAL_CONFIG_NO_LONGER_EXISTS_ERROR =
             "The Sonar Instance in the global configuration with name '%s' no longer exists.\n";
 
-    public GlobalConfig getGlobalConfigData() {
-        var globalConfig = GlobalConfiguration.all().get(GlobalConfig.class);
+    public GlobalSonarQualityGatesConfiguration getGlobalConfigData() {
+        var globalConfig = GlobalConfiguration.all().get(GlobalSonarQualityGatesConfiguration.class);
 
         if (globalConfig == null) {
-            return new GlobalConfig();
+            return new GlobalSonarQualityGatesConfiguration();
         }
 
         return globalConfig;

src/test/java/org/quality/gates/jenkins/plugin/BuildDecisionTest.java

@@ -36,7 +36,7 @@ public class BuildDecisionTest {
     GlobalConfigDataForSonarInstance globalConfigDataForSonarInstance;
 
     @Mock
-    GlobalConfig globalConfig;
+    GlobalSonarQualityGatesConfiguration globalConfig;
 
     @Mock
     private BuildListener listener;

src/test/java/org/quality/gates/jenkins/plugin/GlobalConfigTest.java

@@ -22,10 +22,10 @@
 
 public class GlobalConfigTest {
 
-    private GlobalConfig globalConfig;
+    private GlobalSonarQualityGatesConfiguration globalConfig;
 
     @InjectMocks
-    private GlobalConfig spyGlobalConfig;
+    private GlobalSonarQualityGatesConfiguration spyGlobalConfig;
 
     @Mock
     private StaplerRequest staplerRequest;
@@ -44,7 +44,8 @@ public void setUp() {
         closeable = MockitoAnnotations.openMocks(this);
         jsonObject = new JSONObject();
         globalConfigDataForSonarInstances = new ArrayList<>();
-        globalConfig = new GlobalConfig(globalConfigDataForSonarInstances, globalConfigurationService);
+        globalConfig =
+                new GlobalSonarQualityGatesConfiguration(globalConfigDataForSonarInstances, globalConfigurationService);
         spyGlobalConfig = spy(globalConfig);
     }
 

src/test/java/org/quality/gates/jenkins/plugin/JobConfigurationServiceTest.java

@@ -26,7 +26,7 @@ public class JobConfigurationServiceTest {
     private JobConfigurationService jobConfigurationService;
 
     @Mock
-    private GlobalConfig globalConfig;
+    private GlobalSonarQualityGatesConfiguration globalConfig;
 
     @Mock
     private List<GlobalConfigDataForSonarInstance> globalConfigDataForSonarInstances;

src/test/java/org/quality/gates/jenkins/plugin/QGBuilderIT.java

@@ -32,7 +32,7 @@ public class QGBuilderIT {
 
     private FreeStyleProject freeStyleProject;
 
-    private GlobalConfig globalConfig;
+    private GlobalSonarQualityGatesConfiguration globalConfig;
 
     @Mock
     private BuildDecision buildDecision;
@@ -69,7 +69,7 @@ public void setUp() throws IOException {
                 jobExecutionService,
                 jobConfigurationService,
                 globalConfigDataForSonarInstance);
-        globalConfig = GlobalConfiguration.all().get(GlobalConfig.class);
+        globalConfig = GlobalConfiguration.all().get(GlobalSonarQualityGatesConfiguration.class);
         freeStyleProject = jenkinsRule.createFreeStyleProject("freeStyleProject");
         freeStyleProject.getBuildersList().add(qgBuilder);
         globalConfigDataForSonarInstanceList = new ArrayList<>();

src/test/java/org/quality/gates/jenkins/plugin/QGBuilderTest.java

@@ -81,7 +81,9 @@ public void tearDown() throws Exception {
 
     @Test
     public void testPrebuildShouldFailGlobalConfigDataInstanceIsNull() {
-        doReturn(null).when(buildDecision).chooseSonarInstance(any(GlobalConfig.class), any(JobConfigData.class));
+        doReturn(null)
+                .when(buildDecision)
+                .chooseSonarInstance(any(GlobalSonarQualityGatesConfiguration.class), any(JobConfigData.class));
         doReturn("TestInstanceName").when(jobConfigData).getSonarInstanceName();
         assertFalse(builder.prebuild(abstractBuild, buildListener));
         verify(buildListener).error(JobExecutionService.GLOBAL_CONFIG_NO_LONGER_EXISTS_ERROR, "TestInstanceName");

src/test/java/org/quality/gates/jenkins/plugin/QGPublisherIT.java

@@ -33,7 +33,7 @@ public class QGPublisherIT {
 
     private FreeStyleProject freeStyleProject;
 
-    private GlobalConfig globalConfig;
+    private GlobalSonarQualityGatesConfiguration globalConfig;
 
     @Mock
     private BuildDecision buildDecision;
@@ -73,7 +73,7 @@ public void setUp() throws IOException {
                 jobExecutionService,
                 jobConfigurationService,
                 globalConfigDataForSonarInstance);
-        globalConfig = GlobalConfiguration.all().get(GlobalConfig.class);
+        globalConfig = GlobalConfiguration.all().get(GlobalSonarQualityGatesConfiguration.class);
         freeStyleProject = jenkinsRule.createFreeStyleProject("freeStyleProject");
         freeStyleProject.getBuildersList().add(builder);
         freeStyleProject.getPublishersList().add(publisher);

src/test/java/org/quality/gates/jenkins/plugin/QGPublisherTest.java

@@ -94,7 +94,9 @@ public void tearDown() throws Exception {
 
     @Test
     public void testPrebuildShouldFail() {
-        doReturn(null).when(buildDecision).chooseSonarInstance(any(GlobalConfig.class), any(JobConfigData.class));
+        doReturn(null)
+                .when(buildDecision)
+                .chooseSonarInstance(any(GlobalSonarQualityGatesConfiguration.class), any(JobConfigData.class));
         doReturn("TestInstanceName").when(jobConfigData).getSonarInstanceName();
         assertFalse(publisher.prebuild(abstractBuild, buildListener));
         verify(buildListener).error(JobExecutionService.GLOBAL_CONFIG_NO_LONGER_EXISTS_ERROR, "TestInstanceName");

src/test/java/org/quality/gates/jenkins/plugin/casc/ConfigurationAsCodeTest.java

@@ -6,8 +6,8 @@
 import java.util.List;
 import jenkins.model.GlobalConfiguration;
 import org.jvnet.hudson.test.RestartableJenkinsRule;
-import org.quality.gates.jenkins.plugin.GlobalConfig;
 import org.quality.gates.jenkins.plugin.GlobalConfigDataForSonarInstance;
+import org.quality.gates.jenkins.plugin.GlobalSonarQualityGatesConfiguration;
 
 public class ConfigurationAsCodeTest extends RoundTripAbstractTest {
 
@@ -23,15 +23,16 @@ protected String stringInLogExpected() {
 
     @Override
     protected void assertConfiguredAsExpected(RestartableJenkinsRule j, String configContent) {
-        GlobalConfig globalSonarQualityGatesConfiguration =
-                GlobalConfiguration.all().get(GlobalConfig.class);
+        GlobalSonarQualityGatesConfiguration globalSonarQualityGatesConfiguration =
+                GlobalConfiguration.all().get(GlobalSonarQualityGatesConfiguration.class);
 
         // Assert that globalSonarQualityGatesConfiguration is not null
         assertThat(
                 "GlobalSonarQualityGatesConfiguration should not be null",
                 globalSonarQualityGatesConfiguration != null);
 
-        List<GlobalConfigDataForSonarInstance> sonarInstances = globalSonarQualityGatesConfiguration.fetchListOfGlobalConfigData();
+        List<GlobalConfigDataForSonarInstance> sonarInstances =
+                globalSonarQualityGatesConfiguration.fetchListOfGlobalConfigData();
 
         // Assert that sonarInstances is not null
         assertThat("SonarInstances should not be null", sonarInstances != null);