FIX: review comments and checkbox issue

Author: eznedan

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

@@ -25,7 +25,6 @@
 import javax.servlet.http.HttpServletRequest;
 
 @RestController
-@RequestMapping
 public interface BackEndInformationController {
 
     @RequestMapping(value = "/get-instances", method = RequestMethod.GET)

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

@@ -64,7 +64,6 @@ public ResponseEntity<String> deleteBackEndInstance(Model model, HttpServletRequ
             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);

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

@@ -84,6 +84,7 @@ public ResponseEntity<String> getAuthRequests(Model model, HttpServletRequest re
     @RequestMapping(value = {"/subscriptions", "/subscriptions/*", "/information",
             "/download/subscriptiontemplate"}, method = RequestMethod.GET)
     public ResponseEntity<String> getRequests(Model model, HttpServletRequest request) {
+        LOG.info("------------------------------------------>"+backEndInformation.getHost()+backEndInformation.getPort());
         String eiBackendAddressSuffix = request.getServletPath();
         String newRequestUrl = getEIBackendSubscriptionAddress() + eiBackendAddressSuffix;
         LOG.info("Got HTTP Request with method GET.\nUrlSuffix: " + eiBackendAddressSuffix

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

@@ -94,16 +94,6 @@ public String login(Model model) {
         return "login";
     }
 
-    @RequestMapping("/register.html")
-    public String register(Model model) {
-        return "register";
-    }
-
-    @RequestMapping("/forgot-password.html")
-    public String forgotPassword(Model model) {
-        return "forgot-password";
-    }
-
     // Added documentation for JMESPath rules usage
     @RequestMapping("/jmesPathRulesSetUp.html")
     public String jmesPathRulesSetUp(Model model) {

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

@@ -16,7 +16,6 @@
 */
 package com.ericsson.ei.frontend.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.*;
 import org.springframework.beans.factory.annotation.Value;
@@ -44,7 +43,9 @@ public class BackEndInformation {
 
     @JsonProperty("port")
     @Value("${ei.backendServerPort}")
-    @NotNull @Min(1) @Max(65535)
+    @NotNull
+    @Min(1)
+    @Max(65535)
     private int port;
 
     @JsonProperty("path")
@@ -55,6 +56,5 @@ public class BackEndInformation {
     @Value("${ei.useSecureHttp}")
     private boolean https;
 
-    @JsonIgnore
     private boolean checked;
 }

src/main/java/com/ericsson/ei/frontend/utils/BackEndInstancesUtils.java

@@ -42,6 +42,7 @@
 public class BackEndInstancesUtils {
 
     private static final Logger LOG = LoggerFactory.getLogger(BackEndInstancesUtils.class);
+    private static final String PATH = "src/main/resources/EIBackendInstancesExample.json";
 
     @Value("${ei.backendServerHost}")
     private String host;
@@ -71,6 +72,9 @@ public void init() {
             instances.put(getCurrentInstance());
         }
         writeIntoFile();
+        if (eiInstancesPath.equals("")) {
+            setEiInstancesPath(PATH);
+        }
     }
 
     private JSONObject getCurrentInstance() {
@@ -118,13 +122,13 @@ public void writeIntoFile() {
     public void parseBackEndInstancesFile() {
         if (eiInstancesPath != null) {
             try {
+                information.clear();
+                instances = new JSONArray();
                 JSONArray inputBackEndInstances = new JSONArray(new String(Files.readAllBytes(Paths.get(eiInstancesPath))));
                 for (Object o : inputBackEndInstances) {
                     JSONObject instance = (JSONObject) o;
-                    if (!checkIfInstanceAlreadyExist(instance)) {
-                        information.add(new ObjectMapper().readValue(instance.toString(), BackEndInformation.class));
-                        instances.put(instance);
-                    }
+                    information.add(new ObjectMapper().readValue(instance.toString(), BackEndInformation.class));
+                    instances.put(instance);
                 }
             } catch (IOException e) {
                 LOG.error("Failure when try to parse json file" + e.getMessage());

src/main/resources/EIBackendInstancesExample.json

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

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

@@ -31,7 +31,7 @@ function instanceModel() {
 		}
 	}
 }
-var observableObject = $("#instanceModel")[0];
-ko.cleanNode(observableObject);
-ko.applyBindings(new instanceModel(), observableObject);
+    var observableObject = $("#instanceModel")[0];
+    ko.cleanNode(observableObject);
+    ko.applyBindings(new instanceModel(), observableObject);
 });

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

@@ -34,22 +34,35 @@ function multipleInstancesModel(data) {
            		});
 	}
 	self.submit = function(instances) {
-		$.ajax({
-			url: "/switch-backend",
-			type: "POST",
-			data: ko.toJSON(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 switched", {sticky: false, theme: 'Notify'});
-				$("#mainFrame").load("subscriptionpage.html");
-			}
+	    var count = 0;
+	    var json = JSON.parse(ko.toJSON(instances));
+	    console.log(json);
+	    for(var i = 0; i < json.length; i++){
+	        var obj = json[i];
+	        if(obj.checked == true){
+	            count++;
+	        }
+	    }
+	    if(count == 1){
+		    $.ajax({
+			    url: "/switch-backend",
+			    type: "POST",
+			    data: ko.toJSON(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 switched", {sticky: false, theme: 'Notify'});
+				    $("#mainFrame").load("subscriptionpage.html");
+			    }
 			});
-		}
+		 } else {
+		     $.jGrowl("Please choose one backend instance", {sticky: false, theme: 'Error'});
+		   }
 	}
+}
 	$.ajax({
 		url: "/get-instances",
 		type: "GET",