diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 48632294fac9394ee4e46e66177f721305973c9c..51377879d7e20a4f7e026da6c451747217642e63 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -465,6 +465,7 @@
</inspection_tool>
<inspection_tool class="ConstantExpression" enabled="false" level="INFORMATION" enabled_by_default="false" />
<inspection_tool class="ConstantIfStatementJS" enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="ConstantValue" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="ConstraintValidatorCreator" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="ContextComponentScanInconsistencyInspection" enabled="false" level="ERROR" enabled_by_default="false" />
<inspection_tool class="ContextJavaBeanUnresolvedMethodsInspection" enabled="false" level="ERROR" enabled_by_default="false" />
@@ -660,6 +661,9 @@
<inspection_tool class="ExtendsAnnotation" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="ExtendsObject" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="ExternalizableWithoutPublicNoArgConstructor" enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="ExtractMethodRecommender" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="minLength" value="635" />
+ </inspection_tool>
<inspection_tool class="FacesModelInspection" enabled="false" level="ERROR" enabled_by_default="false" />
<inspection_tool class="FakeJvmFieldConstant" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="FallThroughInSwitchStatementJS" enabled="false" level="WARNING" enabled_by_default="false" />
@@ -700,7 +704,6 @@
<inspection_tool class="GrUnnecessaryPublicModifier" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="GrUnnecessarySemicolon" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="GrUnresolvedAccess" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
- <inspection_tool class="GradleKotlinxCoroutinesDeprecation" enabled="false" level="ERROR" enabled_by_default="false" />
<inspection_tool class="GroovyAccessToStaticFieldLockedOnInstance" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="GroovyAccessibility" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="GroovyAssignabilityCheck" enabled="false" level="WARNING" enabled_by_default="false" />
@@ -738,7 +741,6 @@
<inspection_tool class="GroovyUnusedDeclaration" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="GroovyUnusedIncOrDec" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="GroovyVariableNotAssigned" enabled="false" level="WARNING" enabled_by_default="false" />
- <inspection_tool class="Guava" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="HardwiredNamespacePrefix" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="HasPlatformType" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
<inspection_tool class="HibernateConfigDomFacetInspection" enabled="false" level="WARNING" enabled_by_default="false" />
@@ -891,7 +893,6 @@
<inspection_tool class="JSTypeOfValues" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="JSUndeclaredVariable" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
<inspection_tool class="JSUndefinedPropertyAssignment" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
- <inspection_tool class="JSUnfilteredForInLoop" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="JSUnnecessarySemicolon" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="JSUnreachableSwitchBranches" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="JSUnresolvedExtXType" enabled="false" level="WARNING" enabled_by_default="false" />
@@ -967,6 +968,7 @@
<inspection_tool class="JavaRequiresAutoModule" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="JavaStylePropertiesInvocation" enabled="false" level="INFORMATION" enabled_by_default="false" />
<inspection_tool class="JavacQuirks" enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="JavadocDeclaration" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="JavadocReference" enabled="false" level="ERROR" enabled_by_default="false" />
<inspection_tool class="JavaeeApplicationDomInspection" enabled="false" level="ERROR" enabled_by_default="false" />
<inspection_tool class="JdkProxiedBeanTypeInspection" enabled="false" level="ERROR" enabled_by_default="false" />
@@ -1043,7 +1045,6 @@
<inspection_tool class="MarkdownUnresolvedFileReference" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="MarkedForRemoval" enabled="false" level="ERROR" enabled_by_default="false" />
<inspection_tool class="MathRandomCastToInt" enabled="false" level="WARNING" enabled_by_default="false" />
- <inspection_tool class="MavenCoroutinesDeprecation" enabled="false" level="ERROR" enabled_by_default="false" />
<inspection_tool class="MavenDuplicateDependenciesInspection" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="MavenDuplicatePluginInspection" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="MavenModelInspection" enabled="false" level="ERROR" enabled_by_default="false" />
@@ -1074,6 +1075,39 @@
<inspection_tool class="MissedExecutable" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="MissingAspectjAutoproxyInspection" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="MissingFinalNewline" enabled="false" level="ERROR" enabled_by_default="false" />
+ <inspection_tool class="MissingJavadoc" enabled="false" level="WARNING" enabled_by_default="false">
+ <option name="PACKAGE_SETTINGS">
+ <Options>
+ <option name="ENABLED" value="false" />
+ </Options>
+ </option>
+ <option name="MODULE_SETTINGS">
+ <Options>
+ <option name="ENABLED" value="false" />
+ </Options>
+ </option>
+ <option name="TOP_LEVEL_CLASS_SETTINGS">
+ <Options>
+ <option name="ENABLED" value="false" />
+ </Options>
+ </option>
+ <option name="INNER_CLASS_SETTINGS">
+ <Options>
+ <option name="ENABLED" value="false" />
+ </Options>
+ </option>
+ <option name="METHOD_SETTINGS">
+ <Options>
+ <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
+ <option name="ENABLED" value="false" />
+ </Options>
+ </option>
+ <option name="FIELD_SETTINGS">
+ <Options>
+ <option name="ENABLED" value="false" />
+ </Options>
+ </option>
+ </inspection_tool>
<inspection_tool class="MissingMnemonic" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="MissingOverrideAnnotation" enabled="false" level="INFORMATION" enabled_by_default="false">
<option name="ignoreObjectMethods" value="true" />
@@ -1127,7 +1161,6 @@
<inspection_tool class="ObjectLiteralToLambda" enabled="false" level="INFO" enabled_by_default="false" />
<inspection_tool class="ObjectPropertyName" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
<inspection_tool class="ObjectsEqualsCanBeSimplified" enabled="false" level="INFORMATION" enabled_by_default="false" />
- <inspection_tool class="ObsoleteExperimentalCoroutines" enabled="false" level="ERROR" enabled_by_default="false" />
<inspection_tool class="ObviousNullCheck" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="OctalIntegerJS" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="OctalLiteral" enabled="false" level="WARNING" enabled_by_default="false" />
@@ -1136,6 +1169,7 @@
<inspection_tool class="OptionalExpectation" enabled="false" level="INFORMATION" enabled_by_default="false" />
<inspection_tool class="OptionalGetWithoutIsPresent" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="OptionalIsPresent" enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="OptionalOfNullableMisuseMerged" />
<inspection_tool class="OptionalUsedAsFieldOrParameterType" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="OverflowingLoopIndex" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="OverridingDeprecatedMember" enabled="false" level="WARNING" enabled_by_default="false" />
@@ -1441,7 +1475,6 @@
<inspection_tool class="SqlWithoutWhereInspection" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="StatefulEp" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="StaticInitializerReferencesSubClass" enabled="false" level="WARNING" enabled_by_default="false" />
- <inspection_tool class="StaticPseudoFunctionalStyleMethod" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="StreamToLoop" enabled="false" level="INFORMATION" enabled_by_default="false" />
<inspection_tool class="StringBufferReplaceableByString" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="StringBufferReplaceableByStringBuilder" enabled="false" level="WARNING" enabled_by_default="false" />
@@ -1668,7 +1701,7 @@
<inspection_tool class="YAMLSchemaValidation" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="YAMLUnresolvedAlias" enabled="false" level="ERROR" enabled_by_default="false" />
<inspection_tool class="YAMLUnusedAnchor" enabled="false" level="WARNING" enabled_by_default="false" />
- <inspection_tool class="unused" enabled="false" level="WARNING" enabled_by_default="false">
+ <inspection_tool class="unused" enabled="false" level="WARNING" enabled_by_default="false" checkParameterExcludingHierarchy="false">
<option name="LOCAL_VARIABLE" value="true" />
<option name="FIELD" value="true" />
<option name="METHOD" value="true" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7978ed437e52d30798d86ae0a17b5961e710139b..409a7dd9bc9e1c7fc2cef5bf6cf0f75b92f1348a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="FrameworkDetectionExcludesConfiguration">
@@ -6,7 +7,7 @@
<component name="PDMPlugin">
<option name="skipTestSources" value="false" />
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_22" default="true" project-jdk-name="openjdk-22" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 15a79b75d74cb544b2472ce4d614f914f9585c64..b0d88cad31d185b287241797fb9095d4261e7fa4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -96,7 +96,7 @@ jacocoTestCoverageVerification {
rule {
element = 'CLASS'
limit {
- counter = 'BRANCH'
+ counter = 'LINE'
value = 'COVEREDRATIO'
minimum = 0.5
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 15de90249f9d9972adb9760d44c483e329aba6b4..57f4f7f3768662986497a0c04cf5ddac8cef0461 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Apr 26 16:59:12 BST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/public/index.html b/public/index.html
index de5a138afb54662ccbe659bda6282fed1379fa0c..c9b0ea86f9ba9a5fdad5d74ec21d77c7ff57099d 100644
--- a/public/index.html
+++ b/public/index.html
@@ -15,7 +15,7 @@
<a href="jacocoHtml">Test Coverage</a>
</div>
<div>
-<a href="build/libs/assessment-2023-starter-monopoly-1.0-SNAPSHOT-all.jar">Executable Application Jar</a>
+<a href="build/libs/assessment-2024-starter-monopoly-1.0-SNAPSHOT-all.jar">Executable Application Jar</a>
</div>
diff --git a/src/main/java/com/cm6123/monopoly/app/Application.java b/src/main/java/com/cm6123/monopoly/app/Application.java
index d46aa73cd8ed927af17854765b4551910dcbbf67..4c906df76b81fc0c58d72f56cc9f32e731e7885f 100644
--- a/src/main/java/com/cm6123/monopoly/app/Application.java
+++ b/src/main/java/com/cm6123/monopoly/app/Application.java
@@ -8,7 +8,7 @@ public final class Application {
/**
* Create a logger for the class.
*/
- private static Logger logger = LoggerFactory.getLogger(Application.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(Application.class);
private Application() {
@@ -23,11 +23,13 @@ public final class Application {
public static void main(final String[] args) {
- logger.info("Application Started with args:{}", String.join(",", args));
+ LOGGER.info("Application Started with args:{}", String.join(",", args));
System.out.println("Hello. Welcome to Monopoly.");
- logger.info("Application closing");
+
+
+ LOGGER.info("Application closing");
}
diff --git a/src/main/java/com/cm6123/monopoly/dice/Dice.java b/src/main/java/com/cm6123/monopoly/dice/Dice.java
index 67a9fbd19c9b9b3b30e19f7e5bca6ff4bd1e315e..d01653e47ae0db98d2e2620e9e9cf277986ca38a 100644
--- a/src/main/java/com/cm6123/monopoly/dice/Dice.java
+++ b/src/main/java/com/cm6123/monopoly/dice/Dice.java
@@ -8,7 +8,7 @@ public class Dice {
private Integer faces;
/**
- * Construct a dice with the given number of faces.
+ * Construct a die with the given number of faces.
*
* @param numberOfFaces the number of faces that the dice will have. Dice rolls 1 to this number.
*/