updated with valueOf()

Author: thombergs

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

@@ -32,12 +32,7 @@ public Object resolveArgument(
         .substring(0, requestPath.indexOf("/", 1))
         .replaceAll("^/", "");
 
-    Optional<GitRepository> repository = gitRepositoryFinder.findBySlug(slug);
-
-    if (repository.isEmpty()) {
-      throw new NotFoundException();
-    }
-
-    return repository.get();
+    return gitRepositoryFinder.findBySlug(slug)
+        .orElseThrow(NotFoundException::new);
   }
 }

spring-boot/argumentresolver/src/main/java/io/reflectoring/argumentresolver/GitRepositoryIdWithValueOf.java

@@ -0,0 +1,17 @@
+package io.reflectoring.argumentresolver;
+
+import lombok.Value;
+
+@Value
+class GitRepositoryIdWithValueOf {
+
+  private final long value;
+
+  /**
+   * If we have a static valueOf(String) method, we don't need a Converter!
+   */
+  public static GitRepositoryIdWithValueOf valueOf(String value){
+    return new GitRepositoryIdWithValueOf(Long.parseLong(value));
+  }
+
+}

spring-boot/argumentresolver/src/test/java/io/reflectoring/argumentresolver/GitRepositoryIdWithValueOfTest.java

@@ -0,0 +1,27 @@
+package io.reflectoring.argumentresolver;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.web.servlet.MockMvc;
+
+@WebMvcTest(controllers = GitRepositoryIdWithValueOfTestController.class)
+class GitRepositoryIdWithValueOfTest {
+
+  @Autowired
+  private MockMvc mockMvc;
+
+  @MockBean
+  private GitRepositoryFinder gitRepositoryFinder;
+
+  @Test
+  void resolvesRepositoryId() throws Exception {
+    mockMvc.perform(get("/repositories/42"))
+        .andExpect(status().isOk());
+  }
+
+}

spring-boot/argumentresolver/src/test/java/io/reflectoring/argumentresolver/GitRepositoryIdWithValueOfTestController.java

@@ -0,0 +1,18 @@
+package io.reflectoring.argumentresolver;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+class GitRepositoryIdWithValueOfTestController {
+
+  @GetMapping("/repositories/{repositoryId}")
+  String getRepository(@PathVariable("repositoryId") GitRepositoryIdWithValueOf gitRepositoryId) {
+    assertThat(gitRepositoryId).isNotNull();
+    return "test";
+  }
+
+}