fj-doc-sample semplified.

fugerit79 · fugerit79 · commit f323316dc8c2 · 2022-11-21T09:20:38.000+01:00
Reduced to only one test facade.
diff --git a/docgen/release-notes.txt b/docgen/release-notes.txt
@@ -1,4 +1,8 @@
-﻿0.5.1 (2022-11-20)
+﻿0.5.2 (2022-11-??)
+------------------
++ fj-doc-sample semplified. (Reduced to only one test facade.)
+
+0.5.1 (2022-11-20)
 ------------------
 + Changed Apahe FOP version from 2.6 to 2.8
 + Fix for bug [FOP-3109](https://github.com/fugerit-org/fj-doc/issues/6)
diff --git a/fj-doc-sample/src/main/resources/config/doc-handler-sample.xml b/fj-doc-sample/src/main/resources/config/doc-handler-sample.xml
@@ -1,6 +1,6 @@
 <doc-handler-config user-catalog="default-complete">
 
-	<factory id="common">
+	<factory id="default-complete">
 		<data id="xml-doc" info="xml" type="org.fugerit.java.doc.base.config.DocTypeHandlerXML" />
 		<data id="xls-poi" info="xls" type="org.fugerit.java.doc.mod.poi.XlsPoiTypeHandler" />
 		<data id="xlsx-poi" info="xlsx" type="org.fugerit.java.doc.mod.poi.XlsxPoiTypeHandler" />			
@@ -9,23 +9,7 @@
 			<config fop-config-classloader-path="fop-config.xml" font-base-classloader-path="font/"/>
 		</data>
 		<data id="html-fm" info="html" type="org.fugerit.java.doc.freemarker.html.FreeMarkerHtmlTypeHandler" />	
-		<data id="html-fragment-fm" info="fhtml" type="org.fugerit.java.doc.freemarker.html.FreeMarkerHtmlFragmentTypeHandler" />				
-	</factory>
-
-	<factory id="default-complete" extends="common">
-	</factory>
-
-	<factory id="alternate-complete" extends="common">
-	</factory>
-	
-	<factory id="alternate-fop" extends="common">
-	</factory>	
-	
-	<factory id="alternate-html-fm" extends="common">
-	</factory>		
-	
-	<!-- by default last handler registered for a type will be used by default -->
-	<factory id="full-facade" extends="common"> 
+		<data id="html-fragment-fm" info="fhtml" type="org.fugerit.java.doc.freemarker.html.FreeMarkerHtmlFragmentTypeHandler" />		
 	</factory>
 
 </doc-handler-config>
diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestIntro01PdfBox.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestIntro01PdfBox.java
diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01Fop.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01Fop.java
@@ -1,13 +1,11 @@
 package test.org.fugerit.java.doc.sample.freemarker;
 
 import org.fugerit.java.doc.base.config.DocConfig;
-import org.fugerit.java.doc.sample.facade.SampleFacade;
 
 public class TestFreeMarker01Fop extends BasicFreeMarkerTest {
 
 	public TestFreeMarker01Fop() {
 		super( "free-marker-01-fop", DocConfig.TYPE_FO, DocConfig.TYPE_PDF );
-		this.setFacadeId( SampleFacade.ALT_FOP_FACTORY );
 	}
 
 }
diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01FreeMarkerHtml.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01FreeMarkerHtml.java
@@ -1,13 +1,11 @@
 package test.org.fugerit.java.doc.sample.freemarker;
 
 import org.fugerit.java.doc.base.config.DocConfig;
-import org.fugerit.java.doc.sample.facade.SampleFacade;
 
 public class TestFreeMarker01FreeMarkerHtml extends BasicFreeMarkerTest {
 
 	public TestFreeMarker01FreeMarkerHtml() {
 		super( "free-marker-01-fop", DocConfig.TYPE_HTML, DocConfig.TYPE_HTML_FRAGMENT );
-		this.setFacadeId( SampleFacade.ALT_HTML_FM );
 	}
 
 }
diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01FullFacade.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01FullFacade.java
@@ -2,15 +2,13 @@
 
 import org.fugerit.java.doc.mod.fop.FreeMarkerFopTypeHandler;
 import org.fugerit.java.doc.mod.fop.PdfFopTypeHandler;
-import org.fugerit.java.doc.sample.facade.SampleFacade;
 
 public class TestFreeMarker01FullFacade extends BasicFreeMarkerTest {
 
 	public TestFreeMarker01FullFacade() {
 		super( "full-facade-01", 
 			FreeMarkerFopTypeHandler.HANDLER.getKey(), 
 			PdfFopTypeHandler.HANDLER.getKey()  );
-		this.setFacadeId( SampleFacade.ALT_FULL_FACADE );
 	}
 
 }
diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarkerFopFont.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarkerFopFont.java
@@ -1,13 +1,11 @@
 package test.org.fugerit.java.doc.sample.freemarker;
 
 import org.fugerit.java.doc.base.config.DocConfig;
-import org.fugerit.java.doc.sample.facade.SampleFacade;
 
 public class TestFreeMarkerFopFont extends BasicFreeMarkerTest {
 
 	public TestFreeMarkerFopFont() {
 		super( "free-marker-test-fop-font", DocConfig.TYPE_FO, DocConfig.TYPE_PDF, DocConfig.TYPE_HTML );
-		this.setFacadeId( SampleFacade.ALT_FOP_FACTORY );
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,11 @@`
`1`	`1`	`package test.org.fugerit.java.doc.sample.freemarker;`
`2`	`2`
`3`	`3`	`import org.fugerit.java.doc.base.config.DocConfig;`
`4`		`-import org.fugerit.java.doc.sample.facade.SampleFacade;`
`5`	`4`
`6`	`5`	`public class TestFreeMarker01Fop extends BasicFreeMarkerTest {`
`7`	`6`
`8`	`7`	`public TestFreeMarker01Fop() {`
`9`	`8`	`super( "free-marker-01-fop", DocConfig.TYPE_FO, DocConfig.TYPE_PDF );`
`10`		`- this.setFacadeId( SampleFacade.ALT_FOP_FACTORY );`
`11`	`9`	`}`
`12`	`10`
`13`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,15 +2,13 @@`
`2`	`2`
`3`	`3`	`import org.fugerit.java.doc.mod.fop.FreeMarkerFopTypeHandler;`
`4`	`4`	`import org.fugerit.java.doc.mod.fop.PdfFopTypeHandler;`
`5`		`-import org.fugerit.java.doc.sample.facade.SampleFacade;`
`6`	`5`
`7`	`6`	`public class TestFreeMarker01FullFacade extends BasicFreeMarkerTest {`
`8`	`7`
`9`	`8`	`public TestFreeMarker01FullFacade() {`
`10`	`9`	`super( "full-facade-01",`
`11`	`10`	`FreeMarkerFopTypeHandler.HANDLER.getKey(),`
`12`	`11`	`PdfFopTypeHandler.HANDLER.getKey() );`
`13`		`- this.setFacadeId( SampleFacade.ALT_FULL_FACADE );`
`14`	`12`	`}`
`15`	`13`
`16`	`14`	`}`