Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-15 09:46:16 +01:00
Code Issues Packages Projects Releases Activity

Remove code duplication

Browse Source
This commit is contained in:
René Pfeuffer
2018-10-26 15:15:51 +02:00
parent f6fe299bb1
commit 4a307379a2
5 changed files with 21 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scm-core/src/main/java/sonia/scm/AlreadyExistsException.java
View File

@@ -3,15 +3,12 @@ package sonia.scm;
import java.util.List; import java.util.List;
import static java.util.Collections.singletonList; import static java.util.Collections.singletonList;
import static java.util.Collections.unmodifiableList;
import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.joining;
public class AlreadyExistsException extends RuntimeException implements ExceptionWithContext { public class AlreadyExistsException extends ExceptionWithContext {
private static final String CODE = "FtR7UznKU1"; private static final String CODE = "FtR7UznKU1";
private final List<ContextEntry> context;
public AlreadyExistsException(ModelObject object) { public AlreadyExistsException(ModelObject object) {
this(singletonList(new ContextEntry(object.getClass(), object.getId()))); this(singletonList(new ContextEntry(object.getClass(), object.getId())));
} }
@@ -21,12 +18,7 @@ public class AlreadyExistsException extends RuntimeException implements Exceptio
} }
private AlreadyExistsException(List<ContextEntry> context) { private AlreadyExistsException(List<ContextEntry> context) {
super(createMessage(context)); super(context, createMessage(context));
this.context = context;
}
public List<ContextEntry> getContext() {
return unmodifiableList(context);
} }
@Override @Override

12
scm-core/src/main/java/sonia/scm/ConcurrentModificationException.java
View File

@@ -3,15 +3,12 @@ package sonia.scm;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import static java.util.Collections.unmodifiableList;
import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.joining;
public class ConcurrentModificationException extends RuntimeException implements ExceptionWithContext { public class ConcurrentModificationException extends ExceptionWithContext {
private static final String CODE = "2wR7UzpPG1"; private static final String CODE = "2wR7UzpPG1";
private final List<ContextEntry> context;
public ConcurrentModificationException(Class type, String id) { public ConcurrentModificationException(Class type, String id) {
this(Collections.singletonList(new ContextEntry(type, id))); this(Collections.singletonList(new ContextEntry(type, id)));
} }
@@ -21,12 +18,7 @@ public class ConcurrentModificationException extends RuntimeException implements
} }
private ConcurrentModificationException(List<ContextEntry> context) { private ConcurrentModificationException(List<ContextEntry> context) {
super(createMessage(context)); super(context, createMessage(context));
this.context = context;
}
public List<ContextEntry> getContext() {
return unmodifiableList(context);
} }
@Override @Override

18
scm-core/src/main/java/sonia/scm/ExceptionWithContext.java
View File

@@ -2,10 +2,20 @@ package sonia.scm;
import java.util.List; import java.util.List;
public interface ExceptionWithContext { import static java.util.Collections.unmodifiableList;
List<ContextEntry> getContext();
String getMessage(); public abstract class ExceptionWithContext extends RuntimeException {
String getCode(); private final List<ContextEntry> context;
public ExceptionWithContext(List<ContextEntry> context, String message) {
super(message);
this.context = context;
}
public List<ContextEntry> getContext() {
return unmodifiableList(context);
}
public abstract String getCode();
} }

16
scm-core/src/main/java/sonia/scm/NotFoundException.java
View File

@@ -1,21 +1,14 @@
package sonia.scm; package sonia.scm;
import sonia.scm.repository.NamespaceAndName;
import sonia.scm.repository.Repository;
import java.util.Collections; import java.util.Collections;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import static java.util.Collections.unmodifiableList;
import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.joining;
public class NotFoundException extends RuntimeException implements ExceptionWithContext { public class NotFoundException extends ExceptionWithContext {
private static final String CODE = "AGR7UzkhA1"; private static final String CODE = "AGR7UzkhA1";
private final List<ContextEntry> context;
public NotFoundException(Class type, String id) { public NotFoundException(Class type, String id) {
this(Collections.singletonList(new ContextEntry(type, id))); this(Collections.singletonList(new ContextEntry(type, id)));
} }
@@ -29,12 +22,7 @@ public class NotFoundException extends RuntimeException implements ExceptionWith
} }
private NotFoundException(List<ContextEntry> context) { private NotFoundException(List<ContextEntry> context) {
super(createMessage(context)); super(context, createMessage(context));
this.context = context;
}
public List<ContextEntry> getContext() {
return unmodifiableList(context);
} }
@Override @Override

3
scm-webapp/src/main/java/sonia/scm/api/rest/ContextualExceptionMapper.java
View File

@@ -1,6 +1,5 @@
package sonia.scm.api.rest; package sonia.scm.api.rest;
import com.google.inject.Inject;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import sonia.scm.ExceptionWithContext; import sonia.scm.ExceptionWithContext;
@@ -10,7 +9,7 @@ import sonia.scm.web.VndMediaType;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.ExceptionMapper;
public class ContextualExceptionMapper<E extends Throwable & ExceptionWithContext> implements ExceptionMapper<E> { public class ContextualExceptionMapper<E extends ExceptionWithContext> implements ExceptionMapper<E> {
private static final Logger logger = LoggerFactory.getLogger(ContextualExceptionMapper.class); private static final Logger logger = LoggerFactory.getLogger(ContextualExceptionMapper.class);