This is an automated email from the ASF dual-hosted git repository.
olabusayo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-daffodil.git
The following commit(s) were added to refs/heads/master by this push:
new f3eee73 Fixes bugs, vulnerabilities and securityhotspots
f3eee73 is described below
commit f3eee732f1f5535d0177877720c4fe9f39bc3327
Author: olabusayoT <[email protected]>
AuthorDate: Mon Feb 3 13:31:33 2020 -0500
Fixes bugs, vulnerabilities and securityhotspots
- fixes branches in conditional structure with same implementation
- removes double brace intialization
- replaces arr.toString() with 'new String(arr)'
- fixes unused return val
- fixes some indentation (2 spaces)
DAFFODIL-2272
---
.../org/apache/daffodil/dsom/ElementBase.scala | 6 +-
.../grammar/primitives/SequenceChild.scala | 5 +-
.../io/DirectOrBufferedDataOutputStream.scala | 3 -
.../org/apache/daffodil/japi/ValidationMode.java | 32 ++++-----
.../org/apache/daffodil/japi/logger/LogLevel.java | 26 ++++----
.../example/DebuggerRunnerForJAPITest.java | 78 ++++++++++------------
.../apache/daffodil/macros/TestAssertMacros.scala | 2 +-
.../badudfs/evaluate/StringFunctions/FuncA.java | 4 +-
.../badudfs/evaluate/StringFunctions/FuncB.java | 5 +-
9 files changed, 73 insertions(+), 88 deletions(-)
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementBase.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementBase.scala
index 0a539d9..7e07712 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementBase.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementBase.scala
@@ -491,11 +491,7 @@ trait ElementBase
}
// Handle 8 bit types
case (Representation.Binary, PrimType.Integer | PrimType.Decimal |
PrimType.Byte |
- PrimType.UnsignedByte | PrimType.NonNegativeInteger) =>
- binaryNumberRep match {
- case BinaryNumberRep.Packed | BinaryNumberRep.Bcd |
BinaryNumberRep.Ibm4690Packed => 8
- case _ => 8
- }
+ PrimType.UnsignedByte | PrimType.NonNegativeInteger) => 8
// Handle date types
case (Representation.Binary, PrimType.DateTime | PrimType.Date |
PrimType.Time) =>
binaryCalendarRep match {
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/SequenceChild.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/SequenceChild.scala
index f79b1e5..cea3367 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/SequenceChild.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/SequenceChild.scala
@@ -176,10 +176,7 @@ abstract class SequenceChild(protected val sq:
SequenceTermBase, child: Term, gr
case Never => Positional
}
} else {
- ssp match {
- // case AnyEmpty => NonPositional
- case _ => Positional
- }
+ Positional
}
}
case _ => Positional // obscure cases like maxOccurs 0 with lengthKind
'implicit'
diff --git
a/daffodil-io/src/main/scala/org/apache/daffodil/io/DirectOrBufferedDataOutputStream.scala
b/daffodil-io/src/main/scala/org/apache/daffodil/io/DirectOrBufferedDataOutputStream.scala
index 30f53cd..65dd31a 100644
---
a/daffodil-io/src/main/scala/org/apache/daffodil/io/DirectOrBufferedDataOutputStream.scala
+++
b/daffodil-io/src/main/scala/org/apache/daffodil/io/DirectOrBufferedDataOutputStream.scala
@@ -235,9 +235,6 @@ class DirectOrBufferedDataOutputStream private[io] (
val len = ULong(end - srt).longValue
" Absolute from %d to %d (length %d)".format(srt, end, len)
} else {
- if (splitFrom ne null)
- " at rel bit pos %d".format(relBitPos0b.longValue)
- else
" at rel bit pos %d".format(relBitPos0b.longValue)
}) +
(if (maybeAbsBitLimit0b.isDefined) {
diff --git
a/daffodil-japi/src/main/java/org/apache/daffodil/japi/ValidationMode.java
b/daffodil-japi/src/main/java/org/apache/daffodil/japi/ValidationMode.java
index 7f09f6a..6db5de5 100644
--- a/daffodil-japi/src/main/java/org/apache/daffodil/japi/ValidationMode.java
+++ b/daffodil-japi/src/main/java/org/apache/daffodil/japi/ValidationMode.java
@@ -21,25 +21,25 @@ package org.apache.daffodil.japi;
* Validation modes for validating the resulting infoset against the DFDL
schema
*/
public enum ValidationMode {
- /**
- * Turn off all validation against the DFDL schema
- */
- Off(10),
+ /**
+ * Turn off all validation against the DFDL schema
+ */
+ Off(10),
- /**
- * Perform only facet validation
- */
- Limited(20),
+ /**
+ * Perform only facet validation
+ */
+ Limited(20),
- /**
- * Perform full schema validation using Xerces
- */
- Full(30);
+ /**
+ * Perform full schema validation using Xerces
+ */
+ Full(30);
- public int id;
+ public final int id;
- private ValidationMode(int id) {
- this.id = id;
- }
+ private ValidationMode(int id) {
+ this.id = id;
+ }
}
diff --git
a/daffodil-japi/src/main/java/org/apache/daffodil/japi/logger/LogLevel.java
b/daffodil-japi/src/main/java/org/apache/daffodil/japi/logger/LogLevel.java
index 61353b7..dd581ff 100644
--- a/daffodil-japi/src/main/java/org/apache/daffodil/japi/logger/LogLevel.java
+++ b/daffodil-japi/src/main/java/org/apache/daffodil/japi/logger/LogLevel.java
@@ -24,21 +24,21 @@ package org.apache.daffodil.japi.logger;
* <p>
* Levels Resolver Compile, Debug, and OOLAGDebug are intended for Daffodil
developer
* use.
- *
+ *
*/
public enum LogLevel {
- Error(10),
- Warning(20),
- Info(30),
- Resolver(35), // For messages about resolving schema locations from
namespaces or other.
- Compile(40),
- Debug(50),
- OOLAGDebug(60),
- DelimDebug(70);
+ Error(10),
+ Warning(20),
+ Info(30),
+ Resolver(35), // For messages about resolving schema locations from
namespaces or other.
+ Compile(40),
+ Debug(50),
+ OOLAGDebug(60),
+ DelimDebug(70);
- public int id;
+ public final int id;
- private LogLevel(int id) {
- this.id = id;
- }
+ private LogLevel(int id) {
+ this.id = id;
+ }
}
diff --git
a/daffodil-japi/src/test/java/org/apache/daffodil/example/DebuggerRunnerForJAPITest.java
b/daffodil-japi/src/test/java/org/apache/daffodil/example/DebuggerRunnerForJAPITest.java
index c2046a4..2d7c4a8 100644
---
a/daffodil-japi/src/test/java/org/apache/daffodil/example/DebuggerRunnerForJAPITest.java
+++
b/daffodil-japi/src/test/java/org/apache/daffodil/example/DebuggerRunnerForJAPITest.java
@@ -17,49 +17,45 @@
package org.apache.daffodil.example;
-import org.apache.daffodil.japi.debugger.*;
-
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Iterator;
-public class DebuggerRunnerForJAPITest extends DebuggerRunner {
- ArrayList<String> lines;
-
- @SuppressWarnings("serial")
- ArrayList<String> commands = new ArrayList<String>() {
- {
- add("display info parser");
- add("display info bitPosition");
- add("display info data");
- add("display eval ..");
- add("display info diff");
- add("trace");
- }
- };
-
- Iterator<String> commandsIter;
-
- public void init() {
- lines = new ArrayList<String>();
- commandsIter = commands.iterator();
- }
+import org.apache.daffodil.japi.debugger.DebuggerRunner;
- public void fini() {
- }
-
- public String getCommand() {
- if (commandsIter.hasNext()) {
- return commandsIter.next();
- }
-
- // If the commandsIter commands are good this should never
happen. The
- // only time this would ever get hit is if something caused the
- // debugger to break. But if this does happen, just keep
running trace.
- // We should eventually finish parsing.
- return "trace";
- }
-
- public void lineOutput(String line) {
- lines.add(line + "\n");
- }
+public class DebuggerRunnerForJAPITest extends DebuggerRunner {
+ ArrayList<String> lines;
+
+ ArrayList<String> commands = new ArrayList<>( Arrays.asList("display info
parser",
+ "display info bitPosition",
+ "display info data",
+ "display eval ..",
+ "display info diff",
+ "trace"));
+
+ Iterator<String> commandsIter;
+
+ public void init() {
+ lines = new ArrayList<String>();
+ commandsIter = commands.iterator();
+ }
+
+ public void fini() {
+ }
+
+ public String getCommand() {
+ if (commandsIter.hasNext()) {
+ return commandsIter.next();
+ }
+
+ // If the commandsIter commands are good this should never happen. The
+ // only time this would ever get hit is if something caused the
+ // debugger to break. But if this does happen, just keep running trace.
+ // We should eventually finish parsing.
+ return "trace";
+ }
+
+ public void lineOutput(String line) {
+ lines.add(line + "\n");
+ }
}
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/macros/TestAssertMacros.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/macros/TestAssertMacros.scala
index 08893b0..e1d8b96 100644
---
a/daffodil-lib/src/test/scala/org/apache/daffodil/macros/TestAssertMacros.scala
+++
b/daffodil-lib/src/test/scala/org/apache/daffodil/macros/TestAssertMacros.scala
@@ -73,7 +73,7 @@ class TestAssertMacros {
* be something expensive that computes a message string.
*/
@Test def testMacrosNotEvaluatedSecondArg() {
- Assert.usage(if (1 == x) true else true, { fail(); "failed" })
+ Assert.usage(true, { fail(); "failed" })
}
@Test def testNotYetImplemented0Arg() {
diff --git
a/daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/FuncA.java
b/daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/FuncA.java
index d437eec..12bda0e 100644
--- a/daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/FuncA.java
+++ b/daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/FuncA.java
@@ -41,8 +41,8 @@ public class FuncA implements UserDefinedFunction {
public String evaluate(char[] orig, char[] pre, char[] post) {
String ret = "";
if (orig.length >= pre.length) {
- String newOrig = orig.toString();
- ret = newOrig.replace(pre.toString(), post.toString());
+ String newOrig = new String(orig);
+ ret = newOrig.replace(new String(pre), new String(post));
}
return ret;
}
diff --git
a/daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/FuncB.java
b/daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/FuncB.java
index 15ae862..b877f50 100644
--- a/daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/FuncB.java
+++ b/daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/FuncB.java
@@ -31,8 +31,7 @@ import
org.apache.daffodil.udf.UserDefinedFunctionIdentification;
public class FuncB implements UserDefinedFunction {
public void evaluate(String orig, String pre, String post) {
- if (orig.length() >= pre.length()) {
- orig.replace(pre, post);
- }
+ // do nothing
+
}
}
