Use generics in camel-kamelet-utils (#1559)

Signed-off-by: Aurélien Pupier <apupier@redhat.com>
apache · Aug 14, 2023 · 9a0682b · 9a0682b
1 parent e0ed1f8
commit 9a0682b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/...utils/src/main/java/org/apache/camel/kamelets/utils/headers/DeDuplicateNamingHeaders.java b/...utils/src/main/java/org/apache/camel/kamelets/utils/headers/DeDuplicateNamingHeaders.java
@@ -71,8 +71,8 @@ public void process(Exchange ex) throws InvalidPayloadException {
 			} else {
 				if (selectedHeaders != null && mode.equalsIgnoreCase("filtering")) {
 					List<String> headerList = Arrays.asList(selectedHeaders.split(","));
-					for (Iterator iteratorHeader = headerList.iterator(); iteratorHeader.hasNext();) {
-						String header = (String) iteratorHeader.next();
+					for (Iterator<String> iteratorHeader = headerList.iterator(); iteratorHeader.hasNext();) {
+						String header = iteratorHeader.next();
 						if (key.equalsIgnoreCase(header)) {
 							String newKey = key.replaceFirst(prefix, renamingPrefix);
 							String subKey = newKey.substring(renamingPrefix.length());

diff --git a/...s-utils/src/main/java/org/apache/camel/kamelets/utils/headers/DuplicateNamingHeaders.java b/...s-utils/src/main/java/org/apache/camel/kamelets/utils/headers/DuplicateNamingHeaders.java
@@ -69,8 +69,8 @@ public void process(Exchange ex) throws InvalidPayloadException {
 			} else {
 					if (selectedHeaders != null && mode.equalsIgnoreCase("filtering")) {
 						List<String> headerList = Arrays.asList(selectedHeaders.split(","));
-						for (Iterator iterator = headerList.iterator(); iterator.hasNext();) {
-							String header = (String) iterator.next();
+						for (Iterator<String> iterator = headerList.iterator(); iterator.hasNext();) {
+							String header = iterator.next();
 							if (key.equalsIgnoreCase(header)) {
 								String newKey = key.replaceFirst(prefix, renamingPrefix);
 								String subKey = newKey.substring(renamingPrefix.length());

diff --git a/...mel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/transform/MaskField.java b/...mel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/transform/MaskField.java
@@ -75,7 +75,7 @@ public JsonNode process(@ExchangeProperty("fields") String fields, @ExchangeProp
         }
 
         Map<Object, Object> updatedBody = new HashMap<>();
-        for (Map.Entry entry:
+        for (Map.Entry<Object, Object> entry:
                 body.entrySet()) {
             final String fieldName = (String) entry.getKey();
             final Object origFieldValue = entry.getValue();

diff --git a/...-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/transform/ReplaceField.java b/...-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/transform/ReplaceField.java
@@ -54,7 +54,7 @@ public JsonNode process(@ExchangeProperty("enabled") String enabled, @ExchangePr
         if (ObjectHelper.isNotEmpty(renameFields)) {
             Map<String, String> renamingMap = parseNames(renameFields);
 
-            for (Map.Entry entry :
+            for (Map.Entry<Object, Object> entry :
                     body.entrySet()) {
                 final String fieldName = (String) entry.getKey();
                 if (filterNames(fieldName, enabledFields, disabledFields)) {

diff --git a/...elets-utils/src/main/java/org/apache/camel/kamelets/utils/transform/kafka/ValueToKey.java b/...elets-utils/src/main/java/org/apache/camel/kamelets/utils/transform/kafka/ValueToKey.java
@@ -43,7 +43,7 @@ public void process(@ExchangeProperty("fields") String fields, Exchange ex) thro
             splittedFields = Arrays.stream(fields.split(",")).collect(Collectors.toList());
         }
         Map<Object, Object> key = new HashMap<>();
-        for (Map.Entry entry:
+        for (Map.Entry<Object, Object> entry:
              body.entrySet()) {
             final String fieldName = (String) entry.getKey();
             if (filterNames(fieldName, splittedFields)) {

diff --git a/...kamelets-utils/src/test/java/org/apache/camel/kamelets/utils/transform/MaskFieldTest.java b/...kamelets-utils/src/test/java/org/apache/camel/kamelets/utils/transform/MaskFieldTest.java
@@ -70,7 +70,7 @@ void shouldMaskFieldWithNull() throws Exception {
 
     @Test
     void shouldMaskFieldList() throws Exception {
-        Map<String, List> names = new HashMap<>();
+        Map<String, List<String>> names = new HashMap<>();
         Exchange exchange = new DefaultExchange(camelContext);
         List<String> els = new ArrayList<>();
         els.add("Sheldon");