ADD: delete btn

Author: eznedan

src/main/java/com/ericsson/ei/frontend/WebController.java

@@ -143,6 +143,19 @@ public ResponseEntity<String> switchBackEndInstance(Model model, HttpServletRequ
         }
     }
 
+    @RequestMapping(value = "/switch-backend", method = RequestMethod.DELETE)
+    public ResponseEntity<String> deleteBackEndInstance(Model model, HttpServletRequest request) {
+        try {
+            String body = request.getReader().lines().collect(Collectors.joining(System.lineSeparator()));
+            utils.setInstances(new JSONArray(body));
+            utils.writeIntoFile();
+            utils.parseBackEndInstancesFile();
+            return new ResponseEntity<>(HttpStatus.OK);
+        } catch (Exception e) {
+            return new ResponseEntity<>("Internal error", HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+    }
+
     @RequestMapping(value = "/add-instances", method = RequestMethod.POST)
     public ResponseEntity<String> addInstanceInformation(Model model, HttpServletRequest request) {
         try {

src/main/java/com/ericsson/ei/frontend/model/BackEndInformation.java

@@ -7,6 +7,8 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
 @Getter
@@ -27,7 +29,7 @@ public class BackEndInformation {
 
     @JsonProperty("port")
     @Value("${ei.backendServerPort}")
-    @NotNull
+    @NotNull @Min(1) @Max(65535)
     private int port;
 
     @JsonProperty("path")

src/main/resources/EIBackendInstancesExample.json

@@ -1 +1,18 @@
-[{"path":"","port":8090,"name":"core","host":"localhost","checked":true,"https":false},{"path":"","port":8098,"name":"test","host":"localhost23","checked":false,"https":false},{"path":"","port":"567","name":"hgjghj","host":"ghjghj","checked":false,"https":false}]
+[
+  {
+    "path": "",
+    "port": 8091,
+    "name": "core",
+    "host": "localhost",
+    "checked": false,
+    "https": false
+  },
+  {
+    "path": "/eiffel",
+    "port": 8080,
+    "name": "test",
+    "host": "localhost23",
+    "checked": true,
+    "https": false
+  }
+]

src/main/resources/application.properties

@@ -13,10 +13,10 @@ server.port=8080
 
 ######## EI Backend
 ei.frontendServiceHost=localhost
-ei.frontendServicePort=8080
+ei.frontendServicePort=8092
 ei.frontendContextPath=
 ei.backendServerHost=localhost
-ei.backendServerPort=8090
+ei.backendServerPort=8091
 ei.backendContextPath=
 ei.useSecureHttp=false
 ei.backendInstancesPath=src\\main\\resources\\EIBackendInstancesExample.json

src/main/resources/static/js/switch-instances.js

@@ -22,6 +22,20 @@ jQuery(document).ready(function() {
 
 		self.removeInstance = function() {
 			self.instances.remove(this);
+			    $.ajax({
+            	    url: "/switch-backend",
+            		type: "DELETE",
+            		data: ko.toJSON(self.instances),
+            		contentType: 'application/json; charset=utf-8',
+            		cache: false,
+            		error: function (XMLHttpRequest, textStatus, errorThrown) {
+            		    $.jGrowl(XMLHttpRequest.responseText, {sticky: false, theme: 'Error'});
+            		},
+            		success: function (responseData, textStatus) {
+            		    $.jGrowl("Backend instance was deleted", {sticky: false, theme: 'Notify'});
+            			$("#mainFrame").load("switch-backend.html");
+            		}
+           		});
 		}
 
 		self.submit = function(instances) {