diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..c5f3f6b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive" +} \ No newline at end of file diff --git a/TestAccountLoadSequence.dot b/TestAccountLoadSequence.dot deleted file mode 100755 index e69de29..0000000 diff --git a/build.gradle b/build.gradle index 58a1aea..fa678bc 100644 --- a/build.gradle +++ b/build.gradle @@ -11,9 +11,6 @@ plugins { id 'application' } -sourceCompatibility = JavaVersion.VERSION_21 -targetCompatibility = JavaVersion.VERSION_21 - application { mainClass = 'lodge.TestReservations' } @@ -23,15 +20,17 @@ sourceSets { java { srcDirs = ['src/java'] } + runtimeClasspath = files("$projectDir/libs/*.jars") } } repositories { + mavenCentral() fileTree(dir:'libs', include:'*.jar') } dependencies { - implementation files('libs/gson-2.13.1.jar') + implementation 'com.google.code.gson:gson:2.13.2' } jar { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4081da..2e11132 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/libs/com.google.code.gson:gson:2.13.2.jar b/libs/com.google.code.gson:gson:2.13.2.jar new file mode 100644 index 0000000..5a1b74e Binary files /dev/null and b/libs/com.google.code.gson:gson:2.13.2.jar differ diff --git a/libs/gson-2.13.1.jar b/libs/gson-2.13.1.jar deleted file mode 100644 index 159b930..0000000 Binary files a/libs/gson-2.13.1.jar and /dev/null differ diff --git a/src/resources/acc-A1450981765.json b/src/resources/acc-A1450981765.json index 64286ac..e9fcb96 100755 --- a/src/resources/acc-A1450981765.json +++ b/src/resources/acc-A1450981765.json @@ -1 +1 @@ -{ "Account":{"account_number": "A1450981765","phone_number": "701-456-7890","mailing_address": { "Address":{"street": "10 wilco ave","city": "wilco","state": "WY","zip": "82801"}},"email_address": { "EmailAddress":{"email": "wilco@wyommin.net"}},"reservations":[]}} \ No newline at end of file +{ "Account":{"account_number": "A1450981765","phone_number": "701-456-7890","mailing_address": { "Address":{"street": "10 wilco ave","city": "wilco","state": "WY","zip": "82801"}},"email_address": { "EmailAddress":{"email": "wilco@wyommin.net"}},"reservations":[{"CabinReservation":{"reservation_number":"R0535276622"}},{"HouseReservation":{"reservation_number":"R0499811708"}}]}} \ No newline at end of file diff --git a/uml/sequencediagram.dot b/uml/sequencediagram.dot index bbbd57d..ada9a7c 100755 --- a/uml/sequencediagram.dot +++ b/uml/sequencediagram.dot @@ -53,7 +53,7 @@ digraph TestAccountLoadSequence { actor2_event2 -> actor2_bottom; - // And one more time. + // Again actor3_event2 actor3_event3 @@ -62,13 +62,12 @@ digraph TestAccountLoadSequence { actor3_event3 -> actor3_bottom; - // We connect each event src/dest. First we make sure they - // are vertically aligned. + // Connect each event src/dest. vertically aligned. {rank=same; actor1_event1 actor2_event1} {rank=same; actor2_event2 actor3_event2} {ranke=same; actor3_event3 actor1_event3} - // Finally, we connect the dots. + // Connect the dots. edge [constraint=false, arrowhead=normal]; actor1_event1 -> actor2_event1 [xlabel="AddAccount(Acount)"];