1 files changed, 38 insertions, 3 deletions
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/bootstrap/CbsBootstrapConfiguration.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/bootstrap/CbsBootstrapConfiguration.java
index f668a581..c82c326f 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/bootstrap/CbsBootstrapConfiguration.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/bootstrap/CbsBootstrapConfiguration.java
@@ -3,6 +3,7 @@
  * PNF-REGISTRATION-HANDLER
  * ================================================================================
  * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved.
+ * Copyright (C) 2023 Deutsche Telekom Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,26 +23,36 @@ package org.onap.dcaegen2.services.bootstrap;
 
 
 import org.onap.dcaegen2.services.prh.configuration.CbsConfiguration;
+import org.onap.dcaegen2.services.prh.configuration.CbsConfigurationForAutoCommitDisabledMode;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
 
 @Configuration
 @EnableConfigurationProperties(CbsProperties.class)
 public class CbsBootstrapConfiguration {
-    private static final CbsConfiguration CBS_CONFIGURATION = new CbsConfiguration();
+    
+    private static CbsConfiguration CBS_CONFIGURATION =  new CbsConfiguration();
+    private static CbsConfigurationForAutoCommitDisabledMode CBS_CONFIGURATION_FOR_AUTO_COMMIT_DISABLED_MODE =
+            new CbsConfigurationForAutoCommitDisabledMode();
 
     @Bean
-    public CbsProperties cbsProperties() {
+    public CbsProperties cbsProperties()
+    {
         return new CbsProperties();
     }
 
     @Bean
     @ConditionalOnProperty(value = "cbs.enabled", matchIfMissing = true)
+    @Profile("!autoCommitDisabled")
     public CbsPropertySourceLocator cbsPropertySourceLocator(
             CbsProperties cbsProperties,
             CbsConfiguration cbsConfiguration) {
+        
+        System.out.println("Trying to return CbsPropertySourceLocator bean");
 
         return new CbsPropertySourceLocator(
                 cbsProperties,
@@ -50,9 +61,33 @@ public class CbsBootstrapConfiguration {
                 new CbsClientFactoryFacade(),
                 cbsConfiguration);
     }
+    
+    @Bean
+    @ConditionalOnProperty(value = "cbs.enabled", matchIfMissing = true)
+    @Profile("autoCommitDisabled")
+    public CbsPropertySourceLocatorForAutoCommitDisabled cbsPropertySourceLocatorForAutoCommitDisabled(CbsProperties cbsProperties,
+            CbsConfigurationForAutoCommitDisabledMode cbsConfigurationforAutoCommitdisabledMode) {
+        
+        System.out.println("Trying to return CbsPropertySourceLocatorForAutoCommitDisabled bean"); 
+
+        CbsPropertySourceLocatorForAutoCommitDisabled cbsPropertySourceLocatorACDM = new CbsPropertySourceLocatorForAutoCommitDisabled(cbsProperties,
+                new CbsJsonToPropertyMapConverter(), new CbsClientConfigurationResolver(cbsProperties),
+                new CbsClientFactoryFacade(), cbsConfigurationforAutoCommitdisabledMode);
+
+        return cbsPropertySourceLocatorACDM;
+
+    }
 
     @Bean
+    @Profile("!autoCommitDisabled")
     public CbsConfiguration cbsConfiguration() {
-        return CBS_CONFIGURATION;
+     return CBS_CONFIGURATION;
+    }
+    
+    @Bean
+    @Profile("autoCommitDisabled")
+    public CbsConfigurationForAutoCommitDisabledMode cbsConfigurationForAutoCommitDisabledMode() {
+        return CBS_CONFIGURATION_FOR_AUTO_COMMIT_DISABLED_MODE;
     }
+    
 }