Merge pull request #120 from isuru89/task/small-fixes

upgrade h2, jdbi, springboot slf4j and logback to latest #119

build.sh

@@ -3,29 +3,29 @@
 echo "==============================================================================="
 echo "Building Oasis..."
 echo "==============================================================================="
-mvn clean install -DskipTests
+#mvn clean install -DskipTests
 
 echo "==============================================================================="
 echo "Building Events API Docker Image..."
 echo "==============================================================================="
 cd services/events-api
-docker build -t oasis/events-api .
+#docker build -t oasis/events-api .
 
 cd ../..
 
 echo "==============================================================================="
 echo "Building Admin/Stats API Docker Image..."
 echo "==============================================================================="
 cd services/stats-api
-docker build -t oasis/stats-api .
+#docker build -t oasis/stats-api .
 
 cd ../..
 
 echo "==============================================================================="
 echo "Building Engine Docker Image..."
 echo "==============================================================================="
 cd engine
-docker build -t oasis/engine .
+#docker build -t oasis/engine .
 
 cd ..
 

pom.xml

@@ -11,27 +11,25 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <flink.version>1.9.1</flink.version>
         <java.version>11</java.version>
         <scala.binary.version>2.11</scala.binary.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <jackson.version>2.9.9</jackson.version>
-        <jdbi.version>3.20.1</jdbi.version>
+        <jdbi.version>3.27.0</jdbi.version>
         <vertx.version>4.0.2</vertx.version>
         <junit.version>5.7.1</junit.version>
         <lombok.version>1.18.18</lombok.version>
-        <jedis.version>3.5.1</jedis.version>
         <akka.version>2.6.13</akka.version>
-        <logback.version>1.2.3</logback.version>
-        <springboot.version>2.4.3</springboot.version>
+        <logback.version>1.2.10</logback.version>
+        <springboot.version>2.4.13</springboot.version>
         <commonsio.version>2.8.0</commonsio.version>
         <commonslang.version>3.12.0</commonslang.version>
         <amqp.version>5.11.0</amqp.version>
         <jackson.version>2.12.2</jackson.version>
         <jsonsimple.version>3.1.1</jsonsimple.version>
-        <slf4j.version>1.7.30</slf4j.version>
+        <slf4j.version>1.7.33</slf4j.version>
         <redisson.version>3.16.3</redisson.version>
+        <h2.db.version>2.0.206</h2.db.version>
     </properties>
 
     <modules>
@@ -47,7 +45,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.18</version>
+            <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

services/stats-api/pom.xml

@@ -135,7 +135,7 @@
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<version>1.4.200</version>
+			<version>${h2.db.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>

services/stats-api/src/main/resources/io/github/oasis/db/scripts/apiKey/readApiKey.sql

@@ -7,4 +7,4 @@ FROM
 WHERE
     token = :token
     AND
-    is_active = 1
+    is_active = true

services/stats-api/src/main/resources/io/github/oasis/db/scripts/elements/deleteElementById.sql

@@ -1,6 +1,6 @@
 UPDATE
     OA_ELEMENT
 SET
-    is_active = 0
+    is_active = false
 WHERE
     id = :id

services/stats-api/src/main/resources/io/github/oasis/db/scripts/elements/deleteElementDataById.sql

@@ -1,6 +1,6 @@
 UPDATE
     OA_ELEMENT_DATA
 SET
-    is_active = 0
+    is_active = false
 WHERE
     element_id = :id

services/stats-api/src/main/resources/io/github/oasis/db/scripts/elements/readElementsByGameId.sql

@@ -11,4 +11,4 @@ FROM
 WHERE
     game_id = :gameId
     AND
-    is_active = 1
+    is_active = true

services/stats-api/src/main/resources/io/github/oasis/db/scripts/eventsource/deleteEventSourceById.sql

@@ -1,6 +1,6 @@
 UPDATE
     OA_EVENT_SOURCE
 SET
-    is_active = 0
+    is_active = false
 WHERE
     id = :id

services/stats-api/src/main/resources/io/github/oasis/db/scripts/eventsource/readAllEventSources.sql

@@ -6,4 +6,4 @@ SELECT
 FROM
     OA_EVENT_SOURCE
 WHERE
-    is_active = 1
+    is_active = true

services/stats-api/src/main/resources/io/github/oasis/db/scripts/eventsource/readEventSource.sql

@@ -8,4 +8,4 @@ FROM
 WHERE
     id = :id
     AND
-    is_active = 1
+    is_active = true

services/stats-api/src/main/resources/io/github/oasis/db/scripts/eventsource/readEventSourceByToken.sql

@@ -8,4 +8,4 @@ FROM
 WHERE
     token = :token
     AND
-    is_active = 1
+    is_active = true

services/stats-api/src/main/resources/io/github/oasis/db/scripts/eventsource/readEventSourceGames.sql

@@ -6,4 +6,4 @@ FROM
 WHERE
     oesg.event_source_id = :eventSourceId
     AND
-    oes.is_active = 1
+    oes.is_active = true

services/stats-api/src/main/resources/io/github/oasis/db/scripts/eventsource/readEventSourcesOfGame.sql

@@ -9,4 +9,4 @@ FROM
 WHERE
     oesg.game_id = :gameId
     AND
-    oes.is_active = 1
+    oes.is_active = true

services/stats-api/src/main/resources/io/github/oasis/db/scripts/game/deleteGame.sql

@@ -1,6 +1,6 @@
 UPDATE
     OA_GAME
 SET
-    is_active = 0
+    is_active = false
 WHERE
     id = :id

services/stats-api/src/main/resources/io/github/oasis/db/scripts/players/deletePlayer.sql

@@ -1,6 +1,6 @@
 UPDATE
     OA_PLAYER
 SET
-    is_active = 0
+    is_active = false
 WHERE
     id = :id

simulations/src/main/java/io/github/oasis/simulations/SimulationWithApi.java

@@ -108,6 +108,10 @@ protected int createEventSourceToken() throws Exception {
             throw new IllegalStateException("Unable to associate game with event-source!");
         }
 
+        System.out.println(">>>>>>>>>>>");
+        System.out.println("  Event Source: " + eventSource);
+        System.out.println("<<<<<<<<<<<");
+
         return eventSource.getId();
     }