From 8d797a454a22b308aab3483ede20fa2e54deb294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 10 Nov 2020 08:29:19 +0100 Subject: [PATCH] Fix typings --- .../java/sonia/scm/ConcurrentModificationException.java | 6 +++--- scm-core/src/main/java/sonia/scm/ContextEntry.java | 9 +++++---- scm-core/src/main/java/sonia/scm/NotFoundException.java | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/scm-core/src/main/java/sonia/scm/ConcurrentModificationException.java b/scm-core/src/main/java/sonia/scm/ConcurrentModificationException.java index 694120dc2b..93c84e01cc 100644 --- a/scm-core/src/main/java/sonia/scm/ConcurrentModificationException.java +++ b/scm-core/src/main/java/sonia/scm/ConcurrentModificationException.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + package sonia.scm; import java.util.Collections; @@ -33,7 +33,7 @@ public class ConcurrentModificationException extends ExceptionWithContext { private static final String CODE = "2wR7UzpPG1"; - public ConcurrentModificationException(Class type, String id) { + public ConcurrentModificationException(Class type, String id) { this(Collections.singletonList(new ContextEntry(type, id))); } @@ -56,4 +56,4 @@ public class ConcurrentModificationException extends ExceptionWithContext { .collect(joining(" in ", "", " has been modified concurrently")); } } - + diff --git a/scm-core/src/main/java/sonia/scm/ContextEntry.java b/scm-core/src/main/java/sonia/scm/ContextEntry.java index d398e54609..15217e3173 100644 --- a/scm-core/src/main/java/sonia/scm/ContextEntry.java +++ b/scm-core/src/main/java/sonia/scm/ContextEntry.java @@ -21,22 +21,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + package sonia.scm; import sonia.scm.repository.NamespaceAndName; import sonia.scm.repository.Repository; import sonia.scm.util.AssertUtil; +import java.io.Serializable; import java.util.Collections; import java.util.LinkedList; import java.util.List; -public class ContextEntry { +public class ContextEntry implements Serializable { private final String type; private final String id; - ContextEntry(Class type, String id) { + ContextEntry(Class type, String id) { this(type.getSimpleName(), id); } @@ -91,7 +92,7 @@ public class ContextEntry { return this.in(Repository.class, namespaceAndName.logString()); } - public ContextBuilder in(Class type, String id) { + public ContextBuilder in(Class type, String id) { context.add(new ContextEntry(type, id)); return this; } diff --git a/scm-core/src/main/java/sonia/scm/NotFoundException.java b/scm-core/src/main/java/sonia/scm/NotFoundException.java index 2ca74fc60c..0c0a06926c 100644 --- a/scm-core/src/main/java/sonia/scm/NotFoundException.java +++ b/scm-core/src/main/java/sonia/scm/NotFoundException.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + package sonia.scm; import java.util.Collections; @@ -35,7 +35,7 @@ public class NotFoundException extends ExceptionWithContext { private static final String CODE = "AGR7UzkhA1"; - public NotFoundException(Class type, String id) { + public NotFoundException(Class type, String id) { this(Collections.singletonList(new ContextEntry(type, id))); }