From b3379bf299557f2260880970442224e7d9fd1735 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Sat, 9 May 2026 11:28:54 -0700 Subject: [PATCH] Auto-refactor lint cleanup SequencedCollections: get(0) -> getFirst(), etc Add missing @NotNull/@Nullable Simplify test assertions Map operation simplification Remove redundant throws clause Switch to parameterized log message C-style array -> Java-style array declaration Delete overridden methods identical to parent Switch statement -> enhanced switch statement Remove redundant imports --- .../src/org/labkey/bootstrap/LabKeyBootstrapClassLoader.java | 2 +- server/bootstrap/src/org/labkey/bootstrap/ModuleArchive.java | 4 ++-- .../embedded/src/org/labkey/embedded/LabKeyDeleteAction.java | 4 ++-- .../src/org/labkey/embedded/LabKeySpringBootClassLoader.java | 4 ++-- .../labkey/embedded/LabKeyTomcatServletWebServerFactory.java | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/server/bootstrap/src/org/labkey/bootstrap/LabKeyBootstrapClassLoader.java b/server/bootstrap/src/org/labkey/bootstrap/LabKeyBootstrapClassLoader.java index fee0f876bc..dba63cc5a4 100644 --- a/server/bootstrap/src/org/labkey/bootstrap/LabKeyBootstrapClassLoader.java +++ b/server/bootstrap/src/org/labkey/bootstrap/LabKeyBootstrapClassLoader.java @@ -377,7 +377,7 @@ public File getDeletedModulesDirectory() } catch (IOException x) { - _log.info("Could not set hidden attribute on directory: " + deleted.getPath()); + _log.info("Could not set hidden attribute on directory: {}", deleted.getPath()); } } diff --git a/server/bootstrap/src/org/labkey/bootstrap/ModuleArchive.java b/server/bootstrap/src/org/labkey/bootstrap/ModuleArchive.java index b613a1ce51..171f45e075 100644 --- a/server/bootstrap/src/org/labkey/bootstrap/ModuleArchive.java +++ b/server/bootstrap/src/org/labkey/bootstrap/ModuleArchive.java @@ -87,7 +87,7 @@ private String nameFromModuleXML(InputStream is) throws IOException @Override public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { - String parent = elementStack.isEmpty() ? "" : elementStack.get(elementStack.size()-1); + String parent = elementStack.isEmpty() ? "" : elementStack.getLast(); elementStack.add(qName+"#"+attributes.getValue("id")); if (qName.equals("property") && "bean#moduleBean".equals(parent)) { @@ -99,7 +99,7 @@ public void startElement(String uri, String localName, String qName, Attributes @Override public void endElement(String uri, String localName, String qName) throws SAXException { - elementStack.remove(elementStack.size()-1); + elementStack.removeLast(); } }); diff --git a/server/embedded/src/org/labkey/embedded/LabKeyDeleteAction.java b/server/embedded/src/org/labkey/embedded/LabKeyDeleteAction.java index ed2e503b13..ccada2831d 100644 --- a/server/embedded/src/org/labkey/embedded/LabKeyDeleteAction.java +++ b/server/embedded/src/org/labkey/embedded/LabKeyDeleteAction.java @@ -151,7 +151,7 @@ private List selectFilesToDelete(Path basePath, List 0) { Path target = logToRetain.getPath().getParent().resolve("labkey-errors-" + DATE_FORMAT.format(new Date()) + ".log"); - LOGGER.info("Retaining labkey-errors.log file before it gets deleted by rotation. Copying to " + target); + LOGGER.info("Retaining labkey-errors.log file before it gets deleted by rotation. Copying to {}", target); try { @@ -161,7 +161,7 @@ private List selectFilesToDelete(Path basePath, List loadClass(String name, boolean resolve) throws ClassNotFoundExce ClassLoader parent = getParent(); while (parent != null) { - LOG.debug("Looking for SessionAppending - checking ClassLoader " + parent); + LOG.debug("Looking for SessionAppending - checking ClassLoader {}", parent); if (parent.getClass().getName().equals("jdk.internal.loader.ClassLoaders$AppClassLoader") || parent.getClass().getName().equals("org.springframework.boot.loader.launch.LaunchedClassLoader")) { diff --git a/server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java b/server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java index 0c5f870704..4fdb3c53b6 100644 --- a/server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java +++ b/server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java @@ -394,12 +394,12 @@ private String getPropValue(Map propValues, Integer resourceKey { if (propValues == null) { - LOG.debug(String.format("%1$s property was not provided, using default", propName)); + LOG.debug("{} property was not provided, using default", propName); return defaultValue; } if (!propValues.containsKey(resourceKey)) - LOG.debug(String.format("%1$s property was not provided for resource [%2$s], using default [%3$s]", propName, resourceKey, defaultValue)); + LOG.debug("{} property was not provided for resource [{}], using default [{}]", propName, resourceKey, defaultValue); String val = propValues.getOrDefault(resourceKey, defaultValue); return val != null && !val.isBlank() ? val.trim() : defaultValue;