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

rename HalAppender methods to make clear, that they target links

Browse Source
This commit is contained in:
Sebastian Sdorra
2019-02-04 14:41:07 +01:00
parent a180f9b795
commit 462cccb443
11 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-core/src/main/java/sonia/scm/api/v2/resources/HalAppender.java
View File

@@ -14,7 +14,7 @@ public interface HalAppender {
* @param rel name of relation * @param rel name of relation
* @param href link uri * @param href link uri
*/ */
void appendOne(String rel, String href); void appendLink(String rel, String href);
/** /**
* Returns a builder which is able to append an array of links to the resource. * Returns a builder which is able to append an array of links to the resource.
@@ -22,7 +22,7 @@ public interface HalAppender {
* @param rel name of link relation * @param rel name of link relation
* @return multi link builder * @return multi link builder
*/ */
LinkArrayBuilder arrayBuilder(String rel); LinkArrayBuilder linkArrayBuilder(String rel);
/** /**

20
scm-core/src/test/java/sonia/scm/api/v2/resources/HalAppenderMapperTest.java
View File

@@ -28,34 +28,34 @@ class HalAppenderMapperTest {
@Test @Test
void shouldAppendSimpleLink() { void shouldAppendSimpleLink() {
registry.register(String.class, (ctx, appender) -> appender.appendOne("42", "https://hitchhiker.com")); registry.register(String.class, (ctx, appender) -> appender.appendLink("42", "https://hitchhiker.com"));
mapper.appendLinks(appender, "hello"); mapper.appendLinks(appender, "hello");
verify(appender).appendOne("42", "https://hitchhiker.com"); verify(appender).appendLink("42", "https://hitchhiker.com");
} }
@Test @Test
void shouldCallMultipleEnrichers() { void shouldCallMultipleEnrichers() {
registry.register(String.class, (ctx, appender) -> appender.appendOne("42", "https://hitchhiker.com")); registry.register(String.class, (ctx, appender) -> appender.appendLink("42", "https://hitchhiker.com"));
registry.register(String.class, (ctx, appender) -> appender.appendOne("21", "https://scm.hitchhiker.com")); registry.register(String.class, (ctx, appender) -> appender.appendLink("21", "https://scm.hitchhiker.com"));
mapper.appendLinks(appender, "hello"); mapper.appendLinks(appender, "hello");
verify(appender).appendOne("42", "https://hitchhiker.com"); verify(appender).appendLink("42", "https://hitchhiker.com");
verify(appender).appendOne("21", "https://scm.hitchhiker.com"); verify(appender).appendLink("21", "https://scm.hitchhiker.com");
} }
@Test @Test
void shouldAppendLinkByUsingSourceFromContext() { void shouldAppendLinkByUsingSourceFromContext() {
registry.register(String.class, (ctx, appender) -> { registry.register(String.class, (ctx, appender) -> {
Optional<String> rel = ctx.oneByType(String.class); Optional<String> rel = ctx.oneByType(String.class);
appender.appendOne(rel.get(), "https://hitchhiker.com"); appender.appendLink(rel.get(), "https://hitchhiker.com");
}); });
mapper.appendLinks(appender, "42"); mapper.appendLinks(appender, "42");
verify(appender).appendOne("42", "https://hitchhiker.com"); verify(appender).appendLink("42", "https://hitchhiker.com");
} }
@Test @Test
@@ -63,12 +63,12 @@ class HalAppenderMapperTest {
registry.register(Integer.class, (ctx, appender) -> { registry.register(Integer.class, (ctx, appender) -> {
Optional<Integer> rel = ctx.oneByType(Integer.class); Optional<Integer> rel = ctx.oneByType(Integer.class);
Optional<String> href = ctx.oneByType(String.class); Optional<String> href = ctx.oneByType(String.class);
appender.appendOne(String.valueOf(rel.get()), href.get()); appender.appendLink(String.valueOf(rel.get()), href.get());
}); });
mapper.appendLinks(appender, Integer.valueOf(42), "https://hitchhiker.com"); mapper.appendLinks(appender, Integer.valueOf(42), "https://hitchhiker.com");
verify(appender).appendOne("42", "https://hitchhiker.com"); verify(appender).appendLink("42", "https://hitchhiker.com");
} }
} }

4
scm-webapp/src/main/java/sonia/scm/api/v2/resources/EdisonHalAppender.java
View File

@@ -15,12 +15,12 @@ class EdisonHalAppender implements HalAppender {
} }
@Override @Override
public void appendOne(String rel, String href) { public void appendLink(String rel, String href) {
builder.single(Link.link(rel, href)); builder.single(Link.link(rel, href));
} }
@Override @Override
public LinkArrayBuilder arrayBuilder(String rel) { public LinkArrayBuilder linkArrayBuilder(String rel) {
return new EdisonLinkArrayBuilder(builder, rel); return new EdisonLinkArrayBuilder(builder, rel);
} }

2
scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchToBranchDtoMapperTest.java
View File

@@ -29,7 +29,7 @@ class BranchToBranchDtoMapperTest {
NamespaceAndName namespaceAndName = ctx.oneRequireByType(NamespaceAndName.class); NamespaceAndName namespaceAndName = ctx.oneRequireByType(NamespaceAndName.class);
Branch branch = ctx.oneRequireByType(Branch.class); Branch branch = ctx.oneRequireByType(Branch.class);
appender.appendOne("ka", "http://" + namespaceAndName.logString() + "/" + branch.getName()); appender.appendLink("ka", "http://" + namespaceAndName.logString() + "/" + branch.getName());
}); });
mapper.setRegistry(registry); mapper.setRegistry(registry);

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/EdisonHalAppenderTest.java
View File

@@ -23,7 +23,7 @@ class EdisonHalAppenderTest {
@Test @Test
void shouldAppendOneLink() { void shouldAppendOneLink() {
appender.appendOne("self", "https://scm.hitchhiker.com"); appender.appendLink("self", "https://scm.hitchhiker.com");
Links links = builder.build(); Links links = builder.build();
assertThat(links.getLinkBy("self").get().getHref()).isEqualTo("https://scm.hitchhiker.com"); assertThat(links.getLinkBy("self").get().getHref()).isEqualTo("https://scm.hitchhiker.com");
@@ -31,7 +31,7 @@ class EdisonHalAppenderTest {
@Test @Test
void shouldAppendMultipleLinks() { void shouldAppendMultipleLinks() {
appender.arrayBuilder("items") appender.linkArrayBuilder("items")
.append("one", "http://one") .append("one", "http://one")
.append("two", "http://two") .append("two", "http://two")
.build(); .build();

2
scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileObjectToFileObjectDtoMapperTest.java
View File

@@ -79,7 +79,7 @@ public class FileObjectToFileObjectDtoMapperTest {
FileObject fo = ctx.oneRequireByType(FileObject.class); FileObject fo = ctx.oneRequireByType(FileObject.class);
String rev = ctx.oneRequireByType(String.class); String rev = ctx.oneRequireByType(String.class);
appender.appendOne("hog", "http://" + repository.logString() + "/" + fo.getName() + "/" + rev); appender.appendLink("hog", "http://" + repository.logString() + "/" + fo.getName() + "/" + rev);
}); });
mapper.setRegistry(registry); mapper.setRegistry(registry);

2
scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapperTest.java
View File

@@ -93,7 +93,7 @@ public class GroupToGroupDtoMapperTest {
HalEnricherRegistry registry = new HalEnricherRegistry(); HalEnricherRegistry registry = new HalEnricherRegistry();
registry.register(Group.class, (ctx, appender) -> { registry.register(Group.class, (ctx, appender) -> {
Group group = ctx.oneRequireByType(Group.class); Group group = ctx.oneRequireByType(Group.class);
appender.appendOne("some", "http://" + group.getName()); appender.appendLink("some", "http://" + group.getName());
}); });
mapper.setRegistry(registry); mapper.setRegistry(registry);

2
scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeDtoFactoryTest.java
View File

@@ -174,7 +174,7 @@ class MeDtoFactoryTest {
registry.register(Me.class, (ctx, appender) -> { registry.register(Me.class, (ctx, appender) -> {
User user = ctx.oneRequireByType(User.class); User user = ctx.oneRequireByType(User.class);
appender.appendOne("profile", "http://hitchhiker.com/users/" + user.getName()); appender.appendLink("profile", "http://hitchhiker.com/users/" + user.getName());
}); });
MeDto dto = meDtoFactory.create(); MeDto dto = meDtoFactory.create();

2
scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapperTest.java
View File

@@ -214,7 +214,7 @@ public class RepositoryToRepositoryDtoMapperTest {
HalEnricherRegistry registry = new HalEnricherRegistry(); HalEnricherRegistry registry = new HalEnricherRegistry();
registry.register(Repository.class, (ctx, appender) -> { registry.register(Repository.class, (ctx, appender) -> {
Repository repository = ctx.oneRequireByType(Repository.class); Repository repository = ctx.oneRequireByType(Repository.class);
appender.appendOne("id", "http://" + repository.getId()); appender.appendLink("id", "http://" + repository.getId());
}); });
mapper.setRegistry(registry); mapper.setRegistry(registry);

2
scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagToTagDtoMapperTest.java
View File

@@ -26,7 +26,7 @@ class TagToTagDtoMapperTest {
registry.register(Tag.class, (ctx, appender) -> { registry.register(Tag.class, (ctx, appender) -> {
NamespaceAndName repository = ctx.oneRequireByType(NamespaceAndName.class); NamespaceAndName repository = ctx.oneRequireByType(NamespaceAndName.class);
Tag tag = ctx.oneRequireByType(Tag.class); Tag tag = ctx.oneRequireByType(Tag.class);
appender.appendOne("yo", "http://" + repository.logString() + "/" + tag.getName()); appender.appendLink("yo", "http://" + repository.logString() + "/" + tag.getName());
}); });
mapper.setRegistry(registry); mapper.setRegistry(registry);

2
scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserToUserDtoMapperTest.java
View File

@@ -156,7 +156,7 @@ public class UserToUserDtoMapperTest {
User trillian = UserTestData.createTrillian(); User trillian = UserTestData.createTrillian();
HalEnricherRegistry registry = new HalEnricherRegistry(); HalEnricherRegistry registry = new HalEnricherRegistry();
registry.register(User.class, (ctx, appender) -> appender.appendOne("sample", "http://" + ctx.oneByType(User.class).get().getName())); registry.register(User.class, (ctx, appender) -> appender.appendLink("sample", "http://" + ctx.oneByType(User.class).get().getName()));
mapper.setRegistry(registry); mapper.setRegistry(registry);
UserDto userDto = mapper.map(trillian); UserDto userDto = mapper.map(trillian);