From b961a82e1536ed2d967dad72f235a56ec56908fb Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Thu, 6 Sep 2018 10:41:49 +0200
Subject: [PATCH] Minor refactoring

---
 .../sonia/scm/it/RepositoryAccessITCase.java  | 35 +++++++++----------
 .../api/v2/resources/TagRootResourceTest.java |  4 +--
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/scm-it/src/test/java/sonia/scm/it/RepositoryAccessITCase.java b/scm-it/src/test/java/sonia/scm/it/RepositoryAccessITCase.java
index 0211647321..59fc70b9af 100644
--- a/scm-it/src/test/java/sonia/scm/it/RepositoryAccessITCase.java
+++ b/scm-it/src/test/java/sonia/scm/it/RepositoryAccessITCase.java
@@ -109,8 +109,7 @@ public class RepositoryAccessITCase {
     assertThat(response.body()).isNotNull();
     assertThat(response.body().asString())
       .isNotNull()
-      .isNotBlank()
-    ;
+      .isNotBlank();
 
     RepositoryUtil.addTag(repositoryClient, changeset.getId(), tagName);
     response = given(VndMediaType.TAG_COLLECTION, ADMIN_USERNAME, ADMIN_PASSWORD)
@@ -118,48 +117,46 @@ public class RepositoryAccessITCase {
       .get(tagsUrl)
       .then()
       .statusCode(HttpStatus.SC_OK)
-      .extract()
-    ;
+      .extract();
 
     assertThat(response).isNotNull();
     assertThat(response.body()).isNotNull();
     assertThat(response.body().asString())
       .isNotNull()
-      .isNotBlank()
-    ;
+      .isNotBlank();
+
     assertThat(response.body().jsonPath().getString("_links.self.href"))
       .as("assert tags self link")
       .isNotNull()
-      .contains(repositoryUrl + "/tags/")
-    ;
+      .contains(repositoryUrl + "/tags/");
+
     assertThat(response.body().jsonPath().getList("_embedded.tags"))
       .as("assert tag size")
       .isNotNull()
       .size()
-      .isGreaterThan(0)
-    ;
+      .isGreaterThan(0);
+
     assertThat(response.body().jsonPath().getMap("_embedded.tags.find{it.name=='" + tagName + "'}"))
       .as("assert tag name and revision")
       .isNotNull()
       .hasSize(3)
       .containsEntry("name", tagName)
-      .containsEntry("revision", changeset.getId())
-    ;
+      .containsEntry("revision", changeset.getId());
+
     assertThat(response.body().jsonPath().getString("_embedded.tags.find{it.name=='" + tagName + "'}._links.self.href"))
       .as("assert single tag self link")
       .isNotNull()
-      .contains(String.format("%s/tags/%s", repositoryUrl, tagName))
-    ;
+      .contains(String.format("%s/tags/%s", repositoryUrl, tagName));
+
     assertThat(response.body().jsonPath().getString("_embedded.tags.find{it.name=='" + tagName + "'}._links.sources.href"))
       .as("assert single tag source link")
       .isNotNull()
-      .contains(String.format("%s/sources/%s", repositoryUrl, changeset.getId()))
-    ;
+      .contains(String.format("%s/sources/%s", repositoryUrl, changeset.getId()));
+
     assertThat(response.body().jsonPath().getString("_embedded.tags.find{it.name=='" + tagName + "'}._links.changesets.href"))
       .as("assert single tag changesets link")
       .isNotNull()
-      .contains(String.format("%s/changesets/%s", repositoryUrl, changeset.getId()))
-    ;
+      .contains(String.format("%s/changesets/%s", repositoryUrl, changeset.getId()));
   }
 
   @Test
@@ -200,6 +197,7 @@ public class RepositoryAccessITCase {
       .statusCode(HttpStatus.SC_OK)
       .extract()
       .path("files.find{it.name=='subfolder'}._links.self.href");
+
     String subfolderContentUrl= given()
       .when()
       .get(subfolderSourceUrl)
@@ -207,6 +205,7 @@ public class RepositoryAccessITCase {
       .statusCode(HttpStatus.SC_OK)
       .extract()
       .path("files[0]._links.self.href");
+
     given()
       .when()
       .get(subfolderContentUrl)
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTest.java
index 029184e71f..92d11b3895 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTest.java
@@ -121,9 +121,7 @@ public class TagRootResourceTest {
     assertThat(response).isNotNull();
     assertThat(response.getContentAsString())
       .isNotBlank()
-      .contains("_links")
-    ;
-
+      .contains("_links");
   }
 
   @Test