Fix quality flaws

SonarQubeCommunity · Jun 2, 2016 · a422773 · a422773
1 parent 7b67875
commit a422773
Show file tree

Hide file tree

Showing 20 changed files with 32 additions and 26 deletions.
diff --git a/css-checks-testkit/src/main/java/org/sonar/css/checks/verifier/CssCheckVerifier.java b/css-checks-testkit/src/main/java/org/sonar/css/checks/verifier/CssCheckVerifier.java
@@ -72,8 +72,7 @@ public static void verify(CssCheck check, File file, CssConfiguration configurat
 
   private static List<TestIssue> getExpectedIssues(TestIssueCheck check) {
     Set<TestIssue> issues = check.getTestIssues();
-    List<TestIssue> sortedIssues = Ordering.natural().onResultOf(new IssueToLine()).sortedCopy(issues);
-    return sortedIssues;
+    return Ordering.natural().onResultOf(new IssueToLine()).sortedCopy(issues);
   }
 
   private static Iterator<Issue> getActualIssues(CssCheck check) {

diff --git a/css-checks/src/main/java/org/sonar/css/checks/CompatibleVendorPrefixes.java b/css-checks/src/main/java/org/sonar/css/checks/CompatibleVendorPrefixes.java
@@ -33,7 +33,6 @@
 import org.sonar.css.model.property.StandardProperty;
 import org.sonar.css.model.property.StandardPropertyFactory;
 import org.sonar.css.parser.CssGrammar;
-import org.sonar.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
 import org.sonar.squidbridge.annotations.SqaleSubCharacteristic;
 

diff --git a/css-checks/src/main/java/org/sonar/css/checks/GenerateRuleDescriptions.java b/css-checks/src/main/java/org/sonar/css/checks/GenerateRuleDescriptions.java
@@ -531,7 +531,7 @@ private static Map<String, StandardProperty> getAllStandardProperties() {
       StandardProperty property;
       ImmutableSet<ClassPath.ClassInfo> classInfos = ClassPath.from(Border.class.getClassLoader()).getTopLevelClasses("org.sonar.css.model.property.standard");
       for (ClassPath.ClassInfo classInfo : classInfos) {
-        if (!classInfo.getName().equals("org.sonar.css.model.property.standard.package-info")) {
+        if (!"org.sonar.css.model.property.standard.package-info".equals(classInfo.getName())) {
           property = (StandardProperty) Class.forName(classInfo.getName()).newInstance();
           properties.put(property.getName(), property);
         }
@@ -548,7 +548,7 @@ private static Map<String, StandardAtRule> getAllStandardAtRules() {
       StandardAtRule atRule;
       ImmutableSet<ClassPath.ClassInfo> classInfos = ClassPath.from(Annotation.class.getClassLoader()).getTopLevelClasses("org.sonar.css.model.atrule.standard");
       for (ClassPath.ClassInfo classInfo : classInfos) {
-        if (!classInfo.getName().equals("org.sonar.css.model.atrule.standard.package-info")) {
+        if (!"org.sonar.css.model.atrule.standard.package-info".equals(classInfo.getName())) {
           atRule = (StandardAtRule) Class.forName(classInfo.getName()).newInstance();
           atRules.put(atRule.getName(), atRule);
         }
@@ -565,7 +565,7 @@ private static Map<String, StandardFunction> getAllStandardFunctions() {
       StandardFunction function;
       ImmutableSet<ClassPath.ClassInfo> classInfos = ClassPath.from(Annotation.class.getClassLoader()).getTopLevelClasses("org.sonar.css.model.function.standard");
       for (ClassPath.ClassInfo classInfo : classInfos) {
-        if (!classInfo.getName().equals("org.sonar.css.model.function.standard.package-info")) {
+        if (!"org.sonar.css.model.function.standard.package-info".equals(classInfo.getName())) {
           function = (StandardFunction) Class.forName(classInfo.getName()).newInstance();
           functions.put(function.getName(), function);
         }

diff --git a/css-checks/src/main/java/org/sonar/css/checks/ShorthandProperties.java b/css-checks/src/main/java/org/sonar/css/checks/ShorthandProperties.java
@@ -82,7 +82,7 @@ public void visitNode(AstNode astNode) {
 
   @Override
   public void leaveNode(AstNode astNode) {
-    AstNode primaryIssueLocationNode = null;
+    AstNode primaryIssueLocationNode;
     if (astNode.is(CssGrammar.RULESET)) {
       if (astNode.getFirstChild(CssGrammar.SELECTOR) != null) {
         primaryIssueLocationNode = astNode.getFirstChild(CssGrammar.SELECTOR);

diff --git a/css-checks/src/main/java/org/sonar/css/checks/VendorPrefixWithStandard.java b/css-checks/src/main/java/org/sonar/css/checks/VendorPrefixWithStandard.java
@@ -52,13 +52,13 @@ public void init() {
   @Override
   public void leaveNode(AstNode declarationNode) {
     Property property = new Property(declarationNode.getFirstChild(CssGrammar.PROPERTY).getTokenValue());
-    if (!(property.getStandardProperty() instanceof UnknownProperty) && property.isVendorPrefixed()) {
-      if (!isNonPrefixedPropertyDefined(declarationNode, property)) {
-        addIssue(
-          this,
-          "Define the standard property after this vendor-prefixed property.",
-          declarationNode.getFirstChild(CssGrammar.PROPERTY));
-      }
+    if (!(property.getStandardProperty() instanceof UnknownProperty)
+      && property.isVendorPrefixed()
+      && !isNonPrefixedPropertyDefined(declarationNode, property)) {
+      addIssue(
+        this,
+        "Define the standard property after this vendor-prefixed property.",
+        declarationNode.getFirstChild(CssGrammar.PROPERTY));
     }
   }
 

diff --git a/css-squid/src/main/java/org/sonar/css/CssCheck.java b/css-squid/src/main/java/org/sonar/css/CssCheck.java
@@ -21,7 +21,6 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.sonar.sslr.api.AstNode;
-import com.sonar.sslr.api.Trivia;
 
 import java.util.Set;
 

diff --git a/css-squid/src/main/java/org/sonar/css/model/atrule/StandardAtRuleFactory.java b/css-squid/src/main/java/org/sonar/css/model/atrule/StandardAtRuleFactory.java
@@ -25,6 +25,9 @@
 
 public class StandardAtRuleFactory {
 
+  private StandardAtRuleFactory() {
+  }
+
   public static StandardAtRule createStandardAtRule(String atRuleName) {
     try {
       String className = getClassNameFromAtRuleName(atRuleName);

diff --git a/css-squid/src/main/java/org/sonar/css/model/function/StandardFunctionFactory.java b/css-squid/src/main/java/org/sonar/css/model/function/StandardFunctionFactory.java
@@ -25,6 +25,9 @@
 
 public class StandardFunctionFactory {
 
+  private StandardFunctionFactory() {
+  }
+
   public static StandardFunction createStandardFunction(String functionName) {
     try {
       String className = getClassNameFromFunctionName(functionName);

diff --git a/css-squid/src/main/java/org/sonar/css/model/property/StandardPropertyFactory.java b/css-squid/src/main/java/org/sonar/css/model/property/StandardPropertyFactory.java
@@ -25,6 +25,9 @@
 
 public class StandardPropertyFactory {
 
+  private StandardPropertyFactory() {
+  }
+
   public static StandardProperty createStandardProperty(String propertyName) {
     try {
       String className = getClassNameFromPropertyName(propertyName);

diff --git a/css-squid/src/main/java/org/sonar/css/model/value/CssValueElement.java b/css-squid/src/main/java/org/sonar/css/model/value/CssValueElement.java
@@ -19,6 +19,6 @@
  */
 package org.sonar.css.model.value;
 
-public abstract class CssValueElement {
+public interface CssValueElement {
 
 }
diff --git a/css-squid/src/main/java/org/sonar/css/model/value/valueelement/DelimiterValueElement.java b/css-squid/src/main/java/org/sonar/css/model/value/valueelement/DelimiterValueElement.java
@@ -22,7 +22,7 @@
 import com.sonar.sslr.api.AstNode;
 import org.sonar.css.model.value.CssValueElement;
 
-public class DelimiterValueElement extends CssValueElement {
+public class DelimiterValueElement implements CssValueElement {
 
   private final String type;
 

diff --git a/css-squid/src/main/java/org/sonar/css/model/value/valueelement/DimensionValueElement.java b/css-squid/src/main/java/org/sonar/css/model/value/valueelement/DimensionValueElement.java
@@ -24,7 +24,7 @@
 import org.sonar.css.model.value.CssValueElement;
 import org.sonar.css.parser.CssGrammar;
 
-public class DimensionValueElement extends CssValueElement {
+public class DimensionValueElement implements CssValueElement {
 
   private final double value;
   private final String unit;

diff --git a/css-squid/src/main/java/org/sonar/css/model/value/valueelement/FunctionValueElement.java b/css-squid/src/main/java/org/sonar/css/model/value/valueelement/FunctionValueElement.java
@@ -23,7 +23,7 @@
 import org.sonar.css.model.Function;
 import org.sonar.css.model.value.CssValueElement;
 
-public class FunctionValueElement extends CssValueElement {
+public class FunctionValueElement implements CssValueElement {
 
   private Function function;
 

diff --git a/css-squid/src/main/java/org/sonar/css/model/value/valueelement/HashValueElement.java b/css-squid/src/main/java/org/sonar/css/model/value/valueelement/HashValueElement.java
@@ -23,7 +23,7 @@
 import com.sonar.sslr.api.GenericTokenType;
 import org.sonar.css.model.value.CssValueElement;
 
-public class HashValueElement extends CssValueElement {
+public class HashValueElement implements CssValueElement {
 
   private final String value;
 

diff --git a/css-squid/src/main/java/org/sonar/css/model/value/valueelement/IdentifierValueElement.java b/css-squid/src/main/java/org/sonar/css/model/value/valueelement/IdentifierValueElement.java
@@ -22,7 +22,7 @@
 import com.sonar.sslr.api.AstNode;
 import org.sonar.css.model.value.CssValueElement;
 
-public class IdentifierValueElement extends CssValueElement {
+public class IdentifierValueElement implements CssValueElement {
 
   private final String name;
 

diff --git a/css-squid/src/main/java/org/sonar/css/model/value/valueelement/NotSupportedValueElement.java b/css-squid/src/main/java/org/sonar/css/model/value/valueelement/NotSupportedValueElement.java
@@ -22,7 +22,7 @@
 import com.sonar.sslr.api.AstNode;
 import org.sonar.css.model.value.CssValueElement;
 
-public class NotSupportedValueElement extends CssValueElement {
+public class NotSupportedValueElement implements CssValueElement {
 
   public NotSupportedValueElement(AstNode notSupportedNode) {
   }

diff --git a/css-squid/src/main/java/org/sonar/css/model/value/valueelement/NumberValueElement.java b/css-squid/src/main/java/org/sonar/css/model/value/valueelement/NumberValueElement.java
@@ -22,7 +22,7 @@
 import com.sonar.sslr.api.AstNode;
 import org.sonar.css.model.value.CssValueElement;
 
-public class NumberValueElement extends CssValueElement {
+public class NumberValueElement implements CssValueElement {
 
   private final Double value;
   private final long integerValue;

diff --git a/css-squid/src/main/java/org/sonar/css/model/value/valueelement/PercentageValueElement.java b/css-squid/src/main/java/org/sonar/css/model/value/valueelement/PercentageValueElement.java
@@ -23,7 +23,7 @@
 import com.sonar.sslr.api.GenericTokenType;
 import org.sonar.css.model.value.CssValueElement;
 
-public class PercentageValueElement extends CssValueElement {
+public class PercentageValueElement implements CssValueElement {
 
   private final double value;
   private final boolean isZero;

diff --git a/css-squid/src/main/java/org/sonar/css/model/value/valueelement/StringValueElement.java b/css-squid/src/main/java/org/sonar/css/model/value/valueelement/StringValueElement.java
@@ -22,7 +22,7 @@
 import com.sonar.sslr.api.AstNode;
 import org.sonar.css.model.value.CssValueElement;
 
-public class StringValueElement extends CssValueElement {
+public class StringValueElement implements CssValueElement {
 
   public StringValueElement(AstNode stringNode) {
   }

diff --git a/css-squid/src/main/java/org/sonar/css/model/value/valueelement/UriValueElement.java b/css-squid/src/main/java/org/sonar/css/model/value/valueelement/UriValueElement.java
@@ -22,7 +22,7 @@
 import com.sonar.sslr.api.AstNode;
 import org.sonar.css.model.value.CssValueElement;
 
-public class UriValueElement extends CssValueElement {
+public class UriValueElement implements CssValueElement {
 
   public UriValueElement(AstNode numberNode) {
   }