prime-1.10.2 - Made neo4j protocol configurable.

ostelco · Aug 13, 2018 · f523668 · f523668
2 parents bbe6ad6 + db5eec9
commit f523668
Show file tree

Hide file tree

Showing 27 changed files with 40 additions and 24 deletions.
diff --git a/acceptance-tests/build.gradle b/acceptance-tests/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.2.51"
+  id "org.jetbrains.kotlin.jvm" version "1.2.60"
   id "application"
   id "com.github.johnrengelman.shadow" version "2.0.4"
 }

diff --git a/admin-api/build.gradle b/admin-api/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.2.51"
+  id "org.jetbrains.kotlin.jvm" version "1.2.60"
   id "java-library"
 }
 

diff --git a/analytics/build.gradle b/analytics/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.2.51"
+  id "org.jetbrains.kotlin.jvm" version "1.2.60"
   id "application"
   id "com.github.johnrengelman.shadow" version "2.0.4"
   id "idea"

diff --git a/app-notifier/build.gradle b/app-notifier/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.2.51"
+  id "org.jetbrains.kotlin.jvm" version "1.2.60"
   id "java-library"
 }
 

diff --git a/auth-server/build.gradle b/auth-server/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.2.51"
+  id "org.jetbrains.kotlin.jvm" version "1.2.60"
   id "application"
   id "com.github.johnrengelman.shadow" version "2.0.4"
   id "idea"

diff --git a/build.gradle b/build.gradle
@@ -28,7 +28,7 @@ subprojects {
     options.encoding = 'UTF-8'
   }
   ext {
-    kotlinVersion = "1.2.51"
+    kotlinVersion = "1.2.60"
     dropwizardVersion = "1.3.5"
     googleCloudVersion = "1.35.0"
     jacksonVersion = "2.9.6"

diff --git a/client-api/build.gradle b/client-api/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.jetbrains.kotlin.jvm" version "1.2.51"
+    id "org.jetbrains.kotlin.jvm" version "1.2.60"
     id "java-library"
 }
 

diff --git a/client-api/src/main/kotlin/org/ostelco/prime/client/api/store/SubscriberDAOImpl.kt b/client-api/src/main/kotlin/org/ostelco/prime/client/api/store/SubscriberDAOImpl.kt
@@ -48,13 +48,19 @@ class SubscriberDAOImpl(private val storage: ClientDataSource, private val ocsSu
         }
         try {
             profile.referralId = profile.email
-            storage.addSubscriber(profile, referredBy)
+            val created = storage.addSubscriber(profile, referredBy)
+                    .map { ApiError("Failed to create profile. ${it.message}") }
+
+            if(created.isEmpty()) {
+                return getProfile(subscriberId)
+            }
+
+            return Either.left(created.get())
+
         } catch (e: Exception) {
             logger.error("Failed to create profile", e)
             return Either.left(ApiError("Failed to create profile"))
         }
-
-        return getProfile(subscriberId)
     }
 
     override fun storeApplicationToken(msisdn: String, applicationToken: ApplicationToken): Either<ApiError, ApplicationToken> {

diff --git a/diameter-stack/build.gradle b/diameter-stack/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.2.51"
+  id "org.jetbrains.kotlin.jvm" version "1.2.60"
   id "java-library"
   id "signing"
   id "maven"

diff --git a/diameter-test/build.gradle b/diameter-test/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.2.51"
+  id "org.jetbrains.kotlin.jvm" version "1.2.60"
   id "java-library"
   id "signing"
   id "maven"

diff --git a/ext-auth-provider/build.gradle b/ext-auth-provider/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.2.51"
+  id "org.jetbrains.kotlin.jvm" version "1.2.60"
   id "application"
   id "com.github.johnrengelman.shadow" version "2.0.4"
 }

diff --git a/firebase-store/build.gradle b/firebase-store/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.2.51"
+  id "org.jetbrains.kotlin.jvm" version "1.2.60"
   id "java-library"
 }
 

diff --git a/model/build.gradle b/model/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.2.51"
+  id "org.jetbrains.kotlin.jvm" version "1.2.60"
   id "java-library"
 }
 

diff --git a/neo4j-store/build.gradle b/neo4j-store/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.2.51"
+  id "org.jetbrains.kotlin.jvm" version "1.2.60"
   id "java-library"
 }
 

diff --git a/neo4j-store/src/main/kotlin/org/ostelco/prime/storage/graph/Neo4jModule.kt b/neo4j-store/src/main/kotlin/org/ostelco/prime/storage/graph/Neo4jModule.kt
@@ -56,6 +56,7 @@ fun initDatabase() {
 
 class Config {
     lateinit var host: String
+    lateinit var protocol: String
 }
 
 object ConfigRegistry {
@@ -74,7 +75,7 @@ object Neo4jClient : Managed {
                 .withConnectionTimeout(10, SECONDS)
                 .toConfig()
         driver = GraphDatabase.driver(
-                URI("bolt://${ConfigRegistry.config.host}:7687"),
+                URI("${ConfigRegistry.config.protocol}://${ConfigRegistry.config.host}:7687"),
                 AuthTokens.none(),
                 config) ?: throw Exception("Unable to get Neo4j client driver instance")
     }

diff --git a/neo4j-store/src/test/kotlin/org/ostelco/prime/storage/graph/GraphStoreTest.kt b/neo4j-store/src/test/kotlin/org/ostelco/prime/storage/graph/GraphStoreTest.kt
@@ -181,6 +181,7 @@ class GraphStoreTest {
         fun start() {
             ConfigRegistry.config = Config()
             ConfigRegistry.config.host = "0.0.0.0"
+            ConfigRegistry.config.protocol = "bolt"
             Neo4jClient.start()
         }
 

diff --git a/neo4j-store/src/test/kotlin/org/ostelco/prime/storage/graph/SchemaTest.kt b/neo4j-store/src/test/kotlin/org/ostelco/prime/storage/graph/SchemaTest.kt
@@ -210,6 +210,7 @@ class SchemaTest {
         fun start() {
             ConfigRegistry.config = Config()
             ConfigRegistry.config.host = "0.0.0.0"
+            ConfigRegistry.config.protocol = "bolt"
             Neo4jClient.start()
         }
 

diff --git a/ocs/build.gradle b/ocs/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.2.51"
+  id "org.jetbrains.kotlin.jvm" version "1.2.60"
   id "java-library"
 }
 

diff --git a/prime-api/build.gradle b/prime-api/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.2.51"
+  id "org.jetbrains.kotlin.jvm" version "1.2.60"
   id "java-library"
 }
 

diff --git a/prime-client-api/build.gradle b/prime-client-api/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.2.51"
+  id "org.jetbrains.kotlin.jvm" version "1.2.60"
   id 'java-library'
   id 'org.hidetake.swagger.generator' version '2.12.0'
   id "idea"

diff --git a/prime/build.gradle b/prime/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.2.51"
+  id "org.jetbrains.kotlin.jvm" version "1.2.60"
   id "application"
   id "com.github.johnrengelman.shadow" version "2.0.4"
   id "idea"
@@ -18,7 +18,7 @@ sourceSets {
   }
 }
 
-version = "1.10.1"
+version = "1.10.2"
 
 repositories {
   maven {

diff --git a/prime/config/config.yaml b/prime/config/config.yaml
@@ -7,6 +7,7 @@ modules:
   - type: neo4j
     config:
       host: neo4j
+      protocol: bolt+routing
   - type: ocs
     config:
       projectId: pantel-2decb

diff --git a/prime/config/test.yaml b/prime/config/test.yaml
@@ -9,6 +9,7 @@ modules:
   - type: neo4j
     config:
       host: neo4j
+      protocol: bolt
   - type: ocs
     config:
       projectId: pantel-2decb

diff --git a/prime/src/integration-tests/kotlin/org/ostelco/prime/ocs/OcsTest.kt b/prime/src/integration-tests/kotlin/org/ostelco/prime/ocs/OcsTest.kt
@@ -221,7 +221,10 @@ class OcsTest {
         @JvmStatic
         @Throws(IOException::class)
         fun setUp() {
-            ConfigRegistry.config = Config().apply { this.host = "0.0.0.0" }
+            ConfigRegistry.config = Config().apply {
+                this.host = "0.0.0.0"
+                this.protocol = "bolt"
+            }
             initFirebaseConfigRegistry()
 
             Neo4jClient.start()

diff --git a/prime/src/integration-tests/kotlin/org/ostelco/prime/storage/graph/Neo4jStorageTest.kt b/prime/src/integration-tests/kotlin/org/ostelco/prime/storage/graph/Neo4jStorageTest.kt
@@ -114,6 +114,7 @@ class Neo4jStorageTest {
 
             val config = Config()
             config.host = "0.0.0.0"
+            ConfigRegistry.config.protocol = "bolt"
             ConfigRegistry.config = config
 
             Neo4jClient.start()

diff --git a/prime/src/integration-tests/resources/config.yaml b/prime/src/integration-tests/resources/config.yaml
@@ -7,6 +7,7 @@ modules:
   - type: neo4j
     config:
       host: 0.0.0.0
+      protocol: bolt
   - type: ocs
     config:
       projectId: pantel-2decb

diff --git a/pseudonym-server/build.gradle b/pseudonym-server/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.kotlin.jvm" version "1.2.51"
+  id "org.jetbrains.kotlin.jvm" version "1.2.60"
   id "application"
   id "com.github.johnrengelman.shadow" version "2.0.4"
   id "idea"