From 6abeb297254942c48722c2da0e7c355d523fe307 Mon Sep 17 00:00:00 2001
From: Guo Ruijing <ruijing.guo@intel.com>
Date: Fri, 28 Jul 2017 08:23:01 +0000
Subject: [POLICY-72] replace openecomp for drools-pdp

Change-Id: I8aa8e32d3ba10f7c655b50e97aaf6865514d4777
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
---
 feature-healthcheck/pom.xml                        |  10 +-
 .../feature/config/feature-healthcheck.properties  |   2 +-
 .../policy/drools/healthcheck/HealthCheck.java     | 277 +++++++++++++++++++++
 .../drools/healthcheck/HealthCheckFeature.java     |  78 ++++++
 .../policy/drools/healthcheck/RestHealthCheck.java |  77 ++++++
 .../policy/drools/healthcheck/HealthCheck.java     | 277 ---------------------
 .../drools/healthcheck/HealthCheckFeature.java     |  78 ------
 .../policy/drools/healthcheck/RestHealthCheck.java |  77 ------
 ...p.policy.drools.features.PolicyEngineFeatureAPI |   1 +
 ...p.policy.drools.features.PolicyEngineFeatureAPI |   1 -
 10 files changed, 439 insertions(+), 439 deletions(-)
 create mode 100644 feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheck.java
 create mode 100644 feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheckFeature.java
 create mode 100644 feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/RestHealthCheck.java
 delete mode 100644 feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheck.java
 delete mode 100644 feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheckFeature.java
 delete mode 100644 feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/RestHealthCheck.java
 create mode 100644 feature-healthcheck/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI
 delete mode 100644 feature-healthcheck/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI

(limited to 'feature-healthcheck')

diff --git a/feature-healthcheck/pom.xml b/feature-healthcheck/pom.xml
index 12c6b4d8..3355a2a5 100644
--- a/feature-healthcheck/pom.xml
+++ b/feature-healthcheck/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
   
   <parent>
-    <groupId>org.openecomp.policy.drools-pdp</groupId>
+    <groupId>org.onap.policy.drools-pdp</groupId>
     <artifactId>drools-pdp</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
@@ -99,19 +99,19 @@
 	  <scope>provided</scope>
 	</dependency>
     <dependency>
-      <groupId>org.openecomp.policy.drools-pdp</groupId>
+      <groupId>org.onap.policy.drools-pdp</groupId>
       <artifactId>policy-core</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.openecomp.policy.drools-pdp</groupId>
+      <groupId>org.onap.policy.drools-pdp</groupId>
       <artifactId>policy-endpoints</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.openecomp.policy.drools-pdp</groupId>
+      <groupId>org.onap.policy.drools-pdp</groupId>
       <artifactId>policy-management</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
diff --git a/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties b/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties
index d91c2cc4..cb31e8f0 100644
--- a/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties
+++ b/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties
@@ -21,7 +21,7 @@
 http.server.services=HEALTHCHECK
 http.server.services.HEALTHCHECK.host=0.0.0.0
 http.server.services.HEALTHCHECK.port=6969
-http.server.services.HEALTHCHECK.restClasses=org.openecomp.policy.drools.healthcheck.RestHealthCheck
+http.server.services.HEALTHCHECK.restClasses=org.onap.policy.drools.healthcheck.RestHealthCheck
 http.server.services.HEALTHCHECK.managed=false
 http.server.services.HEALTHCHECK.swagger=true
 
diff --git a/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheck.java b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheck.java
new file mode 100644
index 00000000..0e4ed792
--- /dev/null
+++ b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheck.java
@@ -0,0 +1,277 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * feature-healthcheck
+ * ================================================================================
+ * Copyright (C) 2017 AT&T 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.
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.healthcheck;
+
+import java.util.ArrayList;
+import java.util.Properties;
+
+import javax.ws.rs.core.Response;
+
+import org.onap.policy.drools.http.client.HttpClient;
+import org.onap.policy.drools.http.server.HttpServletServer;
+import org.onap.policy.drools.persistence.SystemPersistence;
+import org.onap.policy.drools.properties.Startable;
+import org.onap.policy.drools.system.PolicyEngine;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Healthcheck
+ */
+public interface HealthCheck extends Startable {
+	
+	/**
+	 * Healthcheck Report
+	 */
+	public static class Report {
+		/**
+		 * Named Entity in the report
+		 */
+		public String name;
+		
+		/**
+		 * URL queried
+		 */
+		public String url;
+		
+		/**
+		 * healthy?
+		 */
+		public boolean healthy;
+		
+		/**
+		 * return code
+		 */
+		public int code;
+		
+		/**
+		 * Message from remote entity
+		 */
+		public String message;
+		
+		@Override
+		public String toString() {
+			StringBuilder builder = new StringBuilder();
+			builder.append("Report [name=");
+			builder.append(name);
+			builder.append(", url=");
+			builder.append(url);
+			builder.append(", healthy=");
+			builder.append(healthy);
+			builder.append(", code=");
+			builder.append(code);
+			builder.append(", message=");
+			builder.append(message);
+			builder.append("]");
+			return builder.toString();
+		}
+	}
+	
+	/**
+	 * Report aggregation
+	 */
+	public static class Reports {
+		public boolean healthy;
+		public ArrayList<Report> details = new ArrayList<>();
+		
+		@Override
+		public String toString() {
+			StringBuilder builder = new StringBuilder();
+			builder.append("Reports [healthy=");
+			builder.append(healthy);
+			builder.append(", details=");
+			builder.append(details);
+			builder.append("]");
+			return builder.toString();
+		}
+	}
+	
+	/**
+	 * perform a healthcheck
+	 * @return a report
+	 */
+	public Reports healthCheck();
+
+	/**
+	 * Healthcheck Monitor
+	 */
+	public static final HealthCheck monitor = new HealthCheckMonitor();
+}
+
+/**
+ * Healthcheck Monitor
+ */
+class HealthCheckMonitor implements HealthCheck {
+
+	/**
+	 * Logger
+	 */
+	private static Logger logger = LoggerFactory.getLogger(HealthCheckMonitor.class);
+	
+	/**
+	 * attached http servers
+	 */
+	protected volatile ArrayList<HttpServletServer> servers = new ArrayList<>();
+	
+	/**
+	 * attached http clients
+	 */
+	protected volatile ArrayList<HttpClient> clients = new ArrayList<>();
+	
+	/**
+	 * healthcheck configuration
+	 */
+	protected volatile Properties healthCheckProperties = null; 
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public Reports healthCheck() {	
+		Reports reports = new Reports();
+		reports.healthy = PolicyEngine.manager.isAlive();
+		
+		HealthCheck.Report engineReport = new Report();
+		engineReport.healthy = PolicyEngine.manager.isAlive();
+		engineReport.name = "PDP-D";
+		engineReport.url = "self";
+		engineReport.code = (PolicyEngine.manager.isAlive()) ? 200 : 500;
+		engineReport.message = (PolicyEngine.manager.isAlive()) ? "alive" : "not alive";
+		reports.details.add(engineReport);
+		
+		for (HttpClient client : clients) {
+			HealthCheck.Report report = new Report();
+			report.name = client.getName();
+			report.url = client.getBaseUrl();
+			report.healthy = true;
+			try {
+				Response response = client.get();
+				report.code = response.getStatus();
+				if (report.code != 200) {
+					report.healthy = false;
+					reports.healthy = false;
+				}
+					
+				try {
+					report.message = HttpClient.getBody(response, String.class);
+				} catch (Exception e) {
+					logger.warn("{}: cannot get body from http-client {}", this, client, e);
+				}
+			} catch (Exception e) {
+				report.healthy = false;
+				reports.healthy = false;
+			}
+			reports.details.add(report);
+		}
+		return reports;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean start() throws IllegalStateException {
+		
+		try {
+			this.healthCheckProperties = SystemPersistence.manager.getProperties(HealthCheckFeature.CONFIGURATION_PROPERTIES_NAME);
+			this.servers = HttpServletServer.factory.build(healthCheckProperties);
+			this.clients = HttpClient.factory.build(healthCheckProperties);
+			
+			for (HttpServletServer server : servers) {
+				try {
+					server.start();
+				} catch (Exception e) {
+					logger.warn("{}: cannot start http-server {}", this, server, e);
+				}
+			}
+		} catch (Exception e) {
+			return false;
+		}
+		
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean stop() throws IllegalStateException {
+		
+		for (HttpServletServer server : servers) {
+			try {
+				server.stop();
+			} catch (Exception e) {
+				logger.warn("{}: cannot stop http-server {}", this, server, e);
+			}
+		}
+		
+		for (HttpClient client : clients) {
+			try {
+				client.stop();
+			} catch (Exception e) {
+				logger.warn("{}: cannot stop http-client {}", this, client, e);
+			}
+		}
+		
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void shutdown() throws IllegalStateException {
+		this.stop();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public synchronized boolean isAlive() {
+		return this.healthCheckProperties != null;
+	}
+	
+	/**
+	 * @return list of attached Http Servers
+	 */
+	public ArrayList<HttpServletServer> getServers() {
+		return this.servers;
+	}
+	
+	/**
+	 * @return list of attached Http Clients
+	 */
+	public ArrayList<HttpClient> getClients() {
+		return this.clients;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("HealthCheckMonitor [servers=");
+		builder.append(servers);
+		builder.append(", clients=");
+		builder.append(clients);
+		builder.append("]");
+		return builder.toString();
+	}
+	
+}
diff --git a/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheckFeature.java b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheckFeature.java
new file mode 100644
index 00000000..34c1fe3a
--- /dev/null
+++ b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheckFeature.java
@@ -0,0 +1,78 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * feature-healthcheck
+ * ================================================================================
+ * Copyright (C) 2017 AT&T 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.
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.healthcheck;
+
+import org.onap.policy.drools.features.PolicyEngineFeatureAPI;
+import org.onap.policy.drools.system.PolicyEngine;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This feature provides healthcheck verification of remotely associated RESTful components
+ */
+public class HealthCheckFeature implements PolicyEngineFeatureAPI {	
+	
+	/**
+	 * Logger
+	 */
+	private static Logger logger = LoggerFactory.getLogger(HealthCheckFeature.class); 
+	
+	/**
+	 * Properties Configuration Name
+	 */
+	public static final String CONFIGURATION_PROPERTIES_NAME = "feature-healthcheck";
+
+	@Override
+	public int getSequenceNumber() {
+		return 1000;
+	}
+
+	@Override
+	public boolean afterStart(PolicyEngine engine) {
+		try {
+			HealthCheck.monitor.start();
+		} catch (IllegalStateException e) {
+			logger.error("Healthcheck Monitor cannot be started", e);
+		}
+		
+		return false;
+	}
+
+	@Override
+	public boolean afterShutdown(PolicyEngine engine) {
+		try {
+			HealthCheck.monitor.stop();
+		} catch (IllegalStateException e) {
+			logger.error("Healthcheck Monitor cannot be stopped", e);
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * gets the monitor
+	 * @return the healthcheck monitor
+	 */
+	public HealthCheck getMonitor() {
+		return HealthCheck.monitor;
+	}
+
+}
diff --git a/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/RestHealthCheck.java b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/RestHealthCheck.java
new file mode 100644
index 00000000..3f51ba46
--- /dev/null
+++ b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/RestHealthCheck.java
@@ -0,0 +1,77 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * feature-healthcheck
+ * ================================================================================
+ * Copyright (C) 2017 AT&T 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.
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.policy.drools.healthcheck;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.onap.policy.drools.healthcheck.HealthCheck.Reports;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Info;
+import io.swagger.annotations.SwaggerDefinition;
+import io.swagger.annotations.Tag;
+
+@Path("/")
+@Api
+@Produces(MediaType.APPLICATION_JSON)
+@SwaggerDefinition(
+    info = @Info(
+        description = "PDP-D Healthcheck Service",
+        version = "v1.0",
+        title = "PDP-D Healthcheck"
+    ),
+    consumes = {MediaType.APPLICATION_JSON},
+    produces = {MediaType.APPLICATION_JSON},
+    schemes = {SwaggerDefinition.Scheme.HTTP},
+    tags = {
+        @Tag(name = "pdp-d-healthcheck", description = "Drools PDP Healthcheck Operations")
+    }
+)
+public class RestHealthCheck {
+	
+    @GET
+    @Path("healthcheck")
+    @Produces(MediaType.APPLICATION_JSON)
+    @ApiOperation(
+        	value="Perform a system healthcheck", 
+        	notes="Provides healthy status of the PDP-D plus the components defined in its configuration by using a REST interface",
+        	response=Reports.class
+    )
+    public Response healthcheck() {  
+		return Response.status(Response.Status.OK).entity(HealthCheck.monitor.healthCheck()).build();
+    }
+    
+    @GET
+    @Path("healthcheck/configuration")
+    @Produces(MediaType.APPLICATION_JSON)
+    @ApiOperation(
+        	value="Configuration", 
+        	notes="Provides the Healthcheck server configuration and monitored REST clients",
+        	response=HealthCheck.class
+    )
+    public HealthCheck configuration() {  
+    	return HealthCheck.monitor;
+    }
+}
diff --git a/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheck.java b/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheck.java
deleted file mode 100644
index 324ea11b..00000000
--- a/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheck.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * feature-healthcheck
- * ================================================================================
- * Copyright (C) 2017 AT&T 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.
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.healthcheck;
-
-import java.util.ArrayList;
-import java.util.Properties;
-
-import javax.ws.rs.core.Response;
-
-import org.openecomp.policy.drools.http.client.HttpClient;
-import org.openecomp.policy.drools.http.server.HttpServletServer;
-import org.openecomp.policy.drools.persistence.SystemPersistence;
-import org.openecomp.policy.drools.properties.Startable;
-import org.openecomp.policy.drools.system.PolicyEngine;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Healthcheck
- */
-public interface HealthCheck extends Startable {
-	
-	/**
-	 * Healthcheck Report
-	 */
-	public static class Report {
-		/**
-		 * Named Entity in the report
-		 */
-		public String name;
-		
-		/**
-		 * URL queried
-		 */
-		public String url;
-		
-		/**
-		 * healthy?
-		 */
-		public boolean healthy;
-		
-		/**
-		 * return code
-		 */
-		public int code;
-		
-		/**
-		 * Message from remote entity
-		 */
-		public String message;
-		
-		@Override
-		public String toString() {
-			StringBuilder builder = new StringBuilder();
-			builder.append("Report [name=");
-			builder.append(name);
-			builder.append(", url=");
-			builder.append(url);
-			builder.append(", healthy=");
-			builder.append(healthy);
-			builder.append(", code=");
-			builder.append(code);
-			builder.append(", message=");
-			builder.append(message);
-			builder.append("]");
-			return builder.toString();
-		}
-	}
-	
-	/**
-	 * Report aggregation
-	 */
-	public static class Reports {
-		public boolean healthy;
-		public ArrayList<Report> details = new ArrayList<>();
-		
-		@Override
-		public String toString() {
-			StringBuilder builder = new StringBuilder();
-			builder.append("Reports [healthy=");
-			builder.append(healthy);
-			builder.append(", details=");
-			builder.append(details);
-			builder.append("]");
-			return builder.toString();
-		}
-	}
-	
-	/**
-	 * perform a healthcheck
-	 * @return a report
-	 */
-	public Reports healthCheck();
-
-	/**
-	 * Healthcheck Monitor
-	 */
-	public static final HealthCheck monitor = new HealthCheckMonitor();
-}
-
-/**
- * Healthcheck Monitor
- */
-class HealthCheckMonitor implements HealthCheck {
-
-	/**
-	 * Logger
-	 */
-	private static Logger logger = LoggerFactory.getLogger(HealthCheckMonitor.class);
-	
-	/**
-	 * attached http servers
-	 */
-	protected volatile ArrayList<HttpServletServer> servers = new ArrayList<>();
-	
-	/**
-	 * attached http clients
-	 */
-	protected volatile ArrayList<HttpClient> clients = new ArrayList<>();
-	
-	/**
-	 * healthcheck configuration
-	 */
-	protected volatile Properties healthCheckProperties = null; 
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public Reports healthCheck() {	
-		Reports reports = new Reports();
-		reports.healthy = PolicyEngine.manager.isAlive();
-		
-		HealthCheck.Report engineReport = new Report();
-		engineReport.healthy = PolicyEngine.manager.isAlive();
-		engineReport.name = "PDP-D";
-		engineReport.url = "self";
-		engineReport.code = (PolicyEngine.manager.isAlive()) ? 200 : 500;
-		engineReport.message = (PolicyEngine.manager.isAlive()) ? "alive" : "not alive";
-		reports.details.add(engineReport);
-		
-		for (HttpClient client : clients) {
-			HealthCheck.Report report = new Report();
-			report.name = client.getName();
-			report.url = client.getBaseUrl();
-			report.healthy = true;
-			try {
-				Response response = client.get();
-				report.code = response.getStatus();
-				if (report.code != 200) {
-					report.healthy = false;
-					reports.healthy = false;
-				}
-					
-				try {
-					report.message = HttpClient.getBody(response, String.class);
-				} catch (Exception e) {
-					logger.warn("{}: cannot get body from http-client {}", this, client, e);
-				}
-			} catch (Exception e) {
-				report.healthy = false;
-				reports.healthy = false;
-			}
-			reports.details.add(report);
-		}
-		return reports;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean start() throws IllegalStateException {
-		
-		try {
-			this.healthCheckProperties = SystemPersistence.manager.getProperties(HealthCheckFeature.CONFIGURATION_PROPERTIES_NAME);
-			this.servers = HttpServletServer.factory.build(healthCheckProperties);
-			this.clients = HttpClient.factory.build(healthCheckProperties);
-			
-			for (HttpServletServer server : servers) {
-				try {
-					server.start();
-				} catch (Exception e) {
-					logger.warn("{}: cannot start http-server {}", this, server, e);
-				}
-			}
-		} catch (Exception e) {
-			return false;
-		}
-		
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean stop() throws IllegalStateException {
-		
-		for (HttpServletServer server : servers) {
-			try {
-				server.stop();
-			} catch (Exception e) {
-				logger.warn("{}: cannot stop http-server {}", this, server, e);
-			}
-		}
-		
-		for (HttpClient client : clients) {
-			try {
-				client.stop();
-			} catch (Exception e) {
-				logger.warn("{}: cannot stop http-client {}", this, client, e);
-			}
-		}
-		
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void shutdown() throws IllegalStateException {
-		this.stop();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public synchronized boolean isAlive() {
-		return this.healthCheckProperties != null;
-	}
-	
-	/**
-	 * @return list of attached Http Servers
-	 */
-	public ArrayList<HttpServletServer> getServers() {
-		return this.servers;
-	}
-	
-	/**
-	 * @return list of attached Http Clients
-	 */
-	public ArrayList<HttpClient> getClients() {
-		return this.clients;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("HealthCheckMonitor [servers=");
-		builder.append(servers);
-		builder.append(", clients=");
-		builder.append(clients);
-		builder.append("]");
-		return builder.toString();
-	}
-	
-}
diff --git a/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheckFeature.java b/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheckFeature.java
deleted file mode 100644
index ac5b4b49..00000000
--- a/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheckFeature.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * feature-healthcheck
- * ================================================================================
- * Copyright (C) 2017 AT&T 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.
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.healthcheck;
-
-import org.openecomp.policy.drools.features.PolicyEngineFeatureAPI;
-import org.openecomp.policy.drools.system.PolicyEngine;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This feature provides healthcheck verification of remotely associated RESTful components
- */
-public class HealthCheckFeature implements PolicyEngineFeatureAPI {	
-	
-	/**
-	 * Logger
-	 */
-	private static Logger logger = LoggerFactory.getLogger(HealthCheckFeature.class); 
-	
-	/**
-	 * Properties Configuration Name
-	 */
-	public static final String CONFIGURATION_PROPERTIES_NAME = "feature-healthcheck";
-
-	@Override
-	public int getSequenceNumber() {
-		return 1000;
-	}
-
-	@Override
-	public boolean afterStart(PolicyEngine engine) {
-		try {
-			HealthCheck.monitor.start();
-		} catch (IllegalStateException e) {
-			logger.error("Healthcheck Monitor cannot be started", e);
-		}
-		
-		return false;
-	}
-
-	@Override
-	public boolean afterShutdown(PolicyEngine engine) {
-		try {
-			HealthCheck.monitor.stop();
-		} catch (IllegalStateException e) {
-			logger.error("Healthcheck Monitor cannot be stopped", e);
-		}
-		
-		return false;
-	}
-	
-	/**
-	 * gets the monitor
-	 * @return the healthcheck monitor
-	 */
-	public HealthCheck getMonitor() {
-		return HealthCheck.monitor;
-	}
-
-}
diff --git a/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/RestHealthCheck.java b/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/RestHealthCheck.java
deleted file mode 100644
index f90363fc..00000000
--- a/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/RestHealthCheck.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * feature-healthcheck
- * ================================================================================
- * Copyright (C) 2017 AT&T 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.
- * 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.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.drools.healthcheck;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.openecomp.policy.drools.healthcheck.HealthCheck.Reports;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Info;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
-
-@Path("/")
-@Api
-@Produces(MediaType.APPLICATION_JSON)
-@SwaggerDefinition(
-    info = @Info(
-        description = "PDP-D Healthcheck Service",
-        version = "v1.0",
-        title = "PDP-D Healthcheck"
-    ),
-    consumes = {MediaType.APPLICATION_JSON},
-    produces = {MediaType.APPLICATION_JSON},
-    schemes = {SwaggerDefinition.Scheme.HTTP},
-    tags = {
-        @Tag(name = "pdp-d-healthcheck", description = "Drools PDP Healthcheck Operations")
-    }
-)
-public class RestHealthCheck {
-	
-    @GET
-    @Path("healthcheck")
-    @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(
-        	value="Perform a system healthcheck", 
-        	notes="Provides healthy status of the PDP-D plus the components defined in its configuration by using a REST interface",
-        	response=Reports.class
-    )
-    public Response healthcheck() {  
-		return Response.status(Response.Status.OK).entity(HealthCheck.monitor.healthCheck()).build();
-    }
-    
-    @GET
-    @Path("healthcheck/configuration")
-    @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(
-        	value="Configuration", 
-        	notes="Provides the Healthcheck server configuration and monitored REST clients",
-        	response=HealthCheck.class
-    )
-    public HealthCheck configuration() {  
-    	return HealthCheck.monitor;
-    }
-}
diff --git a/feature-healthcheck/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI b/feature-healthcheck/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI
new file mode 100644
index 00000000..2ae820ac
--- /dev/null
+++ b/feature-healthcheck/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI
@@ -0,0 +1 @@
+org.onap.policy.drools.healthcheck.HealthCheckFeature
diff --git a/feature-healthcheck/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI b/feature-healthcheck/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI
deleted file mode 100644
index 7e307d08..00000000
--- a/feature-healthcheck/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI
+++ /dev/null
@@ -1 +0,0 @@
-org.openecomp.policy.drools.healthcheck.HealthCheckFeature
-- 
cgit 1.2.3-korg