-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
NIFI-5628 Added content length check to OkHttpReplicationClient.
Added unit tests.
- Loading branch information
Showing
2 changed files
with
197 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
138 changes: 138 additions & 0 deletions
138
...ache/nifi/cluster/coordination/http/replication/okhttp/OkHttpReplicationClientTest.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You 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. | ||
| */ | ||
|
|
||
|
|
||
| package org.apache.nifi.cluster.coordination.http.replication.okhttp | ||
|
|
||
| import org.apache.nifi.properties.StandardNiFiProperties | ||
| import org.apache.nifi.util.NiFiProperties | ||
| import org.junit.BeforeClass | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import org.junit.runners.JUnit4 | ||
| import org.slf4j.Logger | ||
| import org.slf4j.LoggerFactory | ||
|
|
||
| @RunWith(JUnit4.class) | ||
| class OkHttpReplicationClientTest extends GroovyTestCase { | ||
| private static final Logger logger = LoggerFactory.getLogger(OkHttpReplicationClientTest.class) | ||
|
|
||
| @BeforeClass | ||
| static void setUpOnce() throws Exception { | ||
| logger.metaClass.methodMissing = { String name, args -> | ||
| logger.info("[${name?.toUpperCase()}] ${(args as List).join(" ")}") | ||
| } | ||
| } | ||
|
|
||
| private static StandardNiFiProperties mockNiFiProperties() { | ||
| [getClusterNodeConnectionTimeout: { -> "10 ms" }, | ||
| getClusterNodeReadTimeout : { -> "10 ms" }, | ||
| getProperty : { String prop -> | ||
| logger.mock("Requested getProperty(${prop}) -> \"\"") | ||
| "" | ||
| }] as StandardNiFiProperties | ||
| } | ||
|
|
||
| @Test | ||
| void testShouldReplaceNonZeroContentLengthHeader() { | ||
| // Arrange | ||
| def headers = ["Content-Length": "123", "Other-Header": "arbitrary value"] | ||
| String method = "DELETE" | ||
| logger.info("Original headers: ${headers}") | ||
|
|
||
| NiFiProperties mockProperties = mockNiFiProperties() | ||
|
|
||
| OkHttpReplicationClient client = new OkHttpReplicationClient(mockProperties) | ||
|
|
||
| // Act | ||
| client.checkContentLengthHeader(method, headers) | ||
| logger.info("Checked headers: ${headers}") | ||
|
|
||
| // Assert | ||
| assert headers.size() == 2 | ||
| assert headers."Content-Length" == "0" | ||
| } | ||
|
|
||
| @Test | ||
| void testShouldReplaceNonZeroContentLengthHeaderOnDeleteCaseInsensitive() { | ||
| // Arrange | ||
| def headers = ["Content-Length": "123", "Other-Header": "arbitrary value"] | ||
| String method = "delete" | ||
| logger.info("Original headers: ${headers}") | ||
|
|
||
| NiFiProperties mockProperties = mockNiFiProperties() | ||
|
|
||
| OkHttpReplicationClient client = new OkHttpReplicationClient(mockProperties) | ||
|
|
||
| // Act | ||
| client.checkContentLengthHeader(method, headers) | ||
| logger.info("Checked headers: ${headers}") | ||
|
|
||
| // Assert | ||
| assert headers.size() == 2 | ||
| assert headers."Content-Length" == "0" | ||
| } | ||
|
|
||
| @Test | ||
| void testShouldNotReplaceContentLengthHeaderWhenZeroOrNull() { | ||
| // Arrange | ||
| String method = "DELETE" | ||
| def zeroOrNullContentLengths = [null, "0"] | ||
|
|
||
| NiFiProperties mockProperties = mockNiFiProperties() | ||
|
|
||
| OkHttpReplicationClient client = new OkHttpReplicationClient(mockProperties) | ||
|
|
||
| // Act | ||
| zeroOrNullContentLengths.each { String contentLength -> | ||
| def headers = ["Content-Length": contentLength, "Other-Header": "arbitrary value"] | ||
| logger.info("Original headers: ${headers}") | ||
|
|
||
| logger.info("Trying method ${method}") | ||
| client.checkContentLengthHeader(method, headers) | ||
| logger.info("Checked headers: ${headers}") | ||
|
|
||
| // Assert | ||
| assert headers.size() == 2 | ||
| assert headers."Content-Length" == contentLength | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| void testShouldNotReplaceNonZeroContentLengthHeaderOnOtherMethod() { | ||
| // Arrange | ||
| def headers = ["Content-Length": "123", "Other-Header": "arbitrary value"] | ||
| logger.info("Original headers: ${headers}") | ||
|
|
||
| NiFiProperties mockProperties = mockNiFiProperties() | ||
|
|
||
| OkHttpReplicationClient client = new OkHttpReplicationClient(mockProperties) | ||
|
|
||
| def nonDeleteMethods = ["POST", "PUT", "GET", "HEAD"] | ||
|
|
||
| // Act | ||
| nonDeleteMethods.each { String method -> | ||
| logger.info("Trying method ${method}") | ||
| client.checkContentLengthHeader(method, headers) | ||
| logger.info("Checked headers: ${headers}") | ||
|
|
||
| // Assert | ||
| assert headers.size() == 2 | ||
| assert headers."Content-Length" == "123" | ||
| } | ||
| } | ||
| } |