Merge branch 'master' of https://github.com/Ericsson/eiffel-intelligence-frontend

Author: eznedan

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

@@ -54,10 +54,7 @@ public class EIRequestsController {
     @CrossOrigin
     @RequestMapping(value = "/auth/login", method = RequestMethod.GET)
     public ResponseEntity<String> getAuthRequests(Model model, HttpServletRequest request) {
-        String eiBackendAddressSuffix = request.getServletPath();
-        String newRequestUrl = getEIBackendSubscriptionAddress() + eiBackendAddressSuffix;
-        LOG.info("Got HTTP Request with method GET.\nUrlSuffix: " + eiBackendAddressSuffix +
-                "\nForwarding Request to EI Backend with url: " + newRequestUrl);
+        String eiRequestUrl = getEIRequestURL(request);
 
         try {
             client.close();
@@ -66,7 +63,7 @@ public ResponseEntity<String> getAuthRequests(Model model, HttpServletRequest re
             LOG.error("Failed to close HTTP Client");
         }
 
-        HttpGet eiRequest = new HttpGet(newRequestUrl);
+        HttpGet eiRequest = new HttpGet(eiRequestUrl);
 
         String header = request.getHeader("Authorization");
         if (header != null) {
@@ -81,15 +78,12 @@ public ResponseEntity<String> getAuthRequests(Model model, HttpServletRequest re
      * Subscription by id or all subscriptions and EI Env Info.
      */
     @CrossOrigin
-    @RequestMapping(value = { "/subscriptions", "/subscriptions/*", "/information", "/auth",
-        "/auth/checkStatus", "/auth/logout", "/download/*" }, method = RequestMethod.GET)
+    @RequestMapping(value = { "/subscriptions", "/subscriptions/*", "/information", "/download/*", "/auth",
+        "/auth/checkStatus", "/auth/logout", "/queryAggregatedObject", "/queryMissedNotifications", "/query" }, method = RequestMethod.GET)
     public ResponseEntity<String> getRequests(Model model, HttpServletRequest request) {
-        String eiBackendAddressSuffix = request.getServletPath();
-        String newRequestUrl = getEIBackendSubscriptionAddress() + eiBackendAddressSuffix;
-        LOG.info("Got HTTP Request with method GET.\nUrlSuffix: " + eiBackendAddressSuffix
-                + "\nForwarding Request to EI Backend with url: " + newRequestUrl);
+        String eiRequestUrl = getEIRequestURL(request);
 
-        HttpGet eiRequest = new HttpGet(newRequestUrl);
+        HttpGet eiRequest = new HttpGet(eiRequestUrl);
 
         return getResponse(eiRequest);
     }
@@ -98,12 +92,9 @@ public ResponseEntity<String> getRequests(Model model, HttpServletRequest reques
      * Bridge all EI Http Requests with POST method.
      */
     @CrossOrigin
-    @RequestMapping(value = {"/subscriptions", "/rules/rule-check/aggregation"}, method = RequestMethod.POST)
+    @RequestMapping(value = { "/subscriptions", "/rules/rule-check/aggregation", "/query" }, method = RequestMethod.POST)
     public ResponseEntity<String> postRequests(Model model, HttpServletRequest request) {
-        String eiBackendAddressSuffix = request.getServletPath();
-        String newRequestUrl = getEIBackendSubscriptionAddress() + eiBackendAddressSuffix;
-        LOG.info("Got HTTP Request with method POST.\nUrlSuffix: " + eiBackendAddressSuffix
-                + "\nForwarding Request to EI Backend with url: " + newRequestUrl);
+        String eiRequestUrl = getEIRequestURL(request);
 
         String inputReqJsonContent = "";
         try {
@@ -119,7 +110,7 @@ public ResponseEntity<String> postRequests(Model model, HttpServletRequest reque
         LOG.debug("Input Request JSON Content to be forwarded:\n" + inputReqJsonContent);
         HttpEntity inputReqJsonEntity = new ByteArrayEntity(inputReqJsonContent.getBytes());
 
-        HttpPost eiRequest = new HttpPost(newRequestUrl);
+        HttpPost eiRequest = new HttpPost(eiRequestUrl);
         eiRequest.setEntity(inputReqJsonEntity);
         eiRequest.setHeader("Content-type", "application/json");
 
@@ -133,10 +124,7 @@ public ResponseEntity<String> postRequests(Model model, HttpServletRequest reque
     @CrossOrigin
     @RequestMapping(value = "/subscriptions", method = RequestMethod.PUT)
     public ResponseEntity<String> putRequests(Model model, HttpServletRequest request) {
-        String eiBackendAddressSuffix = request.getServletPath();
-        String newRequestUrl = getEIBackendSubscriptionAddress() + eiBackendAddressSuffix;
-        LOG.info("Got HTTP Request with method PUT.\nUrlSuffix: " + eiBackendAddressSuffix
-                + "\nForwarding Request to EI Backend with url: " + newRequestUrl);
+        String eiRequestUrl = getEIRequestURL(request);
 
         String inputReqJsonContent = "";
         try {
@@ -152,7 +140,7 @@ public ResponseEntity<String> putRequests(Model model, HttpServletRequest reques
         LOG.debug("Input Request JSON Content to be forwarded:\n" + inputReqJsonContent);
         HttpEntity inputReqJsonEntity = new ByteArrayEntity(inputReqJsonContent.getBytes());
 
-        HttpPut eiRequest = new HttpPut(newRequestUrl);
+        HttpPut eiRequest = new HttpPut(eiRequestUrl);
         eiRequest.setEntity(inputReqJsonEntity);
         eiRequest.setHeader("Content-type", "application/json");
 
@@ -166,12 +154,9 @@ public ResponseEntity<String> putRequests(Model model, HttpServletRequest reques
     @CrossOrigin
     @RequestMapping(value = "/subscriptions/*", method = RequestMethod.DELETE)
     public ResponseEntity<String> deleteRequests(Model model, HttpServletRequest request) {
-        String eiBackendAddressSuffix = request.getServletPath();
-        String newRequestUrl = getEIBackendSubscriptionAddress() + eiBackendAddressSuffix;
-        LOG.info("Got HTTP Request with method DELETE.\nUrlSuffix: " + eiBackendAddressSuffix
-                + "\nForwarding Request to EI Backend with url: " + newRequestUrl);
+        String eiRequestUrl = getEIRequestURL(request);
 
-        HttpDelete eiRequest = new HttpDelete(newRequestUrl);
+        HttpDelete eiRequest = new HttpDelete(eiRequestUrl);
 
         return getResponse(eiRequest);
     }
@@ -189,6 +174,17 @@ private String getEIBackendSubscriptionAddress() {
         return httpMethod + "://" + backEndInformation.getHost() + ":" + backEndInformation.getPort();
     }
 
+    private String getEIRequestURL(HttpServletRequest request) {
+        String eiBackendAddressSuffix = request.getServletPath();
+        String requestQuery = request.getQueryString();
+        String query = (requestQuery != null && !requestQuery.isEmpty()) ? "?" + requestQuery : "";
+        String requestUrl = getEIBackendSubscriptionAddress() + eiBackendAddressSuffix + query;
+        LOG.info("Got HTTP Request with method " + request.getMethod()
+            + "\nUrlSuffix: " + eiBackendAddressSuffix
+            + "\nForwarding Request to EI Backend with url: " + requestUrl);
+        return requestUrl;
+    }
+
     private ResponseEntity<String> getResponse(HttpRequestBase request) {
         String jsonContent = "";
         int statusCode = 102;