mbeckerle commented on code in PR #803:
URL: https://github.com/apache/daffodil/pull/803#discussion_r898610260
##########
daffodil-core/src/main/scala/org/apache/daffodil/dsom/AnnotatedSchemaComponent.scala:
##########
@@ -84,7 +86,7 @@ trait ResolvesLocalProperties
val fa = formatAnnotation
val opt = fa.justThisOneProperties.get(pname)
val optFound = opt.map { case (value, location) => Found(value, location,
pname, false) }
- val res = optFound.getOrElse { NotFound(Seq(fa.annotatedSC), Nil, pname) }
+ val res = optFound.getOrElse { props.NotFound(Seq(fa.annotatedSC), Nil,
pname) }
Review Comment:
put back to NotFound and import symbol.
##########
daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLEscapeScheme.scala:
##########
@@ -57,8 +57,8 @@ final class DFDLEscapeScheme(node: Node, decl:
AnnotatedSchemaComponent, defES:
// XML library lets your code be the one doing the DTD resolving, so
they can't do it for you.
//
nodeseq match {
- case Nil => Found("", this, pname, false) // we want to hand back
the empty string as a value.
- case _ => Found(nodeseq.toString, this, pname, false)
+ case Nil => props.Found("", this, pname, false) // we want to hand
back the empty string as a value.
Review Comment:
revert and fix symbol import.
##########
daffodil-core/src/main/scala/org/apache/daffodil/grammar/primitives/PrimitivesExpressions.scala:
##########
@@ -100,7 +101,7 @@ abstract class AssertBooleanPrimBase(
decl: AnnotatedSchemaComponent,
stmt: DFDLAssertionBase,
discrim: Boolean, // are we a discriminator or not.
- assertKindName: String) extends AssertBase(decl, Found(stmt.testTxt, stmt,
"test", false), stmt.messageAttrib, discrim, assertKindName, stmt.failureType)
+ assertKindName: String) extends AssertBase(decl, props.Found(stmt.testTxt,
stmt, "test", false), stmt.messageAttrib, discrim, assertKindName,
stmt.failureType)
Review Comment:
revert and fix import.
##########
daffodil-lib/src/main/scala/org/apache/daffodil/lib/api/Validator.scala:
##########
@@ -45,8 +45,8 @@ trait ValidatorFactory {
/**
* The factory method to generate the Validator instance
* @param config com.typesafe.config.Config to pass to validator instance
- * @return [[org.apache.daffodil.api.Validator]] instance ready to execute
- * @throws org.apache.daffodil.api.ValidatorInitializationException when
initialization fails
+ * @return [[Validator]] instance ready to execute
Review Comment:
put back to full package name
##########
daffodil-runtime1/src/main/scala/org/apache/daffodil/dpath/FNFunctions.scala:
##########
@@ -17,19 +17,16 @@
package org.apache.daffodil.dpath
-import java.lang.{ Byte => JByte }
-import java.lang.{ Double => JDouble }
-import java.lang.{ Float => JFloat }
-import java.lang.{ Integer => JInt }
-import java.lang.{ Long => JLong }
-import java.lang.{ Number => JNumber }
-import java.lang.{ Short => JShort }
-import java.math.{ BigDecimal => JBigDecimal }
-import java.math.{ BigInteger => JBigInt }
+import java.lang.{Byte => JByte}
Review Comment:
Just a whitespace change. Revert. Change IDE settings to not frob this.
##########
daffodil-runtime1/src/main/scala/org/apache/daffodil/dpath/DPath.scala:
##########
@@ -17,12 +17,9 @@
package org.apache.daffodil.dpath
-import java.lang.{ Long => JLong, Double => JDouble, Float => JFloat, Byte =>
JByte, Integer => JInt, Short => JShort }
-import java.math.{ BigDecimal => JBigDecimal, BigInteger => JBigInt }
+import java.lang.{Integer => JInt, Byte => JByte, Double => JDouble, Short =>
JShort, Long => JLong, Float => JFloat}
Review Comment:
Revert.
##########
daffodil-core/src/main/scala/org/apache/daffodil/dsom/DFDLEscapeScheme.scala:
##########
@@ -45,7 +45,7 @@ final class DFDLEscapeScheme(node: Node, decl:
AnnotatedSchemaComponent, defES:
protected final override def lookupProperty(pname: String):
PropertyLookupResult = {
val propNodeSeq = xml.attribute(pname)
propNodeSeq match {
- case None => NotFound(Seq(this), Nil, pname) // attribute was not found
+ case None => props.NotFound(Seq(this), Nil, pname) // attribute was not
found
Review Comment:
revert and fix symbol import.
##########
daffodil-core/src/main/scala/org/apache/daffodil/runtime1/VariableRuntime1Mixin.scala:
##########
@@ -97,7 +98,7 @@ trait DFDLNewVariableInstanceRuntime1Mixin { self:
DFDLNewVariableInstance =>
val compilationTargetType = defv.primType
val qn = this.qNameForProperty("defaultValue", XMLUtils.dafintURI)
val defaultValExpr = defaultValue.map { e =>
- ExpressionCompilers.AnyRef.compileProperty(qn, compilationTargetType,
Found(e, this.dpathCompileInfo, "defaultValue", false), this, dpathCompileInfo)
+ ExpressionCompilers.AnyRef.compileProperty(qn, compilationTargetType,
props.Found(e, this.dpathCompileInfo, "defaultValue", false), this,
dpathCompileInfo)
Review Comment:
revert and fix import
##########
daffodil-lib/src/main/scala/org/apache/daffodil/validation/Validators.scala:
##########
@@ -34,15 +34,15 @@ object Validators {
* Get the factory by name or throw
* @param name registered name of the validator factory
* @throws ValidatorNotRegisteredException when factory is not found in the
registered services
- * @return [[org.apache.daffodil.api.ValidatorFactory]] the factory instance
+ * @return [[ValidatorFactory]] the factory instance
Review Comment:
Use fully qualified name.
##########
daffodil-core/src/main/scala/org/apache/daffodil/runtime1/VariableRuntime1Mixin.scala:
##########
@@ -55,7 +56,7 @@ trait DFDLDefineVariableRuntime1Mixin { self:
DFDLDefineVariable =>
val compilationTargetType = primType
val qn = this.qNameForProperty("defaultValue", XMLUtils.dafintURI)
val defaultValExpr = defaultValue.map { e =>
- ExpressionCompilers.AnyRef.compileProperty(qn, compilationTargetType,
Found(e, this.dpathCompileInfo, "defaultValue", false), this, dpathCompileInfo)
+ ExpressionCompilers.AnyRef.compileProperty(qn, compilationTargetType,
props.Found(e, this.dpathCompileInfo, "defaultValue", false), this,
dpathCompileInfo)
Review Comment:
revert and fix import
##########
daffodil-core/src/test/scala/org/apache/daffodil/schema/annotation/props/TestPropertyRuntime.scala:
##########
@@ -23,9 +23,13 @@ import org.junit.Test
import org.apache.daffodil.dsom.SchemaComponentImpl
import org.apache.daffodil.util.Fakes
import org.apache.daffodil.dsom.NestingLexicalMixin
+import org.apache.daffodil.lib.schema.annotation.props
+import org.apache.daffodil.lib.schema.annotation.props
+import org.apache.daffodil.lib.schema.annotation.props.Found
+import org.apache.daffodil.lib.schema.annotation.props.PropertyMixin
sealed trait MyPropType extends MyProp.Value
-object MyProp extends Enum[MyPropType] // with ThrowsSDE
+object MyProp extends props.Enum[MyPropType] // with ThrowsSDE
Review Comment:
revert and fix import
##########
daffodil-lib/src/main/scala/org/apache/daffodil/lib/api/Validator.scala:
##########
@@ -62,7 +62,7 @@ trait ValidationResult {
object ValidationResult {
/**
- * an empty [[org.apache.daffodil.api.ValidationResult]]
+ * an empty [[ValidationResult]]
Review Comment:
use fully qualified name.
##########
daffodil-lib/src/main/scala/org/apache/daffodil/validation/Validators.scala:
##########
@@ -17,11 +17,11 @@
package org.apache.daffodil.validation
-import org.apache.daffodil.api.ValidatorFactory
+import org.apache.daffodil.lib.api.ValidatorFactory
import org.apache.daffodil.util.SimpleNamedServiceLoader
/**
- * Access SPI registered [[org.apache.daffodil.api.ValidatorFactory]]
instances.
+ * Access SPI registered [[ValidatorFactory]] instances.
Review Comment:
Use fully qualified name.
##########
daffodil-lib/src/test/scala/org/apache/daffodil/lib/api/TestDaffodilTunablesAndConfig.scala:
##########
@@ -39,8 +41,8 @@ class TestDaffodilTunablesAndConfig {
val tunables = DaffodilTunables(cfg.tunablesMap)
val warnings = tunables.suppressSchemaDefinitionWarnings
assertEquals(2, warnings.length)
- assertTrue(warnings.contains(WarnID.FacetExplicitLengthOutOfRange))
- assertTrue(warnings.contains(WarnID.EncodingErrorPolicyError))
+ assertTrue(warnings.contains(FacetExplicitLengthOutOfRange))
Review Comment:
Put back WarnID prefixes here, fix imports.
##########
daffodil-lib/src/test/scala/org/apache/daffodil/lib/schema/annotation/props/TestGeneratedProperties.scala:
##########
@@ -97,7 +99,7 @@ class TestGeneratedProperties {
//
nodeseq match {
case Nil => Found("", this, pname, false) // we want to hand back
the empty string as a value.
- case _ => Found(nodeseq.toString, this, pname, false)
+ case _ => props.Found(nodeseq.toString, this, pname, false)
Review Comment:
revert and fix import.
##########
daffodil-lib/src/main/scala/org/apache/daffodil/validation/Validators.scala:
##########
@@ -34,15 +34,15 @@ object Validators {
* Get the factory by name or throw
* @param name registered name of the validator factory
* @throws ValidatorNotRegisteredException when factory is not found in the
registered services
- * @return [[org.apache.daffodil.api.ValidatorFactory]] the factory instance
+ * @return [[ValidatorFactory]] the factory instance
*/
@throws(classOf[ValidatorNotRegisteredException])
def get(name: String): ValidatorFactory = impls.getOrElse(name, throw
ValidatorNotRegisteredException(name))
/**
* Optionally find the factory
* @param name registered name of the validator factory
- * @return [[org.apache.daffodil.api.ValidatorFactory]] optional factory
instance
+ * @return [[ValidatorFactory]] optional factory instance
Review Comment:
use fully qualified name
##########
daffodil-runtime1/src/main/scala/org/apache/daffodil/infoset/InfosetImpl.scala:
##########
@@ -17,19 +17,15 @@
package org.apache.daffodil.infoset
-import java.lang.{ Boolean => JBoolean }
-import java.lang.{ Number => JNumber }
-import java.math.{ BigDecimal => JBigDecimal }
+import java.lang.{Boolean => JBoolean}
Review Comment:
revert.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
