From 0b320b2c357a02d1f7306cb572e09917a4ec59d9 Mon Sep 17 00:00:00 2001 From: Carsten Hammer Date: Sat, 6 Apr 2019 20:42:38 +0200 Subject: [PATCH] Use Arrays.asList instead of copying array in a for loop Change-Id: Ie44950f7d2f2f94a0412efb6c274f6e1e31efcd6 Signed-off-by: Carsten Hammer Signed-off-by: Matthias Sohn --- .../internal/transport/sshd/OpenSshServerKeyVerifier.java | 5 ++--- org.eclipse.jgit.test/src/org/eclipse/jgit/lib/Sets.java | 4 ++-- .../org/eclipse/jgit/attributes/TreeWalkAttributeTest.java | 4 ++-- .../src/org/eclipse/jgit/api/DeleteBranchCommand.java | 4 ++-- .../src/org/eclipse/jgit/api/DeleteTagCommand.java | 4 ++-- .../src/org/eclipse/jgit/revwalk/filter/RevFlagFilter.java | 7 +++---- .../src/org/eclipse/jgit/transport/BasePackConnection.java | 5 +++-- 7 files changed, 16 insertions(+), 17 deletions(-) diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyVerifier.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyVerifier.java index 7d8f3fd39..4246fbe3b 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyVerifier.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyVerifier.java @@ -60,6 +60,7 @@ import java.security.GeneralSecurityException; import java.security.PublicKey; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.LinkedList; @@ -586,9 +587,7 @@ public ModifiedKeyHandling acceptModifiedServerKey( KeyUtils.getFingerPrint(BuiltinDigests.sha256, expected), KeyUtils.getFingerPrint(BuiltinDigests.md5, actual), KeyUtils.getFingerPrint(BuiltinDigests.sha256, actual)); - for (String line : warning.split("\n")) { //$NON-NLS-1$ - messages.add(line); - } + messages.addAll(Arrays.asList(warning.split("\n"))); //$NON-NLS-1$ CredentialsProvider provider = getCredentialsProvider( clientSession); diff --git a/org.eclipse.jgit.test/src/org/eclipse/jgit/lib/Sets.java b/org.eclipse.jgit.test/src/org/eclipse/jgit/lib/Sets.java index 5a01eae9b..e6100e225 100644 --- a/org.eclipse.jgit.test/src/org/eclipse/jgit/lib/Sets.java +++ b/org.eclipse.jgit.test/src/org/eclipse/jgit/lib/Sets.java @@ -43,6 +43,7 @@ package org.eclipse.jgit.lib; +import java.util.Arrays; import java.util.HashSet; import java.util.Set; @@ -50,8 +51,7 @@ public class Sets { @SafeVarargs public static Set of(T... elements) { Set ret = new HashSet<>(); - for (T element : elements) - ret.add(element); + ret.addAll(Arrays.asList(elements)); return ret; } } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/TreeWalkAttributeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/TreeWalkAttributeTest.java index 1d9cd7814..d6aead4a5 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/TreeWalkAttributeTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/TreeWalkAttributeTest.java @@ -49,6 +49,7 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashSet; @@ -854,8 +855,7 @@ private File writeGlobalAttributeFile(String fileName, String... attributes) static Set asSet(Attribute... attrs) { HashSet result = new HashSet<>(); - for (Attribute attr : attrs) - result.add(attr); + result.addAll(Arrays.asList(attrs)); return result; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/DeleteBranchCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/DeleteBranchCommand.java index 31e7281d6..c3feaeffc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/DeleteBranchCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/DeleteBranchCommand.java @@ -46,6 +46,7 @@ import java.io.IOException; import java.text.MessageFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -188,8 +189,7 @@ public List call() throws GitAPIException, public DeleteBranchCommand setBranchNames(String... branchnames) { checkCallable(); this.branchNames.clear(); - for (String branch : branchnames) - this.branchNames.add(branch); + this.branchNames.addAll(Arrays.asList(branchnames)); return this; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/DeleteTagCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/DeleteTagCommand.java index 63a090caf..197024062 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/DeleteTagCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/DeleteTagCommand.java @@ -45,6 +45,7 @@ import java.io.IOException; import java.text.MessageFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -135,8 +136,7 @@ public List call() throws GitAPIException { public DeleteTagCommand setTags(String... tags) { checkCallable(); this.tags.clear(); - for (String tagName : tags) - this.tags.add(tagName); + this.tags.addAll(Arrays.asList(tags)); return this; } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/RevFlagFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/RevFlagFilter.java index c67c44b21..c3dc3dea6 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/RevFlagFilter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/RevFlagFilter.java @@ -44,6 +44,7 @@ package org.eclipse.jgit.revwalk.filter; import java.io.IOException; +import java.util.Arrays; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; @@ -78,8 +79,7 @@ public static RevFilter has(RevFlag a) { */ public static RevFilter hasAll(RevFlag... a) { final RevFlagSet set = new RevFlagSet(); - for (RevFlag flag : a) - set.add(flag); + set.addAll(Arrays.asList(a)); return new HasAll(set); } @@ -103,8 +103,7 @@ public static RevFilter hasAll(RevFlagSet a) { */ public static RevFilter hasAny(RevFlag... a) { final RevFlagSet set = new RevFlagSet(); - for (RevFlag flag : a) - set.add(flag); + set.addAll(Arrays.asList(a)); return new HasAny(set); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackConnection.java index c1ec19e8f..20a5d9da7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackConnection.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackConnection.java @@ -53,6 +53,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.text.MessageFormat; +import java.util.Arrays; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Set; @@ -214,8 +215,8 @@ private void readAdvertisedRefsImpl() throws IOException { if (nul >= 0) { // The first line (if any) may contain "hidden" // capability values after a NUL byte. - for (String c : line.substring(nul + 1).split(" ")) //$NON-NLS-1$ - remoteCapablities.add(c); + remoteCapablities.addAll( + Arrays.asList(line.substring(nul + 1).split(" "))); //$NON-NLS-1$ line = line.substring(0, nul); } }