Skip to content

fix: Remove more quoting for ValueAsString and TextValueHasLanguage #3809

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: Remove more quoting for ValueAsString and TextValueHasLanguage #3809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
320d840
fix: Remove more quoting for ValueAsString and TextValueHasLanguage (…
siers Oct 6, 2025
6fd2cf4
Merge branch 'main' into fix/DEV-4880/remove-more-quoting
seakayone Oct 13, 2025
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
2 changes: 1 addition & 1 deletion ...test-e2e/src/test/scala/org/knora/webapi/slice/resources/api/ValuesEndpointsE2ESpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2614,7 +2614,7 @@ object ValuesEndpointsE2ESpec extends E2EZSpec { self =>
},
test("update a text value with a comment") {
val resourceIri: IRI = AThing.iri
val valueAsString: String = "this is a text value that has an updated comment"
val valueAsString: String = "this is a text value that has a 'thoroughly' updated comment"
val valueHasComment: String = "this is an updated comment"
val propertyIri: SmartIri = "http://0.0.0.0:3333/ontology/0001/anything/v2#hasText".toSmartIri

Expand Down
8 changes: 4 additions & 4 deletions ...src/main/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueMessagesV2.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,11 +1206,12 @@ object TextValueContentV2 {
)
}

private def objectSparqlStringOption(r: Resource, property: String) = for {
private def objectSparqlStringOption(r: Resource, property: String): Either[String, Option[String]] = for {
str <- r.objectStringOption(property)
iri <- str match
case Some(s) => Right(Iri.toSparqlEncodedString(s))
case None => Right(None)
case Some(s) if s.strip.isEmpty => Right(None)
case None => Right(None)
case Some(s) => Right(Some(s))
} yield iri

def from(r: Resource): ZIO[MessageRelay, IRI, TextValueContentV2] = for {
Expand All @@ -1228,7 +1229,6 @@ object TextValueContentV2 {
textValue <-
getTextValue(maybeValueAsString, maybeTextValueAsXml, maybeValueHasLanguage, maybeMappingResponse, comment)
.mapError(_.getMessage)

} yield textValue
}

Expand Down