This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
The following commit(s) were added to refs/heads/master by this push:
new cf0718ea5 [MNG-6847] Use diamond operator
cf0718ea5 is described below
commit cf0718ea5712059af700214713dfc0032e5db706
Author: Tim te Beek <[email protected]>
AuthorDate: Sat Aug 19 18:46:20 2023 +0000
[MNG-6847] Use diamond operator
Use this link to re-run the recipe:
https://app.moderne.io/recipes/org.openrewrite.staticanalysis.UseDiamondOperator?organizationId=QXBhY2hlIE1hdmVu
Co-authored-by: Moderne <[email protected]>
---
maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java | 6 +++---
.../src/main/java/org/apache/maven/scm/CommandParameters.java | 2 +-
maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java | 2 +-
.../main/java/org/apache/maven/scm/command/add/AddScmResult.java | 2 +-
.../org/apache/maven/scm/command/checkin/CheckInScmResult.java | 2 +-
.../java/org/apache/maven/scm/command/info/InfoScmResult.java | 2 +-
.../java/org/apache/maven/scm/command/list/ListScmResult.java | 2 +-
.../apache/maven/scm/command/remoteinfo/RemoteInfoScmResult.java | 4 ++--
.../apache/maven/scm/command/update/AbstractUpdateCommand.java | 2 +-
.../java/org/apache/maven/scm/command/update/UpdateScmResult.java | 2 +-
.../java/org/apache/maven/scm/provider/AbstractScmProvider.java | 2 +-
.../src/main/java/org/apache/maven/scm/provider/ScmUrlUtils.java | 2 +-
.../main/java/org/apache/maven/scm/util/ThreadSafeDateFormat.java | 2 +-
.../main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java | 4 ++--
.../src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java | 8 ++++----
.../apache/maven/scm/provider/hg/command/add/HgAddConsumer.java | 2 +-
.../maven/scm/provider/hg/command/branch/HgBranchCommand.java | 2 +-
.../scm/provider/hg/command/changelog/HgChangeLogCommand.java | 2 +-
.../scm/provider/hg/command/changelog/HgChangeLogConsumer.java | 4 ++--
.../maven/scm/provider/hg/command/checkin/HgCheckInCommand.java | 2 +-
.../maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java | 2 +-
.../scm/provider/hg/command/checkout/HgCheckOutConsumer.java | 2 +-
.../scm/provider/hg/command/inventory/HgOutgoingConsumer.java | 2 +-
.../maven/scm/provider/hg/command/remove/HgRemoveConsumer.java | 2 +-
.../maven/scm/provider/hg/command/status/HgStatusConsumer.java | 2 +-
.../apache/maven/scm/provider/hg/command/tag/HgTagCommand.java | 2 +-
.../test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java | 2 +-
.../maven/scm/provider/local/command/add/LocalAddCommand.java | 2 +-
.../scm/provider/local/repository/LocalScmProviderRepository.java | 2 +-
.../scm/provider/git/gitexe/command/status/GitStatusConsumer.java | 2 +-
.../scm/provider/git/gitexe/command/add/GitExeAddCommandTest.java | 4 ++--
.../git/gitexe/command/changelog/GitChangeLogConsumerTest.java | 2 +-
.../scm/provider/git/jgit/command/blame/JGitBlameCommand.java | 2 +-
.../org/apache/maven/scm/provider/svn/SvnConfigFileReader.java | 2 +-
.../svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java | 2 +-
.../main/java/org/apache/maven/scm/manager/ScmManagerStub.java | 2 +-
.../main/java/org/apache/maven/scm/provider/ScmProviderStub.java | 2 +-
.../maven/scm/tck/command/checkout/CheckOutCommandTckTest.java | 2 +-
38 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
b/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
index 16f37473c..750d2963d 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
@@ -178,7 +178,7 @@ public class ChangeSet implements Serializable {
*/
public List<ChangeFile> getFiles() {
if (files == null) {
- return new ArrayList<ChangeFile>();
+ return new ArrayList<>();
}
return files;
}
@@ -194,7 +194,7 @@ public class ChangeSet implements Serializable {
public void addFile(ChangeFile file) {
if (files == null) {
- files = new ArrayList<ChangeFile>();
+ files = new ArrayList<>();
}
files.add(file);
@@ -425,7 +425,7 @@ public class ChangeSet implements Serializable {
public void addMergedRevision(String mergedRevision) {
if (mergedRevisions == null) {
- mergedRevisions = new LinkedHashSet<String>();
+ mergedRevisions = new LinkedHashSet<>();
}
mergedRevisions.add(mergedRevision);
}
diff --git
a/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java
b/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java
index 4cca6878a..4f9cd187e 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java
@@ -32,7 +32,7 @@ import java.util.Map;
public class CommandParameters implements Serializable {
private static final long serialVersionUID = -7346070735958137283L;
- private Map<String, Object> parameters = new HashMap<String, Object>();
+ private Map<String, Object> parameters = new HashMap<>();
// ----------------------------------------------------------------------
// String
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java
b/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java
index a2e132e9c..a6f50a11a 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java
@@ -61,7 +61,7 @@ public class ScmFileSet implements Serializable {
* @param basedir directory files in the set are relative to
*/
public ScmFileSet(File basedir) {
- this(basedir, new ArrayList<File>(0));
+ this(basedir, new ArrayList<>(0));
}
/**
diff --git
a/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AddScmResult.java
b/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AddScmResult.java
index ade880aa5..b05795d2c 100644
---
a/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AddScmResult.java
+++
b/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AddScmResult.java
@@ -38,7 +38,7 @@ public class AddScmResult extends ScmResult {
public AddScmResult(String commandLine, String providerMessage, String
commandOutput, boolean success) {
super(commandLine, providerMessage, commandOutput, success);
- addedFiles = new ArrayList<ScmFile>(0);
+ addedFiles = new ArrayList<>(0);
}
public AddScmResult(String commandLine, List<ScmFile> addedFiles) {
diff --git
a/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java
b/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java
index a2c6aa609..dc90f3a73 100644
---
a/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java
+++
b/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java
@@ -66,7 +66,7 @@ public class CheckInScmResult extends ScmResult {
public List<ScmFile> getCheckedInFiles() {
if (this.checkedInFiles == null) {
- this.checkedInFiles = new ArrayList<ScmFile>();
+ this.checkedInFiles = new ArrayList<>();
}
return checkedInFiles;
}
diff --git
a/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoScmResult.java
b/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoScmResult.java
index 9addc3fd9..0c4e963be 100644
---
a/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoScmResult.java
+++
b/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoScmResult.java
@@ -36,7 +36,7 @@ public class InfoScmResult extends ScmResult {
public InfoScmResult(String commandLine, String providerMessage, String
commandOutput, boolean success) {
super(commandLine, providerMessage, commandOutput, success);
- infoItems = new ArrayList<InfoItem>(0);
+ infoItems = new ArrayList<>(0);
}
public InfoScmResult(String commandLine, List<InfoItem> files) {
diff --git
a/maven-scm-api/src/main/java/org/apache/maven/scm/command/list/ListScmResult.java
b/maven-scm-api/src/main/java/org/apache/maven/scm/command/list/ListScmResult.java
index acf846e3e..49086adec 100644
---
a/maven-scm-api/src/main/java/org/apache/maven/scm/command/list/ListScmResult.java
+++
b/maven-scm-api/src/main/java/org/apache/maven/scm/command/list/ListScmResult.java
@@ -39,7 +39,7 @@ public class ListScmResult extends ScmResult {
public ListScmResult(String commandLine, String providerMessage, String
commandOutput, boolean success) {
super(commandLine, providerMessage, commandOutput, success);
- files = new ArrayList<ScmFile>(0);
+ files = new ArrayList<>(0);
}
public ListScmResult(String commandLine, List<ScmFile> files) {
diff --git
a/maven-scm-api/src/main/java/org/apache/maven/scm/command/remoteinfo/RemoteInfoScmResult.java
b/maven-scm-api/src/main/java/org/apache/maven/scm/command/remoteinfo/RemoteInfoScmResult.java
index a20a673a5..9320be673 100644
---
a/maven-scm-api/src/main/java/org/apache/maven/scm/command/remoteinfo/RemoteInfoScmResult.java
+++
b/maven-scm-api/src/main/java/org/apache/maven/scm/command/remoteinfo/RemoteInfoScmResult.java
@@ -34,13 +34,13 @@ public class RemoteInfoScmResult extends ScmResult {
* depending on scm informations can be different
* svn: branch name / remote url
*/
- private Map<String, String> branches = new HashMap<String, String>();
+ private Map<String, String> branches = new HashMap<>();
/**
* depending on scm informations can be different
* svn: branch name / remote url
*/
- private Map<String, String> tags = new HashMap<String, String>();
+ private Map<String, String> tags = new HashMap<>();
public RemoteInfoScmResult(String commandLine, String providerMessage,
String commandOutput, boolean success) {
super(commandLine, providerMessage, commandOutput, success);
diff --git
a/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java
b/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java
index 0d33b87d9..22521b6f3 100644
---
a/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java
+++
b/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java
@@ -67,7 +67,7 @@ public abstract class AbstractUpdateCommand extends
AbstractCommand {
ChangeLogScmResult changeLogScmResult =
(ChangeLogScmResult)
changeLogCmd.executeCommand(repository, fileSet, parameters);
- List<ChangeSet> changes = new ArrayList<ChangeSet>();
+ List<ChangeSet> changes = new ArrayList<>();
ChangeLogSet changeLogSet = changeLogScmResult.getChangeLog();
diff --git
a/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java
b/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java
index 57296e06f..e1d4f0e50 100644
---
a/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java
+++
b/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java
@@ -67,7 +67,7 @@ public class UpdateScmResult extends ScmResult {
*/
public List<ChangeSet> getChanges() {
if (changes == null) {
- return new ArrayList<ChangeSet>();
+ return new ArrayList<>();
}
return changes;
}
diff --git
a/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
b/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
index 517325c26..414156b28 100644
---
a/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
+++
b/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
@@ -105,7 +105,7 @@ public abstract class AbstractScmProvider implements
ScmProvider {
*/
@Override
public List<String> validateScmUrl(String scmSpecificUrl, char delimiter) {
- List<String> messages = new ArrayList<String>();
+ List<String> messages = new ArrayList<>();
try {
makeProviderScmRepository(scmSpecificUrl, delimiter);
diff --git
a/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmUrlUtils.java
b/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmUrlUtils.java
index 39a6cb248..48235edc7 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmUrlUtils.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmUrlUtils.java
@@ -118,7 +118,7 @@ public abstract class ScmUrlUtils {
* @return A <code>List</code> that contains the errors that occured
*/
public static List<String> validate(String scmUrl) {
- List<String> messages = new ArrayList<String>();
+ List<String> messages = new ArrayList<>();
if (scmUrl == null) {
messages.add("The scm url cannot be null.");
diff --git
a/maven-scm-api/src/main/java/org/apache/maven/scm/util/ThreadSafeDateFormat.java
b/maven-scm-api/src/main/java/org/apache/maven/scm/util/ThreadSafeDateFormat.java
index 0aa377aa0..3215795b1 100644
---
a/maven-scm-api/src/main/java/org/apache/maven/scm/util/ThreadSafeDateFormat.java
+++
b/maven-scm-api/src/main/java/org/apache/maven/scm/util/ThreadSafeDateFormat.java
@@ -47,7 +47,7 @@ public class ThreadSafeDateFormat extends DateFormat {
public SoftReference<SimpleDateFormat> get() {
SoftReference<SimpleDateFormat> softRef = super.get();
if (softRef == null || softRef.get() == null) {
- softRef = new SoftReference<SimpleDateFormat>(new
SimpleDateFormat(dateFormat));
+ softRef = new SoftReference<>(new
SimpleDateFormat(dateFormat));
super.set(softRef);
}
return softRef;
diff --git
a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
index 2b5234429..e8c2527b3 100644
---
a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
+++
b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
@@ -430,7 +430,7 @@ public abstract class AbstractScmMojo extends AbstractMojo {
}
protected void handleExcludesIncludesAfterCheckoutAndExport(File
checkoutDirectory) throws MojoExecutionException {
- List<String> includes = new ArrayList<String>();
+ List<String> includes = new ArrayList<>();
if (!StringUtils.isBlank(this.getIncludes())) {
String[] tokens = StringUtils.split(this.getIncludes(), ",");
@@ -439,7 +439,7 @@ public abstract class AbstractScmMojo extends AbstractMojo {
}
}
- List<String> excludes = new ArrayList<String>();
+ List<String> excludes = new ArrayList<>();
if (!StringUtils.isBlank(this.getExcludes())) {
String[] tokens = StringUtils.split(this.getExcludes(), ",");
diff --git
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
index 9f879be44..fb91ac817 100644
---
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
+++
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
@@ -56,25 +56,25 @@ public final class HgUtils {
/**
* Map between command and its valid exit codes
*/
- private static final Map<String, List<Integer>> EXIT_CODE_MAP = new
HashMap<String, List<Integer>>();
+ private static final Map<String, List<Integer>> EXIT_CODE_MAP = new
HashMap<>();
/**
* Default exit codes for entries not in exitCodeMap
*/
- private static final List<Integer> DEFAULT_EXIT_CODES = new
ArrayList<Integer>();
+ private static final List<Integer> DEFAULT_EXIT_CODES = new ArrayList<>();
/** Setup exit codes*/
static {
DEFAULT_EXIT_CODES.add(Integer.valueOf(0));
// Diff is different
- List<Integer> diffExitCodes = new ArrayList<Integer>(3);
+ List<Integer> diffExitCodes = new ArrayList<>(3);
diffExitCodes.add(Integer.valueOf(0)); // No difference
diffExitCodes.add(Integer.valueOf(1)); // Conflicts in merge-like or
changes in diff-like
diffExitCodes.add(Integer.valueOf(2)); // Unrepresentable diff changes
EXIT_CODE_MAP.put(HgCommandConstants.DIFF_CMD, diffExitCodes);
// Outgoing is different
- List<Integer> outgoingExitCodes = new ArrayList<Integer>(2);
+ List<Integer> outgoingExitCodes = new ArrayList<>(2);
outgoingExitCodes.add(Integer.valueOf(0)); // There are changes
outgoingExitCodes.add(Integer.valueOf(1)); // No changes
EXIT_CODE_MAP.put(HgCommandConstants.OUTGOING_CMD, outgoingExitCodes);
diff --git
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddConsumer.java
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddConsumer.java
index c2f077485..938e58273 100644
---
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddConsumer.java
+++
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddConsumer.java
@@ -33,7 +33,7 @@ import org.apache.maven.scm.provider.hg.command.HgConsumer;
public class HgAddConsumer extends HgConsumer {
private final File workingDir;
- private final List<ScmFile> addedFiles = new ArrayList<ScmFile>();
+ private final List<ScmFile> addedFiles = new ArrayList<>();
public HgAddConsumer(File workingDir) {
this.workingDir = workingDir;
diff --git
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/branch/HgBranchCommand.java
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/branch/HgBranchCommand.java
index aaa29d715..d857d16a7 100644
---
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/branch/HgBranchCommand.java
+++
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/branch/HgBranchCommand.java
@@ -130,7 +130,7 @@ public class HgBranchCommand extends AbstractBranchCommand
implements Command {
}
List<ScmFile> files = listconsumer.getFiles();
- List<ScmFile> fileList = new ArrayList<ScmFile>();
+ List<ScmFile> fileList = new ArrayList<>();
for (ScmFile f : files) {
fileList.add(new ScmFile(f.getPath(), ScmFileStatus.TAGGED));
}
diff --git
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java
index 9466368dc..e09e7fad8 100644
---
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java
+++
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java
@@ -86,7 +86,7 @@ public class HgChangeLogCommand extends
AbstractChangeLogCommand implements Comm
dateInterval.append(" to ");
dateInterval.append(dateFormat.format(endDate == null ? new Date() :
endDate)); // Upto now
- List<String> cmd = new ArrayList<String>();
+ List<String> cmd = new ArrayList<>();
cmd.addAll(Arrays.asList(
HgCommandConstants.LOG_CMD, HgCommandConstants.TEMPLATE_OPTION,
HgCommandConstants.TEMPLATE_FORMAT,
HgCommandConstants.NO_MERGES_OPTION,
diff --git
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
index 16895b2a2..588565534 100644
---
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
+++
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
@@ -50,7 +50,7 @@ public class HgChangeLogConsumer extends HgConsumer {
private static final String FILES_TOKEN = "files:";
- private List<ChangeSet> logEntries = new ArrayList<ChangeSet>();
+ private List<ChangeSet> logEntries = new ArrayList<>();
private ChangeSet currentChange;
@@ -89,7 +89,7 @@ public class HgChangeLogConsumer extends HgConsumer {
if (line.startsWith(REVNO_TAG)) {
// Init a new changeset
currentChange = new ChangeSet();
- currentChange.setFiles(new ArrayList<ChangeFile>(0));
+ currentChange.setFiles(new ArrayList<>(0));
logEntries.add(currentChange);
// parse revision
diff --git
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkin/HgCheckInCommand.java
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkin/HgCheckInCommand.java
index 484aec0dc..842f8df5f 100644
---
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkin/HgCheckInCommand.java
+++
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkin/HgCheckInCommand.java
@@ -60,7 +60,7 @@ public class HgCheckInCommand extends AbstractCheckInCommand {
repo.isPushChanges() ?
HgUtils.differentOutgoingBranchFound(workingDir, branchName) : false;
// Get files that will be committed (if not specified in fileSet)
- List<ScmFile> commitedFiles = new ArrayList<ScmFile>();
+ List<ScmFile> commitedFiles = new ArrayList<>();
List<File> files = fileSet.getFileList();
if (files.isEmpty()) { // Either commit all changes
HgStatusCommand statusCmd = new HgStatusCommand();
diff --git
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java
index a40c75832..fc0b737dd 100644
---
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java
+++
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java
@@ -64,7 +64,7 @@ public class HgCheckOutCommand extends
AbstractCheckOutCommand implements Comman
}
// Do the actual checkout
- List<String> cmdList = new ArrayList<String>();
+ List<String> cmdList = new ArrayList<>();
if (repo.isPushChanges()) {
cmdList.add(HgCommandConstants.CLONE_CMD);
} else {
diff --git
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutConsumer.java
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutConsumer.java
index 0cff626ab..3b0c9514d 100644
---
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutConsumer.java
+++
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutConsumer.java
@@ -35,7 +35,7 @@ public class HgCheckOutConsumer extends HgConsumer {
private final File workingDirectory;
- private List<ScmFile> checkedOut = new ArrayList<ScmFile>();
+ private List<ScmFile> checkedOut = new ArrayList<>();
public HgCheckOutConsumer(File workingDirectory) {
this.workingDirectory = workingDirectory;
diff --git
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java
index 99215e8be..8ca646419 100644
---
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java
+++
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java
@@ -30,7 +30,7 @@ import org.apache.maven.scm.provider.hg.command.HgConsumer;
*
*/
public class HgOutgoingConsumer extends HgConsumer {
- private List<HgChangeSet> changes = new
CopyOnWriteArrayList<HgChangeSet>();
+ private List<HgChangeSet> changes = new CopyOnWriteArrayList<>();
private static final String BRANCH = "branch";
diff --git
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/remove/HgRemoveConsumer.java
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/remove/HgRemoveConsumer.java
index 8abd33c46..5cff2fcbb 100644
---
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/remove/HgRemoveConsumer.java
+++
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/remove/HgRemoveConsumer.java
@@ -34,7 +34,7 @@ import org.apache.maven.scm.provider.hg.command.HgConsumer;
public class HgRemoveConsumer extends HgConsumer {
private final File workingDir;
- private final List<ScmFile> removedFiles = new ArrayList<ScmFile>();
+ private final List<ScmFile> removedFiles = new ArrayList<>();
public HgRemoveConsumer(File workingDir) {
this.workingDir = workingDir;
diff --git
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/status/HgStatusConsumer.java
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/status/HgStatusConsumer.java
index 1c9093d55..f4c0eccae 100644
---
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/status/HgStatusConsumer.java
+++
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/status/HgStatusConsumer.java
@@ -31,7 +31,7 @@ import org.apache.maven.scm.provider.hg.command.HgConsumer;
*
*/
class HgStatusConsumer extends HgConsumer {
- private final List<ScmFile> repositoryStatus = new ArrayList<ScmFile>();
+ private final List<ScmFile> repositoryStatus = new ArrayList<>();
private final File workingDir;
diff --git
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java
index cde6260cd..feaeb4bdb 100644
---
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java
+++
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java
@@ -113,7 +113,7 @@ public class HgTagCommand extends AbstractTagCommand
implements Command {
result = HgUtils.execute(listconsumer, fileSet.getBasedir(), listCmd);
if (result.isSuccess()) {
List<ScmFile> files = listconsumer.getFiles();
- List<ScmFile> fileList = new ArrayList<ScmFile>();
+ List<ScmFile> fileList = new ArrayList<>();
for (ScmFile f : files) {
if (!f.getPath().endsWith(".hgtags")) {
fileList.add(new ScmFile(f.getPath(),
ScmFileStatus.TAGGED));
diff --git
a/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java
b/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java
index 24d83e455..1fcfc48c7 100644
---
a/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java
+++
b/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java
@@ -74,7 +74,7 @@ public class HgRepoUtils extends ScmTestCase {
HgUtils.execute(WORKING_DIR, init_cmd);
// Create and add files to repository
- List<File> files = new ArrayList<File>();
+ List<File> files = new ArrayList<>();
for (int i = 0; i < filesInTestBranch.length; i++) {
File file = new File(WORKING_DIR.getAbsolutePath(),
filesInTestBranch[i]);
if (file.getParentFile() != null &&
!file.getParentFile().exists()) {
diff --git
a/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/add/LocalAddCommand.java
b/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/add/LocalAddCommand.java
index c6320d1e1..3f4e0efad 100644
---
a/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/add/LocalAddCommand.java
+++
b/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/add/LocalAddCommand.java
@@ -43,7 +43,7 @@ public class LocalAddCommand extends AbstractAddCommand
implements LocalCommand
ScmProviderRepository repository, ScmFileSet fileSet, String
message, boolean binary) throws ScmException {
LocalScmProviderRepository localRepo = (LocalScmProviderRepository)
repository;
- List<ScmFile> fileList = new ArrayList<ScmFile>();
+ List<ScmFile> fileList = new ArrayList<>();
for (File file : fileSet.getFileList()) {
String path = file.getPath().replace('\\', '/');
localRepo.addFile(path);
diff --git
a/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/repository/LocalScmProviderRepository.java
b/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/repository/LocalScmProviderRepository.java
index 40b8a1628..cc4c8f7ba 100644
---
a/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/repository/LocalScmProviderRepository.java
+++
b/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/repository/LocalScmProviderRepository.java
@@ -32,7 +32,7 @@ public class LocalScmProviderRepository extends
ScmProviderRepository {
private String module;
- private Set<String> addedFiles = new HashSet<String>();
+ private Set<String> addedFiles = new HashSet<>();
/**
* @param root
diff --git
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
index 942a017cc..68b8a878c 100644
---
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
+++
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
@@ -150,7 +150,7 @@ public class GitStatusConsumer extends AbstractConsumer {
ScmFileStatus status = null;
- List<String> files = new ArrayList<String>();
+ List<String> files = new ArrayList<>();
Matcher matcher;
if ((matcher = ADDED_PATTERN.matcher(line)).find()) {
diff --git
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitExeAddCommandTest.java
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitExeAddCommandTest.java
index e8cbbdd3e..5cac3ed11 100644
---
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitExeAddCommandTest.java
+++
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitExeAddCommandTest.java
@@ -36,7 +36,7 @@ public class GitExeAddCommandTest extends ScmTestCase {
@Test
public void testAddCommandSingleFile() throws Exception {
- List<File> files = new ArrayList<File>();
+ List<File> files = new ArrayList<>();
files.add(new File("myFile.java"));
@@ -45,7 +45,7 @@ public class GitExeAddCommandTest extends ScmTestCase {
@Test
public void testAddCommandMultipleFiles() throws Exception {
- List<File> files = new ArrayList<File>();
+ List<File> files = new ArrayList<>();
files.add(new File("myFile.java"));
files.add(new File("myFile2.java"));
diff --git
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumerTest.java
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumerTest.java
index ee5a7a5f4..0a1b61c99 100644
---
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumerTest.java
+++
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumerTest.java
@@ -112,7 +112,7 @@ public class GitChangeLogConsumerTest extends ScmTestCase {
List<ChangeSet> modifications = consumer.getModifications();
// must use *Linked* HashMap to have predictable toString
- final Map<ScmFileStatus, AtomicInteger> summary = new
LinkedHashMap<ScmFileStatus, AtomicInteger>();
+ final Map<ScmFileStatus, AtomicInteger> summary = new
LinkedHashMap<>();
for (Iterator<ChangeSet> i = modifications.iterator(); i.hasNext(); ) {
ChangeSet entry = i.next();
diff --git
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/blame/JGitBlameCommand.java
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/blame/JGitBlameCommand.java
index d1ba02512..684074b6c 100644
---
a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/blame/JGitBlameCommand.java
+++
b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/blame/JGitBlameCommand.java
@@ -49,7 +49,7 @@ public class JGitBlameCommand extends AbstractBlameCommand
implements GitCommand
git = JGitUtils.openRepo(basedir);
BlameResult blameResult = git.blame().setFilePath(filename).call();
- List<BlameLine> lines = new ArrayList<BlameLine>();
+ List<BlameLine> lines = new ArrayList<>();
int i = 0;
while ((i = blameResult.computeNext()) != -1) {
diff --git
a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnConfigFileReader.java
b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnConfigFileReader.java
index e3dd9276f..06e2a95ad 100644
---
a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnConfigFileReader.java
+++
b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnConfigFileReader.java
@@ -96,7 +96,7 @@ public class SvnConfigFileReader {
* @return the list of all lines
*/
private List<String> getConfLines() {
- List<String> lines = new ArrayList<String>();
+ List<String> lines = new ArrayList<>();
BufferedReader reader = null;
diff --git
a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java
b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java
index 30bfd05d7..5663fa295 100644
---
a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java
+++
b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java
@@ -204,7 +204,7 @@ public class SvnChangeLogConsumerTest extends ScmTestCase {
int origFileCounter = 0;
// must use *Linked* HashMap to have predictable toString
- final Map<ScmFileStatus, AtomicInteger> summary = new
LinkedHashMap<ScmFileStatus, AtomicInteger>();
+ final Map<ScmFileStatus, AtomicInteger> summary = new
LinkedHashMap<>();
for (ChangeSet entry : consumer.getModifications()) {
diff --git
a/maven-scm-test/src/main/java/org/apache/maven/scm/manager/ScmManagerStub.java
b/maven-scm-test/src/main/java/org/apache/maven/scm/manager/ScmManagerStub.java
index 676ef5673..fc8c3b97d 100644
---
a/maven-scm-test/src/main/java/org/apache/maven/scm/manager/ScmManagerStub.java
+++
b/maven-scm-test/src/main/java/org/apache/maven/scm/manager/ScmManagerStub.java
@@ -75,7 +75,7 @@ public class ScmManagerStub implements ScmManager {
public ScmManagerStub() {
setScmRepository(new ScmRepositoryStub());
setScmProvider(new ScmProviderStub());
- setMessages(new ArrayList<String>(0));
+ setMessages(new ArrayList<>(0));
}
public void setScmProvider(ScmProvider scmProvider) {
diff --git
a/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java
b/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java
index a400d6202..529e13ab3 100644
---
a/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java
+++
b/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java
@@ -74,7 +74,7 @@ public class ScmProviderStub implements ScmProvider {
private ScmProviderRepository scmProviderRepository = new
ScmProviderRepositoryStub();
- private List<String> errors = new ArrayList<String>();
+ private List<String> errors = new ArrayList<>();
private AddScmResult addScmResult;
diff --git
a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java
b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java
index dc189694e..77d126c77 100644
---
a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java
+++
b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java
@@ -48,7 +48,7 @@ public abstract class CheckOutCommandTckTest extends
ScmTckTestCase {
List<ScmFile> checkedOutFiles = result.getCheckedOutFiles();
if (checkedOutFiles.size() != 4) {
- SortedSet<ScmFile> files = new TreeSet<ScmFile>(checkedOutFiles);
+ SortedSet<ScmFile> files = new TreeSet<>(checkedOutFiles);
int i = 0;
