Jelajahi Sumber

Removing WrapperConfigBuilder

Jhonny Mertz 9 tahun lalu
induk
melakukan
b91ebc06e7

+ 1 - 2
src/main/java/br/eti/mertz/wkhtmltopdf/wrapper/Pdf.java

@@ -1,7 +1,6 @@
 package br.eti.mertz.wkhtmltopdf.wrapper;
 
 import br.eti.mertz.wkhtmltopdf.wrapper.configurations.WrapperConfig;
-import br.eti.mertz.wkhtmltopdf.wrapper.configurations.WrapperConfigBuilder;
 import br.eti.mertz.wkhtmltopdf.wrapper.page.Page;
 import br.eti.mertz.wkhtmltopdf.wrapper.page.PageType;
 import br.eti.mertz.wkhtmltopdf.wrapper.params.Param;
@@ -31,7 +30,7 @@ public class Pdf implements PdfService {
     }
 
     public Pdf() {
-        this(new WrapperConfigBuilder().build());
+        this(new WrapperConfig());
     }
 
     public void addPage(String source, PageType type) {

+ 4 - 2
src/main/java/br/eti/mertz/wkhtmltopdf/wrapper/configurations/WrapperConfig.java

@@ -8,8 +8,10 @@ public class WrapperConfig {
 
     public WrapperConfig(String wkhtmltopdfCommand) {
         this.wkhtmltopdfCommand = wkhtmltopdfCommand;
-        if (wkhtmltopdfCommand == null)
-            findExecutable();
+    }
+
+    public WrapperConfig(){
+        this.wkhtmltopdfCommand = findExecutable();
     }
 
     public String getWkhtmltopdfCommand() {

+ 0 - 14
src/main/java/br/eti/mertz/wkhtmltopdf/wrapper/configurations/WrapperConfigBuilder.java

@@ -1,14 +0,0 @@
-package br.eti.mertz.wkhtmltopdf.wrapper.configurations;
-
-public class WrapperConfigBuilder {
-    private String wkhtmltopdfCommand;
-
-    public WrapperConfigBuilder setWkhtmltopdfCommand(String wkhtmltopdfCommand) {
-        this.wkhtmltopdfCommand = wkhtmltopdfCommand;
-        return this;
-    }
-
-    public WrapperConfig build() {
-        return new WrapperConfig(wkhtmltopdfCommand);
-    }
-}

+ 1 - 2
src/tests/java/br/eti/mertz/wkhtmltopdf/wrapper/PdfTest.java

@@ -1,7 +1,6 @@
 package br.eti.mertz.wkhtmltopdf.wrapper;
 
 import br.eti.mertz.wkhtmltopdf.wrapper.configurations.WrapperConfig;
-import br.eti.mertz.wkhtmltopdf.wrapper.configurations.WrapperConfigBuilder;
 import br.eti.mertz.wkhtmltopdf.wrapper.page.PageType;
 import br.eti.mertz.wkhtmltopdf.wrapper.params.Param;
 import org.apache.pdfbox.pdfparser.PDFParser;
@@ -27,7 +26,7 @@ public class PdfTest {
 
     @Test
     public void findExecutable() throws Exception {
-        WrapperConfig wc = new WrapperConfigBuilder().build();
+        WrapperConfig wc = new WrapperConfig();
         Assert.assertThat("executable should be /usr/bin/wkhtmltopdf", wc.findExecutable(), containsString("/usr/bin/wkhtmltopdf"));
     }