Merge branch 'release/0.0.4'

.gitignore

@@ -1,5 +1,6 @@
 HELP.md
 target/
+logs/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
 !**/src/test/**/target/

TourGuide/build.gradle

@@ -14,7 +14,6 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 apply plugin: "jacoco"
 
-
 bootJar {
     baseName = 'tourGuide'
     version =  '1.0.0'
@@ -32,6 +31,7 @@ targetCompatibility = 1.8
 
 dependencies {
     compile("org.springframework.boot:spring-boot-starter-web")
+    compile("org.springframework.boot:spring-boot-starter-log4j2")
     compile("org.springframework.boot:spring-boot-starter-actuator")
     compile group: 'org.javamoney', name: 'moneta', version: '1.3'
 	compile group: 'com.jsoniter', name: 'jsoniter', version: '0.9.23'
@@ -41,9 +41,12 @@ dependencies {
     compile(name:'TripPricer', ext:'jar')
 
     testCompile("junit:junit")
-    testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.1.6.RELEASE'
+    testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.5.2.RELEASE'
 }
 
+configurations.implementation {
+    exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging'
+}
 
 jacoco {
     toolVersion = "0.8.4"

TourGuide/gradlew

@@ -123,7 +123,7 @@ if $cygwin ; then
         SEP="|"
     done
     OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
+    # Add a model-defined pattern to the cygpath arguments
     if [ "$GRADLE_CYGPATTERN" != "" ] ; then
         OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
     fi

TourGuide/settings.gradle

@@ -4,7 +4,7 @@
  * The settings file is used to specify which projects to include in your build.
  * 
  * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user guide at https://docs.gradle.org/4.8.1/userguide/multi_project_builds.html
+ * in the model guide at https://docs.gradle.org/4.8.1/userguide/multi_project_builds.html
  */
 
 rootProject.name = 'TourGuide'

TourGuide/src/main/java/tourGuide/helper/InternalTestHelper.java → TourGuide/src/main/java/tourGuide/config/InternalTestHelper.java

@@ -1,25 +1,25 @@
-package tourGuide.helper;
-
-/** Users testing initializer.
- */
-public class InternalTestHelper {
-
-	// Set this default up to 100,000 for testing
-	private static int internalUserNumber = 100;
-
-	/** Setting the amount of users to test.
-	 * @param internalUserNumber Integer containing the amount of users.
-	 */
-	public static void setInternalUserNumber(int internalUserNumber) {
-
-		InternalTestHelper.internalUserNumber = internalUserNumber;
-	}
-
-	/** Getting the amount of users to test.
-	 * @return Return the amount of users.
-	 */
-	public static int getInternalUserNumber() {
-
-		return internalUserNumber;
-	}
-}
+package tourGuide.config;
+
+/** Users testing initializer.
+ */
+public class InternalTestHelper {
+
+	// Set this default up to 100,000 for testing
+	private static int internalUserNumber = 100;
+
+	/** Setting the amount of users to test.
+	 * @param internalUserNumber Integer containing the amount of users.
+	 */
+	public static void setInternalUserNumber(int internalUserNumber) {
+
+		InternalTestHelper.internalUserNumber = internalUserNumber;
+	}
+
+	/** Getting the amount of users to test.
+	 * @return Return the amount of users.
+	 */
+	public static int getInternalUserNumber() {
+
+		return internalUserNumber;
+	}
+}

TourGuide/src/main/java/tourGuide/TourGuideModule.java → TourGuide/src/main/java/tourGuide/config/TourGuideModule.java

@@ -1,33 +1,33 @@
-package tourGuide;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import gpsUtil.GpsUtil;
-import rewardCentral.RewardCentral;
-import tourGuide.service.RewardsService;
-
-/** TourGuide modules configurer.
- */
-@Configuration
-public class TourGuideModule {
-
-	@Bean
-	public GpsUtil getGpsUtil() {
-
-		return new GpsUtil();
-	}
-
-	@Bean
-	public RewardsService getRewardsService() {
-
-		return new RewardsService(getGpsUtil(), getRewardCentral());
-	}
-
-	@Bean
-	public RewardCentral getRewardCentral() {
-
-		return new RewardCentral();
-	}
-
-}
+package tourGuide.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import gpsUtil.GpsUtil;
+import rewardCentral.RewardCentral;
+import tourGuide.service.RewardsService;
+
+/** TourGuide modules configurer.
+ */
+@Configuration
+public class TourGuideModule {
+
+	@Bean
+	public GpsUtil getGpsUtil() {
+
+		return new GpsUtil();
+	}
+
+	@Bean
+	public RewardsService getRewardsService() {
+
+		return new RewardsService(getGpsUtil(), getRewardCentral());
+	}
+
+	@Bean
+	public RewardCentral getRewardCentral() {
+
+		return new RewardCentral();
+	}
+
+}