Fixed format converter lookup

Author: car031

logicaldoc-core/src/main/java/com/logicaldoc/core/conversion/FormatConverterManager.java

@@ -448,17 +448,18 @@ public FormatConverter getConverter(String inFileName, String outFileName) {
 		if (formatConverters == null || formatConverters.isEmpty())
 			log.warn("No format converter for file {}", inFileName);
 
-		// Get the first available converter
-		FormatConverter converter = formatConverters != null ? formatConverters.get(0) : null;
+		// Get the first available and enabled converter
+		FormatConverter converter = formatConverters != null
+				? formatConverters.stream().filter(c -> c.isEnabled()).findFirst().orElse(null)
+				: null;
 
-		// Check if a special binding is configured
+		// Check if a special binding is configured and points to an enabled
+		// converter
 		String currentConverter = config.getProperty("converter." + inOutkey);
 		if (StringUtils.isNotEmpty(currentConverter) && formatConverters != null)
-			for (FormatConverter formatConverter : formatConverters) {
-				if (formatConverter.getClass().getName().equals(currentConverter)) {
-					converter = formatConverter;
-				}
-			}
+			formatConverters.stream()
+					.filter(conv -> conv.getClass().getName().equals(currentConverter) && conv.isEnabled()).findFirst()
+					.orElse(null);
 
 		if (converter != null)
 			converter.loadParameters();

logicaldoc-util/src/main/java/com/logicaldoc/util/Context.java

@@ -102,9 +102,14 @@ public Object getBean(String id) {
 	 * @return true if the bean is available
 	 */
 	public boolean containsBean(String id) {
-		// If not found with give ID try to lowercase the first char
-		return applicationContext.containsBean(id)
-				|| applicationContext.containsBean(Character.toLowerCase(id.charAt(0)) + id.substring(1));
+		try {
+			// If not found with give ID try to lowercase the first char
+			return applicationContext.containsBean(id)
+					|| applicationContext.containsBean(Character.toLowerCase(id.charAt(0)) + id.substring(1));
+		} catch (IllegalStateException ise) {
+			// the application context was not already initialized
+			return false;
+		}
 	}
 
 	/**

logicaldoc-util/src/main/java/com/logicaldoc/util/time/TimeDiff.java

@@ -20,8 +20,8 @@ private TimeDiff() {
 	 * 
 	 * @param d1 Date one
 	 * @param d2 Date two
-	 * @param field The field we're interested in: day, hour, minute,
-	 *        second, millisecond
+	 * @param field The field we're interested in: day, hour, minute, second,
+	 *        millisecond
 	 * 
 	 * @return The value of the required field
 	 */
@@ -101,7 +101,17 @@ public static String printDuration(Date start, Date stop) {
 	 */
 	public static String printDuration(long diffMillis) {
 		Duration duration = Duration.of(diffMillis, ChronoUnit.MILLIS);
+		return printDuration(duration);
+	}
 
+	/**
+	 * Prints the duration in the format HH:MM:ss.SSS
+	 * 
+	 * @param duration the Duration to printed in human readable format
+	 *
+	 * @return The formatted output
+	 */
+	public static String printDuration(Duration duration) {
 		long millis = duration.toMillis() % 1000;
 		long minutes = duration.toMinutes() % 60;
 		long seconds = (duration.toMillis() / 1000) % 60;

logicaldoc-util/src/test/resources/log4j2.xml

@@ -30,9 +30,14 @@
 		<Logger name="org.hibernate" level="error" additivity="false">
 			<AppenderRef ref="file" />
 		</Logger>
+		<Logger name="org.hibernate" level="error" additivity="false">
+			<AppenderRef ref="file" />
+		</Logger>
+		<Logger name="console" level="error" additivity="false">
+           <Appender-Ref ref="console" />
+        </Logger>
 		<Root level="info">
-			<!-- AppenderRef ref="file" / -->
-			<AppenderRef ref="console" />
+			<AppenderRef ref="file" />
 		</Root>
 	</Loggers>
 </Configuration>

logicaldoc-webapp/src/main/resources/context.properties

@@ -390,8 +390,11 @@ converter.RarConverter.enabled=true
 converter.TarConverter.enabled=true
 converter.SevenZipConverter.enabled=true
 
-converter.HTMLConverter.localUrl=http\://localhost\:8080
 converter.HTMLConverter.enabled=true
+converter.HTMLConverter.fonts=
+converter.HTMLConverter.localUrl=http://localhost:9080
+converter.HTMLConverter.out=-
+converter.HTMLConverter.useLibreOffice=false
 
 converter.P7MConverter.enabled=true
 
@@ -830,6 +833,11 @@ converter.png-pdf=com.logicaldoc.core.conversion.ImageConverter
 converter.bmp-pdf=com.logicaldoc.core.conversion.ImageConverter
 converter.heic-pdf=com.logicaldoc.core.conversion.ImageConverter
 
+converter.html-pdf=com.logicaldoc.conversion.HTMLConverter
+converter.html-png=com.logicaldoc.conversion.HTMLConverter
+converter.htmlx-pdf=com.logicaldoc.conversion.HTMLConverter
+converter.htmlx-png=com.logicaldoc.conversion.HTMLConverter
+
 threadpool.EventCollector.max = 40
 threadpool.EventCollector.type = default
 threadpool.Email.type = default
@@ -839,7 +847,6 @@ threadpool.WebserviceCallCounter.max=20
 threadpool.WebserviceCallCounter.type=default
 threadpool.Note.type = default
 
-
 default.via.enabled=true
 default.via.maxattach=5
 default.via.maxattachsize=1048576