From 996d316ab6cb95adadac7ac65d42f96043251012 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 21 Apr 2015 20:25:43 +0000
Subject: [PATCH] AutoRefactor'ed use Collections.removeAll()
---
opendj-server-legacy/src/main/java/org/opends/server/api/ClientConnection.java | 9 +++------
opendj-server-legacy/src/test/java/org/opends/server/TestListener.java | 28 +++++++++-------------------
2 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/ClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ClientConnection.java
index 983309a..fc6c725 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/ClientConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/ClientConnection.java
@@ -1107,8 +1107,8 @@
return new HashSet<Privilege>(0);
}
- HashSet<Privilege> newPrivileges = new HashSet<Privilege>();
- HashSet<Privilege> removePrivileges = new HashSet<Privilege>();
+ HashSet<Privilege> newPrivileges = new HashSet<>();
+ HashSet<Privilege> removePrivileges = new HashSet<>();
if (isRoot)
{
@@ -1164,10 +1164,7 @@
}
}
- for (Privilege p : removePrivileges)
- {
- newPrivileges.remove(p);
- }
+ newPrivileges.removeAll(removePrivileges);
return newPrivileges;
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/TestListener.java b/opendj-server-legacy/src/test/java/org/opends/server/TestListener.java
index ee73f93..e94a04b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/TestListener.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/TestListener.java
@@ -284,18 +284,14 @@
totalRestartMs += restartMs;
}
double averageRestartSec = 0;
- if (systemRestartTimes.size() > 0) {
+ if (!systemRestartTimes.isEmpty()) {
averageRestartSec = totalRestartMs / (1000.0 * systemRestartTimes.size());
}
originalSystemErr.printf("In core restarts: %d (took %.1fs on average)",
TestCaseUtils.getNumServerRestarts(), averageRestartSec);
originalSystemErr.println();
-// if (doProgressThreadChange) {
-// originalSystemErr.print(TestCaseUtils.threadStacksToString());
-// }
-
- if (_classesWithTestsRunInterleaved.size() > 0) {
+ if (!_classesWithTestsRunInterleaved.isEmpty()) {
System.err.println("WARNING: Some of the test methods for multiple classes " +
"were run out of order (i.e. interleaved with other classes). Either " +
"a class doesn't have the sequential=true annotation, which should " +
@@ -534,11 +530,10 @@
}
- private Set<Class<?>> _checkedForTypeAndAnnotations = new HashSet<Class<?>>();
+ private Set<Class<?>> _checkedForTypeAndAnnotations = new HashSet<>();
private void enforceTestClassTypeAndAnnotations(ITestResult tr) {
- Class<?> testClass = null;
- testClass = tr.getMethod().getRealClass();
+ Class<?> testClass = tr.getMethod().getRealClass();
// Only warn once per class.
if (_checkedForTypeAndAnnotations.contains(testClass)) {
@@ -583,8 +578,7 @@
private final IdentityHashMap<Object,Object> _previousTestObjects = new IdentityHashMap<Object,Object>();
private void checkForInterleavedBetweenClasses(ITestResult tr) {
Object[] testInstances = tr.getMethod().getInstances();
- // This will almost always have a single element. If it doesn't, just
- // skip it.
+ // This will almost always have a single element. If it doesn't, just skip it.
if (testInstances.length != 1) {
return;
}
@@ -713,8 +707,7 @@
printStatusHeaderOnce();
DirectoryServerTestCase testInstance = (DirectoryServerTestCase) finishedTestObject;
- long startTime = testInstance != null ? testInstance.startTime
- : testSuiteStartTime;
+ long startTime = testInstance != null ? testInstance.startTime : testSuiteStartTime;
originalSystemErr.printf("[%s] ",
TEST_PROGESS_TIME_FORMAT.format(new Date(startTime)));
@@ -834,10 +827,8 @@
* @return a new List with base with toRemove items removed from it
*/
private List<String> removeExactly(List<String> base, List<String> toRemove) {
- List<String> diff = new ArrayList<String>(base);
- for (String item : toRemove) {
- diff.remove(item);
- }
+ List<String> diff = new ArrayList<>(base);
+ diff.removeAll(toRemove);
return diff;
}
@@ -870,8 +861,7 @@
results.getTimingInfo(timingOutput);
}
- timingOutput.append(EOL).append(DIVIDER_LINE).append(DIVIDER_LINE).append(
- EOL);
+ timingOutput.append(EOL).append(DIVIDER_LINE).append(DIVIDER_LINE).append(EOL);
getSlowestTestsOutput(timingOutput);
return timingOutput;
--
Gitblit v1.10.0