fix violations

diff --git a/plugins/sonar-pmd-plugin/src/main/java/org/sonar/plugins/pmd/xml/PmdRule.java b/plugins/sonar-pmd-plugin/src/main/java/org/sonar/plugins/pmd/xml/PmdRule.java
index 7cc292162ce31935908502e1abc5fbbd5a627951..0df8d6f1a2de53a2d6b0e2be0ff476ff7f2e1ec9 100644 (file)
--- a/plugins/sonar-pmd-plugin/src/main/java/org/sonar/plugins/pmd/xml/PmdRule.java
+++ b/plugins/sonar-pmd-plugin/src/main/java/org/sonar/plugins/pmd/xml/PmdRule.java
@@ -22,7 +22,7 @@ package org.sonar.plugins.pmd.xml;
 import java.util.ArrayList;
 import java.util.List;
 
-public class PmdRule implements Comparable<String> {
+public class PmdRule {
 
   private String ref;
 

diff --git a/sonar-core/src/main/java/org/sonar/jpa/session/CustomHibernateConnectionProvider.java b/sonar-core/src/main/java/org/sonar/jpa/session/CustomHibernateConnectionProvider.java
index 5f8490a385812a115dc18cfcaf3a97be43805465..e6e36cc1587d4aa60618f0d16f7171028a842213 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/jpa/session/CustomHibernateConnectionProvider.java
+++ b/sonar-core/src/main/java/org/sonar/jpa/session/CustomHibernateConnectionProvider.java
@@ -26,11 +26,15 @@ import java.util.Properties;
 
 public class CustomHibernateConnectionProvider extends InjectedDataSourceConnectionProvider {
 
-  static DataSource datasource;
-  
+  private static DataSource datasourceForConfig;
+
+  static void setDatasourceForConfig(DataSource ds) {
+    CustomHibernateConnectionProvider.datasourceForConfig = ds;
+  }
+
   @Override
   public void configure(Properties props) {
-    setDataSource(datasource);
+    setDataSource(datasourceForConfig);
     super.configure(props);
   }
 }

diff --git a/sonar-core/src/main/java/org/sonar/jpa/session/DefaultDatabaseConnector.java b/sonar-core/src/main/java/org/sonar/jpa/session/DefaultDatabaseConnector.java
index cf1e4b83210df211b4840b880a9bdcb8b5957c81..b1bed908691ef551d1a5167333bf58204b519da1 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/jpa/session/DefaultDatabaseConnector.java
+++ b/sonar-core/src/main/java/org/sonar/jpa/session/DefaultDatabaseConnector.java
@@ -54,7 +54,7 @@ public class DefaultDatabaseConnector extends AbstractDatabaseConnector {
 
   private void createDatasource() {
     try {
-      CustomHibernateConnectionProvider.datasource = database.getDataSource();
+      CustomHibernateConnectionProvider.setDatasourceForConfig(database.getDataSource());
     } catch (Exception e) {
       throw new SonarException("Fail to connect to database", e);
     }

diff --git a/sonar-graph/src/main/java/org/sonar/graph/FeedbackCycle.java b/sonar-graph/src/main/java/org/sonar/graph/FeedbackCycle.java
index a23cb74c9f0b3695c5b937fb1adc3943041bb5b6..5c202597db6e1afdf70e4cb97e64e49313111fad 100644 (file)
--- a/sonar-graph/src/main/java/org/sonar/graph/FeedbackCycle.java
+++ b/sonar-graph/src/main/java/org/sonar/graph/FeedbackCycle.java
@@ -29,6 +29,9 @@ import java.util.Set;
 import com.google.common.collect.HashMultiset;
 import com.google.common.collect.Multiset;
 
+/**
+ * Note: this class has a natural ordering that is inconsistent with equals
+ */
 public final class FeedbackCycle implements Iterable<FeedbackEdge>, Comparable<FeedbackCycle> {
 
   private List<FeedbackEdge> orderedFeedbackEdges;
@@ -89,7 +92,7 @@ public final class FeedbackCycle implements Iterable<FeedbackEdge>, Comparable<F
   }
 
   public int compareTo(FeedbackCycle feedbackCycle) {
-    if (getTotalOccurrencesOfEdgesInCycle() < feedbackCycle.getTotalOccurrencesOfEdgesInCycle()) {
+    if (getTotalOccurrencesOfEdgesInCycle() < feedbackCycle.getTotalOccurrencesOfEdgesInCycle()) {//NOSONAR this class has a natural ordering that is inconsistent with equals
       return -1;
     }
     if (getTotalOccurrencesOfEdgesInCycle() == feedbackCycle.getTotalOccurrencesOfEdgesInCycle()) {

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/RuleMeasure.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/RuleMeasure.java
index c3ca678e7e2b6cc6f6ac674007bd8fdf7c2c1952..99b9ebac7e93c8b02d65f1f8cf77e06e9f607ba9 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/RuleMeasure.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/RuleMeasure.java
@@ -76,7 +76,11 @@ public class RuleMeasure extends Measure {
 
   @Override
   public boolean equals(Object obj) {
-    if (!(obj.getClass().equals(RuleMeasure.class))) {
+    if (obj == null) {
+      return false;
+    }
+    if (!(obj.getClass().equals(RuleMeasure.class))) {//NOSONAR should be refactored but kept in the current state
+      // for the moment.
       return false;
     }
     if (this == obj) {