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 3358f83336 NIFI-14334 Replaced various deprecated methods with their
API suggested equivalents.
3358f83336 is described below
commit 3358f83336ae861bdd4bfa31d23127b615f46896
Author: dan-s1 <[email protected]>
AuthorDate: Thu Mar 6 23:10:11 2025 +0000
NIFI-14334 Replaced various deprecated methods with their API suggested
equivalents.
Signed-off-by: Pierre Villard <[email protected]>
This closes #9783.
---
.../src/main/java/org/apache/nifi/c2/protocol/api/ResourceInfo.java | 2 +-
.../minifi/commons/service/StandardFlowPropertyEncryptorTest.java | 4 ++--
.../src/main/java/org/apache/nifi/gitlab/GitLabRepositoryClient.java | 2 +-
.../main/java/org/apache/nifi/snmp/factory/core/V3SNMPFactory.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/ResourceInfo.java
b/c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/ResourceInfo.java
index 7affc3607e..0430585ed3 100644
---
a/c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/ResourceInfo.java
+++
b/c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/ResourceInfo.java
@@ -27,7 +27,7 @@ public class ResourceInfo implements Serializable {
private String hash;
- @Schema(description = "A global hash calculated from all the available
resources on the agent", required = true)
+ @Schema(description = "A global hash calculated from all the available
resources on the agent", requiredMode = Schema.RequiredMode.REQUIRED)
public String getHash() {
return hash;
}
diff --git
a/minifi/minifi-commons/minifi-commons-framework/src/test/java/org/apache/nifi/minifi/commons/service/StandardFlowPropertyEncryptorTest.java
b/minifi/minifi-commons/minifi-commons-framework/src/test/java/org/apache/nifi/minifi/commons/service/StandardFlowPropertyEncryptorTest.java
index 639106677f..0b9a4c389f 100644
---
a/minifi/minifi-commons/minifi-commons-framework/src/test/java/org/apache/nifi/minifi/commons/service/StandardFlowPropertyEncryptorTest.java
+++
b/minifi/minifi-commons/minifi-commons-framework/src/test/java/org/apache/nifi/minifi/commons/service/StandardFlowPropertyEncryptorTest.java
@@ -20,7 +20,6 @@ package org.apache.nifi.minifi.commons.service;
import static java.util.Map.entry;
import static java.util.UUID.randomUUID;
import static java.util.stream.Collectors.toMap;
-import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.anyString;
@@ -34,6 +33,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.stream.Stream;
+import org.apache.commons.lang3.RandomStringUtils;
import org.apache.nifi.c2.protocol.component.api.Bundle;
import org.apache.nifi.c2.protocol.component.api.ComponentManifest;
import org.apache.nifi.c2.protocol.component.api.ControllerServiceDefinition;
@@ -112,7 +112,7 @@ public class StandardFlowPropertyEncryptorTest {
@BeforeEach
public void setup() {
-
when(mockPropertyEncryptor.encrypt(anyString())).thenReturn(randomAlphabetic(5));
+
when(mockPropertyEncryptor.encrypt(anyString())).thenReturn(RandomStringUtils.secure().nextAlphabetic(5));
testEncryptor = new
StandardFlowPropertyEncryptor(mockPropertyEncryptor, mockRunTimeManifest);
}
diff --git
a/nifi-extension-bundles/nifi-gitlab-bundle/nifi-gitlab-extensions/src/main/java/org/apache/nifi/gitlab/GitLabRepositoryClient.java
b/nifi-extension-bundles/nifi-gitlab-bundle/nifi-gitlab-extensions/src/main/java/org/apache/nifi/gitlab/GitLabRepositoryClient.java
index af97cc43f7..2321e1351a 100644
---
a/nifi-extension-bundles/nifi-gitlab-bundle/nifi-gitlab-extensions/src/main/java/org/apache/nifi/gitlab/GitLabRepositoryClient.java
+++
b/nifi-extension-bundles/nifi-gitlab-bundle/nifi-gitlab-extensions/src/main/java/org/apache/nifi/gitlab/GitLabRepositoryClient.java
@@ -27,7 +27,6 @@ import org.apache.nifi.registry.flow.git.client.GitCommit;
import org.apache.nifi.registry.flow.git.client.GitCreateContentRequest;
import org.apache.nifi.registry.flow.git.client.GitRepositoryClient;
import org.gitlab4j.api.CommitsApi;
-import org.gitlab4j.api.Constants;
import org.gitlab4j.api.GitLabApi;
import org.gitlab4j.api.GitLabApiException;
import org.gitlab4j.api.ProjectApi;
@@ -40,6 +39,7 @@ import org.gitlab4j.api.models.Project;
import org.gitlab4j.api.models.ProjectAccess;
import org.gitlab4j.api.models.RepositoryFile;
import org.gitlab4j.api.models.TreeItem;
+import org.gitlab4j.models.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/factory/core/V3SNMPFactory.java
b/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/factory/core/V3SNMPFactory.java
index 5310fae498..ef945f4f4e 100644
---
a/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/factory/core/V3SNMPFactory.java
+++
b/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/factory/core/V3SNMPFactory.java
@@ -54,7 +54,7 @@ public class V3SNMPFactory extends SNMPManagerFactory
implements SNMPContext {
.map(SNMPUtils::getPriv).orElse(null);
OctetString privacyPassphrase =
Optional.ofNullable(configuration.getPrivacyPassphrase())
.map(OctetString::new).orElse(null);
- snmpManager.getUSM().addUser(securityName, new
UsmUser(securityName, authProtocol, authPassphrase,
+ snmpManager.getUSM().addUser(new UsmUser(securityName,
authProtocol, authPassphrase,
privacyProtocol, privacyPassphrase));
});
