From 85f69fb67b69a5ca92ecf3d35684e66a88a5bd7d Mon Sep 17 00:00:00 2001
From: Johannes Schnatterer <johannes.schnatterer@cloudogu.com>
Date: Mon, 25 Jun 2018 18:32:00 +0200
Subject: [PATCH] More polishing during review

---
 .../src/test/java/sonia/scm/ManagerTest.java  | 93 +++++++++----------
 .../scm/api/v2/resources/CollectionDto.java   |  7 +-
 2 files changed, 46 insertions(+), 54 deletions(-)

diff --git a/scm-core/src/test/java/sonia/scm/ManagerTest.java b/scm-core/src/test/java/sonia/scm/ManagerTest.java
index 68f64b7212..749e579386 100644
--- a/scm-core/src/test/java/sonia/scm/ManagerTest.java
+++ b/scm-core/src/test/java/sonia/scm/ManagerTest.java
@@ -3,7 +3,6 @@ package sonia.scm;
 import org.junit.Test;
 import org.mockito.Mock;
 
-import java.io.IOException;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.stream.IntStream;
@@ -15,60 +14,11 @@ public class ManagerTest {
 
   private int givenItemCount = 0;
 
-  private Manager manager = new Manager() {
-    @Override
-    public void refresh(ModelObject object) throws IOException {
-
-    }
-
-    @Override
-    public ModelObject get(String id) {
-      return null;
-    }
-
-    @Override
-    public Collection getAll() {
-      return IntStream.range(0, givenItemCount).boxed().collect(toList());
-    }
-
-    @Override
-    public Collection getAll(Comparator comparator) {
-      return getAll();
-    }
-
-    @Override
-    public Collection getAll(int start, int limit) {
-      return null;
-    }
-
-    @Override
-    public Collection getAll(Comparator comparator, int start, int limit) {
-      return null;
-    }
-
-    @Override
-    public void create(TypedObject object) throws Exception, IOException {}
-
-    @Override
-    public void delete(TypedObject object) throws Exception, IOException {}
-
-    @Override
-    public void modify(TypedObject object) throws Exception, IOException {}
-
-    @Override
-    public void close() throws IOException {}
-
-    @Override
-    public void init(SCMContextProvider context) {}
-
-    @Override
-    public Long getLastModified() { return null; }
-  };
+  private Manager manager = new ManagerForTesting();
 
   @Mock
   private Comparator comparator;
 
-
   @Test(expected = IllegalArgumentException.class)
   public void validatesPageNumber() {
     manager.getPage(comparator, -1, 5);
@@ -114,4 +64,45 @@ public class ManagerTest {
     assertEquals(1, page2.getEntities().size());
     assertEquals(givenItemCount, page2.getOverallCount());
   }
+
+  private class ManagerForTesting implements Manager {
+
+    @Override
+    public void refresh(ModelObject object) {}
+
+    @Override
+    public ModelObject get(String id) { return null; }
+
+    @Override
+    public Collection getAll() {
+      return IntStream.range(0, givenItemCount).boxed().collect(toList());
+    }
+
+    @Override
+    public Collection getAll(Comparator comparator) { return getAll(); }
+
+    @Override
+    public Collection getAll(int start, int limit) { return null; }
+
+    @Override
+    public Collection getAll(Comparator comparator, int start, int limit) {  return null; }
+
+    @Override
+    public void create(TypedObject object) {}
+
+    @Override
+    public void delete(TypedObject object) {}
+
+    @Override
+    public void modify(TypedObject object) {}
+
+    @Override
+    public void close() {}
+
+    @Override
+    public void init(SCMContextProvider context) {}
+
+    @Override
+    public Long getLastModified() { return null; }
+  }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/CollectionDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/CollectionDto.java
index 80a1b7d455..8a030e5070 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/CollectionDto.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/CollectionDto.java
@@ -4,14 +4,15 @@ import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.HalRepresentation;
 import de.otto.edison.hal.Links;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
-@Data
-public class CollectionDto extends HalRepresentation {
+@Data @EqualsAndHashCode(callSuper = false)
+class CollectionDto extends HalRepresentation {
 
   private int page;
   private int pageTotal;
 
-  public CollectionDto(Links links, Embedded embedded) {
+  CollectionDto(Links links, Embedded embedded) {
     super(links, embedded);
   }
 }