Web-Client SNAPSHOT bump

Cleanup resources property

Author: namedgraph

pom.xml

@@ -140,13 +140,13 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>client</artifactId>
-            <version>4.2.4</version>
+            <version>4.2.5-SNAPSHOT</version>
             <classifier>classes</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>client</artifactId>
-            <version>4.2.4</version>
+            <version>4.2.5-SNAPSHOT</version>
             <type>war</type>
         </dependency>
         <!-- required by jsonld-java - version same as Jersey's HTTP Client -->

src/main/java/com/atomgraph/linkeddatahub/Application.java

@@ -192,6 +192,7 @@
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.client.ClientBuilder;
 import jakarta.ws.rs.client.ClientRequestFilter;
+import java.util.concurrent.ConcurrentHashMap;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.stream.StreamSource;
 import net.jodah.expiringmap.ExpiringMap;
@@ -280,7 +281,7 @@ public class Application extends ResourceConfig
     private final List<Locale> supportedLanguages;
     private final ExpiringMap<URI, Model> webIDmodelCache = ExpiringMap.builder().expiration(1, TimeUnit.DAYS).build(); // TO-DO: config for the expiration period?
     private final ExpiringMap<String, Model> oidcModelCache = ExpiringMap.builder().variableExpiration().build();
-    private final Map<URI, XsltExecutable> xsltExecutableCache = new HashMap<>();
+    private final Map<URI, XsltExecutable> xsltExecutableCache = new ConcurrentHashMap<>();
     private final MessageDigest messageDigest;
     private final boolean enableWebIDSignUp;
     private final String oidcRefreshTokensPropertiesPath;
@@ -636,10 +637,16 @@ public Application(final ServletConfig servletConfig, final MediaTypes mediaType
         try
         {
             keyStore = KeyStore.getInstance("PKCS12");
-            keyStore.load(new FileInputStream(new java.io.File(new URI(clientKeyStoreURIString))), clientKeyStorePassword.toCharArray());
+            try (FileInputStream keyStoreInputStream = new FileInputStream(new java.io.File(new URI(clientKeyStoreURIString))))
+            {
+                keyStore.load(keyStoreInputStream, clientKeyStorePassword.toCharArray());
+            }
 
             trustStore = KeyStore.getInstance("JKS");
-            trustStore.load(new FileInputStream(new java.io.File(new URI(clientTrustStoreURIString))), clientTrustStorePassword.toCharArray());
+            try (FileInputStream trustStoreInputStream = new FileInputStream(new java.io.File(new URI(clientTrustStoreURIString))))
+            {
+                trustStore.load(trustStoreInputStream, clientTrustStorePassword.toCharArray());
+            }
 
             client = getClient(keyStore, clientKeyStorePassword, trustStore, maxConnPerRoute, maxTotalConn, null, false);
             externalClient = getClient(keyStore, clientKeyStorePassword, trustStore, maxConnPerRoute, maxTotalConn, null, false);

src/main/java/com/atomgraph/linkeddatahub/resource/Generate.java

@@ -145,11 +145,13 @@ public Response post(Model model, @QueryParam("default") @DefaultValue("false")
                             service)));
                     new Skolemizer(containerGraphURI.toString()).apply(containerModel);
 
-                    Response containerResponse = super.post(containerModel, false, containerGraphURI);
-                    if (containerResponse.getStatus() != Response.Status.CREATED.getStatusCode())
+                    try (Response containerResponse = super.post(containerModel, false, containerGraphURI))
                     {
-                        if (log.isErrorEnabled()) log.error("Cannot create container");
-                        throw new InternalServerErrorException("Cannot create container");
+                        if (containerResponse.getStatus() != Response.Status.CREATED.getStatusCode())
+                        {
+                            if (log.isErrorEnabled()) log.error("Cannot create container");
+                            throw new InternalServerErrorException("Cannot create container");
+                        }
                     }
                 }
             }

src/main/java/com/atomgraph/linkeddatahub/resource/Graph.java

@@ -686,8 +686,11 @@ public File writeFile(Resource resource, FormDataBodyPart bodyPart)
         {
             dis.getMessageDigest().reset();
             File tempFile = File.createTempFile("tmp", null);
-            FileChannel destination = new FileOutputStream(tempFile).getChannel();
-            destination.transferFrom(Channels.newChannel(dis), 0, 104857600);
+            try (FileOutputStream fos = new FileOutputStream(tempFile);
+                 FileChannel destination = fos.getChannel())
+            {
+                destination.transferFrom(Channels.newChannel(dis), 0, 104857600);
+            }
             String sha1Hash = Hex.encodeHexString(dis.getMessageDigest().digest()); // BigInteger seems to have an issue when the leading hex digit is 0
             if (log.isDebugEnabled()) log.debug("Wrote file: {} with SHA1 hash: {}", tempFile, sha1Hash);
 
@@ -699,7 +702,10 @@ public File writeFile(Resource resource, FormDataBodyPart bodyPart)
             if (log.isDebugEnabled()) log.debug("Renaming resource: {} to SHA1 based URI: {}", resource, sha1Uri);
             ResourceUtils.renameResource(resource, sha1Uri.toString());
 
-            return writeFile(sha1Uri, getUriInfo().getBaseUri(), new FileInputStream(tempFile));
+            try (FileInputStream fis = new FileInputStream(tempFile))
+            {
+                return writeFile(sha1Uri, getUriInfo().getBaseUri(), fis);
+            }
         }
         catch (IOException ex)
         {

src/main/java/com/atomgraph/linkeddatahub/writer/function/SendHTTPRequest.java

@@ -114,7 +114,11 @@ public XdmValue call(XdmValue[] arguments) throws SaxonApiException
                         if (log.isDebugEnabled()) log.debug("Could not execute ldh:send-request function. href: '{}' method: '{}'", href, method);
                         throw new IOException("Could not execute ldh:send-request function. href: '" + href + "' method: '" + method + "'");
                     }
-                    if (cr.hasEntity()) return getProcessor().newDocumentBuilder().build(new StreamSource(cr.readEntity(InputStream.class)));
+                    if (cr.hasEntity())
+                        try (InputStream is = cr.readEntity(InputStream.class))
+                        {
+                            return getProcessor().newDocumentBuilder().build(new StreamSource(is));
+                        }
                 }
             else
             {
@@ -127,7 +131,12 @@ public XdmValue call(XdmValue[] arguments) throws SaxonApiException
                         if (log.isDebugEnabled()) log.debug("Could not execute ldh:send-request function. href: '{}' method: '{}'", href, method);
                         throw new IOException("Could not execute ldh:send-request function. href: '" + href + "' method: '" + method + "'");
                     }
-                    if (cr.hasEntity()) return getProcessor().newDocumentBuilder().build(new StreamSource(cr.readEntity(InputStream.class)));
+                    
+                    if (cr.hasEntity())
+                        try (InputStream is = cr.readEntity(InputStream.class))
+                        {
+                            return getProcessor().newDocumentBuilder().build(new StreamSource(is));
+                        }
                 }
             }