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 0118172f2ea optimized map iteration: entrySet() instead of keySet().
In one case loop was changed with parametrised constructor
0118172f2ea is described below
commit 0118172f2ead8d97a9734e9db5edfc39332b2af3
Author: dk2k <d...@ya.ru>
AuthorDate: Mon Apr 3 19:36:07 2023 +0300
optimized map iteration: entrySet() instead of keySet(). In one case loop
was changed with parametrised constructor
---
.../src/main/java/org/apache/camel/impl/DefaultCamelContext.java | 5 +++--
.../test/java/org/apache/camel/util/CaseInsensitiveMapTest.java | 7 +------
.../main/java/org/apache/camel/support/DefaultExchangeHolder.java | 4 ++--
.../apache/camel/dsl/jbang/core/commands/process/ListHealth.java | 5 +++--
.../main/java/org/apache/camel/maven/packaging/XRefCheckMojo.java | 7 ++++---
.../org/apache/camel/generator/openapi/RestDslYamlGenerator.java | 6 +++---
6 files changed, 16 insertions(+), 18 deletions(-)
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 2b996d072fe..76714f28ff1 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -873,12 +873,13 @@ public class DefaultCamelContext extends
SimpleCamelContext implements ModelCame
}
}
// the remainder of the local beans must also have
their ids made global unique
- for (String oldKey : bbr.keySet()) {
+ for (Map.Entry<String, Map<Class<?>, Object>> entry :
bbr.entrySet()) {
+ String oldKey = entry.getKey();
String newKey = oldKey + "-" + UUID.generateUuid();
LOG.debug(
"Route: {} re-assigning local-bean id: {}
to: {} to ensure ids are globally unique",
routeDefinition.getId(), oldKey, newKey);
- bbrCopy.put(newKey, bbr.get(oldKey));
+ bbrCopy.put(newKey, entry.getValue());
if (!params.containsKey(oldKey)) {
// if a bean was bound as local bean with a
key and it was not defined as template parameter
// then store it as if it was a template
parameter with same key=value which allows us
diff --git
a/core/camel-core/src/test/java/org/apache/camel/util/CaseInsensitiveMapTest.java
b/core/camel-core/src/test/java/org/apache/camel/util/CaseInsensitiveMapTest.java
index e1d4d6b3e48..597bae7d5fa 100644
---
a/core/camel-core/src/test/java/org/apache/camel/util/CaseInsensitiveMapTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/util/CaseInsensitiveMapTest.java
@@ -452,12 +452,7 @@ public class CaseInsensitiveMapTest {
assertTrue(map.containsKey("foo"));
assertTrue(map.containsKey("bar"));
- Map<String, Object> other = new HashMap<>();
-
- for (String key : map.keySet()) {
- Object value = map.get(key);
- other.put(key, value);
- }
+ Map<String, Object> other = new HashMap<>(map);
// the original case of the keys should be preserved
assertFalse(other.containsKey("foo"));
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java
index 0cfd2fbb43c..d3c9d1c09bc 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java
@@ -170,8 +170,8 @@ public class DefaultExchangeHolder implements Serializable {
}
}
if (payload.properties != null) {
- for (String key : payload.properties.keySet()) {
- exchange.setProperty(key, payload.properties.get(key));
+ for (Map.Entry<String, Object> entry :
payload.properties.entrySet()) {
+ exchange.setProperty(entry.getKey(), entry.getValue());
}
}
exchange.setException(payload.exception);
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListHealth.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListHealth.java
index 11573ca7ef0..c8d00e72319 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListHealth.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListHealth.java
@@ -153,13 +153,14 @@ public class ListHealth extends ProcessWatchCommand {
row.sinceStartFailure =
TimeUtils.printAge(delta);
}
}
- for (String k : d.keySet()) {
+ for (Map.Entry<String, Object> entry :
d.entrySet()) {
+ String k = entry.getKey();
// gather custom details
if (!HealthCheckHelper.isReservedKey(k)) {
if (row.customMeta == null) {
row.customMeta = new TreeMap<>();
}
- row.customMeta.put(k, d.get(k));
+ row.customMeta.put(k,
entry.getValue());
}
}
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/XRefCheckMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/XRefCheckMojo.java
index 5ce16c989e5..af75908208b 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/XRefCheckMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/XRefCheckMojo.java
@@ -91,9 +91,10 @@ public class XRefCheckMojo extends AbstractMojo {
componentNavs.computeIfAbsent(name, n -> new ArrayList<>()).addAll(
Optional.ofNullable((List<String>)
antora.get("nav")).orElse(Collections.emptyList()));
}
- for (String component : componentPaths.keySet()) {
+ for (Map.Entry<String, List<Path>> entry : componentPaths.entrySet()) {
+ String component = entry.getKey();
for (String nav : componentNavs.get(component)) {
- Optional<Path> n =
componentPaths.get(component).stream().map(p -> p.resolve(nav))
+ Optional<Path> n = entry.getValue().stream().map(p ->
p.resolve(nav))
.filter(Files::isRegularFile)
.findFirst();
if (n.isPresent()) {
@@ -105,7 +106,7 @@ public class XRefCheckMojo extends AbstractMojo {
pages.put(component + ":" + m.getFileName().toString() +
":" + f.getFileName().toString(), n.get());
}
}
- for (Path root : componentPaths.get(component)) {
+ for (Path root : entry.getValue()) {
try (Stream<Path> stream =
Files.list(root.resolve("modules"))) {
stream.filter(Files::isDirectory)
.filter(p -> Files.isDirectory(p.resolve("pages")))
diff --git
a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslYamlGenerator.java
b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslYamlGenerator.java
index b5c9bcb74a1..027d035361b 100644
---
a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslYamlGenerator.java
+++
b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslYamlGenerator.java
@@ -154,10 +154,10 @@ public class RestDslYamlGenerator extends
RestDslGenerator<RestDslYamlGenerator>
// add Routes
if (generateRoutes) {
- for (String uri : toTagData.keySet()) {
+ for (Map.Entry<String, String> entry : toTagData.entrySet()) {
ObjectNode from = JsonNodeFactory.instance.objectNode();
- from.set("uri", new TextNode(uri));
- String description = toTagData.get(uri);
+ from.set("uri", new TextNode(entry.getKey()));
+ String description = entry.getValue();
if (description != null && !description.isBlank()) {
from.set("description", new TextNode(description));
}
