move resources

clagomess · Mar 12, 2024 · 6c1020d · 6c1020d
1 parent b54b13b
commit 6c1020d
Show file tree

Hide file tree

Showing 37 changed files with 49 additions and 59 deletions.
diff --git a/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/Compiler.java b/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/Compiler.java
@@ -110,7 +110,7 @@ protected File getOutArtifact(ParametersDto parameters){
     }
 
     protected void writeResourceToOut(String resource, PrintWriter out) throws IOException {
-        URL url = Thread.currentThread().getContextClassLoader().getResource(resource);
+        URL url = getClass().getResource(resource);
         if(url == null){
             throw new FileNotFoundException(String.format(
                     "Resource %s not loaded",

diff --git a/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/FeatureToHTMLCompiler.java b/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/FeatureToHTMLCompiler.java
@@ -45,7 +45,7 @@ public void build() throws Exception {
             out.print("<meta name=\"viewport\" content=\"width=device-width, shrink-to-fit=no, initial-scale=1\">");
             out.print(String.format("<title>%s</title>", parameters.getProjectName()));
             out.print("<style>");
-            writeResourceToOut("htmlTemplate/dist/feature.min.css", out);
+            writeResourceToOut("../dist/feature.min.css", out);
             out.print("</style>");
             out.print("</head><body>");
             out.print("<div class=\"container\"><div class=\"row\"><div class=\"col-sm-12\">");

diff --git a/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/FeatureToPDFCompiler.java b/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/FeatureToPDFCompiler.java
@@ -42,8 +42,8 @@ public void build() throws Exception {
 
         try (
                 FileOutputStream fosPDF = new FileOutputStream(outArtifact);
-                InputStream css = Objects.requireNonNull(Thread.currentThread().getContextClassLoader()
-                                .getResource("htmlTemplate/dist/feature-pdf.min.css"))
+                InputStream css = Objects.requireNonNull(getClass()
+                                .getResource("../dist/feature-pdf.min.css"))
                         .openStream();
         ){
             parameters.setEmbedImages(false);

diff --git a/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/FolderToHTMLCompiler.java b/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/FolderToHTMLCompiler.java
@@ -165,7 +165,7 @@ public void build() throws Exception {
             out.print("<meta name=\"viewport\" content=\"width=device-width, shrink-to-fit=no, initial-scale=1\">");
             out.print(String.format("<title>%s</title>", parameters.getProjectName()));
             out.print("<style>");
-            writeResourceToOut("htmlTemplate/dist/feature-pasta.min.css", out);
+            writeResourceToOut("../dist/feature-pasta.min.css", out);
             out.print("\n\n");
             out.print(String.format(
                     "#sidebar-wrapper {background: %s;}",
@@ -188,7 +188,7 @@ public void build() throws Exception {
             out.print("</head><body>\n");
             out.print("<div id=\"wrapper\">");
             buildSidebar(out);
-            writeResourceToOut("htmlTemplate/html/template-feature-pasta-content-wrapper.html", out);
+            writeResourceToOut("../html/template-feature-pasta-content-wrapper.html", out);
             out.print("</div>");
 
             for(File f : arquivos){
@@ -225,13 +225,13 @@ public void build() throws Exception {
             }
 
             buildTemplateIndex(out);
-            writeResourceToOut("htmlTemplate/html/template-feature-pasta-footer.html", out);
+            writeResourceToOut("../html/template-feature-pasta-footer.html", out);
 
             out.print("<script type=\"text/javascript\">\n");
             indexParser.buildIndex(out);
             buildMenu(out);
-            writeResourceToOut("htmlTemplate/dist/feature-pasta.min.js", out);
-            writeResourceToOut("htmlTemplate/dist/feature-pasta-angular.min.js", out);
+            writeResourceToOut("../dist/feature-pasta.min.js", out);
+            writeResourceToOut("../dist/feature-pasta-angular.min.js", out);
             out.print("</script>\n");
             out.print("</body></html>");
         } catch (Throwable e){

diff --git a/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/FolderToPDFCompiler.java b/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/FolderToPDFCompiler.java
@@ -39,8 +39,8 @@ public void build() throws Exception {
 
         try (
                 FileOutputStream fosPDF = new FileOutputStream(outArtifact);
-                InputStream css = Objects.requireNonNull(Thread.currentThread().getContextClassLoader()
-                                .getResource("htmlTemplate/dist/feature-pdf.min.css"))
+                InputStream css = Objects.requireNonNull(getClass()
+                                .getResource("../dist/feature-pdf.min.css"))
                         .openStream();
         ){
             parameters.setEmbedImages(false);

diff --git a/...rc/main/resources/htmlTemplate/.gitignore → ...ithub/clagomess/pirilampo/core/.gitignore b/...rc/main/resources/htmlTemplate/.gitignore → ...ithub/clagomess/pirilampo/core/.gitignore
diff --git a/.../src/main/resources/htmlTemplate/build.sh → .../github/clagomess/pirilampo/core/build.sh b/.../src/main/resources/htmlTemplate/build.sh → .../github/clagomess/pirilampo/core/build.sh
diff --git a/...sources/htmlTemplate/css/feature-base.css → ...omess/pirilampo/core/css/feature-base.css b/...sources/htmlTemplate/css/feature-base.css → ...omess/pirilampo/core/css/feature-base.css
diff --git a/...urces/htmlTemplate/css/simple-sidebar.css → ...ess/pirilampo/core/css/simple-sidebar.css b/...urces/htmlTemplate/css/simple-sidebar.css → ...ess/pirilampo/core/css/simple-sidebar.css
diff --git a/...mlTemplate/css/template-feature-pasta.css → ...lampo/core/css/template-feature-pasta.css b/...mlTemplate/css/template-feature-pasta.css → ...lampo/core/css/template-feature-pasta.css
diff --git a/...htmlTemplate/css/template-feature-pdf.css → ...rilampo/core/css/template-feature-pdf.css b/...htmlTemplate/css/template-feature-pdf.css → ...rilampo/core/css/template-feature-pdf.css
diff --git a/...ces/htmlTemplate/css/template-feature.css → ...s/pirilampo/core/css/template-feature.css b/...ces/htmlTemplate/css/template-feature.css → ...s/pirilampo/core/css/template-feature.css
diff --git a/...emplate/dist/feature-pasta-angular.min.js → ...po/core/dist/feature-pasta-angular.min.js b/...emplate/dist/feature-pasta-angular.min.js → ...po/core/dist/feature-pasta-angular.min.js
diff --git a/...s/htmlTemplate/dist/feature-pasta.min.css → ...pirilampo/core/dist/feature-pasta.min.css b/...s/htmlTemplate/dist/feature-pasta.min.css → ...pirilampo/core/dist/feature-pasta.min.css
diff --git a/...es/htmlTemplate/dist/feature-pasta.min.js → .../pirilampo/core/dist/feature-pasta.min.js b/...es/htmlTemplate/dist/feature-pasta.min.js → .../pirilampo/core/dist/feature-pasta.min.js
diff --git a/...ces/htmlTemplate/dist/feature-pdf.min.css → ...s/pirilampo/core/dist/feature-pdf.min.css b/...ces/htmlTemplate/dist/feature-pdf.min.css → ...s/pirilampo/core/dist/feature-pdf.min.css
diff --git a/...sources/htmlTemplate/dist/feature.min.css → ...omess/pirilampo/core/dist/feature.min.css b/...sources/htmlTemplate/dist/feature.min.css → ...omess/pirilampo/core/dist/feature.min.css
diff --git a/...c/main/resources/htmlTemplate/gulpfile.js → ...thub/clagomess/pirilampo/core/gulpfile.js b/...c/main/resources/htmlTemplate/gulpfile.js → ...thub/clagomess/pirilampo/core/gulpfile.js
diff --git a/...mplate-feature-pasta-content-wrapper.html → ...mplate-feature-pasta-content-wrapper.html b/...mplate-feature-pasta-content-wrapper.html → ...mplate-feature-pasta-content-wrapper.html
diff --git a/...e/html/template-feature-pasta-footer.html → ...e/html/template-feature-pasta-footer.html b/...e/html/template-feature-pasta-footer.html → ...e/html/template-feature-pasta-footer.html
diff --git a/...src/main/resources/htmlTemplate/js/app.js → ...github/clagomess/pirilampo/core/js/app.js b/...src/main/resources/htmlTemplate/js/app.js → ...github/clagomess/pirilampo/core/js/app.js
diff --git a/...rces/htmlTemplate/js/featureController.js → ...ss/pirilampo/core/js/featureController.js b/...rces/htmlTemplate/js/featureController.js → ...ss/pirilampo/core/js/featureController.js
diff --git a/...htmlTemplate/js/template-feature-pasta.js → ...rilampo/core/js/template-feature-pasta.js b/...htmlTemplate/js/template-feature-pasta.js → ...rilampo/core/js/template-feature-pasta.js
diff --git a/.../resources/htmlTemplate/package-lock.json → ...lagomess/pirilampo/core/package-lock.json b/.../resources/htmlTemplate/package-lock.json → ...lagomess/pirilampo/core/package-lock.json
diff --git a/.../main/resources/htmlTemplate/package.json → ...hub/clagomess/pirilampo/core/package.json b/.../main/resources/htmlTemplate/package.json → ...hub/clagomess/pirilampo/core/package.json
diff --git a/core/src/test/java/com/github/clagomess/pirilampo/core/Common.java b/core/src/test/java/com/github/clagomess/pirilampo/core/Common.java
@@ -4,23 +4,18 @@
 import java.util.Objects;
 
 public abstract class Common {
-    protected final File featureFolder = new File(Objects.requireNonNull(Thread.currentThread()
-            .getContextClassLoader()
-            .getResource("feature")).getFile());
+    protected final File featureFolder = new File(Objects.requireNonNull(getClass()
+            .getResource("../feature")).getFile());
 
-    protected final File featureMasterFolder = new File(Objects.requireNonNull(Thread.currentThread()
-            .getContextClassLoader()
-            .getResource("master")).getFile());
+    protected final File featureMasterFolder = new File(Objects.requireNonNull(getClass()
+            .getResource("../master")).getFile());
 
-    protected final File featureFile = new File(Objects.requireNonNull(Thread.currentThread()
-            .getContextClassLoader()
-            .getResource("feature/xxx.Feature")).getFile());
+    protected final File featureFile = new File(Objects.requireNonNull(getClass()
+            .getResource("../feature/xxx.Feature")).getFile());
 
-    protected final File featureErrorFolder = new File(Objects.requireNonNull(Thread.currentThread()
-            .getContextClassLoader()
-            .getResource("feature_error")).getFile());
+    protected final File featureErrorFolder = new File(Objects.requireNonNull(getClass()
+            .getResource("../feature_error")).getFile());
 
-    protected final File featureErrorFile = new File(Objects.requireNonNull(Thread.currentThread()
-            .getContextClassLoader()
-            .getResource("feature_error/yyy.feature")).getFile());
+    protected final File featureErrorFile = new File(Objects.requireNonNull(getClass()
+            .getResource("../feature_error/yyy.feature")).getFile());
 }
diff --git a/core/src/test/java/com/github/clagomess/pirilampo/core/compilers/CompilerTest.java b/core/src/test/java/com/github/clagomess/pirilampo/core/compilers/CompilerTest.java
@@ -14,6 +14,7 @@
 import org.junit.jupiter.params.provider.CsvSource;
 
 import java.io.*;
+import java.util.Objects;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -36,8 +37,8 @@ public void listFolder_NotDir() {
 
     @ParameterizedTest
     @CsvSource({
-            "feature,,feature/xxx.Feature,_xxx,_xxx.html,_xxx.feature,xxx",
-            "feature,master,master/xxx.Feature,_xxx,_xxx.html,_xxx.feature,xxx",
+            "../feature,,../feature/xxx.Feature,_xxx,_xxx.html,_xxx.feature,xxx",
+            "../feature,../master,../master/xxx.Feature,_xxx,_xxx.html,_xxx.feature,xxx",
     })
     public void getFeatureMetadata(
             String source,
@@ -48,18 +49,15 @@ public void getFeatureMetadata(
             String expectedIdFeature,
             String expectedIdName
     ){
-        File sourceFile = new File(Thread.currentThread()
-                .getContextClassLoader()
-                .getResource(source).getFile());
+        File sourceFile = new File(Objects.requireNonNull(getClass()
+                .getResource(source)).getFile());
 
         File sourceMasterFile = StringUtils.isNotBlank(sourceMaster) ?
-                new File(Thread.currentThread()
-                        .getContextClassLoader()
-                        .getResource(sourceMaster).getFile()) : null;
+                new File(Objects.requireNonNull(getClass()
+                        .getResource(sourceMaster)).getFile()) : null;
 
-        File featureFile = new File(Thread.currentThread()
-                .getContextClassLoader()
-                .getResource(feature).getFile());
+        File featureFile = new File(Objects.requireNonNull(getClass()
+                .getResource(feature)).getFile());
 
         ParametersDto parameters = new ParametersDto();
         parameters.setProjectSource(sourceFile);
@@ -75,15 +73,14 @@ public void getFeatureMetadata(
 
     @ParameterizedTest
     @CsvSource({
-        "feature/html_embed.html,.html",
-        "feature/xxx.png,.png",
+        "../feature/html_embed.html,.html",
+        "../feature/xxx.png,.png",
     })
     public void writeResourceToOut(String resource, String suffix) throws IOException {
         File tmpFile = File.createTempFile("writeResourceToOut-", suffix);
 
-        File resourceFile = new File(Thread.currentThread()
-                .getContextClassLoader()
-                .getResource(resource).getFile());
+        File resourceFile = new File(Objects.requireNonNull(getClass()
+                .getResource(resource)).getFile());
 
         try (
                 FileOutputStream fos = new FileOutputStream(tmpFile);
@@ -98,9 +95,8 @@ public void writeResourceToOut(String resource, String suffix) throws IOExceptio
 
     @Test
     public void writeFileToOut()  throws IOException {
-        File resourceFile = new File(Thread.currentThread()
-                .getContextClassLoader()
-                .getResource("feature/html_embed.html").getFile());
+        File resourceFile = new File(Objects.requireNonNull(getClass()
+                .getResource("../feature/html_embed.html")).getFile());
 
         try(
                 StringWriter sw = new StringWriter();

diff --git a/...src/test/java/com/github/clagomess/pirilampo/core/compilers/FolderToHTMLCompilerTest.java b/...src/test/java/com/github/clagomess/pirilampo/core/compilers/FolderToHTMLCompilerTest.java
@@ -15,6 +15,7 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Arrays;
+import java.util.Objects;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -33,9 +34,8 @@ public void setup(){
 
     @Test
     public void build() throws Exception {
-        File logoFile = new File(Thread.currentThread()
-                .getContextClassLoader()
-                .getResource("logo_xxx.png").getFile());
+        File logoFile = new File(Objects.requireNonNull(getClass()
+                .getResource("../logo_xxx.png")).getFile());
 
         ParametersDto parameters = new ParametersDto();
         parameters.setMenuColor("#666");

diff --git a/core/src/test/java/com/github/clagomess/pirilampo/core/dto/ParametersDtoTest.java b/core/src/test/java/com/github/clagomess/pirilampo/core/dto/ParametersDtoTest.java
@@ -106,13 +106,12 @@ public void validate_compilationArtifact(){
     @ParameterizedTest
     @CsvSource(value = {
        "FOLDER,",
-       "FOLDER,feature/xxx.Feature",
-       "FOLDER_DIFF,feature/xxx.Feature",
-       "FEATURE,feature",
+       "FOLDER,../feature/xxx.Feature",
+       "FOLDER_DIFF,../feature/xxx.Feature",
+       "FEATURE,../feature",
     })
     public void validate_projectSource(CompilationTypeEnum compilationTypeEnum, String source){
-        val projectSource = source != null ? new File(Objects.requireNonNull(Thread.currentThread()
-                .getContextClassLoader()
+        val projectSource = source != null ? new File(Objects.requireNonNull(getClass()
                 .getResource(source)).getFile()) : null;
 
         val dto = new ParametersDto();
@@ -124,13 +123,12 @@ public void validate_projectSource(CompilationTypeEnum compilationTypeEnum, Stri
 
     @ParameterizedTest
     @CsvSource(value = {
-            "FOLDER,feature",
-            "FOLDER_DIFF,feature/xxx.Feature",
+            "FOLDER,../feature",
+            "FOLDER_DIFF,../feature/xxx.Feature",
             "FOLDER_DIFF,",
     })
     public void validate_projectMasterSource(CompilationTypeEnum compilationTypeEnum, String sourceMaster){
-        val projectMasterSource = sourceMaster != null ? new File(Objects.requireNonNull(Thread.currentThread()
-                .getContextClassLoader()
+        val projectMasterSource = sourceMaster != null ? new File(Objects.requireNonNull(getClass()
                 .getResource(sourceMaster)).getFile()) : null;
 
         val dto = new ParametersDto();

diff --git a/core/src/test/java/com/github/clagomess/pirilampo/core/parsers/PdfParserTest.java b/core/src/test/java/com/github/clagomess/pirilampo/core/parsers/PdfParserTest.java
@@ -8,6 +8,7 @@
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.nio.file.Files;
+import java.util.Objects;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -24,8 +25,8 @@ public void build() throws Exception {
         try (
                 FileOutputStream fos = new FileOutputStream(targetFile);
                 InputStream html = Files.newInputStream(sourceFile.toPath());
-                InputStream css = Thread.currentThread().getContextClassLoader()
-                        .getResource("htmlTemplate/dist/feature-pdf.min.css")
+                InputStream css = Objects.requireNonNull(getClass()
+                                .getResource("../dist/feature-pdf.min.css"))
                         .openStream();
         ){
             PdfParser pdfParser = new PdfParser(new ParametersDto(), css);

diff --git a/...rc/test/resources/feature/html_embed.html → ...ss/pirilampo/core/feature/html_embed.html b/...rc/test/resources/feature/html_embed.html → ...ss/pirilampo/core/feature/html_embed.html
diff --git a/core/src/test/resources/feature/smallest.png → ...omess/pirilampo/core/feature/smallest.png b/core/src/test/resources/feature/smallest.png → ...omess/pirilampo/core/feature/smallest.png
diff --git a/core/src/test/resources/feature/xxx.Feature → ...gomess/pirilampo/core/feature/xxx.Feature b/core/src/test/resources/feature/xxx.Feature → ...gomess/pirilampo/core/feature/xxx.Feature
diff --git a/core/src/test/resources/feature/xxx.png → .../clagomess/pirilampo/core/feature/xxx.png b/core/src/test/resources/feature/xxx.png → .../clagomess/pirilampo/core/feature/xxx.png
diff --git a/.../test/resources/feature_error/yyy.feature → .../pirilampo/core/feature_error/yyy.feature b/.../test/resources/feature_error/yyy.feature → .../pirilampo/core/feature_error/yyy.feature
diff --git a/core/src/test/resources/logo_xxx.png → ...hub/clagomess/pirilampo/core/logo_xxx.png b/core/src/test/resources/logo_xxx.png → ...hub/clagomess/pirilampo/core/logo_xxx.png
diff --git a/core/src/test/resources/master/xxx.Feature → ...agomess/pirilampo/core/master/xxx.Feature b/core/src/test/resources/master/xxx.Feature → ...agomess/pirilampo/core/master/xxx.Feature