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-changelog-plugin.git
commit b513e3461b9e59a2c900c78a45ed80391b75929e Author: Sylwester Lachiewicz <slachiew...@apache.org> AuthorDate: Fri May 3 18:17:37 2024 +0200 [MCHANGELOG-151] Cleanups --- .../maven/plugins/changelog/ChangeLogHandler.java | 4 +- .../maven/plugins/changelog/ChangeLogReport.java | 35 ++--- .../plugins/changelog/DeveloperActivityReport.java | 2 - .../plugins/changelog/FileActivityComparator.java | 2 - .../plugins/changelog/FileActivityReport.java | 2 - .../changelog/AbstractChangeLogReportTest.java | 16 +- .../plugins/changelog/ChangeLogReportTest.java | 1 - .../changelog/DeveloperActivityReportTest.java | 1 - .../plugins/changelog/FileActivityReportTest.java | 1 - .../changelog/stubs/ChangeLogScmResultStub.java | 4 +- .../plugins/changelog/stubs/DevelopersStub.java | 1 - .../changelog/stubs/FailedScmManagerStub.java | 4 +- .../plugins/changelog/stubs/MavenProjectStub.java | 1 - .../plugins/changelog/stubs/ScmManagerStub.java | 22 +-- .../changelog/stubs/ScmManagerWithHostStub.java | 5 +- .../changelog/stubs/ScmProviderRepositoryStub.java | 1 - .../plugins/changelog/stubs/ScmProviderStub.java | 173 ++++++++------------- .../plugins/changelog/stubs/ScmRepositoryStub.java | 1 - .../plugins/changelog/stubs/SettingsStub.java | 1 - 19 files changed, 90 insertions(+), 187 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/changelog/ChangeLogHandler.java b/src/main/java/org/apache/maven/plugins/changelog/ChangeLogHandler.java index 3455f1b..21171d3 100644 --- a/src/main/java/org/apache/maven/plugins/changelog/ChangeLogHandler.java +++ b/src/main/java/org/apache/maven/plugins/changelog/ChangeLogHandler.java @@ -38,8 +38,6 @@ import org.xml.sax.helpers.DefaultHandler; /** * Change log generated xml parser. SAXParser listener for processing a previously generated xml into several * change log sets. - * - * @version $Id$ */ public class ChangeLogHandler extends DefaultHandler { // Use the same time zone offset when reading and adding times @@ -48,7 +46,7 @@ public class ChangeLogHandler extends DefaultHandler { private static final TimeZone TIMEZONE = TimeZone.getTimeZone(TIMEZONE_STRING); - private Collection<ChangeLogSet> changeSets; + private final Collection<ChangeLogSet> changeSets; private String bufData = ""; diff --git a/src/main/java/org/apache/maven/plugins/changelog/ChangeLogReport.java b/src/main/java/org/apache/maven/plugins/changelog/ChangeLogReport.java index 60f6c8f..535dc32 100644 --- a/src/main/java/org/apache/maven/plugins/changelog/ChangeLogReport.java +++ b/src/main/java/org/apache/maven/plugins/changelog/ChangeLogReport.java @@ -23,6 +23,8 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; import java.io.StringReader; import java.io.UnsupportedEncodingException; import java.io.Writer; @@ -76,13 +78,9 @@ import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository; import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.settings.Server; import org.apache.maven.settings.Settings; -import org.codehaus.plexus.util.ReaderFactory; -import org.codehaus.plexus.util.WriterFactory; /** * Generate a changelog report. - * - * @version $Id$ */ @Mojo(name = "changelog") public class ChangeLogReport extends AbstractMavenReport { @@ -466,7 +464,7 @@ public class ChangeLogReport extends AbstractMavenReport { * or defaulted by the Mojo API. */ private void initializeDefaultConfigurationParameters() { - if (displayFileRevDetailUrl == null || displayFileRevDetailUrl.length() == 0) { + if (displayFileRevDetailUrl == null || displayFileRevDetailUrl.isEmpty()) { displayFileRevDetailUrl = displayFileDetailUrl; } } @@ -504,16 +502,13 @@ public class ChangeLogReport extends AbstractMavenReport { if (outputXML.exists()) { // CHECKSTYLE_OFF: MagicNumber if (outputXMLExpiration > 0 - && outputXMLExpiration * 60000 > System.currentTimeMillis() - outputXML.lastModified()) + && outputXMLExpiration * 60000L > System.currentTimeMillis() - outputXML.lastModified()) // CHECKSTYLE_ON: MagicNumber { try { - // ReaderFactory.newReader( outputXML, getOutputEncoding() ); - // FileInputStream fIn = new FileInputStream( outputXML ); - getLog().info("Using existing changelog.xml..."); - - changelogList = ChangeLog.loadChangedSets(ReaderFactory.newReader(outputXML, getOutputEncoding())); + changelogList = ChangeLog.loadChangedSets( + new InputStreamReader(Files.newInputStream(outputXML.toPath()), getOutputEncoding())); } catch (FileNotFoundException e) { // do nothing, just regenerate } catch (Exception e) { @@ -533,8 +528,6 @@ public class ChangeLogReport extends AbstractMavenReport { try { writeChangelogXml(changelogList); - } catch (UnsupportedEncodingException e) { - throw new MavenReportException("Can't create " + outputXML.getAbsolutePath(), e); } catch (IOException e) { throw new MavenReportException("Can't create " + outputXML.getAbsolutePath(), e); } @@ -569,13 +562,7 @@ public class ChangeLogReport extends AbstractMavenReport { changelogXml.append("\n</changelog>"); outputXML.getParentFile().mkdirs(); - - // PrintWriter pw = new PrintWriter( new BufferedOutputStream( new FileOutputStream( outputXML ) ) ); - // pw.write( changelogXml.toString() ); - // pw.flush(); - // pw.close(); - // MCHANGELOG-86 - Writer writer = WriterFactory.newWriter( + Writer writer = new OutputStreamWriter( new BufferedOutputStream(Files.newOutputStream(outputXML.toPath())), getOutputEncoding()); writer.write(changelogXml.toString()); writer.flush(); @@ -814,7 +801,7 @@ public class ChangeLogReport extends AbstractMavenReport { * @return A date */ private Date parseDate(String date) throws MojoExecutionException { - if (date == null || date.trim().length() == 0) { + if (date == null || date.trim().isEmpty()) { return null; } @@ -1246,8 +1233,8 @@ public class ChangeLogReport extends AbstractMavenReport { BufferedReader br = new BufferedReader(sr); String line; try { - if ((issueIDRegexPattern != null && issueIDRegexPattern.length() > 0) - && (issueLinkUrl != null && issueLinkUrl.length() > 0)) { + if ((issueIDRegexPattern != null && !issueIDRegexPattern.isEmpty()) + && (issueLinkUrl != null && !issueLinkUrl.isEmpty())) { Pattern pattern = Pattern.compile(issueIDRegexPattern); line = br.readLine(); @@ -1608,7 +1595,7 @@ public class ChangeLogReport extends AbstractMavenReport { * @return The effective reporting output file encoding, never <code>null</code>. */ protected String getOutputEncoding() { - return (outputEncoding != null) ? outputEncoding : ReaderFactory.UTF_8; + return (outputEncoding != null) ? outputEncoding : "UTF-8"; } /** diff --git a/src/main/java/org/apache/maven/plugins/changelog/DeveloperActivityReport.java b/src/main/java/org/apache/maven/plugins/changelog/DeveloperActivityReport.java index 7a14bc7..1620084 100644 --- a/src/main/java/org/apache/maven/plugins/changelog/DeveloperActivityReport.java +++ b/src/main/java/org/apache/maven/plugins/changelog/DeveloperActivityReport.java @@ -34,8 +34,6 @@ import org.apache.maven.scm.command.changelog.ChangeLogSet; /** * Generate a developer activity report. - * - * @version $Id$ */ @Mojo(name = "dev-activity") public class DeveloperActivityReport extends ChangeLogReport { diff --git a/src/main/java/org/apache/maven/plugins/changelog/FileActivityComparator.java b/src/main/java/org/apache/maven/plugins/changelog/FileActivityComparator.java index ba8a314..3a1f4d2 100644 --- a/src/main/java/org/apache/maven/plugins/changelog/FileActivityComparator.java +++ b/src/main/java/org/apache/maven/plugins/changelog/FileActivityComparator.java @@ -26,8 +26,6 @@ import org.apache.maven.scm.ChangeFile; /** * Object used to sort the file-activity report into descending order. - * - * @version $Id$ */ public class FileActivityComparator implements Comparator<List<ChangeFile>> { /** diff --git a/src/main/java/org/apache/maven/plugins/changelog/FileActivityReport.java b/src/main/java/org/apache/maven/plugins/changelog/FileActivityReport.java index 8855932..f96c9ac 100644 --- a/src/main/java/org/apache/maven/plugins/changelog/FileActivityReport.java +++ b/src/main/java/org/apache/maven/plugins/changelog/FileActivityReport.java @@ -34,8 +34,6 @@ import org.apache.maven.scm.command.changelog.ChangeLogSet; /** * Generate a file activity report. - * - * @version $Id$ */ @Mojo(name = "file-activity") public class FileActivityReport extends ChangeLogReport { diff --git a/src/test/java/org/apache/maven/plugins/changelog/AbstractChangeLogReportTest.java b/src/test/java/org/apache/maven/plugins/changelog/AbstractChangeLogReportTest.java index 8354c8c..2b8c527 100644 --- a/src/test/java/org/apache/maven/plugins/changelog/AbstractChangeLogReportTest.java +++ b/src/test/java/org/apache/maven/plugins/changelog/AbstractChangeLogReportTest.java @@ -20,19 +20,16 @@ package org.apache.maven.plugins.changelog; import java.io.File; import java.io.IOException; -import java.io.Writer; import org.apache.maven.doxia.site.decoration.DecorationModel; import org.apache.maven.doxia.siterenderer.RendererException; import org.apache.maven.doxia.siterenderer.SiteRenderingContext; import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; import org.apache.maven.plugin.testing.AbstractMojoTestCase; -import org.codehaus.plexus.util.IOUtil; -import org.codehaus.plexus.util.WriterFactory; +import org.codehaus.plexus.util.xml.XmlStreamWriter; /** * @author <a href="mailto:vincent.sive...@gmail.com">Vincent Siveton</a> - * @version $Id$ * @since 2.2 */ public abstract class AbstractChangeLogReportTest extends AbstractMojoTestCase { @@ -45,20 +42,13 @@ public abstract class AbstractChangeLogReportTest extends AbstractMojoTestCase { * @throws IOException if any */ protected void renderer(ChangeLogReport mojo, File outputHtml) throws RendererException, IOException { - Writer writer = null; SiteRenderingContext context = new SiteRenderingContext(); context.setDecoration(new DecorationModel()); context.setTemplateName("org/apache/maven/doxia/siterenderer/resources/default-site.vm"); - try { - outputHtml.getParentFile().mkdirs(); - writer = WriterFactory.newXmlWriter(outputHtml); - + outputHtml.getParentFile().mkdirs(); + try (XmlStreamWriter writer = new XmlStreamWriter(outputHtml)) { mojo.getSiteRenderer().generateDocument(writer, (SiteRendererSink) mojo.getSink(), context); - writer.close(); - writer = null; - } finally { - IOUtil.close(writer); } } } diff --git a/src/test/java/org/apache/maven/plugins/changelog/ChangeLogReportTest.java b/src/test/java/org/apache/maven/plugins/changelog/ChangeLogReportTest.java index 131cc6a..6734a3d 100644 --- a/src/test/java/org/apache/maven/plugins/changelog/ChangeLogReportTest.java +++ b/src/test/java/org/apache/maven/plugins/changelog/ChangeLogReportTest.java @@ -29,7 +29,6 @@ import org.codehaus.plexus.util.FileUtils; /** * @author Edwin Punzalan - * @version $Id$ */ public class ChangeLogReportTest extends AbstractChangeLogReportTest { private ScmManager scmManager; diff --git a/src/test/java/org/apache/maven/plugins/changelog/DeveloperActivityReportTest.java b/src/test/java/org/apache/maven/plugins/changelog/DeveloperActivityReportTest.java index 91df6de..3978a18 100644 --- a/src/test/java/org/apache/maven/plugins/changelog/DeveloperActivityReportTest.java +++ b/src/test/java/org/apache/maven/plugins/changelog/DeveloperActivityReportTest.java @@ -26,7 +26,6 @@ import org.codehaus.plexus.util.FileUtils; /** * @author Edwin Punzalan - * @version $Id$ */ public class DeveloperActivityReportTest extends AbstractChangeLogReportTest { private ScmManager scmManager; diff --git a/src/test/java/org/apache/maven/plugins/changelog/FileActivityReportTest.java b/src/test/java/org/apache/maven/plugins/changelog/FileActivityReportTest.java index 98ead37..17de5b0 100644 --- a/src/test/java/org/apache/maven/plugins/changelog/FileActivityReportTest.java +++ b/src/test/java/org/apache/maven/plugins/changelog/FileActivityReportTest.java @@ -26,7 +26,6 @@ import org.codehaus.plexus.util.FileUtils; /** * @author Edwin Punzalan - * @version $Id$ */ public class FileActivityReportTest extends AbstractChangeLogReportTest { private ScmManager scmManager; diff --git a/src/test/java/org/apache/maven/plugins/changelog/stubs/ChangeLogScmResultStub.java b/src/test/java/org/apache/maven/plugins/changelog/stubs/ChangeLogScmResultStub.java index e9b0887..c08f1cf 100644 --- a/src/test/java/org/apache/maven/plugins/changelog/stubs/ChangeLogScmResultStub.java +++ b/src/test/java/org/apache/maven/plugins/changelog/stubs/ChangeLogScmResultStub.java @@ -21,12 +21,10 @@ package org.apache.maven.plugins.changelog.stubs; import java.util.Collections; import java.util.Date; -import org.apache.maven.scm.ChangeSet; import org.apache.maven.scm.command.changelog.ChangeLogSet; /** * @author Edwin Punzalan - * @version $Id$ */ public class ChangeLogScmResultStub extends org.apache.maven.scm.command.changelog.ChangeLogScmResult { public ChangeLogScmResultStub() { @@ -41,6 +39,6 @@ public class ChangeLogScmResultStub extends org.apache.maven.scm.command.changel * {@inheritDoc} */ public ChangeLogSet getChangeLog() { - return new ChangeLogSet(Collections.<ChangeSet>emptyList(), new Date(360), new Date(720)); + return new ChangeLogSet(Collections.emptyList(), new Date(360), new Date(720)); } } diff --git a/src/test/java/org/apache/maven/plugins/changelog/stubs/DevelopersStub.java b/src/test/java/org/apache/maven/plugins/changelog/stubs/DevelopersStub.java index e0b987c..316a51d 100644 --- a/src/test/java/org/apache/maven/plugins/changelog/stubs/DevelopersStub.java +++ b/src/test/java/org/apache/maven/plugins/changelog/stubs/DevelopersStub.java @@ -25,7 +25,6 @@ import org.apache.maven.model.Developer; /** * @author Edwin Punzalan - * @version $Id$ */ public class DevelopersStub extends ArrayList<Developer> { public DevelopersStub() { diff --git a/src/test/java/org/apache/maven/plugins/changelog/stubs/FailedScmManagerStub.java b/src/test/java/org/apache/maven/plugins/changelog/stubs/FailedScmManagerStub.java index 6b12928..5588c6b 100644 --- a/src/test/java/org/apache/maven/plugins/changelog/stubs/FailedScmManagerStub.java +++ b/src/test/java/org/apache/maven/plugins/changelog/stubs/FailedScmManagerStub.java @@ -19,19 +19,17 @@ package org.apache.maven.plugins.changelog.stubs; import org.apache.maven.scm.command.changelog.ChangeLogScmResult; -import org.apache.maven.scm.manager.NoSuchScmProviderException; import org.apache.maven.scm.provider.ScmProvider; import org.apache.maven.scm.repository.ScmRepository; /** * @author Edwin Punzalan - * @version $Id$ */ public class FailedScmManagerStub extends ScmManagerStub { /** * {@inheritDoc} */ - public ScmProvider getProviderByRepository(ScmRepository scmRepository) throws NoSuchScmProviderException { + public ScmProvider getProviderByRepository(ScmRepository scmRepository) { return new ScmProviderStub() { /** {@inheritDoc} */ protected ChangeLogScmResult getChangeLogScmResult() { diff --git a/src/test/java/org/apache/maven/plugins/changelog/stubs/MavenProjectStub.java b/src/test/java/org/apache/maven/plugins/changelog/stubs/MavenProjectStub.java index a13abd8..b5c7b54 100644 --- a/src/test/java/org/apache/maven/plugins/changelog/stubs/MavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/changelog/stubs/MavenProjectStub.java @@ -25,7 +25,6 @@ import org.codehaus.plexus.PlexusTestCase; /** * @author Edwin Punzalan - * @version $Id$ */ public class MavenProjectStub extends org.apache.maven.plugin.testing.stubs.MavenProjectStub { public static int testCounter = 0; diff --git a/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmManagerStub.java b/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmManagerStub.java index c74770b..24b37f1 100644 --- a/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmManagerStub.java +++ b/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmManagerStub.java @@ -44,16 +44,12 @@ import org.apache.maven.scm.command.status.StatusScmResult; import org.apache.maven.scm.command.tag.TagScmResult; import org.apache.maven.scm.command.unedit.UnEditScmResult; import org.apache.maven.scm.command.update.UpdateScmResult; -import org.apache.maven.scm.manager.NoSuchScmProviderException; import org.apache.maven.scm.manager.ScmManager; import org.apache.maven.scm.provider.ScmProvider; import org.apache.maven.scm.repository.ScmRepository; -import org.apache.maven.scm.repository.ScmRepositoryException; -import org.apache.maven.scm.repository.UnknownRepositoryStructure; /** * @author Edwin Punzalan - * @version $Id$ */ public class ScmManagerStub implements ScmManager { private ScmProvider scmProvider; @@ -61,29 +57,28 @@ public class ScmManagerStub implements ScmManager { /** * {@inheritDoc} */ - public ScmProvider getProviderByType(String string) throws NoSuchScmProviderException { + public ScmProvider getProviderByType(String string) { return null; } /** * {@inheritDoc} */ - public ScmProvider getProviderByUrl(String string) throws ScmRepositoryException, NoSuchScmProviderException { + public ScmProvider getProviderByUrl(String string) { return null; } /** * {@inheritDoc} */ - public ScmRepository makeProviderScmRepository(String string, File file) - throws ScmRepositoryException, UnknownRepositoryStructure, NoSuchScmProviderException { + public ScmRepository makeProviderScmRepository(String string, File file) { return null; } /** * {@inheritDoc} */ - public ScmRepository makeScmRepository(String string) throws ScmRepositoryException, NoSuchScmProviderException { + public ScmRepository makeScmRepository(String string) { return new ScmRepositoryStub(); } @@ -97,7 +92,7 @@ public class ScmManagerStub implements ScmManager { /** * {@inheritDoc} */ - public ScmProvider getProviderByRepository(ScmRepository scmRepository) throws NoSuchScmProviderException { + public ScmProvider getProviderByRepository(ScmRepository scmRepository) { return new ScmProviderStub(); } @@ -274,8 +269,7 @@ public class ScmManagerStub implements ScmManager { /** * {@inheritDoc} */ - public ExportScmResult export(ScmRepository repository, ScmFileSet fileSet, String outputDirectory) - throws ScmException { + public ExportScmResult export(ScmRepository repository, ScmFileSet fileSet, String outputDirectory) { return this.export(repository, fileSet, outputDirectory); } @@ -436,11 +430,11 @@ public class ScmManagerStub implements ScmManager { return this.getProviderByRepository(arg0).mkdir(arg0, arg1, arg2, arg3); } - public ChangeLogScmResult changeLog(ChangeLogScmRequest scmRequest) throws ScmException { + public ChangeLogScmResult changeLog(ChangeLogScmRequest scmRequest) { return null; } - public BlameScmResult blame(BlameScmRequest blameScmRequest) throws ScmException { + public BlameScmResult blame(BlameScmRequest blameScmRequest) { return null; } } diff --git a/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmManagerWithHostStub.java b/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmManagerWithHostStub.java index f40b131..5c4e217 100644 --- a/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmManagerWithHostStub.java +++ b/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmManagerWithHostStub.java @@ -18,20 +18,17 @@ */ package org.apache.maven.plugins.changelog.stubs; -import org.apache.maven.scm.manager.NoSuchScmProviderException; import org.apache.maven.scm.provider.ScmProviderRepositoryWithHost; import org.apache.maven.scm.repository.ScmRepository; -import org.apache.maven.scm.repository.ScmRepositoryException; /** * @author Edwin Punzalan - * @version $Id$ */ public class ScmManagerWithHostStub extends ScmManagerStub { /** * {@inheritDoc} */ - public ScmRepository makeScmRepository(String string) throws ScmRepositoryException, NoSuchScmProviderException { + public ScmRepository makeScmRepository(String string) { ScmProviderRepositoryWithHost scmRepository = new ScmProviderRepositoryWithHost() { /** {@inheritDoc} */ public String getHost() { diff --git a/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmProviderRepositoryStub.java b/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmProviderRepositoryStub.java index 154499f..9a7afd3 100644 --- a/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmProviderRepositoryStub.java +++ b/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmProviderRepositoryStub.java @@ -22,6 +22,5 @@ import org.apache.maven.scm.provider.ScmProviderRepository; /** * @author Edwin Punzalan - * @version $Id$ */ public class ScmProviderRepositoryStub extends ScmProviderRepository {} diff --git a/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmProviderStub.java b/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmProviderStub.java index 1ef4749..0a594a5 100644 --- a/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmProviderStub.java +++ b/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmProviderStub.java @@ -25,7 +25,6 @@ import java.util.List; import org.apache.maven.scm.CommandParameters; import org.apache.maven.scm.ScmBranch; import org.apache.maven.scm.ScmBranchParameters; -import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFileSet; import org.apache.maven.scm.ScmTagParameters; import org.apache.maven.scm.ScmVersion; @@ -54,18 +53,15 @@ import org.apache.maven.scm.log.ScmLogger; import org.apache.maven.scm.provider.ScmProvider; import org.apache.maven.scm.provider.ScmProviderRepository; import org.apache.maven.scm.repository.ScmRepository; -import org.apache.maven.scm.repository.ScmRepositoryException; -import org.apache.maven.scm.repository.UnknownRepositoryStructure; /** * @author Edwin Punzalan - * @version $Id$ */ public class ScmProviderStub implements ScmProvider { /** * {@inheritDoc} */ - public AddScmResult add(ScmRepository scmRepository, ScmFileSet scmFileSet) throws ScmException { + public AddScmResult add(ScmRepository scmRepository, ScmFileSet scmFileSet) { return null; } @@ -91,38 +87,35 @@ public class ScmProviderStub implements ScmProvider { /** * {@inheritDoc} */ - public ScmProviderRepository makeProviderScmRepository(File file) - throws ScmRepositoryException, UnknownRepositoryStructure { + public ScmProviderRepository makeProviderScmRepository(File file) { return null; } /** * {@inheritDoc} */ - public ScmProviderRepository makeProviderScmRepository(String string, char c) throws ScmRepositoryException { + public ScmProviderRepository makeProviderScmRepository(String string, char c) { return null; } /** * {@inheritDoc} */ - public AddScmResult add(ScmRepository scmRepository, ScmFileSet scmFileSet, String message) throws ScmException { + public AddScmResult add(ScmRepository scmRepository, ScmFileSet scmFileSet, String message) { return null; } /** * {@inheritDoc} */ - public BranchScmResult branch(ScmRepository scmRepository, ScmFileSet scmFileSet, String string) - throws ScmException { + public BranchScmResult branch(ScmRepository scmRepository, ScmFileSet scmFileSet, String string) { return null; } /** * {@inheritDoc} */ - public BranchScmResult branch(ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1) - throws ScmException { + public BranchScmResult branch(ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1) { return null; } @@ -137,8 +130,7 @@ public class ScmProviderStub implements ScmProvider { * {@inheritDoc} */ public ChangeLogScmResult changeLog( - ScmRepository scmRepository, ScmFileSet scmFileSet, Date date, Date date1, int i, String string) - throws ScmException { + ScmRepository scmRepository, ScmFileSet scmFileSet, Date date, Date date1, int i, String string) { return getChangeLogScmResult(); } @@ -152,8 +144,7 @@ public class ScmProviderStub implements ScmProvider { Date date1, int i, String string, - String string1) - throws ScmException { + String string1) { return getChangeLogScmResult(); } @@ -161,7 +152,7 @@ public class ScmProviderStub implements ScmProvider { * {@inheritDoc} */ public ChangeLogScmResult changeLog( - ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1) throws ScmException { + ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1) { return getChangeLogScmResult(); } @@ -169,8 +160,7 @@ public class ScmProviderStub implements ScmProvider { * {@inheritDoc} */ public ChangeLogScmResult changeLog( - ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1, String string2) - throws ScmException { + ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1, String string2) { return getChangeLogScmResult(); } @@ -178,8 +168,7 @@ public class ScmProviderStub implements ScmProvider { * {@inheritDoc} */ public ChangeLogScmResult changeLog( - ScmRepository scmRepository, ScmFileSet scmFileSet, Date date, Date date1, int i, ScmBranch scmBranch) - throws ScmException { + ScmRepository scmRepository, ScmFileSet scmFileSet, Date date, Date date1, int i, ScmBranch scmBranch) { return getChangeLogScmResult(); } @@ -193,8 +182,7 @@ public class ScmProviderStub implements ScmProvider { Date date1, int i, ScmBranch scmBranch, - String string) - throws ScmException { + String string) { return getChangeLogScmResult(); } @@ -202,8 +190,7 @@ public class ScmProviderStub implements ScmProvider { * {@inheritDoc} */ public ChangeLogScmResult changeLog( - ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion, ScmVersion scmVersion1) - throws ScmException { + ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion, ScmVersion scmVersion1) { return getChangeLogScmResult(); } @@ -215,24 +202,21 @@ public class ScmProviderStub implements ScmProvider { ScmFileSet scmFileSet, ScmVersion scmVersion, ScmVersion scmVersion1, - String string) - throws ScmException { + String string) { return getChangeLogScmResult(); } /** * {@inheritDoc} */ - public CheckInScmResult checkIn(ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1) - throws ScmException { + public CheckInScmResult checkIn(ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1) { return null; } /** * {@inheritDoc} */ - public CheckInScmResult checkIn(ScmRepository scmRepository, ScmFileSet scmFileSet, String string) - throws ScmException { + public CheckInScmResult checkIn(ScmRepository scmRepository, ScmFileSet scmFileSet, String string) { return null; } @@ -240,47 +224,42 @@ public class ScmProviderStub implements ScmProvider { * {@inheritDoc} */ public CheckInScmResult checkIn( - ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion, String string) - throws ScmException { + ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion, String string) { return null; } /** * {@inheritDoc} */ - public CheckOutScmResult checkOut(ScmRepository scmRepository, ScmFileSet scmFileSet, String string) - throws ScmException { + public CheckOutScmResult checkOut(ScmRepository scmRepository, ScmFileSet scmFileSet, String string) { return null; } /** * {@inheritDoc} */ - public CheckOutScmResult checkOut(ScmRepository scmRepository, ScmFileSet scmFileSet) throws ScmException { + public CheckOutScmResult checkOut(ScmRepository scmRepository, ScmFileSet scmFileSet) { return null; } /** * {@inheritDoc} */ - public CheckOutScmResult checkOut(ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion) - throws ScmException { + public CheckOutScmResult checkOut(ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion) { return null; } /** * {@inheritDoc} */ - public CheckOutScmResult checkOut(ScmRepository scmRepository, ScmFileSet scmFileSet, String string, boolean b) - throws ScmException { + public CheckOutScmResult checkOut(ScmRepository scmRepository, ScmFileSet scmFileSet, String string, boolean b) { return null; } /** * {@inheritDoc} */ - public CheckOutScmResult checkOut(ScmRepository scmRepository, ScmFileSet scmFileSet, boolean b) - throws ScmException { + public CheckOutScmResult checkOut(ScmRepository scmRepository, ScmFileSet scmFileSet, boolean b) { return null; } @@ -288,7 +267,7 @@ public class ScmProviderStub implements ScmProvider { * {@inheritDoc} */ public CheckOutScmResult checkOut( - ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion, boolean b) throws ScmException { + ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion, boolean b) { return null; } @@ -300,16 +279,14 @@ public class ScmProviderStub implements ScmProvider { ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion, - CommandParameters commandParameters) - throws ScmException { + CommandParameters commandParameters) { return null; } /** * {@inheritDoc} */ - public DiffScmResult diff(ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1) - throws ScmException { + public DiffScmResult diff(ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1) { return null; } @@ -317,46 +294,42 @@ public class ScmProviderStub implements ScmProvider { * {@inheritDoc} */ public DiffScmResult diff( - ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion, ScmVersion scmVersion1) - throws ScmException { + ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion, ScmVersion scmVersion1) { return null; } /** * {@inheritDoc} */ - public EditScmResult edit(ScmRepository scmRepository, ScmFileSet scmFileSet) throws ScmException { + public EditScmResult edit(ScmRepository scmRepository, ScmFileSet scmFileSet) { return null; } /** * {@inheritDoc} */ - public ExportScmResult export(ScmRepository scmRepository, ScmFileSet scmFileSet, String string) - throws ScmException { + public ExportScmResult export(ScmRepository scmRepository, ScmFileSet scmFileSet, String string) { return null; // To change body of implemented methods use File | Settings | File Templates. } /** * {@inheritDoc} */ - public ExportScmResult export(ScmRepository scmRepository, ScmFileSet scmFileSet) throws ScmException { + public ExportScmResult export(ScmRepository scmRepository, ScmFileSet scmFileSet) { return null; // To change body of implemented methods use File | Settings | File Templates. } /** * {@inheritDoc} */ - public ExportScmResult export(ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion) - throws ScmException { + public ExportScmResult export(ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion) { return null; // To change body of implemented methods use File | Settings | File Templates. } /** * {@inheritDoc} */ - public ExportScmResult export(ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1) - throws ScmException { + public ExportScmResult export(ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1) { return null; // To change body of implemented methods use File | Settings | File Templates. } @@ -364,32 +337,28 @@ public class ScmProviderStub implements ScmProvider { * {@inheritDoc} */ public ExportScmResult export( - ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion, String string) - throws ScmException { + ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion, String string) { return null; // To change body of implemented methods use File | Settings | File Templates. } /** * {@inheritDoc} */ - public ListScmResult list(ScmRepository repository, ScmFileSet fileSet, boolean recursive, String tag) - throws ScmException { + public ListScmResult list(ScmRepository repository, ScmFileSet fileSet, boolean recursive, String tag) { return null; } /** * {@inheritDoc} */ - public ListScmResult list(ScmRepository scmRepository, ScmFileSet scmFileSet, boolean b, ScmVersion scmVersion) - throws ScmException { + public ListScmResult list(ScmRepository scmRepository, ScmFileSet scmFileSet, boolean b, ScmVersion scmVersion) { return null; // To change body of implemented methods use File | Settings | File Templates. } /** * {@inheritDoc} */ - public RemoveScmResult remove(ScmRepository scmRepository, ScmFileSet scmFileSet, String string) - throws ScmException { + public RemoveScmResult remove(ScmRepository scmRepository, ScmFileSet scmFileSet, String string) { return null; } @@ -403,22 +372,21 @@ public class ScmProviderStub implements ScmProvider { /** * {@inheritDoc} */ - public StatusScmResult status(ScmRepository scmRepository, ScmFileSet scmFileSet) throws ScmException { + public StatusScmResult status(ScmRepository scmRepository, ScmFileSet scmFileSet) { return null; } /** * {@inheritDoc} */ - public TagScmResult tag(ScmRepository scmRepository, ScmFileSet scmFileSet, String string) throws ScmException { + public TagScmResult tag(ScmRepository scmRepository, ScmFileSet scmFileSet, String string) { return null; } /** * {@inheritDoc} */ - public TagScmResult tag(ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1) - throws ScmException { + public TagScmResult tag(ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1) { return null; // To change body of implemented methods use File | Settings | File Templates. } @@ -426,31 +394,29 @@ public class ScmProviderStub implements ScmProvider { * {@inheritDoc} */ @Override - public UntagScmResult untag(ScmRepository scmRepository, ScmFileSet scmFileSet, CommandParameters commandParameters) - throws ScmException { + public UntagScmResult untag( + ScmRepository scmRepository, ScmFileSet scmFileSet, CommandParameters commandParameters) { return null; } /** * {@inheritDoc} */ - public UnEditScmResult unedit(ScmRepository scmRepository, ScmFileSet scmFileSet) throws ScmException { + public UnEditScmResult unedit(ScmRepository scmRepository, ScmFileSet scmFileSet) { return null; } /** * {@inheritDoc} */ - public UpdateScmResult update(ScmRepository scmRepository, ScmFileSet scmFileSet, String string) - throws ScmException { + public UpdateScmResult update(ScmRepository scmRepository, ScmFileSet scmFileSet, String string) { return null; } /** * {@inheritDoc} */ - public UpdateScmResult update(ScmRepository scmRepository, ScmFileSet scmFileSet, String string, Date date) - throws ScmException { + public UpdateScmResult update(ScmRepository scmRepository, ScmFileSet scmFileSet, String string, Date date) { return null; } @@ -458,48 +424,44 @@ public class ScmProviderStub implements ScmProvider { * {@inheritDoc} */ public UpdateScmResult update( - ScmRepository scmRepository, ScmFileSet scmFileSet, String string, Date date, String string1) - throws ScmException { + ScmRepository scmRepository, ScmFileSet scmFileSet, String string, Date date, String string1) { return null; } /** * {@inheritDoc} */ - public UpdateScmResult update(ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1) - throws ScmException { + public UpdateScmResult update(ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1) { return null; } - public UpdateScmResult update(ScmRepository scmRepository, ScmFileSet scmFileSet) throws ScmException { + public UpdateScmResult update(ScmRepository scmRepository, ScmFileSet scmFileSet) { return null; } - public UpdateScmResult update(ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion) - throws ScmException { + public UpdateScmResult update(ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion) { return null; } /** * @deprecated */ - public UpdateScmResult update(ScmRepository scmRepository, ScmFileSet scmFileSet, String string, boolean b) - throws ScmException { + public UpdateScmResult update(ScmRepository scmRepository, ScmFileSet scmFileSet, String string, boolean b) { return null; } /** * {@inheritDoc} */ - public UpdateScmResult update(ScmRepository scmRepository, ScmFileSet scmFileSet, boolean b) throws ScmException { + public UpdateScmResult update(ScmRepository scmRepository, ScmFileSet scmFileSet, boolean b) { return null; } /** * {@inheritDoc} */ - public UpdateScmResult update(ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion, boolean b) - throws ScmException { + public UpdateScmResult update( + ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion, boolean b) { return null; } @@ -507,16 +469,15 @@ public class ScmProviderStub implements ScmProvider { * {@inheritDoc} */ public UpdateScmResult update( - ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion, String string) - throws ScmException { + ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion, String string) { return null; } /** * {@inheritDoc} */ - public UpdateScmResult update(ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion, Date date) - throws ScmException { + public UpdateScmResult update( + ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion, Date date) { return null; } @@ -524,8 +485,7 @@ public class ScmProviderStub implements ScmProvider { * {@inheritDoc} */ public UpdateScmResult update( - ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion, Date date, String string) - throws ScmException { + ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion, Date date, String string) { return null; } @@ -553,48 +513,43 @@ public class ScmProviderStub implements ScmProvider { /** * {@inheritDoc} */ - public TagScmResult tag(ScmRepository arg0, ScmFileSet arg1, String arg2, ScmTagParameters arg3) - throws ScmException { + public TagScmResult tag(ScmRepository arg0, ScmFileSet arg1, String arg2, ScmTagParameters arg3) { return null; } - public BranchScmResult branch(ScmRepository arg0, ScmFileSet arg1, String arg2, ScmBranchParameters arg3) - throws ScmException { + public BranchScmResult branch(ScmRepository arg0, ScmFileSet arg1, String arg2, ScmBranchParameters arg3) { return null; } - public BlameScmResult blame(ScmRepository arg0, ScmFileSet arg1, String arg2) throws ScmException { + public BlameScmResult blame(ScmRepository arg0, ScmFileSet arg1, String arg2) { return null; } - public MkdirScmResult mkdir(ScmRepository arg0, ScmFileSet arg1, String arg2, boolean arg3) throws ScmException { + public MkdirScmResult mkdir(ScmRepository arg0, ScmFileSet arg1, String arg2, boolean arg3) { return null; } public InfoScmResult info( - ScmProviderRepository scmProviderRepository, ScmFileSet scmFileSet, CommandParameters commandParameters) - throws ScmException { + ScmProviderRepository scmProviderRepository, ScmFileSet scmFileSet, CommandParameters commandParameters) { return null; } - public AddScmResult add(ScmRepository scmRepository, ScmFileSet scmFileSet, CommandParameters commandParameters) - throws ScmException { + public AddScmResult add(ScmRepository scmRepository, ScmFileSet scmFileSet, CommandParameters commandParameters) { return null; } public RemoteInfoScmResult remoteInfo( - ScmProviderRepository scmProviderRepository, ScmFileSet scmFileSet, CommandParameters commandParameters) - throws ScmException { + ScmProviderRepository scmProviderRepository, ScmFileSet scmFileSet, CommandParameters commandParameters) { return null; } - public ChangeLogScmResult changeLog(ChangeLogScmRequest scmRequest) throws ScmException { + public ChangeLogScmResult changeLog(ChangeLogScmRequest scmRequest) { return null; } - public BlameScmResult blame(BlameScmRequest blameScmRequest) throws ScmException { + public BlameScmResult blame(BlameScmRequest blameScmRequest) { return null; } } diff --git a/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmRepositoryStub.java b/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmRepositoryStub.java index 16edeb2..7078bd7 100644 --- a/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmRepositoryStub.java +++ b/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmRepositoryStub.java @@ -23,7 +23,6 @@ import org.apache.maven.scm.repository.ScmRepository; /** * @author Edwin Punzalan - * @version $Id$ */ public class ScmRepositoryStub extends ScmRepository { public ScmRepositoryStub() { diff --git a/src/test/java/org/apache/maven/plugins/changelog/stubs/SettingsStub.java b/src/test/java/org/apache/maven/plugins/changelog/stubs/SettingsStub.java index a05434f..b092340 100644 --- a/src/test/java/org/apache/maven/plugins/changelog/stubs/SettingsStub.java +++ b/src/test/java/org/apache/maven/plugins/changelog/stubs/SettingsStub.java @@ -23,7 +23,6 @@ import org.apache.maven.settings.Settings; /** * @author Edwin Punzalan - * @version $Id$ */ public class SettingsStub extends Settings { /**