optimzie_some_code

DataLinkDC · Nov 29, 2024 · 91e873a · 91e873a
1 parent 0ee8278
commit 91e873a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 14 deletions.
diff --git a/dinky-admin/src/main/java/org/dinky/url/RsURLStreamHandlerFactory.java b/dinky-admin/src/main/java/org/dinky/url/RsURLStreamHandlerFactory.java
@@ -33,19 +33,26 @@
 
 @Profile("!test")
 public class RsURLStreamHandlerFactory implements URLStreamHandlerFactory {
-    private final List<String> notContains = Arrays.asList("jar", "file", "http", "https");
+    private static final String PREFIX = "sun.net.www.protocol";
 
     @Override
     public URLStreamHandler createURLStreamHandler(String protocol) {
-        if ("rs".equals(protocol)) {
+        if ("rs".equalsIgnoreCase(protocol)) {
             return new RsURLStreamHandler();
         }
-        for (String tempProtocol : notContains) {
-            if (tempProtocol.equals(StrUtil.sub(protocol, 0, tempProtocol.length()))) {
-                return null;
-            }
+        String name = PREFIX + "." + protocol + ".Handler";
+        try {
+            @SuppressWarnings("deprecation")
+            Object o = Class.forName(name).newInstance();
+            return (URLStreamHandler) o;
+        } catch (ClassNotFoundException x) {
+            // ignore
+        } catch (Exception e) {
+            // For compatibility, all Exceptions are ignored.
+            // any number of exceptions can get thrown here
         }
 
+
         try {
             Class.forName("org.apache.hadoop.fs.FsUrlStreamHandlerFactory");
         } catch (Exception e) {

diff --git a/dinky-app/dinky-app-base/src/main/java/org/dinky/app/flinksql/Submitter.java b/dinky-app/dinky-app-base/src/main/java/org/dinky/app/flinksql/Submitter.java
@@ -259,7 +259,7 @@ public static Optional<JobClient> executeJarJob(String type, Executor executor,
                 ReadableConfig configuration =
                         executor.getStreamExecutionEnvironment().getConfiguration();
                 List<String> jars = configuration.get(PipelineOptions.JARS);
-                List<URL> jarsUrl = jars.stream().map(URLUtil::getURL).collect(Collectors.toList());
+                List<URL> jarsUrl = jars.stream().map(URLUtil::url).collect(Collectors.toList());
                 Pipeline pipeline = executeJarOperation.getStreamGraph(executor.getCustomTableEnvironment(), jarsUrl);
                 if (pipeline instanceof StreamGraph) {
                     // stream job

diff --git a/dinky-client/dinky-client-base/src/main/java/org/dinky/url/RsURLStreamHandlerFactory.java b/dinky-client/dinky-client-base/src/main/java/org/dinky/url/RsURLStreamHandlerFactory.java
@@ -19,6 +19,7 @@
 
 package org.dinky.url;
 
+import java.net.MalformedURLException;
 import java.net.URLStreamHandler;
 import java.net.URLStreamHandlerFactory;
 import java.util.Arrays;
@@ -28,15 +29,21 @@
 
 public class RsURLStreamHandlerFactory implements URLStreamHandlerFactory {
     private static final String PREFIX = "sun.net.www.protocol";
-    private final List<String> notContains = Arrays.asList("jar", "file", "http", "https");
 
     @Override
     public URLStreamHandler createURLStreamHandler(String protocol) {
-        for (String tempProtocol : notContains) {
-            if (tempProtocol.equals(StrUtil.sub(protocol, 0, tempProtocol.length()))) {
-                return null;
-            }
+        String name = PREFIX + "." + protocol + ".Handler";
+        try {
+            @SuppressWarnings("deprecation")
+            Object o = Class.forName(name).newInstance();
+            return (URLStreamHandler) o;
+        } catch (ClassNotFoundException x) {
+            // ignore
+        } catch (Exception e) {
+            // For compatibility, all Exceptions are ignored.
+            // any number of exceptions can get thrown here
         }
+
         if (ResourceFileSystem.URI_SCHEMA.getScheme().equals(protocol)) {
             return new RsURLStreamHandler();
         }
@@ -45,7 +52,6 @@ public URLStreamHandler createURLStreamHandler(String protocol) {
         } catch (Throwable e) {
             return null;
         }
-        String name = PREFIX + "." + protocol + ".Handler";
         try {
             @SuppressWarnings("deprecation")
             Object o = Class.forName(name).newInstance();

diff --git a/dinky-metadata/dinky-metadata-paimon/pom.xml b/dinky-metadata/dinky-metadata-paimon/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.paimon</groupId>
             <artifactId>paimon-bundle</artifactId>
-            <version>0.8.1</version>
+            <version>0.9.0</version>
             <scope>${scope.runtime}</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.paimon/paimon-s3 -->