Skip to content

Commit 4786fb2

Browse files
authored
Update Jelly-JVM to 3.4.0 (#174)
Yay, less test code.
1 parent e46e8ea commit 4786fb2

2 files changed

Lines changed: 14 additions & 71 deletions

File tree

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ resolvers +=
66
"Sonatype OSS Snapshots" at "https://s01.oss.sonatype.org/content/repositories/snapshots"
77

88
lazy val jenaV = "5.3.0"
9-
lazy val jellyV = "3.3.2"
9+
lazy val jellyV = "3.4.0"
1010
lazy val graalvmV = "24.2.2"
1111

1212
addCommandAlias("fixAll", "scalafixAll; scalafmtAll")

src/test/scala/eu/neverblink/jelly/cli/command/helpers/RdfAdapter.scala

Lines changed: 13 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -144,17 +144,9 @@ object RdfAdapter:
144144
type RdfGraphValue =
145145
RdfIri | String | RdfDefaultGraph | RdfLiteral | Null
146146

147-
def rdfGraphStart(graph: RdfGraphValue): RdfGraphStart = {
148-
val graphStart = RdfGraphStart.newInstance()
149-
150-
graph match
151-
case g: RdfIri => graphStart.setGIri(g)
152-
case g: String => graphStart.setGBnode(g)
153-
case g: RdfDefaultGraph => graphStart.setGDefaultGraph(g)
154-
case g: RdfLiteral => graphStart.setGLiteral(g)
155-
156-
graphStart
157-
}
147+
def rdfGraphStart(graph: RdfGraphValue): RdfGraphStart =
148+
RdfGraphStart.newInstance()
149+
.setGraph(graph)
158150

159151
def rdfGraphStart(): RdfGraphStart =
160152
RdfGraphStart.newInstance()
@@ -167,69 +159,20 @@ object RdfAdapter:
167159
predicate: RdfSpoValue,
168160
`object`: RdfSpoValue,
169161
graph: RdfGraphValue = null,
170-
): RdfQuad = {
171-
var quad = RdfQuad.newInstance()
172-
173-
if subject != null then
174-
subject match
175-
case s: RdfIri => quad = quad.setSIri(s)
176-
case s: String => quad = quad.setSBnode(s)
177-
case s: RdfLiteral => quad = quad.setSLiteral(s)
178-
case s: RdfTriple => quad = quad.setSTripleTerm(s)
179-
180-
if predicate != null then
181-
predicate match
182-
case p: RdfIri => quad = quad.setPIri(p)
183-
case p: String => quad = quad.setPBnode(p)
184-
case p: RdfLiteral => quad = quad.setPLiteral(p)
185-
case p: RdfTriple => quad = quad.setPTripleTerm(p)
186-
187-
if `object` != null then
188-
`object` match
189-
case o: RdfIri => quad = quad.setOIri(o)
190-
case o: String => quad = quad.setOBnode(o)
191-
case o: RdfLiteral => quad = quad.setOLiteral(o)
192-
case o: RdfTriple => quad = quad.setOTripleTerm(o)
193-
194-
if graph != null then
195-
graph match
196-
case g: RdfIri => quad = quad.setGIri(g)
197-
case g: String => quad = quad.setGBnode(g)
198-
case g: RdfDefaultGraph => quad = quad.setGDefaultGraph(g)
199-
case g: RdfLiteral => quad = quad.setGLiteral(g)
200-
201-
quad
202-
}
162+
): RdfQuad = RdfQuad.newInstance()
163+
.setSubject(subject)
164+
.setPredicate(predicate)
165+
.setObject(`object`)
166+
.setGraph(graph)
203167

204168
type RdfSpoValue =
205169
RdfIri | String | RdfLiteral | RdfTriple | Null
206170

207-
def rdfTriple(subject: RdfSpoValue, predicate: RdfSpoValue, `object`: RdfSpoValue): RdfTriple = {
208-
var triple = RdfTriple.newInstance()
209-
210-
if subject != null then
211-
subject match
212-
case s: RdfIri => triple = triple.setSIri(s)
213-
case s: String => triple = triple.setSBnode(s)
214-
case s: RdfLiteral => triple = triple.setSLiteral(s)
215-
case s: RdfTriple => triple = triple.setSTripleTerm(s)
216-
217-
if predicate != null then
218-
predicate match
219-
case p: RdfIri => triple = triple.setPIri(p)
220-
case p: String => triple = triple.setPBnode(p)
221-
case p: RdfLiteral => triple = triple.setPLiteral(p)
222-
case p: RdfTriple => triple = triple.setPTripleTerm(p)
223-
224-
if `object` != null then
225-
`object` match
226-
case o: RdfIri => triple = triple.setOIri(o)
227-
case o: String => triple = triple.setOBnode(o)
228-
case o: RdfLiteral => triple = triple.setOLiteral(o)
229-
case o: RdfTriple => triple = triple.setOTripleTerm(o)
230-
231-
triple
232-
}
171+
def rdfTriple(subject: RdfSpoValue, predicate: RdfSpoValue, `object`: RdfSpoValue): RdfTriple =
172+
RdfTriple.newInstance()
173+
.setSubject(subject)
174+
.setPredicate(predicate)
175+
.setObject(`object`)
233176

234177
def extractRdfStreamRow(row: RdfStreamRow): RdfStreamRowValue =
235178
if row.hasOptions then row.getOptions

0 commit comments

Comments
 (0)