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 4628fed5ede492e31a7fb570520698d7dfe09240..b3c4aeb6b55e27936af4e0be2d42d66b4e00cbd0 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 42b7670217c4c4efcc9c6117162955db79b34c60..803290c96a4b1dc13f176d17b34edf8367f2692d 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 20319e1e8f3d3ae25e782516af2a3ea5157cd9af..1b28aaecf3eb957006f52395c8741db79e1384de 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();