update link handling logic

Author: mzouink

src/main/java/org/scijava/links/FijiURILink.java

@@ -31,11 +31,6 @@
 import java.net.URI;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Arrays;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
-import java.util.Objects;
 
 /**
  * Utility class for working with {@link URI} objects.
@@ -44,11 +39,12 @@
  */
 public final class FijiURILink {
 
+    public static final String FIJI_SCHEME = "fiji";
 
-    private final String plugin;     // e.g., "BDV"
-    private final String subPlugin;  // e.g., "open" (nullable)
-    private final String query;      // e.g., "a=1&b=2" (nullable)
-    private final String rawQuery;   // e.g., "a=1&b=2" (nullable)
+    private final String plugin; // e.g., "BDV"
+    private final String subPlugin; // e.g., "open" (nullable)
+    private final String query; // e.g., "a=1&b=2" (nullable)
+    private final String rawQuery; // e.g., "a=1&b=2" (nullable)
 
     private FijiURILink(String plugin, String subPlugin, String query, String rawQuery) {
         this.plugin = plugin;
@@ -58,13 +54,15 @@ private FijiURILink(String plugin, String subPlugin, String query, String rawQue
     }
 
     public static FijiURILink parse(String uriString) {
-        Objects.requireNonNull(uriString, "uriString");
-        final URI uri;
         try {
-            uri = new URI(uriString);
-        } catch (URISyntaxException e) {
+            URI uri = URI.create(uriString);
+            return parse(uri);
+        } catch (IllegalArgumentException e) {
             throw new IllegalArgumentException("Invalid URI: " + uriString, e);
         }
+    }
+
+    public static FijiURILink parse(URI uri) {
 
         if (!"fiji".equalsIgnoreCase(uri.getScheme())) {
             throw new IllegalArgumentException("Scheme must be fiji://");
@@ -87,15 +85,27 @@ public static FijiURILink parse(String uriString) {
         // Raw query (no '?'), leave as-is; users can parse if they want.
         String q = uri.getQuery();
         // Optional: decode percent-escapes (uncomment if desired)
-        // q = (q == null) ? null : java.net.URLDecoder.decode(q, StandardCharsets.UTF_8);
+        // q = (q == null) ? null : java.net.URLDecoder.decode(q,
+        // StandardCharsets.UTF_8);
         String raw = uri.getRawQuery();
         return new FijiURILink(plugin, sub, q, raw);
     }
 
-    public String getPlugin()    { return plugin; }
-    public String getSubPlugin() { return subPlugin; }    // may be null
-    public String getQuery()     { return query; }        // may be null
-    public String getRawQuery()  { return rawQuery; }     // may be null
+    public String getPlugin() {
+        return plugin;
+    }
+
+    public String getSubPlugin() {
+        return subPlugin;
+    } // may be null
+
+    public String getQuery() {
+        return query;
+    } // may be null
+
+    public String getRawQuery() {
+        return rawQuery;
+    } // may be null
 
     public Map<String, String> getParsedQuery() {
         final LinkedHashMap<String, String> map = new LinkedHashMap<>();
@@ -109,16 +119,13 @@ public Map<String, String> getParsedQuery() {
         return map;
     }
 
-    @Override public String toString() {
+    @Override
+    public String toString() {
         StringBuilder sb = new StringBuilder("fiji://").append(plugin);
-        if (subPlugin != null) sb.append('/').append(subPlugin);
-        if (query != null) sb.append('?').append(query);
+        if (subPlugin != null)
+            sb.append('/').append(subPlugin);
+        if (query != null)
+            sb.append('?').append(query);
         return sb.toString();
     }
-
-    // Convenience helper: returns null instead of throwing
-    public static FijiURILink tryParse(String uriString) {
-        try { return parse(uriString); } catch (RuntimeException e) { return null; }
-    }
 }
-        

src/main/java/org/scijava/links/LinkHandler.java

@@ -35,7 +35,7 @@
 /**
  * A plugin for handling URI links.
  *
- * @author Curtis Rueden
+ * @author Curtis Rueden, Marwan Zouinkhi
  */
 public interface LinkHandler extends HandlerPlugin<URI> {
 
@@ -46,8 +46,14 @@ public interface LinkHandler extends HandlerPlugin<URI> {
      */
     void handle(URI uri);
 
+    String getName();
+
     @Override
     default Class<URI> getType() {
         return URI.class;
     }
+
+    default public boolean supports(final URI uri) {
+        return FijiURILink.parse(uri).getPlugin().toUpperCase().equals(getName().toUpperCase());
+    }
 }

src/test/java/org/scijava/links/LinksTest.java

@@ -28,17 +28,13 @@
  */
 
 package org.scijava.links;
-
-import org.junit.Test;
-
-
 import java.util.Map;
+import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
 
 
 public class LinksTest {
@@ -103,36 +99,20 @@ public void toString_roundTrips_reasonably() {
 
         @Test
         public void rejectsWrongScheme() {
-            IllegalArgumentException ex = assertThrows(IllegalArgumentException.class,
+            assertThrows(IllegalArgumentException.class,
                     () -> FijiURILink.parse("http://BDV/open?x=1"));
-            assertTrue(ex.getMessage().contains("Scheme must be fiji://"));
         }
 
-        @Test
-        public void rejectsMissingPlugin() {
-            IllegalArgumentException ex = assertThrows(IllegalArgumentException.class,
-                    () -> FijiURILink.parse("fiji:///open?x=1"));
-            assertTrue(ex.getMessage().contains("Missing plugin name"));
-        }
 
         @Test
         public void rejectsInvalidUriSyntax() {
             assertThrows(IllegalArgumentException.class,
                     () -> FijiURILink.parse("fiji://BDV/open?bad|query"));
         }
 
-
-
-        @Test
-        public void returnsNullOnError() {
-            assertNull(FijiURILink.tryParse("not-a-uri"));
-            assertNull(FijiURILink.tryParse("http://BDV")); // wrong scheme
-            assertNull(FijiURILink.tryParse("fiji:///"));
-        }
-
         @Test
         public void returnsObjectOnSuccess() {
-            FijiURILink ok = FijiURILink.tryParse("fiji://BDV/open?q=ok");
+            FijiURILink ok = FijiURILink.parse("fiji://BDV/open?q=ok");
             assertNotNull(ok);
             assertEquals("BDV", ok.getPlugin());
             assertEquals("open", ok.getSubPlugin());