core: logo is a project file

clagomess · Mar 17, 2024 · 7abf3a2 · 7abf3a2
1 parent 8bbac04
commit 7abf3a2
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 32 deletions.
diff --git a/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/PropertiesCompiler.java b/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/PropertiesCompiler.java
@@ -6,7 +6,6 @@
 import com.github.clagomess.pirilampo.core.enums.HtmlPanelToggleEnum;
 import com.github.clagomess.pirilampo.core.enums.LayoutPdfEnum;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -41,13 +40,7 @@ public void loadData(ParametersDto parameters){
 
             parameters.setProjectName(prop.getProperty("projectName", parameters.getProjectName()));
             parameters.setProjectVersion(prop.getProperty("projectVersion", parameters.getProjectVersion()));
-
-            if(prop.containsKey("projectLogo")){
-                parameters.setProjectLogo(StringUtils.isNotBlank(prop.getProperty("projectLogo")) ?
-                        new File(prop.getProperty("projectLogo")) :
-                        null
-                );
-            }
+            parameters.setProjectLogo(prop.getProperty("projectLogo", null));
 
             parameters.setLayoutPdf(LayoutPdfEnum.valueOf(prop.getProperty(
                     "layoutPdf",
@@ -89,11 +82,7 @@ public void setData(ParametersDto parameters){
             Properties prop = new Properties();
             prop.setProperty("projectName", parameters.getProjectName());
             prop.setProperty("projectVersion", parameters.getProjectVersion());
-            prop.setProperty("projectLogo",
-                    parameters.getProjectLogo() != null ?
-                            parameters.getProjectLogo().getAbsolutePath() :
-                            ""
-            );
+            prop.setProperty("projectLogo", String.valueOf(parameters.getProjectLogo()));
             prop.setProperty("layoutPdf", parameters.getLayoutPdf().name());
             prop.setProperty("htmlPanelToggle", parameters.getHtmlPanelToggle().name());
             prop.setProperty("menuColor", parameters.getMenuColor());

diff --git a/core/src/main/java/com/github/clagomess/pirilampo/core/dto/ParametersDto.java b/core/src/main/java/com/github/clagomess/pirilampo/core/dto/ParametersDto.java
@@ -19,7 +19,7 @@
 public class ParametersDto {
     private String projectName = "Pirilampo";
     private String projectVersion = "1.0";
-    private File projectLogo;
+    private String projectLogo;
     private LayoutPdfEnum layoutPdf = LayoutPdfEnum.PORTRAIT;
     private HtmlPanelToggleEnum htmlPanelToggle = HtmlPanelToggleEnum.OPENED;
     private String menuColor = "#14171A";
@@ -35,10 +35,6 @@ public void validate() throws ParametersException {
         if(StringUtils.isBlank(projectName)) throw ParametersException.required("Project Name");
         if(StringUtils.isBlank(projectVersion)) throw ParametersException.required("Project Version");
 
-        if(projectLogo != null && !projectLogo.isFile()){ //@TODO: can be a project logo
-            throw new ParametersException("Option <Project Logo> must be a valid file");
-        }
-
         if(layoutPdf == null) throw ParametersException.required("Layout PDF");
         if(htmlPanelToggle == null) throw ParametersException.required("HTML Panel Toggle");
 

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
@@ -16,7 +16,6 @@
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
-import java.util.Objects;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -35,12 +34,9 @@ public void setup(){
 
     @Test
     public void build() throws Exception {
-        File logoFile = new File(Objects.requireNonNull(getClass()
-                .getResource("../logo_xxx.png")).getFile());
-
         ParametersDto parameters = new ParametersDto();
         parameters.setMenuColor("#666");
-        parameters.setProjectLogo(logoFile);
+        parameters.setProjectLogo("logo_xxx.png");
         parameters.setProjectSource(featureFolder);
         parameters.setProjectTarget(targetFile);
 

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
@@ -36,15 +36,6 @@ public void validate_projectVersion(){
         assertThrowsExactly(ParametersException.class, dto::validate);
     }
 
-    @Test
-    public void validate_projectLogo(){
-        val dto = new ParametersDto();
-        dto.setProjectSource(featureFolder);
-        dto.setProjectLogo(featureFolder);
-
-        assertThrowsExactly(ParametersException.class, dto::validate);
-    }
-
     @Test
     public void validate_layoutPdf(){
         val dto = new ParametersDto();

diff --git a/...hub/clagomess/pirilampo/core/logo_xxx.png → ...omess/pirilampo/core/feature/logo_xxx.png b/...hub/clagomess/pirilampo/core/logo_xxx.png → ...omess/pirilampo/core/feature/logo_xxx.png