Skip to content

Commit e0dfcec

Browse files
DariaBodDariaBod
committed
Merge branch 'develop' into fb_fixFlakyLimsTests
2 parents 48174fe + 40f713a commit e0dfcec

181 files changed

Lines changed: 584 additions & 805 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎modules/crawlerTest/src/org/labkey/crawlertest/CrawlerTestModule.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package org.labkey.crawlertest;
1818

1919
import org.jetbrains.annotations.NotNull;
20-
import org.labkey.api.data.Container;
2120
import org.labkey.api.module.CodeOnlyModule;
2221
import org.labkey.api.module.ModuleContext;
2322
import org.labkey.api.view.WebPartFactory;
@@ -52,11 +51,4 @@ protected void init()
5251
public void doStartup(ModuleContext moduleContext)
5352
{
5453
}
55-
56-
@Override
57-
@NotNull
58-
public Collection<String> getSummary(Container c)
59-
{
60-
return Collections.emptyList();
61-
}
6254
}

‎modules/dumbster/src/com/dumbster/smtp/SmtpActionType.java‎

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -104,37 +104,23 @@ public boolean isStateless() {
104104
* @return a String
105105
*/
106106
public String toString() {
107-
switch(value) {
108-
case CONNECT_BYTE:
109-
return "Connect";
110-
case EHLO_BYTE:
111-
return "EHLO";
112-
case MAIL_BYTE:
113-
return "MAIL";
114-
case RCPT_BYTE:
115-
return "RCPT";
116-
case DATA_BYTE:
117-
return "DATA";
118-
case DATA_END_BYTE:
119-
return ".";
120-
case QUIT_BYTE:
121-
return "QUIT";
122-
case RSET_BYTE:
123-
return "RSET";
124-
case VRFY_BYTE:
125-
return "VRFY";
126-
case EXPN_BYTE:
127-
return "EXPN";
128-
case HELP_BYTE:
129-
return "HELP";
130-
case NOOP_BYTE:
131-
return "NOOP";
132-
case UNREC_BYTE:
133-
return "Unrecognized command / data";
134-
case BLANK_LINE_BYTE:
135-
return "Blank line";
136-
default:
137-
return "Unknown";
138-
}
107+
return switch (value)
108+
{
109+
case CONNECT_BYTE -> "Connect";
110+
case EHLO_BYTE -> "EHLO";
111+
case MAIL_BYTE -> "MAIL";
112+
case RCPT_BYTE -> "RCPT";
113+
case DATA_BYTE -> "DATA";
114+
case DATA_END_BYTE -> ".";
115+
case QUIT_BYTE -> "QUIT";
116+
case RSET_BYTE -> "RSET";
117+
case VRFY_BYTE -> "VRFY";
118+
case EXPN_BYTE -> "EXPN";
119+
case HELP_BYTE -> "HELP";
120+
case NOOP_BYTE -> "NOOP";
121+
case UNREC_BYTE -> "Unrecognized command / data";
122+
case BLANK_LINE_BYTE -> "Blank line";
123+
default -> "Unknown";
124+
};
139125
}
140126
}

‎modules/dumbster/src/com/dumbster/smtp/SmtpMessage.java‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,8 @@ public String getBody() {
123123
* @param value header value
124124
*/
125125
private void addHeader(String name, String value) {
126-
List<String> valueList = headers.get(name);
127-
if (valueList == null) {
128-
valueList = new ArrayList<>(1);
129-
headers.put(name, valueList);
130-
}
131-
valueList.add(value);
126+
List<String> valueList = headers.computeIfAbsent(name, _ -> new ArrayList<>(1));
127+
valueList.add(value);
132128
}
133129

134130
/**
@@ -137,12 +133,8 @@ private void addHeader(String name, String value) {
137133
* @param value header value
138134
*/
139135
private void appendHeader(String name, String value) {
140-
List<String> valueList = headers.get(name);
141-
if (valueList == null) {
142-
valueList = new ArrayList<>(1);
143-
headers.put(name, valueList);
144-
}
145-
valueList.set(0, valueList.get(0) + value);
136+
List<String> valueList = headers.computeIfAbsent(name, k -> new ArrayList<>(1));
137+
valueList.set(0, valueList.getFirst() + value);
146138
}
147139

148140
/**

‎modules/dumbster/src/com/dumbster/smtp/SmtpState.java‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,23 +66,16 @@ private SmtpState(byte value) {
6666
* @return a String
6767
*/
6868
public String toString() {
69-
switch(value) {
70-
case CONNECT_BYTE:
71-
return "CONNECT";
72-
case GREET_BYTE:
73-
return "GREET";
74-
case MAIL_BYTE:
75-
return "MAIL";
76-
case RCPT_BYTE:
77-
return "RCPT";
78-
case DATA_HEADER_BYTE:
79-
return "DATA_HDR";
80-
case DATA_BODY_BYTE:
81-
return "DATA_BODY";
82-
case QUIT_BYTE:
83-
return "QUIT";
84-
default:
85-
return "Unknown";
86-
}
69+
return switch (value)
70+
{
71+
case CONNECT_BYTE -> "CONNECT";
72+
case GREET_BYTE -> "GREET";
73+
case MAIL_BYTE -> "MAIL";
74+
case RCPT_BYTE -> "RCPT";
75+
case DATA_HEADER_BYTE -> "DATA_HDR";
76+
case DATA_BODY_BYTE -> "DATA_BODY";
77+
case QUIT_BYTE -> "QUIT";
78+
default -> "Unknown";
79+
};
8780
}
8881
}

‎modules/dumbster/src/org/labkey/dumbster/model/DumbsterManager.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,14 @@ public boolean start()
102102
props.setProperty("mail.smtp.port", Integer.toString(port));
103103
Session session = Session.getInstance(props);
104104

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

108-
_log.info("Connecting mail recorder to port " + port);
108+
_log.info("Connecting mail recorder to port {}", port);
109109
_server = SimpleSmtpServer.start(port);
110110
if (_server.isStopped())
111111
{
112-
_log.error("Failed to connect mail recorder. Port " + port + " may be in use.");
112+
_log.error("Failed to connect mail recorder. Port {} may be in use.", port);
113113
_server = null;
114114
return false;
115115
}
@@ -123,7 +123,7 @@ public void stop()
123123
// viewing until the next call to start() overwrites.
124124
if (_server != null)
125125
{
126-
_log.info("Reverting MailHelper to " + AppProps.getInstance().getWebappConfigurationFilename() + " configuration");
126+
_log.info("Reverting MailHelper to {} configuration", AppProps.getInstance().getWebappConfigurationFilename());
127127
MailHelper.setSmtpSession(null);
128128

129129
_server.stop();
@@ -138,11 +138,6 @@ public String getName()
138138
return "Dumbster manager";
139139
}
140140

141-
@Override
142-
public void shutdownPre()
143-
{
144-
}
145-
146141
@Override
147142
public void shutdownStarted()
148143
{
@@ -165,10 +160,10 @@ public SmtpMessage[] getMessages()
165160
// Dumbster returns iterator on list which requires synchronization.
166161
synchronized (_server)
167162
{
168-
Iterator it = _server.getReceivedEmail();
163+
Iterator<SmtpMessage> it = _server.getReceivedEmail();
169164
while (it.hasNext())
170165
{
171-
messageList.add((SmtpMessage) it.next());
166+
messageList.add(it.next());
172167
}
173168
}
174169

‎modules/editableModule/src/org/labkey/editablemodule/EditableModuleModule.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
package org.labkey.editablemodule;
1818

1919
import org.jetbrains.annotations.NotNull;
20-
import org.labkey.api.data.Container;
21-
import org.labkey.api.data.ContainerManager;
2220
import org.labkey.api.module.CodeOnlyModule;
2321
import org.labkey.api.module.ModuleContext;
2422
import org.labkey.api.view.WebPartFactory;
@@ -53,11 +51,4 @@ protected void init()
5351
public void doStartup(ModuleContext moduleContext)
5452
{
5553
}
56-
57-
@Override
58-
@NotNull
59-
public Collection<String> getSummary(Container c)
60-
{
61-
return Collections.emptyList();
62-
}
6354
}

‎src/org/labkey/junit/rules/TestWatcher.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.util.ArrayList;
44
import java.util.List;
55

6+
import org.jetbrains.annotations.NotNull;
67
import org.junit.AssumptionViolatedException;
78
import org.junit.rules.TestRule;
89
import org.junit.runner.Description;
@@ -16,7 +17,7 @@
1617
public abstract class TestWatcher implements TestRule
1718
{
1819
@Override
19-
public Statement apply(final Statement base, final Description description) {
20+
public @NotNull Statement apply(final @NotNull Statement base, final @NotNull Description description) {
2021
return new Statement() {
2122
@Override
2223
public void evaluate() throws Throwable {

‎src/org/labkey/remoteapi/security/BulkUpdateGroupCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,17 @@ public BulkUpdateGroupCommand(@NotNull Integer groupId)
5656
_groupId = groupId;
5757
}
5858

59-
public void setGroupId(Integer groupId)
59+
public void setGroupId(@Nullable Integer groupId)
6060
{
6161
_groupId = groupId;
6262
}
6363

64-
public void setGroupName(String groupName)
64+
public void setGroupName(@Nullable String groupName)
6565
{
6666
_groupName = groupName;
6767
}
6868

69-
public void setMembers(List<Map<String, Object>> members)
69+
public void setMembers(@Nullable List<Map<String, Object>> members)
7070
{
7171
_members = members;
7272
}

‎src/org/labkey/serverapi/collections/ArrayListMap.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package org.labkey.serverapi.collections;
1717

1818
import org.apache.commons.lang3.tuple.Pair;
19+
import org.jetbrains.annotations.NotNull;
1920
import org.junit.Assert;
2021
import org.junit.Test;
2122

@@ -107,7 +108,7 @@ public Integer remove(Object o)
107108
}
108109

109110
@Override
110-
public void putAll(Map<? extends K, ? extends Integer> map)
111+
public void putAll(@NotNull Map<? extends K, ? extends Integer> map)
111112
{
112113
_map.putAll(map);
113114
}
@@ -119,19 +120,19 @@ public void clear()
119120
}
120121

121122
@Override
122-
public Set<K> keySet()
123+
public @NotNull Set<K> keySet()
123124
{
124125
return _map.keySet();
125126
}
126127

127128
@Override
128-
public Collection<Integer> values()
129+
public @NotNull Collection<Integer> values()
129130
{
130131
return _map.values();
131132
}
132133

133134
@Override
134-
public Set<Entry<K, Integer>> entrySet()
135+
public @NotNull Set<Entry<K, Integer>> entrySet()
135136
{
136137
return _map.entrySet();
137138
}
@@ -238,7 +239,7 @@ public boolean containsValue(Object value)
238239

239240

240241
@Override
241-
public Set<Entry<K, V>> entrySet()
242+
public @NotNull Set<Entry<K, V>> entrySet()
242243
{
243244
Set<Entry<K, V>> r = new HashSet<>(_row.size() * 2);
244245
for (Entry<K, Integer> e : _findMap.entrySet())
@@ -255,7 +256,7 @@ public Set<Entry<K, V>> entrySet()
255256

256257

257258
@Override
258-
public Set<K> keySet()
259+
public @NotNull Set<K> keySet()
259260
{
260261
Set<K> ret = _findMap.keySet();
261262
assert null != (ret = Collections.unmodifiableSet(ret));
@@ -288,7 +289,7 @@ public int size()
288289

289290

290291
@Override
291-
public Collection<V> values()
292+
public @NotNull Collection<V> values()
292293
{
293294
ArrayList<V> a = new ArrayList<>(size());
294295
for (Object o : _row)

‎src/org/labkey/serverapi/reader/DataLoader.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.apache.commons.beanutils.Converter;
2121
import org.apache.commons.collections4.IteratorUtils;
2222
import org.apache.commons.lang3.StringUtils;
23+
import org.jetbrains.annotations.NotNull;
2324
import org.labkey.remoteapi.collections.CaseInsensitiveHashMap;
2425
import org.labkey.serverapi.collections.ArrayListMap;
2526
import org.labkey.serverapi.collections.RowMapFactory;
@@ -285,7 +286,7 @@ public void setScanAheadLineCount(int count)
285286
* Returns an iterator over the data
286287
*/
287288
@Override
288-
public abstract CloseableIterator<Map<String, Object>> iterator();
289+
public abstract @NotNull CloseableIterator<Map<String, Object>> iterator();
289290

290291

291292
/**

0 commit comments

Comments
 (0)