Fix sonnar obstruction

[holmes/common.git] / holmes-actions / src / main / java / org / openo / holmes / common / utils / MSBRegisterUtil.java

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