update

mvnw

@@ -108,7 +108,7 @@ if $cygwin ; then
     CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
 fi
 
-# For Migwn, ensure paths are in UNIX format before anything is touched
+# For Mingw, ensure paths are in UNIX format before anything is touched
 if $mingw ; then
   [ -n "$M2_HOME" ] &&
     M2_HOME="`(cd "$M2_HOME"; pwd)`"
@@ -200,8 +200,69 @@ if [ -z "$BASE_DIR" ]; then
   exit 1;
 fi
 
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        wget "$jarUrl" -O "$wrapperJarPath"
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        curl -o "$wrapperJarPath" "$jarUrl"
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
 export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
-echo $MAVEN_PROJECTBASEDIR
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
 MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
 
 # For Cygwin, switch paths to Windows format before running java

mvnw.cmd

@@ -35,6 +35,8 @@
 
 @REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
 @echo off
+@REM set title of command window
+title %0
 @REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
 @if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
 
@@ -115,10 +117,26 @@ for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do s
 :endReadAdditionalConfig
 
 SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-
 set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
+	IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B 
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    echo Found %WRAPPER_JAR%
+) else (
+    echo Couldn't find %WRAPPER_JAR%, downloading it ...
+	echo Downloading from: %DOWNLOAD_URL%
+    powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
+    echo Finished downloading %WRAPPER_JAR%
+)
+@REM End of extension
+
 %MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
 if ERRORLEVEL 1 goto error
 goto end

pom.xml

@@ -2,21 +2,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>io.zipcoder</groupId>
-	<artifactId>crud-app-starter</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
-
-	<name>crud-app-starter</name>
-	<description>Starter project for Spring Boot-based CRUD applications</description>
-
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.2.RELEASE</version>
+		<version>1.5.19.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
+	<groupId>com.personcontroller</groupId>
+	<artifactId>demo</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+	<name>demo</name>
+	<description>Demo project for Spring Boot</description>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -27,30 +24,24 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-            <scope>compile</scope>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <!--<version>RELEASE</version>-->
-        </dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-			<!--<version>1.3.5.RELEASE</version>-->
-		</dependency>
-    </dependencies>
+	</dependencies>
 
 	<build>
 		<plugins>
@@ -61,5 +52,43 @@
 		</plugins>
 	</build>
 
+	<repositories>
+		<repository>
+			<id>spring-snapshots</id>
+			<name>Spring Snapshots</name>
+			<url>https://repo.spring.io/snapshot</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/milestone</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>spring-snapshots</id>
+			<name>Spring Snapshots</name>
+			<url>https://repo.spring.io/snapshot</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/milestone</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+
 
 </project>

src/main/java/com/personcontroller/demo/DemoApplication.java

@@ -0,0 +1,12 @@
+package com.personcontroller.demo;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class DemoApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(DemoApplication.class, args);
+	}
+}

src/main/java/com/personcontroller/demo/Person.java

@@ -0,0 +1,45 @@
+package com.personcontroller.demo;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Person {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private String firstName;
+    private String lastName;
+    private Integer id;
+
+
+    public Person() {
+
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+}

src/main/java/com/personcontroller/demo/PersonController.java

@@ -0,0 +1,56 @@
+package com.personcontroller.demo;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+
+@RestController
+public class PersonController {
+
+    @Autowired
+    PersonRepository personRepository;
+
+    @RequestMapping(value = "/people", method = RequestMethod.POST)
+    public ResponseEntity<Person> createPerson(@RequestBody Person p){
+
+        return new ResponseEntity<>(personRepository.save(p), HttpStatus.CREATED);
+    }
+
+    @RequestMapping(value = "/people{id}", method = RequestMethod.GET)
+    public ResponseEntity<Person> getPerson(@PathVariable Integer id){
+
+        Person p = personRepository.findOne(id);
+
+        if(p==null){
+            return new ResponseEntity<>(p, HttpStatus.NOT_FOUND);
+        }
+        return new ResponseEntity<>(p, HttpStatus.OK);
+    }
+
+    @RequestMapping(value = "/people", method = RequestMethod.GET)
+    public ResponseEntity<Iterable<Person>> getPersonList(){
+
+        return new ResponseEntity<>(personRepository.findAll(), HttpStatus.OK);
+    }
+
+    @RequestMapping(value = "/people{id}", method = RequestMethod.PUT)
+    public ResponseEntity<Person> updatePerson(@PathVariable Integer id, @RequestBody Person updatedPerson){
+
+        Person p = personRepository.findOne(id);
+
+        if(p!=null){
+            return new ResponseEntity<>(updatedPerson, HttpStatus.OK);
+        }
+            updatedPerson.setId(id);
+            personRepository.save(updatedPerson);
+        return new ResponseEntity<>(updatedPerson, HttpStatus.CREATED);
+    }
+
+    @RequestMapping(value = "/people", method = RequestMethod.DELETE)
+    public ResponseEntity<?> deletePerson(@PathVariable Integer id){
+        personRepository.delete(id);
+        return new ResponseEntity<>(null, HttpStatus.NO_CONTENT);
+    }
+}

src/main/java/com/personcontroller/demo/PersonRepository.java

@@ -0,0 +1,8 @@
+package com.personcontroller.demo;
+
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PersonRepository extends CrudRepository<Person, Integer> {
+}

src/main/java/io/zipcoder/crudapp/CRUDApplication.java

@@ -1,22 +0,0 @@
-package io.zipcoder.crudapp;
-
-import org.h2.server.web.WebServlet;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
-import org.springframework.context.annotation.Bean;
-
-@SpringBootApplication
-public class CRUDApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(CRUDApplication.class, args);
-	}
-
-	@Bean
-	ServletRegistrationBean h2servletRegistration(){
-		ServletRegistrationBean registrationBean = new ServletRegistrationBean( new WebServlet());
-		registrationBean.addUrlMappings("/console/*");
-		return registrationBean;
-	}
-}

src/main/resources/application-h2.properties

@@ -1,4 +0,0 @@
-spring.datasource.url=jdbc:h2:mem:testdb;Mode=Oracle
-spring.datasource.platform=h2
-spring.jpa.hibernate.ddl-auto=none
-spring.datasource.continue-on-error=true

src/main/resources/application.properties

@@ -1,3 +0,0 @@
-spring.profiles.active=h2
-
-spring.jpa.database-platform=org.hibernate.dialect.Oracle10gDialect

src/main/resources/schema-h2.sql

@@ -1,11 +0,0 @@
-DROP TABLE PERSON;
-
-CREATE TABLE PERSON (
-ID NUMBER(10,0) NOT NULL AUTO_INCREMENT,
-FIRST_NAME VARCHAR2(255) DEFAULT NULL,
-LAST_NAME VARCHAR2(255) DEFAULT NULL,
-PRIMARY KEY (ID));
-
-DROP SEQUENCE hibernate_sequence;
-
-CREATE SEQUENCE hibernate_sequence;

src/main/resources/static/Requests.html

@@ -1,232 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-    <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
-    <style media="screen">
-    h2 {
-      font-size: 1.2em;
-    }
-
-    #mainContent {
-    display: inline-flex;
-    }
-
-    #displayContainer {
-      width: 50%;
-    }
-    </style>
-</head>
-<body>
-  <section id="mainContent">
-
-
-    <section id="requestForms">
-
-
-      <section>
-        <h2>GET person list</h2>
-        <button type="button" name="submitGetAll" onclick="getPeople()">Submit GET All</button>
-      </section>
-      <section>
-        <h2>GET person by id</h2>
-        <label for="getPersonId">Person ID:</label><input type="number" name="getPersonId" value="1" id="getPersonId"><br>
-        <button type="button" name="submitGet" onclick="getPerson()">Submit GET</button>
-      </section>
-      <section>
-        <h2>POST new Person:</h2>
-
-        <label for="firstName">First Name:</label><input type="text" name="firstName" value="foo" id="postPersonFirstName"><br>
-        <label for="lastName">Last Name:</label><input type="text" name="lastName" value="bar" id="postPersonLastName"><br>
-        <button type="button" name="submitPost" onclick="postPerson()">Submit POST</button>
-      </section>
-
-      <section>
-        <h2>PUT updated person</h2>
-        <label for="putFirstName">First Name:</label><input type="text" name="putFirstName" value="Han" id="putPersonFirstName"><br>
-        <label for="putLastName">Last Name:</label><input type="text" name="putLastName" value="Solo" id="putPersonLastName"><br>
-        <label for="putId">ID:</label><input type="number" name="putId" value="" id="putPersonId"><br>
-        <button type="button" name="submitPut" onclick="putPerson()">Submit PUT</button>
-      </section>
-
-      <section>
-        <h2>DELETE person by ID</h2>
-        <label for="delPersonId">Person ID:</label><input type="number" name="delPersonId" value="1" id="deletePersonId"><br>
-        <button type="button" name="submitDelete" onclick="deletePerson()">Submit DELETE</button>
-      </section>
-    </section>
-    <section id="displayContainer" >
-      <div class="display" id="displayBox" >
-        Nothing to Display
-      </div>
-
-    </section>
-  </section>
-<script>
-
-function updateDisplay(content, header){
-  var newContent = content;
-  if(header != null){
-    newContent = header + newContent;
-  }
-  document.getElementById("displayBox").innerHTML = newContent;
-}
-function postPerson(){
-  // get values from fields
-  var postFirstName = document.getElementById("postPersonFirstName").value;
-  var postLastName = document.getElementById("postPersonLastName").value;
-  var URI = "http://localhost:8080/people/";
-  var requestType = "POST";
-
-  var postData = JSON.stringify({
-  "firstName": postFirstName,
-  "lastName": postLastName
-});
-  console.log("Requesting post for person:");
-  console.log(postData);
-  // send POST request
-  var xhr = new XMLHttpRequest();
-xhr.withCredentials = true;
-
-xhr.addEventListener("readystatechange", function () {
-  if (this.readyState === 4) {
-    console.log(this)
-    console.log(this.responseText);
-    updateDisplay(this.responseText, requestType + URI + ":<br>");
-  }
-});
-
-xhr.open(requestType, URI);
-xhr.setRequestHeader("content-type", "application/json");
-xhr.setRequestHeader("cache-control", "no-cache");
-// xhr.setRequestHeader("postman-token", "b11af5d0-9526-b27a-e6fc-a89dc4d348fc");
-
-xhr.send(postData);
-  // update display with result
-}
-
-
-
-function putPerson(){
-  // get values from fields
-  // send POST request
-  // update display with result
-  // get values from fields
-  var putFirstName = document.getElementById("putPersonFirstName").value;
-  var putLastName = document.getElementById("putPersonLastName").value;
-  var putId = document.getElementById("putPersonId").value;
-  var URI = "http://localhost:8080/people/" + putId;
-  var requestType = "PUT";
-
-  var putData = JSON.stringify({
-  "firstName": putFirstName,
-  "lastName": putLastName,
-  "id": putId
-});
-  console.log("Requesting put for person:");
-  console.log(putData);
-  // send POST request
-  var xhr = new XMLHttpRequest();
-xhr.withCredentials = true;
-
-xhr.addEventListener("readystatechange", function () {
-  if (this.readyState === 4) {
-    console.log(this)
-    console.log(this.responseText);
-    // updateDisplay(this.responseText);
-    updateDisplay(this.responseText, requestType + URI + ":<br>");
-  }
-});
-
-xhr.open(requestType, URI);
-xhr.setRequestHeader("content-type", "application/json");
-xhr.setRequestHeader("cache-control", "no-cache");
-// xhr.setRequestHeader("postman-token", "b11af5d0-9526-b27a-e6fc-a89dc4d348fc");
-
-xhr.send(putData);
-}
-
-function getPerson(){
-
-  var getId = document.getElementById("getPersonId").value;
-  var URI = "http://localhost:8080/people/" + getId;
-  var requestType = "GET";
-  var xhr = new XMLHttpRequest();
-
-xhr.withCredentials = true;
-
-xhr.addEventListener("readystatechange", function () {
-  if (this.readyState === 4) {
-    console.log(this)
-    console.log(this.responseText);
-    updateDisplay(this.responseText, requestType + URI + ":<br>");
-  }
-});
-
-xhr.open(requestType, URI);
-xhr.setRequestHeader("content-type", "application/json");
-xhr.setRequestHeader("cache-control", "no-cache");
-// xhr.setRequestHeader("postman-token", "b11af5d0-9526-b27a-e6fc-a89dc4d348fc");
-
-xhr.send(null);
-  // get values from fields
-  // send POST request
-  // update display with result
-}
-
-function getPeople(){
-  // send GET /person request
-  // update display with result
-  var URI = "http://localhost:8080/people/";
-  var requestType = "GET";
-
-  var xhr = new XMLHttpRequest();
-xhr.withCredentials = true;
-
-xhr.addEventListener("readystatechange", function () {
-  if (this.readyState === 4) {
-    console.log(this)
-    console.log(this.responseText);
-    updateDisplay(this.responseText, requestType + URI + ":<br>");
-  }
-});
-
-xhr.open(requestType, URI);
-xhr.setRequestHeader("content-type", "application/json");
-xhr.setRequestHeader("cache-control", "no-cache");
-// xhr.setRequestHeader("postman-token", "b11af5d0-9526-b27a-e6fc-a89dc4d348fc");
-
-xhr.send(null);
-}
-
-function deletePerson(){
-
-    var deleteId = document.getElementById("deletePersonId").value;
-    var URI = "http://localhost:8080/people/" + deleteId;
-    var requestType = "DELETE";
-    var xhr = new XMLHttpRequest();
-
-  xhr.withCredentials = true;
-
-  xhr.addEventListener("readystatechange", function () {
-    if (this.readyState === 4) {
-      console.log(this)
-      console.log(this.responseText);
-      updateDisplay(this.responseText, requestType + URI + ":<br>");
-    }
-  });
-
-  xhr.open(requestType, URI);
-  xhr.setRequestHeader("content-type", "application/json");
-  xhr.setRequestHeader("cache-control", "no-cache");
-  // xhr.setRequestHeader("postman-token", "b11af5d0-9526-b27a-e6fc-a89dc4d348fc");
-
-  xhr.send(null);
-  // get values from fields
-  // send DELETE request
-  // update display with result
-}
-</script>
-</body>
-</html>

src/test/java/io/zipcoder/crudapp/CRUDApplicationTests.java → src/test/java/com/personcontroller/demo/DemoApplicationTests.java

@@ -1,4 +1,4 @@
-package io.zipcoder.crudapp;
+package com.personcontroller.demo;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class CRUDApplicationTests {
+public class DemoApplicationTests {
 
 	@Test
 	public void contextLoads() {