Factorize code in AbstractNameCheck (#98)

Author: pynicolas

python-checks/src/main/java/org/sonar/python/checks/AbstractFunctionNameCheck.java

@@ -23,12 +23,10 @@
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.AstNodeType;
 import java.util.Set;
-import java.util.regex.Pattern;
 import org.sonar.check.RuleProperty;
-import org.sonar.python.PythonCheck;
 import org.sonar.python.api.PythonGrammar;
 
-public abstract class AbstractFunctionNameCheck extends PythonCheck {
+public abstract class AbstractFunctionNameCheck extends AbstractNameCheck {
 
   private static final String DEFAULT = "^[a-z_][a-z0-9_]{2,}$";
   private static final String MESSAGE = "Rename %s \"%s\" to match the regular expression %s.";
@@ -37,13 +35,10 @@ public abstract class AbstractFunctionNameCheck extends PythonCheck {
     key = "format",
     defaultValue = "" + DEFAULT)
   public String format = DEFAULT;
-  private Pattern pattern = null;
 
-  private Pattern pattern() {
-    if (pattern == null) {
-      pattern = Pattern.compile(format);
-    }
-    return pattern;
+  @Override
+  protected String format() {
+    return format;
   }
 
   @Override

python-checks/src/main/java/org/sonar/python/checks/AbstractNameCheck.java

@@ -0,0 +1,38 @@
+/*
+ * SonarQube Python Plugin
+ * Copyright (C) 2011-2017 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * 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, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonar.python.checks;
+
+import java.util.regex.Pattern;
+import org.sonar.python.PythonCheck;
+
+public abstract class AbstractNameCheck extends PythonCheck {
+
+  private Pattern pattern = null;
+
+  protected Pattern pattern() {
+    if (pattern == null) {
+      pattern = Pattern.compile(format());
+    }
+    return pattern;
+  }
+
+  protected abstract String format();
+
+}

python-checks/src/main/java/org/sonar/python/checks/ClassNameCheck.java

@@ -23,14 +23,12 @@
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.AstNodeType;
 import java.util.Set;
-import java.util.regex.Pattern;
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
-import org.sonar.python.PythonCheck;
 import org.sonar.python.api.PythonGrammar;
 
 @Rule(key = ClassNameCheck.CHECK_KEY)
-public class ClassNameCheck extends PythonCheck {
+public class ClassNameCheck extends AbstractNameCheck {
 
   public static final String CHECK_KEY = "S101";
   private static final String DEFAULT = "^[A-Z_][a-zA-Z0-9]+$";
@@ -40,13 +38,10 @@ public class ClassNameCheck extends PythonCheck {
     key = "format",
     defaultValue = "" + DEFAULT)
   public String format = DEFAULT;
-  private Pattern pattern = null;
 
-  private Pattern pattern() {
-    if (pattern == null) {
-      pattern = Pattern.compile(format);
-    }
-    return pattern;
+  @Override
+  protected String format() {
+    return format;
   }
 
   @Override