Skip to content

Commit bc13418

Browse files
authored
FIX: issue with frontendUrl (#33)
1 parent 4c912fa commit bc13418

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import org.springframework.http.ResponseEntity;
2020
import org.springframework.ui.Model;
21+
import org.springframework.web.bind.annotation.CrossOrigin;
2122
import org.springframework.web.bind.annotation.RequestMapping;
2223
import org.springframework.web.bind.annotation.RequestMethod;
2324
import org.springframework.web.bind.annotation.RestController;
@@ -27,18 +28,23 @@
2728
@RestController
2829
public interface BackEndInformationController {
2930

31+
@CrossOrigin
3032
@RequestMapping(value = "/get-instances", method = RequestMethod.GET)
3133
ResponseEntity<String> getInstances(Model model);
3234

35+
@CrossOrigin
3336
@RequestMapping(value = "/switch-backend", method = RequestMethod.POST)
3437
ResponseEntity<String> switchBackEndInstance(Model model, HttpServletRequest request);
3538

39+
@CrossOrigin
3640
@RequestMapping(value = "/switch-backendByMainPage", method = RequestMethod.POST)
3741
ResponseEntity<String> switchBackEndInstanceByMainPage(Model model, HttpServletRequest request);
3842

43+
@CrossOrigin
3944
@RequestMapping(value = "/switch-backend", method = RequestMethod.DELETE)
4045
ResponseEntity<String> deleteBackEndInstance(Model model, HttpServletRequest request);
4146

47+
@CrossOrigin
4248
@RequestMapping(value = "/add-instances", method = RequestMethod.POST)
4349
ResponseEntity<String> addInstanceInformation(Model model, HttpServletRequest request);
4450
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ public ResponseEntity<String> addInstanceInformation(Model model, HttpServletReq
8080
String body = request.getReader().lines().collect(Collectors.joining(System.lineSeparator()));
8181
JsonObject instance = new JsonParser().parse(body).getAsJsonObject();
8282
if (!utils.checkIfInstanceAlreadyExist(instance)) {
83-
instance.addProperty("default", false);
8483
utils.getInstances().add(instance);
8584
utils.writeIntoFile();
8685
return new ResponseEntity<>(HttpStatus.OK);

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,13 @@ public void init() {
8282
}
8383
writeIntoFile();
8484
information.clear();
85-
information = new Gson().fromJson(instances,new TypeToken<List<BackEndInformation>>() {
85+
information = new Gson().fromJson(instances, new TypeToken<List<BackEndInformation>>() {
8686
}.getType());
87+
for (BackEndInformation backEndInformation : information) {
88+
if (backEndInformation.isActive()) {
89+
setBackEndProperties(backEndInformation);
90+
}
91+
}
8792
}
8893

8994
private JsonObject getCurrentInstance() {

0 commit comments

Comments
 (0)