Merge branch 'develop' into feature/browse_commit_with_limit

scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java

@@ -185,7 +185,8 @@ public class BranchRootResource {
     description = "create success",
     headers = @Header(
       name = "Location",
-      description = "uri to the created branch"
+      description = "uri to the created branch",
+      schema = @Schema(type = "string")
     )
   )
   @ApiResponse(responseCode = "401", description = "not authenticated / invalid credentials")

scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupCollectionResource.java

@@ -95,13 +95,14 @@ public class GroupCollectionResource {
   @POST
   @Path("")
   @Consumes(VndMediaType.GROUP)
-  @Operation(summary = "Create group", description = "Creates a new group.", tags = "Group")
+  @Operation(summary = "Create group", description = "Creates a new group.", tags = "Group", operationId = "group_create")
   @ApiResponse(
     responseCode = "201",
     description = "create success",
     headers = @Header(
       name = "Location",
-      description = "uri to the created group"
+      description = "uri to the created group",
+      schema = @Schema(type = "string")
     )
   )
   @ApiResponse(responseCode = "401", description = "not authenticated / invalid credentials")

scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDto.java

@@ -12,9 +12,10 @@ import sonia.scm.util.ValidationUtil;
 import javax.validation.constraints.Pattern;
 import java.time.Instant;
 import java.util.List;
-import java.util.Map;
 
-@Getter @Setter @NoArgsConstructor
+@Getter
+@Setter
+@NoArgsConstructor
 public class GroupDto extends HalRepresentation {
 
   private Instant creationDate;
@@ -24,7 +25,6 @@ public class GroupDto extends HalRepresentation {
   @Pattern(regexp = ValidationUtil.REGEX_NAME)
   private String name;
   private String type;
-  private Map<String, String> properties;
   private List<String> members;
   private boolean external;
 

scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java

@@ -109,7 +109,8 @@ public class RepositoryCollectionResource {
     description = "create success",
     headers = @Header(
       name = "Location",
-      description = "uri to the created repository"
+      description = "uri to the created repository",
+      schema = @Schema(type = "string")
     )
   )
   @ApiResponse(responseCode = "401", description = "not authenticated / invalid credentials")

scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryDto.java

@@ -7,16 +7,17 @@ import de.otto.edison.hal.Links;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotEmpty;
 import sonia.scm.util.ValidationUtil;
 
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.Pattern;
 import java.time.Instant;
 import java.util.List;
-import java.util.Map;
 
-@Getter @Setter @NoArgsConstructor
+@Getter
+@Setter
+@NoArgsConstructor
 public class RepositoryDto extends HalRepresentation {
 
   @Email
@@ -30,10 +31,8 @@ public class RepositoryDto extends HalRepresentation {
   private String namespace;
   @Pattern(regexp = ValidationUtil.REGEX_REPOSITORYNAME)
   private String name;
-  private boolean archived = false;
   @NotEmpty
   private String type;
-  protected Map<String, String> properties;
 
   RepositoryDto(Links links, Embedded embedded) {
     super(links, embedded);

scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryPermissionRootResource.java

@@ -9,9 +9,9 @@ import lombok.extern.slf4j.Slf4j;
 import sonia.scm.AlreadyExistsException;
 import sonia.scm.NotFoundException;
 import sonia.scm.repository.NamespaceAndName;
-import sonia.scm.repository.RepositoryPermission;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryManager;
+import sonia.scm.repository.RepositoryPermission;
 import sonia.scm.repository.RepositoryPermissions;
 import sonia.scm.web.VndMediaType;
 
@@ -71,7 +71,11 @@ public class RepositoryPermissionRootResource {
   @ApiResponse(
     responseCode = "201",
     description = "creates",
-    headers = @Header(name = "Location", description = "uri of the created permission")
+    headers = @Header(
+      name = "Location",
+      description = "uri of the created permission",
+      schema = @Schema(type = "string")
+    )
   )
   @ApiResponse(
     responseCode = "404",

scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryRoleCollectionResource.java

@@ -96,7 +96,8 @@ public class RepositoryRoleCollectionResource {
     description = "create success",
     headers = @Header(
       name = "Location",
-      description = "uri to the created repository role"
+      description = "uri to the created repository role",
+      schema = @Schema(type = "string")
     )
   )
   @ApiResponse(responseCode = "401", description = "not authenticated / invalid credentials")

scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java

@@ -105,7 +105,8 @@ public class UserCollectionResource {
     description = "create success",
     headers = @Header(
       name = "Location",
-      description = "uri to the created user"
+      description = "uri to the created user",
+      schema = @Schema(type = "string")
     )
   )
   @ApiResponse(responseCode = "401", description = "not authenticated / invalid credentials")

scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java

@@ -7,13 +7,12 @@ import de.otto.edison.hal.Links;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotEmpty;
 import sonia.scm.util.ValidationUtil;
 
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.Pattern;
 import java.time.Instant;
-import java.util.Map;
 
 @NoArgsConstructor @Getter @Setter
 public class UserDto extends HalRepresentation {
@@ -30,7 +29,6 @@ public class UserDto extends HalRepresentation {
   @JsonInclude(JsonInclude.Include.NON_NULL)
   private String password;
   private String type;
-  private Map<String, String> properties;
 
   UserDto(Links links, Embedded embedded) {
     super(links, embedded);