X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fopeno%2Fholmes%2Fcommon%2Futils%2FMSBRegisterUtil.java;h=f7825e7a5fc81d761679bd36602c7fbf4b52ee20;hb=68d0b52af532f4cde355b642593e76cf737aeb21;hp=1de431e58a151db39900ceedb5144edd8b5d3211;hpb=62359f952127eace5e9715b581f27d8443fc90a9;p=holmes%2Fcommon.git

diff --git a/holmes-actions/src/main/java/org/openo/holmes/common/utils/MSBRegisterUtil.java b/holmes-actions/src/main/java/org/openo/holmes/common/utils/MSBRegisterUtil.java
index 1de431e..f7825e7 100644
--- a/holmes-actions/src/main/java/org/openo/holmes/common/utils/MSBRegisterUtil.java
+++ b/holmes-actions/src/main/java/org/openo/holmes/common/utils/MSBRegisterUtil.java
@@ -16,90 +16,49 @@
 
 package org.openo.holmes.common.utils;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
 import java.io.IOException;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.entity.ByteArrayEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
 import org.jvnet.hk2.annotations.Service;
 import org.openo.holmes.common.api.entity.ServiceRegisterEntity;
 import org.openo.holmes.common.config.MicroServiceConfig;
-import org.openo.holmes.common.constant.AlarmConst;
+import org.openo.holmes.common.msb.MicroserviceBusRest;
 
 @Slf4j
 @Service
 public class MSBRegisterUtil {
 
     public void register(ServiceRegisterEntity entity) throws IOException {
-        ((Runnable) () -> {
-            log.info("start inventory micro service register");
-            boolean flag = false;
-            int retry = 0;
-            while (!flag && retry < 20) {
-                log.info("inventory micro service register.retry:" + retry);
-                retry++;
-                flag = inner_register(entity);
-                if (!flag) {
-                    log.warn("micro service register failed, sleep 30S and try again.");
-                    threadSleep(30000);
-                } else {
-                    log.info("micro service register success!");
-                    break;
-                }
+        log.info("start holmes micro service register");
+        boolean flag = false;
+        int retry = 0;
+        while (!flag && retry < 20) {
+            log.info("Holmes microservice register. retry:" + retry);
+            retry++;
+            flag = innerRegister(entity);
+            if (!flag) {
+                log.warn("micro service register failed, sleep 30S and try again.");
+                threadSleep(30000);
+            } else {
+                log.info("micro service register success!");
+                break;
             }
-            log.info("holmes micro service register end.");
-        }).run();
-    }
-
-    private void setHeader(HttpRequestBase httpRequestBase) {
-        httpRequestBase.setHeader("Content-Type", "text/html;charset=UTF-8");
-        httpRequestBase.setHeader("Accept", "application/json");
-        httpRequestBase.setHeader("Content-Type", "application/json");
+        }
+        log.info("holmes micro service register end.");
     }
 
-    private boolean inner_register(ServiceRegisterEntity entity) {
-        CloseableHttpClient httpClient = HttpClients.createDefault();
+    private boolean innerRegister(ServiceRegisterEntity entity) {
         try {
-            ObjectMapper mapper = new ObjectMapper();
-            String content = mapper.writeValueAsString(entity);
-            HttpPost httpPost = new HttpPost(
-                    MicroServiceConfig.getMsbServerAddr() + "/api/microservices/v1/services?createOrUpdate=false");
-            if (StringUtils.isNotEmpty(content)) {
-                httpPost.setEntity(new ByteArrayEntity(content.getBytes()));
-            }
-            this.setHeader(httpPost);
-            HttpResponse response;
-            try {
-                response = httpClient.execute(httpPost);
-            } catch (Exception e) {
-                log.warn("Registering the service to the bus failure", e);
-                return false;
-            }
-            if (response.getStatusLine().getStatusCode() == AlarmConst.MICRO_SERVICE_STATUS_SUCCESS) {
-                log.info("Registration successful service to the bus :" + EntityUtils.toString(response.getEntity()));
-                return true;
-            } else {
-                log.warn(
-                        "Registering the service to the bus failure:" + response.getStatusLine().getStatusCode() + " " +
-                                response.getStatusLine().getReasonPhrase());
-                return false;
-            }
-        } catch (IOException e) {
-            log.warn("ServiceRegisterEntity:" + entity + " parse failed",e);
-        } finally {
-            try {
-                httpClient.close();
-            } catch (IOException e) {
-                log.warn("At the time of registering service httpclient close failure",e);
-            }
+            log.info("msbServerAddr:" + MicroServiceConfig.getMsbServerAddr());
+            log.info("entity:" + entity);
+            MicroserviceBusRest resourceserviceproxy = ConsumerFactory.createConsumer(
+                    MicroServiceConfig.getMsbServerAddr(), MicroserviceBusRest.class);
+            resourceserviceproxy.registerServce("false", entity);
+        } catch (Exception error) {
+            log.error("microservice register failed!" + error.getMessage(), error);
+            return false;
         }
-        return false;
+        return true;
     }
 
     private void threadSleep(int second) {
@@ -107,7 +66,7 @@ public class MSBRegisterUtil {
         try {
             Thread.sleep(second);
         } catch (InterruptedException error) {
-            log.error("thread sleep error.errorMsg:" + error.getMessage());
+            log.error("thread sleep error.errorMsg:" + error.getMessage(), error);
         }
         log.info("sleep end .");
     }