From ee82c0d0aabce008dc024d9aa6670fcc5b78384c Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Wed, 13 May 2020 11:39:22 +0200 Subject: [PATCH] move EdisonHalAppender to scm-core because we need it for plugins --- .../main/java/sonia/scm/web}/EdisonHalAppender.java | 7 ++++--- .../java/sonia/scm/web}/EdisonHalAppenderTest.java | 3 ++- .../scm/api/v2/resources/BranchToBranchDtoMapper.java | 1 + .../resources/BrowserResultToFileObjectDtoMapper.java | 10 +--------- .../DefaultChangesetToChangesetDtoMapper.java | 1 + .../scm/api/v2/resources/GroupToGroupDtoMapper.java | 1 + .../sonia/scm/api/v2/resources/IndexDtoGenerator.java | 1 + .../java/sonia/scm/api/v2/resources/MeDtoFactory.java | 1 + .../RepositoryRoleToRepositoryRoleDtoMapper.java | 1 + .../v2/resources/RepositoryToRepositoryDtoMapper.java | 1 + .../sonia/scm/api/v2/resources/TagToTagDtoMapper.java | 1 + .../scm/api/v2/resources/UserToUserDtoMapper.java | 1 + 12 files changed, 16 insertions(+), 13 deletions(-) rename {scm-webapp/src/main/java/sonia/scm/api/v2/resources => scm-core/src/main/java/sonia/scm/web}/EdisonHalAppender.java (92%) rename {scm-webapp/src/test/java/sonia/scm/api/v2/resources => scm-core/src/test/java/sonia/scm/web}/EdisonHalAppenderTest.java (97%) diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/EdisonHalAppender.java b/scm-core/src/main/java/sonia/scm/web/EdisonHalAppender.java similarity index 92% rename from scm-webapp/src/main/java/sonia/scm/api/v2/resources/EdisonHalAppender.java rename to scm-core/src/main/java/sonia/scm/web/EdisonHalAppender.java index 688010d1ef..d7cc38018a 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/EdisonHalAppender.java +++ b/scm-core/src/main/java/sonia/scm/web/EdisonHalAppender.java @@ -22,22 +22,23 @@ * SOFTWARE. */ -package sonia.scm.api.v2.resources; +package sonia.scm.web; import de.otto.edison.hal.Embedded; import de.otto.edison.hal.HalRepresentation; import de.otto.edison.hal.Link; import de.otto.edison.hal.Links; +import sonia.scm.api.v2.resources.HalAppender; import java.util.ArrayList; import java.util.List; -class EdisonHalAppender implements HalAppender { +public class EdisonHalAppender implements HalAppender { private final Links.Builder linkBuilder; private final Embedded.Builder embeddedBuilder; - EdisonHalAppender(Links.Builder linkBuilder, Embedded.Builder embeddedBuilder) { + public EdisonHalAppender(Links.Builder linkBuilder, Embedded.Builder embeddedBuilder) { this.linkBuilder = linkBuilder; this.embeddedBuilder = embeddedBuilder; } diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/EdisonHalAppenderTest.java b/scm-core/src/test/java/sonia/scm/web/EdisonHalAppenderTest.java similarity index 97% rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/EdisonHalAppenderTest.java rename to scm-core/src/test/java/sonia/scm/web/EdisonHalAppenderTest.java index ff2a15b97a..0abb1c209c 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/EdisonHalAppenderTest.java +++ b/scm-core/src/test/java/sonia/scm/web/EdisonHalAppenderTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package sonia.scm.api.v2.resources; +package sonia.scm.web; import de.otto.edison.hal.Embedded; import de.otto.edison.hal.HalRepresentation; @@ -30,6 +30,7 @@ import de.otto.edison.hal.Link; import de.otto.edison.hal.Links; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import sonia.scm.web.EdisonHalAppender; import java.util.List; diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchToBranchDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchToBranchDtoMapper.java index 30b689a3a3..0d779d2164 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchToBranchDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchToBranchDtoMapper.java @@ -32,6 +32,7 @@ import org.mapstruct.Mapping; import org.mapstruct.ObjectFactory; import sonia.scm.repository.Branch; import sonia.scm.repository.NamespaceAndName; +import sonia.scm.web.EdisonHalAppender; import javax.inject.Inject; diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BrowserResultToFileObjectDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BrowserResultToFileObjectDtoMapper.java index 1271845a14..f289bc917e 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BrowserResultToFileObjectDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BrowserResultToFileObjectDtoMapper.java @@ -24,22 +24,17 @@ package sonia.scm.api.v2.resources; -import com.google.common.annotations.VisibleForTesting; import de.otto.edison.hal.Embedded; import de.otto.edison.hal.Links; import org.mapstruct.Context; import org.mapstruct.Mapper; import org.mapstruct.Mapping; -import org.mapstruct.ObjectFactory; import org.mapstruct.Qualifier; import sonia.scm.repository.BrowserResult; import sonia.scm.repository.FileObject; import sonia.scm.repository.NamespaceAndName; -import sonia.scm.repository.SubRepository; -import sonia.scm.repository.spi.BrowseCommand; -import sonia.scm.repository.spi.BrowseCommandRequest; +import sonia.scm.web.EdisonHalAppender; -import javax.inject.Inject; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -48,9 +43,6 @@ import java.time.Instant; import java.util.Optional; import java.util.OptionalLong; -import static de.otto.edison.hal.Embedded.embeddedBuilder; -import static de.otto.edison.hal.Link.link; - @Mapper public abstract class BrowserResultToFileObjectDtoMapper extends BaseFileObjectDtoMapper { diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultChangesetToChangesetDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultChangesetToChangesetDtoMapper.java index 2c1799f786..a9ba0758a6 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultChangesetToChangesetDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultChangesetToChangesetDtoMapper.java @@ -37,6 +37,7 @@ import sonia.scm.repository.Tag; import sonia.scm.repository.api.Command; import sonia.scm.repository.api.RepositoryService; import sonia.scm.repository.api.RepositoryServiceFactory; +import sonia.scm.web.EdisonHalAppender; import javax.inject.Inject; import java.util.List; diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapper.java index 2ab6bf48e2..da8be2865d 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapper.java @@ -31,6 +31,7 @@ import org.mapstruct.ObjectFactory; import sonia.scm.group.Group; import sonia.scm.group.GroupPermissions; import sonia.scm.security.PermissionPermissions; +import sonia.scm.web.EdisonHalAppender; import javax.inject.Inject; import java.util.List; diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IndexDtoGenerator.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IndexDtoGenerator.java index 6f6ae8f6bc..41167a221f 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IndexDtoGenerator.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/IndexDtoGenerator.java @@ -38,6 +38,7 @@ import sonia.scm.plugin.PluginPermissions; import sonia.scm.security.Authentications; import sonia.scm.security.PermissionPermissions; import sonia.scm.user.UserPermissions; +import sonia.scm.web.EdisonHalAppender; import javax.inject.Inject; import java.util.List; diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeDtoFactory.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeDtoFactory.java index 80d4736f30..5308402540 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeDtoFactory.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeDtoFactory.java @@ -34,6 +34,7 @@ import sonia.scm.security.Authentications; import sonia.scm.user.User; import sonia.scm.user.UserManager; import sonia.scm.user.UserPermissions; +import sonia.scm.web.EdisonHalAppender; import javax.inject.Inject; diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryRoleToRepositoryRoleDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryRoleToRepositoryRoleDtoMapper.java index 4afe1d97b6..1cd56dc2b4 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryRoleToRepositoryRoleDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryRoleToRepositoryRoleDtoMapper.java @@ -30,6 +30,7 @@ import org.mapstruct.Mapper; import org.mapstruct.ObjectFactory; import sonia.scm.repository.RepositoryRole; import sonia.scm.repository.RepositoryRolePermissions; +import sonia.scm.web.EdisonHalAppender; import javax.inject.Inject; diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java index 2105124015..8dd3e8fb1b 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java @@ -38,6 +38,7 @@ import sonia.scm.repository.api.Command; import sonia.scm.repository.api.RepositoryService; import sonia.scm.repository.api.RepositoryServiceFactory; import sonia.scm.repository.api.ScmProtocol; +import sonia.scm.web.EdisonHalAppender; import sonia.scm.web.api.RepositoryToHalMapper; import java.util.List; diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagToTagDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagToTagDtoMapper.java index bd7a2b1a5f..e056162dcc 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagToTagDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagToTagDtoMapper.java @@ -32,6 +32,7 @@ import org.mapstruct.Mapping; import org.mapstruct.ObjectFactory; import sonia.scm.repository.NamespaceAndName; import sonia.scm.repository.Tag; +import sonia.scm.web.EdisonHalAppender; import javax.inject.Inject; diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserToUserDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserToUserDtoMapper.java index 01435ab614..322c951962 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserToUserDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserToUserDtoMapper.java @@ -33,6 +33,7 @@ import sonia.scm.security.PermissionPermissions; import sonia.scm.user.User; import sonia.scm.user.UserManager; import sonia.scm.user.UserPermissions; +import sonia.scm.web.EdisonHalAppender; import javax.inject.Inject;