Skip to content

Commit 6dc0715

Browse files
authored
Call initialize in the Pipeline public constructor (#94)
* Encapsulate init in the aux constructor * Make pipeline.initialize() private
1 parent ee46645 commit 6dc0715

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ String json =
152152
153153
var pipeline = new Pipeline(json, LogLevel.Error());
154154
155-
pipeline.initialize(); // initialize the pipeline
156155
pipeline.execute(); // execute the pipeline
157156
158157
var metadata = pipeline.getMetadata(); // retrieve metadata

core/src/main/scala/io/pdal/Pipeline.scala

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@ import com.github.sbt.jni.syntax.NativeLoader
2929
class Pipeline private (val json: String, val logLevel: Int) extends Native {
3030
Pipeline // reference companion object so nativeLoader loads the JNI native libraries
3131

32-
def this(json: String, logLevel: LogLevel.Value = LogLevel.Error) = this(json, logLevel.id)
32+
def this(json: String, logLevel: LogLevel.Value = LogLevel.Error) = {
33+
this(json, logLevel.id); initialize()
34+
}
3335

34-
@native def initialize(): Unit
36+
@native private def initialize(): Unit
3537
@native def execute(): Unit
3638
@native def getPointViews(): PointViewIterator
3739
@native def close(): Unit
@@ -46,7 +48,6 @@ class Pipeline private (val json: String, val logLevel: Int) extends Native {
4648
}
4749

4850
object Pipeline extends NativeLoader("pdaljni.2.6") {
49-
def apply(json: String, logLevel: LogLevel.Value = LogLevel.Error): Pipeline = {
50-
val p = new Pipeline(json, logLevel); p.initialize(); p
51-
}
51+
def apply(json: String, logLevel: LogLevel.Value = LogLevel.Error): Pipeline =
52+
new Pipeline(json, logLevel)
5253
}

0 commit comments

Comments
 (0)