Skip to content

Commit 17419f0

Browse files
author
eznedan
committed
2 parents 7dd9d53 + 34aca48 commit 17419f0

File tree

1 file changed

+24
-28
lines changed

1 file changed

+24
-28
lines changed

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

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,7 @@ public class EIRequestsController {
5454
@CrossOrigin
5555
@RequestMapping(value = "/auth/login", method = RequestMethod.GET)
5656
public ResponseEntity<String> getAuthRequests(Model model, HttpServletRequest request) {
57-
String eiBackendAddressSuffix = request.getServletPath();
58-
String newRequestUrl = getEIBackendSubscriptionAddress() + eiBackendAddressSuffix;
59-
LOG.info("Got HTTP Request with method GET.\nUrlSuffix: " + eiBackendAddressSuffix +
60-
"\nForwarding Request to EI Backend with url: " + newRequestUrl);
57+
String eiRequestUrl = getEIRequestURL(request);
6158

6259
try {
6360
client.close();
@@ -66,7 +63,7 @@ public ResponseEntity<String> getAuthRequests(Model model, HttpServletRequest re
6663
LOG.error("Failed to close HTTP Client");
6764
}
6865

69-
HttpGet eiRequest = new HttpGet(newRequestUrl);
66+
HttpGet eiRequest = new HttpGet(eiRequestUrl);
7067

7168
String header = request.getHeader("Authorization");
7269
if (header != null) {
@@ -81,15 +78,12 @@ public ResponseEntity<String> getAuthRequests(Model model, HttpServletRequest re
8178
* Subscription by id or all subscriptions and EI Env Info.
8279
*/
8380
@CrossOrigin
84-
@RequestMapping(value = { "/subscriptions", "/subscriptions/*", "/information", "/auth",
85-
"/auth/checkStatus", "/auth/logout", "/download/*" }, method = RequestMethod.GET)
81+
@RequestMapping(value = { "/subscriptions", "/subscriptions/*", "/information", "/download/*", "/auth",
82+
"/auth/checkStatus", "/auth/logout", "/queryAggregatedObject", "/queryMissedNotifications", "/query" }, method = RequestMethod.GET)
8683
public ResponseEntity<String> getRequests(Model model, HttpServletRequest request) {
87-
String eiBackendAddressSuffix = request.getServletPath();
88-
String newRequestUrl = getEIBackendSubscriptionAddress() + eiBackendAddressSuffix;
89-
LOG.info("Got HTTP Request with method GET.\nUrlSuffix: " + eiBackendAddressSuffix
90-
+ "\nForwarding Request to EI Backend with url: " + newRequestUrl);
84+
String eiRequestUrl = getEIRequestURL(request);
9185

92-
HttpGet eiRequest = new HttpGet(newRequestUrl);
86+
HttpGet eiRequest = new HttpGet(eiRequestUrl);
9387

9488
return getResponse(eiRequest);
9589
}
@@ -98,12 +92,9 @@ public ResponseEntity<String> getRequests(Model model, HttpServletRequest reques
9892
* Bridge all EI Http Requests with POST method.
9993
*/
10094
@CrossOrigin
101-
@RequestMapping(value = {"/subscriptions", "/rules/rule-check/aggregation"}, method = RequestMethod.POST)
95+
@RequestMapping(value = { "/subscriptions", "/rules/rule-check/aggregation", "/query" }, method = RequestMethod.POST)
10296
public ResponseEntity<String> postRequests(Model model, HttpServletRequest request) {
103-
String eiBackendAddressSuffix = request.getServletPath();
104-
String newRequestUrl = getEIBackendSubscriptionAddress() + eiBackendAddressSuffix;
105-
LOG.info("Got HTTP Request with method POST.\nUrlSuffix: " + eiBackendAddressSuffix
106-
+ "\nForwarding Request to EI Backend with url: " + newRequestUrl);
97+
String eiRequestUrl = getEIRequestURL(request);
10798

10899
String inputReqJsonContent = "";
109100
try {
@@ -119,7 +110,7 @@ public ResponseEntity<String> postRequests(Model model, HttpServletRequest reque
119110
LOG.debug("Input Request JSON Content to be forwarded:\n" + inputReqJsonContent);
120111
HttpEntity inputReqJsonEntity = new ByteArrayEntity(inputReqJsonContent.getBytes());
121112

122-
HttpPost eiRequest = new HttpPost(newRequestUrl);
113+
HttpPost eiRequest = new HttpPost(eiRequestUrl);
123114
eiRequest.setEntity(inputReqJsonEntity);
124115
eiRequest.setHeader("Content-type", "application/json");
125116

@@ -133,10 +124,7 @@ public ResponseEntity<String> postRequests(Model model, HttpServletRequest reque
133124
@CrossOrigin
134125
@RequestMapping(value = "/subscriptions", method = RequestMethod.PUT)
135126
public ResponseEntity<String> putRequests(Model model, HttpServletRequest request) {
136-
String eiBackendAddressSuffix = request.getServletPath();
137-
String newRequestUrl = getEIBackendSubscriptionAddress() + eiBackendAddressSuffix;
138-
LOG.info("Got HTTP Request with method PUT.\nUrlSuffix: " + eiBackendAddressSuffix
139-
+ "\nForwarding Request to EI Backend with url: " + newRequestUrl);
127+
String eiRequestUrl = getEIRequestURL(request);
140128

141129
String inputReqJsonContent = "";
142130
try {
@@ -152,7 +140,7 @@ public ResponseEntity<String> putRequests(Model model, HttpServletRequest reques
152140
LOG.debug("Input Request JSON Content to be forwarded:\n" + inputReqJsonContent);
153141
HttpEntity inputReqJsonEntity = new ByteArrayEntity(inputReqJsonContent.getBytes());
154142

155-
HttpPut eiRequest = new HttpPut(newRequestUrl);
143+
HttpPut eiRequest = new HttpPut(eiRequestUrl);
156144
eiRequest.setEntity(inputReqJsonEntity);
157145
eiRequest.setHeader("Content-type", "application/json");
158146

@@ -166,12 +154,9 @@ public ResponseEntity<String> putRequests(Model model, HttpServletRequest reques
166154
@CrossOrigin
167155
@RequestMapping(value = "/subscriptions/*", method = RequestMethod.DELETE)
168156
public ResponseEntity<String> deleteRequests(Model model, HttpServletRequest request) {
169-
String eiBackendAddressSuffix = request.getServletPath();
170-
String newRequestUrl = getEIBackendSubscriptionAddress() + eiBackendAddressSuffix;
171-
LOG.info("Got HTTP Request with method DELETE.\nUrlSuffix: " + eiBackendAddressSuffix
172-
+ "\nForwarding Request to EI Backend with url: " + newRequestUrl);
157+
String eiRequestUrl = getEIRequestURL(request);
173158

174-
HttpDelete eiRequest = new HttpDelete(newRequestUrl);
159+
HttpDelete eiRequest = new HttpDelete(eiRequestUrl);
175160

176161
return getResponse(eiRequest);
177162
}
@@ -189,6 +174,17 @@ private String getEIBackendSubscriptionAddress() {
189174
return httpMethod + "://" + backEndInformation.getHost() + ":" + backEndInformation.getPort();
190175
}
191176

177+
private String getEIRequestURL(HttpServletRequest request) {
178+
String eiBackendAddressSuffix = request.getServletPath();
179+
String requestQuery = request.getQueryString();
180+
String query = (requestQuery != null && !requestQuery.isEmpty()) ? "?" + requestQuery : "";
181+
String requestUrl = getEIBackendSubscriptionAddress() + eiBackendAddressSuffix + query;
182+
LOG.info("Got HTTP Request with method " + request.getMethod()
183+
+ "\nUrlSuffix: " + eiBackendAddressSuffix
184+
+ "\nForwarding Request to EI Backend with url: " + requestUrl);
185+
return requestUrl;
186+
}
187+
192188
private ResponseEntity<String> getResponse(HttpRequestBase request) {
193189
String jsonContent = "";
194190
int statusCode = 102;

0 commit comments

Comments
 (0)