You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2021/05/02 16:07:23 UTC
[maven-shared-utils] branch master updated: remove two unused
non-public exception classes (#89)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git
The following commit(s) were added to refs/heads/master by this push:
new ff58583 remove two unused non-public exception classes (#89)
ff58583 is described below
commit ff58583c0c4ffc34de52567f78bca99d65e14d24
Author: Elliotte Rusty Harold <el...@users.noreply.github.com>
AuthorDate: Sun May 2 16:07:12 2021 +0000
remove two unused non-public exception classes (#89)
---
.../maven/shared/utils/xml/XmlReaderException.java | 156 ---------------------
.../maven/shared/utils/xml/XmlStreamReader.java | 9 +-
.../shared/utils/xml/XmlStreamReaderException.java | 79 -----------
3 files changed, 3 insertions(+), 241 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XmlReaderException.java b/src/main/java/org/apache/maven/shared/utils/xml/XmlReaderException.java
deleted file mode 100644
index 5ee48a0..0000000
--- a/src/main/java/org/apache/maven/shared/utils/xml/XmlReaderException.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.apache.maven.shared.utils.xml;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * <p>The XmlReaderException is thrown by the XmlReader constructors if the charset encoding can not be determined
- * according to the XML 1.0 specification and RFC 3023.</p>
- * <p>The exception returns the unconsumed InputStream to allow the application to do an alternate processing with the
- * stream. Note that the original InputStream given to the XmlReader cannot be used as that one has been already
- * read.</p>
- *
- * @author Alejandro Abdelnur
- * @version revision 1.1 taken on 26/06/2007 from Rome (see https://rome.dev.java.net/source/browse/rome/src/java/com/sun/syndication/io/XmlReaderException.java)
- */
-class XmlReaderException
- extends IOException
-{
- /**
- *
- */
- private static final long serialVersionUID = 5044326391409597950L;
-
- private final String bomEncoding;
-
- private final String xmlGuessEncoding;
-
- private final String xmlEncoding;
-
- private final String contentTypeMime;
-
- private final String contentTypeEncoding;
-
- private final InputStream is;
-
- /**
- * <p>Creates an exception instance if the charset encoding could not be determined.</p>
- * <p>Instances of this exception are thrown by the XmlReader.</p>
- *
- * @param msg message describing the reason for the exception.
- * @param bomEnc BOM encoding.
- * @param xmlGuessEnc XML guess encoding.
- * @param xmlEnc XML prolog encoding.
- * @param is the unconsumed InputStream.
- */
- XmlReaderException( String msg, String bomEnc, String xmlGuessEnc, String xmlEnc, InputStream is )
- {
- this( msg, null, null, bomEnc, xmlGuessEnc, xmlEnc, is );
- }
-
- /**
- * <p>Creates an exception instance if the charset encoding could not be determined.</p>
- * <p>Instances of this exception are thrown by the XmlReader.</p>
- *
- * @param msg message describing the reason for the exception.
- * @param ctMime MIME type in the content-type.
- * @param ctEnc encoding in the content-type.
- * @param bomEnc BOM encoding.
- * @param xmlGuessEnc XML guess encoding.
- * @param xmlEnc XML prolog encoding.
- * @param is the unconsumed InputStream.
- */
- XmlReaderException( String msg, String ctMime, String ctEnc, String bomEnc, String xmlGuessEnc,
- String xmlEnc, InputStream is )
- {
- super( msg );
- contentTypeMime = ctMime;
- contentTypeEncoding = ctEnc;
- bomEncoding = bomEnc;
- xmlGuessEncoding = xmlGuessEnc;
- xmlEncoding = xmlEnc;
- this.is = is;
- }
-
- /**
- * Returns the BOM encoding found in the InputStream.
- *
- * @return the BOM encoding, null if none.
- */
- public String getBomEncoding()
- {
- return bomEncoding;
- }
-
- /**
- * Returns the encoding guess based on the first bytes of the InputStream.
- *
- * @return the encoding guess, null if it couldn't be guessed.
- */
- public String getXmlGuessEncoding()
- {
- return xmlGuessEncoding;
- }
-
- /**
- * Returns the encoding found in the XML prolog of the InputStream.
- *
- * @return the encoding of the XML prolog, null if none.
- */
- public String getXmlEncoding()
- {
- return xmlEncoding;
- }
-
- /**
- * Returns the MIME type in the content-type used to attempt determining the encoding.
- *
- * @return the MIME type in the content-type, null if there was not content-type or the encoding detection did not
- * involve HTTP.
- */
- public String getContentTypeMime()
- {
- return contentTypeMime;
- }
-
- /**
- * Returns the encoding in the content-type used to attempt determining the encoding.
- *
- * @return the encoding in the content-type, null if there was not content-type, no encoding in it or the encoding
- * detection did not involve HTTP.
- */
- public String getContentTypeEncoding()
- {
- return contentTypeEncoding;
- }
-
- /**
- * Returns the unconsumed InputStream to allow the application to do an alternate encoding detection on the
- * InputStream.
- *
- * @return the unconsumed InputStream.
- */
- public InputStream getInputStream()
- {
- return is;
- }
-}
diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java
index 6990d4f..da58a0b 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java
@@ -79,10 +79,9 @@ public class XmlStreamReader
* @param is {@link InputStream}
* @param lenient yes/no
* @throws IOException in case of an error
- * @throws XmlStreamReaderException in case of an error
*/
public XmlStreamReader( InputStream is, boolean lenient )
- throws IOException, XmlStreamReaderException
+ throws IOException
{
reader = new org.apache.commons.io.input.XmlStreamReader( is, lenient, staticDefaultEncoding );
}
@@ -124,10 +123,9 @@ public class XmlStreamReader
* @param lenient yes/no
* @param defaultEncoding the default encoding
* @throws IOException in case of error
- * @throws XmlStreamReaderException in case of error
*/
public XmlStreamReader( InputStream is, String httpContentType, boolean lenient, String defaultEncoding )
- throws IOException, XmlStreamReaderException
+ throws IOException
{
reader = new org.apache.commons.io.input.XmlStreamReader( is, httpContentType, lenient,
( defaultEncoding == null )
@@ -140,10 +138,9 @@ public class XmlStreamReader
* @param httpContentType content type
* @param lenient yes/no
* @throws IOException in case of error
- * @throws XmlStreamReaderException in case of error
*/
public XmlStreamReader( InputStream is, String httpContentType, boolean lenient )
- throws IOException, XmlStreamReaderException
+ throws IOException
{
this( is, httpContentType, lenient, null );
}
diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java
deleted file mode 100644
index 992b833..0000000
--- a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.apache.maven.shared.utils.xml;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.InputStream;
-
-/**
- * <p>The XmlStreamReaderException is thrown by the XmlStreamReader constructors if the charset encoding can not be
- * determined according to the XML 1.0 specification and RFC 3023.</p>
- * <p>The exception returns the unconsumed InputStream to allow the application to do an alternate processing with the
- * stream. Note that the original InputStream given to the XmlStreamReader cannot be used as that one has been already
- * read.</p>
- *
- * @author Alejandro Abdelnur
- * @version revision 1.1 taken on 26/06/2007 from Rome (see
- * https://rome.dev.java.net/source/browse/rome/src/java/com/sun/syndication/io/XmlReaderException.java)
- */
-class XmlStreamReaderException
- extends XmlReaderException
-{
- /**
- *
- */
- private static final long serialVersionUID = 1007947701939672080L;
-
- /**
- * Creates an exception instance if the charset encoding could not be determined.
- * <p/>
- * Instances of this exception are thrown by the XmlReader.
- * <p/>
- *
- * @param msg message describing the reason for the exception.
- * @param bomEnc BOM encoding.
- * @param xmlGuessEnc XML guess encoding.
- * @param xmlEnc XML prolog encoding.
- * @param is the unconsumed InputStream.
- */
- XmlStreamReaderException( String msg, String bomEnc, String xmlGuessEnc, String xmlEnc, InputStream is )
- {
- super( msg, bomEnc, xmlGuessEnc, xmlEnc, is );
- }
-
- /**
- * Creates an exception instance if the charset encoding could not be determined.
- * <p/>
- * Instances of this exception are thrown by the XmlReader.
- * <p/>
- *
- * @param msg message describing the reason for the exception.
- * @param ctMime MIME type in the content-type.
- * @param ctEnc encoding in the content-type.
- * @param bomEnc BOM encoding.
- * @param xmlGuessEnc XML guess encoding.
- * @param xmlEnc XML prolog encoding.
- * @param is the unconsumed InputStream.
- */
- XmlStreamReaderException( String msg, String ctMime, String ctEnc, String bomEnc, String xmlGuessEnc,
- String xmlEnc, InputStream is )
- {
- super( msg, ctMime, ctEnc, bomEnc, xmlGuessEnc, xmlEnc, is );
- }
-}