[camel-kafka-connector] branch master updated: Avoid mix of stream and non-stream; simplify comparison

[ac...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git


The following commit(s) were added to refs/heads/master by this push:
     new dfdf568  Avoid mix of stream and non-stream; simplify comparison
dfdf568 is described below

commit dfdf568cc78397163e8002116039542e6c60ed68
Author: Aurélien Pupier <ap...@redhat.com>
AuthorDate: Thu Nov 5 12:03:23 2020 +0100

    Avoid mix of stream and non-stream; simplify comparison
    
    Signed-off-by: Aurélien Pupier <ap...@redhat.com>
---
 .../maven/CamelKafkaConnectorUpdateMojo.java               | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java
index a4a8410..5480533 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java
@@ -25,6 +25,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -33,6 +34,7 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import javax.annotation.Generated;
 import javax.xml.XMLConstants;
@@ -537,14 +539,10 @@ public class CamelKafkaConnectorUpdateMojo extends AbstractCamelKafkaConnectorMo
             HashMap<String, Object> templateParams = new HashMap<>();
             templateParams.put("connectorName", StringUtils.capitalize(sanitizedName));
             templateParams.put("connectorClass", packageName + "." + javaClassConnectorName);
-            ArrayList<CamelKafkaConnectorOptionModel> mandatoryOptions = new ArrayList<>();
-            listOptions.stream().filter(o -> o.getPriority().toUpperCase().equals("HIGH")).forEach(o -> mandatoryOptions.add(o));
-            mandatoryOptions.sort((option1, option2) -> {
-                String name1 = option1.getName();
-                String name2 = option2.getName();
-                int res = String.CASE_INSENSITIVE_ORDER.compare(name1, name2);
-                return (res != 0) ? res : name1.compareTo(name2);
-            });
+            List<CamelKafkaConnectorOptionModel> mandatoryOptions = listOptions.stream()
+                    .filter(o -> "HIGH".equalsIgnoreCase(o.getPriority()))
+                    .sorted(Comparator.comparing(CamelKafkaConnectorOptionModel::getName, String.CASE_INSENSITIVE_ORDER))
+                    .collect(Collectors.toList());
             templateParams.put("options", mandatoryOptions);
             String examplePropertiesFileContent = (String)TemplateRuntime.eval(examplesPropertiestemplate, templateParams);
             writeFileIfChanged(examplePropertiesFileContent, new File(connectorDir, "src/main/docs/examples/" + javaClassConnectorName + ".properties"), getLog());