Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-06-18 16:50:16 +02:00
Code Issues Packages Projects Releases Activity

Merge parallel development

Browse Source
This commit is contained in:
René Pfeuffer
2018-07-02 14:36:04 +02:00
parent 5b5c30f054 ffabda3f83
commit 54776548ea
17 changed files with 478 additions and 978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

377
scm-annotation-processor/src/main/java/sonia/scm/annotation/ScmAnnotationProcessor.java
View File

@@ -1,9 +1,9 @@
/**
* Copyright (c) 2010, Sebastian Sdorra All rights reserved.
*
* <p>
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* <p>
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. 2. Redistributions in
* binary form must reproduce the above copyright notice, this list of
@@ -11,7 +11,7 @@
* materials provided with the distribution. 3. Neither the name of SCM-Manager;
* nor the names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* <p>
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -22,13 +22,11 @@
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* <p>
* http://bitbucket.org/sdorra/scm-manager
*
*/
package sonia.scm.annotation;
//~--- non-JDK imports --------------------------------------------------------
@@ -107,84 +105,51 @@ import javax.xml.transform.stream.StreamResult;
*/
@SupportedAnnotationTypes("*")
@MetaInfServices(Processor.class)
@SuppressWarnings({ "Since16", "Since15" })
@SuppressWarnings({"Since16", "Since15"})
@SupportedSourceVersion(SourceVersion.RELEASE_8)
public final class ScmAnnotationProcessor extends AbstractProcessor
{
public final class ScmAnnotationProcessor extends AbstractProcessor {
/** Field description */
private static final String DESCRIPTOR_MODULE = "META-INF/scm/module.xml";
/** Field description */
private static final String DESCRIPTOR_PLUGIN = "META-INF/scm/plugin.xml";
/** Field description */
private static final String EL_MODULE = "module";
/** Field description */
private static final String EMPTY = "";
/** Field description */
private static final String PROPERTY_VALUE = "yes";
/** Field description */
private static final Set<String> SUBSCRIBE_ANNOTATIONS =
ImmutableSet.of(Subscribe.class.getName());
/** Field description */
private static final Set<ClassAnnotation> CLASS_ANNOTATIONS =
ImmutableSet.of(new ClassAnnotation("rest-resource", Path.class),
new ClassAnnotation("rest-provider", Provider.class));
//~--- methods --------------------------------------------------------------
/**
* Method description
*
*
* @param annotations
* @param roundEnv
*
* @return
*/
@Override
public boolean process(Set<? extends TypeElement> annotations,
RoundEnvironment roundEnv)
{
if (!roundEnv.processingOver())
{
RoundEnvironment roundEnv) {
if (!roundEnv.processingOver()) {
Set<DescriptorElement> descriptorElements = Sets.newHashSet();
Set<TypeElement> subscriberAnnotations = Sets.newHashSet();
for (TypeElement e : annotations)
{
for (TypeElement e : annotations) {
PluginAnnotation pa = e.getAnnotation(PluginAnnotation.class);
if (pa != null)
{
if (pa != null) {
scanForClassAnnotations(descriptorElements, roundEnv, e, pa.value());
}
if (SUBSCRIBE_ANNOTATIONS.contains(e.getQualifiedName().toString()))
{
if (SUBSCRIBE_ANNOTATIONS.contains(e.getQualifiedName().toString())) {
subscriberAnnotations.add(e);
}
}
for (ClassAnnotation ca : CLASS_ANNOTATIONS)
{
for (ClassAnnotation ca : CLASS_ANNOTATIONS) {
TypeElement annotation = findAnnotation(annotations,
ca.annotationClass);
ca.annotationClass);
if (annotation != null)
{
if (annotation != null) {
scanForClassAnnotations(descriptorElements, roundEnv, annotation,
ca.elementName);
}
}
for (TypeElement annotation : subscriberAnnotations)
{
for (TypeElement annotation : subscriberAnnotations) {
scanForSubscriberAnnotations(descriptorElements, roundEnv, annotation);
}
@@ -194,46 +159,25 @@ public final class ScmAnnotationProcessor extends AbstractProcessor
return false;
}
/**
* Method description
*
*
* @param closeable
*/
private void close(Closeable closeable)
{
if (closeable != null)
{
try
{
private void close(Closeable closeable) {
if (closeable != null) {
try {
closeable.close();
}
catch (IOException ex)
{
} catch (IOException ex) {
printException("could not close closeable", ex);
}
}
}
/**
* Method description
*
*
* @param annotations
* @param annotationClass
*
* @return
*/
private TypeElement findAnnotation(Set<? extends TypeElement> annotations,
Class<? extends Annotation> annotationClass)
{
Class<? extends Annotation> annotationClass) {
TypeElement annotation = null;
for (TypeElement te : annotations)
{
if (te.getQualifiedName().toString().equals(annotationClass.getName()))
{
annotation = te;
for (TypeElement typeElement : annotations) {
if (typeElement.getQualifiedName().toString().equals(annotationClass.getName())) {
annotation = typeElement;
break;
}
@@ -242,24 +186,13 @@ public final class ScmAnnotationProcessor extends AbstractProcessor
return annotation;
}
/**
* Method description
*
*
* @param filer
*
* @return
*
* @throws IOException
*/
private File findDescriptor(Filer filer) throws IOException
{
private File findDescriptor(Filer filer) throws IOException {
FileObject f = filer.getResource(StandardLocation.CLASS_OUTPUT, EMPTY,
DESCRIPTOR_PLUGIN);
DESCRIPTOR_PLUGIN);
File file = new File(f.toUri());
if (!file.exists())
{
if (!file.exists()) {
f = filer.getResource(StandardLocation.CLASS_OUTPUT, EMPTY,
DESCRIPTOR_MODULE);
file = new File(f.toUri());
@@ -268,68 +201,40 @@ public final class ScmAnnotationProcessor extends AbstractProcessor
return file;
}
/**
* Method description
*
*
* @param f
*
* @param file
*
* @return
*/
private Document parseDocument(File file)
{
private Document parseDocument(File file) {
Document doc = null;
InputStream input = null;
try
{
try {
DocumentBuilder builder =
DocumentBuilderFactory.newInstance().newDocumentBuilder();
if (file.exists())
{
if (file.exists()) {
input = new FileInputStream(file);
doc = builder.parse(input);
}
else
{
} else {
doc = builder.newDocument();
doc.appendChild(doc.createElement(EL_MODULE));
}
}
catch (ParserConfigurationException | SAXException | IOException
| DOMException ex)
{
} catch (ParserConfigurationException | SAXException | IOException
| DOMException ex) {
printException("could not parse document", ex);
}
finally
{
} finally {
close(input);
}
return doc;
}
/**
* Method description
*
*
* @param obj
*
* @return
*/
private String prepareArrayElement(Object obj)
{
private String prepareArrayElement(Object obj) {
String v = obj.toString();
if (v.startsWith("\""))
{
if (v.startsWith("\"")) {
v = v.substring(1);
if (v.endsWith(""))
{
if (v.endsWith("")) {
v = v.substring(0, v.length() - 1);
}
}
@@ -337,15 +242,8 @@ public final class ScmAnnotationProcessor extends AbstractProcessor
return v;
}
/**
* Method description
*
*
* @param msg
* @param throwable
*/
private void printException(String msg, Throwable throwable)
{
private void printException(String msg, Throwable throwable) {
processingEnv.getMessager().printMessage(Kind.ERROR, msg);
String stack = Throwables.getStackTraceAsString(throwable);
@@ -353,144 +251,98 @@ public final class ScmAnnotationProcessor extends AbstractProcessor
processingEnv.getMessager().printMessage(Kind.ERROR, stack);
}
/**
* Method description
*
*
* @param descriptorElements
* @param roundEnv
* @param annotation
* @param elementName
* @param elements
*
* @return
*/
private void scanForClassAnnotations(
Set<DescriptorElement> descriptorElements, RoundEnvironment roundEnv,
TypeElement annotation, String elementName)
{
TypeElement annotation, String elementName) {
Set<ClassWithAttributes> classes = Sets.newHashSet();
for (Element e : roundEnv.getElementsAnnotatedWith(annotation))
{
if (e.getKind().isClass() || e.getKind().isInterface())
{
for (Element e : roundEnv.getElementsAnnotatedWith(annotation)) {
if (isClassOrInterface(e)) {
TypeElement type = (TypeElement) e;
String desc = processingEnv.getElementUtils().getDocComment(type);
if (desc != null)
{
if (desc != null) {
desc = desc.trim();
}
//J-
classes.add(
new ClassWithAttributes(
type.getQualifiedName().toString(),
desc,
getAttributesFromAnnotation(e, annotation)
type.getQualifiedName().toString(), desc, getAttributesFromAnnotation(e, annotation)
)
);
//J+
}
}
descriptorElements.add(new ClassSetElement(elementName, classes));
}
/**
* Method description
*
*
* @param descriptorElements
* @param roundEnv
* @param annotation
*/
private boolean isClassOrInterface(Element e) {
return e.getKind().isClass() || e.getKind().isInterface();
}
private void scanForSubscriberAnnotations(
Set<DescriptorElement> descriptorElements, RoundEnvironment roundEnv,
TypeElement annotation)
{
for (Element el : roundEnv.getElementsAnnotatedWith(annotation))
{
if (el.getKind() == ElementKind.METHOD)
{
TypeElement annotation) {
for (Element el : roundEnv.getElementsAnnotatedWith(annotation)) {
if (el.getKind() == ElementKind.METHOD) {
ExecutableElement ee = (ExecutableElement) el;
List<? extends VariableElement> params = ee.getParameters();
if ((params != null) && (params.size() == 1))
{
if ((params != null) && (params.size() == 1)) {
VariableElement param = params.get(0);
Element clazz = el.getEnclosingElement();
String desc = processingEnv.getElementUtils().getDocComment(clazz);
if (desc != null)
{
if (desc != null) {
desc = desc.trim();
}
//J-
descriptorElements.add(
new SubscriberElement(
clazz.toString(),
clazz.toString(),
param.asType().toString(),
desc
)
);
//J+
}
}
}
}
/**
* Method description
*
*
* @param descriptorElements
*/
private void write(Set<DescriptorElement> descriptorElements)
{
private void write(Set<DescriptorElement> descriptorElements) {
Filer filer = processingEnv.getFiler();
try
{
try {
File file = findDescriptor(filer);
Document doc = parseDocument(file);
if (doc != null)
{
if (doc != null) {
org.w3c.dom.Element root = doc.getDocumentElement();
for (DescriptorElement el : descriptorElements)
{
for (DescriptorElement el : descriptorElements) {
el.append(doc, root);
}
writeDocument(doc, file);
}
}
catch (IOException ex)
{
} catch (IOException ex) {
printException("could not open plugin descriptor", ex);
}
}
/**
* Method description
*
*
* @param doc
* @param f
* @param file
*/
private void writeDocument(Document doc, File file)
{
private void writeDocument(Document doc, File file) {
Writer writer = null;
try
{
try {
file.getParentFile().mkdirs();
writer = new FileWriter(file);
@@ -499,42 +351,24 @@ public final class ScmAnnotationProcessor extends AbstractProcessor
transformer.setOutputProperty(OutputKeys.INDENT, PROPERTY_VALUE);
transformer.transform(new DOMSource(doc), new StreamResult(writer));
}
catch (IOException | IllegalArgumentException | TransformerException ex)
{
} catch (IOException | IllegalArgumentException | TransformerException ex) {
printException("could not write document", ex);
}
finally
{
} finally {
close(writer);
}
}
//~--- get methods ----------------------------------------------------------
/**
* Method description
*
*
* @param el
* @param annotation
*
* @return
*/
private Map<String, String> getAttributesFromAnnotation(Element el,
TypeElement annotation)
{
TypeElement annotation) {
Map<String, String> attributes = Maps.newHashMap();
for (AnnotationMirror am : el.getAnnotationMirrors())
{
String qn = am.getAnnotationType().asElement().toString();
for (AnnotationMirror annotationMirror : el.getAnnotationMirrors()) {
String qn = annotationMirror.getAnnotationType().asElement().toString();
if (qn.equals(annotation.toString()))
{
if (qn.equals(annotation.toString())) {
for (Entry<? extends ExecutableElement,
? extends AnnotationValue> entry : am.getElementValues().entrySet())
{
? extends AnnotationValue> entry : annotationMirror.getElementValues().entrySet()) {
attributes.put(entry.getKey().getSimpleName().toString(),
getValue(entry.getValue()));
}
@@ -544,77 +378,42 @@ public final class ScmAnnotationProcessor extends AbstractProcessor
return attributes;
}
/**
* Method description
*
*
* @param v
*
* @return
*/
private String getValue(AnnotationValue v)
{
private String getValue(AnnotationValue v) {
String value;
Object object = v.getValue();
if (object instanceof Iterable)
{
if (object instanceof Iterable) {
Iterator<?> it = ((Iterable<?>) object).iterator();
StringBuilder buffer = new StringBuilder();
while (it.hasNext())
{
while (it.hasNext()) {
buffer.append(prepareArrayElement(it.next()));
if (it.hasNext())
{
if (it.hasNext()) {
buffer.append(",");
}
}
value = buffer.toString();
}
else
{
} else {
value = object.toString();
}
return value;
}
//~--- inner classes --------------------------------------------------------
/**
* Class description
*
*
* @version Enter version here..., 14/03/18
* @author Enter your name here...
*/
private static final class ClassAnnotation
{
private static final class ClassAnnotation {
/**
* Constructs ...
*
*
* @param elementName
* @param annotationClass
*/
public ClassAnnotation(String elementName,
Class<? extends Annotation> annotationClass)
{
Class<? extends Annotation> annotationClass) {
this.elementName = elementName;
this.annotationClass = annotationClass;
}
//~--- fields -------------------------------------------------------------
/** Field description */
private final Class<? extends Annotation> annotationClass;
/** Field description */
private final String elementName;
}
}

2
scm-annotations/src/main/java/sonia/scm/plugin/ExtensionPoint.java
View File

@@ -33,8 +33,6 @@
package sonia.scm.plugin;
//~--- JDK imports ------------------------------------------------------------
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

8
scm-core/src/main/java/sonia/scm/repository/NamespaceStrategy.java Normal file
View File

@@ -0,0 +1,8 @@
package sonia.scm.repository;
import sonia.scm.plugin.ExtensionPoint;
@ExtensionPoint
public interface NamespaceStrategy {
String getNamespace();
}

717
scm-core/src/main/java/sonia/scm/repository/Repository.java
View File

@@ -33,28 +33,26 @@
package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import com.github.sdorra.ssp.PermissionObject;
import com.github.sdorra.ssp.StaticPermissions;
import com.google.common.base.Objects;
import com.google.common.collect.Lists;
import sonia.scm.BasicPropertiesAware;
import sonia.scm.ModelObject;
import sonia.scm.util.HttpUtil;
import sonia.scm.util.Util;
import sonia.scm.util.ValidationUtil;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
//~--- JDK imports ------------------------------------------------------------
/**
* Source code repository.
@@ -67,32 +65,43 @@ import java.util.List;
)
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "repositories")
public class Repository extends BasicPropertiesAware implements ModelObject, PermissionObject
{
public class Repository extends BasicPropertiesAware implements ModelObject, PermissionObject {
/** Field description */
private static final long serialVersionUID = 3486560714961909711L;
//~--- constructors ---------------------------------------------------------
private String contact;
private Long creationDate;
private String description;
@XmlElement(name = "healthCheckFailure")
@XmlElementWrapper(name = "healthCheckFailures")
private List<HealthCheckFailure> healthCheckFailures;
private String id;
private Long lastModified;
private String namespace;
private String name;
private List<Permission> permissions;
@XmlElement(name = "public")
private boolean publicReadable = false;
private boolean archived = false;
private String type;
/**
* Constructs a new {@link Repository}.
* This constructor is used by JAXB.
*
*/
public Repository() {}
public Repository() {
}
/**
* Constructs a new {@link Repository}.
*
*
*
* @param id id of the {@link Repository}
* @param id id of the {@link Repository}
* @param type type of the {@link Repository}
* @param name name of the {@link Repository}
*/
public Repository(String id, String type, String name)
{
public Repository(String id, String type, String name) {
this.id = id;
this.type = type;
this.name = name;
@@ -101,51 +110,231 @@ public class Repository extends BasicPropertiesAware implements ModelObject, Per
/**
* Constructs a new {@link Repository}.
*
*
*
* @param id id of the {@link Repository}
* @param type type of the {@link Repository}
* @param name name of the {@link Repository}
* @param contact email address of a person who is responsible for
* this repository.
* @param id id of the {@link Repository}
* @param type type of the {@link Repository}
* @param name name of the {@link Repository}
* @param namespace namespace of the {@link Repository}
* @param contact email address of a person who is responsible for
* this repository.
* @param description a short description of the repository
* @param permissions permissions for specific users and groups.
*/
public Repository(String id, String type, String name, String contact,
String description, Permission... permissions)
{
public Repository(String id, String type, String namespace, String name, String contact,
String description, Permission... permissions) {
this.id = id;
this.type = type;
this.namespace = namespace;
this.name = name;
this.contact = contact;
this.description = description;
this.permissions = Lists.newArrayList();
if (Util.isNotEmpty(permissions))
{
if (Util.isNotEmpty(permissions)) {
this.permissions.addAll(Arrays.asList(permissions));
}
}
//~--- methods --------------------------------------------------------------
/**
* Returns a contact email address of a person who is responsible for
* the {@link Repository}.
*
* @return contact email address
*/
public String getContact() {
return contact;
}
/**
* Create a clone of this {@link Repository} object.
* Returns a timestamp of the creation date of the {@link Repository}.
*
* @return a timestamp of the creation date of the {@link Repository}
*/
public Long getCreationDate() {
return creationDate;
}
/**
* Returns a short description of the {@link Repository}.
*
* @return clone of this {@link Repository}
* @return short description
*/
public String getDescription() {
return description;
}
/**
* Returns a {@link List} of {@link HealthCheckFailure}s. The {@link List}
* is empty if the repository is healthy.
*
* @return {@link List} of {@link HealthCheckFailure}s
* @since 1.36
*/
@SuppressWarnings("unchecked")
public List<HealthCheckFailure> getHealthCheckFailures() {
if (healthCheckFailures == null) {
healthCheckFailures = Collections.EMPTY_LIST;
}
return healthCheckFailures;
}
/**
* Returns the unique id of the {@link Repository}.
*
* @return unique id
*/
@Override
public Repository clone()
{
public String getId() {
return id;
}
/**
* Returns the timestamp of the last modified date of the {@link Repository}.
*
* @return timestamp of the last modified date
*/
@Override
public Long getLastModified() {
return lastModified;
}
/**
* Returns the name of the {@link Repository}.
*
* @return name of the {@link Repository}
*/
public String getName() {
return name;
}
/**
* Returns the access permissions of the {@link Repository}.
*
* @return access permissions
*/
public List<Permission> getPermissions() {
if (permissions == null) {
permissions = Lists.newArrayList();
}
return permissions;
}
/**
* Returns the type (hg, git, svn ...) of the {@link Repository}.
*
* @return type of the repository
*/
@Override
public String getType() {
return type;
}
/**
* Returns true if the repository is archived.
*
* @return true if the repository is archived
* @since 1.14
*/
public boolean isArchived() {
return archived;
}
/**
* Returns {@code true} if the repository is healthy.
*
* @return {@code true} if the repository is healthy
* @since 1.36
*/
public boolean isHealthy() {
return Util.isEmpty(healthCheckFailures);
}
/**
* Returns true if the {@link Repository} is public readable.
*
* @return true if the {@link Repository} is public readable
*/
public boolean isPublicReadable() {
return publicReadable;
}
/**
* Returns true if the {@link Repository} is valid.
* <ul>
* <li>The name is not empty and contains only A-z, 0-9, _, -, /</li>
* <li>The type is not empty</li>
* <li>The contact is empty or contains a valid email address</li>
* </ul>
*
* @return true if the {@link Repository} is valid
*/
@Override
public boolean isValid() {
return ValidationUtil.isRepositoryNameValid(name) && Util.isNotEmpty(type)
&& ((Util.isEmpty(contact))
|| ValidationUtil.isMailAddressValid(contact));
}
/**
* Archive or un archive this repository.
*
* @param archived true to enable archive
* @since 1.14
*/
public void setArchived(boolean archived) {
this.archived = archived;
}
public void setContact(String contact) {
this.contact = contact;
}
public void setCreationDate(Long creationDate) {
this.creationDate = creationDate;
}
public void setDescription(String description) {
this.description = description;
}
public void setId(String id) {
this.id = id;
}
public void setLastModified(Long lastModified) {
this.lastModified = lastModified;
}
public void setNamespace(String namespace) { this.namespace = namespace; }
public void setName(String name) {
this.name = name;
}
public void setPermissions(List<Permission> permissions) {
this.permissions = permissions;
}
public void setPublicReadable(boolean publicReadable) {
this.publicReadable = publicReadable;
}
public void setType(String type) {
this.type = type;
}
public void setHealthCheckFailures(List<HealthCheckFailure> healthCheckFailures) {
this.healthCheckFailures = healthCheckFailures;
}
@Override
public Repository clone() {
Repository repository = null;
try
{
try {
repository = (Repository) super.clone();
}
catch (CloneNotSupportedException ex)
{
} catch (CloneNotSupportedException ex) {
throw new RuntimeException(ex);
}
@@ -155,11 +344,10 @@ public class Repository extends BasicPropertiesAware implements ModelObject, Per
/**
* Copies all properties of the {@link Repository} to the given one.
*
*
* @param repository to copies all properties of this one
* @param repository the target {@link Repository}
*/
public void copyProperties(Repository repository)
{
public void copyProperties(Repository repository) {
repository.setNamespace(namespace);
repository.setName(name);
repository.setContact(contact);
repository.setCreationDate(creationDate);
@@ -175,14 +363,11 @@ public class Repository extends BasicPropertiesAware implements ModelObject, Per
/**
* Creates the url of the repository.
*
*
* @param baseUrl base url of the server including the context path
*
* @return url of the repository
* @since 1.17
*/
public String createUrl(String baseUrl)
{
public String createUrl(String baseUrl) {
String url = HttpUtil.append(baseUrl, type);
return HttpUtil.append(url, name);
@@ -191,429 +376,59 @@ public class Repository extends BasicPropertiesAware implements ModelObject, Per
/**
* Returns true if the {@link Repository} is the same as the obj argument.
*
*
* @param obj the reference object with which to compare
*
* @return true if the {@link Repository} is the same as the obj argument
*/
@Override
public boolean equals(Object obj)
{
if (obj == null)
{
public boolean equals(Object obj) {
if (obj == null) {
return false;
}
if (getClass() != obj.getClass())
{
if (getClass() != obj.getClass()) {
return false;
}
final Repository other = (Repository) obj;
//J-
return Objects.equal(id, other.id)
&& Objects.equal(name, other.name)
&& Objects.equal(contact, other.contact)
&& Objects.equal(description, other.description)
&& Objects.equal(publicReadable, other.publicReadable)
&& Objects.equal(archived, other.archived)
&& Objects.equal(permissions, other.permissions)
&& Objects.equal(type, other.type)
&& Objects.equal(creationDate, other.creationDate)
&& Objects.equal(lastModified, other.lastModified)
&& Objects.equal(properties, other.properties)
&& Objects.equal(healthCheckFailures, other.healthCheckFailures);
//J+
return Objects.equal(id, other.id)
&& Objects.equal(namespace, other.namespace)
&& Objects.equal(name, other.name)
&& Objects.equal(contact, other.contact)
&& Objects.equal(description, other.description)
&& Objects.equal(publicReadable, other.publicReadable)
&& Objects.equal(archived, other.archived)
&& Objects.equal(permissions, other.permissions)
&& Objects.equal(type, other.type)
&& Objects.equal(creationDate, other.creationDate)
&& Objects.equal(lastModified, other.lastModified)
&& Objects.equal(properties, other.properties)
&& Objects.equal(healthCheckFailures, other.healthCheckFailures);
}
/**
* Returns the hash code value for the {@link Repository}.
*
*
* @return the hash code value for the {@link Repository}
*/
@Override
public int hashCode()
{
return Objects.hashCode(id, name, contact, description, publicReadable,
public int hashCode() {
return Objects.hashCode(id, namespace, name, contact, description, publicReadable,
archived, permissions, type, creationDate, lastModified, properties,
healthCheckFailures);
}
/**
* Returns a {@link String} that represents the {@link Repository}.
*
*
* @return {@link String} that represents the {@link Repository}
*/
@Override
public String toString()
{
//J-
public String toString() {
return Objects.toStringHelper(this)
.add("id", id)
.add("name", name)
.add("contact", contact)
.add("description", description)
.add("publicReadable", publicReadable)
.add("archived", archived)
.add("permissions", permissions)
.add("type", type)
.add("lastModified", lastModified)
.add("creationDate", creationDate)
.add("properties", properties)
.add("healthCheckFailures", healthCheckFailures)
.toString();
//J+
.add("id", id)
.add("namespace", namespace)
.add("name", name)
.add("contact", contact)
.add("description", description)
.add("publicReadable", publicReadable)
.add("archived", archived)
.add("permissions", permissions)
.add("type", type)
.add("lastModified", lastModified)
.add("creationDate", creationDate)
.add("properties", properties)
.add("healthCheckFailures", healthCheckFailures)
.toString();
}
//~--- get methods ----------------------------------------------------------
/**
* Returns a contact email address of a person who is responsible for
* the {@link Repository}.
*
*
* @return contact email address
*/
public String getContact()
{
return contact;
}
/**
* Returns a timestamp of the creation date of the {@link Repository}.
*
*
* @return a timestamp of the creation date of the {@link Repository}
*/
public Long getCreationDate()
{
return creationDate;
}
/**
* Returns a short description of the {@link Repository}.
*
*
* @return short description
*/
public String getDescription()
{
return description;
}
/**
* Returns a {@link List} of {@link HealthCheckFailure}s. The {@link List}
* is empty if the repository is healthy.
*
*
* @return {@link List} of {@link HealthCheckFailure}s
* @since 1.36
*/
@SuppressWarnings("unchecked")
public List<HealthCheckFailure> getHealthCheckFailures()
{
if (healthCheckFailures == null)
{
healthCheckFailures = Collections.EMPTY_LIST;
}
return healthCheckFailures;
}
/**
* Returns the unique id of the {@link Repository}.
*
*
* @return unique id
*/
@Override
public String getId()
{
return id;
}
/**
* Returns the timestamp of the last modified date of the {@link Repository}.
*
*
* @return timestamp of the last modified date
*/
@Override
public Long getLastModified()
{
return lastModified;
}
/**
* Returns the name of the {@link Repository}.
*
*
* @return name of the {@link Repository}
*/
public String getName()
{
return name;
}
/**
* Returns the access permissions of the {@link Repository}.
*
*
* @return access permissions
*/
public List<Permission> getPermissions()
{
if (permissions == null)
{
permissions = Lists.newArrayList();
}
return permissions;
}
/**
* Returns the type (hg, git, svn ...) of the {@link Repository}.
*
*
* @return type of the repository
*/
@Override
public String getType()
{
return type;
}
/**
* Returns true if the repository is archived.
*
*
* @return true if the repository is archived
* @since 1.14
*/
public boolean isArchived()
{
return archived;
}
/**
* Returns {@code true} if the repository is healthy.
*
*
* @return {@code true} if the repository is healthy
*
* @since 1.36
*/
public boolean isHealthy()
{
return Util.isEmpty(healthCheckFailures);
}
/**
* Returns true if the {@link Repository} is public readable.
*
*
* @return true if the {@link Repository} is public readable
*/
public boolean isPublicReadable()
{
return publicReadable;
}
/**
* Returns true if the {@link Repository} is valid.
* <ul>
* <li>The name is not empty and contains only A-z, 0-9, _, -, /</li>
* <li>The type is not empty</li>
* <li>The contact is empty or contains a valid email address</li>
* </ul>
*
*
* @return true if the {@link Repository} is valid
*/
@Override
public boolean isValid()
{
return ValidationUtil.isRepositoryNameValid(name) && Util.isNotEmpty(type)
&& ((Util.isEmpty(contact))
|| ValidationUtil.isMailAddressValid(contact));
}
public String getSpace() {
return space;
}
//~--- set methods ----------------------------------------------------------
/**
* Archive or un archive this repository.
*
*
* @param archived true to enable archive
* @since 1.14
*/
public void setArchived(boolean archived)
{
this.archived = archived;
}
/**
* Sets the contact of the {@link Repository}. The contact address should be
* a email address of a person who is responsible for the {@link Repository}.
*
*
* @param contact email address of a person who is responsible for
* the {@link Repository}
*/
public void setContact(String contact)
{
this.contact = contact;
}
/**
* Set the creation date of the {@link Repository}.
*
*
* @param creationDate creation date of the {@link Repository}
*/
public void setCreationDate(Long creationDate)
{
this.creationDate = creationDate;
}
/**
* Sets a short description of the {@link Repository}.
*
*
* @param description short description
*/
public void setDescription(String description)
{
this.description = description;
}
/**
* The unique id of the {@link Repository}.
*
*
* @param id unique id
*/
public void setId(String id)
{
this.id = id;
}
/**
* Set the last modified timestamp of the {@link Repository}.
*
*
* @param lastModified last modified timestamp
*/
public void setLastModified(Long lastModified)
{
this.lastModified = lastModified;
}
/**
* Set the name of the {@link Repository}.
*
*
* @param name name of the {@link Repository}
*/
public void setName(String name)
{
this.name = name;
}
/**
* Set the access permissions for the {@link Repository}.
*
*
* @param permissions list of access permissions
*/
public void setPermissions(List<Permission> permissions)
{
this.permissions = permissions;
}
/**
* Sets true if the {@link Repository} is public readable.
*
*
* @param publicReadable public readable
*/
public void setPublicReadable(boolean publicReadable)
{
this.publicReadable = publicReadable;
}
/**
* Sets the type (hg, svn, git ...) of the {@link Repository}.
*
*
* @param type type of the {@link Repository}
*/
public void setType(String type)
{
this.type = type;
}
/**
* Sets {@link HealthCheckFailure} for a unhealthy repository.
*
* @param healthCheckFailures list of {@link HealthCheckFailure}s
*
* @since 1.36
*/
public void setHealthCheckFailures(List<HealthCheckFailure> healthCheckFailures)
{
this.healthCheckFailures = healthCheckFailures;
}
public void setSpace(String space) {
this.space = space;
}
//~--- fields ---------------------------------------------------------------
/** Field description */
private String contact;
/** Field description */
private Long creationDate;
/** Field description */
private String description;
/**
* @since 1.36
*/
@XmlElement(name = "healthCheckFailure")
@XmlElementWrapper(name = "healthCheckFailures")
private List<HealthCheckFailure> healthCheckFailures;
/** Field description */
private String id;
/** Field description */
private Long lastModified;
/** Field description */
private String name;
/** Field description */
private List<Permission> permissions;
/** Field description */
@XmlElement(name = "public")
private boolean publicReadable = false;
/** Field description */
private boolean archived = false;
/** Field description */
private String type;
private String space;
}

8
scm-core/src/main/java/sonia/scm/repository/SpacesStrategy.java
View File

@@ -1,8 +0,0 @@
package sonia.scm.repository;
import sonia.scm.plugin.ExtensionPoint;
@ExtensionPoint(multi = true)
public interface SpacesStrategy {
String getCurrentSpace();
}

11
scm-core/src/main/java/sonia/scm/repository/StaticSpacesStrategy.java
View File

@@ -1,11 +0,0 @@
package sonia.scm.repository;
import sonia.scm.plugin.Extension;
@Extension
public class StaticSpacesStrategy implements SpacesStrategy {
@Override
public String getCurrentSpace() {
return "test";
}
}

2
scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java
View File

@@ -253,7 +253,7 @@ public final class RepositoryServiceFactory
for (RepositoryServiceResolver resolver : resolvers)
{
RepositoryServiceProvider provider = resolver.reslove(repository);
RepositoryServiceProvider provider = resolver.resolve(repository);
if (provider != null)
{

4
scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceResolver.java
View File

@@ -33,8 +33,6 @@
package sonia.scm.repository.spi;
//~--- non-JDK imports --------------------------------------------------------
import sonia.scm.plugin.ExtensionPoint;
import sonia.scm.repository.Repository;
@@ -55,5 +53,5 @@ public interface RepositoryServiceResolver
*
* @return
*/
public RepositoryServiceProvider reslove(Repository repository);
public RepositoryServiceProvider resolve(Repository repository);
}

2
scm-core/src/test/java/sonia/scm/repository/RepositoryTest.java
View File

@@ -32,8 +32,6 @@
package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import org.junit.Test;
import static org.junit.Assert.*;

2
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceResolver.java
View File

@@ -76,7 +76,7 @@ public class GitRepositoryServiceResolver implements RepositoryServiceResolver
* @return
*/
@Override
public GitRepositoryServiceProvider reslove(Repository repository)
public GitRepositoryServiceProvider resolve(Repository repository)
{
GitRepositoryServiceProvider provider = null;

2
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceResolver.java
View File

@@ -82,7 +82,7 @@ public class HgRepositoryServiceResolver implements RepositoryServiceResolver
* @return
*/
@Override
public HgRepositoryServiceProvider reslove(Repository repository)
public HgRepositoryServiceProvider resolve(Repository repository)
{
HgRepositoryServiceProvider provider = null;

2
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnRepositoryServiceResolver.java
View File

@@ -76,7 +76,7 @@ public class SvnRepositoryServiceResolver implements RepositoryServiceResolver
* @return
*/
@Override
public SvnRepositoryServiceProvider reslove(Repository repository)
public SvnRepositoryServiceProvider resolve(Repository repository)
{
SvnRepositoryServiceProvider provider = null;

17
scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
View File

@@ -67,15 +67,7 @@ import sonia.scm.plugin.DefaultPluginManager;
import sonia.scm.plugin.ExtensionProcessor;
import sonia.scm.plugin.PluginLoader;
import sonia.scm.plugin.PluginManager;
import sonia.scm.repository.DefaultRepositoryManager;
import sonia.scm.repository.DefaultRepositoryProvider;
import sonia.scm.repository.HealthCheckContextListener;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryDAO;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.repository.RepositoryManagerProvider;
import sonia.scm.repository.RepositoryProvider;
import sonia.scm.repository.SpacesStrategy;
import sonia.scm.repository.*;
import sonia.scm.repository.api.HookContextFactory;
import sonia.scm.repository.api.RepositoryServiceFactory;
import sonia.scm.repository.spi.HookEventFacade;
@@ -283,9 +275,6 @@ public class ScmServletModule extends ServletModule
bind(UserDAO.class, XmlUserDAO.class);
bind(RepositoryDAO.class, XmlRepositoryDAO.class);
Class<? extends SpacesStrategy> mySpaceStrategy = extensionProcessor.byExtensionPoint(SpacesStrategy.class).iterator().next();
bind(SpacesStrategy.class, mySpaceStrategy);
bindDecorated(RepositoryManager.class, DefaultRepositoryManager.class,
RepositoryManagerProvider.class);
bindDecorated(UserManager.class, DefaultUserManager.class,
@@ -297,7 +286,6 @@ public class ScmServletModule extends ServletModule
// bind sslcontext provider
bind(SSLContext.class).toProvider(SSLContextProvider.class);
// bind ahc
Multibinder<ContentTransformer> transformers =
Multibinder.newSetBinder(binder(), ContentTransformer.class);
@@ -362,6 +350,9 @@ public class ScmServletModule extends ServletModule
// bind events
// bind(LastModifiedUpdateListener.class);
Class<? extends NamespaceStrategy> namespaceStrategy = extensionProcessor.byExtensionPoint(NamespaceStrategy.class).iterator().next();
bind(NamespaceStrategy.class, namespaceStrategy);
}
/**

11
scm-webapp/src/main/java/sonia/scm/repository/DefaultNamespaceStrategy.java Normal file
View File

@@ -0,0 +1,11 @@
package sonia.scm.repository;
import sonia.scm.plugin.Extension;
@Extension
public class DefaultNamespaceStrategy implements NamespaceStrategy{
@Override
public String getNamespace() {
return "42";
}
}

282
scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
View File

@@ -1,19 +1,19 @@
/**
* Copyright (c) 2010, Sebastian Sdorra
* All rights reserved.
*
* <p>
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* <p>
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* 3. Neither the name of SCM-Manager; nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
* <p>
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -24,13 +24,11 @@
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* <p>
* http://bitbucket.org/sdorra/scm-manager
*
*/
package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
@@ -79,73 +77,53 @@ import java.util.concurrent.ThreadFactory;
* @author Sebastian Sdorra
*/
@Singleton
public class DefaultRepositoryManager extends AbstractRepositoryManager
{
public class DefaultRepositoryManager extends AbstractRepositoryManager {
/** Field description */
private static final String THREAD_NAME = "Hook-%s";
/** Field description */
private static final Logger logger =
LoggerFactory.getLogger(DefaultRepositoryManager.class);
private final ScmConfiguration configuration;
private final ExecutorService executorService;
private final Map<String, RepositoryHandler> handlerMap;
private final KeyGenerator keyGenerator;
private final RepositoryDAO repositoryDAO;
private final Set<Type> types;
private RepositoryMatcher repositoryMatcher;
private NamespaceStrategy namespaceStrategy;
//~--- constructors ---------------------------------------------------------
/**
* Constructs ...
*
* @param configuration
* @param contextProvider
* @param keyGenerator
* @param repositoryDAO
* @param handlerSet
* @param repositoryMatcher
* @param spaceStrategy
*/
@Inject
public DefaultRepositoryManager(ScmConfiguration configuration,
SCMContextProvider contextProvider, KeyGenerator keyGenerator,
RepositoryDAO repositoryDAO, Set<RepositoryHandler> handlerSet,
RepositoryMatcher repositoryMatcher, SpacesStrategy spaceStrategy)
{
SCMContextProvider contextProvider, KeyGenerator keyGenerator,
RepositoryDAO repositoryDAO, Set<RepositoryHandler> handlerSet,
RepositoryMatcher repositoryMatcher,
NamespaceStrategy namespaceStrategy) {
this.configuration = configuration;
this.keyGenerator = keyGenerator;
this.repositoryDAO = repositoryDAO;
this.repositoryMatcher = repositoryMatcher;
this.spaceStrategy = spaceStrategy;
this.namespaceStrategy = namespaceStrategy;
//J-
ThreadFactory factory = new ThreadFactoryBuilder()
.setNameFormat(THREAD_NAME).build();
this.executorService = new SubjectAwareExecutorService(
Executors.newCachedThreadPool(factory)
);
//J+
handlerMap = new HashMap<>();
types = new HashSet<>();
for (RepositoryHandler handler : handlerSet)
{
for (RepositoryHandler handler : handlerSet) {
addHandler(contextProvider, handler);
}
}
//~--- methods --------------------------------------------------------------
/**
* Method description
*
*
* @throws IOException
*/
@Override
public void close() throws IOException
{
public void close() throws IOException {
executorService.shutdown();
for (RepositoryHandler handler : handlerMap.values())
{
for (RepositoryHandler handler : handlerMap.values()) {
IOUtil.close(handler);
}
}
@@ -161,26 +139,22 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
* @throws RepositoryException
*/
public void create(Repository repository, boolean initRepository)
throws RepositoryException, IOException
{
throws RepositoryException, IOException {
logger.info("create repository {} of type {}", repository.getName(),
repository.getType());
repository.setSpace(spaceStrategy.getCurrentSpace());
RepositoryPermissions.create().check();
AssertUtil.assertIsValid(repository);
if (repositoryDAO.contains(repository))
{
if (repositoryDAO.contains(repository)) {
throw RepositoryAlreadyExistsException.create(repository);
}
repository.setId(keyGenerator.createKey());
repository.setCreationDate(System.currentTimeMillis());
repository.setNamespace(namespaceStrategy.getNamespace());
if (initRepository)
{
if (initRepository) {
getHandler(repository).create(repository);
}
@@ -200,8 +174,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
*/
@Override
public void create(Repository repository)
throws RepositoryException, IOException
{
throws RepositoryException, IOException {
create(repository, true);
}
@@ -216,31 +189,25 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
*/
@Override
public void delete(Repository repository)
throws RepositoryException, IOException
{
if (logger.isInfoEnabled())
{
throws RepositoryException, IOException {
if (logger.isInfoEnabled()) {
logger.info("delete repository {} of type {}", repository.getName(),
repository.getType());
}
RepositoryPermissions.delete(repository).check();
if (configuration.isEnableRepositoryArchive() &&!repository.isArchived())
{
if (configuration.isEnableRepositoryArchive() && !repository.isArchived()) {
throw new RepositoryIsNotArchivedException(
"Repository could not deleted, because it is not archived.");
}
if (repositoryDAO.contains(repository))
{
if (repositoryDAO.contains(repository)) {
fireEvent(HandlerEventType.BEFORE_DELETE, repository);
getHandler(repository).delete(repository);
repositoryDAO.delete(repository);
fireEvent(HandlerEventType.DELETE, repository);
}
else
{
} else {
throw new RepositoryNotFoundException(
"repository ".concat(repository.getName()).concat(" not found"));
}
@@ -257,8 +224,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
*/
@Override
public void importRepository(Repository repository)
throws RepositoryException, IOException
{
throws RepositoryException, IOException {
create(repository, false);
}
@@ -269,7 +235,8 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
* @param context
*/
@Override
public void init(SCMContextProvider context) {}
public void init(SCMContextProvider context) {
}
/**
* Method description
@@ -282,10 +249,8 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
*/
@Override
public void modify(Repository repository)
throws RepositoryException, IOException
{
if (logger.isInfoEnabled())
{
throws RepositoryException, IOException {
if (logger.isInfoEnabled()) {
logger.info("modify repository {} of type {}", repository.getName(),
repository.getType());
}
@@ -293,19 +258,16 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
AssertUtil.assertIsValid(repository);
Repository oldRepository = repositoryDAO.get(repository.getType(),
repository.getName());
repository.getName());
if (oldRepository != null)
{
if (oldRepository != null) {
RepositoryPermissions.modify(oldRepository).check();
fireEvent(HandlerEventType.BEFORE_MODIFY, repository, oldRepository);
repository.setLastModified(System.currentTimeMillis());
getHandler(repository).modify(repository);
repositoryDAO.modify(repository);
fireEvent(HandlerEventType.MODIFY, repository, oldRepository);
}
else
{
} else {
throw new RepositoryNotFoundException(
"repository ".concat(repository.getName()).concat(" not found"));
}
@@ -322,20 +284,16 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
*/
@Override
public void refresh(Repository repository)
throws RepositoryException, IOException
{
throws RepositoryException, IOException {
AssertUtil.assertIsNotNull(repository);
RepositoryPermissions.read(repository).check();
Repository fresh = repositoryDAO.get(repository.getType(),
repository.getName());
repository.getName());
if (fresh != null)
{
if (fresh != null) {
fresh.copyProperties(repository);
}
else
{
} else {
throw new RepositoryNotFoundException(
"repository ".concat(repository.getName()).concat(" not found"));
}
@@ -352,16 +310,14 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
* @return
*/
@Override
public Repository get(String id)
{
public Repository get(String id) {
AssertUtil.assertIsNotEmpty(id);
RepositoryPermissions.read(id).check();
Repository repository = repositoryDAO.get(id);
if (repository != null)
{
if (repository != null) {
repository = repository.clone();
}
@@ -378,15 +334,13 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
* @return
*/
@Override
public Repository get(String type, String name)
{
public Repository get(String type, String name) {
AssertUtil.assertIsNotEmpty(type);
AssertUtil.assertIsNotEmpty(name);
Repository repository = repositoryDAO.get(type, name);
if (repository != null)
{
if (repository != null) {
RepositoryPermissions.read(repository).check();
repository = repository.clone();
}
@@ -403,25 +357,21 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
* @return
*/
@Override
public Collection<Repository> getAll(Comparator<Repository> comparator)
{
public Collection<Repository> getAll(Comparator<Repository> comparator) {
List<Repository> repositories = Lists.newArrayList();
PermissionActionCheck<Repository> check = RepositoryPermissions.read();
for (Repository repository : repositoryDAO.getAll())
{
for (Repository repository : repositoryDAO.getAll()) {
if (handlerMap.containsKey(repository.getType())
&& check.isPermitted(repository))
{
&& check.isPermitted(repository)) {
Repository r = repository.clone();
repositories.add(r);
}
}
if (comparator != null)
{
if (comparator != null) {
Collections.sort(repositories, comparator);
}
@@ -435,8 +385,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
* @return
*/
@Override
public Collection<Repository> getAll()
{
public Collection<Repository> getAll() {
return getAll(null);
}
@@ -453,23 +402,19 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
*/
@Override
public Collection<Repository> getAll(Comparator<Repository> comparator,
int start, int limit)
{
int start, int limit) {
final PermissionActionCheck<Repository> check =
RepositoryPermissions.read();
return Util.createSubCollection(repositoryDAO.getAll(), comparator,
new CollectionAppender<Repository>()
{
@Override
public void append(Collection<Repository> collection, Repository item)
{
if (check.isPermitted(item))
{
collection.add(item.clone());
new CollectionAppender<Repository>() {
@Override
public void append(Collection<Repository> collection, Repository item) {
if (check.isPermitted(item)) {
collection.add(item.clone());
}
}
}
}, start, limit);
}, start, limit);
}
/**
@@ -482,8 +427,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
* @return
*/
@Override
public Collection<Repository> getAll(int start, int limit)
{
public Collection<Repository> getAll(int start, int limit) {
return getAll(null, start, limit);
}
@@ -494,14 +438,11 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
* @return
*/
@Override
public Collection<Type> getConfiguredTypes()
{
public Collection<Type> getConfiguredTypes() {
List<Type> validTypes = Lists.newArrayList();
for (RepositoryHandler handler : handlerMap.values())
{
if (handler.isConfigured())
{
for (RepositoryHandler handler : handlerMap.values()) {
if (handler.isConfigured()) {
validTypes.add(handler.getType());
}
}
@@ -518,8 +459,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
* @return
*/
@Override
public Repository getFromRequest(HttpServletRequest request)
{
public Repository getFromRequest(HttpServletRequest request) {
AssertUtil.assertIsNotNull(request);
return getFromUri(HttpUtil.getStrippedURI(request));
@@ -535,15 +475,12 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
* @return
*/
@Override
public Repository getFromTypeAndUri(String type, String uri)
{
if (Strings.isNullOrEmpty(type))
{
public Repository getFromTypeAndUri(String type, String uri) {
if (Strings.isNullOrEmpty(type)) {
throw new ArgumentIsInvalidException("argument type is required");
}
if (Strings.isNullOrEmpty(uri))
{
if (Strings.isNullOrEmpty(uri)) {
throw new ArgumentIsInvalidException("argument uri is required");
}
@@ -552,16 +489,13 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
Repository repository = null;
if (handlerMap.containsKey(type))
{
if (handlerMap.containsKey(type)) {
Collection<Repository> repositories = repositoryDAO.getAll();
PermissionActionCheck<Repository> check = RepositoryPermissions.read();
for (Repository r : repositories)
{
if (repositoryMatcher.matches(r, type, uri))
{
for (Repository r : repositories) {
if (repositoryMatcher.matches(r, type, uri)) {
check.check(r);
repository = r.clone();
@@ -570,8 +504,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
}
}
if ((repository == null) && logger.isDebugEnabled())
{
if ((repository == null) && logger.isDebugEnabled()) {
logger.debug("could not find repository with type {} and uri {}", type,
uri);
}
@@ -588,20 +521,17 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
* @return
*/
@Override
public Repository getFromUri(String uri)
{
public Repository getFromUri(String uri) {
AssertUtil.assertIsNotEmpty(uri);
if (uri.startsWith(HttpUtil.SEPARATOR_PATH))
{
if (uri.startsWith(HttpUtil.SEPARATOR_PATH)) {
uri = uri.substring(1);
}
int typeSeperator = uri.indexOf(HttpUtil.SEPARATOR_PATH);
Repository repository = null;
if (typeSeperator > 0)
{
if (typeSeperator > 0) {
String type = uri.substring(0, typeSeperator);
uri = uri.substring(typeSeperator + 1);
@@ -620,8 +550,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
* @return
*/
@Override
public RepositoryHandler getHandler(String type)
{
public RepositoryHandler getHandler(String type) {
return handlerMap.get(type);
}
@@ -632,8 +561,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
* @return
*/
@Override
public Long getLastModified()
{
public Long getLastModified() {
return repositoryDAO.getLastModified();
}
@@ -644,8 +572,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
* @return
*/
@Override
public Collection<Type> getTypes()
{
public Collection<Type> getTypes() {
return types;
}
@@ -660,22 +587,19 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
* @param handler
*/
private void addHandler(SCMContextProvider contextProvider,
RepositoryHandler handler)
{
RepositoryHandler handler) {
AssertUtil.assertIsNotNull(handler);
Type type = handler.getType();
AssertUtil.assertIsNotNull(type);
if (handlerMap.containsKey(type.getName()))
{
if (handlerMap.containsKey(type.getName())) {
throw new ConfigurationException(
type.getName().concat("allready registered"));
}
if (logger.isInfoEnabled())
{
if (logger.isInfoEnabled()) {
logger.info("added RepositoryHandler {} for type {}", handler.getClass(),
type);
}
@@ -699,46 +623,18 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
* @throws RepositoryException
*/
private RepositoryHandler getHandler(Repository repository)
throws RepositoryException
{
throws RepositoryException {
String type = repository.getType();
RepositoryHandler handler = handlerMap.get(type);
if (handler == null)
{
if (handler == null) {
throw new RepositoryHandlerNotFoundException(
"could not find handler for ".concat(type));
}
else if (!handler.isConfigured())
{
} else if (!handler.isConfigured()) {
throw new RepositoryException("handler is not configured");
}
return handler;
}
//~--- fields ---------------------------------------------------------------
/** Field description */
private final ScmConfiguration configuration;
/** Field description */
private final ExecutorService executorService;
/** Field description */
private final Map<String, RepositoryHandler> handlerMap;
/** Field description */
private final KeyGenerator keyGenerator;
/** Field description */
private final RepositoryDAO repositoryDAO;
/** Field description */
private final Set<Type> types;
/** Field description */
private RepositoryMatcher repositoryMatcher;
private final SpacesStrategy spaceStrategy;
}

5
scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerPerfTest.java
View File

@@ -95,6 +95,8 @@ public class DefaultRepositoryManagerPerfTest {
private final ScmConfiguration configuration = new ScmConfiguration();
private final KeyGenerator keyGenerator = new DefaultKeyGenerator();
private final NamespaceStrategy namespaceStrategy = new DefaultNamespaceStrategy();
@Mock
private RepositoryHandler repositoryHandler;
@@ -120,7 +122,8 @@ public class DefaultRepositoryManagerPerfTest {
repositoryDAO,
handlerSet,
repositoryMatcher,
mock(SpacesStrategy.class));
namespaceStrategy
);
setUpTestRepositories();

4
scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
View File

@@ -548,10 +548,12 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository, Re
ScmConfiguration configuration = new ScmConfiguration();
NamespaceStrategy namespaceStrategy = new DefaultNamespaceStrategy();
configuration.setEnableRepositoryArchive(archiveEnabled);
return new DefaultRepositoryManager(configuration, contextProvider,
keyGenerator, repositoryDAO, handlerSet, createRepositoryMatcher(), mock(SpacesStrategy.class));
keyGenerator, repositoryDAO, handlerSet, createRepositoryMatcher(), namespaceStrategy);
}
private void createRepository(RepositoryManager m, Repository repository)