-/*-\r
- * ================================================================================\r
- * ECOMP Portal\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ================================================================================\r
- */\r
-package org.openecomp.portalapp.portal.controller;\r
-\r
-import java.util.ArrayList;\r
-import java.util.List;\r
-\r
-import javax.servlet.http.HttpServletRequest;\r
-import javax.servlet.http.HttpServletResponse;\r
-\r
-import org.springframework.beans.factory.annotation.Autowired;\r
-import org.springframework.web.bind.annotation.PathVariable;\r
-import org.springframework.web.bind.annotation.RequestMapping;\r
-import org.springframework.web.bind.annotation.RequestMethod;\r
-import org.springframework.web.bind.annotation.RestController;\r
-\r
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;\r
-import org.openecomp.portalapp.controller.EPRestrictedBaseController;\r
-import org.openecomp.portalapp.portal.service.ConsulHealthService;\r
-import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse;\r
-import org.openecomp.portalapp.portal.ecomp.model.PortalRestStatusEnum;\r
-import com.orbitz.consul.ConsulException;\r
-import com.orbitz.consul.model.health.ServiceHealth;\r
-\r
-import io.searchbox.client.config.exception.NoServerConfiguredException;\r
-\r
-@RestController\r
-@RequestMapping("/portalApi/consul")\r
-public class ConsulClientController extends EPRestrictedBaseController {\r
- private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ConsulClientController.class);\r
-\r
- @Autowired\r
- private ConsulHealthService consulHealthService;\r
- //Get location of a healthy node running our service\r
- @RequestMapping(value = { "/service/{service}" }, method = RequestMethod.GET, produces = "application/json")\r
- public PortalRestResponse<String> getServiceLocation(HttpServletRequest request, HttpServletResponse response, @PathVariable("service") String service) {\r
-\r
- try{\r
- return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "Success!", consulHealthService.getServiceLocation(service));\r
- }\r
- catch(NoServerConfiguredException e){\r
- logger.error(logger.errorLogger, "No healthy service exception!");\r
- return new PortalRestResponse<String>(PortalRestStatusEnum.WARN, "Warning!", "No healthy service exception!");\r
- }\r
- catch(ConsulException e){\r
- logger.error(logger.errorLogger, "Couldn't connect ot consul - Is consul running?");\r
- return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "Error!", "Couldn't connect ot consul - Is consul running?");\r
- }\r
- }\r
-\r
- @RequestMapping(value = { "/service/healthy/{service}" }, method = RequestMethod.GET, produces = "application/json")\r
- public PortalRestResponse<List<ServiceHealth>> getAllHealthyNodes(HttpServletRequest request, HttpServletResponse response, @PathVariable("service") String service) {\r
- try{\r
- return new PortalRestResponse<List<ServiceHealth>>(PortalRestStatusEnum.OK, "Success!", consulHealthService.getAllHealthyNodes(service));\r
- }\r
- catch(ConsulException e){\r
- logger.error(logger.errorLogger, "Couldn't connect to consul - shouldn't break anything.");\r
- return new PortalRestResponse<List<ServiceHealth>>(PortalRestStatusEnum.ERROR,"Error!", new ArrayList<>());\r
- }\r
- }\r
- \r
- @RequestMapping(value = { "/service/all/{service}" }, method = RequestMethod.GET, produces = "application/json")\r
- public PortalRestResponse<List<ServiceHealth>> getAllNodes(HttpServletRequest request, HttpServletResponse response, @PathVariable("service") String service) {\r
- try{\r
- return new PortalRestResponse<List<ServiceHealth>>(PortalRestStatusEnum.OK, "Success!", consulHealthService.getAllNodes(service));\r
- }\r
- catch(ConsulException e){\r
- logger.error(logger.errorLogger, "Couldn't connect to consul - shouldn't break anything.");\r
- return new PortalRestResponse<List<ServiceHealth>>(PortalRestStatusEnum.ERROR,"Error!", new ArrayList<>());\r
- }\r
- }\r
-\r
-}\r
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * 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.openecomp.portalapp.portal.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.openecomp.portalapp.controller.EPRestrictedBaseController;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestStatusEnum;
+import org.openecomp.portalapp.portal.service.ConsulHealthService;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.orbitz.consul.ConsulException;
+import com.orbitz.consul.model.health.ServiceHealth;
+
+import io.searchbox.client.config.exception.NoServerConfiguredException;
+
+@RestController
+@RequestMapping("/portalApi/consul")
+public class ConsulClientController extends EPRestrictedBaseController {
+ private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ConsulClientController.class);
+
+ @Autowired
+ private ConsulHealthService consulHealthService;
+
+ // Get location of a healthy node running our service
+ @RequestMapping(value = { "/service/{service}" }, method = RequestMethod.GET, produces = "application/json")
+ public PortalRestResponse<String> getServiceLocation(HttpServletRequest request, HttpServletResponse response,
+ @PathVariable("service") String service) {
+
+ try {
+ return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "Success!",
+ consulHealthService.getServiceLocation(service, null));
+ } catch (NoServerConfiguredException e) {
+ logger.error(logger.errorLogger, "No healthy service exception!");
+ return new PortalRestResponse<String>(PortalRestStatusEnum.WARN, "Warning!",
+ "No healthy service exception!");
+ } catch (ConsulException e) {
+ logger.error(logger.errorLogger, "Couldn't connect ot consul - Is consul running?");
+ return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "Error!",
+ "Couldn't connect ot consul - Is consul running?");
+ }
+ }
+
+ @RequestMapping(value = { "/service/healthy/{service}" }, method = RequestMethod.GET, produces = "application/json")
+ public PortalRestResponse<List<ServiceHealth>> getAllHealthyNodes(HttpServletRequest request,
+ HttpServletResponse response, @PathVariable("service") String service) {
+ try {
+ return new PortalRestResponse<List<ServiceHealth>>(PortalRestStatusEnum.OK, "Success!",
+ consulHealthService.getAllHealthyNodes(service));
+ } catch (ConsulException e) {
+ logger.error(logger.errorLogger, "Couldn't connect to consul - shouldn't break anything.");
+ return new PortalRestResponse<List<ServiceHealth>>(PortalRestStatusEnum.ERROR, "Error!", new ArrayList<>());
+ }
+ }
+
+ @RequestMapping(value = { "/service/all/{service}" }, method = RequestMethod.GET, produces = "application/json")
+ public PortalRestResponse<List<ServiceHealth>> getAllNodes(HttpServletRequest request, HttpServletResponse response,
+ @PathVariable("service") String service) {
+ try {
+ return new PortalRestResponse<List<ServiceHealth>>(PortalRestStatusEnum.OK, "Success!",
+ consulHealthService.getAllNodes(service));
+ } catch (ConsulException e) {
+ logger.error(logger.errorLogger, "Couldn't connect to consul - shouldn't break anything.");
+ return new PortalRestResponse<List<ServiceHealth>>(PortalRestStatusEnum.ERROR, "Error!", new ArrayList<>());
+ }
+ }
+
+}
Code Review / portal.git / blobdiff