Merge branch 'master' into master

2018-01-11 08:31:58 +00:00
parent 9ff8a53c7d 07750c2266
commit 6d6cc2d50e
280 changed files with 7009 additions and 1260 deletions
@@ -1,61 +0,0 @@
-package com.baeldung.functional;
-
-import static org.springframework.web.reactive.function.BodyInserters.fromObject;
-import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
-import static org.springframework.web.reactive.function.server.RouterFunctions.route;
-import static org.springframework.web.reactive.function.server.RouterFunctions.toHttpHandler;
-import static org.springframework.web.reactive.function.server.ServerResponse.ok;
-
-import org.apache.catalina.Context;
-import org.apache.catalina.startup.Tomcat;
-import org.springframework.boot.web.embedded.tomcat.TomcatWebServer;
-import org.springframework.boot.web.server.WebServer;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.http.server.reactive.HttpHandler;
-import org.springframework.http.server.reactive.ServletHttpHandlerAdapter;
-import org.springframework.web.reactive.function.server.RouterFunction;
-import org.springframework.web.reactive.function.server.RouterFunctions;
-import org.springframework.web.reactive.function.server.ServerResponse;
-import org.springframework.web.server.WebHandler;
-import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
-
-public class ExploreSpring5URLPatternUsingRouterFunctions {
-
-    private RouterFunction<ServerResponse> routingFunction() {
-
-        return route(GET("/p?ths"), serverRequest -> ok().body(fromObject("/p?ths"))).andRoute(GET("/test/{*id}"), serverRequest -> ok().body(fromObject(serverRequest.pathVariable("id"))))
-            .andRoute(GET("/*card"), serverRequest -> ok().body(fromObject("/*card path was accessed")))
-            .andRoute(GET("/{var1}_{var2}"), serverRequest -> ok().body(fromObject(serverRequest.pathVariable("var1") + " , " + serverRequest.pathVariable("var2"))))
-            .andRoute(GET("/{baeldung:[a-z]+}"), serverRequest -> ok().body(fromObject("/{baeldung:[a-z]+} was accessed and baeldung=" + serverRequest.pathVariable("baeldung"))))
-            .and(RouterFunctions.resources("/files/{*filepaths}", new ClassPathResource("files/")));
-    }
-
-    WebServer start() throws Exception {
-        WebHandler webHandler = (WebHandler) toHttpHandler(routingFunction());
-        HttpHandler httpHandler = WebHttpHandlerBuilder.webHandler(webHandler)
-            .filter(new IndexRewriteFilter())
-            .build();
-
-        Tomcat tomcat = new Tomcat();
-        tomcat.setHostname("localhost");
-        tomcat.setPort(9090);
-        Context rootContext = tomcat.addContext("", System.getProperty("java.io.tmpdir"));
-        ServletHttpHandlerAdapter servlet = new ServletHttpHandlerAdapter(httpHandler);
-        Tomcat.addServlet(rootContext, "httpHandlerServlet", servlet);
-        rootContext.addServletMappingDecoded("/", "httpHandlerServlet");
-
-        TomcatWebServer server = new TomcatWebServer(tomcat);
-        server.start();
-        return server;
-
-    }
-
-    public static void main(String[] args) {
-        try {
-            new FunctionalWebApplication().start();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-}
@@ -0,0 +1,62 @@
+package com.baeldung.restdocs;
+
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.Valid;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/crud")
+public class CRUDController {
+
+    @GetMapping
+    public List<CrudInput> read(@RequestBody @Valid CrudInput crudInput) {
+        List<CrudInput> returnList = new ArrayList<>();
+        returnList.add(crudInput);
+        return returnList;
+    }
+
+    @ResponseStatus(HttpStatus.CREATED)
+    @PostMapping
+    public HttpHeaders save(@RequestBody @Valid CrudInput crudInput) {
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setLocation(linkTo(CRUDController.class).slash(crudInput.getId()).toUri());
+        return httpHeaders;
+    }
+
+    @DeleteMapping("/{id}")
+    @ResponseStatus(HttpStatus.OK)
+    HttpHeaders delete(@PathVariable("id") long id) {
+        return new HttpHeaders();
+    }
+
+    @PutMapping("/{id}")
+    @ResponseStatus(HttpStatus.ACCEPTED)
+    void put(@PathVariable("id") long id, @RequestBody CrudInput crudInput) {
+
+    }
+
+    @PatchMapping("/{id}")
+    public List<CrudInput> patch(@PathVariable("id") long id, @RequestBody CrudInput crudInput) {
+        List<CrudInput> returnList = new ArrayList<CrudInput>();
+        crudInput.setId(id);
+        returnList.add(crudInput);
+        return returnList;
+    }
+}
@@ -0,0 +1,66 @@
+package com.baeldung.restdocs;
+
+import java.net.URI;
+import java.util.Collections;
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class CrudInput {
+    
+    @NotNull
+    private long id;
+    
+    @NotBlank
+    private String title;
+
+    private String body;
+
+    private List<URI> tagUris;
+
+    @JsonCreator
+    public CrudInput(@JsonProperty("id") long id, @JsonProperty("title") String title, @JsonProperty("body") String body, @JsonProperty("tags") List<URI> tagUris) {
+        this.id=id;
+        this.title = title;
+        this.body = body;
+        this.tagUris = tagUris == null ? Collections.<URI> emptyList() : tagUris;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getBody() {
+        return body;
+    }
+    
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public void setBody(String body) {
+        this.body = body;
+    }
+
+    public void setTagUris(List<URI> tagUris) {
+        this.tagUris = tagUris;
+    }
+
+    @JsonProperty("tags")
+    public List<URI> getTagUris() {
+        return this.tagUris;
+    }
+
+}
@@ -0,0 +1,21 @@
+package com.baeldung.restdocs;
+
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
+
+import org.springframework.hateoas.ResourceSupport;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/")
+public class IndexController {
+
+    @GetMapping
+    public ResourceSupport index() {
+        ResourceSupport index = new ResourceSupport();
+        index.add(linkTo(CRUDController.class).withRel("crud"));
+        return index;
+    }
+
+}
@@ -0,0 +1,12 @@
+package com.baeldung.restdocs;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SpringRestDocsApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringRestDocsApplication.class, args);
+    }
+}
@@ -1,39 +0,0 @@
-package com.baeldung.web;
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class PathPatternController {
-
-    @GetMapping("/spring5/{*id}")
-    public String URIVariableHandler(@PathVariable String id) {
-        return id;
-    }
-
-    @GetMapping("/s?ring5")
-    public String wildcardTakingExactlyOneChar() {
-        return "/s?ring5";
-    }
-
-    @GetMapping("/spring5/*id")
-    public String wildcardTakingZeroOrMoreChar() {
-        return "/spring5/*id";
-    }
-
-    @GetMapping("/resources/**")
-    public String wildcardTakingZeroOrMorePathSegments() {
-        return "/resources/**";
-    }
-
-    @GetMapping("/{baeldung:[a-z]+}")
-    public String regexInPathVariable(@PathVariable String baeldung) {
-        return baeldung;
-    }
-
-    @GetMapping("/{var1}_{var2}")
-    public String multiplePathVariablesInSameSegment(@PathVariable String var1, @PathVariable String var2) {
-        return "Two variables are var1=" + var1 + " and var2=" + var2;
-    }
-}