-
Notifications
You must be signed in to change notification settings - Fork 3
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.
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
Mark the loadXML call as blocking #28
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,10 @@ | |
package org.http4s | ||
package scalaxml | ||
|
||
import cats.data.EitherT | ||
import cats.effect.Async | ||
import cats.effect.Concurrent | ||
import cats.syntax.all._ | ||
import org.http4s.Charset.`UTF-8` | ||
import org.http4s.headers.`Content-Type` | ||
|
||
|
@@ -49,7 +52,8 @@ trait ElemInstances { | |
* | ||
* @return an XML element | ||
*/ | ||
implicit def xml[F[_]](implicit F: Concurrent[F]): EntityDecoder[F, Elem] = { | ||
@deprecated("Blocks. Use xmlDecoder with an Async constraint.", "0.23.12") | ||
def xml[F[_]](implicit F: Concurrent[F]): EntityDecoder[F, Elem] = { | ||
import EntityDecoder._ | ||
decodeBy(MediaType.text.xml, MediaType.text.html, MediaType.application.xml) { msg => | ||
val source = new InputSource() | ||
|
@@ -67,4 +71,25 @@ trait ElemInstances { | |
} | ||
} | ||
} | ||
|
||
implicit def xmlDecoder[F[_]](implicit F: Async[F]): EntityDecoder[F, Elem] = { | ||
import EntityDecoder._ | ||
decodeBy(MediaType.text.xml, MediaType.text.html, MediaType.application.xml) { msg => | ||
val source = new InputSource() | ||
msg.charset.foreach(cs => source.setEncoding(cs.nioCharset.name)) | ||
|
||
collectBinary(msg).flatMap[DecodeFailure, Elem] { chunk => | ||
source.setByteStream(new ByteArrayInputStream(chunk.toArray)) | ||
Comment on lines
+81
to
+82
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We could avoid this strictness by converting the fs2 stream to an InputStream. I think we'd spend CPU to save memory with that approach. |
||
val saxParser = saxFactory.newSAXParser() | ||
EitherT( | ||
F.blocking(XML.loadXML(source, saxParser)) | ||
.map(Either.right[DecodeFailure, Elem](_)) | ||
.recover { case e: SAXParseException => | ||
Left(MalformedMessageBodyFailure("Invalid XML", Some(e))) | ||
} | ||
) | ||
} | ||
} | ||
} | ||
|
||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we care enough we can do a runtime check for
Async
to delegate to the new implementation.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That technique makes me squeamish, but we've adopted it enough other places and I've never seen an accident scene from it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops. I merged before resolving this. If we want, it could still be a separate PR.