Remove redundant code (#1290)

* Remove redundant code

Author: elharo

maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java

@@ -431,7 +431,7 @@ public void addMergedRevision(String mergedRevision) {
     }
 
     public Set<String> getMergedRevisions() {
-        return mergedRevisions == null ? Collections.<String>emptySet() : mergedRevisions;
+        return mergedRevisions == null ? Collections.emptySet() : mergedRevisions;
     }
 
     public void setMergedRevisions(Set<String> mergedRevisions) {

maven-scm-api/src/main/java/org/apache/maven/scm/repository/ScmRepository.java

@@ -54,6 +54,6 @@ public ScmProviderRepository getProviderRepository() {
 
     /** {@inheritDoc} */
     public String toString() {
-        return provider.toString() + ":" + providerRepository.toString();
+        return provider + ":" + providerRepository;
     }
 }

maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java

@@ -79,7 +79,7 @@ public void testFilesListExcludes() throws IOException {
 
         Iterator<File> it = files.iterator();
         while (it.hasNext()) {
-            File file = (File) it.next();
+            File file = it.next();
             if (removeBasedir(file.getAbsolutePath()).indexOf("exclude") != -1) {
                 fail("Found excludes in file set: " + file);
             }

maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java

@@ -192,8 +192,6 @@ public void execute(String scmUrl, String command, File workingDirectory, ScmVer
             System.err.println("Error while executing the SCM command.");
 
             ex.printStackTrace(System.err);
-
-            return;
         }
     }
 

maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java

@@ -54,7 +54,7 @@ public void execute() throws MojoExecutionException {
 
             checkResult(result);
 
-            getLog().info("" + result.getAddedFiles().size() + " files successfully added.");
+            getLog().info(result.getAddedFiles().size() + " files successfully added.");
 
         } catch (IOException | ScmException e) {
             throw new MojoExecutionException("Cannot run add command : ", e);

maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java

@@ -220,12 +220,9 @@ private Date parseDate(SimpleDateFormat format, String date) throws MojoExecutio
         }
 
         try {
-            return format.parse(date.toString());
+            return format.parse(date);
         } catch (ParseException e) {
-            throw new MojoExecutionException(
-                    "Please use this date pattern: "
-                            + format.toLocalizedPattern().toString(),
-                    e);
+            throw new MojoExecutionException("Please use this date pattern: " + format.toLocalizedPattern(), e);
         }
     }
 }

maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java

@@ -108,7 +108,7 @@ private void validateConnection(String connectionString, String type) throws Moj
             Iterator<String> iter = messages.iterator();
 
             while (iter.hasNext()) {
-                getLog().error(iter.next().toString());
+                getLog().error(iter.next());
             }
 
             getLog().error("The invalid scm url connection: '" + connectionString + "'.");

maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddConsumer.java

@@ -41,7 +41,7 @@ public HgAddConsumer(File workingDir) {
 
     /** {@inheritDoc} */
     public void doConsume(ScmFileStatus status, String trimmedLine) {
-        if (status != null && status == ScmFileStatus.ADDED) {
+        if (status == ScmFileStatus.ADDED) {
             // Only include real files (not directories)
             File tmpFile = new File(workingDir, trimmedLine);
             if (!tmpFile.exists()) {

maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/remove/HgRemoveConsumer.java

@@ -42,7 +42,7 @@ public HgRemoveConsumer(File workingDir) {
 
     /** {@inheritDoc} */
     public void doConsume(ScmFileStatus status, String trimmedLine) {
-        if (status != null && status == ScmFileStatus.DELETED) {
+        if (status == ScmFileStatus.DELETED) {
             // Only include real files (not directories)
             File tmpFile = new File(workingDir, trimmedLine);
             if (!tmpFile.exists()) {

maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java

@@ -110,7 +110,7 @@ public void testDeletion() throws Exception {
         Iterator<ScmFile> files = new TreeSet<ScmFile>(updatedFiles).iterator();
 
         // readme.txt
-        ScmFile file = (ScmFile) files.next();
+        ScmFile file = files.next();
         assertPath("/readme.txt", file.getPath());
         assertTrue(file.getStatus().isUpdate());