diff --git a/README.md b/README.md index e92dc67bf3d95d76dc9f2b3ef7c4736a34efa623..f9093e5af99de1ed9a0a1cbe1b500c7a01f87e89 100644 --- a/README.md +++ b/README.md @@ -65,3 +65,17 @@ You need to connect to our feed on [Azure DevOps](https://slb-swt.visualstudio.c ``` + +## Changes to support newly Added transaction logger and slf4jlogger +The consumer service might run into multiple logger bindings error on start up +which can be fixed by excluding some of the logger dependencies. + +Note: Below are reference PRs for exclusion and might change from service to service + +Refer this [MR](https://community.opengroup.org/osdu/platform/security-and-compliance/entitlements-azure/-/merge_requests/13) as reference on how to exclude dependencies along with how to enable the +Enabled transaction logger and slf4jlogger +## Environment variables to be added in application.properties to consume the TenantFactoryImpl +| name | value | description | +| --- | --- | --- | +| `tenantInfo.container.name` | `TenantInfo` | cosmos container name | +| `azure.cosmosdb.database` | ex `dev-osdu-r2-db` | cosmos databse name | \ No newline at end of file diff --git a/pom.xml b/pom.xml index c4e11784bdac94c5d19348ee61f56d79a037b919..e8cfd97bbc4b92ae3837ad28b1f630ad1d11b929 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.opengroup.osdu core-lib-azure jar - 0.0.17 + 0.0.18 core-lib-azure diff --git a/src/main/java/org/opengroup/osdu/azure/di/CosmosDBConfiguration.java b/src/main/java/org/opengroup/osdu/azure/di/CosmosDBConfiguration.java index 1f90097fd3e32d58f45ff25b21de295252b2a152..792f2ec855a20d1165a22f88f4c682854a7ba586 100644 --- a/src/main/java/org/opengroup/osdu/azure/di/CosmosDBConfiguration.java +++ b/src/main/java/org/opengroup/osdu/azure/di/CosmosDBConfiguration.java @@ -3,12 +3,14 @@ package org.opengroup.osdu.azure.di; import lombok.Getter; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; /** * A configuration bean class to set up CosmosDb variables. */ @Configuration @Getter +@Lazy public class CosmosDBConfiguration { @Value("${tenantInfo.container.name}") diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index d817f227c62398260efe79c3a1446363c18c94d7..0000000000000000000000000000000000000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright © Microsoft Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Azure CosmosDB configuration -tenantInfo.container.name=TenantInfo -azure.cosmosdb.database=${cosmosdb_database} \ No newline at end of file