Skip to content

Commit 87bca8d

Browse files
fugerit79fugerit79
committed
chore: refactor of utils libraries for fj-doc-mod-fop module
1 parent b94542b commit 87bca8d

File tree

6 files changed

+53
-43
lines changed

6 files changed

+53
-43
lines changed

‎fj-doc-mod-fop/src/main/java/org/fugerit/java/doc/mod/fop/PdfFopTypeHandler.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
import org.fugerit.java.doc.base.config.*;
3030
import org.fugerit.java.doc.base.model.DocBase;
3131
import org.fugerit.java.doc.mod.fop.config.FopConfigClassLoaderWrapper;
32+
import org.fugerit.java.doc.mod.fop.utils.ConfigUtils;
33+
import org.fugerit.java.doc.mod.fop.utils.PoolUtils;
3234
import org.w3c.dom.Element;
3335
import org.w3c.dom.NodeList;
3436

@@ -85,6 +87,8 @@ public class PdfFopTypeHandler extends FreeMarkerFopTypeHandler {
8587

8688
private static final String FOP_CONFIG_ROOT = "fop";
8789

90+
private static final boolean LEGACY_CLASS_LOADER_MODE_CONFIG_HANDLER_FAIL_WITH_EXCEPTION = Boolean.TRUE;
91+
8892
/**
8993
*
9094
*/
@@ -258,7 +262,7 @@ protected void handleConfigTag(Element config) throws ConfigException {
258262
}
259263
// legacy class loader mode
260264
if ( StringUtils.isEmpty( fopConfigMode ) && StringUtils.isNotEmpty( fopConfigClassloaderPath ) && StringUtils.isNotEmpty( fontBaseClassloaderPath ) ) {
261-
this.legacyClassLoaderMode();
265+
ConfigUtils.LEGACY_CLASS_LOADER_MODE_CONFIG_HANDLER.accept( LEGACY_CLASS_LOADER_MODE_CONFIG_HANDLER_FAIL_WITH_EXCEPTION );
262266
}
263267
// setup fop config mode
264268
this.setupFopConfigMode(fopConfigMode, fopConfigResolverType, fopConfigClassloaderPath, config);
@@ -322,15 +326,10 @@ private void setupFopConfigMode( String fopConfigMode, String fopConfigResoverTy
322326
this.fopConfig = fopConfigClassLoaderWrapper;
323327
} );
324328
} else if ( ATT_FOP_CONFIG_MODE_CLASS_LOADER_LEGACY.equalsIgnoreCase( fopConfigMode ) ) {
325-
this.legacyClassLoaderMode();
329+
ConfigUtils.LEGACY_CLASS_LOADER_MODE_CONFIG_HANDLER.accept( LEGACY_CLASS_LOADER_MODE_CONFIG_HANDLER_FAIL_WITH_EXCEPTION );
326330
}
327331
}
328332

329-
private void legacyClassLoaderMode() throws ConfigException {
330-
log.warn( "Deprecated legacy class loader mode : {}", ATT_FOP_CONFIG_MODE_CLASS_LOADER_LEGACY );
331-
throw new ConfigException( "Deprecated config mode, see github fugerit-org/fj-doc repository, issue 65" );
332-
}
333-
334333
@Override
335334
public String toString() {
336335
return super.toString()+String.format( "[pdfAmode=%s,pdfUAmode=,%s,poolMin=%s,poolMax=%s]", this.getPdfAMode(), this.getPdfUAMode(), this.getFopPoolMin(), this.getFopPoolMax() );

‎fj-doc-mod-fop/src/main/java/org/fugerit/java/doc/mod/fop/utils/ConfigUtils.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package org.fugerit.java.doc.mod.fop.utils;
2+
3+
import lombok.extern.slf4j.Slf4j;
4+
import org.fugerit.java.core.cfg.ConfigException;
5+
import org.fugerit.java.core.cfg.ConfigRuntimeException;
6+
import org.fugerit.java.doc.mod.fop.PdfFopTypeHandler;
7+
8+
import java.util.function.Consumer;
9+
10+
@Slf4j
11+
public class ConfigUtils {
12+
13+
private ConfigUtils() {}
14+
15+
public static Consumer<Boolean> LEGACY_CLASS_LOADER_MODE_CONFIG_HANDLER = error -> {
16+
log.warn( "Deprecated legacy class loader mode : classloader-legacy" );
17+
if ( error ) {
18+
throw new ConfigRuntimeException( "Deprecated config mode, see github fugerit-org/fj-doc repository, issue 65" );
19+
}
20+
};
21+
22+
}

‎fj-doc-mod-fop/src/main/java/org/fugerit/java/doc/mod/fop/PoolUtils.java‎ renamed to ‎fj-doc-mod-fop/src/main/java/org/fugerit/java/doc/mod/fop/utils/PoolUtils.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package org.fugerit.java.doc.mod.fop;
1+
package org.fugerit.java.doc.mod.fop.utils;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.fugerit.java.core.cfg.ConfigException;
55
import org.fugerit.java.core.function.UnsafeSupplier;
6+
import org.fugerit.java.doc.mod.fop.FopConfigWrap;
67

78
import java.util.List;
89

‎fj-doc-mod-fop/src/main/resources/META-INF/native-image/org.fugerit.java/fj-doc-mod-fop/reflect-config.json‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -571,39 +571,6 @@
571571
"name" : "wait",
572572
"parameterTypes" : [ "long", "int" ]
573573
} ]
574-
}, {
575-
"name" : "org.fugerit.java.doc.mod.fop.PoolUtils",
576-
"methods" : [ {
577-
"name" : "equals",
578-
"parameterTypes" : [ "java.lang.Object" ]
579-
}, {
580-
"name" : "getClass",
581-
"parameterTypes" : [ ]
582-
}, {
583-
"name" : "handleFopWrap",
584-
"parameterTypes" : [ "org.fugerit.java.doc.mod.fop.FopConfigWrap", "java.util.List", "int", "int", "org.fugerit.java.core.function.UnsafeSupplier" ]
585-
}, {
586-
"name" : "hashCode",
587-
"parameterTypes" : [ ]
588-
}, {
589-
"name" : "notify",
590-
"parameterTypes" : [ ]
591-
}, {
592-
"name" : "notifyAll",
593-
"parameterTypes" : [ ]
594-
}, {
595-
"name" : "toString",
596-
"parameterTypes" : [ ]
597-
}, {
598-
"name" : "wait",
599-
"parameterTypes" : [ ]
600-
}, {
601-
"name" : "wait",
602-
"parameterTypes" : [ "long" ]
603-
}, {
604-
"name" : "wait",
605-
"parameterTypes" : [ "long", "int" ]
606-
} ]
607574
}, {
608575
"name" : "org.fugerit.java.doc.mod.fop.config.ClassLoaderResourceResolverWrapper",
609576
"methods" : [ {

‎fj-doc-mod-fop/src/test/java/test/org/fugerit/java/doc/mod/fop/TestConfigUtils.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package test.org.fugerit.java.doc.mod.fop;
2+
3+
import org.fugerit.java.core.cfg.ConfigRuntimeException;
4+
import org.fugerit.java.doc.mod.fop.utils.ConfigUtils;
5+
import org.junit.jupiter.api.Assertions;
6+
import org.junit.jupiter.api.Test;
7+
8+
class TestConfigUtils {
9+
10+
@Test
11+
void testLegacyClassLoaderModeConfigHandlerError() {
12+
Assertions.assertThrows(ConfigRuntimeException.class, () -> ConfigUtils.LEGACY_CLASS_LOADER_MODE_CONFIG_HANDLER.accept( Boolean.TRUE ) );
13+
}
14+
15+
@Test
16+
void testLegacyClassLoaderModeConfigHandlerWarning() {
17+
boolean ok = Boolean.TRUE;
18+
ConfigUtils.LEGACY_CLASS_LOADER_MODE_CONFIG_HANDLER.accept( Boolean.FALSE );
19+
Assertions.assertTrue( ok );
20+
}
21+
22+
}

‎fj-doc-mod-fop/src/test/java/test/org/fugerit/java/doc/mod/fop/TestPdfFopTypePooledHandler.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.fugerit.java.core.cfg.ConfigException;
5-
import org.fugerit.java.core.cfg.ConfigRuntimeException;
6-
import org.fugerit.java.core.function.SafeFunction;
75
import org.fugerit.java.core.function.UnsafeSupplier;
86
import org.fugerit.java.core.lang.helpers.ClassHelper;
97
import org.fugerit.java.core.xml.XMLException;
108
import org.fugerit.java.core.xml.dom.DOMIO;
119
import org.fugerit.java.doc.base.config.DocInput;
1210
import org.fugerit.java.doc.base.config.DocOutput;
1311
import org.fugerit.java.doc.mod.fop.*;
12+
import org.fugerit.java.doc.mod.fop.utils.PoolUtils;
1413
import org.junit.jupiter.api.Assertions;
1514
import org.junit.jupiter.api.Test;
1615
import org.w3c.dom.Element;

0 commit comments

Comments
 (0)