Skip to content

Commit 9218fbc

Browse files
committed
Consolidate managed resource.
1 parent 6a8d05c commit 9218fbc

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

src/main/scala/org/renci/relationgraph/Main.scala

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,7 @@ object Main extends ZCaseApp[Config] {
3838
private val OWLOntology = OWL2.Ontology.asNode
3939

4040
override def run(config: Config, arg: RemainingArgs): ZIO[ZEnv, Nothing, ExitCode] = {
41-
val streamManaged = for {
42-
outputStream <- Managed.fromAutoCloseable(ZIO.effect(new FileOutputStream(new File(config.outputFile))))
43-
rdfWriter <- createStreamRDF(outputStream)
44-
} yield rdfWriter
45-
val program = streamManaged.use { rdfWriter =>
41+
val program = createStreamRDF(config.outputFile).use { rdfWriter =>
4642
for {
4743
fileProperties <- config.propertiesFile.map(readPropertiesFile).getOrElse(ZIO.succeed(Set.empty[AtomicConcept]))
4844
specifiedProperties = fileProperties ++ config.property.map(prop => AtomicConcept(prop)).to(Set)
@@ -93,14 +89,16 @@ object Main extends ZCaseApp[Config] {
9389
ontology <- ZIO.effect(manager.loadOntologyFromOntologyDocument(new File(path)))
9490
} yield ontology
9591

96-
def createStreamRDF(output: OutputStream): Managed[Throwable, StreamRDF] =
97-
Managed.make {
92+
def createStreamRDF(path: String): TaskManaged[StreamRDF] = for {
93+
outputStream <- Managed.fromAutoCloseable(ZIO.effect(new FileOutputStream(new File(path))))
94+
rdfWriter <- Managed.make {
9895
ZIO.effect {
99-
val stream = StreamRDFWriter.getWriterStream(output, RDFFormat.TURTLE_FLAT, null)
96+
val stream = StreamRDFWriter.getWriterStream(outputStream, RDFFormat.TURTLE_FLAT, null)
10097
stream.start()
10198
stream
10299
}
103100
}(stream => ZIO.succeed(stream.finish()))
101+
} yield rdfWriter
104102

105103
def allClasses(ont: OWLOntology): ZStream[Any, Nothing, OWLClass] = Stream.fromIterable(ont.getClassesInSignature(Imports.INCLUDED).asScala.to(Set) - OWLThing - OWLNothing)
106104

0 commit comments

Comments
 (0)