CHANGE: checked to active

REMOVE: active from example

Author: eznedan

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

@@ -49,7 +49,7 @@ public ResponseEntity<String> switchBackEndInstance(Model model, HttpServletRequ
             utils.writeIntoFile();
             utils.parseBackEndInstancesFile();
             for (BackEndInformation backEndInformation : utils.getInformation()) {
-                if (backEndInformation.isChecked()) {
+                if (backEndInformation.isActive()) {
                     utils.setBackEndProperties(backEndInformation);
                 }
             }

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

@@ -56,5 +56,5 @@ public class BackEndInformation {
     @Value("${ei.useSecureHttp}")
     private boolean https;
 
-    private boolean checked;
+    private boolean active;
 }

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

@@ -42,7 +42,7 @@
 public class BackEndInstancesUtils {
 
     private static final Logger LOG = LoggerFactory.getLogger(BackEndInstancesUtils.class);
-    private static final String PATH = "src/main/resources/EIBackendInstancesExample.json";
+    private static final String PATH = "src/main/resources/EIBackendInstancesInformation.json";
 
     @Value("${ei.backendServerHost}")
     private String host;
@@ -71,10 +71,10 @@ public void init() {
         if (!checkIfInstanceAlreadyExist(getCurrentInstance())) {
             instances.put(getCurrentInstance());
         }
-        writeIntoFile();
         if (eiInstancesPath.equals("")) {
             setEiInstancesPath(PATH);
         }
+        writeIntoFile();
     }
 
     private JSONObject getCurrentInstance() {
@@ -84,7 +84,7 @@ private JSONObject getCurrentInstance() {
         instance.put("port", port);
         instance.put("path", path);
         instance.put("https", https);
-        instance.put("checked", true);
+        instance.put("active", true);
         return instance;
     }
 

src/main/resources/EIBackendInstancesExample.json

@@ -1,26 +1,16 @@
 [
-  {
-    "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/switch-instances.js

@@ -1,19 +1,19 @@
 jQuery(document).ready(function() {
-function singleInstanceModel(name, host, port, path, https, checked) {
+function singleInstanceModel(name, host, port, path, https, active) {
 	this.name = ko.observable(name),
 	this.host = ko.observable(host),
 	this.port = ko.observable(port),
 	this.path = ko.observable(path),
 	this.https = ko.observable(https),
-	this.checked = ko.observable(checked)
+	this.active = ko.observable(active)
 }
 function multipleInstancesModel(data) {
 	var self = this;
 	self.instances = ko.observableArray();
 	var json = JSON.parse(data);
 	for(var i = 0; i < json.length; i++) {
 		var obj = json[i];
-		var instance = new singleInstanceModel(obj.name, obj.host, obj.port, obj.path, obj.https, obj.checked);
+		var instance = new singleInstanceModel(obj.name, obj.host, obj.port, obj.path, obj.https, obj.active);
 		self.instances.push(instance);
 	}
 	self.removeInstance = function() {
@@ -39,7 +39,7 @@ function multipleInstancesModel(data) {
 	    console.log(json);
 	    for(var i = 0; i < json.length; i++){
 	        var obj = json[i];
-	        if(obj.checked == true){
+	        if(obj.active == true){
 	            count++;
 	        }
 	    }

src/main/resources/templates/switch-backend.html

@@ -27,7 +27,7 @@
                 <tbody data-bind="foreach: instances">
                 <tr>
                     <td align="center"><input align="center" id="activeInstance" type="checkbox"
-                                              data-bind="checked: checked"/></td>
+                                              data-bind="checked: active"/></td>
                     <td data-bind="text: name" align="center"></td>
                     <td data-bind="text: host" align="center"></td>
                     <td data-bind="text: port" align="center"></td>