add details when a resource is missing + do not fail on file already …

…exists (#4184)
eclipse-dirigible · Jul 31, 2024 · bc6e3f5 · bc6e3f5
1 parent 5691269
commit bc6e3f5
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 94 deletions.
diff --git a/.../api/api-http/src/test/java/org/eclipse/dirigible/componenets/api/http/HttpSuiteTest.java b/.../api/api-http/src/test/java/org/eclipse/dirigible/componenets/api/http/HttpSuiteTest.java
@@ -9,11 +9,11 @@
  */
 package org.eclipse.dirigible.componenets.api.http;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import java.io.IOException;
-import java.util.Base64;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.dirigible.components.engine.javascript.service.JavascriptService;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -34,11 +34,13 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.filter.OncePerRequestFilter;
-import jakarta.servlet.Filter;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
+import java.util.Base64;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @ExtendWith(SpringExtension.class)
 @SpringBootTest
@@ -154,15 +156,6 @@ public void executeSessionTest() throws Exception {
                .andExpect(status().is2xxSuccessful());
     }
 
-    @Test
-    public void executeRSTest() throws Exception {
-        mockMvc.perform(get("/services/js/http-tests/rs-define-request-handlers.js").header(HttpHeaders.AUTHORIZATION,
-                "Basic " + Base64.getEncoder()
-                                 .encodeToString("user:password".getBytes())))
-               .andDo(print())
-               .andExpect(status().is2xxSuccessful());
-    }
-
     @Configuration
     static class Config {
         @Autowired
@@ -183,6 +176,7 @@ PasswordEncoder passwordEncoder() {
 
     }
 
+
     static class HttpResponseHeaderHandlerFilter extends OncePerRequestFilter {
 
         @Override
@@ -197,7 +191,6 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
     }
 
 
-
     @SpringBootApplication
     static class TestConfiguration {
 

diff --git a/...i/api-http/src/test/resources/META-INF/dirigible/http-tests/rs-define-request-handlers.js b/...i/api-http/src/test/resources/META-INF/dirigible/http-tests/rs-define-request-handlers.js
diff --git a/...urity/src/test/java/org/eclipse/dirigible/componenets/api/security/SecuritySuiteTest.java b/...urity/src/test/java/org/eclipse/dirigible/componenets/api/security/SecuritySuiteTest.java
diff --git a/...ts/api/api-security/src/test/resources/META-INF/dirigible/security-tests/user-get-name.js b/...ts/api/api-security/src/test/resources/META-INF/dirigible/security-tests/user-get-name.js
diff --git a/...re/src/main/java/org/eclipse/dirigible/graalium/core/modules/DirigibleSourceProvider.java b/...re/src/main/java/org/eclipse/dirigible/graalium/core/modules/DirigibleSourceProvider.java
@@ -15,6 +15,8 @@
 import org.eclipse.dirigible.repository.api.IRepository;
 import org.eclipse.dirigible.repository.api.IRepositoryStructure;
 import org.eclipse.dirigible.repository.api.IResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
@@ -31,6 +33,8 @@
 @CalledFromJS
 public class DirigibleSourceProvider implements JavascriptSourceProvider {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(DirigibleSourceProvider.class);
+
     /**
      * Gets the absolute source path.
      *
@@ -184,15 +188,23 @@ protected String createLookupPath(String filePathString) {
      * @return the path
      */
     public Path unpackedToFileSystem(Path pathToUnpack, Path pathToLookup) {
+        String path = "/META-INF/dirigible/" + pathToLookup.toString();
         try (InputStream bundled = this.getClass()
-                                       .getResourceAsStream("/META-INF/dirigible/" + pathToLookup.toString())) {
+                                       .getResourceAsStream(path)) {
             Files.createDirectories(pathToUnpack.getParent());
-            Files.createFile(pathToUnpack);
+            if (!Files.exists(pathToUnpack)) {
+                LOGGER.debug("File [{}] does NOT exist. Will be created", pathToUnpack);
+                Files.createFile(pathToUnpack);
+            } else {
+                LOGGER.debug("File [{}] exists and will NOT be created", pathToUnpack);
+            }
+            if (null == bundled) {
+                throw new IllegalStateException("Failed to load resource from path [" + path + "]");
+            }
             Files.copy(bundled, pathToUnpack, StandardCopyOption.REPLACE_EXISTING);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
+            return pathToUnpack;
+        } catch (IOException ex) {
+            throw new RuntimeException("Failed to unpack [" + pathToLookup + "] to [" + pathToUnpack + "]", ex);
         }
-
-        return pathToUnpack;
     }
 }
diff --git a/...rations/src/test/resources/META-INF/dirigible/modules-tests/src/security/security-test.ts b/...rations/src/test/resources/META-INF/dirigible/modules-tests/src/security/security-test.ts
@@ -0,0 +1,6 @@
+import { user } from "sdk/security";
+import { assertEquals, test } from "sdk/junit"
+
+test('get-user-test', () => {
+	assertEquals('Unexpected user', user.getName(), 'guest');
+});