Skip to content

Update Jelly-JVM to 3.4.0 #174

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

Merged
Ostrzyciel merged 1 commit into from
Jul 28, 2025
Merged

Update Jelly-JVM to 3.4.0 #174

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
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ resolvers +=
"Sonatype OSS Snapshots" at "https://s01.oss.sonatype.org/content/repositories/snapshots"

lazy val jenaV = "5.3.0"
lazy val jellyV = "3.3.2"
lazy val jellyV = "3.4.0"
lazy val graalvmV = "24.2.2"

addCommandAlias("fixAll", "scalafixAll; scalafmtAll")
Expand Down
83 changes: 13 additions & 70 deletions src/test/scala/eu/neverblink/jelly/cli/command/helpers/RdfAdapter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,17 +144,9 @@ object RdfAdapter:
type RdfGraphValue =
RdfIri | String | RdfDefaultGraph | RdfLiteral | Null

def rdfGraphStart(graph: RdfGraphValue): RdfGraphStart = {
val graphStart = RdfGraphStart.newInstance()

graph match
case g: RdfIri => graphStart.setGIri(g)
case g: String => graphStart.setGBnode(g)
case g: RdfDefaultGraph => graphStart.setGDefaultGraph(g)
case g: RdfLiteral => graphStart.setGLiteral(g)

graphStart
}
def rdfGraphStart(graph: RdfGraphValue): RdfGraphStart =
RdfGraphStart.newInstance()
.setGraph(graph)

def rdfGraphStart(): RdfGraphStart =
RdfGraphStart.newInstance()
Expand All @@ -167,69 +159,20 @@ object RdfAdapter:
predicate: RdfSpoValue,
`object`: RdfSpoValue,
graph: RdfGraphValue = null,
): RdfQuad = {
var quad = RdfQuad.newInstance()

if subject != null then
subject match
case s: RdfIri => quad = quad.setSIri(s)
case s: String => quad = quad.setSBnode(s)
case s: RdfLiteral => quad = quad.setSLiteral(s)
case s: RdfTriple => quad = quad.setSTripleTerm(s)

if predicate != null then
predicate match
case p: RdfIri => quad = quad.setPIri(p)
case p: String => quad = quad.setPBnode(p)
case p: RdfLiteral => quad = quad.setPLiteral(p)
case p: RdfTriple => quad = quad.setPTripleTerm(p)

if `object` != null then
`object` match
case o: RdfIri => quad = quad.setOIri(o)
case o: String => quad = quad.setOBnode(o)
case o: RdfLiteral => quad = quad.setOLiteral(o)
case o: RdfTriple => quad = quad.setOTripleTerm(o)

if graph != null then
graph match
case g: RdfIri => quad = quad.setGIri(g)
case g: String => quad = quad.setGBnode(g)
case g: RdfDefaultGraph => quad = quad.setGDefaultGraph(g)
case g: RdfLiteral => quad = quad.setGLiteral(g)

quad
}
): RdfQuad = RdfQuad.newInstance()
Copy link
Contributor

@nk2IsHere nk2IsHere Jul 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so pretty <3

.setSubject(subject)
.setPredicate(predicate)
.setObject(`object`)
.setGraph(graph)

type RdfSpoValue =
RdfIri | String | RdfLiteral | RdfTriple | Null

def rdfTriple(subject: RdfSpoValue, predicate: RdfSpoValue, `object`: RdfSpoValue): RdfTriple = {
var triple = RdfTriple.newInstance()

if subject != null then
subject match
case s: RdfIri => triple = triple.setSIri(s)
case s: String => triple = triple.setSBnode(s)
case s: RdfLiteral => triple = triple.setSLiteral(s)
case s: RdfTriple => triple = triple.setSTripleTerm(s)

if predicate != null then
predicate match
case p: RdfIri => triple = triple.setPIri(p)
case p: String => triple = triple.setPBnode(p)
case p: RdfLiteral => triple = triple.setPLiteral(p)
case p: RdfTriple => triple = triple.setPTripleTerm(p)

if `object` != null then
`object` match
case o: RdfIri => triple = triple.setOIri(o)
case o: String => triple = triple.setOBnode(o)
case o: RdfLiteral => triple = triple.setOLiteral(o)
case o: RdfTriple => triple = triple.setOTripleTerm(o)

triple
}
def rdfTriple(subject: RdfSpoValue, predicate: RdfSpoValue, `object`: RdfSpoValue): RdfTriple =
RdfTriple.newInstance()
.setSubject(subject)
.setPredicate(predicate)
.setObject(`object`)

def extractRdfStreamRow(row: RdfStreamRow): RdfStreamRowValue =
if row.hasOptions then row.getOptions
Expand Down