Factorized coverage code

Author: Gilles Grousset

commons/src/main/java/com/backelite/sonarqube/commons/Constants.java

@@ -0,0 +1,33 @@
+/**
+ * commons - Enables analysis of Swift and Objective-C projects into SonarQube.
+ * Copyright © 2015 Backelite (${email})
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.backelite.sonarqube.commons;
+
+/**
+ * Created by gillesgrousset on 23/08/2018.
+ */
+public final class Constants {
+
+    // Common constants
+    public static final String FALSE = "false";
+
+    public static final String PROPERTY_PREFIX = "sonar.swift";
+
+    public static final String TEST_FRAMEWORK_KEY = PROPERTY_PREFIX + ".testframework";
+    public static final String TEST_FRAMEWORK_DEFAULT = "ghunit";
+
+}

objclang/src/main/java/com/backelite/sonarqube/objectivec/ObjectiveCConstants.java

@@ -18,17 +18,9 @@
 package com.backelite.sonarqube.objectivec;
 
 
-public class ObjectiveCConstants {
+public final class ObjectiveCConstants {
 
-    // Global Objective C constants
-    public static final String FALSE = "false";
+    public static final String FILE_SUFFIXES = "h,m,mm";
 
-    public static final String FILE_SUFFIXES_KEY = "sonar.objectivec.file.suffixes";
-    public static final String FILE_SUFFIXES_DEFVALUE = "h,m,mm";
-
-    public static final String PROPERTY_PREFIX = "sonar.objectivec";
-
-    public static final String TEST_FRAMEWORK_KEY = PROPERTY_PREFIX + ".testframework";
-    public static final String TEST_FRAMEWORK_DEFAULT = "ghunit";
 
 }

objclang/src/main/java/com/backelite/sonarqube/objectivec/coverage/CoberturaReportParser.java

@@ -17,6 +17,7 @@
  */
 package com.backelite.sonarqube.objectivec.issues.fauxpas;
 
+import com.backelite.sonarqube.commons.Constants;
 import com.backelite.sonarqube.objectivec.lang.core.ObjectiveC;
 import org.apache.tools.ant.DirectoryScanner;
 import org.slf4j.Logger;
@@ -33,7 +34,7 @@
 
 public class FauxPasSensor implements Sensor {
 
-    public static final String REPORT_PATH_KEY = ObjectiveCConstants.PROPERTY_PREFIX
+    public static final String REPORT_PATH_KEY = Constants.PROPERTY_PREFIX
             + ".fauxpas.report";
     public static final String DEFAULT_REPORT_PATH = "sonar-reports/*fauxpas.json";
 

objclang/src/main/java/com/backelite/sonarqube/objectivec/coverage/CoberturaSensor.java

@@ -19,6 +19,7 @@
 
 import java.io.File;
 
+import com.backelite.sonarqube.commons.Constants;
 import com.backelite.sonarqube.objectivec.ObjectiveCConstants;
 import com.backelite.sonarqube.objectivec.lang.core.ObjectiveC;
 import org.apache.tools.ant.DirectoryScanner;
@@ -31,7 +32,7 @@
 import org.sonar.api.resources.Project;
 
 public final class OCLintSensor implements Sensor {
-    public static final String REPORT_PATH_KEY = ObjectiveCConstants.PROPERTY_PREFIX + ".oclint.report";
+    public static final String REPORT_PATH_KEY = Constants.PROPERTY_PREFIX + ".oclint.report";
     public static final String DEFAULT_REPORT_PATH = "sonar-reports/*oclint.xml";
 
     private final Settings conf;