This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new cdb3aa8cc1e (chores) convert core/camel-yaml-io to use pattern
matching for instanceof
cdb3aa8cc1e is described below
commit cdb3aa8cc1e4f3051f5ddb9de3da26701014b3dc
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Wed Aug 21 13:49:46 2024 +0200
(chores) convert core/camel-yaml-io to use pattern matching for instanceof
---
.../java/org/apache/camel/yaml/LwModelToYAMLDumper.java | 8 ++++----
.../main/java/org/apache/camel/yaml/io/YamlWriter.java | 15 +++++++--------
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git
a/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/LwModelToYAMLDumper.java
b/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/LwModelToYAMLDumper.java
index 01c01040ea3..add9e92e606 100644
---
a/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/LwModelToYAMLDumper.java
+++
b/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/LwModelToYAMLDumper.java
@@ -262,10 +262,10 @@ public class LwModelToYAMLDumper implements
ModelToYAMLDumper {
NamespaceAware na = null;
Expression exp = ed.getExpressionValue();
- if (exp instanceof NamespaceAware) {
- na = (NamespaceAware) exp;
- } else if (ed instanceof NamespaceAware) {
- na = (NamespaceAware) ed;
+ if (exp instanceof NamespaceAware namespaceAware) {
+ na = namespaceAware;
+ } else if (ed instanceof NamespaceAware namespaceAware) {
+ na = namespaceAware;
}
return na;
diff --git
a/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/io/YamlWriter.java
b/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/io/YamlWriter.java
index 7b35bfc17bb..f5a95277e89 100644
--- a/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/io/YamlWriter.java
+++ b/core/camel-yaml-io/src/main/java/org/apache/camel/yaml/io/YamlWriter.java
@@ -310,16 +310,15 @@ public class YamlWriter extends ServiceSupport implements
CamelContextAware {
exp = expressionName(model, key);
}
Object v = entry.getValue();
- if (v instanceof EipModel) {
- EipModel m = (EipModel) entry.getValue();
+ if (v instanceof EipModel m) {
if (exp == null || "expression".equals(exp)) {
v = asExpressionNode(m, m.getName());
} else {
v = asExpressionNode(m, exp);
}
}
- if (exp != null && v instanceof EipNode) {
- node.addExpression((EipNode) v);
+ if (exp != null && v instanceof EipNode eipNode) {
+ node.addExpression(eipNode);
} else {
node.addProperty(key, v);
if ("expression".equals(key)) {
@@ -385,8 +384,8 @@ public class YamlWriter extends ServiceSupport implements
CamelContextAware {
List<Object> list = new ArrayList<>();
for (Object v : col) {
Object r = v;
- if (r instanceof EipModel) {
- EipNode en = asNode((EipModel) r);
+ if (r instanceof EipModel eipModel) {
+ EipNode en = asNode(eipModel);
value = en.asJsonObject();
JsonObject wrap = new JsonObject();
wrap.put(en.getName(), value);
@@ -403,8 +402,8 @@ public class YamlWriter extends ServiceSupport implements
CamelContextAware {
}
jo.put(key, list);
} else {
- if (value instanceof EipModel) {
- EipNode r = asNode((EipModel) value);
+ if (value instanceof EipModel eipModel) {
+ EipNode r = asNode(eipModel);
value = r.asJsonObject();
jo.put(r.getName(), value);
} else {
