diff --git a/core/src/main/java/hudson/Launcher.java b/core/src/main/java/hudson/Launcher.java index 45fe90cab0..c6e39a27d3 100644 --- a/core/src/main/java/hudson/Launcher.java +++ b/core/src/main/java/hudson/Launcher.java @@ -774,7 +774,7 @@ public abstract class Launcher { */ protected final void maskedPrintCommandLine(@Nonnull List cmd, @CheckForNull boolean[] mask, @CheckForNull FilePath workDir) { if(mask==null) { - printCommandLine(cmd.toArray(new String[cmd.size()]),workDir); + printCommandLine(cmd.toArray(new String[0]),workDir); return; } diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index d11b84990c..62c21991b3 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -537,7 +537,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas TaskGraphBuilder g = new TaskGraphBuilder(); // schedule execution of loading plugins - for (final PluginWrapper p : activePlugins.toArray(new PluginWrapper[activePlugins.size()])) { + for (final PluginWrapper p : activePlugins.toArray(new PluginWrapper[0])) { g.followedBy().notFatal().attains(PLUGINS_PREPARED).add(String.format("Loading plugin %s v%s (%s)", p.getLongName(), p.getVersion(), p.getShortName()), new Executable() { public void run(Reactor session) throws Exception { try { @@ -560,7 +560,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas } // schedule execution of initializing plugins - for (final PluginWrapper p : activePlugins.toArray(new PluginWrapper[activePlugins.size()])) { + for (final PluginWrapper p : activePlugins.toArray(new PluginWrapper[0])) { g.followedBy().notFatal().attains(PLUGINS_STARTED).add("Initializing plugin " + p.getShortName(), new Executable() { public void run(Reactor session) throws Exception { if (!activePlugins.contains(p)) { diff --git a/core/src/main/java/hudson/cli/CLICommand.java b/core/src/main/java/hudson/cli/CLICommand.java index 4a47ae973c..e9c8f5765f 100644 --- a/core/src/main/java/hudson/cli/CLICommand.java +++ b/core/src/main/java/hudson/cli/CLICommand.java @@ -243,7 +243,7 @@ public abstract class CLICommand implements ExtensionPoint, Cloneable { if (!(this instanceof HelpCommand || this instanceof WhoAmICommand)) Jenkins.getActiveInstance().checkPermission(Jenkins.READ); - p.parseArgument(args.toArray(new String[args.size()])); + p.parseArgument(args.toArray(new String[0])); if (!(this instanceof HelpCommand || this instanceof WhoAmICommand)) Jenkins.getActiveInstance().checkPermission(Jenkins.READ); LOGGER.log(Level.FINE, "Invoking CLI command {0}, with {1} arguments, as user {2}.", diff --git a/core/src/main/java/hudson/cli/GroovyCommand.java b/core/src/main/java/hudson/cli/GroovyCommand.java index ea05dca912..f87ba80abc 100644 --- a/core/src/main/java/hudson/cli/GroovyCommand.java +++ b/core/src/main/java/hudson/cli/GroovyCommand.java @@ -68,7 +68,7 @@ public class GroovyCommand extends CLICommand { binding.setProperty("stderr",stderr); GroovyShell groovy = new GroovyShell(Jenkins.getActiveInstance().getPluginManager().uberClassLoader, binding); - groovy.run(loadScript(),"RemoteClass",remaining.toArray(new String[remaining.size()])); + groovy.run(loadScript(),"RemoteClass",remaining.toArray(new String[0])); return 0; } diff --git a/core/src/main/java/hudson/lifecycle/UnixLifecycle.java b/core/src/main/java/hudson/lifecycle/UnixLifecycle.java index 7746e13888..a17c898ab3 100644 --- a/core/src/main/java/hudson/lifecycle/UnixLifecycle.java +++ b/core/src/main/java/hudson/lifecycle/UnixLifecycle.java @@ -83,7 +83,7 @@ public class UnixLifecycle extends Lifecycle { // exec to self String exe = args.get(0); - LIBC.execvp(exe, new StringArray(args.toArray(new String[args.size()]))); + LIBC.execvp(exe, new StringArray(args.toArray(new String[0]))); throw new IOException("Failed to exec '"+exe+"' "+LIBC.strerror(Native.getLastError())); } diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 2f91394f20..f86aed606d 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -822,7 +822,7 @@ public abstract class AbstractProject

,R extends A if (c != null) { queueActions.add(new CauseAction(c)); } - return scheduleBuild2(quietPeriod, queueActions.toArray(new Action[queueActions.size()])); + return scheduleBuild2(quietPeriod, queueActions.toArray(new Action[0])); } /** diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java index 87303f9ebe..f5b77b8ee7 100644 --- a/core/src/main/java/hudson/model/Run.java +++ b/core/src/main/java/hudson/model/Run.java @@ -2098,7 +2098,7 @@ public abstract class Run ,RunT extends Run bytes) { Collections.reverse(bytes); - Byte[] byteArray = bytes.toArray(new Byte[bytes.size()]); + Byte[] byteArray = bytes.toArray(new Byte[0]); return new String(ArrayUtils.toPrimitive(byteArray), getCharset()); } diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java index 2b1cdd4c94..380bdce825 100644 --- a/core/src/main/java/hudson/model/UpdateCenter.java +++ b/core/src/main/java/hudson/model/UpdateCenter.java @@ -951,7 +951,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas for (String c : p.categories) entries.add(new PluginEntry(p, getCategoryDisplayName(c))); } - return entries.toArray(new PluginEntry[entries.size()]); + return entries.toArray(new PluginEntry[0]); } private static String getCategoryDisplayName(String category) { diff --git a/core/src/main/java/hudson/security/ChainedServletFilter.java b/core/src/main/java/hudson/security/ChainedServletFilter.java index 40830fc2e6..a9a0e12907 100644 --- a/core/src/main/java/hudson/security/ChainedServletFilter.java +++ b/core/src/main/java/hudson/security/ChainedServletFilter.java @@ -58,7 +58,7 @@ public class ChainedServletFilter implements Filter { } public void setFilters(Collection filters) { - this.filters = filters.toArray(new Filter[filters.size()]); + this.filters = filters.toArray(new Filter[0]); } public void init(FilterConfig filterConfig) throws ServletException { diff --git a/core/src/main/java/hudson/security/ContainerAuthentication.java b/core/src/main/java/hudson/security/ContainerAuthentication.java index 66d22b30aa..28a8c34029 100644 --- a/core/src/main/java/hudson/security/ContainerAuthentication.java +++ b/core/src/main/java/hudson/security/ContainerAuthentication.java @@ -66,7 +66,7 @@ public final class ContainerAuthentication implements Authentication { l.add(new GrantedAuthorityImpl(g)); } l.add(SecurityRealm.AUTHENTICATED_AUTHORITY); - authorities = l.toArray(new GrantedAuthority[l.size()]); + authorities = l.toArray(new GrantedAuthority[0]); } public GrantedAuthority[] getAuthorities() { diff --git a/core/src/main/java/hudson/security/WhoAmI.java b/core/src/main/java/hudson/security/WhoAmI.java index 6002bdf519..5d944acb88 100644 --- a/core/src/main/java/hudson/security/WhoAmI.java +++ b/core/src/main/java/hudson/security/WhoAmI.java @@ -69,7 +69,7 @@ public class WhoAmI implements UnprotectedRootAction { for (GrantedAuthority a : auth().getAuthorities()) { authorities.add(a.getAuthority()); } - return (String[]) authorities.toArray(new String[authorities.size()]); + return (String[]) authorities.toArray(new String[0]); } @Override diff --git a/core/src/main/java/hudson/tasks/BuildTrigger.java b/core/src/main/java/hudson/tasks/BuildTrigger.java index 253eb98aaa..9ee8c349e4 100644 --- a/core/src/main/java/hudson/tasks/BuildTrigger.java +++ b/core/src/main/java/hudson/tasks/BuildTrigger.java @@ -275,7 +275,7 @@ public class BuildTrigger extends Recorder implements DependencyDeclarer { logger.println(Messages.BuildTrigger_Disabled(ModelHyperlinkNote.encodeTo(p))); continue; } - boolean scheduled = p.scheduleBuild(p.getQuietPeriod(), new UpstreamCause((Run)build), buildActions.toArray(new Action[buildActions.size()])); + boolean scheduled = p.scheduleBuild(p.getQuietPeriod(), new UpstreamCause((Run)build), buildActions.toArray(new Action[0])); if (Jenkins.getInstance().getItemByFullName(p.getFullName()) == p) { String name = ModelHyperlinkNote.encodeTo(p); if (scheduled) { diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java index 91850c271b..5f5410b59e 100644 --- a/core/src/main/java/hudson/tasks/Maven.java +++ b/core/src/main/java/hudson/tasks/Maven.java @@ -470,7 +470,7 @@ public class Maven extends Builder { } } } - this.installations = tmpList.toArray(new MavenInstallation[tmpList.size()]); + this.installations = tmpList.toArray(new MavenInstallation[0]); save(); } diff --git a/core/src/main/java/hudson/tasks/Shell.java b/core/src/main/java/hudson/tasks/Shell.java index d582cddeb9..cfafd179b2 100644 --- a/core/src/main/java/hudson/tasks/Shell.java +++ b/core/src/main/java/hudson/tasks/Shell.java @@ -92,7 +92,7 @@ public class Shell extends CommandInterpreter { args.addAll(Arrays.asList(Util.tokenize(command.substring(0,end).trim()))); args.add(script.getRemote()); args.set(0,args.get(0).substring(2)); // trim off "#!" - return args.toArray(new String[args.size()]); + return args.toArray(new String[0]); } else return new String[] { getDescriptor().getShellOrDefault(script.getChannel()), "-xe", script.getRemote()}; } diff --git a/core/src/main/java/hudson/util/ArgumentListBuilder.java b/core/src/main/java/hudson/util/ArgumentListBuilder.java index d40cbc5233..4962892658 100644 --- a/core/src/main/java/hudson/util/ArgumentListBuilder.java +++ b/core/src/main/java/hudson/util/ArgumentListBuilder.java @@ -260,7 +260,7 @@ public class ArgumentListBuilder implements Serializable, Cloneable { } public String[] toCommandArray() { - return args.toArray(new String[args.size()]); + return args.toArray(new String[0]); } @Override diff --git a/core/src/main/java/hudson/util/DataSetBuilder.java b/core/src/main/java/hudson/util/DataSetBuilder.java index 87fd0bba42..d13dbce112 100644 --- a/core/src/main/java/hudson/util/DataSetBuilder.java +++ b/core/src/main/java/hudson/util/DataSetBuilder.java @@ -60,8 +60,8 @@ public final class DataSetBuilder rowSet = new TreeSet<>(rows); TreeSet colSet = new TreeSet<>(columns); - Comparable[] _rows = rowSet.toArray(new Comparable[rowSet.size()]); - Comparable[] _cols = colSet.toArray(new Comparable[colSet.size()]); + Comparable[] _rows = rowSet.toArray(new Comparable[0]); + Comparable[] _cols = colSet.toArray(new Comparable[0]); // insert rows and columns in the right order for (Comparable r : _rows) diff --git a/core/src/main/java/hudson/util/VariableResolver.java b/core/src/main/java/hudson/util/VariableResolver.java index 909dd0860b..2f57719185 100644 --- a/core/src/main/java/hudson/util/VariableResolver.java +++ b/core/src/main/java/hudson/util/VariableResolver.java @@ -87,7 +87,7 @@ public interface VariableResolver { } public Union(Collection> resolvers) { - this.resolvers = resolvers.toArray(new VariableResolver[resolvers.size()]); + this.resolvers = resolvers.toArray(new VariableResolver[0]); } public V resolve(String name) { diff --git a/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java b/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java index c29f088cdf..712cf83b1a 100644 --- a/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java +++ b/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java @@ -68,7 +68,7 @@ public class RenderOnDemandClosure { Script script = (Script) c.getVariables().get("org.apache.commons.jelly.body"); if(script!=null) bodyStack.add(script); } - this.bodyStack = bodyStack.toArray(new Script[bodyStack.size()]); + this.bodyStack = bodyStack.toArray(new Script[0]); assert !bodyStack.isEmpty(); // there must be at least one, which is the direct child of Map variables = new HashMap<>(); diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java index a98ce99de8..389453de3e 100644 --- a/core/src/main/java/jenkins/model/Jenkins.java +++ b/core/src/main/java/jenkins/model/Jenkins.java @@ -1916,7 +1916,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve * Gets the read-only list of all {@link Computer}s. */ public Computer[] getComputers() { - Computer[] r = computers.values().toArray(new Computer[computers.size()]); + Computer[] r = computers.values().toArray(new Computer[0]); Arrays.sort(r,new Comparator() { @Override public int compare(Computer lhs, Computer rhs) { if(lhs.getNode()==Jenkins.this) return -1; @@ -3170,7 +3170,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve })); } - g.requires(loadJobs.toArray(new Handle[loadJobs.size()])).attains(JOB_LOADED).add("Cleaning up obsolete items deleted from the disk", new Executable() { + g.requires(loadJobs.toArray(new Handle[0])).attains(JOB_LOADED).add("Cleaning up obsolete items deleted from the disk", new Executable() { public void run(Reactor reactor) throws Exception { // anything we didn't load from disk, throw them away. // doing this after loading from disk allows newly loaded items diff --git a/core/src/main/java/jenkins/org/apache/commons/validator/routines/InetAddressValidator.java b/core/src/main/java/jenkins/org/apache/commons/validator/routines/InetAddressValidator.java index d051018096..25e0466900 100644 --- a/core/src/main/java/jenkins/org/apache/commons/validator/routines/InetAddressValidator.java +++ b/core/src/main/java/jenkins/org/apache/commons/validator/routines/InetAddressValidator.java @@ -149,7 +149,7 @@ public class InetAddressValidator implements Serializable { } else if (inet6Address.startsWith("::") && !octetList.isEmpty()) { octetList.remove(0); } - octets = octetList.toArray(new String[octetList.size()]); + octets = octetList.toArray(new String[0]); } if (octets.length > IPV6_MAX_HEX_GROUPS) { return false; diff --git a/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java b/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java index 71919db1a8..34a2064c5f 100644 --- a/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java +++ b/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java @@ -63,7 +63,7 @@ public class LastGrantedAuthoritiesProperty extends UserProperty { } } - return grantedAuthorities.toArray(new GrantedAuthority[grantedAuthorities.size()]); + return grantedAuthorities.toArray(new GrantedAuthority[0]); } /** @@ -74,7 +74,7 @@ public class LastGrantedAuthoritiesProperty extends UserProperty { for (GrantedAuthority ga : auth.getAuthorities()) { roles.add(ga.getAuthority()); } - String[] a = roles.toArray(new String[roles.size()]); + String[] a = roles.toArray(new String[0]); if (!Arrays.equals(this.roles,a)) { this.roles = a; this.timestamp = System.currentTimeMillis(); diff --git a/core/src/main/java/jenkins/slaves/restarter/UnixSlaveRestarter.java b/core/src/main/java/jenkins/slaves/restarter/UnixSlaveRestarter.java index 086c044efa..0a48762891 100644 --- a/core/src/main/java/jenkins/slaves/restarter/UnixSlaveRestarter.java +++ b/core/src/main/java/jenkins/slaves/restarter/UnixSlaveRestarter.java @@ -54,7 +54,7 @@ public class UnixSlaveRestarter extends SlaveRestarter { // exec to self String exe = Daemon.getCurrentExecutable(); - LIBC.execv(exe, new StringArray(args.toArray(new String[args.size()]))); + LIBC.execv(exe, new StringArray(args.toArray(new String[0]))); throw new IOException("Failed to exec '" + exe + "' " + LIBC.strerror(Native.getLastError())); }