Merge branch 'develop' into feature/ocsgw-remove-analytics

.circleci/config.yml

@@ -6,16 +6,16 @@ jobs:
     machine:
       image: ubuntu-1604:201903-01
     environment:
-      JAVA_HOME: /usr/lib/jvm/zulu13.27.9-ca-jdk13-linux_x64
+      JAVA_HOME: /usr/lib/jvm/zulu13.28.11-ca-jdk13.0.1-linux_x64
 
     steps:
       - checkout
       - run:
           name: upgrading Java to open-jdk-12
           command: |
             # sudo apt update; sudo apt install -y wget
-            sudo wget https://cdn.azul.com/zulu/bin/zulu13.27.9-ca-jdk13-linux_x64.tar.gz -O /tmp/zulu13.27.9-ca-jdk13-linux_x64.tar.gz
-            sudo tar -zxf /tmp/zulu13.27.9-ca-jdk13-linux_x64.tar.gz -C /usr/lib/jvm
+            sudo wget https://cdn.azul.com/zulu/bin/zulu13.28.11-ca-jdk13.0.1-linux_x64.tar.gz -O /tmp/zulu13.28.11-ca-jdk13.0.1-linux_x64.tar.gz
+            sudo tar -zxf /tmp/zulu13.28.11-ca-jdk13.0.1-linux_x64.tar.gz -C /usr/lib/jvm
       - run:
           # checking for merge conflicts and merging locally if none exist
           name: merging ${CIRCLE_BRANCH} into develop locally
@@ -29,7 +29,7 @@ jobs:
       - run:
           name: javac -version
           command: |
-            export PATH=/usr/lib/jvm/zulu13.27.9-ca-jdk13-linux_x64/bin:$PATH
+            export PATH=/usr/lib/jvm/zulu13.28.11-ca-jdk13.0.1-linux_x64/bin:$PATH
             javac -version
       - run:
           name: Pulling Gradle cache
@@ -82,12 +82,12 @@ jobs:
   code-coverage:
     environment:
       CODACY_DOWNLOAD_URL: https://github.com/codacy/codacy-coverage-reporter/releases/download
-      CODACY_VERSION: 6.0.0
+      CODACY_VERSION: 6.0.6
       CODACY_JAR_FILE: codacy-coverage-reporter-assembly-latest.jar
       CODACY_MODULE: com.codacy.CodacyCoverageReporter
 
     docker:
-      - image: circleci/openjdk:11.0.3-jdk-stretch
+      - image: circleci/openjdk:13.0.1-jdk-buster
 
     steps:
       - run:
@@ -115,7 +115,7 @@ jobs:
     machine:
       image: ubuntu-1604:201903-01
     environment:
-      JAVA_HOME: /usr/lib/jvm/zulu13.27.9-ca-jdk13-linux_x64
+      JAVA_HOME: /usr/lib/jvm/zulu13.28.11-ca-jdk13.0.1-linux_x64
 
     steps:
       - checkout
@@ -124,8 +124,8 @@ jobs:
           command: |
             # sudo apt update; sudo apt install -y wget
 
-            sudo wget https://cdn.azul.com/zulu/bin/zulu13.27.9-ca-jdk13-linux_x64.tar.gz -O /tmp/zulu13.27.9-ca-jdk13-linux_x64.tar.gz
-            sudo tar -zxf /tmp/zulu13.27.9-ca-jdk13-linux_x64.tar.gz -C /usr/lib/jvm
+            sudo wget https://cdn.azul.com/zulu/bin/zulu13.28.11-ca-jdk13.0.1-linux_x64.tar.gz -O /tmp/zulu13.28.11-ca-jdk13.0.1-linux_x64.tar.gz
+            sudo tar -zxf /tmp/zulu13.28.11-ca-jdk13.0.1-linux_x64.tar.gz -C /usr/lib/jvm
       - run:
           name: Pulling Gradle cache
           command: |
@@ -140,7 +140,7 @@ jobs:
       - run:
           name: javac -version
           command: |
-            export PATH=/usr/lib/jvm/zulu13.27.9-ca-jdk13-linux_x64/bin:$PATH
+            export PATH=/usr/lib/jvm/zulu13.28.11-ca-jdk13.0.1-linux_x64/bin:$PATH
             javac -version
       - run:
           name: Gradle Build Prime and ScanInfo Shredder

.travis.yml

@@ -24,6 +24,6 @@ after_success:
   # The curl command is not always working. Kept original command in comment incase codacy updates
   #- sudo apt-get install jq
   #- wget -O ~/codacy-coverage-reporter-assembly-latest.jar $(curl https://api.github.com/repos/codacy/codacy-coverage-reporter/releases/latest | jq -r .assets[0].browser_download_url)
-  - wget -O ~/codacy-coverage-reporter-assembly-latest.jar https://github.com/codacy/codacy-coverage-reporter/releases/download/4.0.3/codacy-coverage-reporter-4.0.3-assembly.jar
+  - wget -O ~/codacy-coverage-reporter-assembly-latest.jar https://github.com/codacy/codacy-coverage-reporter/releases/download/6.0.6/codacy-coverage-reporter-6.0.6-assembly.jar
   - for REPORT_TARGET in $(find . -name jacocoTestReport.xml | sort); do java -cp ~/codacy-coverage-reporter-assembly-latest.jar com.codacy.CodacyCoverageReporter report -l Java -r ${REPORT_TARGET} --partial; done
   - java -cp ~/codacy-coverage-reporter-assembly-latest.jar com.codacy.CodacyCoverageReporter final

acceptance-tests/Dockerfile

@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk:13
+FROM azul/zulu-openjdk:13.0.1
 
 LABEL maintainer="[email protected]"
 

auth-server/Dockerfile

@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk:13
+FROM azul/zulu-openjdk:13.0.1
 
 LABEL maintainer="[email protected]"
 

buildSrc/src/main/kotlin/org/ostelco/prime/gradle/Version.kt

@@ -1,26 +1,26 @@
 package org.ostelco.prime.gradle
 
 object Version {
-  const val assertJ = "3.13.2"
+  const val assertJ = "3.14.0"
 
   const val arrow = "0.8.2"
 
   const val byteBuddy = "1.10.2"
   const val csv = "1.7"
-  const val cxf = "3.3.3"
+  const val cxf = "3.3.4"
   const val dockerComposeJunitRule = "1.3.0"
-  const val dropwizard = "1.3.15"
+  const val dropwizard = "1.3.16"
   const val metrics = "4.1.1"
-  const val firebase = "6.10.0"
+  const val firebase = "6.11.0"
 
-  const val googleCloud = "1.91.2"
-  const val googleCloudDataStore = "1.98.0"
+  const val googleCloud = "1.91.3"
+  const val googleCloudDataStore = "1.99.0"
   const val googleCloudLogging = "0.116.0-alpha"
-  const val googleCloudPubSub = "1.98.0"
-  const val googleCloudStorage = "1.98.0"
+  const val googleCloudPubSub = "1.99.0"
+  const val googleCloudStorage = "1.99.0"
 
   const val gson = "2.8.6"
-  const val grpc = "1.24.0"
+  const val grpc = "1.24.1"
   const val guava = "28.1-jre"
   const val jackson = "2.10.0"
   const val jacksonDatabind = "2.10.0"
@@ -43,13 +43,13 @@ object Version {
   const val postgresql = "42.2.8"  // See comment in ./sim-administration/simmanager/build.gradle
   const val prometheusDropwizard = "2.2.0"
   const val protoc = "3.10.0"
-  const val slf4j = "1.7.28"
+  const val slf4j = "1.7.29"
   // IMPORTANT: When Stripe SDK library version is updated, check if the Stripe API version has changed.
   // If so, then update API version in Stripe Web Console for callback Webhooks.
-  const val stripe = "14.0.1"
+  const val stripe = "14.4.1"
   const val swagger = "2.0.10"
   const val swaggerCodegen = "2.4.9"
-  const val testcontainers = "1.12.2"
+  const val testcontainers = "1.12.3"
   const val tink = "1.2.2"
   const val zxing = "3.4.0"
 }

diameter-ha/build.gradle.kts

@@ -18,7 +18,7 @@ dependencies {
   }
   implementation("org.slf4j:log4j-over-slf4j:${Version.slf4j}")
 
-  compile("io.lettuce:lettuce-core:5.2.0.RELEASE")
+  compile("io.lettuce:lettuce-core:5.2.1.RELEASE")
 
   testImplementation(kotlin("test-junit"))
   testRuntimeOnly("org.hamcrest:hamcrest-all:1.3")

ext-auth-provider/Dockerfile

@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk:13
+FROM azul/zulu-openjdk:13.0.1
 
 LABEL maintainer="[email protected]"
 

ext-myinfo-emulator/Dockerfile

@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk:13
+FROM azul/zulu-openjdk:13.0.1
 
 LABEL maintainer="[email protected]"
 

houston/src/components/Search/Alert.js

@@ -8,7 +8,7 @@ import { authConstants } from '../../actions/auth.actions';
 
 function AlertMessage({ alert, clearAlert }) {
   const { code, message, type } = alert;
-  const isOpen = (type === 'error' || code === authConstants.AUTHENTICATION_FAILURE)
+  const isOpen = (type === 'error' && code !== authConstants.AUTHENTICATION_FAILURE)
 
   return (
     <Alert color="danger" isOpen={isOpen} toggle={() => clearAlert()}>

houston/src/helpers/utils.js

@@ -13,7 +13,7 @@ export const humanReadableBytes = (sizeInBytes) => {
     sizeInBytes = sizeInBytes / 1024;
     i++;
   } while (sizeInBytes > 1024);
-  return `${Math.max(sizeInBytes, 0.1).toFixed(1)} ${byteUnits[i]}`;
+  return `${Math.max(sizeInBytes, 0.1).toFixed(2)} ${byteUnits[i]}`;
 }
 
 export const convertTimestampToDate = (timestamp) => {

houston/src/routes.js

@@ -4,7 +4,6 @@ import { connect } from 'react-redux';
 
 import App from './components/App';
 import Main from './components/Search/Main';
-import Notifications from './components/Notifications/Notifications';
 import Callback from './components/Callback/Callback';
 import { Provider } from 'react-redux';
 import { store } from './helpers';
@@ -65,9 +64,6 @@ function NoMatch() {
         <li>
           <Link to="/">Search</Link>
         </li>
-        <li>
-          <Link to="/notifications">Notifications</Link>
-        </li>
       </ul>
     </div>
   );
@@ -82,7 +78,6 @@ export const makeMainRoutes = () => {
           <Switch >
             <Route path="/login" component={Login} />
             <ProtectedRoute path="/" exact component={Main} />
-            <ProtectedRoute path="/notifications" component={Notifications} />
             <Route path="/callback" render={(props) => {
               handleAuthentication(props);
               return <Callback {...props} />

neo4j-store/src/main/kotlin/org/ostelco/prime/dsl/Transactions.kt

@@ -150,7 +150,7 @@ class WriteTransaction(override val transaction: PrimeTransaction) : ReadTransac
                             transaction = transaction
                     )
                 } else {
-                    relationStore.create(
+                    relationStore.createIfAbsent(
                             fromId = relationExpression.fromId,
                             toId = relationExpression.toId,
                             transaction = transaction

neo4j-store/src/main/kotlin/org/ostelco/prime/storage/graph/Neo4jStore.kt

@@ -232,21 +232,21 @@ object Neo4jStoreSingleton : GraphStore {
             from = customerEntity,
             to = subscriptionEntity,
             dataClass = None::class.java)
-            .also { RelationStore(it) }
+            .also { UniqueRelationStore(it) }
 
     val exSubscriptionRelation = RelationType(
             relation = HAD_SUBSCRIPTION,
             from = exCustomerEntity,
             to = subscriptionEntity,
             dataClass = None::class.java)
-            .also { RelationStore(it) }
+            .also { UniqueRelationStore(it) }
 
     val customerToBundleRelation = RelationType(
             relation = HAS_BUNDLE,
             from = customerEntity,
             to = bundleEntity,
             dataClass = None::class.java)
-            .also { RelationStore(it) }
+            .also { UniqueRelationStore(it) }
 
     val subscriptionToBundleRelation = RelationType(
             relation = LINKED_TO_BUNDLE,
@@ -260,14 +260,14 @@ object Neo4jStoreSingleton : GraphStore {
             from = customerEntity,
             to = simProfileEntity,
             dataClass = None::class.java)
-            .also { RelationStore(it) }
+            .also { UniqueRelationStore(it) }
 
     val exCustomerToSimProfileRelation = RelationType(
             relation = HAD_SIM_PROFILE,
             from = exCustomerEntity,
             to = simProfileEntity,
             dataClass = None::class.java)
-            .also { RelationStore(it) }
+            .also { UniqueRelationStore(it) }
 
     val forPurchaseByRelation = RelationType(
             relation = FOR_PURCHASE_BY,
@@ -288,7 +288,7 @@ object Neo4jStoreSingleton : GraphStore {
             from = customerEntity,
             to = customerEntity,
             dataClass = None::class.java)
-            .also { RelationStore(it) }
+            .also { UniqueRelationStore(it) }
 
     val subscribesToPlanRelation = RelationType(
             relation = Relation.SUBSCRIBES_TO_PLAN,