Skip to content

Auto-refactor assorted Java lint #2989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
labkey-jeckels wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Auto-refactor assorted Java lint #2989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99314b9
Auto-refactor lint cleanup
labkey-jeckels May 9, 2026
63744c4
Fix mangled map simplification
labkey-jeckels May 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions modules/crawlerTest/src/org/labkey/crawlertest/CrawlerTestModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package org.labkey.crawlertest;

import org.jetbrains.annotations.NotNull;
import org.labkey.api.data.Container;
import org.labkey.api.module.CodeOnlyModule;
import org.labkey.api.module.ModuleContext;
import org.labkey.api.view.WebPartFactory;
Expand Down Expand Up @@ -52,11 +51,4 @@ protected void init()
public void doStartup(ModuleContext moduleContext)
{
}

@Override
@NotNull
public Collection<String> getSummary(Container c)
{
return Collections.emptyList();
}
}
50 changes: 18 additions & 32 deletions modules/dumbster/src/com/dumbster/smtp/SmtpActionType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,37 +104,23 @@ public boolean isStateless() {
* @return a String
*/
public String toString() {
switch(value) {
case CONNECT_BYTE:
return "Connect";
case EHLO_BYTE:
return "EHLO";
case MAIL_BYTE:
return "MAIL";
case RCPT_BYTE:
return "RCPT";
case DATA_BYTE:
return "DATA";
case DATA_END_BYTE:
return ".";
case QUIT_BYTE:
return "QUIT";
case RSET_BYTE:
return "RSET";
case VRFY_BYTE:
return "VRFY";
case EXPN_BYTE:
return "EXPN";
case HELP_BYTE:
return "HELP";
case NOOP_BYTE:
return "NOOP";
case UNREC_BYTE:
return "Unrecognized command / data";
case BLANK_LINE_BYTE:
return "Blank line";
default:
return "Unknown";
}
return switch (value)
{
case CONNECT_BYTE -> "Connect";
case EHLO_BYTE -> "EHLO";
case MAIL_BYTE -> "MAIL";
case RCPT_BYTE -> "RCPT";
case DATA_BYTE -> "DATA";
case DATA_END_BYTE -> ".";
case QUIT_BYTE -> "QUIT";
case RSET_BYTE -> "RSET";
case VRFY_BYTE -> "VRFY";
case EXPN_BYTE -> "EXPN";
case HELP_BYTE -> "HELP";
case NOOP_BYTE -> "NOOP";
case UNREC_BYTE -> "Unrecognized command / data";
case BLANK_LINE_BYTE -> "Blank line";
default -> "Unknown";
};
}
}
16 changes: 4 additions & 12 deletions modules/dumbster/src/com/dumbster/smtp/SmtpMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,8 @@ public String getBody() {
* @param value header value
*/
private void addHeader(String name, String value) {
List<String> valueList = headers.get(name);
if (valueList == null) {
valueList = new ArrayList<>(1);
headers.put(name, valueList);
}
valueList.add(value);
List<String> valueList = headers.computeIfAbsent(name, _ -> new ArrayList<>(1));
valueList.add(value);
}

/**
Expand All @@ -137,12 +133,8 @@ private void addHeader(String name, String value) {
* @param value header value
*/
private void appendHeader(String name, String value) {
List<String> valueList = headers.get(name);
if (valueList == null) {
valueList = new ArrayList<>(1);
headers.put(name, valueList);
}
valueList.set(0, valueList.get(0) + value);
List<String> valueList = headers.computeIfAbsent(name, k -> new ArrayList<>(1));
valueList.set(0, valueList.getFirst() + value);
}

/**
Expand Down
29 changes: 11 additions & 18 deletions modules/dumbster/src/com/dumbster/smtp/SmtpState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,16 @@ private SmtpState(byte value) {
* @return a String
*/
public String toString() {
switch(value) {
case CONNECT_BYTE:
return "CONNECT";
case GREET_BYTE:
return "GREET";
case MAIL_BYTE:
return "MAIL";
case RCPT_BYTE:
return "RCPT";
case DATA_HEADER_BYTE:
return "DATA_HDR";
case DATA_BODY_BYTE:
return "DATA_BODY";
case QUIT_BYTE:
return "QUIT";
default:
return "Unknown";
}
return switch (value)
{
case CONNECT_BYTE -> "CONNECT";
case GREET_BYTE -> "GREET";
case MAIL_BYTE -> "MAIL";
case RCPT_BYTE -> "RCPT";
case DATA_HEADER_BYTE -> "DATA_HDR";
case DATA_BODY_BYTE -> "DATA_BODY";
case QUIT_BYTE -> "QUIT";
default -> "Unknown";
};
}
}
17 changes: 6 additions & 11 deletions modules/dumbster/src/org/labkey/dumbster/model/DumbsterManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,14 @@ public boolean start()
props.setProperty("mail.smtp.port", Integer.toString(port));
Session session = Session.getInstance(props);

_log.info("Switching MailHelper to use port " + port);
_log.info("Switching MailHelper to use port {}", port);
MailHelper.setSmtpSession(session);

_log.info("Connecting mail recorder to port " + port);
_log.info("Connecting mail recorder to port {}", port);
_server = SimpleSmtpServer.start(port);
if (_server.isStopped())
{
_log.error("Failed to connect mail recorder. Port " + port + " may be in use.");
_log.error("Failed to connect mail recorder. Port {} may be in use.", port);
_server = null;
return false;
}
Expand All @@ -123,7 +123,7 @@ public void stop()
// viewing until the next call to start() overwrites.
if (_server != null)
{
_log.info("Reverting MailHelper to " + AppProps.getInstance().getWebappConfigurationFilename() + " configuration");
_log.info("Reverting MailHelper to {} configuration", AppProps.getInstance().getWebappConfigurationFilename());
MailHelper.setSmtpSession(null);

_server.stop();
Expand All @@ -138,11 +138,6 @@ public String getName()
return "Dumbster manager";
}

@Override
public void shutdownPre()
{
}

@Override
public void shutdownStarted()
{
Expand All @@ -165,10 +160,10 @@ public SmtpMessage[] getMessages()
// Dumbster returns iterator on list which requires synchronization.
synchronized (_server)
{
Iterator it = _server.getReceivedEmail();
Iterator<SmtpMessage> it = _server.getReceivedEmail();
while (it.hasNext())
{
messageList.add((SmtpMessage) it.next());
messageList.add(it.next());
}
}

Expand Down
9 changes: 0 additions & 9 deletions modules/editableModule/src/org/labkey/editablemodule/EditableModuleModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
package org.labkey.editablemodule;

import org.jetbrains.annotations.NotNull;
import org.labkey.api.data.Container;
import org.labkey.api.data.ContainerManager;
import org.labkey.api.module.CodeOnlyModule;
import org.labkey.api.module.ModuleContext;
import org.labkey.api.view.WebPartFactory;
Expand Down Expand Up @@ -53,11 +51,4 @@ protected void init()
public void doStartup(ModuleContext moduleContext)
{
}

@Override
@NotNull
public Collection<String> getSummary(Container c)
{
return Collections.emptyList();
}
}
3 changes: 2 additions & 1 deletion src/org/labkey/junit/rules/TestWatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.List;

import org.jetbrains.annotations.NotNull;
import org.junit.AssumptionViolatedException;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
Expand All @@ -16,7 +17,7 @@
public abstract class TestWatcher implements TestRule
{
@Override
public Statement apply(final Statement base, final Description description) {
public @NotNull Statement apply(final @NotNull Statement base, final @NotNull Description description) {
return new Statement() {
@Override
public void evaluate() throws Throwable {
Expand Down
6 changes: 3 additions & 3 deletions src/org/labkey/remoteapi/security/BulkUpdateGroupCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,17 @@ public BulkUpdateGroupCommand(@NotNull Integer groupId)
_groupId = groupId;
}

public void setGroupId(Integer groupId)
public void setGroupId(@Nullable Integer groupId)
{
_groupId = groupId;
}

public void setGroupName(String groupName)
public void setGroupName(@Nullable String groupName)
{
_groupName = groupName;
}

public void setMembers(List<Map<String, Object>> members)
public void setMembers(@Nullable List<Map<String, Object>> members)
{
_members = members;
}
Expand Down
15 changes: 8 additions & 7 deletions src/org/labkey/serverapi/collections/ArrayListMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package org.labkey.serverapi.collections;

import org.apache.commons.lang3.tuple.Pair;
import org.jetbrains.annotations.NotNull;
import org.junit.Assert;
import org.junit.Test;

Expand Down Expand Up @@ -107,7 +108,7 @@ public Integer remove(Object o)
}

@Override
public void putAll(Map<? extends K, ? extends Integer> map)
public void putAll(@NotNull Map<? extends K, ? extends Integer> map)
{
_map.putAll(map);
}
Expand All @@ -119,19 +120,19 @@ public void clear()
}

@Override
public Set<K> keySet()
public @NotNull Set<K> keySet()
{
return _map.keySet();
}

@Override
public Collection<Integer> values()
public @NotNull Collection<Integer> values()
{
return _map.values();
}

@Override
public Set<Entry<K, Integer>> entrySet()
public @NotNull Set<Entry<K, Integer>> entrySet()
{
return _map.entrySet();
}
Expand Down Expand Up @@ -238,7 +239,7 @@ public boolean containsValue(Object value)


@Override
public Set<Entry<K, V>> entrySet()
public @NotNull Set<Entry<K, V>> entrySet()
{
Set<Entry<K, V>> r = new HashSet<>(_row.size() * 2);
for (Entry<K, Integer> e : _findMap.entrySet())
Expand All @@ -255,7 +256,7 @@ public Set<Entry<K, V>> entrySet()


@Override
public Set<K> keySet()
public @NotNull Set<K> keySet()
{
Set<K> ret = _findMap.keySet();
assert null != (ret = Collections.unmodifiableSet(ret));
Expand Down Expand Up @@ -288,7 +289,7 @@ public int size()


@Override
public Collection<V> values()
public @NotNull Collection<V> values()
{
ArrayList<V> a = new ArrayList<>(size());
for (Object o : _row)
Expand Down
3 changes: 2 additions & 1 deletion src/org/labkey/serverapi/reader/DataLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.apache.commons.beanutils.Converter;
import org.apache.commons.collections4.IteratorUtils;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.labkey.remoteapi.collections.CaseInsensitiveHashMap;
import org.labkey.serverapi.collections.ArrayListMap;
import org.labkey.serverapi.collections.RowMapFactory;
Expand Down Expand Up @@ -285,7 +286,7 @@ public void setScanAheadLineCount(int count)
* Returns an iterator over the data
*/
@Override
public abstract CloseableIterator<Map<String, Object>> iterator();
public abstract @NotNull CloseableIterator<Map<String, Object>> iterator();


/**
Expand Down
12 changes: 6 additions & 6 deletions src/org/labkey/test/BaseWebDriverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hc.core5.http.HttpStatus;
import org.awaitility.Awaitility;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.json.JSONObject;
import org.jetbrains.annotations.NotNull;
import org.junit.Assume;
import org.junit.AssumptionViolatedException;
import org.junit.ClassRule;
Expand Down Expand Up @@ -298,7 +298,7 @@ private static Class<? extends BaseWebDriverTest> getCurrentTestClass()
}

@Override
public WebDriver getWrappedDriver()
public @NotNull WebDriver getWrappedDriver()
{
return SingletonWebDriver.getInstance().getWebDriver();
}
Expand Down Expand Up @@ -566,7 +566,7 @@ Statement createFailOnTimeoutStatement(Statement statement, Class<?> testClass)
}

@Override
public Statement apply(Statement base, Description description)
public @NotNull Statement apply(Statement base, Description description)
{
try
{
Expand Down Expand Up @@ -936,7 +936,7 @@ private void handleFailure(Throwable error, @LoggedParam String testName)
if (error instanceof MultipleFailureException mfe)
{
// Only "handle" primary test failure. Just log failures thrown during @After or @AfterClass methods.
error = mfe.getFailures().get(0);
error = mfe.getFailures().getFirst();
for (int i = 1; i < mfe.getFailures().size(); i++)
{
TestLogger.error("Secondary error after test:", mfe.getFailures().get(i));
Expand Down Expand Up @@ -2465,7 +2465,7 @@ public void startImport()

while (!_pipelineRoot.equals(testDir))
{
dirNames.add(0, testDir.getName());
dirNames.addFirst(testDir.getName());
testDir = testDir.getParentFile();
}

Expand Down Expand Up @@ -2823,7 +2823,7 @@ protected void executeAndVerifyScript(String script, @Nullable String... altErro
if (exception instanceof String exceptionStr)
{
if (errors.size() == 1)
checker().verifyEquals("Unexpected error message", errors.get(0), exception);
checker().verifyEquals("Unexpected error message", errors.getFirst(), exception);
else
{
for (String error : altErrors)
Expand Down
Loading
Loading