Fixed bugs with svg and woff2 resources loading

Author: oleksii-unnamed

README.md

@@ -21,7 +21,7 @@ User Interface for GroupDocs.Viewer for Java. API for easily integrating a docum
       <dependency>
         <groupId>com.groupdocs</groupId>
         <artifactId>groupdocs-viewer-ui</artifactId>
-        <version>24.12.1</version>
+        <version>24.12.2</version>
       </dependency>
 
       <dependency>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.groupdocs</groupId>
     <artifactId>groupdocs-viewer-ui</artifactId>
-    <version>24.12.1</version>
+    <version>24.12.2</version>
     <packaging>jar</packaging>
 
     <name>GroupDocs.Viewer for Java User Interface</name>

res/simplified-pom.xml

@@ -6,7 +6,7 @@
     <artifactId>groupdocs-viewer-ui</artifactId>
     <name>GroupDocs.Viewer for Java User Interface</name>
     <url>https://github.com/groupdocs-viewer/GroupDocs.Viewer-for-Java-UI</url>
-    <version>24.12.1</version>
+    <version>24.12.2</version>
     <description>
         GroupDocs.Viewer UI is a rich UI interface that designed to work in conjunction with GroupDocs.Viewer for Java to display most popular file and document formats in a browser.
         To integrate GroupDocs.Viewer UI in your Java project you just need to configure Viewer API and handle requests using specific endpoint handler provided in GroupDocs.Viewer.UI.

samples/groupdocs-viewer-java-ui-spring-boot/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.example</groupId>
 	<artifactId>groupdocs-viewer-java-ui-spring-boot</artifactId>
-	<version>24.12.1</version>
+	<version>24.12.2</version>
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>

src/main/java/com/groupdocs/viewerui/handler/CommonViewerEndpointHandler.java

@@ -543,6 +543,9 @@ private UiResource prepareUiResourceForResponse(String requestUrl) throws IOExce
             }
             resourcePath = Paths.get(uiPath).normalize().relativize(Paths.get(path)).toString();
         }
+        if (resourcePath.contains("\\")) {
+            resourcePath = resourcePath.replaceAll("\\\\", "/");
+        }
 
         if (resourcePath.startsWith("/")) {
             resourcePath = resourcePath.substring(1);

src/main/java/com/groupdocs/viewerui/ui/core/DefaultContentTypeDetector.java

@@ -1,13 +1,16 @@
 package com.groupdocs.viewerui.ui.core;
 
-import java.io.IOException;
-import java.net.FileNameMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.net.URLConnection;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
 public class DefaultContentTypeDetector implements IContentTypeDetector {
+    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultContentTypeDetector.class);
+
     /**
      * Detects the content type of the given resource name.
      *
@@ -16,16 +19,22 @@ public class DefaultContentTypeDetector implements IContentTypeDetector {
      */
     @Override
     public String detect(String resourceName) {
-        FileNameMap fileNameMap = URLConnection.getFileNameMap();
-        String contentType = fileNameMap.getContentTypeFor(resourceName);
+        String contentType = URLConnection.guessContentTypeFromName(resourceName);
         if (contentType == null) {
-            Path path = Paths.get(resourceName);
-            try {
-                contentType = Files.probeContentType(path);
-            } catch (IOException e) {
-                return "application/octet-stream";
+            if (resourceName.endsWith(".woff") || resourceName.endsWith(".woff2")) {
+                contentType = "application/x-font-woff";
+            } else {
+                try {
+                    Path path = Paths.get(resourceName);
+                    contentType = Files.probeContentType(path);
+                } catch (Exception e2) {
+                    LOGGER.trace("Content type for '{}' was not detected, using 'application/octet-stream'", resourceName);
+                }
             }
         }
+        if (contentType == null) {
+            contentType = "application/octet-stream";
+        }
 
         return contentType;
     }

src/main/java/com/groupdocs/viewerui/ui/core/UiEmbeddedResourcesReader.java

@@ -3,6 +3,8 @@
 import com.groupdocs.viewerui.Keys;
 import com.groupdocs.viewerui.exception.ViewerUiException;
 import com.groupdocs.viewerui.ui.core.extensions.StreamExtensions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -11,13 +13,18 @@
 import java.util.Optional;
 
 public class UiEmbeddedResourcesReader implements IUiResourcesReader {
+    private static final Logger LOGGER = LoggerFactory.getLogger(UiEmbeddedResourcesReader.class);
 
     private static final String BASIC_RESOURCE_PATH = "com/groupdocs/viewerui";
     private List<UiResource> _cachedUiResources = null;
     private IContentTypeDetector _contentTypeDetector;
 
     @Override
     public UiResource getUiResource(String resourceName) throws IOException {
+        if (resourceName.contains("\\")) {
+            LOGGER.error("Resource name is not valid (contains '\\' character): {}", resourceName);
+            throw new ViewerUiException("Resource name is not valid (contains '\\' character): " + resourceName);
+        }
         if (_cachedUiResources == null) {
             _cachedUiResources = new ArrayList<>();
             final UiResource uiResource = loadAndAddUiResource(getClass().getClassLoader(), resourceName, getContentTypeDetector());
@@ -39,6 +46,7 @@ private static UiResource loadAndAddUiResource(ClassLoader classLoader, String r
         try (final InputStream resourceAsStream = classLoader
                 .getResourceAsStream(BASIC_RESOURCE_PATH + "/" + resourceName)) {
             if (resourceAsStream == null) {
+                LOGGER.error("Failed loading UI resource (not found): {}", BASIC_RESOURCE_PATH + "/" + resourceName);
                 throw new ViewerUiException(
                         "Resource with name '" + Keys.GROUPDOCSVIEWERUI_MAIN_UI_RESOURCE + "' was not found");
             }