Skip to content

Commit ec681b5

Browse files
thombergsthombergs
committed
Repository -> GitRepository
1 parent 761fdd4 commit ec681b5

15 files changed

Lines changed: 64 additions & 48 deletions

spring-boot/argumentresolver/src/main/java/io/reflectoring/argumentresolver/Repository.java renamed to spring-boot/argumentresolver/src/main/java/io/reflectoring/argumentresolver/GitRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import lombok.Value;
55

66
@Value
7-
class Repository {
7+
class GitRepository {
88

99
private final Long id;
1010
private final String slug;

spring-boot/argumentresolver/src/main/java/io/reflectoring/argumentresolver/RepositoryArgumentResolver.java renamed to spring-boot/argumentresolver/src/main/java/io/reflectoring/argumentresolver/GitRepositoryArgumentResolver.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.reflectoring.argumentresolver;
22

33
import java.util.Optional;
4-
import java.util.regex.Pattern;
54
import lombok.RequiredArgsConstructor;
65
import org.springframework.core.MethodParameter;
76
import org.springframework.web.bind.support.WebDataBinderFactory;
@@ -11,13 +10,13 @@
1110
import org.springframework.web.method.support.ModelAndViewContainer;
1211

1312
@RequiredArgsConstructor
14-
class RepositoryArgumentResolver implements HandlerMethodArgumentResolver {
13+
class GitRepositoryArgumentResolver implements HandlerMethodArgumentResolver {
1514

16-
private final RepositoryFinder repositoryFinder;
15+
private final GitRepositoryFinder gitRepositoryFinder;
1716

1817
@Override
1918
public boolean supportsParameter(MethodParameter parameter) {
20-
return parameter.getParameter().getType() == Repository.class;
19+
return parameter.getParameter().getType() == GitRepository.class;
2120
}
2221

2322
@Override
@@ -33,7 +32,7 @@ public Object resolveArgument(
3332
.substring(0, requestPath.indexOf("/", 1))
3433
.replaceAll("^/", "");
3534

36-
Optional<Repository> repository = repositoryFinder.findBySlug(slug);
35+
Optional<GitRepository> repository = gitRepositoryFinder.findBySlug(slug);
3736

3837
if (repository.isEmpty()) {
3938
throw new NotFoundException();

spring-boot/argumentresolver/src/main/java/io/reflectoring/argumentresolver/RepositoryArgumentResolverConfiguration.java renamed to spring-boot/argumentresolver/src/main/java/io/reflectoring/argumentresolver/GitRepositoryArgumentResolverConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
@Component
1010
@RequiredArgsConstructor
11-
class RepositoryArgumentResolverConfiguration implements WebMvcConfigurer {
11+
class GitRepositoryArgumentResolverConfiguration implements WebMvcConfigurer {
1212

13-
private final RepositoryFinder repositoryFinder;
13+
private final GitRepositoryFinder gitRepositoryFinder;
1414

1515
@Override
1616
public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
17-
resolvers.add(new RepositoryArgumentResolver(repositoryFinder));
17+
resolvers.add(new GitRepositoryArgumentResolver(gitRepositoryFinder));
1818
}
1919

2020
}

‎spring-boot/argumentresolver/src/main/java/io/reflectoring/argumentresolver/GitRepositoryFinder.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package io.reflectoring.argumentresolver;
2+
3+
import java.util.Optional;
4+
5+
public interface GitRepositoryFinder {
6+
7+
Optional<GitRepository> findBySlug(String slug);
8+
9+
}

spring-boot/argumentresolver/src/main/java/io/reflectoring/argumentresolver/RepositoryId.java renamed to spring-boot/argumentresolver/src/main/java/io/reflectoring/argumentresolver/GitRepositoryId.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import lombok.Value;
44

55
@Value
6-
class RepositoryId {
6+
class GitRepositoryId {
77

88
private final long value;
99

‎spring-boot/argumentresolver/src/main/java/io/reflectoring/argumentresolver/GitRepositoryIdConverter.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package io.reflectoring.argumentresolver;
2+
3+
import org.springframework.core.convert.converter.Converter;
4+
import org.springframework.stereotype.Component;
5+
6+
@Component
7+
class GitRepositoryIdConverter implements Converter<String, GitRepositoryId> {
8+
9+
@Override
10+
public GitRepositoryId convert(String source) {
11+
return new GitRepositoryId(Long.parseLong(source));
12+
}
13+
}

‎spring-boot/argumentresolver/src/main/java/io/reflectoring/argumentresolver/RepositoryFinder.java‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎spring-boot/argumentresolver/src/main/java/io/reflectoring/argumentresolver/RepositoryIdConverter.java‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

spring-boot/argumentresolver/src/test/java/io/reflectoring/argumentresolver/RepositoryArgumentResolverTest.java renamed to spring-boot/argumentresolver/src/test/java/io/reflectoring/argumentresolver/GitRepositoryArgumentResolverTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@
1111
import org.springframework.boot.test.mock.mockito.MockBean;
1212
import org.springframework.test.web.servlet.MockMvc;
1313

14-
@WebMvcTest(controllers = RepositoryArgumentResolverTestController.class)
15-
class RepositoryArgumentResolverTest {
14+
@WebMvcTest(controllers = GitRepositoryArgumentResolverTestController.class)
15+
class GitRepositoryArgumentResolverTest {
1616

1717
@Autowired
1818
private MockMvc mockMvc;
1919

2020
@MockBean
21-
private RepositoryFinder repositoryFinder;
21+
private GitRepositoryFinder gitRepositoryFinder;
2222

2323
@Test
2424
void resolvesSiteSuccessfully() throws Exception {
2525

26-
given(repositoryFinder.findBySlug("my-repo"))
27-
.willReturn(Optional.of(new Repository(1L, "my-repo")));
26+
given(gitRepositoryFinder.findBySlug("my-repo"))
27+
.willReturn(Optional.of(new GitRepository(1L, "my-repo")));
2828

2929
mockMvc.perform(get("/my-repo/listContributors"))
3030
.andExpect(status().isOk());
@@ -33,7 +33,7 @@ void resolvesSiteSuccessfully() throws Exception {
3333
@Test
3434
void notFoundOnUnknownSlug() throws Exception {
3535

36-
given(repositoryFinder.findBySlug("unknownSlug"))
36+
given(gitRepositoryFinder.findBySlug("unknownSlug"))
3737
.willReturn(Optional.empty());
3838

3939
mockMvc.perform(get("/unknownSlug/listContributors"))

spring-boot/argumentresolver/src/test/java/io/reflectoring/argumentresolver/RepositoryArgumentResolverTestController.java renamed to spring-boot/argumentresolver/src/test/java/io/reflectoring/argumentresolver/GitRepositoryArgumentResolverTestController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
@RestController
1010
@RequestMapping(path = "/{repositorySlug}")
11-
class RepositoryArgumentResolverTestController {
11+
class GitRepositoryArgumentResolverTestController {
1212

1313
@GetMapping("/listContributors")
14-
String listContributors(Repository repository) {
15-
assertThat(repository.getId()).isEqualTo(1L);
14+
String listContributors(GitRepository gitRepository) {
15+
assertThat(gitRepository.getId()).isEqualTo(1L);
1616
return "test";
1717
}
1818

0 commit comments

Comments
 (0)