Optimizing taglib loading

cuioss · Jan 3, 2024 · 8f1ba39 · 8f1ba39
1 parent e853734
commit 8f1ba39
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 34 deletions.
diff --git a/modules/cui-jsf-dev/src/main/java/de/cuioss/jsf/dev/metadata/TagLib.java b/modules/cui-jsf-dev/src/main/java/de/cuioss/jsf/dev/metadata/TagLib.java
@@ -35,7 +35,7 @@
 import de.cuioss.jsf.dev.metadata.model.TagStorage;
 import de.cuioss.jsf.dev.metadata.model.UIComponentMetadata;
 import de.cuioss.jsf.dev.metadata.model.ValidatorMetadata;
-import de.cuioss.tools.base.Preconditions;
+import de.cuioss.portal.common.util.PortalResourceLoader;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
@@ -93,16 +93,15 @@ public TagLib(final String tagLibPath, final String tagLibNamespaceUrl) {
 
         tagPath = tagLibPath;
 
-        final var resource = TagLib.class.getResource(tagPath);
-
-        Preconditions.checkState(null != resource, "Unable to load path %d", tagPath);
+        final var resource = PortalResourceLoader.getRessource(tagLibPath, getClass());
 
         componentMetadata = new TagStorage<>();
         converterMetadata = new TagStorage<>();
         validatorMetadata = new TagStorage<>();
         behaviorMetadata = new TagStorage<>();
 
-        parseTagLib(resource);
+        parseTagLib(
+                resource.orElseThrow(() -> new IllegalStateException("Unable to load TagLib from path: " + tagPath)));
 
         componentMetadata.sortCollected();
         converterMetadata.sortCollected();

diff --git a/modules/cui-jsf-dev/src/main/java/de/cuioss/jsf/dev/ui/components/SourceCodeComponent.java b/modules/cui-jsf-dev/src/main/java/de/cuioss/jsf/dev/ui/components/SourceCodeComponent.java
@@ -48,6 +48,7 @@
 
 import de.cuioss.jsf.api.application.navigation.NavigationUtils;
 import de.cuioss.jsf.api.components.base.BaseCuiNamingContainer;
+import de.cuioss.portal.common.util.PortalResourceLoader;
 import de.cuioss.tools.collect.CollectionBuilder;
 import de.cuioss.tools.io.FileLoaderUtility;
 import de.cuioss.tools.io.FileTypePrefix;
@@ -228,10 +229,10 @@ private Optional<URL> resolvePath(final String path) {
         if (!path.startsWith("/")) {
             for (var candidate : determineViewRelativePath(path)) {
                 log.debug("Checking candidate '%s'", candidate);
-                var found = Thread.currentThread().getContextClassLoader().getResource(candidate);
-                if (found != null) {
+                var found = PortalResourceLoader.getRessource(candidate, getClass());
+                if (found.isPresent()) {
                     log.debug("Found candidate '%s'", candidate);
-                    return Optional.of(found);
+                    return found;
                 }
             }
             log.warn("%s", getClass().getResource(path));

diff --git a/...es/cui-jsf-dev/src/test/java/de/cuioss/jsf/dev/ui/components/SourceCodeComponentTest.java b/...es/cui-jsf-dev/src/test/java/de/cuioss/jsf/dev/ui/components/SourceCodeComponentTest.java
@@ -18,8 +18,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 
 import de.cuioss.test.generator.Generators;
 import de.cuioss.test.jsf.component.AbstractComponentTest;
@@ -52,34 +53,15 @@ void shouldResolveSourceId() {
         assertTrue(resolved.contains("Extract Sample Source"));
     }
 
-    @Test
-    @Disabled
-    void shouldReadRelativeSourceFile() {
-        getRequestConfigDecorator().setViewId(VIEW_ID);
-        var component = new SourceCodeComponent();
-        component.setSourcePath("test.properties");
-        var resolved = component.resolveSource();
-        assertEquals("hello=world", resolved);
-    }
-
-    @Test
-    @Disabled
-    void shouldReadRelativeToResourcesSourceFile() {
-        getRequestConfigDecorator().setViewId(VIEW_ID);
-        var component = new SourceCodeComponent();
-        component.setSourcePath("relativeResources.properties");
-        var resolved = component.resolveSource();
-        assertEquals("hello=relative", resolved);
-    }
-
-    @Test
-    @Disabled
-    void shouldReadRelativeAsAbsoluteSourceFile() {
+    @ParameterizedTest
+    @CsvSource({ "test.properties,hello=world", "relativeResources.properties,hello=relative",
+            "absoluteResources.properties,hello=absolute" })
+    void shouldReadRelativeSourceFile(String path, String result) {
         getRequestConfigDecorator().setViewId(VIEW_ID);
         var component = new SourceCodeComponent();
-        component.setSourcePath("absoluteResources.properties");
+        component.setSourcePath(path);
         var resolved = component.resolveSource();
-        assertEquals("hello=absolute", resolved);
+        assertEquals(result, resolved);
     }
 
     @Test