Fix the X-HTTP-Method-Override issue

Issue-ID: AAI-1084
Change-Id: Ife49befcbcd9c35c30f3c2b33558cf665f4ab7df
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>

3 files changed, 206 insertions, 1 deletions

diff --git a/aai-resources/src/main/java/org/onap/aai/interceptors/pre/AAIRequestFilterPriority.java b/aai-resources/src/main/java/org/onap/aai/interceptors/pre/AAIRequestFilterPriority.java
index 5c57932..0db7b44 100644
--- a/aai-resources/src/main/java/org/onap/aai/interceptors/pre/AAIRequestFilterPriority.java
+++ b/aai-resources/src/main/java/org/onap/aai/interceptors/pre/AAIRequestFilterPriority.java
@@ -29,7 +29,9 @@ public final class AAIRequestFilterPriority {
 
 	public static final int SET_LOGGING_CONTEXT = 3000;
 
-	public static final int AUTHORIZATION = 4000;
+	public static final int HTTP_HEADER = 4000;
+
+	public static final int AUTHORIZATION = 4500;
 
 	public static final int HEADER_MANIPULATION = 5000;
 
diff --git a/aai-resources/src/main/java/org/onap/aai/interceptors/pre/HttpHeaderInterceptor.java b/aai-resources/src/main/java/org/onap/aai/interceptors/pre/HttpHeaderInterceptor.java
new file mode 100644
index 0000000..faca530
--- /dev/null
+++ b/aai-resources/src/main/java/org/onap/aai/interceptors/pre/HttpHeaderInterceptor.java
@@ -0,0 +1,50 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.interceptors.pre;
+import org.onap.aai.interceptors.AAIContainerFilter;
+import org.onap.aai.interceptors.AAIHeaderProperties;
+
+import javax.annotation.Priority;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.PreMatching;
+import javax.ws.rs.HttpMethod;
+
+import java.io.IOException;
+
+/**
+ * The Class HttpHeaderInterceptor
+ */
+@PreMatching
+@Priority(AAIRequestFilterPriority.HTTP_HEADER)
+public class HttpHeaderInterceptor extends AAIContainerFilter implements ContainerRequestFilter {
+	public static final String patchMethod = "PATCH";
+	
+    @Override
+    public void filter(ContainerRequestContext containerRequestContext) throws IOException {
+    	String overrideMethod = containerRequestContext.getHeaderString(AAIHeaderProperties.HTTP_METHOD_OVERRIDE);
+    	String httpMethod = containerRequestContext.getMethod();
+    	
+		if (HttpMethod.POST.equalsIgnoreCase(httpMethod) && patchMethod.equalsIgnoreCase(overrideMethod)) {
+			containerRequestContext.setMethod(patchMethod);
+		}
+    }
+    
+}
diff --git a/aai-resources/src/test/java/org/onap/aai/rest/ConfigurationTest.java b/aai-resources/src/test/java/org/onap/aai/rest/ConfigurationTest.java
new file mode 100644
index 0000000..b6d8872
--- /dev/null
+++ b/aai-resources/src/test/java/org/onap/aai/rest/ConfigurationTest.java
@@ -0,0 +1,153 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.rest;
+
+import com.jayway.jsonpath.JsonPath;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.onap.aai.ResourcesApp;
+import org.onap.aai.ResourcesTestConfiguration;
+import org.onap.aai.config.PropertyPasswordConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Import;
+import org.springframework.http.*;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Collections;
+import java.util.UUID;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Test REST requests against configuration resource
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = ResourcesApp.class)
+@TestPropertySource(locations = "classpath:application-test.properties")
+@ContextConfiguration(initializers = PropertyPasswordConfiguration.class)
+@Import(ResourcesTestConfiguration.class)
+public class ConfigurationTest {
+
+    @Autowired
+    RestTemplate restTemplate;
+
+    @LocalServerPort
+    int randomPort;
+
+    private HttpEntity<String> httpEntity;
+    private HttpEntity<String> httpEntityPut;
+    private HttpEntity<String> httpEntityPatch;
+    private String baseUrl;
+    private HttpHeaders headers;
+    @Before
+    public void setup() throws UnsupportedEncodingException {
+
+        headers = new HttpHeaders();
+
+        headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.add("Real-Time", "true");
+        headers.add("X-FromAppId", "JUNIT");
+        headers.add("X-TransactionId", "JUNIT");
+
+        String authorization = Base64.getEncoder().encodeToString("AAI:AAI".getBytes("UTF-8"));
+        headers.add("Authorization", "Basic " + authorization);
+
+        httpEntity = new HttpEntity<String>(headers);
+        baseUrl = "https://localhost:" + randomPort;
+    }
+
+    @Test
+    public void testGetPutPatchConfiguration() {
+    	String hostname = "pservertest" + UUID.randomUUID().toString();
+        String endpoint = "/aai/v13/cloud-infrastructure/pservers/pserver/" + hostname;
+
+        ResponseEntity responseEntity = null;
+
+        responseEntity = restTemplate.exchange(baseUrl + endpoint, HttpMethod.GET, httpEntity, String.class);
+        assertEquals(HttpStatus.NOT_FOUND, responseEntity.getStatusCode());
+
+        String putBody = "{" +
+        		"\"hostname\": \"" + hostname + "\"," +
+        		"\"ptnii-equip-name\": \"type1\"," +
+        		"\"equip-type\": \"subtype1\" " +
+        	"}";
+        httpEntityPut = new HttpEntity<String>(putBody, headers);
+        responseEntity = restTemplate.exchange(baseUrl + endpoint, HttpMethod.PUT, httpEntityPut, String.class);
+        assertEquals(HttpStatus.CREATED, responseEntity.getStatusCode());
+
+        String vertexId = responseEntity.getHeaders().getFirst("vertex-id");
+        responseEntity = restTemplate.exchange(baseUrl + "/aai/v12/resources/id/" + vertexId, HttpMethod.GET, httpEntity, String.class);
+        assertEquals(HttpStatus.OK, responseEntity.getStatusCode());
+
+        responseEntity = restTemplate.exchange(baseUrl + endpoint, HttpMethod.GET, httpEntity, String.class);
+        assertEquals(HttpStatus.OK, responseEntity.getStatusCode());
+        
+        String patchBody = "{" +
+        		"\"hostname\": \"" + hostname + "\"," +
+        		"\"ptnii-equip-name\": \"type2\"," +
+        		"\"equip-type\": \"subtype2\" " +
+        	"}";
+        headers.put("Content-Type", Arrays.asList("application/merge-patch+json"));
+        headers.add("X-HTTP-Method-Override", "PATCH");
+        
+        httpEntityPatch = new HttpEntity<String>(patchBody, headers);
+        
+        responseEntity = restTemplate.exchange(baseUrl + endpoint, HttpMethod.POST, httpEntityPatch, String.class);
+        assertEquals(HttpStatus.OK, responseEntity.getStatusCode());
+        
+        responseEntity = restTemplate.exchange(baseUrl + endpoint, HttpMethod.GET, httpEntity, String.class);
+        assertEquals(HttpStatus.OK, responseEntity.getStatusCode());
+        
+        String body = responseEntity.getBody().toString();
+        String ptniiEquipName = JsonPath.read(body, "$.ptnii-equip-name");
+
+        assertEquals("type2", ptniiEquipName);
+        
+        patchBody = "{" +
+        		"\"hostname\": \"" + hostname + "\"," +
+        		"\"ptnii-equip-name\": \"type3\"," +
+        		"\"equip-type\": \"subtype3\" " +
+        	"}";
+        
+        httpEntityPatch = new HttpEntity<String>(patchBody, headers);
+        responseEntity = restTemplate.exchange(baseUrl + endpoint, HttpMethod.PATCH, httpEntityPatch, String.class);
+        assertEquals(HttpStatus.OK, responseEntity.getStatusCode());
+        
+        responseEntity = restTemplate.exchange(baseUrl + endpoint, HttpMethod.GET, httpEntity, String.class);
+        assertEquals(HttpStatus.OK, responseEntity.getStatusCode());
+        
+        body = responseEntity.getBody().toString();
+        ptniiEquipName = JsonPath.read(body, "$.ptnii-equip-name");
+
+        assertEquals("type3", ptniiEquipName);
+        
+    }
+    
+}