From 4fda6daaa03f4006f6e1cf2ca720e1a464b25f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 2 Jun 2020 17:05:23 +0200 Subject: [PATCH] Naming things --- ...ChangesetTrailers.java => ChangesetTrailerProvider.java} | 2 +- ...ailers.java => ChangesetDescriptionTrailerProvider.java} | 6 +++--- .../v2/resources/DefaultChangesetToChangesetDtoMapper.java | 6 +++--- .../sonia/scm/api/v2/resources/BranchRootResourceTest.java | 5 ++--- .../api/v2/resources/ChangesetDescriptionTrailersTest.java | 2 +- .../scm/api/v2/resources/ChangesetRootResourceTest.java | 4 ++-- .../sonia/scm/api/v2/resources/FileHistoryResourceTest.java | 6 +++--- .../scm/api/v2/resources/IncomingRootResourceTest.java | 6 +++--- 8 files changed, 18 insertions(+), 19 deletions(-) rename scm-core/src/main/java/sonia/scm/repository/{ChangesetTrailers.java => ChangesetTrailerProvider.java} (96%) rename scm-webapp/src/main/java/sonia/scm/api/v2/resources/{ChangesetDescriptionTrailers.java => ChangesetDescriptionTrailerProvider.java} (94%) diff --git a/scm-core/src/main/java/sonia/scm/repository/ChangesetTrailers.java b/scm-core/src/main/java/sonia/scm/repository/ChangesetTrailerProvider.java similarity index 96% rename from scm-core/src/main/java/sonia/scm/repository/ChangesetTrailers.java rename to scm-core/src/main/java/sonia/scm/repository/ChangesetTrailerProvider.java index d8ae8eb6db..09f156df32 100644 --- a/scm-core/src/main/java/sonia/scm/repository/ChangesetTrailers.java +++ b/scm-core/src/main/java/sonia/scm/repository/ChangesetTrailerProvider.java @@ -29,6 +29,6 @@ import sonia.scm.plugin.ExtensionPoint; import java.util.List; @ExtensionPoint -public interface ChangesetTrailers { +public interface ChangesetTrailerProvider { List getTrailers(Repository repository, Changeset changeset); } diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetDescriptionTrailers.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetDescriptionTrailerProvider.java similarity index 94% rename from scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetDescriptionTrailers.java rename to scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetDescriptionTrailerProvider.java index 7733aaafba..7f2f2464e5 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetDescriptionTrailers.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetDescriptionTrailerProvider.java @@ -27,7 +27,7 @@ package sonia.scm.api.v2.resources; import com.google.common.collect.ImmutableSet; import sonia.scm.plugin.Extension; import sonia.scm.repository.Changeset; -import sonia.scm.repository.ChangesetTrailers; +import sonia.scm.repository.ChangesetTrailerProvider; import sonia.scm.repository.Person; import sonia.scm.repository.Repository; import sonia.scm.repository.Trailer; @@ -46,13 +46,13 @@ import static java.util.Optional.empty; import static java.util.Optional.of; @Extension -public class ChangesetDescriptionTrailers implements ChangesetTrailers { +public class ChangesetDescriptionTrailerProvider implements ChangesetTrailerProvider { private static final Collection SUPPORTED_TRAILER_TYPES = ImmutableSet.of("Co-authored-by", "Reviewed-by", "Signed-off-by", "Committed-by"); private static final Pattern PERSON_PATTERN = Pattern.compile("^\\W*(.*)\\W+<(.*)>\\W*$"); @Inject - public ChangesetDescriptionTrailers() {} + public ChangesetDescriptionTrailerProvider() {} @Override public List getTrailers(Repository repository, Changeset changeset) { 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 3a7262362c..a998cad8c2 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 @@ -33,7 +33,7 @@ import org.mapstruct.MappingTarget; import org.mapstruct.ObjectFactory; import sonia.scm.repository.Branch; import sonia.scm.repository.Changeset; -import sonia.scm.repository.ChangesetTrailers; +import sonia.scm.repository.ChangesetTrailerProvider; import sonia.scm.repository.Person; import sonia.scm.repository.Repository; import sonia.scm.repository.Tag; @@ -74,7 +74,7 @@ public abstract class DefaultChangesetToChangesetDtoMapper extends HalAppenderMa private TagCollectionToDtoMapper tagCollectionToDtoMapper; @Inject - private Set changesetTrailersSet; + private Set changesetTrailerProviderSet; abstract TrailerDto map(Trailer trailer); @@ -83,7 +83,7 @@ public abstract class DefaultChangesetToChangesetDtoMapper extends HalAppenderMa @AfterMapping void appendTrailerPersons(Changeset changeset, @MappingTarget ChangesetDto target, @Context Repository repository) { List collectedTrailers = new ArrayList<>(); - changesetTrailersSet.stream() + changesetTrailerProviderSet.stream() .flatMap(changesetTrailers -> changesetTrailers.getTrailers(repository, changeset).stream()) .map(this::map) .forEach(collectedTrailers::add); diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java index 42756108ce..518f75a3c9 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java @@ -30,7 +30,6 @@ import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.support.SubjectThreadState; import org.apache.shiro.util.ThreadContext; import org.apache.shiro.util.ThreadState; -import org.assertj.core.api.Assertions; import org.assertj.core.util.Lists; import org.jboss.resteasy.mock.MockHttpRequest; import org.jboss.resteasy.mock.MockHttpResponse; @@ -45,7 +44,7 @@ import sonia.scm.repository.Branch; import sonia.scm.repository.Branches; import sonia.scm.repository.Changeset; import sonia.scm.repository.ChangesetPagingResult; -import sonia.scm.repository.ChangesetTrailers; +import sonia.scm.repository.ChangesetTrailerProvider; import sonia.scm.repository.NamespaceAndName; import sonia.scm.repository.Person; import sonia.scm.repository.Repository; @@ -117,7 +116,7 @@ public class BranchRootResourceTest extends RepositoryTestBase { private TagCollectionToDtoMapper tagCollectionToDtoMapper; @Mock - private Set changesetTrailers; + private Set changesetTrailers; @InjectMocks diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetDescriptionTrailersTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetDescriptionTrailersTest.java index d1aebd592e..35d2646a2a 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetDescriptionTrailersTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetDescriptionTrailersTest.java @@ -43,7 +43,7 @@ class ChangesetDescriptionTrailersTest { private static final Repository REPOSITORY = RepositoryTestData.createHeartOfGold(); - private final ChangesetDescriptionTrailers changesetDescriptionTrailers = new ChangesetDescriptionTrailers(); + private final ChangesetDescriptionTrailerProvider changesetDescriptionTrailers = new ChangesetDescriptionTrailerProvider(); @Test void shouldReturnEmptyList() { diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java index dcde44f27e..33b280e351 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java @@ -43,7 +43,7 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import sonia.scm.repository.Changeset; import sonia.scm.repository.ChangesetPagingResult; -import sonia.scm.repository.ChangesetTrailers; +import sonia.scm.repository.ChangesetTrailerProvider; import sonia.scm.repository.NamespaceAndName; import sonia.scm.repository.Person; import sonia.scm.repository.Repository; @@ -88,7 +88,7 @@ public class ChangesetRootResourceTest extends RepositoryTestBase { private LogCommandBuilder logCommandBuilder; @Mock - private Set changesetTrailers; + private Set changesetTrailers; @InjectMocks private ChangesetCollectionToDtoMapper changesetCollectionToDtoMapper; diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java index a0eed52893..44fb6d76fd 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.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.api.v2.resources; import com.google.inject.util.Providers; @@ -44,7 +44,7 @@ import sonia.scm.ContextEntry; import sonia.scm.NotFoundException; import sonia.scm.repository.Changeset; import sonia.scm.repository.ChangesetPagingResult; -import sonia.scm.repository.ChangesetTrailers; +import sonia.scm.repository.ChangesetTrailerProvider; import sonia.scm.repository.InternalRepositoryException; import sonia.scm.repository.NamespaceAndName; import sonia.scm.repository.Person; @@ -92,7 +92,7 @@ public class FileHistoryResourceTest extends RepositoryTestBase { private FileHistoryCollectionToDtoMapper fileHistoryCollectionToDtoMapper; @Mock - private Set changesetTrailers; + private Set changesetTrailers; @InjectMocks private DefaultChangesetToChangesetDtoMapperImpl changesetToChangesetDtoMapper; diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/IncomingRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/IncomingRootResourceTest.java index 75abe4fcaa..6ce4630c59 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/IncomingRootResourceTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/IncomingRootResourceTest.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.api.v2.resources; @@ -45,7 +45,7 @@ import org.mockito.junit.MockitoJUnitRunner; import sonia.scm.NotFoundException; import sonia.scm.repository.Changeset; import sonia.scm.repository.ChangesetPagingResult; -import sonia.scm.repository.ChangesetTrailers; +import sonia.scm.repository.ChangesetTrailerProvider; import sonia.scm.repository.NamespaceAndName; import sonia.scm.repository.Person; import sonia.scm.repository.Repository; @@ -110,7 +110,7 @@ public class IncomingRootResourceTest extends RepositoryTestBase { private IncomingChangesetCollectionToDtoMapper incomingChangesetCollectionToDtoMapper; @Mock - private Set changesetTrailers; + private Set changesetTrailers; @InjectMocks private DefaultChangesetToChangesetDtoMapperImpl changesetToChangesetDtoMapper;