Replace "size() > 0" with "!isEmpty()" where appropriate. In the Status implementation we can drop the check; the subsequent loop will only execute when the list is non-empty anyway. Change-Id: I355aff551a603373e702a9d44304f087b476263c Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>tags/v5.4.0.201906121030-r
@@ -84,7 +84,7 @@ abstract class TransferHandler { | |||
@Override | |||
Body process() throws IOException { | |||
Response.Body body = new Response.Body(); | |||
if (objects.size() > 0) { | |||
if (!objects.isEmpty()) { | |||
body.objects = new ArrayList<>(); | |||
for (LfsObject o : objects) { | |||
addObjectInfo(body, o); | |||
@@ -122,7 +122,7 @@ abstract class TransferHandler { | |||
@Override | |||
Body process() throws IOException { | |||
Response.Body body = new Response.Body(); | |||
if (objects.size() > 0) { | |||
if (!objects.isEmpty()) { | |||
body.objects = new ArrayList<>(); | |||
for (LfsObject o : objects) { | |||
addObjectInfo(body, o); |
@@ -96,7 +96,7 @@ class Checkout extends TextBuiltin { | |||
try (Git git = new Git(db)) { | |||
CheckoutCommand command = git.checkout() | |||
.setProgressMonitor(new TextProgressMonitor(errw)); | |||
if (paths.size() > 0) { | |||
if (!paths.isEmpty()) { | |||
command.setStartPoint(name); | |||
if (paths.size() == 1 && paths.get(0).equals(".")) { //$NON-NLS-1$ | |||
command.setAllPaths(true); |
@@ -85,7 +85,7 @@ class LsFiles extends TextBuiltin { | |||
CanonicalTreeParser p = new CanonicalTreeParser(); | |||
p.reset(rw.getObjectReader(), c.getTree()); | |||
tw.reset(); // drop the first empty tree, which we do not need here | |||
if (paths.size() > 0) { | |||
if (!paths.isEmpty()) { | |||
tw.setFilter(PathFilterGroup.createFromStrings(paths)); | |||
} | |||
tw.addTree(p); |
@@ -76,7 +76,7 @@ class LsTree extends TextBuiltin { | |||
protected void run() { | |||
try (TreeWalk walk = new TreeWalk(db)) { | |||
walk.reset(); // drop the first empty tree, which we do not need here | |||
if (paths.size() > 0) { | |||
if (!paths.isEmpty()) { | |||
walk.setFilter(PathFilterGroup.createFromStrings(paths)); | |||
} | |||
walk.setRecursive(recursive); |
@@ -80,7 +80,7 @@ class Reset extends TextBuiltin { | |||
try (Git git = new Git(db)) { | |||
ResetCommand command = git.reset(); | |||
command.setRef(commit); | |||
if (paths.size() > 0) { | |||
if (!paths.isEmpty()) { | |||
for (String path : paths) { | |||
command.addPath(path); | |||
} |
@@ -93,7 +93,7 @@ class Status extends TextBuiltin { | |||
protected void run() { | |||
try (Git git = new Git(db)) { | |||
StatusCommand statusCommand = git.status(); | |||
if (filterPaths != null && filterPaths.size() > 0) { | |||
if (filterPaths != null) { | |||
for (String path : filterPaths) { | |||
statusCommand.addPath(path); | |||
} |
@@ -98,7 +98,7 @@ public class CleanCommandTest extends RepositoryTestCase { | |||
StatusCommand command = git.status(); | |||
Status status = command.call(); | |||
Set<String> files = status.getUntracked(); | |||
assertTrue(files.size() > 0); | |||
assertFalse(files.isEmpty()); | |||
// run clean | |||
Set<String> cleanedFiles = git.clean().call(); | |||
@@ -120,7 +120,7 @@ public class CleanCommandTest extends RepositoryTestCase { | |||
StatusCommand command = git.status(); | |||
Status status = command.call(); | |||
Set<String> files = status.getUntracked(); | |||
assertTrue(files.size() > 0); | |||
assertFalse(files.isEmpty()); | |||
// run clean | |||
Set<String> cleanedFiles = git.clean().setCleanDirectories(true).call(); | |||
@@ -143,7 +143,7 @@ public class CleanCommandTest extends RepositoryTestCase { | |||
StatusCommand command = git.status(); | |||
Status status = command.call(); | |||
Set<String> files = status.getUntracked(); | |||
assertTrue(files.size() > 0); | |||
assertFalse(files.isEmpty()); | |||
// run clean with setPaths | |||
Set<String> paths = new TreeSet<>(); | |||
@@ -164,7 +164,7 @@ public class CleanCommandTest extends RepositoryTestCase { | |||
StatusCommand command = git.status(); | |||
Status status = command.call(); | |||
Set<String> files = status.getUntracked(); | |||
assertTrue(files.size() > 0); | |||
assertFalse(files.isEmpty()); | |||
// run clean | |||
Set<String> cleanedFiles = git.clean().setDryRun(true).call(); | |||
@@ -186,7 +186,7 @@ public class CleanCommandTest extends RepositoryTestCase { | |||
StatusCommand command = git.status(); | |||
Status status = command.call(); | |||
Set<String> files = status.getUntracked(); | |||
assertTrue(files.size() > 0); | |||
assertFalse(files.isEmpty()); | |||
// run clean | |||
Set<String> cleanedFiles = git.clean().setDryRun(true) |
@@ -133,7 +133,7 @@ public class LogCommand extends GitCommand<Iterable<RevCommit>> { | |||
@Override | |||
public Iterable<RevCommit> call() throws GitAPIException, NoHeadException { | |||
checkCallable(); | |||
if (pathFilters.size() > 0) | |||
if (!pathFilters.isEmpty()) | |||
walk.setTreeFilter(AndTreeFilter.create( | |||
PathFilterGroup.create(pathFilters), TreeFilter.ANY_DIFF)); | |||
if (skip > -1 && maxCount > -1) |
@@ -490,7 +490,7 @@ public class RebaseCommand extends GitCommand<RebaseResult> { | |||
resetSoftToParent(); | |||
List<RebaseTodoLine> steps = repo.readRebaseTodo( | |||
rebaseState.getPath(GIT_REBASE_TODO), false); | |||
RebaseTodoLine nextStep = steps.size() > 0 ? steps.get(0) : null; | |||
RebaseTodoLine nextStep = steps.isEmpty() ? null : steps.get(0); | |||
File messageFixupFile = rebaseState.getFile(MESSAGE_FIXUP); | |||
File messageSquashFile = rebaseState.getFile(MESSAGE_SQUASH); | |||
if (isSquash && messageFixupFile.exists()) | |||
@@ -1083,7 +1083,7 @@ public class RebaseCommand extends GitCommand<RebaseResult> { | |||
repo.writeRebaseTodoFile(rebaseState.getPath(GIT_REBASE_TODO), | |||
todoLines, false); | |||
if (poppedLines.size() > 0) { | |||
if (!poppedLines.isEmpty()) { | |||
repo.writeRebaseTodoFile(rebaseState.getPath(DONE), poppedLines, | |||
true); | |||
} |
@@ -1190,7 +1190,7 @@ public class ResolveMerger extends ThreeWayMerger { | |||
* otherwise | |||
*/ | |||
public boolean failed() { | |||
return failingPaths.size() > 0; | |||
return !failingPaths.isEmpty(); | |||
} | |||
/** |
@@ -227,7 +227,7 @@ public class BundleWriter { | |||
exc.add(r.getId()); | |||
packWriter.setIndexDisabled(true); | |||
packWriter.setDeltaBaseAsOffset(true); | |||
packWriter.setThin(exc.size() > 0); | |||
packWriter.setThin(!exc.isEmpty()); | |||
packWriter.setReuseValidatingObjects(false); | |||
if (exc.isEmpty()) { | |||
packWriter.setTagTargets(tagTargets); |