Merge branch '1.5.0.release' ci_latest

.gitignore

@@ -109,11 +109,13 @@ gradle-app.setting
 # ignoring .env file needed by docker-compose
 config/**/.env
 
-# Karate DSL results 
-src/test/api/karate/target/**/*
-src/test/api/karate/karate.jar
-src/test/utils/karate/target/**/*
-src/test/utils/karate/karate.jar
+# Karate tests
+## Results
+src/test/**/karate/target/**/*
+## Karate jar
+src/test/**/karate.jar
+## Tar.gz bundles
+src/test/**/karate/**/*.tar.gz
 
 # UI
 ui/main/node_modules

.travis.yml

@@ -33,16 +33,16 @@ install:
   - CurrentNpmVersion="$(npm -version)"
   - if [ "${CurrentNpmVersion}" != "${EXPECTED_NPM_VERSION}" ] ; then npm i -g npm@${EXPECTED_NPM_VERSION} ; fi
   # 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.242-zulu`
-  # the value of the following variable is `8.0.242` and its vendor name part is `-zulu`
-  - CURRENT_JDK_VERSION="8.0.242"
-  # need to substitute last dot by an underscore. Example value for the following: "1.8.0_242"
+  # 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"
+  # 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/*./_}"
-  # example value for the following: "8.0.242-zulu"
+  # example value for the following: "8.0.265-zulu"
   - JDK_VERSION_4_SDKMAN="${CURRENT_JDK_VERSION}-zulu"
   # Use javac because the prompt is simpler than the java one
-  # skips the beginning should return 1.8.0_242. Here redirection '2>&1' needed to load prompt value otherwise variable is empty
+  # skips the beginning should return 1.8.0_265. Here redirection '2>&1' needed to load prompt value otherwise variable is empty
   - CurrentJavacVersionNumber="$(javac -version 2>&1 | cut -d ' ' -f 2)"
   # if javac version is different than expected then asks sdkman to use expected java version or install it if necessary
   # if sdkman can't use the expected java version then asks sdkman to install it. Sdkman is configured to use it as default (line 26)

CICD/travis/upload_doc.sh

@@ -43,10 +43,12 @@ done
 # Copy asciidoctor documentation (only release notes and single_file_doc)
 mkdir -p $HOME/documentation/documentation/archives/$OF_VERSION/
 mkdir -p $HOME/documentation/documentation/archives/$OF_VERSION/images/
+mkdir -p $HOME/documentation/documentation/archives/$OF_VERSION/pdf/
 mkdir -p $HOME/documentation/documentation/archives/$OF_VERSION/docs/
 cp $OF_HOME/build/asciidoc/html5/docs/release_notes.html $HOME/documentation/documentation/archives/$OF_VERSION/docs/
 cp $OF_HOME/build/asciidoc/html5/docs/single_page_doc.html $HOME/documentation/documentation/archives/$OF_VERSION/docs/
 cp -r $OF_HOME/build/asciidoc/html5/images/* $HOME/documentation/documentation/archives/$OF_VERSION/images/
+cp -r $OF_HOME/build/asciidoc/html5/pdf/* $HOME/documentation/documentation/archives/$OF_VERSION/pdf/
 
 cd $HOME/documentation
 

VERSION

@@ -1 +1 @@
-1.4.0.RELEASE
+1.5.0.RELEASE

bin/add_header.sh

@@ -87,10 +87,10 @@ echo -e "Licence header content: \n$licenceContent"
 echo -e "\n"
 
 #Exclude bundles demo/test files
-findCommand+="! -path \"$OF_HOME/services/core/thirds/src/test/data/bundles/*\" "
-findCommand+="-and ! -path \"$OF_HOME/services/core/thirds/src/main/docker/volume/thirds-storage/*\" "
-findCommand+="-and ! -path \"$OF_HOME/services/core/thirds/src/test/docker/volume/thirds-storage/*\" "
-findCommand+="-and ! -path \"$OF_HOME/src/test/utils/karate/thirds/resources/*\" "
+findCommand+="! -path \"$OF_HOME/services/core/businessconfig/src/test/data/bundles/*\" "
+findCommand+="-and ! -path \"$OF_HOME/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/*\" "
+findCommand+="-and ! -path \"$OF_HOME/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/*\" "
+findCommand+="-and ! -path \"$OF_HOME/src/test/utils/karate/businessconfig/resources/*\" "
 
 #Exclude generated folders from ui
 findCommand+="-and ! -path \"$OF_HOME/ui/main/build/*\" "

bin/load_environment_light.sh

@@ -2,7 +2,7 @@
 
 . ${BASH_SOURCE%/*}/load_variables.sh
 
-sdk use gradle 6.1.1
-sdk use java 8.0.252-zulu
+sdk use gradle 6.5.1
+sdk use java 8.0.265-zulu
 sdk use maven 3.5.3
 nvm use v10.16.3

bin/load_variables.sh

@@ -12,26 +12,25 @@ export OF_CORE=$OF_HOME/services/core
 export OF_CLIENT=$OF_HOME/client
 export OF_TOOLS=$OF_HOME/tools
 export OF_COMPONENTS=( "$OF_TOOLS/swagger-spring-generators" "$OF_TOOLS/generic/utilities" "$OF_TOOLS/generic/test-utilities"  )
-OF_COMPONENTS+=( "$OF_TOOLS/spring/spring-utilities" "$OF_TOOLS/spring/spring-mongo-utilities" "$OF_TOOLS/spring/spring-oauth2-utilities" )
+OF_COMPONENTS+=( "$OF_TOOLS/spring/spring-utilities" "$OF_TOOLS/spring/spring-mongo-utilities" "$OF_TOOLS/spring/aop-process" "$OF_TOOLS/spring/spring-oauth2-utilities" )
 OF_COMPONENTS+=( "$OF_CLIENT/cards" "$OF_CLIENT/users")
-OF_COMPONENTS+=("$OF_CORE/thirds" "$OF_CORE/cards-publication" "$OF_CORE/cards-consultation" "$OF_CORE/users")
+OF_COMPONENTS+=("$OF_CORE/businessconfig" "$OF_CORE/cards-publication" "$OF_CORE/cards-consultation" "$OF_CORE/users")
 
 export OF_REL_COMPONENTS=( "tools/swagger-spring-generators" "tools/generic/utilities" "tools/generic/test-utilities" )
-OF_REL_COMPONENTS+=( "tools/spring/spring-utilities" "tools/spring/spring-mongo-utilities" "tools/spring/spring-oauth2-utilities" )
-OF_REL_COMPONENTS+=( "client/cards" "client/users" "client/thirds")
-OF_REL_COMPONENTS+=("services/core/thirds" "services/core/cards-publication" "services/core/cards-consultation" "services/core/users" )
+OF_REL_COMPONENTS+=( "tools/spring/spring-utilities" "tools/spring/spring-mongo-utilities" "tools/spring/aop-process" "tools/spring/spring-oauth2-utilities" )
+OF_REL_COMPONENTS+=( "client/cards" "client/users" "client/businessconfig")
+OF_REL_COMPONENTS+=("services/core/businessconfig" "services/core/cards-publication" "services/core/cards-consultation" "services/core/users" )
 
 export OF_VERSION=$(cat "$OF_HOME/VERSION")
 
-export OF_CLIENT_REL_COMPONENTS=( "cards" "users" "thirds")
+export OF_CLIENT_REL_COMPONENTS=( "cards" "users" "businessconfig")
 
 echo "OPERATORFABRIC ENVIRONMENT VARIABLES"
 
 echo OF_HOME=$OF_HOME
 echo OF_CORE=$OF_CORE
 echo OF_CLIENT=$OF_CLIENT
 echo OF_TOOLS=$OF_TOOLS
-echo OF_INFRA=$OF_INFRA
 echo
 echo "OperatorFabric version is $OF_VERSION"
 index=0

bin/run_all.sh

@@ -13,7 +13,7 @@ OF_HOME=$(realpath $DIR/..)
 CURRENT_PATH=$(pwd)
 
 resetConfiguration=true
-businessServices=( "users" "cards-consultation" "cards-publication" "thirds")
+businessServices=( "users" "cards-consultation" "cards-publication" "businessconfig")
 offline=false
 
 function join_by { local IFS="$1"; shift; echo "$*"; }

build.gradle

@@ -2,11 +2,11 @@ import com.github.jk1.license.render.*
 plugins {
     id "com.github.jk1.dependency-license-report" version "1.6"
     id "com.moowork.node" version "1.2.0"
-    id "org.asciidoctor.convert" version "1.5.9.2"
+    id "org.asciidoctor.convert" version "1.5.10"
     id "maven-publish"
     id "signing"
     id "org.owasp.dependencycheck" version "5.2.0"
-    id 'org.springframework.boot' version '2.2.5.RELEASE'
+    id 'org.springframework.boot' version '2.4.0-M1'
     id 'org.sonarqube' version '3.0' apply false
 }
 
@@ -31,6 +31,7 @@ ext {
             starterJetty            : "org.springframework.boot:spring-boot-starter-jetty:${versions['spring.boot']}",
             starterRabbitmq         : "org.springframework.boot:spring-boot-starter-amqp:${versions['spring.boot']}",
             starterSecurity         : "org.springframework.boot:spring-boot-starter-security:${versions['spring.boot']}",
+            starterMongo            : "org.springframework.boot:spring-boot-starter-data-mongodb:${versions['spring.boot']}",
             starterMongoR           : "org.springframework.boot:spring-boot-starter-data-mongodb-reactive:${versions['spring.boot']}",
             starterTest             : "org.springframework.boot:spring-boot-starter-test:${versions['spring.boot']}",
             starterValidation       : "org.springframework.boot:spring-boot-starter-validation:${versions['spring.boot']}",
@@ -114,7 +115,7 @@ asciidoctor {
     }
     resources {
         from('src/docs/asciidoc') {
-            include 'images/*'
+            include 'images/*','pdf/*'
         }
     }
     attributes  nofooter            : '',
@@ -196,5 +197,5 @@ tasks.withType(JavaCompile) {
 }
 
  wrapper {
-    gradleVersion = '6.1.1'
+    gradleVersion = '6.5.1'
 }

client/actions/build.gradle

@@ -1,8 +1,8 @@
 jar {
     manifest {
         attributes( "Created-By"             : "Gradle ${gradle.gradleVersion}",
-                    "Specification-Title"    : "OperatorFabric Thirds Manager Client Data",
-                    "Implementation-Title"   : "OperatorFabric Thirds Manager Client Data",
+                    "Specification-Title"    : "OperatorFabric Businessconfig Manager Client Data",
+                    "Implementation-Title"   : "OperatorFabric Businessconfig Manager Client Data",
                     "Implementation-Version" : operatorfabric.version,
                     "Specification-Version"  : operatorfabric.version
         )

client/thirds/build.gradle → client/businessconfig/build.gradle

@@ -1,8 +1,8 @@
 jar {
     manifest {
         attributes( "Created-By"             : "Gradle ${gradle.gradleVersion}",
-                    "Specification-Title"    : "OperatorFabric Thirds Manager Client Data",
-                    "Implementation-Title"   : "OperatorFabric Thirds Manager Client Data",
+                    "Specification-Title"    : "OperatorFabric Businessconfig Manager Client Data",
+                    "Implementation-Title"   : "OperatorFabric Businessconfig Manager Client Data",
                     "Implementation-Version" : operatorfabric.version,
                     "Specification-Version"  : operatorfabric.version
         )

client/thirds/src/main/java/org/lfenergy/operatorfabric/thirds/model/ActionEnum.java → client/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ActionEnum.java

@@ -9,7 +9,7 @@
 
 
 
-package org.lfenergy.operatorfabric.thirds.model;
+package org.lfenergy.operatorfabric.businessconfig.model;
 
 /**
  * Card associated Action type

client/thirds/src/main/java/org/lfenergy/operatorfabric/thirds/model/InputEnum.java → client/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/InputEnum.java

@@ -9,7 +9,7 @@
 
 
 
-package org.lfenergy.operatorfabric.thirds.model;
+package org.lfenergy.operatorfabric.businessconfig.model;
 
 /**
  * The type of input

client/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/LinkTypeEnum.java

@@ -0,0 +1,7 @@
+package org.lfenergy.operatorfabric.businessconfig.model;
+
+public enum LinkTypeEnum {
+    TAB,  
+    IFRAME,    
+    BOTH
+}

client/thirds/src/main/java/org/lfenergy/operatorfabric/thirds/model/ResponseBtnColorEnum.java → client/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ResponseBtnColorEnum.java

@@ -6,7 +6,7 @@
  */
 
 
-package org.lfenergy.operatorfabric.thirds.model;
+package org.lfenergy.operatorfabric.businessconfig.model;
 
 /**
  * Response associated button color

client/businessconfig/src/main/modeling/config.json

@@ -0,0 +1,21 @@
+{
+  "library": "spring-boot",
+  "java8": true,
+  "modelPackage": "org.lfenergy.operatorfabric.businessconfig.model",
+  "hideGenerationTimestamp": true,
+  "apiPackage": "org.lfenergy.operatorfabric.businessconfig.controllers",
+  "configPackage": "org.lfenergy.operatorfabric.businessconfig.config",
+  "invokerPackage": "org.lfenergy.operatorfabric.businessconfig.invokers",
+  "dateLibrary": "java8",
+  "useBeanValidation": false,
+  "interfaceOnly": false,
+  "delegatePattern": true,
+  "singleContentTypes": false,
+  "importMappings" : {
+    "ActionEnum": "org.lfenergy.operatorfabric.businessconfig.model.ActionEnum",
+    "ResponseBtnColorEnum": "org.lfenergy.operatorfabric.businessconfig.model.ResponseBtnColorEnum",
+    "LinkTypeEnum":         "org.lfenergy.operatorfabric.businessconfig.model.LinkTypeEnum",
+    "EpochDate": "java.time.Instant",
+    "LongInteger": "java.lang.Long"
+  }
+}

client/client.gradle

@@ -121,7 +121,7 @@ subprojects {
                        from components.java
                        artifact sourcesJar
                        artifact javadocJar
-                       version='0.3.3'
+                       version="${project.version}"
        pom{
 		licenses{
 			license{
@@ -155,9 +155,9 @@ subprojects {
                }
 
        }
-    apply plugin: 'signing'
-    signing {
-		useGpgCmd()
-        	sign publishing.publications.mavenJava
-	    }
+//    apply plugin: 'signing'
+//    signing {
+//		useGpgCmd()
+//        	sign publishing.publications.mavenJava
+//	    }
 }

client/users/src/main/java/org/lfenergy/operatorfabric/users/model/RightsEnum.java

@@ -26,10 +26,9 @@
  *
  */
 public enum RightsEnum {
-    READ("Read"),
-    READANDWRITE("ReadAndWrite"),
-    READANDRESPOND("ReadAndRespond"),
-    ALL("All");
+    RECEIVE("Receive"),
+    WRITE("Write"),
+    RECEIVEANDWRITE("ReceiveAndWrite");
 
     private String value;
 

config/dev/thirds-dev.yml → config/dev/businessconfig-dev.yml

@@ -2,11 +2,11 @@ server:
   port: 2100
 spring:
   application:
-    name: thirds
+    name: businessconfig
 
-operatorfabric.thirds:
+operatorfabric.businessconfig:
   storage:
-    path: "./services/core/thirds/build/docker-volume/thirds-storage"
+    path: "./services/core/businessconfig/build/docker-volume/businessconfig-storage"
 
 #here we put urls for all feign clients
 users:

config/dev/cards-consultation-dev.yml

@@ -3,7 +3,7 @@ server:
 spring:
   application:
     name: cards-consultation
-
+#logging.level.org.lfenergy.operatorfabric: debug
 #here we put urls for all feign clients
 users:
   ribbon:

config/dev/cards-publication-dev.yml

@@ -10,7 +10,7 @@ users:
     listOfServers: http://localhost:2103
 
 externalRecipients-url: "{\
-           test_action: \"http://localhost:8090/test\", \
+           processAction: \"http://localhost:8090/test\", \
            api_test_externalRecipient1: \"http://localhost:8090/test\", \
            api_test_externalRecipient2: \"http://localhost:8090/test\" \
            }"

config/dev/common-dev.yml

@@ -28,6 +28,30 @@ operatorfabric:
       login-claim: preferred_username
       expire-claim: exp
 
+### activate the folLowing if you want the entities of the user to came from the token and not mongoDB   
+### entitiesIdClaim is the name of the field in the token     
+#      entitiesIdClaim : entitiesId
+#      gettingEntitiesFromToken: true
+###
+
+### activate the following if you want the groups of the user to came from the token and not mongoDB   
+#      groups: 
+#        mode: JWT
+#        rolesClaim:
+#          rolesClaimStandard:
+#            - path: "ATTR1"
+#            - path: "ATTR2"            
+#          rolesClaimStandardArray:  
+#            - path: "resource_access/opfab-client/roles"
+#          rolesClaimStandardList:  
+#            - path: "groups" 
+#              separator: ";"           
+#          rolesClaimCheckExistPath: 
+#            - path: "resource_access/AAA" 
+#              roleValue: "roleAAA"      
+#            - path: "resource_access/BBB"
+#              roleValue: "roleBBB"  
+### 
 message: common message
 management:
   endpoints: