Fix quality flaws

diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/HashAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/HashAction.java
index 8c644a1ff143907b27f4cf7ed722f072dd7219cb..49132fa654f22c45baba67ce587cd095505cf55f 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/HashAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/HashAction.java
@@ -66,7 +66,8 @@ public class HashAction implements SourcesWsAction {
 
   @Override
   public void handle(Request request, Response response) throws Exception {
-    try (DbSession session = dbClient.openSession(false)) {
+    DbSession session = dbClient.openSession(false);
+    try {
       final String componentKey = request.mandatoryParam("key");
       final ComponentDto component = componentFinder.getByKey(session, componentKey);
       userSession.checkProjectUuidPermission(UserRole.USER, component.projectUuid());
@@ -82,6 +83,8 @@ public class HashAction implements SourcesWsAction {
       } finally {
         writer.close();
       }
+    } finally {
+      session.close();
     }
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/RawAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/RawAction.java
index e907fc4af0345af8afb249c871c6e077f9db8ef2..b05c6e7d4eb7c0fa0b98e4ccd5e851106802fb86 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/RawAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/RawAction.java
@@ -69,13 +69,16 @@ public class RawAction implements SourcesWsAction {
   public void handle(Request request, Response response) {
     String fileKey = request.mandatoryParam("key");
     userSession.checkComponentPermission(UserRole.CODEVIEWER, fileKey);
-    try (DbSession session = dbClient.openSession(false)) {
+    DbSession session = dbClient.openSession(false);
+    try {
       ComponentDto componentDto = componentFinder.getByKey(session, fileKey);
       List<String> lines = sourceService.getLinesAsTxt(componentDto.uuid(), null, null);
       response.stream().setMediaType("text/plain");
       IOUtils.writeLines(lines, "\n", response.stream().output(), StandardCharsets.UTF_8);
     } catch (IOException e) {
       throw new IllegalStateException("Fail to write raw source of file " + fileKey, e);
+    } finally {
+      session.close();
     }
   }
 }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/exceptions/MessageTest.java b/server/sonar-server/src/test/java/org/sonar/server/exceptions/MessageTest.java
index ea17a0554ce465bdc41532fec81e614718588bc8..e10148f47ee38b60f9c905009b4c69fdb7294628 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/exceptions/MessageTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/exceptions/MessageTest.java
@@ -44,14 +44,22 @@ public class MessageTest {
   public void test_equals_and_hashcode() throws Exception {
     Message message1 = Message.of("key1", "param1");
     Message message2 = Message.of("key2", "param2");
+    Message message3 = Message.of("key1");
+    Message message4 = Message.of("key1", "param2");
     Message sameAsMessage1 = Message.of("key1", "param1");
 
     assertThat(message1).isEqualTo(message1);
     assertThat(message1).isNotEqualTo(message2);
+    assertThat(message1).isNotEqualTo(message3);
+    assertThat(message1).isNotEqualTo(message4);
     assertThat(message1).isEqualTo(sameAsMessage1);
+    assertThat(message1).isNotEqualTo(null);
+    assertThat(message1).isNotEqualTo(new Object());
 
     assertThat(message1.hashCode()).isEqualTo(message1.hashCode());
     assertThat(message1.hashCode()).isNotEqualTo(message2.hashCode());
+    assertThat(message1.hashCode()).isNotEqualTo(message3.hashCode());
+    assertThat(message1.hashCode()).isNotEqualTo(message4.hashCode());
     assertThat(message1.hashCode()).isEqualTo(sameAsMessage1.hashCode());
   }
 
@@ -59,5 +67,6 @@ public class MessageTest {
   public void to_string() {
     assertThat(Message.of("key1", "param1").toString()).isEqualTo("Message{key=key1, params=[param1]}");
     assertThat(Message.of("key1").toString()).isEqualTo("Message{key=key1, params=[]}");
+    assertThat(Message.of("key1", null).toString()).isEqualTo("Message{key=key1, params=null}");
   }
 }