You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2016/12/22 06:12:16 UTC
[1/5] ant git commit: accept "impossible" exceptions
Repository: ant
Updated Branches:
refs/heads/1.9.x 121043fe5 -> 7081e356a
accept "impossible" exceptions
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/da943ea1
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/da943ea1
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/da943ea1
Branch: refs/heads/1.9.x
Commit: da943ea14a7ff63313a480edc7e21e3324cc1894
Parents: 121043f
Author: Stefan Bodewig <bo...@apache.org>
Authored: Thu Dec 22 06:26:28 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Thu Dec 22 06:26:28 2016 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/tar/TarEntry.java | 7 ++++---
src/main/org/apache/tools/tar/TarUtils.java | 4 ++--
src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java | 2 +-
src/main/org/apache/tools/zip/AsiExtraField.java | 2 +-
src/main/org/apache/tools/zip/GeneralPurposeBit.java | 2 +-
src/main/org/apache/tools/zip/ZipLong.java | 2 +-
src/main/org/apache/tools/zip/ZipShort.java | 2 +-
7 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/da943ea1/src/main/org/apache/tools/tar/TarEntry.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/tar/TarEntry.java b/src/main/org/apache/tools/tar/TarEntry.java
index 6799079..86024ea 100644
--- a/src/main/org/apache/tools/tar/TarEntry.java
+++ b/src/main/org/apache/tools/tar/TarEntry.java
@@ -846,7 +846,7 @@ public class TarEntry implements TarConstants {
writeEntryHeader(outbuf, TarUtils.FALLBACK_ENCODING, false);
} catch (IOException ex2) {
// impossible
- throw new RuntimeException(ex2);
+ throw new RuntimeException(ex2); //NOSONAR
}
}
}
@@ -932,7 +932,7 @@ public class TarEntry implements TarConstants {
parseTarHeader(header, TarUtils.DEFAULT_ENCODING, true);
} catch (IOException ex2) {
// not really possible
- throw new RuntimeException(ex2);
+ throw new RuntimeException(ex2); //NOSONAR
}
}
}
@@ -1095,7 +1095,8 @@ public class TarEntry implements TarConstants {
try {
buffer1 = expected.getBytes("ASCII");
} catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e); // Should not happen
+ // Should not happen
+ throw new RuntimeException(e); //NOSONAR
}
return isEqual(buffer1, 0, buffer1.length, buffer, offset, length,
false);
http://git-wip-us.apache.org/repos/asf/ant/blob/da943ea1/src/main/org/apache/tools/tar/TarUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/tar/TarUtils.java b/src/main/org/apache/tools/tar/TarUtils.java
index f86154e..5fa2e01 100644
--- a/src/main/org/apache/tools/tar/TarUtils.java
+++ b/src/main/org/apache/tools/tar/TarUtils.java
@@ -265,7 +265,7 @@ public class TarUtils {
return parseName(buffer, offset, length, FALLBACK_ENCODING);
} catch (final IOException ex2) {
// impossible
- throw new RuntimeException(ex2);
+ throw new RuntimeException(ex2); //NOSONAR
}
}
}
@@ -324,7 +324,7 @@ public class TarUtils {
FALLBACK_ENCODING);
} catch (final IOException ex2) {
// impossible
- throw new RuntimeException(ex2);
+ throw new RuntimeException(ex2); //NOSONAR
}
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/da943ea1/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java b/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java
index 1014787..ab56f46 100644
--- a/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java
+++ b/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java
@@ -54,7 +54,7 @@ public abstract class AbstractUnicodeExtraField implements ZipExtraField {
try {
unicodeName = text.getBytes("UTF-8");
} catch (final UnsupportedEncodingException e) {
- throw new RuntimeException("FATAL: UTF-8 encoding not supported.",
+ throw new RuntimeException("FATAL: UTF-8 encoding not supported.", //NOSONAR
e);
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/da943ea1/src/main/org/apache/tools/zip/AsiExtraField.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/zip/AsiExtraField.java b/src/main/org/apache/tools/zip/AsiExtraField.java
index d2ca691..fb8227d 100644
--- a/src/main/org/apache/tools/zip/AsiExtraField.java
+++ b/src/main/org/apache/tools/zip/AsiExtraField.java
@@ -346,7 +346,7 @@ public class AsiExtraField implements ZipExtraField, UnixStat, Cloneable {
return cloned;
} catch (CloneNotSupportedException cnfe) {
// impossible
- throw new RuntimeException(cnfe);
+ throw new RuntimeException(cnfe); //NOSONAR
}
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/da943ea1/src/main/org/apache/tools/zip/GeneralPurposeBit.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/zip/GeneralPurposeBit.java b/src/main/org/apache/tools/zip/GeneralPurposeBit.java
index 1d2255f..a1af211 100644
--- a/src/main/org/apache/tools/zip/GeneralPurposeBit.java
+++ b/src/main/org/apache/tools/zip/GeneralPurposeBit.java
@@ -188,7 +188,7 @@ public final class GeneralPurposeBit implements Cloneable {
return super.clone();
} catch (CloneNotSupportedException ex) {
// impossible
- throw new RuntimeException("GeneralPurposeBit is not Cloneable?", ex);
+ throw new RuntimeException("GeneralPurposeBit is not Cloneable?", ex); //NOSONAR
}
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/da943ea1/src/main/org/apache/tools/zip/ZipLong.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/zip/ZipLong.java b/src/main/org/apache/tools/zip/ZipLong.java
index 72af84d..6180823 100644
--- a/src/main/org/apache/tools/zip/ZipLong.java
+++ b/src/main/org/apache/tools/zip/ZipLong.java
@@ -190,7 +190,7 @@ public final class ZipLong implements Cloneable {
return super.clone();
} catch (CloneNotSupportedException cnfe) {
// impossible
- throw new RuntimeException(cnfe);
+ throw new RuntimeException(cnfe); //NOSONAR
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/da943ea1/src/main/org/apache/tools/zip/ZipShort.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/zip/ZipShort.java b/src/main/org/apache/tools/zip/ZipShort.java
index e52c570..2f5482f 100644
--- a/src/main/org/apache/tools/zip/ZipShort.java
+++ b/src/main/org/apache/tools/zip/ZipShort.java
@@ -155,7 +155,7 @@ public final class ZipShort implements Cloneable {
return super.clone();
} catch (CloneNotSupportedException cnfe) {
// impossible
- throw new RuntimeException(cnfe);
+ throw new RuntimeException(cnfe); //NOSONAR
}
}
[4/5] ant git commit: use better suited exceptions
Posted by bo...@apache.org.
use better suited exceptions
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/0715dda3
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/0715dda3
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/0715dda3
Branch: refs/heads/1.9.x
Commit: 0715dda3176e34dd0140043e209e66c469c49ece
Parents: 934adc2
Author: Stefan Bodewig <bo...@apache.org>
Authored: Thu Dec 22 07:11:09 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Thu Dec 22 07:11:09 2016 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/Main.java | 6 +-----
src/main/org/apache/tools/ant/Project.java | 6 +++---
src/main/org/apache/tools/ant/ProjectHelperRepository.java | 6 +++---
src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java | 2 +-
.../org/apache/tools/ant/taskdefs/optional/TraXLiaison.java | 3 ++-
.../tools/ant/taskdefs/optional/depend/JarFileIterator.java | 4 +++-
.../org/apache/tools/ant/util/depend/AbstractAnalyzer.java | 3 ++-
.../org/apache/tools/ant/util/optional/JavaxScriptRunner.java | 2 +-
src/main/org/apache/tools/tar/TarInputStream.java | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/0715dda3/src/main/org/apache/tools/ant/Main.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java
index 4626e14..b104fd3 100644
--- a/src/main/org/apache/tools/ant/Main.java
+++ b/src/main/org/apache/tools/ant/Main.java
@@ -978,10 +978,6 @@ public class Main implements AntMain {
project.setInputHandler(handler);
}
- // TODO: (Jon Skeet) Any reason for writing a message and then using a bare
- // RuntimeException rather than just using a BuildException here? Is it
- // in case the message could end up being written to no loggers (as the
- // loggers could have failed to be created due to this failure)?
/**
* Creates the default build logger for sending build events to the ant
* log.
@@ -1003,7 +999,7 @@ public class Main implements AntMain {
System.err.println("The specified logger class "
+ loggerClassname
+ " could not be used because " + e.getMessage());
- throw new RuntimeException();
+ throw e;
}
} else {
logger = new DefaultLogger();
http://git-wip-us.apache.org/repos/asf/ant/blob/0715dda3/src/main/org/apache/tools/ant/Project.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
index f7d3a36..34dddb2 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -1836,7 +1836,7 @@ public class Project implements ResourceFactory {
if (st == null) {
tsort(root[i], targetTable, state, visiting, ret);
} else if (st == VISITING) {
- throw new RuntimeException("Unexpected node in visiting state: "
+ throw new BuildException("Unexpected node in visiting state: "
+ root[i]);
}
}
@@ -1855,7 +1855,7 @@ public class Project implements ResourceFactory {
if (st == null) {
tsort(curTarget, targetTable, state, visiting, complete);
} else if (st == VISITING) {
- throw new RuntimeException("Unexpected node in visiting state: "
+ throw new BuildException("Unexpected node in visiting state: "
+ curTarget);
}
}
@@ -1941,7 +1941,7 @@ public class Project implements ResourceFactory {
}
final String p = visiting.pop();
if (root != p) {
- throw new RuntimeException("Unexpected internal error: expected to "
+ throw new BuildException("Unexpected internal error: expected to "
+ "pop " + root + " but got " + p);
}
state.put(root, VISITED);
http://git-wip-us.apache.org/repos/asf/ant/blob/0715dda3/src/main/org/apache/tools/ant/ProjectHelperRepository.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/ProjectHelperRepository.java b/src/main/org/apache/tools/ant/ProjectHelperRepository.java
index 02ad62d..7fe92c4 100644
--- a/src/main/org/apache/tools/ant/ProjectHelperRepository.java
+++ b/src/main/org/apache/tools/ant/ProjectHelperRepository.java
@@ -62,7 +62,7 @@ public class ProjectHelperRepository {
PROJECTHELPER2_CONSTRUCTOR = ProjectHelper2.class.getConstructor();
} catch (Exception e) {
// ProjectHelper2 must be available
- throw new RuntimeException(e);
+ throw new BuildException(e);
}
}
@@ -263,7 +263,7 @@ public class ProjectHelperRepository {
return helper;
}
}
- throw new RuntimeException("BUG: at least the ProjectHelper2 should "
+ throw new BuildException("BUG: at least the ProjectHelper2 should "
+ "have supported the file " + buildFile);
}
@@ -286,7 +286,7 @@ public class ProjectHelperRepository {
return helper;
}
}
- throw new RuntimeException("BUG: at least the ProjectHelper2 should "
+ throw new BuildException("BUG: at least the ProjectHelper2 should "
+ "have supported the file " + antlib);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/0715dda3/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
index 24b5bb6..8fce71e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
@@ -721,7 +721,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
* @return the requested class.
* @exception Exception if the class could not be loaded.
*/
- private Class loadClass(final String classname) throws Exception {
+ private Class loadClass(final String classname) throws ClassNotFoundException {
setupLoader();
if (loader == null) {
return Class.forName(classname);
http://git-wip-us.apache.org/repos/asf/ant/blob/0715dda3/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
index a6cd6d6..605aba9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
@@ -322,7 +322,8 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
* @see #addParam(java.lang.String, java.lang.String)
* @see #setOutputProperty(java.lang.String, java.lang.String)
*/
- private void createTransformer() throws Exception {
+ private void createTransformer()
+ throws IOException, ParserConfigurationException, SAXException, TransformerException {
if (templates == null) {
readTemplates();
}
http://git-wip-us.apache.org/repos/asf/ant/blob/0715dda3/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java
index bc315d2..c468b95 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java
@@ -22,6 +22,8 @@ import java.io.InputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
+import org.apache.tools.ant.BuildException;
+
/**
* A class file iterator which iterates through the contents of a Java jar
* file.
@@ -79,7 +81,7 @@ public class JarFileIterator implements ClassFileIterator {
text += ": " + message;
}
- throw new RuntimeException("Problem reading JAR file: " + text);
+ throw new BuildException("Problem reading JAR file: " + text);
}
return nextElement;
http://git-wip-us.apache.org/repos/asf/ant/blob/0715dda3/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java
index 5c95d75..a312ff4 100644
--- a/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java
+++ b/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java
@@ -22,6 +22,7 @@ import java.util.Enumeration;
import java.util.Vector;
import java.util.zip.ZipFile;
+import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.util.VectorSet;
@@ -80,7 +81,7 @@ public abstract class AbstractAnalyzer implements DependencyAnalyzer {
*/
public Enumeration<File> getFileDependencies() {
if (!supportsFileDependencies()) {
- throw new RuntimeException("File dependencies are not supported "
+ throw new BuildException("File dependencies are not supported "
+ "by this analyzer");
}
if (!determined) {
http://git-wip-us.apache.org/repos/asf/ant/blob/0715dda3/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java b/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java
index a24537a..7a5cfa4 100644
--- a/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java
+++ b/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java
@@ -126,7 +126,7 @@ public class JavaxScriptRunner extends ScriptRunnerBase {
}
}
- private ReflectWrapper createEngine() throws Exception {
+ private ReflectWrapper createEngine() {
if (engine != null) {
return engine;
}
http://git-wip-us.apache.org/repos/asf/ant/blob/0715dda3/src/main/org/apache/tools/tar/TarInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/tar/TarInputStream.java b/src/main/org/apache/tools/tar/TarInputStream.java
index 964e5c5..82c0a0d 100644
--- a/src/main/org/apache/tools/tar/TarInputStream.java
+++ b/src/main/org/apache/tools/tar/TarInputStream.java
@@ -276,7 +276,7 @@ public class TarInputStream extends FilterInputStream {
while (numToSkip > 0) {
long skipped = skip(numToSkip);
if (skipped <= 0) {
- throw new RuntimeException("failed to skip current tar"
+ throw new IOException("failed to skip current tar"
+ " entry");
}
numToSkip -= skipped;
[5/5] ant git commit: stick with RuntimeExceptions to prevent
recursive logging loops
Posted by bo...@apache.org.
stick with RuntimeExceptions to prevent recursive logging loops
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/7081e356
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/7081e356
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/7081e356
Branch: refs/heads/1.9.x
Commit: 7081e356a86317bf32635888a6d3cf340dfa9a67
Parents: 0715dda
Author: Stefan Bodewig <bo...@apache.org>
Authored: Thu Dec 22 07:11:31 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Thu Dec 22 07:11:31 2016 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/XmlLogger.java | 6 +++---
src/main/org/apache/tools/ant/listener/MailLogger.java | 4 ++--
src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java | 2 +-
src/main/org/apache/tools/ant/util/DOMElementWriter.java | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/7081e356/src/main/org/apache/tools/ant/XmlLogger.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/XmlLogger.java b/src/main/org/apache/tools/ant/XmlLogger.java
index a67a260..d03067d 100644
--- a/src/main/org/apache/tools/ant/XmlLogger.java
+++ b/src/main/org/apache/tools/ant/XmlLogger.java
@@ -264,7 +264,7 @@ public class XmlLogger implements BuildLogger {
if (!threadStack.empty()) {
TimedElement poppedStack = threadStack.pop();
if (poppedStack != targetElement) {
- throw new RuntimeException("Mismatch - popped element = " + poppedStack
+ throw new RuntimeException("Mismatch - popped element = " + poppedStack //NOSONAR
+ " finished target element = " + targetElement);
}
if (!threadStack.empty()) {
@@ -316,7 +316,7 @@ public class XmlLogger implements BuildLogger {
Task task = event.getTask();
TimedElement taskElement = tasks.get(task);
if (taskElement == null) {
- throw new RuntimeException("Unknown task " + task + " not in " + tasks);
+ throw new RuntimeException("Unknown task " + task + " not in " + tasks); //NOSONAR
}
long totalTime = System.currentTimeMillis() - taskElement.startTime;
taskElement.element.setAttribute(TIME_ATTR, DefaultLogger.formatTime(totalTime));
@@ -334,7 +334,7 @@ public class XmlLogger implements BuildLogger {
if (!threadStack.empty()) {
TimedElement poppedStack = threadStack.pop();
if (poppedStack != taskElement) {
- throw new RuntimeException("Mismatch - popped element = " + poppedStack
+ throw new RuntimeException("Mismatch - popped element = " + poppedStack //NOSONAR
+ " finished task element = " + taskElement);
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/7081e356/src/main/org/apache/tools/ant/listener/MailLogger.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/listener/MailLogger.java b/src/main/org/apache/tools/ant/listener/MailLogger.java
index 3d5bcd2..45289a1 100644
--- a/src/main/org/apache/tools/ant/listener/MailLogger.java
+++ b/src/main/org/apache/tools/ant/listener/MailLogger.java
@@ -327,7 +327,7 @@ public class MailLogger extends DefaultLogger {
* property is not present in properties.
*/
private String getValue(Hashtable<String, Object> properties, String name,
- String defaultValue) throws Exception {
+ String defaultValue) {
String propertyName = "MailLogger." + name;
String value = (String) properties.get(propertyName);
@@ -336,7 +336,7 @@ public class MailLogger extends DefaultLogger {
}
if (value == null) {
- throw new Exception("Missing required parameter: " + propertyName);
+ throw new RuntimeException("Missing required parameter: " + propertyName); //NOSONAR
}
return value;
http://git-wip-us.apache.org/repos/asf/ant/blob/7081e356/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java b/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java
index b2c3468..23bb6bd 100644
--- a/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java
+++ b/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java
@@ -77,7 +77,7 @@ public class LogOutputStream extends LineOrientedOutputStream {
super.processBuffer();
} catch (IOException e) {
// impossible since *our* processLine doesn't throw an IOException
- throw new RuntimeException("Impossible IOException caught: " + e);
+ throw new RuntimeException("Impossible IOException caught: " + e); //NOSONAR
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/7081e356/src/main/org/apache/tools/ant/util/DOMElementWriter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/DOMElementWriter.java b/src/main/org/apache/tools/ant/util/DOMElementWriter.java
index 14cbaee..cafecf0 100644
--- a/src/main/org/apache/tools/ant/util/DOMElementWriter.java
+++ b/src/main/org/apache/tools/ant/util/DOMElementWriter.java
@@ -494,7 +494,7 @@ public class DOMElementWriter {
try {
encodedata(out, value);
} catch (IOException ex) {
- throw new RuntimeException(ex);
+ throw new RuntimeException(ex); //NOSONAR
}
return out.toString();
}
[2/5] ant git commit: accept generic exceptions because of backwards
compatibility
Posted by bo...@apache.org.
accept generic exceptions because of backwards compatibility
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/18877234
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/18877234
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/18877234
Branch: refs/heads/1.9.x
Commit: 18877234f21782ea101f0049db2f85907e7f4c68
Parents: da943ea
Author: Stefan Bodewig <bo...@apache.org>
Authored: Thu Dec 22 06:29:09 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Thu Dec 22 06:29:09 2016 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/Project.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java | 6 +++---
src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java | 2 +-
.../org/apache/tools/ant/taskdefs/optional/TraXLiaison.java | 2 +-
.../org/apache/tools/ant/taskdefs/optional/jlink/jlink.java | 2 +-
.../apache/tools/ant/taskdefs/optional/junit/JUnitTask.java | 4 ++--
src/main/org/apache/tools/ant/util/FileUtils.java | 2 +-
src/main/org/apache/tools/ant/util/StringUtils.java | 2 +-
8 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/18877234/src/main/org/apache/tools/ant/Project.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
index 827183d..f7d3a36 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -1430,7 +1430,7 @@ public class Project implements ResourceFactory {
"Target '" + curtarget.getName()
+ "' failed with message '"
+ thrownException.getMessage() + "'.", MSG_ERR);
- thrownException.printStackTrace(System.err);
+ thrownException.printStackTrace(System.err); //NOSONAR
if (buildException == null) {
buildException =
new BuildException(thrownException);
http://git-wip-us.apache.org/repos/asf/ant/blob/18877234/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java b/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java
index 304995c..5976bce 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java
@@ -44,7 +44,7 @@ public interface XSLTLiaison {
* @throws Exception thrown if any problems happens.
* @since Ant 1.4
*/
- void setStylesheet(File stylesheet) throws Exception;
+ void setStylesheet(File stylesheet) throws Exception; //NOSONAR
/**
* Add a parameter to be set during the XSL transformation.
@@ -54,7 +54,7 @@ public interface XSLTLiaison {
* @see XSLTLiaison4#addParam(java.lang.String, java.lang.Object)
* @since Ant 1.3
*/
- void addParam(String name, String expression) throws Exception;
+ void addParam(String name, String expression) throws Exception; //NOSONAR
/**
* Perform the transformation of a file into another.
@@ -64,6 +64,6 @@ public interface XSLTLiaison {
* @see #setStylesheet(File)
* @since Ant 1.4
*/
- void transform(File infile, File outfile) throws Exception;
+ void transform(File infile, File outfile) throws Exception; //NOSONAR
} //-- XSLTLiaison
http://git-wip-us.apache.org/repos/asf/ant/blob/18877234/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
index 7544592..24b5bb6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
@@ -1380,7 +1380,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
* @since Ant 1.7
*/
private void setLiaisonDynamicFileParameters(
- final XSLTLiaison liaison, final File inFile) throws Exception {
+ final XSLTLiaison liaison, final File inFile) throws Exception { //NOSONAR
if (fileNameParameter != null) {
liaison.addParam(fileNameParameter, inFile.getName());
}
http://git-wip-us.apache.org/repos/asf/ant/blob/18877234/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
index 10620ee..a6cd6d6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
@@ -143,7 +143,7 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
* Constructor for TraXLiaison.
* @throws Exception never
*/
- public TraXLiaison() throws Exception {
+ public TraXLiaison() throws Exception { //NOSONAR
}
/**
http://git-wip-us.apache.org/repos/asf/ant/blob/18877234/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java
index b2c5d0f..0c143cf 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java
@@ -144,7 +144,7 @@ public class jlink {
* a rational manner to outfile.
* @throws Exception on error.
*/
- public void link() throws Exception {
+ public void link() throws Exception { //NOSONAR
ZipOutputStream output = new ZipOutputStream(new FileOutputStream(outfile));
if (compression) {
http://git-wip-us.apache.org/repos/asf/ant/blob/18877234/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index e15e11e..edf63b6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -702,10 +702,10 @@ public class JUnitTask extends Task {
/**
* Creates a new JUnitRunner and enables fork of a new Java VM.
*
- * @throws Exception under ??? circumstances
+ * @throws Exception never
* @since Ant 1.2
*/
- public JUnitTask() throws Exception {
+ public JUnitTask() throws Exception { //NOSONAR
}
/**
http://git-wip-us.apache.org/repos/asf/ant/blob/18877234/src/main/org/apache/tools/ant/util/FileUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java
index c2a60ed..b22f517 100644
--- a/src/main/org/apache/tools/ant/util/FileUtils.java
+++ b/src/main/org/apache/tools/ant/util/FileUtils.java
@@ -1603,7 +1603,7 @@ public class FileUtils {
*
* @since Ant 1.7
*/
- public static String getRelativePath(File fromFile, File toFile) throws Exception {
+ public static String getRelativePath(File fromFile, File toFile) throws Exception { //NOSONAR
String fromPath = fromFile.getCanonicalPath();
String toPath = toFile.getCanonicalPath();
http://git-wip-us.apache.org/repos/asf/ant/blob/18877234/src/main/org/apache/tools/ant/util/StringUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/StringUtils.java b/src/main/org/apache/tools/ant/util/StringUtils.java
index dcae2b8..4ce9ee3 100644
--- a/src/main/org/apache/tools/ant/util/StringUtils.java
+++ b/src/main/org/apache/tools/ant/util/StringUtils.java
@@ -195,7 +195,7 @@ public final class StringUtils {
* @throws Exception if there is a problem.
* @since Ant 1.7
*/
- public static long parseHumanSizes(String humanSize) throws Exception {
+ public static long parseHumanSizes(String humanSize) throws Exception { //NOSONAR
long factor = 1L;
char s = humanSize.charAt(0);
switch (s) {
[3/5] ant git commit: there is no better choice of a non-generic
exception
Posted by bo...@apache.org.
there is no better choice of a non-generic exception
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/934adc2e
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/934adc2e
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/934adc2e
Branch: refs/heads/1.9.x
Commit: 934adc2ee778bd12f9226b6b287dd34294708361
Parents: 1887723
Author: Stefan Bodewig <bo...@apache.org>
Authored: Thu Dec 22 06:30:25 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Thu Dec 22 06:30:25 2016 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/util/ReaderInputStream.java | 2 +-
src/main/org/apache/tools/tar/TarOutputStream.java | 4 ++--
src/main/org/apache/tools/zip/ExtraFieldUtils.java | 6 +++---
src/main/org/apache/tools/zip/ZipEntry.java | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/934adc2e/src/main/org/apache/tools/ant/util/ReaderInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/ReaderInputStream.java b/src/main/org/apache/tools/ant/util/ReaderInputStream.java
index 620af8d..f327b77 100644
--- a/src/main/org/apache/tools/ant/util/ReaderInputStream.java
+++ b/src/main/org/apache/tools/ant/util/ReaderInputStream.java
@@ -148,7 +148,7 @@ public class ReaderInputStream extends InputStream {
try {
in.mark(limit);
} catch (IOException ioe) {
- throw new RuntimeException(ioe.getMessage());
+ throw new RuntimeException(ioe.getMessage()); //NOSONAR
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/934adc2e/src/main/org/apache/tools/tar/TarOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/tar/TarOutputStream.java b/src/main/org/apache/tools/tar/TarOutputStream.java
index 032f725..cacc686 100644
--- a/src/main/org/apache/tools/tar/TarOutputStream.java
+++ b/src/main/org/apache/tools/tar/TarOutputStream.java
@@ -586,7 +586,7 @@ public class TarOutputStream extends FilterOutputStream {
private void failForBigNumber(String field, long value, long maxValue, String additionalMsg) {
if (value < 0 || value > maxValue) {
- throw new RuntimeException(field + " '" + value
+ throw new RuntimeException(field + " '" + value //NOSONAR
+ "' is too big ( > "
+ maxValue + " )");
}
@@ -638,7 +638,7 @@ public class TarOutputStream extends FilterOutputStream {
write(0); // NUL terminator
closeEntry();
} else if (longFileMode != LONGFILE_TRUNCATE) {
- throw new RuntimeException(fieldName + " '" + name
+ throw new RuntimeException(fieldName + " '" + name //NOSONAR
+ "' is too long ( > "
+ TarConstants.NAMELEN + " bytes)");
}
http://git-wip-us.apache.org/repos/asf/ant/blob/934adc2e/src/main/org/apache/tools/zip/ExtraFieldUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/zip/ExtraFieldUtils.java b/src/main/org/apache/tools/zip/ExtraFieldUtils.java
index a6c0118..8a7355e 100644
--- a/src/main/org/apache/tools/zip/ExtraFieldUtils.java
+++ b/src/main/org/apache/tools/zip/ExtraFieldUtils.java
@@ -63,11 +63,11 @@ public class ExtraFieldUtils {
ZipExtraField ze = (ZipExtraField) c.newInstance();
implementations.put(ze.getHeaderId(), c);
} catch (ClassCastException cc) {
- throw new RuntimeException(c + " doesn\'t implement ZipExtraField");
+ throw new RuntimeException(c + " doesn\'t implement ZipExtraField"); //NOSONAR
} catch (InstantiationException ie) {
- throw new RuntimeException(c + " is not a concrete class");
+ throw new RuntimeException(c + " is not a concrete class"); //NOSONAR
} catch (IllegalAccessException ie) {
- throw new RuntimeException(c + "\'s no-arg constructor is not public");
+ throw new RuntimeException(c + "\'s no-arg constructor is not public"); //NOSONAR
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/934adc2e/src/main/org/apache/tools/zip/ZipEntry.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/zip/ZipEntry.java b/src/main/org/apache/tools/zip/ZipEntry.java
index 30a8155..df3f840 100644
--- a/src/main/org/apache/tools/zip/ZipEntry.java
+++ b/src/main/org/apache/tools/zip/ZipEntry.java
@@ -517,7 +517,7 @@ public class ZipEntry extends java.util.zip.ZipEntry implements Cloneable {
mergeExtraFields(local, true);
} catch (final ZipException e) {
// actually this is not be possible as of Ant 1.8.1
- throw new RuntimeException("Error parsing extra fields for entry: "
+ throw new RuntimeException("Error parsing extra fields for entry: " //NOSONAR
+ getName() + " - " + e.getMessage(), e);
}
}
@@ -544,7 +544,7 @@ public class ZipEntry extends java.util.zip.ZipEntry implements Cloneable {
ExtraFieldUtils.UnparseableExtraField.READ);
mergeExtraFields(central, false);
} catch (final ZipException e) {
- throw new RuntimeException(e.getMessage(), e);
+ throw new RuntimeException(e.getMessage(), e); //NOSONAR
}
}