This is an automated email from the ASF dual-hosted git repository.
vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new bc75e3bd46 QPID-8653: [Broker-J] Code cleanup: collection type
arguments, collection factory methods, lambdas (#207)
bc75e3bd46 is described below
commit bc75e3bd466890fb6d42eef94cb44a42feb59282
Author: Daniil Kirilyuk <[email protected]>
AuthorDate: Mon Aug 7 12:52:49 2023 +0200
QPID-8653: [Broker-J] Code cleanup: collection type arguments, collection
factory methods, lambdas (#207)
---
.../qpid/server/logging/logback/BrokerFileLoggerImpl.java | 5 +----
.../apache/qpid/server/logging/logback/LogRecorder.java | 2 +-
.../logging/logback/Logback1027WorkaroundTurboFilter.java | 4 ++--
.../server/logging/logback/LoggerNameAndLevelFilter.java | 6 +++---
.../logback/PredicateAndLoggerNameAndLevelFilter.java | 2 +-
.../server/logging/logback/QpidLoggerTurboFilter.java | 2 +-
.../server/logging/logback/RollingPolicyDecorator.java | 12 ++----------
.../qpid/server/logging/logback/RolloverWatcher.java | 15 ++++-----------
.../qpid/server/logging/logback/StartupAppender.java | 6 ++++--
.../server/logging/logback/VirtualHostFileLoggerImpl.java | 2 +-
10 files changed, 20 insertions(+), 36 deletions(-)
diff --git
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerImpl.java
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerImpl.java
index 0338e38948..482a1c83f2 100644
---
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerImpl.java
+++
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerImpl.java
@@ -147,7 +147,7 @@ public class BrokerFileLoggerImpl extends
AbstractBrokerLogger<BrokerFileLoggerI
@Override
public List<LogFileDetails> getLogFiles()
{
- return _rolloverWatcher == null ?
Collections.<LogFileDetails>emptyList() :_rolloverWatcher.getLogFileDetails();
+ return _rolloverWatcher == null ? Collections.emptyList()
:_rolloverWatcher.getLogFileDetails();
}
@Override
@@ -212,7 +212,6 @@ public class BrokerFileLoggerImpl extends
AbstractBrokerLogger<BrokerFileLoggerI
{
onCloseOrDelete();
return Futures.immediateFuture(null);
-
}
@Override
@@ -229,6 +228,4 @@ public class BrokerFileLoggerImpl extends
AbstractBrokerLogger<BrokerFileLoggerI
_statusManager.remove(_logbackStatusListener);
}
}
-
-
}
diff --git
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogRecorder.java
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogRecorder.java
index 59543bafac..d1c3e18cc1 100644
---
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogRecorder.java
+++
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogRecorder.java
@@ -36,7 +36,7 @@ public class LogRecorder implements Iterable<LogRecord>
public Iterator<LogRecord> iterator()
{
final CyclicBuffer<LogRecord> buffer = _eventAppender.getBuffer();
- return buffer != null ? buffer.asList().iterator() :
Collections.<LogRecord>emptyIterator();
+ return buffer != null ? buffer.asList().iterator() :
Collections.emptyIterator();
}
}
diff --git
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/Logback1027WorkaroundTurboFilter.java
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/Logback1027WorkaroundTurboFilter.java
index 105b2e3d9a..5180f31a2e 100644
---
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/Logback1027WorkaroundTurboFilter.java
+++
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/Logback1027WorkaroundTurboFilter.java
@@ -62,7 +62,7 @@ public class Logback1027WorkaroundTurboFilter extends
TurboFilter
if (seen == null)
{
- seen = Collections.newSetFromMap(new IdentityHashMap<Throwable,
Boolean>());
+ seen = Collections.newSetFromMap(new IdentityHashMap<>());
}
if (!seen.add(t))
@@ -75,7 +75,7 @@ public class Logback1027WorkaroundTurboFilter extends
TurboFilter
int allSuppressedLength = allSuppressed.length;
if (allSuppressedLength > 0)
{
- Set<Throwable> seenCopy = Collections.newSetFromMap(new
IdentityHashMap<Throwable, Boolean>(seen.size()));
+ Set<Throwable> seenCopy = Collections.newSetFromMap(new
IdentityHashMap<>(seen.size()));
seenCopy.addAll(seen);
for (int i = 0; i < allSuppressedLength; ++i)
{
diff --git
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilter.java
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilter.java
index 68d05f66f5..675e130346 100644
---
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilter.java
+++
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilter.java
@@ -65,7 +65,7 @@ public class LoggerNameAndLevelFilter extends
Filter<ILoggingEvent> implements E
{
if(loggerName == null || "".equals(loggerName) ||
Logger.ROOT_LOGGER_NAME.equals(loggerName))
{
- return new Filter<ILoggingEvent>()
+ return new Filter<>()
{
@Override
public FilterReply decide(final ILoggingEvent event)
@@ -77,7 +77,7 @@ public class LoggerNameAndLevelFilter extends
Filter<ILoggingEvent> implements E
else if(loggerName.endsWith(".*"))
{
final String prefixName =
loggerName.substring(0,loggerName.length()-2);
- return new Filter<ILoggingEvent>()
+ return new Filter<>()
{
@Override
public FilterReply decide(final ILoggingEvent event)
@@ -92,7 +92,7 @@ public class LoggerNameAndLevelFilter extends
Filter<ILoggingEvent> implements E
}
else
{
- return new Filter<ILoggingEvent>()
+ return new Filter<>()
{
@Override
public FilterReply decide(final ILoggingEvent event)
diff --git
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PredicateAndLoggerNameAndLevelFilter.java
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PredicateAndLoggerNameAndLevelFilter.java
index 5a37989b7f..f457b068da 100644
---
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PredicateAndLoggerNameAndLevelFilter.java
+++
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PredicateAndLoggerNameAndLevelFilter.java
@@ -52,7 +52,7 @@ class PredicateAndLoggerNameAndLevelFilter extends
LoggerNameAndLevelFilter
protected Filter<ILoggingEvent> createFilter(final String loggerName)
{
final Filter<ILoggingEvent> filter = super.createFilter(loggerName);
- return new Filter<ILoggingEvent>()
+ return new Filter<>()
{
@Override
public FilterReply decide(final ILoggingEvent event)
diff --git
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilter.java
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilter.java
index 6843661352..d8c2462841 100644
---
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilter.java
+++
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilter.java
@@ -108,7 +108,7 @@ public final class QpidLoggerTurboFilter extends TurboFilter
{
// Disable the 'decide' optimisation until the new minimum is
established
_minimumFilterLevel = Level.ALL.levelInt;
- _effectiveLevels.set(new ConcurrentHashMap<Logger, Integer>());
+ _effectiveLevels.set(new ConcurrentHashMap<>());
synchronized (_minimumFilterLevelUpdateLock)
{
int newMinimumLogLevel = Level.OFF.levelInt;
diff --git
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RollingPolicyDecorator.java
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RollingPolicyDecorator.java
index 2d56156c95..ee74849179 100644
---
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RollingPolicyDecorator.java
+++
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RollingPolicyDecorator.java
@@ -30,7 +30,6 @@ import java.nio.file.Path;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Comparator;
import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@@ -216,7 +215,7 @@ public class RollingPolicyDecorator implements RollingPolicy
final List<Path> rolledFiles = new ArrayList<>();
try
{
- Files.walkFileTree(_rolledFilesBaseFolder, new
FileVisitor<Path>()
+ Files.walkFileTree(_rolledFilesBaseFolder, new FileVisitor<>()
{
@Override
public FileVisitResult preVisitDirectory(Path dir,
BasicFileAttributes attrs)
@@ -275,14 +274,7 @@ public class RollingPolicyDecorator implements
RollingPolicy
results[i++] = parent.relativize(f).toString();
}
- Arrays.sort(results, new Comparator<String>()
- {
- @Override
- public int compare(String o1, String o2)
- {
- return o1.compareTo(o2);
- }
- });
+ Arrays.sort(results, String::compareTo);
return results;
}
diff --git
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RolloverWatcher.java
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RolloverWatcher.java
index aaaf42983d..62b50017d0 100644
---
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RolloverWatcher.java
+++
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RolloverWatcher.java
@@ -23,7 +23,6 @@ package org.apache.qpid.server.logging.logback;
import java.io.File;
import java.nio.file.Path;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
@@ -43,14 +42,8 @@ import org.apache.qpid.server.logging.ZippedContent;
public class RolloverWatcher implements RollingPolicyDecorator.RolloverListener
{
private static final Logger LOGGER =
LoggerFactory.getLogger(RolloverWatcher.class);
- private static final Comparator<LogFileDetails> LAST_MODIFIED_COMPARATOR =
new Comparator<LogFileDetails>()
- {
- @Override
- public int compare(final LogFileDetails o1, final LogFileDetails o2)
- {
- return Long.compare(o2.getLastModified(), o1.getLastModified());
- }
- };
+ private static final Comparator<LogFileDetails> LAST_MODIFIED_COMPARATOR =
(o1, o2) ->
+ Long.compare(o2.getLastModified(), o1.getLastModified());
private final Path _activeFilePath;
private volatile Collection<String> _rolledFiles;
private volatile Path _baseFolder;
@@ -58,13 +51,13 @@ public class RolloverWatcher implements
RollingPolicyDecorator.RolloverListener
public RolloverWatcher(final String activeFileName)
{
_activeFilePath = new File(activeFileName).toPath();
- _rolledFiles = Collections.emptyList();
+ _rolledFiles = List.of();
}
@Override
public void onRollover(Path baseFolder, String[] relativeFileNames)
{
- _rolledFiles =
Collections.unmodifiableCollection(Arrays.asList(relativeFileNames));
+ _rolledFiles = List.of(relativeFileNames);
_baseFolder = baseFolder;
}
diff --git
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/StartupAppender.java
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/StartupAppender.java
index 67e2fb24f8..30988e14a8 100644
---
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/StartupAppender.java
+++
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/StartupAppender.java
@@ -76,12 +76,14 @@ public class StartupAppender extends
AppenderBase<ILoggingEvent>
patternLayoutEncoder.setPattern("%X{qpid.log.prefix}%d{HH:mm:ss.SSS}
[%thread] %-5level %logger{36} - %msg%n");
patternLayoutEncoder.start();
- consoleAppender.addFilter(new Filter<ILoggingEvent>()
+ consoleAppender.addFilter(new Filter<>()
{
@Override
public FilterReply decide(final ILoggingEvent event)
{
- return
event.getLevel().isGreaterOrEqual(_consoleAppenderAcceptLogLevel) ?
FilterReply.ACCEPT : FilterReply.DENY;
+ return
event.getLevel().isGreaterOrEqual(_consoleAppenderAcceptLogLevel)
+ ? FilterReply.ACCEPT
+ : FilterReply.DENY;
}
});
diff --git
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLoggerImpl.java
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLoggerImpl.java
index ec6ef25a9c..641acfa073 100644
---
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLoggerImpl.java
+++
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLoggerImpl.java
@@ -140,7 +140,7 @@ public class VirtualHostFileLoggerImpl extends
AbstractVirtualHostLogger<Virtual
@Override
public List<LogFileDetails> getLogFiles()
{
- return _rolloverWatcher == null ?
Collections.<LogFileDetails>emptyList() : _rolloverWatcher.getLogFileDetails();
+ return _rolloverWatcher == null ? Collections.emptyList() :
_rolloverWatcher.getLogFileDetails();
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
