[nifi] 02/02: NIFI-11626 Upgraded maven-source-plugin from 3.2.1 to 3.3.0
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git commit eb925ba46b7a047d0e03de86034216b900665633 Author: siddr AuthorDate: Fri Jun 2 23:58:08 2023 +0530 NIFI-11626 Upgraded maven-source-plugin from 3.2.1 to 3.3.0 This closes #7335 Signed-off-by: David Handermann (cherry picked from commit 258db04f68bf683b0bf271582f8578f4d9f118ef) --- nifi-registry/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index d3db4de246..c3bb3b22f4 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -287,7 +287,7 @@ org.apache.maven.plugins maven-source-plugin -3.2.1 +3.3.0 org.apache.maven.plugins
[nifi] 01/02: NIFI-11613 Refactored SanitizeContextPathFilterTest from Groovy to Java
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 9df77971d11275e495ffdf8d52040e7922e005e0
Author: dan-s1
AuthorDate: Fri Jun 2 16:20:58 2023 +
NIFI-11613 Refactored SanitizeContextPathFilterTest from Groovy to Java
- Moved Java tests from groovy directory to java directory and removed
groovy directory from nifi-web-utils
This closes #7333
Signed-off-by: David Handermann
(cherry picked from commit 27b5a2f931e10ce1f25351e8b1070924a3ece196)
---
.../filter/SanitizeContextPathFilterTest.groovy| 120 -
.../web/filter/SanitizeContextPathFilterTest.java | 99 +
.../nifi/web/util/RequestUriBuilderTest.java | 0
.../org/apache/nifi/web/util/WebUtilsTest.java | 0
4 files changed, 99 insertions(+), 120 deletions(-)
diff --git
a/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/filter/SanitizeContextPathFilterTest.groovy
b/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/filter/SanitizeContextPathFilterTest.groovy
deleted file mode 100644
index 5734d3cd76..00
---
a/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/filter/SanitizeContextPathFilterTest.groovy
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * 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.web.filter
-
-import org.junit.jupiter.api.Test
-
-import javax.servlet.FilterConfig
-import javax.servlet.ServletContext
-import javax.servlet.http.HttpServletRequest
-
-import static org.junit.jupiter.api.Assertions.assertEquals
-
-class SanitizeContextPathFilterTest {
-
-private static String getValue(String parameterName, Map
params = [:]) {
-params.containsKey(parameterName) ? params[parameterName] : ""
-}
-
-@Test
-void testInitShouldExtractAllowedContextPaths() {
-// Arrange
-def EXPECTED_ALLOWED_CONTEXT_PATHS = ["/path1", "/path2"].join(", ")
-def parameters = [allowedContextPaths: EXPECTED_ALLOWED_CONTEXT_PATHS]
-FilterConfig mockFilterConfig = [
-getInitParameter : { String parameterName ->
getValue(parameterName, parameters) },
-getServletContext: { ->
-[getInitParameter: { String parameterName -> return
getValue(parameterName, parameters) }] as ServletContext
-}] as FilterConfig
-
-SanitizeContextPathFilter scpf = new SanitizeContextPathFilter()
-
-// Act
-scpf.init(mockFilterConfig)
-
-// Assert
-assertEquals(EXPECTED_ALLOWED_CONTEXT_PATHS,
scpf.getAllowedContextPaths())
-}
-
-@Test
-void testInitShouldHandleBlankAllowedContextPaths() {
-// Arrange
-def EXPECTED_ALLOWED_CONTEXT_PATHS = ""
-FilterConfig mockFilterConfig = [
-getInitParameter : { String parameterName -> "" },
-getServletContext: { ->
-[getInitParameter: { String parameterName -> "" }] as
ServletContext
-}] as FilterConfig
-
-SanitizeContextPathFilter scpf = new SanitizeContextPathFilter()
-
-// Act
-scpf.init(mockFilterConfig)
-
-// Assert
-assertEquals(EXPECTED_ALLOWED_CONTEXT_PATHS,
scpf.getAllowedContextPaths())
-}
-
-@Test
-void testShouldInjectContextPathAttribute() {
-// Arrange
-final String EXPECTED_ALLOWED_CONTEXT_PATHS = ["/path1",
"/path2"].join(", ")
-final String EXPECTED_FORWARD_PATH = "index.jsp"
-final Map PARAMETERS = [
-allowedContextPaths: EXPECTED_ALLOWED_CONTEXT_PATHS,
-forwardPath: EXPECTED_FORWARD_PATH
-]
-
-final String EXPECTED_CONTEXT_PATH = "/path1"
-
-// Mock collaborators
-FilterConfig mockFilterConfig = [
-getInitParameter : { String parameterName ->
-return getValue(parameterName, PARAMETERS)
-},
-getServletContext: { ->
-[getInitParameter: { String parameterName ->
-
[nifi] branch support/nifi-1.x updated (7f74abbbe1 -> eb925ba46b)
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a change to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
from 7f74abbbe1 NIFI-11633 Upgraded MariaDB client from 3.1.3 to 3.1.4
new 9df77971d1 NIFI-11613 Refactored SanitizeContextPathFilterTest from
Groovy to Java
new eb925ba46b NIFI-11626 Upgraded maven-source-plugin from 3.2.1 to 3.3.0
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../filter/SanitizeContextPathFilterTest.groovy| 120 -
.../web/filter/SanitizeContextPathFilterTest.java | 99 +
.../nifi/web/util/RequestUriBuilderTest.java | 0
.../org/apache/nifi/web/util/WebUtilsTest.java | 0
nifi-registry/pom.xml | 2 +-
5 files changed, 100 insertions(+), 121 deletions(-)
delete mode 100644
nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/filter/SanitizeContextPathFilterTest.groovy
create mode 100644
nifi-commons/nifi-web-utils/src/test/java/org/apache/nifi/web/filter/SanitizeContextPathFilterTest.java
rename nifi-commons/nifi-web-utils/src/test/{groovy =>
java}/org/apache/nifi/web/util/RequestUriBuilderTest.java (100%)
rename nifi-commons/nifi-web-utils/src/test/{groovy =>
java}/org/apache/nifi/web/util/WebUtilsTest.java (100%)
[nifi] branch main updated (852ec9eefc -> 258db04f68)
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
from 852ec9eefc NIFI-11633 Upgraded MariaDB client from 3.1.3 to 3.1.4
add 27b5a2f931 NIFI-11613 Refactored SanitizeContextPathFilterTest from
Groovy to Java
add 258db04f68 NIFI-11626 Upgraded maven-source-plugin from 3.2.1 to 3.3.0
No new revisions were added by this update.
Summary of changes:
.../filter/SanitizeContextPathFilterTest.groovy| 120 -
.../web/filter/SanitizeContextPathFilterTest.java | 99 +
.../nifi/web/util/RequestUriBuilderTest.java | 0
.../org/apache/nifi/web/util/WebUtilsTest.java | 0
nifi-registry/pom.xml | 2 +-
5 files changed, 100 insertions(+), 121 deletions(-)
delete mode 100644
nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/filter/SanitizeContextPathFilterTest.groovy
create mode 100644
nifi-commons/nifi-web-utils/src/test/java/org/apache/nifi/web/filter/SanitizeContextPathFilterTest.java
rename nifi-commons/nifi-web-utils/src/test/{groovy =>
java}/org/apache/nifi/web/util/RequestUriBuilderTest.java (100%)
rename nifi-commons/nifi-web-utils/src/test/{groovy =>
java}/org/apache/nifi/web/util/WebUtilsTest.java (100%)
[nifi] branch support/nifi-1.x updated: NIFI-11633 Upgraded MariaDB client from 3.1.3 to 3.1.4
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new 7f74abbbe1 NIFI-11633 Upgraded MariaDB client from 3.1.3 to 3.1.4 7f74abbbe1 is described below commit 7f74abbbe112ee4cd100c0c64039d9c5bb41c0a1 Author: mr1716 AuthorDate: Fri Jun 2 09:33:47 2023 -0400 NIFI-11633 Upgraded MariaDB client from 3.1.3 to 3.1.4 This closes #7330 Signed-off-by: David Handermann (cherry picked from commit 852ec9eefc283062d2a8d19a52d74d0a8a002a1f) --- nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml index 6ebd9ea6eb..0688a2bf8b 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml +++ b/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml @@ -70,7 +70,7 @@ org.mariadb.jdbc mariadb-java-client -3.1.3 +3.1.4 org.postgresql
[nifi] branch main updated (803868935a -> 852ec9eefc)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 803868935a NIFI-11628 Fixed Object[] and Throwable argument substitution in SimpleProcessLogger add 852ec9eefc NIFI-11633 Upgraded MariaDB client from 3.1.3 to 3.1.4 No new revisions were added by this update. Summary of changes: nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[nifi] branch support/nifi-1.x updated: NIFI-11628 Fixed Object[] and Throwable argument substitution in SimpleProcessLogger
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 8af6f9416d NIFI-11628 Fixed Object[] and Throwable argument
substitution in SimpleProcessLogger
8af6f9416d is described below
commit 8af6f9416dba5ab34832c078c1c413de6c27be3d
Author: Peter Turcsanyi
AuthorDate: Thu Jun 1 22:19:23 2023 +0200
NIFI-11628 Fixed Object[] and Throwable argument substitution in
SimpleProcessLogger
This closes #7362
Signed-off-by: David Handermann
(cherry picked from commit 803868935afc424bf0b69b6b82802e557e689c04)
---
.../apache/nifi/processor/SimpleProcessLogger.java | 14 ++
.../nifi/processor/TestSimpleProcessLogger.java| 31 +-
2 files changed, 39 insertions(+), 6 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
index 32f19e328a..c7d8e8eab5 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
@@ -91,7 +91,7 @@ public class SimpleProcessLogger implements ComponentLog {
logger.warn(componentMessage, arguments);
logRepository.addLogMessage(LogLevel.WARN, componentMessage,
arguments);
} else {
-logger.warn(componentMessage, arguments, t);
+logger.warn(componentMessage, addThrowable(arguments, t));
logRepository.addLogMessage(LogLevel.WARN,
getCausesMessage(msg), addCauses(arguments, t), t);
}
}
@@ -158,7 +158,7 @@ public class SimpleProcessLogger implements ComponentLog {
logger.trace(componentMessage, arguments);
logRepository.addLogMessage(LogLevel.TRACE, componentMessage,
arguments);
} else {
-logger.trace(componentMessage, arguments, t);
+logger.trace(componentMessage, addThrowable(arguments, t));
logRepository.addLogMessage(LogLevel.TRACE,
getCausesMessage(msg), addCauses(arguments, t), t);
}
}
@@ -245,7 +245,7 @@ public class SimpleProcessLogger implements ComponentLog {
logger.info(componentMessage, arguments);
logRepository.addLogMessage(LogLevel.INFO, componentMessage,
arguments);
} else {
-logger.info(componentMessage, arguments, t);
+logger.info(componentMessage, addThrowable(arguments, t));
logRepository.addLogMessage(LogLevel.INFO,
getCausesMessage(msg), addCauses(arguments, t), t);
}
}
@@ -312,7 +312,7 @@ public class SimpleProcessLogger implements ComponentLog {
logger.error(componentMessage, arguments);
logRepository.addLogMessage(LogLevel.ERROR, componentMessage,
arguments);
} else {
-logger.error(componentMessage, arguments, t);
+logger.error(componentMessage, addThrowable(arguments, t));
logRepository.addLogMessage(LogLevel.ERROR,
getCausesMessage(msg), addCauses(arguments, t), t);
}
}
@@ -369,7 +369,7 @@ public class SimpleProcessLogger implements ComponentLog {
logger.debug(componentMessage, arguments);
logRepository.addLogMessage(LogLevel.DEBUG, componentMessage,
arguments);
} else {
-logger.debug(componentMessage, arguments, t);
+logger.debug(componentMessage, addThrowable(arguments, t));
logRepository.addLogMessage(LogLevel.DEBUG,
getCausesMessage(msg), addCauses(arguments, t), t);
}
}
@@ -533,6 +533,10 @@ public class SimpleProcessLogger implements ComponentLog {
return ArrayUtils.insert(0, originalArgs, component);
}
+private Object[] addThrowable(final Object[] originalArgs, final Throwable
throwable) {
+return ArrayUtils.add(originalArgs, throwable);
+}
+
private Object[] addCauses(final Object[] arguments, final Throwable
throwable) {
final String causes = getCauses(throwable);
return ArrayUtils.add(arguments, causes);
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/processor/TestSimpleProcessLogger.java
[nifi] branch main updated (df9f8ddcfb -> 803868935a)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from df9f8ddcfb NIFI-11636: Do not buffer Parquet content into memory unnecessarily add 803868935a NIFI-11628 Fixed Object[] and Throwable argument substitution in SimpleProcessLogger No new revisions were added by this update. Summary of changes: .../apache/nifi/processor/SimpleProcessLogger.java | 14 ++ .../nifi/processor/TestSimpleProcessLogger.java| 31 +- 2 files changed, 39 insertions(+), 6 deletions(-)
[nifi] branch main updated (8dfda776f7 -> df9f8ddcfb)
This is an automated email from the ASF dual-hosted git repository. mattyb149 pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 8dfda776f7 NIFI-11634 Update testcontainers.version to 1.18.3 add df9f8ddcfb NIFI-11636: Do not buffer Parquet content into memory unnecessarily No new revisions were added by this update. Summary of changes: .../nifi-resources/src/main/resources/conf/logback.xml| 2 +- .../java/org/apache/nifi/parquet/stream/NifiParquetInputFile.java | 5 ++--- .../org/apache/nifi/parquet/stream/NifiSeekableInputStream.java | 8 3 files changed, 7 insertions(+), 8 deletions(-)
[nifi] branch support/nifi-1.x updated: NIFI-11636: Do not buffer Parquet content into memory unnecessarily
This is an automated email from the ASF dual-hosted git repository.
mattyb149 pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 5da77e8e74 NIFI-11636: Do not buffer Parquet content into memory
unnecessarily
5da77e8e74 is described below
commit 5da77e8e74343f04ebe7da34ba47cbc3cbe0d4fc
Author: Mark Payne
AuthorDate: Fri Jun 2 13:21:15 2023 -0400
NIFI-11636: Do not buffer Parquet content into memory unnecessarily
NIFI-11636: Change default log level from parquet internal reader to WARN
as it logs excessively at INFO level
Signed-off-by: Matt Burgess
---
.../nifi-resources/src/main/resources/conf/logback.xml| 2 +-
.../java/org/apache/nifi/parquet/stream/NifiParquetInputFile.java | 5 ++---
.../org/apache/nifi/parquet/stream/NifiSeekableInputStream.java | 8
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
index 4a1e57e1f5..ae2733f880 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
@@ -119,7 +119,7 @@
-
+
diff --git
a/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/parquet/stream/NifiParquetInputFile.java
b/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/parquet/stream/NifiParquetInputFile.java
index c4ac722c7b..98e8cf3f75 100644
---
a/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/parquet/stream/NifiParquetInputFile.java
+++
b/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/parquet/stream/NifiParquetInputFile.java
@@ -20,7 +20,6 @@ import org.apache.nifi.stream.io.ByteCountingInputStream;
import org.apache.parquet.io.InputFile;
import org.apache.parquet.io.SeekableInputStream;
-import java.io.IOException;
import java.io.InputStream;
public class NifiParquetInputFile implements InputFile {
@@ -42,12 +41,12 @@ public class NifiParquetInputFile implements InputFile {
}
@Override
-public long getLength() throws IOException {
+public long getLength() {
return length;
}
@Override
-public SeekableInputStream newStream() throws IOException {
+public SeekableInputStream newStream() {
return new NifiSeekableInputStream(input);
}
}
diff --git
a/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/parquet/stream/NifiSeekableInputStream.java
b/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/parquet/stream/NifiSeekableInputStream.java
index cd6b820536..89d2cc0c32 100644
---
a/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/parquet/stream/NifiSeekableInputStream.java
+++
b/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/parquet/stream/NifiSeekableInputStream.java
@@ -29,11 +29,11 @@ public class NifiSeekableInputStream extends
DelegatingSeekableInputStream {
public NifiSeekableInputStream(final ByteCountingInputStream input) {
super(input);
this.input = input;
-this.input.mark(Integer.MAX_VALUE);
+this.input.mark(8192);
}
@Override
-public long getPos() throws IOException {
+public long getPos() {
return input.getBytesConsumed();
}
@@ -47,7 +47,7 @@ public class NifiSeekableInputStream extends
DelegatingSeekableInputStream {
if (newPos < currentPos) {
// seeking backwards so first reset back to beginning of the
stream then seek
input.reset();
-input.mark(Integer.MAX_VALUE);
+input.mark(8192);
}
// must call getPos() again in case reset was called above
@@ -65,7 +65,7 @@ public class NifiSeekableInputStream extends
DelegatingSeekableInputStream {
}
@Override
-public synchronized void reset() throws IOException {
+public synchronized void reset() {
throw new UnsupportedOperationException("Mark/reset is not supported");
}
}
[nifi] branch support/nifi-1.x updated: NIFI-11634 Update testcontainers.version to 1.18.3
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new d4e9bd5ce9 NIFI-11634 Update testcontainers.version to 1.18.3 d4e9bd5ce9 is described below commit d4e9bd5ce94b10b393c00fcdddb5fa2732efd1e4 Author: mr1716 AuthorDate: Fri Jun 2 09:38:46 2023 -0400 NIFI-11634 Update testcontainers.version to 1.18.3 Signed-off-by: Pierre Villard This closes #7331. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0a038b2538..f8cdaafaf4 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ 4.5.14 4.4.16 1.71 -1.18.1 +1.18.3 2.0.7 2.4.0 9.4.51.v20230217
[nifi] branch main updated: NIFI-11634 Update testcontainers.version to 1.18.3
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new 8dfda776f7 NIFI-11634 Update testcontainers.version to 1.18.3 8dfda776f7 is described below commit 8dfda776f7213091e384788f6ede4b450b1db40b Author: mr1716 AuthorDate: Fri Jun 2 09:38:46 2023 -0400 NIFI-11634 Update testcontainers.version to 1.18.3 Signed-off-by: Pierre Villard This closes #7331. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ea9d20088d..08f31c7b66 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ 4.5.14 4.4.16 1.71 -1.18.1 +1.18.3 2.0.7 2.4.0 9.4.51.v20230217
[nifi] branch main updated: NIFI-11629 This closes #7327. Added Socket Write Timeout to InvokeHTTP
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new ec525b0437 NIFI-11629 This closes #7327. Added Socket Write Timeout to
InvokeHTTP
ec525b0437 is described below
commit ec525b0437f6369a7dca56b9818475385d0d03a6
Author: exceptionfactory
AuthorDate: Thu Jun 1 17:12:38 2023 -0500
NIFI-11629 This closes #7327. Added Socket Write Timeout to InvokeHTTP
Signed-off-by: Joe Witt
---
.../java/org/apache/nifi/processors/standard/InvokeHTTP.java | 11 +++
1 file changed, 11 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
index e24e4a7bae..2fb469e4d4 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
@@ -242,6 +242,15 @@ public class InvokeHTTP extends AbstractProcessor {
.addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
.build();
+public static final PropertyDescriptor SOCKET_WRITE_TIMEOUT = new
PropertyDescriptor.Builder()
+.name("Socket Write Timeout")
+.displayName("Socket Write Timeout")
+.description("Maximum time to wait for write operations while
sending requests from a socket connection to the HTTP URL.")
+.required(true)
+.defaultValue("15 secs")
+.addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
+.build();
+
public static final PropertyDescriptor SOCKET_IDLE_TIMEOUT = new
PropertyDescriptor.Builder()
.name("idle-timeout")
.displayName("Socket Idle Timeout")
@@ -505,6 +514,7 @@ public class InvokeHTTP extends AbstractProcessor {
SSL_CONTEXT_SERVICE,
SOCKET_CONNECT_TIMEOUT,
SOCKET_READ_TIMEOUT,
+SOCKET_WRITE_TIMEOUT,
SOCKET_IDLE_TIMEOUT,
SOCKET_IDLE_CONNECTIONS,
PROXY_CONFIGURATION_SERVICE,
@@ -731,6 +741,7 @@ public class InvokeHTTP extends AbstractProcessor {
okHttpClientBuilder.followRedirects(context.getProperty(RESPONSE_REDIRECTS_ENABLED).asBoolean());
okHttpClientBuilder.connectTimeout((context.getProperty(SOCKET_CONNECT_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).intValue()),
TimeUnit.MILLISECONDS);
okHttpClientBuilder.readTimeout(context.getProperty(SOCKET_READ_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).intValue(),
TimeUnit.MILLISECONDS);
+
okHttpClientBuilder.writeTimeout(context.getProperty(SOCKET_WRITE_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).intValue(),
TimeUnit.MILLISECONDS);
okHttpClientBuilder.connectionPool(
new ConnectionPool(
context.getProperty(SOCKET_IDLE_CONNECTIONS).asInteger(),
[nifi] branch support/nifi-1.x updated: NIFI-8287 Corrected Path usage for Java 8
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new 3abac8d64e NIFI-8287 Corrected Path usage for Java 8 3abac8d64e is described below commit 3abac8d64ebd926d7c43e64d42df472f6a9662c6 Author: exceptionfactory AuthorDate: Fri Jun 2 04:33:19 2023 -0500 NIFI-8287 Corrected Path usage for Java 8 Signed-off-by: David Handermann --- .../java/org/apache/nifi/processors/aws/v2/AbstractAwsProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/v2/AbstractAwsProcessor.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/v2/AbstractAwsProcessor.java index ceb05b9094..476acd97f9 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/v2/AbstractAwsProcessor.java +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/v2/AbstractAwsProcessor.java @@ -58,7 +58,7 @@ import javax.net.ssl.TrustManager; import java.io.File; import java.net.Proxy; import java.net.URI; -import java.nio.file.Path; +import java.nio.file.Paths; import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; @@ -398,7 +398,7 @@ public abstract class AbstractAwsProcessor trustManagers); builder.tlsKeyManagersProvider(keyManagersProvider); }
