Fix Quality flaws

including removal of unused methods in QProfileFactory

diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java
index 4b0e60b2d69d5547f36e8a4755c8983d0606abde..7f334a68d3cbaa84e57625be9ac015a078274c54 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java
@@ -215,15 +215,6 @@ public class QProfileFactory {
     return db.qualityProfileDao().selectByProjectAndLanguages(session, projectKey, languageKeys);
   }
 
-  QualityProfileDto getByNameAndLanguage(String name, String language) {
-    DbSession dbSession = db.openSession(false);
-    try {
-      return getByNameAndLanguage(dbSession, name, language);
-    } finally {
-      dbSession.close();
-    }
-  }
-
   @CheckForNull
   public QualityProfileDto getByNameAndLanguage(DbSession session, String name, String language) {
     return db.qualityProfileDao().selectByNameAndLanguage(name, language, session);

diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRef.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRef.java
index 9dca9c59dd745a822f5441032b513c8aef4b274d..3aaa54725e201d379aa174ce8734aca4fab359fb 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRef.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRef.java
@@ -98,13 +98,13 @@ public class QProfileRef {
       return false;
     }
     QProfileRef that = (QProfileRef) o;
-    if (key != null ? !key.equals(that.key) : that.key != null) {
+    if (key != null ? !key.equals(that.key) : (that.key != null)) {
       return false;
     }
-    if (language != null ? !language.equals(that.language) : that.language != null) {
+    if (language != null ? !language.equals(that.language) : (that.language != null)) {
       return false;
     }
-    return name != null ? name.equals(that.name) : that.name == null;
+    return name != null ? name.equals(that.name) : (that.name == null);
 
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogLoader.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogLoader.java
index cf123a8e861d2b20b6b8410549a5fd2520509320..bbf6b794f6fb75de7adf9eb2c013474e31c93019 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogLoader.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogLoader.java
@@ -99,7 +99,8 @@ public class ChangelogLoader {
     }
 
     @VisibleForTesting
-    Change(String key, String type, long at, @Nullable String severity, @Nullable String userLogin, @Nullable String userName, @Nullable String inheritance, @Nullable RuleKey ruleKey, @Nullable String ruleName) {
+    Change(String key, String type, long at, @Nullable String severity, @Nullable String userLogin,
+           @Nullable String userName, @Nullable String inheritance, @Nullable RuleKey ruleKey, @Nullable String ruleName) {
       this.key = key;
       this.type = type;
       this.at = at;

diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryMediumTest.java
index 836f995a6f90340493efb6061de0c6102730f980..52d0fe686113fc3b4d48906fdb3aa29decd40570 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryMediumTest.java
@@ -27,12 +27,9 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.sonar.api.server.rule.RuleParamType;
-import org.sonar.core.permission.GlobalPermissions;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.RowNotFoundException;
-import org.sonar.db.component.ComponentDto;
-import org.sonar.db.component.ComponentTesting;
 import org.sonar.db.qualityprofile.QualityProfileDto;
 import org.sonar.db.rule.RuleDto;
 import org.sonar.db.rule.RuleParamDto;
@@ -44,7 +41,6 @@ import org.sonar.server.qualityprofile.index.ActiveRuleIndexer;
 import org.sonar.server.rule.index.RuleIndex;
 import org.sonar.server.rule.index.RuleIndexer;
 import org.sonar.server.rule.index.RuleQuery;
-import org.sonar.server.tester.MockUserSession;
 import org.sonar.server.tester.ServerTester;
 import org.sonar.server.tester.UserSessionRule;
 
@@ -330,38 +326,6 @@ public class QProfileFactoryMediumTest {
     factory.setDefault(XOO_P1_KEY);
   }
 
-  @Test
-  public void get_profile_by_project_and_language() {
-    ComponentDto project = ComponentTesting.newProjectDto("ABCD")
-      .setId(1L)
-      .setKey("org.codehaus.sonar:sonar");
-    db.componentDao().insert(dbSession, project);
-
-    QualityProfileDto profileDto = QProfileTesting.newXooP1();
-    db.qualityProfileDao().insert(dbSession, profileDto);
-    dbSession.commit();
-    dbSession.clearCache();
-    assertThat(factory.getByProjectAndLanguage("org.codehaus.sonar:sonar", "xoo")).isNull();
-
-    tester.get(QProfileProjectOperations.class).addProject(profileDto.getKey(), project.uuid(),
-      new MockUserSession("me").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN), dbSession);
-    dbSession.commit();
-    dbSession.clearCache();
-    assertThat(factory.getByProjectAndLanguage("org.codehaus.sonar:sonar", "xoo").getKey()).isEqualTo(XOO_P1_KEY);
-  }
-
-  @Test
-  public void get_profile_by_name_and_language() {
-    QualityProfileDto profileDto = QProfileTesting.newQProfileDto(new QProfileName("xoo", "SonarQube way"), "abcd");
-    db.qualityProfileDao().insert(dbSession, profileDto);
-    dbSession.commit();
-    dbSession.clearCache();
-
-    assertThat(factory.getByNameAndLanguage("SonarQube way", "xoo").getKey()).isEqualTo("abcd");
-    assertThat(factory.getByNameAndLanguage("SonarQube way", "java")).isNull();
-    assertThat(factory.getByNameAndLanguage("Unfound", "xoo")).isNull();
-  }
-
   private void initRules() {
     // create pre-defined rules
     RuleDto xooRule1 = RuleTesting.newXooX1();