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 2bee9627c9 NIFI-14848 Replaced switch statements with enhanced switch
statements.
2bee9627c9 is described below
commit 2bee9627c997fd41a6b1393a3c33d6feddce4702
Author: dan-s1 <[email protected]>
AuthorDate: Tue Aug 12 15:28:46 2025 +0000
NIFI-14848 Replaced switch statements with enhanced switch statements.
Signed-off-by: Pierre Villard <[email protected]>
This closes #10197.
---
.../nifi/c2/protocol/api/C2OperationState.java | 20 +--
.../bootstrap/command/CommandRunnerFactory.java | 41 ++----
.../language/compile/ExpressionCompiler.java | 158 +++++++++------------
.../evaluation/functions/EqualsEvaluator.java | 15 +-
.../java/org/apache/nifi/hl7/query/HL7Query.java | 49 +++----
.../nifi/remote/util/SiteToSiteRestApiClient.java | 17 ++-
.../standard/db/impl/MySQLDatabaseAdapter.java | 22 +--
.../standard/db/impl/Oracle12DatabaseAdapter.java | 23 +--
.../standard/db/impl/OracleDatabaseAdapter.java | 23 +--
.../standard/db/impl/PhoenixDatabaseAdapter.java | 22 +--
.../db/impl/PostgreSQLDatabaseAdapter.java | 22 +--
.../standard/db/impl/DerbyDatabaseAdapter.java | 20 +--
.../distributed/cache/server/SetCacheServer.java | 20 +--
.../cache/server/map/MapCacheServer.java | 20 +--
.../apache/nifi/provenance/schema/EventRecord.java | 69 ++++-----
.../provenance/schema/LookupTableEventRecord.java | 71 ++++-----
.../nifi/provenance/toc/StandardTocReader.java | 14 +-
.../repository/RepositoryRecordSerde.java | 22 ++-
.../repository/SchemaRepositoryRecordSerde.java | 49 +++----
.../StandardRepositoryRecordSerdeFactory.java | 22 ++-
.../WriteAheadRepositoryRecordSerde.java | 17 +--
.../repository/schema/ContentClaimFieldMap.java | 19 +--
.../repository/schema/FlowFileRecordFieldMap.java | 33 ++---
.../schema/RepositoryRecordFieldMap.java | 47 +++---
.../repository/schema/ResourceClaimFieldMap.java | 18 +--
.../protocol/impl/SocketProtocolListener.java | 26 ++--
.../nifi/events/VolatileBulletinRepository.java | 41 ++----
.../apache/nifi/util/FlowDifferenceFilters.java | 36 ++---
.../org/apache/nifi/events/BulletinFactory.java | 21 +--
.../client/async/nio/LoadBalanceSession.java | 34 ++---
.../nifi/controller/swap/SwapSummaryFieldMap.java | 27 ++--
.../socket/SocketFlowFileServerProtocol.java | 13 +-
.../authorization/StandardAuthorizableLookup.java | 58 +++-----
.../apache/nifi/web/StandardNiFiServiceFacade.java | 13 +-
.../file/FileAccessPolicyProvider.java | 16 +--
.../extension/docs/HtmlExtensionDocWriter.java | 20 +--
.../org/apache/nifi/registry/util/FormatUtils.java | 65 ++-------
.../HttpMethodAuthorizationRules.java | 21 +--
38 files changed, 428 insertions(+), 816 deletions(-)
diff --git
a/c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/C2OperationState.java
b/c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/C2OperationState.java
index cd32026186..86ae498d37 100644
---
a/c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/C2OperationState.java
+++
b/c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/C2OperationState.java
@@ -120,19 +120,13 @@ public class C2OperationState implements Serializable {
* @return update state enumeration value.
*/
public static OperationState fromOrdinal(int state) {
- switch (state) {
- case 0:
- return FULLY_APPLIED;
- case 1:
- return PARTIALLY_APPLIED;
- case 2:
- return OPERATION_NOT_UNDERSTOOD;
- case 3:
- return NO_OPERATION;
- case 4:
- default:
- return NOT_APPLIED;
- }
+ return switch (state) {
+ case 0 -> FULLY_APPLIED;
+ case 1 -> PARTIALLY_APPLIED;
+ case 2 -> OPERATION_NOT_UNDERSTOOD;
+ case 3 -> NO_OPERATION;
+ default -> NOT_APPLIED;
+ };
}
/**
diff --git
a/minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/command/CommandRunnerFactory.java
b/minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/command/CommandRunnerFactory.java
index 730995f76f..b39a6702df 100644
---
a/minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/command/CommandRunnerFactory.java
+++
b/minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/command/CommandRunnerFactory.java
@@ -76,34 +76,19 @@ public class CommandRunnerFactory {
* @return the runner
*/
public CommandRunner getRunner(BootstrapCommand command) {
- CommandRunner commandRunner;
- switch (command) {
- case START:
- case RUN:
- commandRunner = new StartRunner(currentPortProvider,
bootstrapFileProvider, periodicStatusReporterManager, miNiFiStdLogHandler,
miNiFiParameters,
- bootstrapConfigFile, runMiNiFi, miNiFiExecCommandProvider,
configurationChangeListener);
- break;
- case STOP:
- commandRunner = new StopRunner(bootstrapFileProvider,
miNiFiParameters, miNiFiCommandSender, currentPortProvider,
gracefulShutdownParameterProvider, processUtils);
- break;
- case STATUS:
- commandRunner = new StatusRunner(miNiFiParameters,
miNiFiStatusProvider);
- break;
- case RESTART:
- commandRunner = new
CompositeCommandRunner(getRestartServices());
- break;
- case DUMP:
- commandRunner = new DumpRunner(miNiFiCommandSender,
currentPortProvider);
- break;
- case ENV:
- commandRunner = new EnvRunner(miNiFiCommandSender,
currentPortProvider);
- break;
- case FLOWSTATUS:
- commandRunner = new
FlowStatusRunner(periodicStatusReporterManager);
- break;
- default:
- throw new IllegalArgumentException("Unknown MiNiFi bootstrap
command");
- }
+ CommandRunner commandRunner = switch (command) {
+ case START, RUN ->
+ new StartRunner(currentPortProvider,
bootstrapFileProvider, periodicStatusReporterManager, miNiFiStdLogHandler,
miNiFiParameters,
+ bootstrapConfigFile, runMiNiFi,
miNiFiExecCommandProvider, configurationChangeListener);
+ case STOP ->
+ new StopRunner(bootstrapFileProvider, miNiFiParameters,
miNiFiCommandSender, currentPortProvider, gracefulShutdownParameterProvider,
processUtils);
+ case STATUS -> new StatusRunner(miNiFiParameters,
miNiFiStatusProvider);
+ case RESTART -> new CompositeCommandRunner(getRestartServices());
+ case DUMP -> new DumpRunner(miNiFiCommandSender,
currentPortProvider);
+ case ENV -> new EnvRunner(miNiFiCommandSender,
currentPortProvider);
+ case FLOWSTATUS -> new
FlowStatusRunner(periodicStatusReporterManager);
+ default -> throw new IllegalArgumentException("Unknown MiNiFi
bootstrap command");
+ };
return commandRunner;
}
diff --git
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/compile/ExpressionCompiler.java
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/compile/ExpressionCompiler.java
index de5036549d..1a17d9fa49 100644
---
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/compile/ExpressionCompiler.java
+++
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/compile/ExpressionCompiler.java
@@ -491,15 +491,13 @@ public class ExpressionCompiler {
@SuppressWarnings("unchecked")
private Evaluator<Boolean> toBooleanEvaluator(final Evaluator<?>
evaluator, final String location) {
- switch (evaluator.getResultType()) {
- case BOOLEAN:
- return (Evaluator<Boolean>) evaluator;
- case STRING:
- return addToken(new BooleanCastEvaluator((StringEvaluator)
evaluator), evaluator.getToken());
- default:
- throw new AttributeExpressionLanguageParsingException("Cannot
implicitly convert Data Type " + evaluator.getResultType() + " to " +
ResultType.BOOLEAN
- + (location == null ? "" : " at location [" + location +
"]"));
- }
+ return switch (evaluator.getResultType()) {
+ case BOOLEAN -> (Evaluator<Boolean>) evaluator;
+ case STRING -> addToken(new BooleanCastEvaluator((StringEvaluator)
evaluator), evaluator.getToken());
+ default ->
+ throw new
AttributeExpressionLanguageParsingException("Cannot implicitly convert Data
Type " + evaluator.getResultType() + " to " + ResultType.BOOLEAN
+ + (location == null ? "" : " at location [" +
location + "]"));
+ };
}
@@ -513,19 +511,14 @@ public class ExpressionCompiler {
@SuppressWarnings("unchecked")
private Evaluator<Long> toWholeNumberEvaluator(final Evaluator<?>
evaluator, final String location) {
- switch (evaluator.getResultType()) {
- case WHOLE_NUMBER:
- return (Evaluator<Long>) evaluator;
- case STRING:
- case DATE:
- case INSTANT:
- case DECIMAL:
- case NUMBER:
- return addToken(new WholeNumberCastEvaluator(evaluator),
evaluator.getToken());
- default:
- throw new AttributeExpressionLanguageParsingException("Cannot
implicitly convert Data Type " + evaluator.getResultType() + " to " +
ResultType.WHOLE_NUMBER
- + (location == null ? "" : " at location [" + location +
"]"));
- }
+ return switch (evaluator.getResultType()) {
+ case WHOLE_NUMBER -> (Evaluator<Long>) evaluator;
+ case STRING, DATE, INSTANT, DECIMAL, NUMBER ->
+ addToken(new WholeNumberCastEvaluator(evaluator),
evaluator.getToken());
+ default ->
+ throw new
AttributeExpressionLanguageParsingException("Cannot implicitly convert Data
Type " + evaluator.getResultType() + " to " + ResultType.WHOLE_NUMBER
+ + (location == null ? "" : " at location [" +
location + "]"));
+ };
}
private Evaluator<Double> toDecimalEvaluator(final Evaluator<?> evaluator)
{
@@ -534,18 +527,14 @@ public class ExpressionCompiler {
@SuppressWarnings("unchecked")
private Evaluator<Double> toDecimalEvaluator(final Evaluator<?> evaluator,
final String location) {
- switch (evaluator.getResultType()) {
- case DECIMAL:
- return (Evaluator<Double>) evaluator;
- case WHOLE_NUMBER:
- case STRING:
- case DATE:
- case NUMBER:
- return addToken(new DecimalCastEvaluator(evaluator),
evaluator.getToken());
- default:
- throw new AttributeExpressionLanguageParsingException("Cannot
implicitly convert Data Type " + evaluator.getResultType() + " to " +
ResultType.DECIMAL
- + (location == null ? "" : " at location [" + location +
"]"));
- }
+ return switch (evaluator.getResultType()) {
+ case DECIMAL -> (Evaluator<Double>) evaluator;
+ case WHOLE_NUMBER, STRING, DATE, NUMBER ->
+ addToken(new DecimalCastEvaluator(evaluator),
evaluator.getToken());
+ default ->
+ throw new
AttributeExpressionLanguageParsingException("Cannot implicitly convert Data
Type " + evaluator.getResultType() + " to " + ResultType.DECIMAL
+ + (location == null ? "" : " at location [" +
location + "]"));
+ };
}
private Evaluator<Number> toNumberEvaluator(final Evaluator<?> evaluator) {
@@ -554,19 +543,14 @@ public class ExpressionCompiler {
@SuppressWarnings("unchecked")
private Evaluator<Number> toNumberEvaluator(final Evaluator<?> evaluator,
final String location) {
- switch (evaluator.getResultType()) {
- case NUMBER:
- return (Evaluator<Number>) evaluator;
- case STRING:
- case DATE:
- case INSTANT:
- case DECIMAL:
- case WHOLE_NUMBER:
- return addToken(new NumberCastEvaluator(evaluator),
evaluator.getToken());
- default:
- throw new AttributeExpressionLanguageParsingException("Cannot
implicitly convert Data Type " + evaluator.getResultType() + " to " +
ResultType.WHOLE_NUMBER
- + (location == null ? "" : " at location [" + location +
"]"));
- }
+ return switch (evaluator.getResultType()) {
+ case NUMBER -> (Evaluator<Number>) evaluator;
+ case STRING, DATE, INSTANT, DECIMAL, WHOLE_NUMBER ->
+ addToken(new NumberCastEvaluator(evaluator),
evaluator.getToken());
+ default ->
+ throw new
AttributeExpressionLanguageParsingException("Cannot implicitly convert Data
Type " + evaluator.getResultType() + " to " + ResultType.WHOLE_NUMBER
+ + (location == null ? "" : " at location [" +
location + "]"));
+ };
}
private DateEvaluator toDateEvaluator(final Evaluator<?> evaluator) {
@@ -896,34 +880,24 @@ public class ExpressionCompiler {
}
case TO_NUMBER: {
verifyArgCount(argEvaluators, 0, "toNumber");
- switch (subjectEvaluator.getResultType()) {
- case STRING:
- case WHOLE_NUMBER:
- case DECIMAL:
- case NUMBER:
- case DATE:
- case INSTANT:
- return
addToken(toWholeNumberEvaluator(subjectEvaluator), "toNumber");
- default:
- throw new
AttributeExpressionLanguageParsingException(subjectEvaluator + " returns type "
+ subjectEvaluator.getResultType() + " but expected to get " +
ResultType.STRING +
- ", " + ResultType.DECIMAL + ", or " +
ResultType.DATE);
- }
+ return switch (subjectEvaluator.getResultType()) {
+ case STRING, WHOLE_NUMBER, DECIMAL, NUMBER, DATE, INSTANT
->
+ addToken(toWholeNumberEvaluator(subjectEvaluator),
"toNumber");
+ default ->
+ throw new
AttributeExpressionLanguageParsingException(subjectEvaluator + " returns type "
+ subjectEvaluator.getResultType() + " but expected to get " +
ResultType.STRING +
+ ", " + ResultType.DECIMAL + ", or " +
ResultType.DATE);
+ };
}
// fallthrough
case TO_DECIMAL: {
verifyArgCount(argEvaluators, 0, "toDecimal");
- switch (subjectEvaluator.getResultType()) {
- case WHOLE_NUMBER:
- case DECIMAL:
- case STRING:
- case NUMBER:
- case DATE:
- case INSTANT:
- return addToken(toDecimalEvaluator(subjectEvaluator),
"toDecimal");
- default:
- throw new
AttributeExpressionLanguageParsingException(subjectEvaluator + " returns type "
+ subjectEvaluator.getResultType() + " but expected to get " +
ResultType.STRING +
- ", " + ResultType.WHOLE_NUMBER + ", or " +
ResultType.DATE);
- }
+ return switch (subjectEvaluator.getResultType()) {
+ case WHOLE_NUMBER, DECIMAL, STRING, NUMBER, DATE, INSTANT
->
+ addToken(toDecimalEvaluator(subjectEvaluator),
"toDecimal");
+ default ->
+ throw new
AttributeExpressionLanguageParsingException(subjectEvaluator + " returns type "
+ subjectEvaluator.getResultType() + " but expected to get " +
ResultType.STRING +
+ ", " + ResultType.WHOLE_NUMBER + ", or " +
ResultType.DATE);
+ };
}
// fallthrough
case TO_MICROS: {
@@ -1172,8 +1146,8 @@ public class ExpressionCompiler {
attributeNames.add(newStringLiteralEvaluator(tree.getChild(i).getText()).evaluate(new
StandardEvaluationContext(Collections.emptyMap())).getValue());
}
- switch (multiAttrType) {
- case ALL_ATTRIBUTES:
+ return switch (multiAttrType) {
+ case ALL_ATTRIBUTES -> {
for (final String attributeName : attributeNames) {
try {
FlowFile.KeyValidator.validateKey(attributeName);
@@ -1181,11 +1155,11 @@ public class ExpressionCompiler {
throw new
AttributeExpressionLanguageParsingException("Invalid Attribute Name: " +
attributeName + ". " + iae.getMessage());
}
}
-
- return addToken(new
MultiNamedAttributeEvaluator(attributeNames, ALL_ATTRIBUTES), "allAttributes");
- case ALL_MATCHING_ATTRIBUTES:
- return addToken(new
MultiMatchAttributeEvaluator(attributeNames, ALL_MATCHING_ATTRIBUTES),
"allMatchingAttributes");
- case ANY_ATTRIBUTE:
+ yield addToken(new
MultiNamedAttributeEvaluator(attributeNames, ALL_ATTRIBUTES), "allAttributes");
+ }
+ case ALL_MATCHING_ATTRIBUTES ->
+ addToken(new
MultiMatchAttributeEvaluator(attributeNames, ALL_MATCHING_ATTRIBUTES),
"allMatchingAttributes");
+ case ANY_ATTRIBUTE -> {
for (final String attributeName : attributeNames) {
try {
FlowFile.KeyValidator.validateKey(attributeName);
@@ -1193,13 +1167,13 @@ public class ExpressionCompiler {
throw new
AttributeExpressionLanguageParsingException("Invalid Attribute Name: " +
attributeName + ". " + iae.getMessage());
}
}
-
- return addToken(new
MultiNamedAttributeEvaluator(attributeNames, ANY_ATTRIBUTE), "anyAttribute");
- case ANY_MATCHING_ATTRIBUTE:
- return addToken(new
MultiMatchAttributeEvaluator(attributeNames, ANY_MATCHING_ATTRIBUTE),
"anyMatchingAttribute");
- default:
- throw new AssertionError("Illegal Multi-Attribute
Reference: " + functionTypeTree.toString());
- }
+ yield addToken(new
MultiNamedAttributeEvaluator(attributeNames, ANY_ATTRIBUTE), "anyAttribute");
+ }
+ case ANY_MATCHING_ATTRIBUTE ->
+ addToken(new
MultiMatchAttributeEvaluator(attributeNames, ANY_MATCHING_ATTRIBUTE),
"anyMatchingAttribute");
+ default ->
+ throw new AssertionError("Illegal Multi-Attribute
Reference: " + functionTypeTree.toString());
+ };
}
case ATTR_NAME: {
return newStringLiteralEvaluator(tree.getChild(0).getText());
@@ -1247,14 +1221,12 @@ public class ExpressionCompiler {
} else if (tree.getChildCount() == 1) {
final Tree childTree = tree.getChild(0);
try {
- switch (childTree.getType()) {
- case TRUE:
- return addToken(new HostnameEvaluator(true),
"hostname");
- case FALSE:
- return addToken(new HostnameEvaluator(false),
"hostname");
- default:
- throw new
AttributeExpressionLanguageParsingException("Call to hostname() must take 0 or
1 (boolean) parameter");
- }
+ return switch (childTree.getType()) {
+ case TRUE -> addToken(new HostnameEvaluator(true),
"hostname");
+ case FALSE -> addToken(new
HostnameEvaluator(false), "hostname");
+ default ->
+ throw new
AttributeExpressionLanguageParsingException("Call to hostname() must take 0 or
1 (boolean) parameter");
+ };
} catch (final UnknownHostException e) {
throw new AttributeExpressionLanguageException(e);
}
diff --git
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EqualsEvaluator.java
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EqualsEvaluator.java
index 597bfd78e4..f2d432a8ba 100644
---
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EqualsEvaluator.java
+++
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EqualsEvaluator.java
@@ -69,16 +69,11 @@ public class EqualsEvaluator extends BooleanEvaluator {
return null;
}
- switch (type) {
- case STRING:
- return (String) value;
- case DATE:
- return String.valueOf(((Date) value).getTime());
- case BOOLEAN:
- case NUMBER:
- default:
- return String.valueOf(value);
- }
+ return switch (type) {
+ case STRING -> (String) value;
+ case DATE -> String.valueOf(((Date) value).getTime());
+ default -> String.valueOf(value);
+ };
}
@Override
diff --git
a/nifi-commons/nifi-hl7-query-language/src/main/java/org/apache/nifi/hl7/query/HL7Query.java
b/nifi-commons/nifi-hl7-query-language/src/main/java/org/apache/nifi/hl7/query/HL7Query.java
index 3b02678725..70777c6d00 100644
---
a/nifi-commons/nifi-hl7-query-language/src/main/java/org/apache/nifi/hl7/query/HL7Query.java
+++
b/nifi-commons/nifi-hl7-query-language/src/main/java/org/apache/nifi/hl7/query/HL7Query.java
@@ -216,32 +216,29 @@ public class HL7Query {
// DATE('24 HOURS AGO')
// DATE('YESTERDAY')
- switch (tree.getType()) {
- case EQUALS:
- return new
EqualsEvaluator(buildReferenceEvaluator(tree.getChild(0)),
buildReferenceEvaluator(tree.getChild(1)));
- case NOT_EQUALS:
- return new
NotEqualsEvaluator(buildReferenceEvaluator(tree.getChild(0)),
buildReferenceEvaluator(tree.getChild(1)));
- case GT:
- return new
GreaterThanEvaluator(buildReferenceEvaluator(tree.getChild(0)),
buildReferenceEvaluator(tree.getChild(1)));
- case LT:
- return new
LessThanEvaluator(buildReferenceEvaluator(tree.getChild(0)),
buildReferenceEvaluator(tree.getChild(1)));
- case GE:
- return new
GreaterThanOrEqualEvaluator(buildReferenceEvaluator(tree.getChild(0)),
buildReferenceEvaluator(tree.getChild(1)));
- case LE:
- return new
LessThanOrEqualEvaluator(buildReferenceEvaluator(tree.getChild(0)),
buildReferenceEvaluator(tree.getChild(1)));
- case NOT:
- return new
NotEvaluator(buildBooleanEvaluator(tree.getChild(0)));
- case AND:
- return new
AndEvaluator(buildBooleanEvaluator(tree.getChild(0)),
buildBooleanEvaluator(tree.getChild(1)));
- case OR:
- return new
OrEvaluator(buildBooleanEvaluator(tree.getChild(0)),
buildBooleanEvaluator(tree.getChild(1)));
- case IS_NULL:
- return new
IsNullEvaluator(buildReferenceEvaluator(tree.getChild(0)));
- case NOT_NULL:
- return new
NotNullEvaluator(buildReferenceEvaluator(tree.getChild(0)));
- default:
- throw new HL7QueryParsingException("Cannot build boolean
evaluator for '" + tree.getText() + "'");
- }
+ return switch (tree.getType()) {
+ case EQUALS ->
+ new
EqualsEvaluator(buildReferenceEvaluator(tree.getChild(0)),
buildReferenceEvaluator(tree.getChild(1)));
+ case NOT_EQUALS ->
+ new
NotEqualsEvaluator(buildReferenceEvaluator(tree.getChild(0)),
buildReferenceEvaluator(tree.getChild(1)));
+ case GT ->
+ new
GreaterThanEvaluator(buildReferenceEvaluator(tree.getChild(0)),
buildReferenceEvaluator(tree.getChild(1)));
+ case LT ->
+ new
LessThanEvaluator(buildReferenceEvaluator(tree.getChild(0)),
buildReferenceEvaluator(tree.getChild(1)));
+ case GE ->
+ new
GreaterThanOrEqualEvaluator(buildReferenceEvaluator(tree.getChild(0)),
buildReferenceEvaluator(tree.getChild(1)));
+ case LE ->
+ new
LessThanOrEqualEvaluator(buildReferenceEvaluator(tree.getChild(0)),
buildReferenceEvaluator(tree.getChild(1)));
+ case NOT -> new
NotEvaluator(buildBooleanEvaluator(tree.getChild(0)));
+ case AND ->
+ new AndEvaluator(buildBooleanEvaluator(tree.getChild(0)),
buildBooleanEvaluator(tree.getChild(1)));
+ case OR ->
+ new OrEvaluator(buildBooleanEvaluator(tree.getChild(0)),
buildBooleanEvaluator(tree.getChild(1)));
+ case IS_NULL -> new
IsNullEvaluator(buildReferenceEvaluator(tree.getChild(0)));
+ case NOT_NULL -> new
NotNullEvaluator(buildReferenceEvaluator(tree.getChild(0)));
+ default ->
+ throw new HL7QueryParsingException("Cannot build boolean
evaluator for '" + tree.getText() + "'");
+ };
}
Tree getTree() {
diff --git
a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/util/SiteToSiteRestApiClient.java
b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/util/SiteToSiteRestApiClient.java
index 8bcbd709ff..64a16a4d53 100644
---
a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/util/SiteToSiteRestApiClient.java
+++
b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/util/SiteToSiteRestApiClient.java
@@ -1025,17 +1025,16 @@ public class SiteToSiteRestApiClient implements
Closeable {
final TransactionResultEntity errEntity = readResponse(in);
final ResponseCode errCode =
ResponseCode.fromCode(errEntity.getResponseCode());
- switch (errCode) {
- case UNKNOWN_PORT:
- return new UnknownPortException(errEntity.getMessage());
- case PORT_NOT_IN_VALID_STATE:
- return new PortNotRunningException(errEntity.getMessage());
- default:
+ return switch (errCode) {
+ case UNKNOWN_PORT -> new
UnknownPortException(errEntity.getMessage());
+ case PORT_NOT_IN_VALID_STATE -> new
PortNotRunningException(errEntity.getMessage());
+ default -> {
if (responseCode == RESPONSE_CODE_FORBIDDEN) {
- return new HandshakeException(errEntity.getMessage());
+ yield new HandshakeException(errEntity.getMessage());
}
- return new IOException("Unexpected response code: " +
responseCode + " errCode:" + errCode + " errMessage:" + errEntity.getMessage());
- }
+ yield new IOException("Unexpected response code: " +
responseCode + " errCode:" + errCode + " errMessage:" + errEntity.getMessage());
+ }
+ };
}
private TransactionResultEntity readResponse(final InputStream
inputStream) throws IOException {
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/MySQLDatabaseAdapter.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/MySQLDatabaseAdapter.java
index 18ca534c8a..d608f39177 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/MySQLDatabaseAdapter.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/MySQLDatabaseAdapter.java
@@ -148,22 +148,10 @@ public class MySQLDatabaseAdapter extends
GenericDatabaseAdapter {
@Override
public String getSQLForDataType(int sqlType) {
- switch (sqlType) {
- case Types.DOUBLE:
- return "DOUBLE PRECISION";
- case CHAR:
- case LONGNVARCHAR:
- case LONGVARCHAR:
- case NCHAR:
- case NVARCHAR:
- case VARCHAR:
- case CLOB:
- case NCLOB:
- case OTHER:
- case SQLXML:
- return "TEXT";
- default:
- return JDBCType.valueOf(sqlType).getName();
- }
+ return switch (sqlType) {
+ case Types.DOUBLE -> "DOUBLE PRECISION";
+ case CHAR, LONGNVARCHAR, LONGVARCHAR, NCHAR, NVARCHAR, VARCHAR,
CLOB, NCLOB, OTHER, SQLXML -> "TEXT";
+ default -> JDBCType.valueOf(sqlType).getName();
+ };
}
}
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/Oracle12DatabaseAdapter.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/Oracle12DatabaseAdapter.java
index 34cdefe4e0..0ca1c44dd5 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/Oracle12DatabaseAdapter.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/Oracle12DatabaseAdapter.java
@@ -224,24 +224,13 @@ public class Oracle12DatabaseAdapter implements
DatabaseAdapter {
@Override
public String getSQLForDataType(int sqlType) {
- switch (sqlType) {
- case Types.DOUBLE:
- return "DOUBLE PRECISION";
- case CHAR:
- case LONGNVARCHAR:
- case LONGVARCHAR:
- case NCHAR:
- case NVARCHAR:
- case VARCHAR:
- case CLOB:
- case NCLOB:
- case OTHER:
- case SQLXML:
+ return switch (sqlType) {
+ case Types.DOUBLE -> "DOUBLE PRECISION";
+ case CHAR, LONGNVARCHAR, LONGVARCHAR, NCHAR, NVARCHAR, VARCHAR,
CLOB, NCLOB, OTHER, SQLXML ->
// Must have a max length specified (the Oracle docs say
2000), and use VARCHAR2 instead of VARCHAR for consistent comparison semantics
- return "VARCHAR2(2000)";
- default:
- return JDBCType.valueOf(sqlType).getName();
- }
+ "VARCHAR2(2000)";
+ default -> JDBCType.valueOf(sqlType).getName();
+ };
}
@Override
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/OracleDatabaseAdapter.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/OracleDatabaseAdapter.java
index 4dc81aa85a..8c83168e88 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/OracleDatabaseAdapter.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/OracleDatabaseAdapter.java
@@ -152,24 +152,13 @@ public class OracleDatabaseAdapter implements
DatabaseAdapter {
@Override
public String getSQLForDataType(int sqlType) {
- switch (sqlType) {
- case Types.DOUBLE:
- return "DOUBLE PRECISION";
- case CHAR:
- case LONGNVARCHAR:
- case LONGVARCHAR:
- case NCHAR:
- case NVARCHAR:
- case VARCHAR:
- case CLOB:
- case NCLOB:
- case OTHER:
- case SQLXML:
+ return switch (sqlType) {
+ case Types.DOUBLE -> "DOUBLE PRECISION";
+ case CHAR, LONGNVARCHAR, LONGVARCHAR, NCHAR, NVARCHAR, VARCHAR,
CLOB, NCLOB, OTHER, SQLXML ->
// Must have a max length specified (the Oracle docs say
2000), and use VARCHAR2 instead of VARCHAR for consistent comparison semantics
- return "VARCHAR2(2000)";
- default:
- return JDBCType.valueOf(sqlType).getName();
- }
+ "VARCHAR2(2000)";
+ default -> JDBCType.valueOf(sqlType).getName();
+ };
}
@Override
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/PhoenixDatabaseAdapter.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/PhoenixDatabaseAdapter.java
index 6c8b1bb29c..49e1bd3296 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/PhoenixDatabaseAdapter.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/PhoenixDatabaseAdapter.java
@@ -165,22 +165,10 @@ public final class PhoenixDatabaseAdapter implements
DatabaseAdapter {
@Override
public String getSQLForDataType(int sqlType) {
- switch (sqlType) {
- case Types.DOUBLE:
- return "DOUBLE PRECISION";
- case CHAR:
- case LONGNVARCHAR:
- case LONGVARCHAR:
- case NCHAR:
- case NVARCHAR:
- case VARCHAR:
- case CLOB:
- case NCLOB:
- case OTHER:
- case SQLXML:
- return "TEXT";
- default:
- return JDBCType.valueOf(sqlType).getName();
- }
+ return switch (sqlType) {
+ case Types.DOUBLE -> "DOUBLE PRECISION";
+ case CHAR, LONGNVARCHAR, LONGVARCHAR, NCHAR, NVARCHAR, VARCHAR,
CLOB, NCLOB, OTHER, SQLXML -> "TEXT";
+ default -> JDBCType.valueOf(sqlType).getName();
+ };
}
}
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/PostgreSQLDatabaseAdapter.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/PostgreSQLDatabaseAdapter.java
index bc97844b3d..156666b836 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/PostgreSQLDatabaseAdapter.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/PostgreSQLDatabaseAdapter.java
@@ -173,22 +173,10 @@ public class PostgreSQLDatabaseAdapter extends
GenericDatabaseAdapter {
@Override
public String getSQLForDataType(int sqlType) {
- switch (sqlType) {
- case Types.DOUBLE:
- return "DOUBLE PRECISION";
- case CHAR:
- case LONGNVARCHAR:
- case LONGVARCHAR:
- case NCHAR:
- case NVARCHAR:
- case VARCHAR:
- case CLOB:
- case NCLOB:
- case OTHER:
- case SQLXML:
- return "TEXT";
- default:
- return JDBCType.valueOf(sqlType).getName();
- }
+ return switch (sqlType) {
+ case Types.DOUBLE -> "DOUBLE PRECISION";
+ case CHAR, LONGNVARCHAR, LONGVARCHAR, NCHAR, NVARCHAR, VARCHAR,
CLOB, NCLOB, OTHER, SQLXML -> "TEXT";
+ default -> JDBCType.valueOf(sqlType).getName();
+ };
}
}
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/db/impl/DerbyDatabaseAdapter.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/db/impl/DerbyDatabaseAdapter.java
index bb261adf13..df4b2d827c 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/db/impl/DerbyDatabaseAdapter.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/db/impl/DerbyDatabaseAdapter.java
@@ -177,21 +177,11 @@ public class DerbyDatabaseAdapter implements
DatabaseAdapter {
@Override
public String getSQLForDataType(int sqlType) {
- switch (sqlType) {
- case CHAR:
- case LONGNVARCHAR:
- case LONGVARCHAR:
- case NCHAR:
- case NVARCHAR:
- case VARCHAR:
- case CLOB:
- case NCLOB:
- case OTHER:
- case SQLXML:
+ return switch (sqlType) {
+ case CHAR, LONGNVARCHAR, LONGVARCHAR, NCHAR, NVARCHAR, VARCHAR,
CLOB, NCLOB, OTHER, SQLXML ->
// Derby must have a max length specified
- return "VARCHAR(100)";
- default:
- return JDBCType.valueOf(sqlType).getName();
- }
+ "VARCHAR(100)";
+ default -> JDBCType.valueOf(sqlType).getName();
+ };
}
}
\ No newline at end of file
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/SetCacheServer.java
b/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/SetCacheServer.java
index 8b33c0b682..306b261e52 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/SetCacheServer.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/SetCacheServer.java
@@ -41,20 +41,12 @@ public class SetCacheServer extends AbstractCacheServer {
final SSLContext sslContext = sslContextProvider == null ? null :
sslContextProvider.createContext();
- final EvictionPolicy evictionPolicy;
- switch (evictionPolicyName) {
- case EVICTION_STRATEGY_FIFO:
- evictionPolicy = EvictionPolicy.FIFO;
- break;
- case EVICTION_STRATEGY_LFU:
- evictionPolicy = EvictionPolicy.LFU;
- break;
- case EVICTION_STRATEGY_LRU:
- evictionPolicy = EvictionPolicy.LRU;
- break;
- default:
- throw new IllegalArgumentException("Illegal Eviction Policy: "
+ evictionPolicyName);
- }
+ final EvictionPolicy evictionPolicy = switch (evictionPolicyName) {
+ case EVICTION_STRATEGY_FIFO -> EvictionPolicy.FIFO;
+ case EVICTION_STRATEGY_LFU -> EvictionPolicy.LFU;
+ case EVICTION_STRATEGY_LRU -> EvictionPolicy.LRU;
+ default -> throw new IllegalArgumentException("Illegal Eviction
Policy: " + evictionPolicyName);
+ };
try {
final File persistenceDir = persistencePath == null ? null : new
File(persistencePath);
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheServer.java
b/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheServer.java
index 2d821e2659..8e483602e2 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheServer.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheServer.java
@@ -51,20 +51,12 @@ public class MapCacheServer extends AbstractCacheServer {
sslContext = sslContextProvider.createContext();
}
- final EvictionPolicy evictionPolicy;
- switch (evictionPolicyName) {
- case EVICTION_STRATEGY_FIFO:
- evictionPolicy = EvictionPolicy.FIFO;
- break;
- case EVICTION_STRATEGY_LFU:
- evictionPolicy = EvictionPolicy.LFU;
- break;
- case EVICTION_STRATEGY_LRU:
- evictionPolicy = EvictionPolicy.LRU;
- break;
- default:
- throw new IllegalArgumentException("Illegal Eviction Policy: "
+ evictionPolicyName);
- }
+ final EvictionPolicy evictionPolicy = switch (evictionPolicyName) {
+ case EVICTION_STRATEGY_FIFO -> EvictionPolicy.FIFO;
+ case EVICTION_STRATEGY_LFU -> EvictionPolicy.LFU;
+ case EVICTION_STRATEGY_LRU -> EvictionPolicy.LRU;
+ default -> throw new IllegalArgumentException("Illegal Eviction
Policy: " + evictionPolicyName);
+ };
try {
final File persistenceDir = persistencePath == null ? null : new
File(persistencePath);
diff --git
a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/schema/EventRecord.java
b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/schema/EventRecord.java
index 8c82b110fd..5cf8642c7b 100644
---
a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/schema/EventRecord.java
+++
b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/schema/EventRecord.java
@@ -68,52 +68,31 @@ public class EventRecord implements Record {
@Override
public Object getFieldValue(final String fieldName) {
- switch (fieldName) {
- case EventFieldNames.EVENT_IDENTIFIER:
- return eventId;
- case EventFieldNames.ALTERNATE_IDENTIFIER:
- return event.getAlternateIdentifierUri();
- case EventFieldNames.CHILD_UUIDS:
- return event.getChildUuids();
- case EventFieldNames.COMPONENT_ID:
- return event.getComponentId();
- case EventFieldNames.COMPONENT_TYPE:
- return event.getComponentType();
- case EventFieldNames.CONTENT_CLAIM:
- return contentClaimRecord;
- case EventFieldNames.EVENT_DETAILS:
- return event.getDetails();
- case EventFieldNames.EVENT_DURATION:
- return event.getEventDuration();
- case EventFieldNames.EVENT_TIME:
- return event.getEventTime();
- case EventFieldNames.EVENT_TYPE:
- return event.getEventType().name();
- case EventFieldNames.FLOWFILE_ENTRY_DATE:
- return event.getFlowFileEntryDate();
- case EventFieldNames.FLOWFILE_UUID:
- return event.getFlowFileUuid();
- case EventFieldNames.LINEAGE_START_DATE:
- return event.getLineageStartDate();
- case EventFieldNames.PARENT_UUIDS:
- return event.getParentUuids();
- case EventFieldNames.PREVIOUS_ATTRIBUTES:
- return event.getPreviousAttributes();
- case EventFieldNames.PREVIOUS_CONTENT_CLAIM:
- return previousClaimRecord;
- case EventFieldNames.RELATIONSHIP:
- return event.getRelationship();
- case EventFieldNames.SOURCE_QUEUE_IDENTIFIER:
- return event.getSourceQueueIdentifier();
- case EventFieldNames.SOURCE_SYSTEM_FLOWFILE_IDENTIFIER:
- return event.getSourceSystemFlowFileIdentifier();
- case EventFieldNames.TRANSIT_URI:
- return event.getTransitUri();
- case EventFieldNames.UPDATED_ATTRIBUTES:
- return event.getUpdatedAttributes();
- }
+ return switch (fieldName) {
+ case EventFieldNames.EVENT_IDENTIFIER -> eventId;
+ case EventFieldNames.ALTERNATE_IDENTIFIER ->
event.getAlternateIdentifierUri();
+ case EventFieldNames.CHILD_UUIDS -> event.getChildUuids();
+ case EventFieldNames.COMPONENT_ID -> event.getComponentId();
+ case EventFieldNames.COMPONENT_TYPE -> event.getComponentType();
+ case EventFieldNames.CONTENT_CLAIM -> contentClaimRecord;
+ case EventFieldNames.EVENT_DETAILS -> event.getDetails();
+ case EventFieldNames.EVENT_DURATION -> event.getEventDuration();
+ case EventFieldNames.EVENT_TIME -> event.getEventTime();
+ case EventFieldNames.EVENT_TYPE -> event.getEventType().name();
+ case EventFieldNames.FLOWFILE_ENTRY_DATE ->
event.getFlowFileEntryDate();
+ case EventFieldNames.FLOWFILE_UUID -> event.getFlowFileUuid();
+ case EventFieldNames.LINEAGE_START_DATE ->
event.getLineageStartDate();
+ case EventFieldNames.PARENT_UUIDS -> event.getParentUuids();
+ case EventFieldNames.PREVIOUS_ATTRIBUTES ->
event.getPreviousAttributes();
+ case EventFieldNames.PREVIOUS_CONTENT_CLAIM -> previousClaimRecord;
+ case EventFieldNames.RELATIONSHIP -> event.getRelationship();
+ case EventFieldNames.SOURCE_QUEUE_IDENTIFIER ->
event.getSourceQueueIdentifier();
+ case EventFieldNames.SOURCE_SYSTEM_FLOWFILE_IDENTIFIER ->
event.getSourceSystemFlowFileIdentifier();
+ case EventFieldNames.TRANSIT_URI -> event.getTransitUri();
+ case EventFieldNames.UPDATED_ATTRIBUTES ->
event.getUpdatedAttributes();
+ default -> null;
+ };
- return null;
}
@SuppressWarnings("unchecked")
diff --git
a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/schema/LookupTableEventRecord.java
b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/schema/LookupTableEventRecord.java
index 50f0bdf572..5a6aecf74c 100644
---
a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/schema/LookupTableEventRecord.java
+++
b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/schema/LookupTableEventRecord.java
@@ -181,52 +181,33 @@ public class LookupTableEventRecord implements Record {
@Override
public Object getFieldValue(final String fieldName) {
- switch (fieldName) {
- case EventFieldNames.EVENT_IDENTIFIER:
- return (int) (eventId - eventIdStartOffset);
- case EventFieldNames.ALTERNATE_IDENTIFIER:
- return event.getAlternateIdentifierUri();
- case EventFieldNames.CHILD_UUIDS:
- return event.getChildUuids();
- case EventFieldNames.COMPONENT_ID:
- return createLookupValue(event.getComponentId(),
componentIdMap);
- case EventFieldNames.COMPONENT_TYPE:
- return createLookupValue(event.getComponentType(),
componentTypeMap);
- case EventFieldNames.CONTENT_CLAIM:
- return createExplicitSameOrNoneValue(contentClaimRecord,
previousClaimRecord, () -> contentClaimRecord);
- case EventFieldNames.EVENT_DETAILS:
- return event.getDetails();
- case EventFieldNames.EVENT_DURATION:
- return (int) event.getEventDuration();
- case EventFieldNames.EVENT_TIME:
- return (int) (event.getEventTime() - startTimeOffset);
- case EventFieldNames.EVENT_TYPE:
- return eventTypeMap.get(event.getEventType().name());
- case EventFieldNames.FLOWFILE_ENTRY_DATE:
- return (int) (event.getFlowFileEntryDate() - startTimeOffset);
- case EventFieldNames.LINEAGE_START_DATE:
- return (int) (event.getLineageStartDate() - startTimeOffset);
- case EventFieldNames.PARENT_UUIDS:
- return event.getParentUuids();
- case EventFieldNames.PREVIOUS_ATTRIBUTES:
- return event.getPreviousAttributes();
- case EventFieldNames.PREVIOUS_CONTENT_CLAIM:
- return previousClaimRecord;
- case EventFieldNames.RELATIONSHIP:
- return event.getRelationship();
- case EventFieldNames.SOURCE_QUEUE_IDENTIFIER:
- return createLookupValue(event.getSourceQueueIdentifier(),
queueIdMap);
- case EventFieldNames.SOURCE_SYSTEM_FLOWFILE_IDENTIFIER:
- return event.getSourceSystemFlowFileIdentifier();
- case EventFieldNames.TRANSIT_URI:
- return event.getTransitUri();
- case EventFieldNames.UPDATED_ATTRIBUTES:
- return event.getUpdatedAttributes();
- case EventFieldNames.FLOWFILE_UUID:
- return event.getAttribute(CoreAttributes.UUID.key());
- }
+ return switch (fieldName) {
+ case EventFieldNames.EVENT_IDENTIFIER -> (int) (eventId -
eventIdStartOffset);
+ case EventFieldNames.ALTERNATE_IDENTIFIER ->
event.getAlternateIdentifierUri();
+ case EventFieldNames.CHILD_UUIDS -> event.getChildUuids();
+ case EventFieldNames.COMPONENT_ID ->
createLookupValue(event.getComponentId(), componentIdMap);
+ case EventFieldNames.COMPONENT_TYPE ->
createLookupValue(event.getComponentType(), componentTypeMap);
+ case EventFieldNames.CONTENT_CLAIM ->
+ createExplicitSameOrNoneValue(contentClaimRecord,
previousClaimRecord, () -> contentClaimRecord);
+ case EventFieldNames.EVENT_DETAILS -> event.getDetails();
+ case EventFieldNames.EVENT_DURATION -> (int)
event.getEventDuration();
+ case EventFieldNames.EVENT_TIME -> (int) (event.getEventTime() -
startTimeOffset);
+ case EventFieldNames.EVENT_TYPE ->
eventTypeMap.get(event.getEventType().name());
+ case EventFieldNames.FLOWFILE_ENTRY_DATE -> (int)
(event.getFlowFileEntryDate() - startTimeOffset);
+ case EventFieldNames.LINEAGE_START_DATE -> (int)
(event.getLineageStartDate() - startTimeOffset);
+ case EventFieldNames.PARENT_UUIDS -> event.getParentUuids();
+ case EventFieldNames.PREVIOUS_ATTRIBUTES ->
event.getPreviousAttributes();
+ case EventFieldNames.PREVIOUS_CONTENT_CLAIM -> previousClaimRecord;
+ case EventFieldNames.RELATIONSHIP -> event.getRelationship();
+ case EventFieldNames.SOURCE_QUEUE_IDENTIFIER ->
+ createLookupValue(event.getSourceQueueIdentifier(),
queueIdMap);
+ case EventFieldNames.SOURCE_SYSTEM_FLOWFILE_IDENTIFIER ->
event.getSourceSystemFlowFileIdentifier();
+ case EventFieldNames.TRANSIT_URI -> event.getTransitUri();
+ case EventFieldNames.UPDATED_ATTRIBUTES ->
event.getUpdatedAttributes();
+ case EventFieldNames.FLOWFILE_UUID ->
event.getAttribute(CoreAttributes.UUID.key());
+ default -> null;
+ };
- return null;
}
private static Long addLong(final Integer optionalValue, final long
requiredValue) {
diff --git
a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/toc/StandardTocReader.java
b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/toc/StandardTocReader.java
index e877a19e09..e675317755 100644
---
a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/toc/StandardTocReader.java
+++
b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/toc/StandardTocReader.java
@@ -69,16 +69,10 @@ public class StandardTocReader implements TocReader {
+ "expected value of 0 or 1 but got " + compressionFlag);
}
- final int blockInfoBytes;
- switch (version) {
- case 1:
- blockInfoBytes = 8;
- break;
- case 2:
- default:
- blockInfoBytes = 16;
- break;
- }
+ final int blockInfoBytes = switch (version) {
+ case 1 -> 8;
+ default -> 16;
+ };
final int numBlocks = (buffer.length - 2) / blockInfoBytes;
offsets = new long[numBlocks];
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/RepositoryRecordSerde.java
b/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/RepositoryRecordSerde.java
index 56328c6513..b3faad6c28 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/RepositoryRecordSerde.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/RepositoryRecordSerde.java
@@ -29,20 +29,14 @@ public abstract class RepositoryRecordSerde implements
SerDe<SerializedRepositor
@Override
public UpdateType getUpdateType(final SerializedRepositoryRecord record) {
- switch (record.getType()) {
- case CONTENTMISSING:
- case DELETE:
- return UpdateType.DELETE;
- case CREATE:
- return UpdateType.CREATE;
- case UPDATE:
- return UpdateType.UPDATE;
- case SWAP_OUT:
- return UpdateType.SWAP_OUT;
- case SWAP_IN:
- return UpdateType.SWAP_IN;
- }
- return null;
+ return switch (record.getType()) {
+ case CONTENTMISSING, DELETE -> UpdateType.DELETE;
+ case CREATE -> UpdateType.CREATE;
+ case UPDATE -> UpdateType.UPDATE;
+ case SWAP_OUT -> UpdateType.SWAP_OUT;
+ case SWAP_IN -> UpdateType.SWAP_IN;
+ default -> null;
+ };
}
@Override
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/SchemaRepositoryRecordSerde.java
b/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/SchemaRepositoryRecordSerde.java
index 12933f9dc5..980b5c0838 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/SchemaRepositoryRecordSerde.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/SchemaRepositoryRecordSerde.java
@@ -71,25 +71,14 @@ public class SchemaRepositoryRecordSerde extends
RepositoryRecordSerde implement
@Override
public void serializeRecord(final SerializedRepositoryRecord record, final
DataOutputStream out) throws IOException {
- final RecordSchema schema;
- switch (record.getType()) {
- case CREATE:
- case UPDATE:
- schema = RepositoryRecordSchema.CREATE_OR_UPDATE_SCHEMA_V2;
- break;
- case CONTENTMISSING:
- case DELETE:
- schema = RepositoryRecordSchema.DELETE_SCHEMA_V2;
- break;
- case SWAP_IN:
- schema = RepositoryRecordSchema.SWAP_IN_SCHEMA_V2;
- break;
- case SWAP_OUT:
- schema = RepositoryRecordSchema.SWAP_OUT_SCHEMA_V2;
- break;
- default:
- throw new IllegalArgumentException("Received Repository Record
with unknown Update Type: " + record.getType()); // won't happen.
- }
+ final RecordSchema schema = switch (record.getType()) {
+ case CREATE, UPDATE ->
RepositoryRecordSchema.CREATE_OR_UPDATE_SCHEMA_V2;
+ case CONTENTMISSING, DELETE ->
RepositoryRecordSchema.DELETE_SCHEMA_V2;
+ case SWAP_IN -> RepositoryRecordSchema.SWAP_IN_SCHEMA_V2;
+ case SWAP_OUT -> RepositoryRecordSchema.SWAP_OUT_SCHEMA_V2;
+ default ->
+ throw new IllegalArgumentException("Received Repository
Record with unknown Update Type: " + record.getType()); // won't happen.
+ };
serializeRecord(record, out, schema,
RepositoryRecordSchema.REPOSITORY_RECORD_SCHEMA_V2);
}
@@ -169,21 +158,15 @@ public class SchemaRepositoryRecordSerde extends
RepositoryRecordSerde implement
final String actionType = (String)
record.getFieldValue(RepositoryRecordSchema.ACTION_TYPE_FIELD);
final RepositoryRecordType recordType =
RepositoryRecordType.valueOf(actionType);
- switch (recordType) {
- case CREATE:
- return createRecord(record, RepositoryRecordType.CREATE, null);
- case CONTENTMISSING:
- case DELETE:
- return deleteRecord(record);
- case SWAP_IN:
- return swapInRecord(record);
- case SWAP_OUT:
- return swapOutRecord(record);
- case UPDATE:
- return updateRecord(record);
- }
+ return switch (recordType) {
+ case CREATE -> createRecord(record, RepositoryRecordType.CREATE,
null);
+ case CONTENTMISSING, DELETE -> deleteRecord(record);
+ case SWAP_IN -> swapInRecord(record);
+ case SWAP_OUT -> swapOutRecord(record);
+ case UPDATE -> updateRecord(record);
+ default -> throw new IOException("Found unrecognized Update Type
'" + actionType + "'");
+ };
- throw new IOException("Found unrecognized Update Type '" + actionType
+ "'");
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/StandardRepositoryRecordSerdeFactory.java
b/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/StandardRepositoryRecordSerdeFactory.java
index 884105af3b..d466ffa8d0 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/StandardRepositoryRecordSerdeFactory.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/StandardRepositoryRecordSerdeFactory.java
@@ -60,20 +60,14 @@ public class StandardRepositoryRecordSerdeFactory
implements RepositoryRecordSer
@Override
public UpdateType getUpdateType(final SerializedRepositoryRecord record) {
- switch (record.getType()) {
- case CONTENTMISSING:
- case DELETE:
- return UpdateType.DELETE;
- case CREATE:
- return UpdateType.CREATE;
- case UPDATE:
- return UpdateType.UPDATE;
- case SWAP_OUT:
- return UpdateType.SWAP_OUT;
- case SWAP_IN:
- return UpdateType.SWAP_IN;
- }
- return null;
+ return switch (record.getType()) {
+ case CONTENTMISSING, DELETE -> UpdateType.DELETE;
+ case CREATE -> UpdateType.CREATE;
+ case UPDATE -> UpdateType.UPDATE;
+ case SWAP_OUT -> UpdateType.SWAP_OUT;
+ case SWAP_IN -> UpdateType.SWAP_IN;
+ default -> null;
+ };
}
@Override
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/WriteAheadRepositoryRecordSerde.java
b/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/WriteAheadRepositoryRecordSerde.java
index 2d9dcce4e7..e541ad2456 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/WriteAheadRepositoryRecordSerde.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/WriteAheadRepositoryRecordSerde.java
@@ -374,17 +374,12 @@ public class WriteAheadRepositoryRecordSerde extends
RepositoryRecordSerde imple
}
private RepositoryRecordType getRecordType(final int serializedUpdateType)
{
- switch (serializedUpdateType) {
- case ACTION_CREATE:
- return RepositoryRecordType.CREATE;
- case ACTION_SWAPPED_IN:
- return RepositoryRecordType.SWAP_IN;
- case ACTION_SWAPPED_OUT:
- return RepositoryRecordType.SWAP_OUT;
- case ACTION_UPDATE:
- default:
- return RepositoryRecordType.UPDATE;
- }
+ return switch (serializedUpdateType) {
+ case ACTION_CREATE -> RepositoryRecordType.CREATE;
+ case ACTION_SWAPPED_IN -> RepositoryRecordType.SWAP_IN;
+ case ACTION_SWAPPED_OUT -> RepositoryRecordType.SWAP_OUT;
+ default -> RepositoryRecordType.UPDATE;
+ };
}
@Override
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/schema/ContentClaimFieldMap.java
b/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/schema/ContentClaimFieldMap.java
index eddde3444a..d08ba08332 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/schema/ContentClaimFieldMap.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/schema/ContentClaimFieldMap.java
@@ -45,18 +45,13 @@ public class ContentClaimFieldMap implements Record {
@Override
public Object getFieldValue(final String fieldName) {
- switch (fieldName) {
- case ContentClaimSchema.RESOURCE_CLAIM:
- return resourceClaimFieldMap;
- case ContentClaimSchema.CONTENT_CLAIM_LENGTH:
- return contentClaim.getLength();
- case ContentClaimSchema.CONTENT_CLAIM_OFFSET:
- return contentClaimOffset;
- case ContentClaimSchema.RESOURCE_CLAIM_OFFSET:
- return contentClaim.getOffset();
- default:
- return null;
- }
+ return switch (fieldName) {
+ case ContentClaimSchema.RESOURCE_CLAIM -> resourceClaimFieldMap;
+ case ContentClaimSchema.CONTENT_CLAIM_LENGTH ->
contentClaim.getLength();
+ case ContentClaimSchema.CONTENT_CLAIM_OFFSET -> contentClaimOffset;
+ case ContentClaimSchema.RESOURCE_CLAIM_OFFSET ->
contentClaim.getOffset();
+ default -> null;
+ };
}
@Override
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/schema/FlowFileRecordFieldMap.java
b/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/schema/FlowFileRecordFieldMap.java
index ff0615f59e..16f7bbba85 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/schema/FlowFileRecordFieldMap.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/schema/FlowFileRecordFieldMap.java
@@ -49,28 +49,19 @@ public class FlowFileRecordFieldMap implements Record {
@Override
public Object getFieldValue(final String fieldName) {
- switch (fieldName) {
- case FlowFileSchema.ATTRIBUTES:
- return flowFile.getAttributes();
- case FlowFileSchema.CONTENT_CLAIM:
- return contentClaim;
- case FlowFileSchema.ENTRY_DATE:
- return flowFile.getEntryDate();
- case FlowFileSchema.FLOWFILE_SIZE:
- return flowFile.getSize();
- case FlowFileSchema.LINEAGE_START_DATE:
- return flowFile.getLineageStartDate();
- case FlowFileSchema.LINEAGE_START_INDEX:
- return flowFile.getLineageStartIndex();
- case FlowFileSchema.QUEUE_DATE:
- return flowFile.getLastQueueDate();
- case FlowFileSchema.QUEUE_DATE_INDEX:
- return flowFile.getQueueDateIndex();
- case FlowFileSchema.RECORD_ID:
- return flowFile.getId();
- }
+ return switch (fieldName) {
+ case FlowFileSchema.ATTRIBUTES -> flowFile.getAttributes();
+ case FlowFileSchema.CONTENT_CLAIM -> contentClaim;
+ case FlowFileSchema.ENTRY_DATE -> flowFile.getEntryDate();
+ case FlowFileSchema.FLOWFILE_SIZE -> flowFile.getSize();
+ case FlowFileSchema.LINEAGE_START_DATE ->
flowFile.getLineageStartDate();
+ case FlowFileSchema.LINEAGE_START_INDEX ->
flowFile.getLineageStartIndex();
+ case FlowFileSchema.QUEUE_DATE -> flowFile.getLastQueueDate();
+ case FlowFileSchema.QUEUE_DATE_INDEX ->
flowFile.getQueueDateIndex();
+ case FlowFileSchema.RECORD_ID -> flowFile.getId();
+ default -> null;
+ };
- return null;
}
@SuppressWarnings("unchecked")
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/schema/RepositoryRecordFieldMap.java
b/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/schema/RepositoryRecordFieldMap.java
index cc1ec0df14..83c4b07911 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/schema/RepositoryRecordFieldMap.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/schema/RepositoryRecordFieldMap.java
@@ -37,36 +37,25 @@ public class RepositoryRecordFieldMap implements Record {
@Override
public Object getFieldValue(final String fieldName) {
- switch (fieldName) {
- case RepositoryRecordSchema.ACTION_TYPE:
- return record.getType().name();
- case RepositoryRecordSchema.RECORD_ID:
- return record.getFlowFileRecord().getId();
- case RepositoryRecordSchema.SWAP_LOCATION:
- return record.getSwapLocation();
- case FlowFileSchema.ATTRIBUTES:
- return flowFile.getAttributes();
- case FlowFileSchema.ENTRY_DATE:
- return flowFile.getEntryDate();
- case FlowFileSchema.FLOWFILE_SIZE:
- return flowFile.getSize();
- case FlowFileSchema.LINEAGE_START_DATE:
- return flowFile.getLineageStartDate();
- case FlowFileSchema.LINEAGE_START_INDEX:
- return flowFile.getLineageStartIndex();
- case FlowFileSchema.QUEUE_DATE:
- return flowFile.getLastQueueDate();
- case FlowFileSchema.QUEUE_DATE_INDEX:
- return flowFile.getQueueDateIndex();
- case FlowFileSchema.CONTENT_CLAIM:
+ return switch (fieldName) {
+ case RepositoryRecordSchema.ACTION_TYPE -> record.getType().name();
+ case RepositoryRecordSchema.RECORD_ID ->
record.getFlowFileRecord().getId();
+ case RepositoryRecordSchema.SWAP_LOCATION ->
record.getSwapLocation();
+ case FlowFileSchema.ATTRIBUTES -> flowFile.getAttributes();
+ case FlowFileSchema.ENTRY_DATE -> flowFile.getEntryDate();
+ case FlowFileSchema.FLOWFILE_SIZE -> flowFile.getSize();
+ case FlowFileSchema.LINEAGE_START_DATE ->
flowFile.getLineageStartDate();
+ case FlowFileSchema.LINEAGE_START_INDEX ->
flowFile.getLineageStartIndex();
+ case FlowFileSchema.QUEUE_DATE -> flowFile.getLastQueueDate();
+ case FlowFileSchema.QUEUE_DATE_INDEX ->
flowFile.getQueueDateIndex();
+ case FlowFileSchema.CONTENT_CLAIM -> {
final ContentClaimFieldMap contentClaimFieldMap =
record.getContentClaim() == null ? null
- : new ContentClaimFieldMap(record.getContentClaim(),
record.getClaimOffset(), contentClaimSchema);
- return contentClaimFieldMap;
- case RepositoryRecordSchema.QUEUE_IDENTIFIER:
- return record.getQueueIdentifier();
- default:
- return null;
- }
+ : new ContentClaimFieldMap(record.getContentClaim(),
record.getClaimOffset(), contentClaimSchema);
+ yield contentClaimFieldMap;
+ }
+ case RepositoryRecordSchema.QUEUE_IDENTIFIER ->
record.getQueueIdentifier();
+ default -> null;
+ };
}
@Override
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/schema/ResourceClaimFieldMap.java
b/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/schema/ResourceClaimFieldMap.java
index bc4741fa0a..069586e70a 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/schema/ResourceClaimFieldMap.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/src/main/java/org/apache/nifi/controller/repository/schema/ResourceClaimFieldMap.java
@@ -38,18 +38,14 @@ public class ResourceClaimFieldMap implements Record {
@Override
public Object getFieldValue(final String fieldName) {
- switch (fieldName) {
- case ContentClaimSchema.CLAIM_CONTAINER:
- return resourceClaim.getContainer();
- case ContentClaimSchema.CLAIM_SECTION:
- return resourceClaim.getSection();
- case ContentClaimSchema.CLAIM_IDENTIFIER:
- return resourceClaim.getId();
- case ContentClaimSchema.LOSS_TOLERANT:
- return resourceClaim.isLossTolerant();
- }
+ return switch (fieldName) {
+ case ContentClaimSchema.CLAIM_CONTAINER ->
resourceClaim.getContainer();
+ case ContentClaimSchema.CLAIM_SECTION ->
resourceClaim.getSection();
+ case ContentClaimSchema.CLAIM_IDENTIFIER -> resourceClaim.getId();
+ case ContentClaimSchema.LOSS_TOLERANT ->
resourceClaim.isLossTolerant();
+ default -> null;
+ };
- return null;
}
public static ResourceClaim getResourceClaim(final Record record, final
ResourceClaimManager claimManager) {
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListener.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListener.java
index 747b5a0862..99c6cd0e36 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListener.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListener.java
@@ -247,22 +247,16 @@ public class SocketProtocolListener extends
SocketListener implements ProtocolLi
return null;
}
- switch (message.getType()) {
- case CONNECTION_REQUEST:
- return ((ConnectionRequestMessage)
message).getConnectionRequest().getProposedNodeIdentifier();
- case HEARTBEAT:
- return ((HeartbeatMessage)
message).getHeartbeat().getNodeIdentifier();
- case OFFLOAD_REQUEST:
- return ((OffloadMessage) message).getNodeId();
- case DISCONNECTION_REQUEST:
- return ((DisconnectMessage) message).getNodeId();
- case FLOW_REQUEST:
- return ((FlowRequestMessage) message).getNodeId();
- case RECONNECTION_REQUEST:
- return ((ReconnectionRequestMessage) message).getNodeId();
- default:
- return null;
- }
+ return switch (message.getType()) {
+ case CONNECTION_REQUEST ->
+ ((ConnectionRequestMessage)
message).getConnectionRequest().getProposedNodeIdentifier();
+ case HEARTBEAT -> ((HeartbeatMessage)
message).getHeartbeat().getNodeIdentifier();
+ case OFFLOAD_REQUEST -> ((OffloadMessage) message).getNodeId();
+ case DISCONNECTION_REQUEST -> ((DisconnectMessage)
message).getNodeId();
+ case FLOW_REQUEST -> ((FlowRequestMessage) message).getNodeId();
+ case RECONNECTION_REQUEST -> ((ReconnectionRequestMessage)
message).getNodeId();
+ default -> null;
+ };
}
private Set<String> getCertificateIdentities(final Socket socket) throws
IOException {
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/events/VolatileBulletinRepository.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/events/VolatileBulletinRepository.java
index 3825c5de38..cd9e750b4c 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/events/VolatileBulletinRepository.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/events/VolatileBulletinRepository.java
@@ -282,36 +282,23 @@ public class VolatileBulletinRepository implements
BulletinRepository {
}
private String getBulletinStoreKey(final Bulletin bulletin) {
- switch (bulletin.getSourceType()) {
- case FLOW_CONTROLLER:
- return CONTROLLER_BULLETIN_STORE_KEY;
- case CONTROLLER_SERVICE:
- return SERVICE_BULLETIN_STORE_KEY;
- case REPORTING_TASK:
- return REPORTING_TASK_BULLETIN_STORE_KEY;
- case FLOW_ANALYSIS_RULE:
- return FLOW_ANALYSIS_RULE_BULLETIN_STORE_KEY;
- case PARAMETER_PROVIDER:
- return PARAMETER_PROVIDER_BULLETIN_STORE_KEY;
- case FLOW_REGISTRY_CLIENT:
- return FLOW_REGISTRY_CLIENT_STORE_KEY;
- default:
- return bulletin.getGroupId();
- }
+ return switch (bulletin.getSourceType()) {
+ case FLOW_CONTROLLER -> CONTROLLER_BULLETIN_STORE_KEY;
+ case CONTROLLER_SERVICE -> SERVICE_BULLETIN_STORE_KEY;
+ case REPORTING_TASK -> REPORTING_TASK_BULLETIN_STORE_KEY;
+ case FLOW_ANALYSIS_RULE -> FLOW_ANALYSIS_RULE_BULLETIN_STORE_KEY;
+ case PARAMETER_PROVIDER -> PARAMETER_PROVIDER_BULLETIN_STORE_KEY;
+ case FLOW_REGISTRY_CLIENT -> FLOW_REGISTRY_CLIENT_STORE_KEY;
+ default -> bulletin.getGroupId();
+ };
}
private boolean isControllerBulletin(final Bulletin bulletin) {
- switch (bulletin.getSourceType()) {
- case FLOW_CONTROLLER:
- case CONTROLLER_SERVICE:
- case REPORTING_TASK:
- case FLOW_ANALYSIS_RULE:
- case PARAMETER_PROVIDER:
- case FLOW_REGISTRY_CLIENT:
- return true;
- default:
- return false;
- }
+ return switch (bulletin.getSourceType()) {
+ case FLOW_CONTROLLER, CONTROLLER_SERVICE, REPORTING_TASK,
FLOW_ANALYSIS_RULE, PARAMETER_PROVIDER,
+ FLOW_REGISTRY_CLIENT -> true;
+ default -> false;
+ };
}
private class DefaultBulletinProcessingStrategy implements
BulletinProcessingStrategy {
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/FlowDifferenceFilters.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/FlowDifferenceFilters.java
index d8334d771b..e9dbd8ee84 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/FlowDifferenceFilters.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/FlowDifferenceFilters.java
@@ -99,16 +99,13 @@ public class FlowDifferenceFilters {
}
private static ComponentNode getComponent(final FlowManager flowManager,
final ComponentType componentType, final String componentId) {
- switch (componentType) {
- case CONTROLLER_SERVICE:
- return flowManager.getControllerServiceNode(componentId);
- case PROCESSOR:
- return flowManager.getProcessorNode(componentId);
- case REPORTING_TASK:
- return flowManager.getReportingTaskNode(componentId);
- }
+ return switch (componentType) {
+ case CONTROLLER_SERVICE ->
flowManager.getControllerServiceNode(componentId);
+ case PROCESSOR -> flowManager.getProcessorNode(componentId);
+ case REPORTING_TASK ->
flowManager.getReportingTaskNode(componentId);
+ default -> null;
+ };
- return null;
}
// The Registry URL may change if, for instance, a registry is moved to a
new host, or is made secure, the port changes, etc.
@@ -244,18 +241,15 @@ public class FlowDifferenceFilters {
return false;
}
- switch (type) {
- case RETRIED_RELATIONSHIPS_CHANGED:
- return processorNode.getRetriedRelationships().isEmpty();
- case RETRY_COUNT_CHANGED:
- return processorNode.getRetryCount() ==
ProcessorNode.DEFAULT_RETRY_COUNT;
- case MAX_BACKOFF_PERIOD_CHANGED:
- return
ProcessorNode.DEFAULT_MAX_BACKOFF_PERIOD.equals(processorNode.getMaxBackoffPeriod());
- case BACKOFF_MECHANISM_CHANGED:
- return ProcessorNode.DEFAULT_BACKOFF_MECHANISM ==
processorNode.getBackoffMechanism();
- default:
- return false;
- }
+ return switch (type) {
+ case RETRIED_RELATIONSHIPS_CHANGED ->
processorNode.getRetriedRelationships().isEmpty();
+ case RETRY_COUNT_CHANGED -> processorNode.getRetryCount() ==
ProcessorNode.DEFAULT_RETRY_COUNT;
+ case MAX_BACKOFF_PERIOD_CHANGED ->
+
ProcessorNode.DEFAULT_MAX_BACKOFF_PERIOD.equals(processorNode.getMaxBackoffPeriod());
+ case BACKOFF_MECHANISM_CHANGED ->
+ ProcessorNode.DEFAULT_BACKOFF_MECHANISM ==
processorNode.getBackoffMechanism();
+ default -> false;
+ };
}
public static boolean isNewPropertyWithDefaultValue(final FlowDifference
fd, final FlowManager flowManager) {
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/events/BulletinFactory.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/events/BulletinFactory.java
index 8c099b2a43..e9c14885df 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/events/BulletinFactory.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/events/BulletinFactory.java
@@ -118,19 +118,12 @@ public final class BulletinFactory {
}
private static ComponentType getComponentType(final Connectable
connectable) {
- switch (connectable.getConnectableType()) {
- case REMOTE_INPUT_PORT:
- case REMOTE_OUTPUT_PORT:
- return ComponentType.REMOTE_PROCESS_GROUP;
- case INPUT_PORT:
- return ComponentType.INPUT_PORT;
- case OUTPUT_PORT:
- return ComponentType.OUTPUT_PORT;
- case STATELESS_GROUP:
- return ComponentType.PROCESS_GROUP;
- case PROCESSOR:
- default:
- return ComponentType.PROCESSOR;
- }
+ return switch (connectable.getConnectableType()) {
+ case REMOTE_INPUT_PORT, REMOTE_OUTPUT_PORT ->
ComponentType.REMOTE_PROCESS_GROUP;
+ case INPUT_PORT -> ComponentType.INPUT_PORT;
+ case OUTPUT_PORT -> ComponentType.OUTPUT_PORT;
+ case STATELESS_GROUP -> ComponentType.PROCESS_GROUP;
+ default -> ComponentType.PROCESSOR;
+ };
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/client/async/nio/LoadBalanceSession.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/client/async/nio/LoadBalanceSession.java
index 56283b91d0..52c374288e 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/client/async/nio/LoadBalanceSession.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/client/async/nio/LoadBalanceSession.java
@@ -237,28 +237,20 @@ public class LoadBalanceSession {
private ByteBuffer getDataFrame() throws IOException {
- switch (phase) {
- case RECOMMEND_PROTOCOL_VERSION:
- return recommendProtocolVersion();
- case ABORT_PROTOCOL_NEGOTIATION:
- return abortProtocolNegotiation();
- case SEND_CONNECTION_ID:
- return getConnectionId();
- case CHECK_SPACE:
- return checkSpace();
- case GET_NEXT_FLOWFILE:
- return getNextFlowFile();
- case SEND_FLOWFILE_DEFINITION:
- case SEND_FLOWFILE_CONTENTS:
- return getFlowFileContent();
- case SEND_CHECKSUM:
- return getChecksum();
- case SEND_TRANSACTION_COMPLETE:
- return getTransactionComplete();
- default:
+ return switch (phase) {
+ case RECOMMEND_PROTOCOL_VERSION -> recommendProtocolVersion();
+ case ABORT_PROTOCOL_NEGOTIATION -> abortProtocolNegotiation();
+ case SEND_CONNECTION_ID -> getConnectionId();
+ case CHECK_SPACE -> checkSpace();
+ case GET_NEXT_FLOWFILE -> getNextFlowFile();
+ case SEND_FLOWFILE_DEFINITION, SEND_FLOWFILE_CONTENTS ->
getFlowFileContent();
+ case SEND_CHECKSUM -> getChecksum();
+ case SEND_TRANSACTION_COMPLETE -> getTransactionComplete();
+ default -> {
logger.debug("Phase of {}, returning null ByteBuffer", phase);
- return null;
- }
+ yield null;
+ }
+ };
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/swap/SwapSummaryFieldMap.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/swap/SwapSummaryFieldMap.java
index df3b25fad0..c36c46fd85 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/swap/SwapSummaryFieldMap.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/swap/SwapSummaryFieldMap.java
@@ -66,24 +66,17 @@ public class SwapSummaryFieldMap implements Record {
@Override
public Object getFieldValue(final String fieldName) {
- switch (fieldName) {
- case SwapSchema.MAX_RECORD_ID:
- return swapSummary.getMaxFlowFileId();
- case SwapSchema.FLOWFILE_COUNT:
- return swapSummary.getQueueSize().getObjectCount();
- case SwapSchema.FLOWFILE_SIZE:
- return swapSummary.getQueueSize().getByteCount();
- case SwapSchema.QUEUE_IDENTIFIER:
- return queueIdentifier;
- case SwapSchema.RESOURCE_CLAIMS:
- return claimCounts;
- case SwapSchema.MIN_LAST_QUEUE_DATE:
- return swapSummary.getMinLastQueueDate();
- case SwapSchema.TOTAL_LAST_QUEUE_DATE:
- return swapSummary.getTotalLastQueueDate();
- }
+ return switch (fieldName) {
+ case SwapSchema.MAX_RECORD_ID -> swapSummary.getMaxFlowFileId();
+ case SwapSchema.FLOWFILE_COUNT ->
swapSummary.getQueueSize().getObjectCount();
+ case SwapSchema.FLOWFILE_SIZE ->
swapSummary.getQueueSize().getByteCount();
+ case SwapSchema.QUEUE_IDENTIFIER -> queueIdentifier;
+ case SwapSchema.RESOURCE_CLAIMS -> claimCounts;
+ case SwapSchema.MIN_LAST_QUEUE_DATE ->
swapSummary.getMinLastQueueDate();
+ case SwapSchema.TOTAL_LAST_QUEUE_DATE ->
swapSummary.getTotalLastQueueDate();
+ default -> null;
+ };
- return null;
}
@SuppressWarnings("unchecked")
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/SocketFlowFileServerProtocol.java
b/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/SocketFlowFileServerProtocol.java
index c866e7d14e..906617d739 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/SocketFlowFileServerProtocol.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/SocketFlowFileServerProtocol.java
@@ -97,15 +97,10 @@ public class SocketFlowFileServerProtocol extends
AbstractFlowFileServerProtocol
} else {
handshakeResult.writeResponse(dos);
}
- switch (handshakeResult) {
- case UNAUTHORIZED:
- case PORT_NOT_IN_VALID_STATE:
- case PORTS_DESTINATION_FULL:
- responseWritten = true;
- break;
- default:
- throw e;
- }
+ responseWritten = switch (handshakeResult) {
+ case UNAUTHORIZED, PORT_NOT_IN_VALID_STATE,
PORTS_DESTINATION_FULL -> true;
+ default -> throw e;
+ };
}
// send "OK" response
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/StandardAuthorizableLookup.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/StandardAuthorizableLookup.java
index 62c0041b04..89e1ac1957 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/StandardAuthorizableLookup.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/StandardAuthorizableLookup.java
@@ -636,48 +636,22 @@ public class StandardAuthorizableLookup implements
AuthorizableLookup {
}
private Authorizable getAccessPolicyByResource(final ResourceType
resourceType, final String componentId) {
- Authorizable authorizable = null;
- switch (resourceType) {
- case ControllerService:
- authorizable =
getControllerService(componentId).getAuthorizable();
- break;
- case Funnel:
- authorizable = getFunnel(componentId);
- break;
- case InputPort:
- authorizable = getInputPort(componentId);
- break;
- case Label:
- authorizable = getLabel(componentId);
- break;
- case OutputPort:
- authorizable = getOutputPort(componentId);
- break;
- case Processor:
- authorizable = getProcessor(componentId).getAuthorizable();
- break;
- case ProcessGroup:
- authorizable = getProcessGroup(componentId).getAuthorizable();
- break;
- case RegistryClient:
- authorizable =
getFlowRegistryClient(componentId).getAuthorizable();
- break;
- case RemoteProcessGroup:
- authorizable = getRemoteProcessGroup(componentId);
- break;
- case ReportingTask:
- authorizable = getReportingTask(componentId).getAuthorizable();
- break;
- case FlowAnalysisRule:
- authorizable =
getFlowAnalysisRule(componentId).getAuthorizable();
- break;
- case ParameterContext:
- authorizable = getParameterContext(componentId);
- break;
- case ParameterProvider:
- authorizable =
getParameterProvider(componentId).getAuthorizable();
- break;
- }
+ Authorizable authorizable = switch (resourceType) {
+ case ControllerService ->
getControllerService(componentId).getAuthorizable();
+ case Funnel -> getFunnel(componentId);
+ case InputPort -> getInputPort(componentId);
+ case Label -> getLabel(componentId);
+ case OutputPort -> getOutputPort(componentId);
+ case Processor -> getProcessor(componentId).getAuthorizable();
+ case ProcessGroup ->
getProcessGroup(componentId).getAuthorizable();
+ case RegistryClient ->
getFlowRegistryClient(componentId).getAuthorizable();
+ case RemoteProcessGroup -> getRemoteProcessGroup(componentId);
+ case ReportingTask ->
getReportingTask(componentId).getAuthorizable();
+ case FlowAnalysisRule ->
getFlowAnalysisRule(componentId).getAuthorizable();
+ case ParameterContext -> getParameterContext(componentId);
+ case ParameterProvider ->
getParameterProvider(componentId).getAuthorizable();
+ default -> null;
+ };
if (authorizable == null) {
throw new IllegalArgumentException("An unexpected type of resource
in this policy " + resourceType.getValue());
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
index 3bb1a78561..18e89d11eb 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
@@ -6080,14 +6080,13 @@ public class StandardNiFiServiceFacade implements
NiFiServiceFacade {
private Authorizable getAuthorizable(final Connectable connectable) {
- switch (connectable.getConnectableType()) {
- case REMOTE_INPUT_PORT:
- case REMOTE_OUTPUT_PORT:
+ return switch (connectable.getConnectableType()) {
+ case REMOTE_INPUT_PORT, REMOTE_OUTPUT_PORT -> {
final String rpgId = ((RemoteGroupPort)
connectable).getRemoteProcessGroup().getIdentifier();
- return authorizableLookup.getRemoteProcessGroup(rpgId);
- default:
- return
authorizableLookup.getLocalConnectable(connectable.getIdentifier());
- }
+ yield authorizableLookup.getRemoteProcessGroup(rpgId);
+ }
+ default ->
authorizableLookup.getLocalConnectable(connectable.getIdentifier());
+ };
}
private Authorizable getAuthorizable(final String componentTypeName, final
InstantiatedVersionedComponent versionedComponent) {
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/file/FileAccessPolicyProvider.java
b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/file/FileAccessPolicyProvider.java
index 7bf9d82b4c..c9583f801f 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/file/FileAccessPolicyProvider.java
+++
b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/file/FileAccessPolicyProvider.java
@@ -599,16 +599,12 @@ public class FileAccessPolicyProvider extends
AbstractConfigurableAccessPolicyPr
}
private RequestAction getAction(final String actionCode) {
- switch (actionCode) {
- case READ_CODE:
- return RequestAction.READ;
- case WRITE_CODE:
- return RequestAction.WRITE;
- case DELETE_CODE:
- return RequestAction.DELETE;
- default:
- throw new IllegalStateException("Unknown action: " +
actionCode);
- }
+ return switch (actionCode) {
+ case READ_CODE -> RequestAction.READ;
+ case WRITE_CODE -> RequestAction.WRITE;
+ case DELETE_CODE -> RequestAction.DELETE;
+ default -> throw new IllegalStateException("Unknown action: " +
actionCode);
+ };
}
/**
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/extension/docs/HtmlExtensionDocWriter.java
b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/extension/docs/HtmlExtensionDocWriter.java
index 6e1425d02b..67f031d846 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/extension/docs/HtmlExtensionDocWriter.java
+++
b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/extension/docs/HtmlExtensionDocWriter.java
@@ -147,20 +147,12 @@ public class HtmlExtensionDocWriter implements
ExtensionDocWriter {
private void writeBundleInfo(final ExtensionMetadata extensionMetadata,
final XMLStreamWriter xmlStreamWriter) throws XMLStreamException {
final BundleInfo bundleInfo = extensionMetadata.getBundleInfo();
- final String extenstionType;
- switch (extensionMetadata.getType()) {
- case PROCESSOR:
- extenstionType = "Processor";
- break;
- case CONTROLLER_SERVICE:
- extenstionType = "Controller Service";
- break;
- case REPORTING_TASK:
- extenstionType = "Reporting Task";
- break;
- default:
- throw new IllegalArgumentException("Unknown extension type: "
+ extensionMetadata.getType());
- }
+ final String extenstionType = switch (extensionMetadata.getType()) {
+ case PROCESSOR -> "Processor";
+ case CONTROLLER_SERVICE -> "Controller Service";
+ case REPORTING_TASK -> "Reporting Task";
+ default -> throw new IllegalArgumentException("Unknown extension
type: " + extensionMetadata.getType());
+ };
xmlStreamWriter.writeStartElement("table");
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-utils/src/main/java/org/apache/nifi/registry/util/FormatUtils.java
b/nifi-registry/nifi-registry-core/nifi-registry-utils/src/main/java/org/apache/nifi/registry/util/FormatUtils.java
index f78e892c73..e57d7f99bf 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-utils/src/main/java/org/apache/nifi/registry/util/FormatUtils.java
+++
b/nifi-registry/nifi-registry-core/nifi-registry-utils/src/main/java/org/apache/nifi/registry/util/FormatUtils.java
@@ -303,16 +303,10 @@ public class FormatUtils {
* @return true if the unit is "weeks"; false otherwise
*/
protected static boolean isWeek(final String rawUnit) {
- switch (rawUnit) {
- case "w":
- case "wk":
- case "wks":
- case "week":
- case "weeks":
- return true;
- default:
- return false;
- }
+ return switch (rawUnit) {
+ case "w", "wk", "wks", "week", "weeks" -> true;
+ default -> false;
+ };
}
/**
@@ -324,47 +318,16 @@ public class FormatUtils {
* @return the TimeUnit
*/
protected static TimeUnit determineTimeUnit(String rawUnit) {
- switch (rawUnit.toLowerCase()) {
- case "ns":
- case "nano":
- case "nanos":
- case "nanoseconds":
- return TimeUnit.NANOSECONDS;
- case "µs":
- case "micro":
- case "micros":
- case "microseconds":
- return TimeUnit.MICROSECONDS;
- case "ms":
- case "milli":
- case "millis":
- case "milliseconds":
- return TimeUnit.MILLISECONDS;
- case "s":
- case "sec":
- case "secs":
- case "second":
- case "seconds":
- return TimeUnit.SECONDS;
- case "m":
- case "min":
- case "mins":
- case "minute":
- case "minutes":
- return TimeUnit.MINUTES;
- case "h":
- case "hr":
- case "hrs":
- case "hour":
- case "hours":
- return TimeUnit.HOURS;
- case "d":
- case "day":
- case "days":
- return TimeUnit.DAYS;
- default:
- throw new IllegalArgumentException("Could not parse '" +
rawUnit + "' to TimeUnit");
- }
+ return switch (rawUnit.toLowerCase()) {
+ case "ns", "nano", "nanos", "nanoseconds" -> TimeUnit.NANOSECONDS;
+ case "µs", "micro", "micros", "microseconds" ->
TimeUnit.MICROSECONDS;
+ case "ms", "milli", "millis", "milliseconds" ->
TimeUnit.MILLISECONDS;
+ case "s", "sec", "secs", "second", "seconds" -> TimeUnit.SECONDS;
+ case "m", "min", "mins", "minute", "minutes" -> TimeUnit.MINUTES;
+ case "h", "hr", "hrs", "hour", "hours" -> TimeUnit.HOURS;
+ case "d", "day", "days" -> TimeUnit.DAYS;
+ default -> throw new IllegalArgumentException("Could not parse '"
+ rawUnit + "' to TimeUnit");
+ };
}
public static String formatUtilization(final double utilization) {
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authorization/HttpMethodAuthorizationRules.java
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authorization/HttpMethodAuthorizationRules.java
index 2602ba5960..aba94e7ef4 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authorization/HttpMethodAuthorizationRules.java
+++
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authorization/HttpMethodAuthorizationRules.java
@@ -27,21 +27,12 @@ public interface HttpMethodAuthorizationRules {
default RequestAction mapHttpMethodToAction(HttpMethod httpMethod) {
- switch (httpMethod.name()) {
- case "TRACE":
- case "OPTIONS":
- case "HEAD":
- case "GET":
- return RequestAction.READ;
- case "POST":
- case "PUT":
- case "PATCH":
- return RequestAction.WRITE;
- case "DELETE":
- return RequestAction.DELETE;
- default:
- throw new IllegalArgumentException("Unknown http method: " +
httpMethod);
- }
+ return switch (httpMethod.name()) {
+ case "TRACE", "OPTIONS", "HEAD", "GET" -> RequestAction.READ;
+ case "POST", "PUT", "PATCH" -> RequestAction.WRITE;
+ case "DELETE" -> RequestAction.DELETE;
+ default -> throw new IllegalArgumentException("Unknown http
method: " + httpMethod);
+ };
}
