Skip to content

Replace deprecated URL constructor globally #1678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gdesrosiers1805 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace deprecated URL constructor globally #1678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions daffodil-core/src/main/java/org/apache/daffodil/api/validation/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
* <p><b>Example:</b></p>
* <pre>{@code
* // enable XML schema validation, setting the "xerces" property to the schema.xsd file
* dataProcessor.withValidation("xerces", new URL("file:///path/to/schema.xsd"))
* dataProcessor.withValidation("xerces", new URI("file:///path/to/schema.xsd").toURL)
* }</pre>
* </dd>
*
Expand All @@ -92,10 +92,10 @@
* <p><b>Example:</b></p>
* <pre>{@code
* // enable schematron validation, setting the "schematron" property to the schematron.sch file
* dataProcessor.withValidation("schematron", new URL("file:///path/to/schematron.sch"))
* dataProcessor.withValidation("schematron", new URI("file:///path/to/schematron.sch").toURL)
*
* // use schematron validation, reading the schematron.properties file to set "schematron" or other schematron properties
* dataProcessor.withValidation("schematron", new URL("file:///path/to/schematron.properties"))
* dataProcessor.withValidation("schematron", new URI("file:///path/to/schematron.properties").toURL)
* }</pre>
* </dd>
* </dl>
Expand Down
3 changes: 2 additions & 1 deletion daffodil-core/src/main/scala/org/apache/daffodil/validation/XercesValidator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.daffodil.validation

import java.io.IOException
import java.net.URI
import java.net.URL
import java.util.Properties
import javax.xml.XMLConstants
Expand Down Expand Up @@ -60,7 +61,7 @@ object XercesValidatorFactory {
"invalid configuration: xerces property is empty or not defined"
)
}
val url = new URL(schemaFile)
val url = new URI(schemaFile).toURL
Comment thread
gdesrosiers1805 marked this conversation as resolved.
XercesValidator.fromURL(url)
}
}
Expand Down
3 changes: 0 additions & 3 deletions daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestXMLCatalogAndValidate.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,6 @@ object XMLLoaderFactory {
val loader = new SchemaAwareFactoryAdapter()
loader
}

// val doc = loader.load(new URL("http://horstmann.com/index.html"))
// println(doc);
}

// From http://stackoverflow.com/questions/1627111/how-does-one-validate-the-schema-of-an-xml-file-using-scala
Expand Down
5 changes: 2 additions & 3 deletions ...src/main/scala/org/apache/daffodil/validation/schematron/SchematronValidatorFactory.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package org.apache.daffodil.validation.schematron

import java.io.InputStream
import java.net.URI
import java.net.URL
import java.util.Properties

import org.apache.daffodil.api
Expand All @@ -44,13 +43,13 @@ import net.sf.saxon.TransformerFactoryImpl
object SchematronValidatorFactory {
def makeValidator(config: Properties): SchematronValidator = {
val schPathValue = config.getProperty(SchematronValidator.name)
val schUrl = new URL({
val schUrl = new URI({
if (!Misc.isNullOrBlank(schPathValue)) schPathValue
else
throw new api.validation.ValidatorInitializationException(
"invalid configuration: schematron property is empty or not defined"
)
})
}).toURL
val schStream =
try {
schUrl.openStream()
Expand Down
4 changes: 2 additions & 2 deletions daffodil-test/src/test/scala/org/apache/daffodil/infoset/TestStringAsXmlValidator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package org.apache.daffodil.infoset

import java.io.InputStream
import java.net.URL
import java.net.URI
import java.util.Properties

import org.apache.daffodil.api.validation.ValidationHandler
Expand All @@ -30,7 +30,7 @@ object TestStringAsXmlValidator {
}

class TestStringAsXmlValidator(schemaURL: String) extends Validator {
private lazy val xercesValidator = XercesValidator.fromURL(new URL(schemaURL))
private lazy val xercesValidator = XercesValidator.fromURL(new URI(schemaURL).toURL)

override def validateXML(document: InputStream, vh: ValidationHandler): Unit = {
xercesValidator.validateXML(document, vh)
Expand Down