Sonar fix log exception

[dmaap/dbcapi.git] / src / main / java / org / onap / dmaap / dbcapi / service / MR_ClusterService.java

diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClusterService.java b/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClusterService.java
index e2c661b..db6389e 100644 (file)
--- a/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClusterService.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClusterService.java
@@ -3,6 +3,8 @@
  * org.onap.dmaap
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ *
+ * Modifications Copyright (C) 2019 IBM.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,11 +30,13 @@ import java.util.Set;
 
 import javax.ws.rs.core.Response.Status;
 
+import org.onap.dmaap.dbcapi.client.MrProvConnection;
 import org.onap.dmaap.dbcapi.database.DatabaseClass;
 import org.onap.dmaap.dbcapi.logging.BaseLoggingClass;
 import org.onap.dmaap.dbcapi.model.ApiError;
 import org.onap.dmaap.dbcapi.model.DcaeLocation;
 import org.onap.dmaap.dbcapi.model.MR_Cluster;
+import org.onap.dmaap.dbcapi.model.Topic;
 import org.onap.dmaap.dbcapi.model.DmaapObject.DmaapObject_Status;
 import org.onap.dmaap.dbcapi.service.DcaeLocationService;
 import org.onap.dmaap.dbcapi.util.DmaapConfig;
@@ -119,7 +123,7 @@ public class MR_ClusterService extends BaseLoggingClass {
                        return null;
                }
                cluster.setLastMod();
-               cluster.setStatus(DmaapObject_Status.VALID);
+               cluster.setStatus( addTopicsToCluster( cluster, apiError ) );
                mr_clusters.put( cluster.getDcaeLocationName(), cluster );
                DcaeLocationService svc = new DcaeLocationService();
                DcaeLocation loc = svc.getDcaeLocation( cluster.getDcaeLocationName() );
@@ -145,6 +149,7 @@ public class MR_ClusterService extends BaseLoggingClass {
                        return null;
                }
                cluster.setLastMod();
+               cluster.setStatus( addTopicsToCluster( cluster, apiError ) );
                mr_clusters.put( cluster.getDcaeLocationName(), cluster );
                DcaeLocationService svc = new DcaeLocationService();
                DcaeLocation loc = svc.getDcaeLocation( cluster.getDcaeLocationName() );
@@ -153,7 +158,7 @@ public class MR_ClusterService extends BaseLoggingClass {
                        cluster.setLastMod();
                        cluster.setStatus(DmaapObject_Status.INVALID);
                        mr_clusters.put( cluster.getDcaeLocationName(), cluster );
-               } else if ( loc.isCentral()  & multiSite ) {
+               } else if ( loc.isCentral() && multiSite ) {
                        ApiError resp = TopicService.setBridgeClientPerms( cluster );
                        if ( ! resp.is2xx() ) {
                                logger.error( "Unable to provision Bridge to " + cluster.getDcaeLocationName() );
@@ -162,6 +167,7 @@ public class MR_ClusterService extends BaseLoggingClass {
                                mr_clusters.put( cluster.getDcaeLocationName(), cluster );
                        }
                }
+               
                apiError.setCode(200);
                return cluster;
        }
@@ -178,5 +184,22 @@ public class MR_ClusterService extends BaseLoggingClass {
                return mr_clusters.remove(key);
        }       
        
-
+       private DmaapObject_Status addTopicsToCluster( MR_Cluster cluster, ApiError err  ){
+               
+               TopicService ts = new TopicService();
+               MrProvConnection prov = new MrProvConnection();
+               List<Topic>  topics = ts.getAllTopicsWithoutClients();
+               for( Topic topic: topics ) {
+                       logger.info( "POST topic " + topic.getFqtn() + " to cluster " + cluster.getFqdn() + " in loc " + cluster.getDcaeLocationName());
+                       if ( prov.makeTopicConnection(cluster)) {
+                               String resp = prov.doPostTopic(topic, err);
+                               logger.info( "response code: " + err.getCode() );
+                               if ( ! err.is2xx() && ! (err.getCode() == 409) ) {
+                                       return DmaapObject_Status.INVALID;
+                               } 
+                       }
+               }
+               
+               return DmaapObject_Status.VALID;
+       }
 }