ci_latest - merge branch '1.8.0.release'

.gitignore

@@ -124,4 +124,7 @@ ui/main/report.html
 ui/main/package-lock.json
 
 # Bundles for docker config 
-config/docker/businessconfig-storage/**
+config/docker/businessconfig-storage/**
+
+# now script generated
+config/dev/nginx.conf

.travis.yml

@@ -4,7 +4,7 @@ addons:
     sonarcloud:
         organization: "opfab"
         token:
-            secure: "r3BfCTuMqW5B6GvQR5ZnnHauciJsqOLeKPMRp7NS1vr6oIo4SHIO6zyLbHUK7ItRt8at+DPkQE8eHtDSWlYutKwfbRPwxcqR4zf4AYuVmHWCS7WmcERMEixbOo5lGQ47KjMMsTbGTSg+Atv80Y3fugX4prm4rDWE8G/Irqvw4GW8P9DeI5upHOTBRzPifrT/PVoovCsqkdfzEFJBYb/fl9VdT340+nrxmcM1Lm1dQeDibAdqdXJQxjgKvbZTUq0D8Ih65EPEESQZjkb8G9CGumsfm6Rhcu1btrqVUCdv8QXe/ERkmryMSA041SmgmtEAf+b/TfdgIn1SLnEbOlLIv1melv0yvBhMHijcASZP1gsnfOTBKFRE616a87L7y3XrX58OAHiAaZ9ecpW5McOI6hHwlHpUaFvKTvbN05lxe3VziYmCIT0SRRrfquyoe8b9s/04FzGTSVnVumKCzlwUJq5M1pbjnS5XOgQCuwauAEarqdCyS9iSWPPm8NkSxkkNu43tCykYRh8dDAN/4E7f8oSoW2RrSsMpJ7a3Q77ACVQJQZtiGQdDStUPHtLNQlN8vzbYNHrkpZbO4nT64tONaTvwFirbkuQpkAGmYFN8jSSeyNRI+gM1lx3fxowjyIt+D+8KsofX5GYG7IDRTt9jVUkcwBOicDG9IuZ3ZaZRtVU="
+          secure: "Y6lcwkarytMScY+s2DLUuXodA6mQSBXqtuiypw6g6MO8xn5HUwy0MtmYVTfoNCRjSlZcFDaoLPFlkitRCAeZKJpeIw1iGbJFeLWUDI9QLwXebni4WuaWhNjuYIYt8IcP6im4YdzRuzz/TG1FHShtIDwhg7assBy4L/vtiOUTfxP8+/JgAR3Hl/OWFl0s+DY7Ldc8DnS7KTaXu/imjIKE68yWz77uYGzS+P4BZP79peVjSIoQXIb4p8KyfPJvIHEnt/m1MHDr67LzkUd2alypkCNSG/vxlL07oJTJQyPWKihpzHiXVH5jL4RTZVLVjBsSIuzMuf/jzP+s8S+iuEgHAKj+SC8DF02pciRj6naZNcXBFBTW9YeAXqLD3Eim/ZvGQtPq88KXZsvqJ9XluRz4Zx9cTDtjty7RQJBQzP98cA4n0d1t5NWRcyBJoijpDDax5jD6QkICAGtfR7Q8X0r8/TXf3VhTI/z3fhikTqTPvBd5jdFG3gkg/kTW6IFU95mAMQBC4CIKxNPnt7ojp+ZaqXKynbtD5FparQTP9sFOncen5M8AepQKnRGY8evfXl230PkDHA1S1YFfN/EdSd0tmkOV1nck9P+0Z25V1eXObJcMV3lHwFAosF9523t82DOWc+3bJgCmHa3AXKGoqB1sOFzgh7eOOudcGd2pcBjmMyU="
 services:
   - docker
 env:
@@ -35,7 +35,7 @@ install:
   # Should be synch with ${OF_HOME}/bin/load_environment_light.sh. It's the first part of the sdk reference without vendor name
   # for example the current configured in sdk has the following reference `8.0.265-zulu`
   # the value of the following variable is `8.0.265` and its vendor name part is `-zulu`
-  - CURRENT_JDK_VERSION="8.0.265"
+  - CURRENT_JDK_VERSION="$(<JAVA_VERSION)"
   # need to substitute last dot by an underscore. Example value for the following: "1.8.0_265"
   # for java version higher than 8 the prefix `1.` should be removed
   - FULL_JDK_VERSION="1.${CURRENT_JDK_VERSION%.*}${CURRENT_JDK_VERSION/*./_}"

JAVA_VERSION

@@ -0,0 +1 @@
+8.0.272

VERSION

@@ -1 +1 @@
-1.7.0.RELEASE
+1.8.0.RELEASE

bin/load_environment_light.sh

@@ -9,9 +9,10 @@
 # This file is part of the OperatorFabric project.
 
 
-. ${BASH_SOURCE%/*}/load_variables.sh
+source ${BASH_SOURCE%/*}/load_variables.sh
 
 sdk use gradle 6.5.1
-sdk use java 8.0.265-zulu
+# the java version is externalized because also needed for travis configuration
+sdk use java $(<JAVA_VERSION)-zulu
 sdk use maven 3.5.3
 nvm use v10.16.3

bin/run_all.sh

@@ -30,7 +30,9 @@ function join_by { local IFS="$1"; shift; echo "$*"; }
 function display_usage() {
 	echo -e "\nThis script runs OperatorFabric services."
 	echo -e "Usage:"
-	echo -e "\trun_all.sh [OPTIONS] (start, stop, restart, status)"
+	echo -e "\trun_all.sh [OPTIONS] (start, stop , hardstop, restart, status)\n"
+  echo -e "\tstop: soft kill of the processes"
+  echo -e "\thardstop: hard kill of the processes (with kill -9) \n"
 	echo -e "options:"
 	echo -e "\t-s, --services\t: list of comma separated services. Business services to run. Defaults to " $(join_by ","  "${businessServices[@]}")
 	echo -e "\t-r, --reset\t: true or false. Resets service data. Defaults to $resetConfiguration."
@@ -168,6 +170,32 @@ stopCommand(){
   done
 }
 
+
+
+hardstopProject() {
+    projectBuildPath="$2/build"
+    projectPidFilePath="$projectBuildPath/PIDFILE"
+    echo "##########################################################"
+    if [ -f "$projectPidFilePath" ]; then
+      pid=$(<"$projectPidFilePath")
+      echo "Stopping $1 (pid: $pid)"
+      if ! kill -9 $pid > /dev/null 2>&1; then
+          echo "$1: could not send SIGTERM to process $pid" >&2
+      fi
+    else
+      echo "'$projectPidFilePath' not found"
+    fi
+    echo "##########################################################"
+}
+
+hardstopCommand(){
+  for ((i=0; i<${#dependentProjects[*]}; ));
+  do
+    hardstopProject ${dependentProjects[i]} ${dependentProjects[i+1]}
+    i=$((i+"$PRJ_STRC_FIELDS"))
+  done
+}
+
 projectStatus() {
 #set -x
     projectBuildPath="$2/build"
@@ -206,6 +234,10 @@ case $command in
   ;;
   stop)
   stopCommand
+#  exit 0;
+  ;;
+  hardstop)
+  hardstopCommand
 #  exit 0;
   ;;
   restart)

build.gradle

@@ -27,6 +27,7 @@ ext {
             starterWeb              : "org.springframework.boot:spring-boot-starter-web:${versions['spring.boot']}",
             starterWebflux          : "org.springframework.boot:spring-boot-starter-webflux:${versions['spring.boot']}",
             actuator                : "org.springframework.boot:spring-boot-starter-actuator:${versions['spring.boot']}",
+            micrometer              : "io.micrometer:micrometer-registry-prometheus:latest.release",
             starterAop              : "org.springframework.boot:spring-boot-starter-aop:${versions['spring.boot']}",
             starterJetty            : "org.springframework.boot:spring-boot-starter-jetty:${versions['spring.boot']}",
             starterRabbitmq         : "org.springframework.boot:spring-boot-starter-amqp:${versions['spring.boot']}",

client/cards/build.gradle

@@ -1,3 +1,18 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath "com.commercehub.gradle.plugin:gradle-avro-plugin:${versions['gradle.avro.plugin']}"
+    }
+}
+
+apply plugin: "com.commercehub.gradle.plugin.avro"
+
+dependencies {
+    compile "org.apache.avro:avro:${versions['avro']}"
+}
+
 jar {
     manifest {
         attributes( "Created-By"             : "Gradle ${gradle.gradleVersion}",
@@ -26,4 +41,9 @@ swaggerSources {
     }
 }
 
+avro {
+    createSetters = true
+    fieldVisibility = "PRIVATE"
+    stringType = "String"
+}
 

client/cards/src/main/avro/I8n.avsc

@@ -0,0 +1,22 @@
+{
+  "type": "record",
+  "name": "I18n",
+  "namespace": "org.lfenergy.operatorfabric.avro",
+  "fields": [
+    {
+      "name": "key",
+      "type":"string"
+    },
+    {
+      "name" : "parameters",
+      "type" : [
+        "null",
+        {
+          "type": "map",
+          "values": "string"
+        }
+      ],
+      "default": null
+    }
+  ]
+}

client/cards/src/main/avro/card.avsc

@@ -0,0 +1,165 @@
+{
+  "type": "record",
+  "name": "Card",
+  "namespace": "org.lfenergy.operatorfabric.avro",
+  "fields": [
+    {
+      "name": "parentCardId",
+      "type": ["null", "string"],
+      "default": null
+    },
+    {
+      "name": "initialParentCardUid",
+      "type": ["null", "string"],
+      "default": null
+    },
+    {
+      "name": "process",
+      "type": "string"
+    },
+    {
+      "name": "processInstanceId",
+      "type": "string"
+    },
+    {
+      "name": "publisher",
+      "type": "string"
+    },
+    {
+      "name": "processVersion",
+      "type": "string"
+    },
+    {
+      "name": "state",
+      "type": ["null","string"],
+      "default": null
+    },
+    {
+      "name": "publishDate",
+      "type": ["null","long"],
+      "logicalType": "timestamp-millis",
+      "default": null
+    },
+    {
+      "name": "lttd",
+      "type": ["null","long"],
+      "logicalType": "timestamp-millis",
+      "default": null
+    },
+    {
+      "name": "startDate",
+      "type": "long",
+      "logicalType": "timestamp-millis"
+    },
+    {
+      "name": "endDate",
+      "type": ["null","long"],
+      "logicalType": "timestamp-millis",
+      "default": null
+    },
+    {
+      "name": "severity",
+      "type": {
+        "name": "SeverityType",
+        "type": "enum",
+        "symbols" : ["ALARM", "ACTION", "INFORMATION", "COMPLIANT"]
+      }
+    },
+    {
+      "name": "tags",
+      "type": [
+        "null",
+        {
+          "type": "array",
+          "items": "string"
+        }
+      ],
+      "default": null
+    },
+    {
+      "name": "timeSpans",
+      "type": [
+        "null",
+        {
+          "type": "array",
+          "items": {
+            "name": "timespan",
+            "type": "Timespan"
+          }
+        }
+      ],
+      "default": null
+    },
+    {
+      "name": "title",
+      "type": "I18n"
+    },
+    {
+      "name": "summary",
+      "type":  "I18n"
+    },
+    {
+      "name": "userRecipients",
+      "type": [
+        "null",
+        {
+          "type": "array",
+          "items": "string"
+        }
+      ],
+      "default": null
+    },
+    {
+      "name": "groupRecipients",
+      "type": [
+        "null",
+        {
+          "type": "array",
+          "items": "string"
+        }
+      ],
+      "default": null
+    },
+    {
+      "name": "externalRecipients",
+      "type": [
+        "null",
+        {
+          "type": "array",
+          "items": "string"
+        }
+      ],
+      "default": null
+    },
+    {
+      "name": "entitiesAllowedToRespond",
+      "type": [
+        "null",
+        {
+          "type": "array",
+          "items": "string"
+        }
+      ],
+      "default": null
+    },
+    {
+      "name": "entityRecipients",
+      "type": [
+        "null",
+        {
+          "type": "array",
+          "items": "string"
+        }
+      ],
+      "default": null
+    },
+    {
+      "name": "data",
+      "type": [
+        "null",
+        "string"
+      ],
+      "default":  null
+    }
+  ]
+}

client/cards/src/main/avro/cardCommand.avsc

@@ -0,0 +1,21 @@
+{
+  "type": "record",
+  "name": "CardCommand",
+  "namespace": "org.lfenergy.operatorfabric.avro",
+  "fields": [
+    { "name": "command",
+      "type":
+        {
+          "name": "CommandType",
+          "type": "enum",
+          "symbols" : ["UNKNOWN","CREATE_CARD", "UPDATE_CARD", "DELETE_CARD", "RESPONSE_CARD"],
+          "default": "UNKNOWN"
+        }
+    },
+    {
+      "name": "card",
+      "type": ["null","Card"],
+      "default": null
+    }
+  ]
+}

client/cards/src/main/avro/timespan.avsc

@@ -0,0 +1,21 @@
+{
+  "type": "record",
+  "name": "Timespan",
+  "namespace": "org.lfenergy.operatorfabric.avro",
+  "fields": [
+    {
+      "name": "start",
+      "type": "long",
+      "logicalType": "timestamp-millis"
+    },
+    {
+      "name" : "end",
+      "type": [
+        "null",
+        "long"
+      ],
+      "logicalType": "timestamp-millis",
+      "default" : null
+    }
+  ]
+}