Browse Source

Consistently use "!isEmpty()" to detect non-empty list

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>
stable-5.5
David Pursehouse 6 years ago
parent
commit
00f840dcd1
  1. 4
      org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/TransferHandler.java
  2. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java
  3. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsFiles.java
  4. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsTree.java
  5. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reset.java
  6. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java
  7. 10
      org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CleanCommandTest.java
  8. 2
      org.eclipse.jgit/src/org/eclipse/jgit/api/LogCommand.java
  9. 4
      org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
  10. 2
      org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
  11. 2
      org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleWriter.java

4
org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/TransferHandler.java

@ -84,7 +84,7 @@ abstract class TransferHandler {
@Override @Override
Body process() throws IOException { Body process() throws IOException {
Response.Body body = new Response.Body(); Response.Body body = new Response.Body();
if (objects.size() > 0) { if (!objects.isEmpty()) {
body.objects = new ArrayList<>(); body.objects = new ArrayList<>();
for (LfsObject o : objects) { for (LfsObject o : objects) {
addObjectInfo(body, o); addObjectInfo(body, o);
@ -122,7 +122,7 @@ abstract class TransferHandler {
@Override @Override
Body process() throws IOException { Body process() throws IOException {
Response.Body body = new Response.Body(); Response.Body body = new Response.Body();
if (objects.size() > 0) { if (!objects.isEmpty()) {
body.objects = new ArrayList<>(); body.objects = new ArrayList<>();
for (LfsObject o : objects) { for (LfsObject o : objects) {
addObjectInfo(body, o); addObjectInfo(body, o);

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java

@ -96,7 +96,7 @@ class Checkout extends TextBuiltin {
try (Git git = new Git(db)) { try (Git git = new Git(db)) {
CheckoutCommand command = git.checkout() CheckoutCommand command = git.checkout()
.setProgressMonitor(new TextProgressMonitor(errw)); .setProgressMonitor(new TextProgressMonitor(errw));
if (paths.size() > 0) { if (!paths.isEmpty()) {
command.setStartPoint(name); command.setStartPoint(name);
if (paths.size() == 1 && paths.get(0).equals(".")) { //$NON-NLS-1$ if (paths.size() == 1 && paths.get(0).equals(".")) { //$NON-NLS-1$
command.setAllPaths(true); command.setAllPaths(true);

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsFiles.java

@ -85,7 +85,7 @@ class LsFiles extends TextBuiltin {
CanonicalTreeParser p = new CanonicalTreeParser(); CanonicalTreeParser p = new CanonicalTreeParser();
p.reset(rw.getObjectReader(), c.getTree()); p.reset(rw.getObjectReader(), c.getTree());
tw.reset(); // drop the first empty tree, which we do not need here 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.setFilter(PathFilterGroup.createFromStrings(paths));
} }
tw.addTree(p); tw.addTree(p);

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsTree.java

@ -76,7 +76,7 @@ class LsTree extends TextBuiltin {
protected void run() { protected void run() {
try (TreeWalk walk = new TreeWalk(db)) { try (TreeWalk walk = new TreeWalk(db)) {
walk.reset(); // drop the first empty tree, which we do not need here 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.setFilter(PathFilterGroup.createFromStrings(paths));
} }
walk.setRecursive(recursive); walk.setRecursive(recursive);

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reset.java

@ -80,7 +80,7 @@ class Reset extends TextBuiltin {
try (Git git = new Git(db)) { try (Git git = new Git(db)) {
ResetCommand command = git.reset(); ResetCommand command = git.reset();
command.setRef(commit); command.setRef(commit);
if (paths.size() > 0) { if (!paths.isEmpty()) {
for (String path : paths) { for (String path : paths) {
command.addPath(path); command.addPath(path);
} }

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java

@ -93,7 +93,7 @@ class Status extends TextBuiltin {
protected void run() { protected void run() {
try (Git git = new Git(db)) { try (Git git = new Git(db)) {
StatusCommand statusCommand = git.status(); StatusCommand statusCommand = git.status();
if (filterPaths != null && filterPaths.size() > 0) { if (filterPaths != null) {
for (String path : filterPaths) { for (String path : filterPaths) {
statusCommand.addPath(path); statusCommand.addPath(path);
} }

10
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CleanCommandTest.java

@ -98,7 +98,7 @@ public class CleanCommandTest extends RepositoryTestCase {
StatusCommand command = git.status(); StatusCommand command = git.status();
Status status = command.call(); Status status = command.call();
Set<String> files = status.getUntracked(); Set<String> files = status.getUntracked();
assertTrue(files.size() > 0); assertFalse(files.isEmpty());
// run clean // run clean
Set<String> cleanedFiles = git.clean().call(); Set<String> cleanedFiles = git.clean().call();
@ -120,7 +120,7 @@ public class CleanCommandTest extends RepositoryTestCase {
StatusCommand command = git.status(); StatusCommand command = git.status();
Status status = command.call(); Status status = command.call();
Set<String> files = status.getUntracked(); Set<String> files = status.getUntracked();
assertTrue(files.size() > 0); assertFalse(files.isEmpty());
// run clean // run clean
Set<String> cleanedFiles = git.clean().setCleanDirectories(true).call(); Set<String> cleanedFiles = git.clean().setCleanDirectories(true).call();
@ -143,7 +143,7 @@ public class CleanCommandTest extends RepositoryTestCase {
StatusCommand command = git.status(); StatusCommand command = git.status();
Status status = command.call(); Status status = command.call();
Set<String> files = status.getUntracked(); Set<String> files = status.getUntracked();
assertTrue(files.size() > 0); assertFalse(files.isEmpty());
// run clean with setPaths // run clean with setPaths
Set<String> paths = new TreeSet<>(); Set<String> paths = new TreeSet<>();
@ -164,7 +164,7 @@ public class CleanCommandTest extends RepositoryTestCase {
StatusCommand command = git.status(); StatusCommand command = git.status();
Status status = command.call(); Status status = command.call();
Set<String> files = status.getUntracked(); Set<String> files = status.getUntracked();
assertTrue(files.size() > 0); assertFalse(files.isEmpty());
// run clean // run clean
Set<String> cleanedFiles = git.clean().setDryRun(true).call(); Set<String> cleanedFiles = git.clean().setDryRun(true).call();
@ -186,7 +186,7 @@ public class CleanCommandTest extends RepositoryTestCase {
StatusCommand command = git.status(); StatusCommand command = git.status();
Status status = command.call(); Status status = command.call();
Set<String> files = status.getUntracked(); Set<String> files = status.getUntracked();
assertTrue(files.size() > 0); assertFalse(files.isEmpty());
// run clean // run clean
Set<String> cleanedFiles = git.clean().setDryRun(true) Set<String> cleanedFiles = git.clean().setDryRun(true)

2
org.eclipse.jgit/src/org/eclipse/jgit/api/LogCommand.java

@ -133,7 +133,7 @@ public class LogCommand extends GitCommand<Iterable<RevCommit>> {
@Override @Override
public Iterable<RevCommit> call() throws GitAPIException, NoHeadException { public Iterable<RevCommit> call() throws GitAPIException, NoHeadException {
checkCallable(); checkCallable();
if (pathFilters.size() > 0) if (!pathFilters.isEmpty())
walk.setTreeFilter(AndTreeFilter.create( walk.setTreeFilter(AndTreeFilter.create(
PathFilterGroup.create(pathFilters), TreeFilter.ANY_DIFF)); PathFilterGroup.create(pathFilters), TreeFilter.ANY_DIFF));
if (skip > -1 && maxCount > -1) if (skip > -1 && maxCount > -1)

4
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java

@ -490,7 +490,7 @@ public class RebaseCommand extends GitCommand<RebaseResult> {
resetSoftToParent(); resetSoftToParent();
List<RebaseTodoLine> steps = repo.readRebaseTodo( List<RebaseTodoLine> steps = repo.readRebaseTodo(
rebaseState.getPath(GIT_REBASE_TODO), false); 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 messageFixupFile = rebaseState.getFile(MESSAGE_FIXUP);
File messageSquashFile = rebaseState.getFile(MESSAGE_SQUASH); File messageSquashFile = rebaseState.getFile(MESSAGE_SQUASH);
if (isSquash && messageFixupFile.exists()) if (isSquash && messageFixupFile.exists())
@ -1083,7 +1083,7 @@ public class RebaseCommand extends GitCommand<RebaseResult> {
repo.writeRebaseTodoFile(rebaseState.getPath(GIT_REBASE_TODO), repo.writeRebaseTodoFile(rebaseState.getPath(GIT_REBASE_TODO),
todoLines, false); todoLines, false);
if (poppedLines.size() > 0) { if (!poppedLines.isEmpty()) {
repo.writeRebaseTodoFile(rebaseState.getPath(DONE), poppedLines, repo.writeRebaseTodoFile(rebaseState.getPath(DONE), poppedLines,
true); true);
} }

2
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java

@ -1190,7 +1190,7 @@ public class ResolveMerger extends ThreeWayMerger {
* otherwise * otherwise
*/ */
public boolean failed() { public boolean failed() {
return failingPaths.size() > 0; return !failingPaths.isEmpty();
} }
/** /**

2
org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleWriter.java

@ -227,7 +227,7 @@ public class BundleWriter {
exc.add(r.getId()); exc.add(r.getId());
packWriter.setIndexDisabled(true); packWriter.setIndexDisabled(true);
packWriter.setDeltaBaseAsOffset(true); packWriter.setDeltaBaseAsOffset(true);
packWriter.setThin(exc.size() > 0); packWriter.setThin(!exc.isEmpty());
packWriter.setReuseValidatingObjects(false); packWriter.setReuseValidatingObjects(false);
if (exc.isEmpty()) { if (exc.isEmpty()) {
packWriter.setTagTargets(tagTargets); packWriter.setTagTargets(tagTargets);

Loading…
Cancel
Save