FoD: Don't compare URLs (use URI) for feature matching

Feature on Demand scans the feature list and uses the URL for the
feature to identify the correct feature. URL uses the registered
Handler to implement #equals and #hashCode. When run with NetBinox
both the layers and the FeatureInfo yield URLs using the
JarClassLoader. When run with Felix as OSGI runtime the layers report
URLHandlersStreamHandlerProxy.

Instead of changing the URL logic, use the URI to find a valid
FeatureInfo.

Author: matthiasblaesing

ergonomics/ide.ergonomics/nbproject/project.properties

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-javac.source=1.8
+javac.release=21
 javac.compilerargs=-Xlint -Xlint:-serial
 
 javadoc.arch=${basedir}/arch.xml

ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FoDLayersProvider.java

@@ -18,6 +18,8 @@
  */
 package org.netbeans.modules.ide.ergonomics.fod;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.*;
 import java.util.logging.Level;
@@ -26,6 +28,7 @@
 import org.netbeans.spi.project.support.ant.AntBasedProjectType;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.Repository;
+import org.openide.util.Exceptions;
 import org.openide.util.Lookup;
 import org.openide.util.LookupEvent;
 import org.openide.util.LookupListener;
@@ -82,15 +85,25 @@ protected void registerLayers(Collection<? super URL> context) {
     }
 
     public FeatureInfo whichProvides(FileObject template) {
-        Set<URL> layers = new HashSet<URL>();
+        Set<URI> layers = new HashSet<>();
         Object obj = template.getAttribute("layers");
-        if (obj instanceof URL[]) {
-            layers.addAll(Arrays.asList((URL[])obj));
+        if (obj instanceof URL[] urlArray) {
+            for(URL url: urlArray) {
+                try {
+                    layers.add(url.toURI());
+                } catch (URISyntaxException | NullPointerException ex) {
+                    LOG.log(Level.WARNING, "Failed to convert URL to URI: {0}", url);
+                }
+            }
         }
 
         for (FeatureInfo info : FeatureManager.features()) {
-            if (layers.contains(info.getLayerURL())) {
-                return info;
+            try {
+                if (layers.contains(info.getLayerURL().toURI())) {
+                    return info;
+                }
+            } catch (URISyntaxException | NullPointerException ex) {
+                LOG.log(Level.WARNING, "Failed to convert URL to URI: {0}", info.getLayerURL());
             }
         }
         return null;