From 46581485e2188e398b044b8a066ff19b2ae797ec Mon Sep 17 00:00:00 2001
From: unknown <tom@laffyco.net>
Date: Sun, 5 Dec 2021 14:05:10 +0000
Subject: [PATCH 1/2] Update to JDK 17

---
 .classpath                  |  7 +------
 .github/workflows/maven.yml |  4 ++--
 pom.xml                     | 20 +-------------------
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/.classpath b/.classpath
index fc790a6..6fd6b4f 100644
--- a/.classpath
+++ b/.classpath
@@ -18,16 +18,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="/Java-Matching-Engine-Core"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 1fb4a17..e855b3f 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -16,10 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'adopt'
         cache: maven
         server-id: github
diff --git a/pom.xml b/pom.xml
index c34d74d..571f108 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 	<name>rest-api</name>
 	<description>Rest API for the Java Matching Engine</description>
 	<properties>
-		<java.version>1.8</java.version>
+		<java.version>17</java.version>
 	</properties>
 
 	<repositories>
@@ -72,24 +72,6 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}</outputDirectory>
-							<overWriteReleases>false</overWriteReleases>
-							<overWriteSnapshots>true</overWriteSnapshots>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 

From 9e16ae1b83a6e89d21a94c7c924e1610b835d20f Mon Sep 17 00:00:00 2001
From: unknown <tom@laffyco.net>
Date: Sat, 11 Dec 2021 09:03:08 +0000
Subject: [PATCH 2/2] URL best practices

---
 README.md                                        | 16 ++++++++--------
 .../restapi/controllers/OrderController.java     |  2 +-
 .../restapi/controllers/SpreadController.java    |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 1669634..41da75f 100644
--- a/README.md
+++ b/README.md
@@ -42,10 +42,10 @@ User A creates a buy order of 2 items (e.g. 2 shares, 2 bitcoin, etc) with a pri
 ##### Request
 
 ```
-POST /order/
-	?side=BUY
-    &amount=2
-    &price=5
+POST /api/v1/order/
+		?side=BUY
+		&amount=2
+		&price=5
 ``` 
 ##### Response
 
@@ -67,10 +67,10 @@ User B creates a sell order of 2 items with a price of 5.
 ##### Request
 
 ```
-POST /order/
-	?side=SELL
-    &amount=2
-    &price=5
+POST api/v1//order/
+		?side=SELL
+		&amount=2
+		&price=5
 ``` 
 
 ##### Response
diff --git a/src/main/java/net/laffyco/javamatchingengine/restapi/controllers/OrderController.java b/src/main/java/net/laffyco/javamatchingengine/restapi/controllers/OrderController.java
index 3d3b488..071ae08 100644
--- a/src/main/java/net/laffyco/javamatchingengine/restapi/controllers/OrderController.java
+++ b/src/main/java/net/laffyco/javamatchingengine/restapi/controllers/OrderController.java
@@ -25,7 +25,7 @@
  *
  */
 @RestController
-@RequestMapping("/order")
+@RequestMapping("/api/v1/order")
 public class OrderController {
 
     /**
diff --git a/src/main/java/net/laffyco/javamatchingengine/restapi/controllers/SpreadController.java b/src/main/java/net/laffyco/javamatchingengine/restapi/controllers/SpreadController.java
index 0ee5f3b..de6e598 100644
--- a/src/main/java/net/laffyco/javamatchingengine/restapi/controllers/SpreadController.java
+++ b/src/main/java/net/laffyco/javamatchingengine/restapi/controllers/SpreadController.java
@@ -16,7 +16,7 @@
  *
  */
 @RestController
-@RequestMapping("/spread")
+@RequestMapping("/api/v1/spread")
 public class SpreadController {
 
     /**