Shade google common in hadoop (#4222)

Author: ruanwenjun

seatunnel-connectors-v2/connector-elasticsearch/src/main/java/org/apache/seatunnel/connectors/seatunnel/elasticsearch/client/EsRestClient.java

@@ -442,9 +442,13 @@ public Map<String, String> getFieldTypeMapping(String index, List<String> source
                     JsonNode properties = mappingsProperty.get("properties");
                     mapping = getFieldTypeMappingFromProperties(properties, source);
                 } else {
-                    for (Iterator<JsonNode> iter = mappingsProperty.iterator(); iter.hasNext(); ) {
-                        JsonNode typeNode = iter.next();
-                        JsonNode properties = typeNode.get("properties");
+                    for (JsonNode typeNode : mappingsProperty) {
+                        JsonNode properties;
+                        if (typeNode.has("properties")) {
+                            properties = typeNode.get("properties");
+                        } else {
+                            properties = typeNode;
+                        }
                         mapping.putAll(getFieldTypeMappingFromProperties(properties, source));
                     }
                 }
@@ -457,7 +461,6 @@ public Map<String, String> getFieldTypeMapping(String index, List<String> source
     }
 
     private static Map<String, String> getFieldTypeMappingFromProperties(JsonNode properties, List<String> source) {
-        Map<String, String> mapping = new HashMap<>();
         Map<String, String> allElasticSearchFieldTypeInfoMap = new HashMap<>();
         properties.fields().forEachRemaining(entry -> {
             String fieldName = entry.getKey();

seatunnel-core/seatunnel-starter/src/main/java/org/apache/seatunnel/core/starter/seatunnel/command/ClientExecuteCommand.java

@@ -36,6 +36,7 @@
 import org.apache.seatunnel.engine.core.job.JobStatus;
 import org.apache.seatunnel.engine.server.SeaTunnelNodeContext;
 
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.hazelcast.client.config.ClientConfig;
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.instance.impl.HazelcastInstanceFactory;
@@ -126,7 +127,10 @@ public void execute() throws CommandExecuteException {
                 // get job id
                 long jobId = clientJobProxy.getJobId();
                 JobMetricsRunner jobMetricsRunner = new JobMetricsRunner(engineClient, jobId);
-                executorService = Executors.newSingleThreadScheduledExecutor();
+                executorService = Executors.newSingleThreadScheduledExecutor(new ThreadFactoryBuilder()
+                    .setNameFormat("job-metrics-runner-%d")
+                    .setDaemon(true)
+                    .build());
                 executorService.scheduleAtFixedRate(jobMetricsRunner, 0,
                     seaTunnelConfig.getEngineConfig().getPrintJobMetricsInfoInterval(), TimeUnit.SECONDS);
                 // wait for job complete
@@ -141,12 +145,15 @@ public void execute() throws CommandExecuteException {
         } finally {
             if (engineClient != null) {
                 engineClient.close();
+                log.info("Closed SeaTunnel client......");
             }
             if (instance != null) {
                 instance.shutdown();
+                log.info("Closed HazelcastInstance ......");
             }
             if (executorService != null) {
                 executorService.shutdown();
+                log.info("Closed metrics executor service ......");
             }
             if (jobMetricsSummary != null) {
                 // print job statistics information when job finished

seatunnel-shade/seatunnel-hadoop3-3.1.4-uber/pom.xml

@@ -92,6 +92,7 @@
                                     <includes>
                                         <include>com.google.common.base.*</include>
                                         <include>com.google.common.cache.*</include>
+                                        <include>com.google.common.collect.*</include>
                                     </includes>
                                 </relocation>
                                 <relocation>