This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch clean-up-signatures in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit afe47536e72735ebceaa811cc2845ec6a87bf73e Author: Michael Osipov <[email protected]> AuthorDate: Wed Apr 26 08:52:56 2023 +0200 Clean up --- .../java/org/apache/maven/doxia/tools/DefaultSiteTool.java | 5 +---- .../apache/maven/doxia/siterenderer/DefaultSiteRenderer.java | 8 +------- .../org/apache/maven/doxia/siterenderer/DocumentRenderer.java | 10 ++++------ .../apache/maven/doxia/siterenderer/DoxiaDocumentRenderer.java | 5 ++--- .../java/org/apache/maven/doxia/siterenderer/SiteRenderer.java | 10 ++++------ 5 files changed, 12 insertions(+), 26 deletions(-) diff --git a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java index 83690b8..f0eaf31 100644 --- a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java +++ b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java @@ -367,8 +367,6 @@ public class DefaultSiteTool implements SiteTool { } } catch (ArtifactResolutionException e) { throw new SiteToolException("Unable to locate site descriptor", e); - } catch (IOException e) { - throw new SiteToolException("Unable to locate site descriptor", e); } } @@ -819,7 +817,6 @@ public class DefaultSiteTool implements SiteTool { * @param remoteProjectRepositories not null * @param locale not null * @return the resolved site descriptor or null if not found in repositories. - * @throws IOException if any * @throws ArtifactResolutionException if any */ private File resolveSiteDescriptor( @@ -827,7 +824,7 @@ public class DefaultSiteTool implements SiteTool { RepositorySystemSession repoSession, List<RemoteRepository> remoteProjectRepositories, Locale locale) - throws IOException, ArtifactResolutionException { + throws ArtifactResolutionException { String variant = locale.getVariant(); String country = locale.getCountry(); String language = locale.getLanguage(); diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java index f93adaa..e6cc13a 100644 --- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java +++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java @@ -313,7 +313,7 @@ public class DefaultSiteRenderer implements Renderer { /** {@inheritDoc} */ public void renderDocument( Writer writer, DocumentRenderingContext docRenderingContext, SiteRenderingContext siteContext) - throws RendererException, FileNotFoundException, UnsupportedEncodingException { + throws RendererException { SiteRendererSink sink = new SiteRendererSink(docRenderingContext); File doc = new File(docRenderingContext.getBasedir(), docRenderingContext.getInputName()); @@ -732,12 +732,6 @@ public class DefaultSiteRenderer implements Renderer { } } - /** {@inheritDoc} */ - public void copyResources(SiteRenderingContext siteRenderingContext, File resourcesDirectory, File outputDirectory) - throws IOException { - throw new AssertionError("copyResources( SiteRenderingContext, File, File ) is deprecated."); - } - /** {@inheritDoc} */ public void copyResources(SiteRenderingContext siteRenderingContext, File outputDirectory) throws IOException { ZipFile file = getZipFile(siteRenderingContext.getSkin().getFile()); diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderer.java index 3047ef1..f208161 100644 --- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderer.java +++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderer.java @@ -18,8 +18,7 @@ */ package org.apache.maven.doxia.siterenderer; -import java.io.FileNotFoundException; -import java.io.UnsupportedEncodingException; +import java.io.IOException; import java.io.Writer; /** @@ -35,12 +34,11 @@ public interface DocumentRenderer { * @param writer the Writer for the document output. * @param siteRenderer the site renderer to merge document content to. * @param siteRenderingContext the site rendering context. - * @throws org.apache.maven.doxia.siterenderer.RendererException if it bombs. - * @throws java.io.FileNotFoundException if it bombs. - * @throws java.io.UnsupportedEncodingException if it bombs. + * @throws RendererException if it bombs. + * @throws IOException if it bombs. */ void renderDocument(Writer writer, SiteRenderer siteRenderer, SiteRenderingContext siteRenderingContext) - throws RendererException, FileNotFoundException, UnsupportedEncodingException; + throws IOException, RendererException; /** * The name of the output document. diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DoxiaDocumentRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DoxiaDocumentRenderer.java index a2dfeea..a436c94 100644 --- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DoxiaDocumentRenderer.java +++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DoxiaDocumentRenderer.java @@ -18,8 +18,7 @@ */ package org.apache.maven.doxia.siterenderer; -import java.io.FileNotFoundException; -import java.io.UnsupportedEncodingException; +import java.io.IOException; import java.io.Writer; /** @@ -43,7 +42,7 @@ public class DoxiaDocumentRenderer implements DocumentRenderer { /** {@inheritDoc} */ public void renderDocument(Writer writer, SiteRenderer siteRenderer, SiteRenderingContext siteRenderingContext) - throws RendererException, FileNotFoundException, UnsupportedEncodingException { + throws IOException, RendererException { siteRenderer.renderDocument(writer, docRenderingContext, siteRenderingContext); } diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderer.java index 5bdbe2c..7945b7f 100644 --- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderer.java +++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderer.java @@ -19,9 +19,7 @@ package org.apache.maven.doxia.siterenderer; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; -import java.io.UnsupportedEncodingException; import java.io.Writer; import java.util.Collection; import java.util.Locale; @@ -55,11 +53,12 @@ public interface SiteRenderer { * @param writer the Writer to use. * @param content the document content to be merged. * @param siteRenderingContext the SiteRenderingContext to use. + * @throws IOException if it bombs. * @throws RendererException if it bombs. * @since 1.8 */ void mergeDocumentIntoSite(Writer writer, DocumentContent content, SiteRenderingContext siteRenderingContext) - throws RendererException; + throws IOException, RendererException; /** * Create a Site Rendering Context for a site using a skin. @@ -108,10 +107,9 @@ public interface SiteRenderer { * @param writer the writer to render the document to. * @param docRenderingContext the document's rendering context, which is expected to have a non-null parser id. * @param siteContext the site's rendering context + * @throws IOException if it bombs. * @throws RendererException if it bombs. - * @throws FileNotFoundException if it bombs. - * @throws UnsupportedEncodingException if it bombs. */ void renderDocument(Writer writer, DocumentRenderingContext docRenderingContext, SiteRenderingContext siteContext) - throws RendererException, FileNotFoundException, UnsupportedEncodingException; + throws IOException, RendererException; }
