Merge branch 'handleRequestRejectedException' into 'master'

Change response code for RequestRejectedException

See merge request !453

provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/middleware/AzureExceptionMapper.java

@@ -7,10 +7,13 @@ import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.model.http.AppException;
 import org.opengroup.osdu.partition.middleware.GlobalExceptionMapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.web.firewall.HttpStatusRequestRejectedHandler;
+import org.springframework.security.web.firewall.RequestRejectedHandler;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestController;
@@ -28,9 +31,13 @@ public class AzureExceptionMapper extends GlobalExceptionMapper {
     @Autowired
     private TelemetryClient telemetryClient;
 
+    @Bean
+    public RequestRejectedHandler requestRejectedHandler() {
+        return new HttpStatusRequestRejectedHandler();
+    }
+
     @ExceptionHandler(HttpResponseException.class)
     protected ResponseEntity<Object> handleHttpResponseException(HttpResponseException e) {
-        
         if (e.getResponse().getStatusCode() == HttpStatus.TOO_MANY_REQUESTS.value()) {
             return this.getErrorResponse(new AppException(e.getResponse().getStatusCode(), e.getLocalizedMessage(), e.getMessage(), e));
         }

testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/util/BaseTestTemplate.java

@@ -96,4 +96,10 @@ public abstract class BaseTestTemplate extends TestBase {
         CloseableHttpResponse response = descriptor.run(getId(), "");
         assertEquals(error(EntityUtils.toString(response.getEntity())), 401, response.getCode());
     }
+
+    @Test
+    public void should_return400_when_makingHttpRequestWithoutValidUrl() throws Exception {
+        CloseableHttpResponse response = descriptor.run("/", testUtils.getAccessToken());
+        assertEquals(error(EntityUtils.toString(response.getEntity())), 400, response.getCode());
+    }
 }