diff options
Diffstat (limited to 'dmaap-dsa/src/main/java')
-rw-r--r-- | dmaap-dsa/src/main/java/org/onap/holmes/dsa/dmaap/DmaapDsaActiveApp.java | 38 | ||||
-rw-r--r-- | dmaap-dsa/src/main/java/org/onap/holmes/dsa/resources/HealthCheck.java | 42 |
2 files changed, 25 insertions, 55 deletions
diff --git a/dmaap-dsa/src/main/java/org/onap/holmes/dsa/dmaap/DmaapDsaActiveApp.java b/dmaap-dsa/src/main/java/org/onap/holmes/dsa/dmaap/DmaapDsaActiveApp.java index ab1e36b..55838ae 100644 --- a/dmaap-dsa/src/main/java/org/onap/holmes/dsa/dmaap/DmaapDsaActiveApp.java +++ b/dmaap-dsa/src/main/java/org/onap/holmes/dsa/dmaap/DmaapDsaActiveApp.java @@ -16,13 +16,20 @@ package org.onap.holmes.dsa.dmaap;
+import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
+
import io.dropwizard.setup.Environment;
import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
import lombok.extern.slf4j.Slf4j;
import org.onap.holmes.common.api.entity.ServiceRegisterEntity;
import org.onap.holmes.common.config.MicroServiceConfig;
import org.onap.holmes.common.dropwizard.ioc.bundle.IOCApplication;
+import org.onap.holmes.common.exception.CorrelationException;
import org.onap.holmes.common.utils.MSBRegisterUtil;
+import org.onap.msb.sdk.discovery.entity.MicroServiceInfo;
+import org.onap.msb.sdk.discovery.entity.Node;
@Slf4j
public class DmaapDsaActiveApp extends IOCApplication<DmaapDsaConfig> {
@@ -33,22 +40,27 @@ public class DmaapDsaActiveApp extends IOCApplication<DmaapDsaConfig> { @Override
public void run(DmaapDsaConfig configuration, Environment environment) throws Exception {
super.run(configuration, environment);
-
try {
- new MSBRegisterUtil().register(initServiceEntity());
- } catch (IOException e) {
- log.warn("Micro service registry httpclient close failure", e);
+ new MSBRegisterUtil().register2Msb(createMicroServiceInfo());
+ } catch (CorrelationException e) {
+ log.warn(e.getMessage(), e);
}
}
- private ServiceRegisterEntity initServiceEntity() {
- ServiceRegisterEntity serviceRegisterEntity = new ServiceRegisterEntity();
- serviceRegisterEntity.setServiceName("holmes-dmaap-dsa");
- serviceRegisterEntity.setProtocol("REST");
- serviceRegisterEntity.setVersion("v1");
- serviceRegisterEntity.setUrl("/api/holmes-dmaap-dsa/v1/");
- serviceRegisterEntity.setSingleNode(MicroServiceConfig.getServiceIp(), "9103", 0);
- serviceRegisterEntity.setVisualRange("1|0");
- return serviceRegisterEntity;
+ private MicroServiceInfo createMicroServiceInfo() {
+ String[] serviceAddrInfo = MicroServiceConfig.getServiceAddrInfo();
+ MicroServiceInfo msinfo = new MicroServiceInfo();
+ msinfo.setServiceName("holmes-dmaap-dsa");
+ msinfo.setVersion("v1");
+ msinfo.setUrl("/api/holmes-dmaap-dsa/v1/");
+ msinfo.setProtocol("REST");
+ msinfo.setVisualRange("0|1");
+ Set<Node> nodes = new HashSet<>();
+ Node node = new Node();
+ node.setIp(serviceAddrInfo[0]);
+ node.setPort(serviceAddrInfo[1]);
+ nodes.add(node);
+ msinfo.setNodes(nodes);
+ return msinfo;
}
}
diff --git a/dmaap-dsa/src/main/java/org/onap/holmes/dsa/resources/HealthCheck.java b/dmaap-dsa/src/main/java/org/onap/holmes/dsa/resources/HealthCheck.java deleted file mode 100644 index 060a303..0000000 --- a/dmaap-dsa/src/main/java/org/onap/holmes/dsa/resources/HealthCheck.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2017 ZTE 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. - */ - -package org.onap.holmes.dsa.resources; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.SwaggerDefinition; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import lombok.extern.slf4j.Slf4j; -import org.jvnet.hk2.annotations.Service; - -@Service -@SwaggerDefinition -@Path("/healthcheck") -@Api(tags = {"HealthCheck"}) -@Produces(MediaType.TEXT_PLAIN) -@Slf4j -public class HealthCheck { - @GET - @Produces(MediaType.TEXT_PLAIN) - @ApiOperation(value = "Interface for the health check of the data source adapter module for Holmes") - public boolean healthCheck(){ - return true; - } -} |