From e0be77fb0c60dd75e8dc025a76722406d8fef08e Mon Sep 17 00:00:00 2001
From: komakkar <komakkar@microsoft.com>
Date: Wed, 27 Jan 2021 18:43:50 +0530
Subject: [PATCH] Addressing failed test for option request.
---
.../provider/azure/pubsub/EventGridRequestBodyExtractor.java | 3 ++-
.../azure/pubsub/EventGridRequestBodyExtractorTest.java | 2 +-
.../osdu/notification/api/TestPubsubEndpointHMAC.java | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/pubsub/EventGridRequestBodyExtractor.java b/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/pubsub/EventGridRequestBodyExtractor.java
index 4628fed5e..b3c4aeb6b 100644
--- a/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/pubsub/EventGridRequestBodyExtractor.java
+++ b/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/pubsub/EventGridRequestBodyExtractor.java
@@ -29,6 +29,7 @@ import org.opengroup.osdu.notification.provider.interfaces.IPubsubRequestBodyExt
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.context.annotation.RequestScope;
import javax.servlet.http.HttpServletRequest;
@@ -152,7 +153,7 @@ public class EventGridRequestBodyExtractor implements IPubsubRequestBodyExtracto
// TODO : @komakkar sanitize the exceptions to match the SpringExceptionMapper and throw ValidationException
private NotificationRequest extractNotificationRequestFromHttpRequest() {
NotificationRequest notificationRequest = null;
- if (this.notificationRequest == null) {
+ if (this.notificationRequest == null && this.httpServletRequest.getMethod().equalsIgnoreCase("post")) {
try {
String requestBody = getBody(this.httpServletRequest);
NotificationRequest[] notificationRequestArray = GSON.fromJson(requestBody, NotificationRequest[].class);
diff --git a/provider/notification-azure/src/test/java/org/opengroup/osdu/notification/provider/azure/pubsub/EventGridRequestBodyExtractorTest.java b/provider/notification-azure/src/test/java/org/opengroup/osdu/notification/provider/azure/pubsub/EventGridRequestBodyExtractorTest.java
index 42b767021..803290c96 100644
--- a/provider/notification-azure/src/test/java/org/opengroup/osdu/notification/provider/azure/pubsub/EventGridRequestBodyExtractorTest.java
+++ b/provider/notification-azure/src/test/java/org/opengroup/osdu/notification/provider/azure/pubsub/EventGridRequestBodyExtractorTest.java
@@ -213,7 +213,7 @@ public class EventGridRequestBodyExtractorTest {
BufferedReader reader = new BufferedReader(new StringReader(validHandshakeRequestRoot));
ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(validHandshakeRequestRoot.getBytes());
-
+ when(httpServletRequest.getMethod()).thenReturn("POST");
when(httpServletRequest.getInputStream()).thenReturn(new ServletInputStream() {
@Override
public boolean isFinished() {
diff --git a/testing/notification-test-azure/src/test/java/org/opengroup/osdu/notification/api/TestPubsubEndpointHMAC.java b/testing/notification-test-azure/src/test/java/org/opengroup/osdu/notification/api/TestPubsubEndpointHMAC.java
index 20319e1e8..1b28aaecf 100644
--- a/testing/notification-test-azure/src/test/java/org/opengroup/osdu/notification/api/TestPubsubEndpointHMAC.java
+++ b/testing/notification-test-azure/src/test/java/org/opengroup/osdu/notification/api/TestPubsubEndpointHMAC.java
@@ -90,7 +90,7 @@ public class TestPubsubEndpointHMAC extends PubsubEndpointHMACTests {
}
@Test
- @Override// ignoring because it is flaky. Fixing in a different MR
+ @Override
public void should_return20X_when_usingCredentialsWithOpsPermission() throws Exception {
this.createResource();
@@ -115,7 +115,7 @@ public class TestPubsubEndpointHMAC extends PubsubEndpointHMACTests {
}
@Test
- @Override// ignoring because it is flaky. Debugging it to fix.
+ @Override
public void should_return20XResponseCode_when_makingValidHttpsRequest() throws Exception {
this.createResource();
--
GitLab