chore: step1 update (#25)

Author: YOU54F

.github/workflows/test.yml

@@ -0,0 +1,24 @@
+name: CI
+on:
+    push:
+        branches:
+            - step1
+    pull_request:
+        branches:
+            - step1
+jobs:
+    test:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Set up JDK 17
+              uses: actions/setup-java@v4
+              with:
+                  java-version: 17
+                  distribution: 'temurin'
+
+            - name: Test consumer tests
+              run: ./gradlew consumer:bootRun || true

.gitignore

@@ -29,6 +29,41 @@ out/
 /nbdist/
 /.nb-gradle/
 
+### VS Code ###
+.vscode/
+.gradle
+build/
+!../gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+consumer/bin
+provider/bin
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea/
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
 ### VS Code ###
 .vscode/
 .gradle
@@ -45,3 +80,7 @@ gradle-app.setting
 
 # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
 # gradle/wrapper/gradle-wrapper.properties
+
+## MacOS
+
+.DS_Store

.java-version

@@ -0,0 +1 @@
+17.0

README.md

@@ -7,7 +7,7 @@ step of the workshop just check out the branch for that step (i.e. `git checkout
 
 ## Requirements
 
-* JDK 8+
+* JDK 17+
 * Docker for step 11
 
 ## Workshop outline:

consumer/build.gradle

@@ -1,11 +1,13 @@
 plugins {
-	id 'org.springframework.boot' version '2.3.4.RELEASE'
-	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+	// Stopped from moving to 3.2.x due to wiremock issue
+	// https://github.com/wiremock/wiremock/issues/2395
+	id 'org.springframework.boot' version '3.1.8'
+	id 'io.spring.dependency-management' version '1.1.4'
 }
 
 group = 'au.com.dius.pactworkshop'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '8'
+sourceCompatibility = '17'
 
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter'
@@ -14,7 +16,7 @@ dependencies {
 	testImplementation('org.springframework.boot:spring-boot-starter-test') {
 		exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
 	}
-	testImplementation 'com.github.tomakehurst:wiremock:2.27.2'
+	testImplementation 'com.github.tomakehurst:wiremock:3.0.1'
 }
 
 test {

consumer/src/main/java/au/com/dius/pactworkshop/consumer/ConsoleInterface.java

@@ -49,10 +49,15 @@ private Integer getUserChoice(Scanner scanner) {
 
     private void printProduct(int index) {
         String id = products.get(index - 1).getId();
-        Product product = productService.getProduct(id);
+        try {
+            Product product = productService.getProduct(id);
 
-        System.out.println("Product Details\n---------------");
-        System.out.println(product);
+            System.out.println("Product Details\n---------------");
+            System.out.println(product);
+        } catch (Exception e) {
+            System.out.println("Failed to load product " + id);
+            System.out.println(e.getMessage());
+        }
     }
 
     private Integer parseChoice(String choice) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists