Merge branch 'org_props' into 'master'

Move azure property from core module

See merge request !86

entitlements-v2-core/src/main/java/org/opengroup/osdu/entitlements/v2/di/LibraryBeanConfiguration.java

@@ -2,28 +2,16 @@ package org.opengroup.osdu.entitlements.v2.di;
 
 import org.opengroup.osdu.core.common.http.HttpClient;
 import org.opengroup.osdu.core.common.http.IHttpClient;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
-import javax.inject.Named;
-
 @Configuration
 @ComponentScan("org.opengroup.osdu.core.common")
 public class LibraryBeanConfiguration {
 
-    @Value("${azure.keyvault.url}")
-    private String keyVaultURL;
-
     @Bean
     public IHttpClient getHttpClient() {
         return new HttpClient();
     }
-
-    @Bean
-    @Named("KEY_VAULT_URL")
-    public String keyVaultURL() {
-        return keyVaultURL;
-    }
 }

provider/entitlements-v2-aws/src/main/resources/application.properties

@@ -14,9 +14,6 @@ app.domain=${SERVICE_DOMAIN_NAME:example.com}
 
 aws.parameter.prefix=/osdu/${ENVIRONMENT}
 
-# Don't know the purpose yet. Needs to be moved to provider side. Issue submitted in GL
-azure.keyvault.url=xx
-
 redishost=${REDIS_CLUSTER_ENDPOINT}
 redisport=${REDIS_CLUSTER_PORT}
 redis.partition.association=0

provider/entitlements-v2-azure/src/main/java/org/opengroup/osdu/entitlements/v2/azure/config/AzureBootstrapConfig.java

+package org.opengroup.osdu.entitlements.v2.azure.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class AzureBootstrapConfig {
+
+    @Bean(name="KEY_VAULT_URL")
+    public String keyVaultURL(@Value("${azure.keyvault.url}") String keyVaultURL) {
+        return keyVaultURL;
+    }
+}

provider/entitlements-v2-ibm/src/main/resources/application.properties

@@ -30,6 +30,3 @@ partition.keycloak.realm=TODO
 partition.keycloak.client_id=TODO
 partition.keycloak.client_secert=TODO
 spring.security.oauth2.resourceserver.jwt.jwk-set-uri=TODO
-
-#This variable is mandatory. what is the use of ??
-azure.keyvault.url=xyz