bitmag-1243-upgrade-java by Knud-Aage · Pull Request #84 · bitrepository/reference

Knud-Aage · 2026-04-28T11:34:04Z

Upgrading to java 21 resolves all vulnerabilities in pom.xml for all modules. There were some changes necessary primarily because of deprecated methods, but there weren't many.

…e were some other minor changes like URL to URI.toURL.

…-java # Conflicts: # bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/BasicAlarmService.java # bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/AuditTrailService.java # bitrepository-core/src/test/java/org/bitrepository/common/settings/SettingsLoaderTest.java # bitrepository-core/src/test/java/org/bitrepository/protocol/fileexchange/LocalFileExchangeTest.java # bitrepository-core/src/test/java/org/bitrepository/protocol/http/HttpFileExchangeTest.java # bitrepository-core/src/test/java/org/bitrepository/protocol/utils/FileExchangeResolverTest.java # bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/ChecksumStorageModel.java

ole-v-v · 2026-04-30T12:00:20Z

            messageBus.close();
            // TODO Kill any lingering timer threads
-        } catch (JMSException e) {
+        } catch (jakarta.jms.JMSException e) {


Perhaps nit-picking, for my part I would prefer an import over using the fully qualified name here.

ole-v-v · 2026-04-30T12:25:57Z

+            URI baseURI = new URI(settings.getProtocolType().value(), null, settings.getServerName(),
+                    settings.getPort().intValue(), path, null, null);
+            // Then append the manually encoded filename. toASCIIString() ensures we don't double-encode.
+            return baseURI.resolve(encodedFilename).toURL();


As far as I have been able to tell, resolve() throws away the path and replaces it with the encoded filename that we pass. If this is correct, we will have to concatenate path and file name manually as in the old code.

Kept the replacement and avoided the resolve

ole-v-v · 2026-04-30T13:19:51Z

+        // However, it does NOT encode characters like '+' if they are part of the path segment, as they are technically allowed.
+        // But the existing tests and many WebDAV servers expect '+' to be encoded as %2B in the filename.
+        // Therefore, we manually encode the filename and then construct the full URI.
+        String encodedFilename = URLEncoder.encode(filename, StandardCharsets.UTF_8).replace("+", "%20");


It seems to me that .replace("+", "%20") is superfluous? Encoding a space a + is very standard, so WebDAV servers should expect it that way? Also I didn’t find any failing test when I left it out?

I can confirm that the URI#URI(String, String, String, int, String, String, String) constructor keeps a + in the path unchanged.

Deleted the lines

ole-v-v · 2026-04-30T13:34:34Z

 import org.bitrepository.bitrepositorymessages.Message;
 import org.bitrepository.protocol.MessageContext;
 import org.bitrepository.protocol.messagebus.MessageListener;
-


We might have wanted to keep this empty line since it separate the import of out own classes from those of JUnit.

A stupid intellij reformatiitng rule makes it that way

ole-v-v · 2026-04-30T13:45:18Z

+            String path = getHttpServerPath() + "/" + filename;
+            String scheme = getProtocol().toLowerCase();
+            if (getHttpServerName() == null) {
+                String absolutePath = Paths.get(path).toAbsolutePath().normalize().toString().replace("\\", "/");


If we want or need to take running on a Windows computer into account (which makes sense), shouldn’t we then also use the platform specific path separator when concatenating getHttpServerPath() and filename above? Asked without being sure what the bullet-proof solution is.

Changed to a version that hopefully works on both windows and linux

ole-v-v · 2026-04-30T13:50:58Z


        ResourceHandler resource_handler = new ResourceHandler();
-        resource_handler.setDirectoriesListed(true);
+        resource_handler.setDirAllowed(true);


Why this change? The way I read the docs (without really understanding), these are two different methods, so I had not expected them to be interchangeable??

It is because setDirectoriesListed is deprecated.

ole-v-v · 2026-05-01T07:15:38Z

-        resource_handler.setResourceBase(httpServerDir.getPath());
+        resource_handler.setBaseResource(ResourceFactory.root().newResource(httpServerDir.toPath()));


Same question here, which advantage is this change giving us?

It is because of deprecation

ole-v-v · 2026-05-01T07:33:02Z


-        HandlerList handlers = new HandlerList();
-        handlers.setHandlers(new Handler[] { resource_handler, new DefaultHandler() });
+        Handler.Sequence handlers = new Handler.Sequence(resource_handler, new DefaultHandler());


ole-v-v · 2026-05-01T08:09:15Z

-            URL uploadUrl = new URL(fileAddress);
-            FileExchange fileExchange = FileExchangeResolver.getBasicFileExchangeFromURL(uploadUrl);
-            fileExchange.putFile(is, uploadUrl);
+            final URI uploadUri = URI.create(fileAddress);


Use constructor? (And if so, add any exceptions from it to the catch clause below.)

ole-v-v · 2026-05-01T08:12:27Z

        try {
            File fileToUpload = createAuditTrailFile(message, extractedAuditTrails);
-            URL uploadUrl = new URL(message.getResultAddress());
+            URI uploadUri = new URI(message.getResultAddress());


May convert to URL at once?

ole-v-v · 2026-05-06T13:49:06Z

            output.error("Issue regarding removing file from server: " + e.getMessage());
-        }
-    }
+        }    }


Oops, lines inadvertently joined.

ole-v-v · 2026-05-06T13:52:09Z

-                    // Test if URL can actually be opened to exit early
-                    // - otherwise checksum pillars will still receive and store checksum.


Wasn’t the comment fine and helpful?

Knud-Aage added 4 commits April 7, 2026 12:50

Removed jAccept from the test classes

520c50f

Started to get the java version of bitrepository upgraded

3c191ca

Upgraded to java 21 by mostly replacing javax with jakarta. Also ther…

fd3e919

…e were some other minor changes like URL to URI.toURL.

Knud-Aage requested review from Thommelise and ole-v-v April 28, 2026 11:34

Removed unnecessary public keyword

0b65902

ole-v-v reviewed Apr 30, 2026

View reviewed changes

Comment thread bitrepository-client/src/main/java/org/bitrepository/commandline/CommandLineClient.java Outdated

ole-v-v reviewed Apr 30, 2026

View reviewed changes

Comment thread bitrepository-client/src/main/java/org/bitrepository/commandline/CommandLineClient.java Outdated

ole-v-v reviewed Apr 30, 2026

View reviewed changes

Comment thread ...tory-core/src/test/java/org/bitrepository/protocol/fileexchange/HttpServerConfiguration.java Outdated

ole-v-v reviewed Apr 30, 2026

View reviewed changes

ole-v-v reviewed May 1, 2026

View reviewed changes

Comment thread ...pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetChecksumsRequestHandler.java Outdated

ole-v-v reviewed May 1, 2026

View reviewed changes

Knud-Aage added 3 commits May 3, 2026 19:52

Changes due to review of PR

0ede7ea

Primarily made URL changes due to review of PR

3c90592

Changes due to review of PR

f401bbe

Knud-Aage requested a review from Asger-KB May 7, 2026 09:31

ole-v-v reviewed May 7, 2026

View reviewed changes

		resource_handler.setResourceBase(httpServerDir.getPath());
		resource_handler.setBaseResource(ResourceFactory.root().newResource(httpServerDir.toPath()));

		// Test if URL can actually be opened to exit early
		// - otherwise checksum pillars will still receive and store checksum.

Conversation

Knud-Aage commented Apr 28, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

ole-v-v Apr 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ole-v-v Apr 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ole-v-v May 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ole-v-v Apr 30, 2026 •

edited

Loading

ole-v-v Apr 30, 2026 •

edited

Loading

ole-v-v May 1, 2026 •

edited

Loading