Skip to content

Commit 7cac778

Browse files
rozzarozza
committed
Scalastyle and type simplifications and cleanups
1 parent be4afcd commit 7cac778

File tree

4 files changed

+89
-99
lines changed

4 files changed

+89
-99
lines changed

‎driver-scala/src/test/scala/org/mongodb/scala/internal/ObservableImplementationSpec.scala

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -221,48 +221,48 @@ class ObservableImplementationSpec extends BaseSpec with TableDrivenPropertyChec
221221
private def failingObservables =
222222
Table(
223223
"observable",
224-
TestObservable[Int](failOn = failOn),
225-
AndThenObservable[Int, Int](TestObservable[Int](failOn = failOn), {
224+
TestObservable(failOn = failOn),
225+
AndThenObservable[Int, Int](TestObservable(failOn = failOn), {
226226
case Success(r) => 1000
227227
case Failure(ex) => 0
228228
}),
229-
FilterObservable[Int](TestObservable[Int](failOn = failOn), (i: Int) => i % 2 != 0),
230-
FlatMapObservable[Int, Int](TestObservable[Int](), (i: Int) => TestObservable[Int](failOn = failOn)),
231-
FoldLeftObservable(TestObservable[Int](1 to 100, failOn = failOn), 0, (v: Int, i: Int) => v + i),
232-
MapObservable[Int, Int](TestObservable[Int](failOn = failOn), (i: Int) => i * 100),
233-
RecoverObservable[Int, Int](TestObservable[Int](failOn = failOn), { case e: ArithmeticException => 999 }),
234-
RecoverWithObservable[Int, Int](TestObservable[Int](failOn = failOn), {
235-
case e: ArithmeticException => TestObservable[Int]()
229+
FilterObservable[Int](TestObservable(failOn = failOn), (i: Int) => i % 2 != 0),
230+
FlatMapObservable[Int, Int](TestObservable(), (i: Int) => TestObservable(failOn = failOn)),
231+
FoldLeftObservable(TestObservable(1 to 100, failOn = failOn), 0, (v: Int, i: Int) => v + i),
232+
MapObservable[Int, Int](TestObservable(failOn = failOn), (i: Int) => i * 100),
233+
RecoverObservable[Int, Int](TestObservable(failOn = failOn), { case e: ArithmeticException => 999 }),
234+
RecoverWithObservable[Int, Int](TestObservable(failOn = failOn), {
235+
case e: ArithmeticException => TestObservable()
236236
}),
237-
RecoverWithObservable[Int, Int](TestObservable[Int](failOn = failOn), {
238-
case e => TestObservable[Int](failOn = failOn)
237+
RecoverWithObservable[Int, Int](TestObservable(failOn = failOn), {
238+
case e => TestObservable(failOn = failOn)
239239
}),
240-
ZipObservable[Int, Int](TestObservable[Int](), TestObservable[Int](failOn = failOn)).map[Int](a => a._1),
241-
ZipObservable[Int, Int](TestObservable[Int](failOn = failOn), TestObservable[Int]()).map[Int](a => a._1)
240+
ZipObservable[Int, Int](TestObservable(), TestObservable(failOn = failOn)).map[Int](a => a._1),
241+
ZipObservable[Int, Int](TestObservable(failOn = failOn), TestObservable()).map[Int](a => a._1)
242242
)
243243

244244
private def failingFunctionsObservables =
245245
Table(
246246
"observable",
247-
FilterObservable[Int](TestObservable[Int](), (i: Int) => {
247+
FilterObservable[Int](TestObservable(), (i: Int) => {
248248
if (i > 10) {
249249
throw new RuntimeException("Error")
250250
}
251251
i % 2 == 0
252252
}),
253-
FlatMapObservable[Int, Int](TestObservable[Int](), (i: Int) => {
253+
FlatMapObservable[Int, Int](TestObservable(), (i: Int) => {
254254
if (i > 10) {
255255
throw new RuntimeException("Error")
256256
}
257-
TestObservable[Int](1 to 2)
257+
TestObservable(1 to 2)
258258
}),
259-
FoldLeftObservable(TestObservable[Int](1 to 100), 0, (v: Int, i: Int) => {
259+
FoldLeftObservable(TestObservable(1 to 100), 0, (v: Int, i: Int) => {
260260
if (i > 10) {
261261
throw new RuntimeException("Error")
262262
}
263263
v + i
264264
}),
265-
MapObservable[Int, Int](TestObservable[Int](), (i: Int) => {
265+
MapObservable[Int, Int](TestObservable(), (i: Int) => {
266266
if (i > 10) {
267267
throw new RuntimeException("Error")
268268
}
@@ -273,71 +273,71 @@ class ObservableImplementationSpec extends BaseSpec with TableDrivenPropertyChec
273273
private def happyObservables =
274274
Table(
275275
("observable", "observer"),
276-
(TestObservable[Int](), TestObserver[Int]()),
277-
(AndThenObservable[Int, Int](TestObservable[Int](), {
276+
(TestObservable(), TestObserver[Int]()),
277+
(AndThenObservable[Int, Int](TestObservable(), {
278278
case Success(r) => 1000
279279
case Failure(ex) => 0
280280
}), TestObserver[Int]()),
281-
(FilterObservable[Int](TestObservable[Int](), (i: Int) => i % 2 != 0), TestObserver[Int]()),
281+
(FilterObservable[Int](TestObservable(), (i: Int) => i % 2 != 0), TestObserver[Int]()),
282282
(
283-
FlatMapObservable[Int, Int](TestObservable[Int](), (i: Int) => TestObservable[Int](1 to 1)),
283+
FlatMapObservable[Int, Int](TestObservable(), (i: Int) => TestObservable(1 to 1)),
284284
TestObserver[Int]()
285285
),
286286
(
287-
FlatMapObservable[Int, Int](TestObservable[Int](1 to 1), (i: Int) => TestObservable[Int]()),
287+
FlatMapObservable[Int, Int](TestObservable(1 to 1), (i: Int) => TestObservable()),
288288
TestObserver[Int]()
289289
),
290-
(FoldLeftObservable(TestObservable[Int](1 to 100), 0, (v: Int, i: Int) => v + i), TestObserver[Int]()),
291-
(MapObservable[Int, Int](TestObservable[Int](), (i: Int) => i * 100), TestObserver[Int]()),
292-
(RecoverObservable[Int, Int](TestObservable[Int](), { case e: ArithmeticException => 999 }), TestObserver[Int]()),
290+
(FoldLeftObservable(TestObservable(1 to 100), 0, (v: Int, i: Int) => v + i), TestObserver[Int]()),
291+
(MapObservable[Int, Int](TestObservable(), (i: Int) => i * 100), TestObserver[Int]()),
292+
(RecoverObservable[Int, Int](TestObservable(), { case e: ArithmeticException => 999 }), TestObserver[Int]()),
293293
(
294-
RecoverWithObservable[Int, Int](TestObservable[Int](), { case t => TestObservable[Int]() }),
294+
RecoverWithObservable[Int, Int](TestObservable(), { case t => TestObservable() }),
295295
TestObserver[Int]()
296296
),
297297
(
298-
RecoverWithObservable[Int, Int](TestObservable[Int](1 to 10, failOn = 1), { case t => TestObservable[Int]() }),
298+
RecoverWithObservable[Int, Int](TestObservable(1 to 10, failOn = 1), { case t => TestObservable() }),
299299
TestObserver[Int]()
300300
),
301301
(IterableObservable((1 to 100).toStream), TestObserver[Int]()),
302-
(ZipObservable[Int, Int](TestObservable[Int](), TestObservable[Int]()).map[Int](a => a._1), TestObserver[Int]())
302+
(ZipObservable[Int, Int](TestObservable(), TestObservable()).map[Int](a => a._1), TestObserver[Int]())
303303
)
304304

305305
private def zippedObservables =
306306
Table[Observable[(Int, Int)]](
307307
"observable",
308-
ZipObservable[Int, Int](TestObservable[Int](1 to 50), TestObservable[Int]()),
309-
ZipObservable[Int, Int](TestObservable[Int](), TestObservable[Int](1 to 50))
308+
ZipObservable[Int, Int](TestObservable(1 to 50), TestObservable()),
309+
ZipObservable[Int, Int](TestObservable(), TestObservable(1 to 50))
310310
)
311311

312312
private def zippedObservablesWithEmptyObservable =
313313
Table[Observable[(Int, Int)]](
314314
"observable",
315-
ZipObservable[Int, Int](TestObservable[Int](1 to 50), TestObservable[Int](List())),
316-
ZipObservable[Int, Int](TestObservable[Int](List()), TestObservable[Int](1 to 50))
315+
ZipObservable[Int, Int](TestObservable(1 to 50), TestObservable(List())),
316+
ZipObservable[Int, Int](TestObservable(List()), TestObservable(1 to 50))
317317
)
318318

319319
private def overRequestingObservables =
320320
Table(
321321
("observable", "observer", "expected"),
322322
(
323323
FlatMapObservable[Int, Int](
324-
OverRequestedObservable(TestObservable[Int](1 to 10)),
325-
(i: Int) => TestObservable[Int](1 to 10)
324+
OverRequestedObservable(TestObservable(1 to 10)),
325+
(i: Int) => TestObservable(1 to 10)
326326
),
327327
TestObserver[Int](),
328328
100
329329
),
330330
(
331331
RecoverWithObservable[Int, Int](
332-
TestObservable[Int](1 to 10, failOn = 1),
333-
{ case t => OverRequestedObservable(TestObservable[Int](1 to 10)) }
332+
TestObservable(1 to 10, failOn = 1),
333+
{ case t => OverRequestedObservable(TestObservable(1 to 10)) }
334334
),
335335
TestObserver[Int](),
336336
10
337337
)
338338
)
339339

340-
case class OverRequestedObservable(observable: TestObservable[Int] = TestObservable[Int]()) extends Observable[Int] {
340+
case class OverRequestedObservable(observable: TestObservable = TestObservable()) extends Observable[Int] {
341341

342342
var totalRequested = 0L
343343
override def subscribe(observer: Observer[_ >: Int]): Unit = {

‎driver-scala/src/test/scala/org/mongodb/scala/internal/ScalaObservableSpec.scala

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class ScalaObservableSpec extends BaseSpec {
5454
it should "have a transform method" in {
5555
var completed = false
5656
val results = ArrayBuffer[String]()
57-
observable[Int]()
57+
observable()
5858
.transform((res: Int) => res.toString, (ex: Throwable) => ex)
5959
.subscribe((s: String) => results += s, (t: Throwable) => (), () => completed = true)
6060
results should equal((1 to 100).map(_.toString))
@@ -63,7 +63,7 @@ class ScalaObservableSpec extends BaseSpec {
6363
completed = false
6464
val exception = new MongoException("New Exception")
6565
var throwable: Option[Throwable] = None
66-
observable[Int](fail = true)
66+
observable(fail = true)
6767
.transform((res: Int) => res, (ex: Throwable) => exception)
6868
.subscribe((s: Int) => (), (t: Throwable) => throwable = Some(t), () => completed = true)
6969

@@ -74,7 +74,7 @@ class ScalaObservableSpec extends BaseSpec {
7474
it should "have a map method" in {
7575
val results = ArrayBuffer[String]()
7676
var completed = false
77-
observable[Int]()
77+
observable()
7878
.map((res: Int) => res.toString)
7979
.subscribe((s: String) => results += s, (t: Throwable) => (), () => completed = true)
8080
results should equal((1 to 100).map(_.toString))
@@ -83,7 +83,7 @@ class ScalaObservableSpec extends BaseSpec {
8383

8484
it should "have a flatMap method" in {
8585
def myObservable(fail: Boolean = false): Observable[String] =
86-
observable[Int](fail = fail).flatMap((res: Int) => observable(List(res.toString)))
86+
observable(fail = fail).flatMap((res: Int) => Observable(List(res.toString)))
8787

8888
val results = ArrayBuffer[String]()
8989
myObservable().subscribe((s: String) => results += s)
@@ -102,7 +102,7 @@ class ScalaObservableSpec extends BaseSpec {
102102

103103
it should "have a filter method" in {
104104
def myObservable(fail: Boolean = false): Observable[Int] =
105-
observable[Int](fail = fail).filter((i: Int) => i % 2 != 0)
105+
observable(fail = fail).filter((i: Int) => i % 2 != 0)
106106

107107
val results = ArrayBuffer[Int]()
108108
myObservable().subscribe((i: Int) => results += i)
@@ -119,7 +119,7 @@ class ScalaObservableSpec extends BaseSpec {
119119

120120
it should "have a withFilter method" in {
121121
def myObservable(fail: Boolean = false): Observable[Int] =
122-
observable[Int](fail = fail).withFilter((i: Int) => i % 2 != 0)
122+
observable(fail = fail).withFilter((i: Int) => i % 2 != 0)
123123

124124
val results = ArrayBuffer[Int]()
125125
myObservable().subscribe((i: Int) => results += i)
@@ -136,7 +136,7 @@ class ScalaObservableSpec extends BaseSpec {
136136

137137
it should "have a collect method" in {
138138
def myObservable(fail: Boolean = false): Observable[Seq[Int]] = {
139-
observable[Int](fail = fail).collect()
139+
observable(fail = fail).collect()
140140
}
141141

142142
val results = ArrayBuffer[Int]()
@@ -157,7 +157,7 @@ class ScalaObservableSpec extends BaseSpec {
157157
var completed = false
158158
var errorSeen: Option[Throwable] = None
159159

160-
observable[Int]()
160+
observable()
161161
.collect()
162162
.flatMap(_ => Observable(1 to 3))
163163
.subscribe((i: Int) => results += i, (t: Throwable) => errorSeen = Some(t), () => completed = true)
@@ -170,7 +170,7 @@ class ScalaObservableSpec extends BaseSpec {
170170
completed = false
171171
errorSeen = None
172172

173-
observable[Int](fail = true)
173+
observable(fail = true)
174174
.collect()
175175
.flatMap(_ => Observable(1 to 3))
176176
.subscribe((i: Int) => results += i, (t: Throwable) => errorSeen = Some(t), () => completed = true)
@@ -182,7 +182,7 @@ class ScalaObservableSpec extends BaseSpec {
182182

183183
it should "have a foldLeft method" in {
184184
def myObservable(fail: Boolean = false): Observable[Int] = {
185-
observable[Int](fail = fail).foldLeft(0)((l: Int, i) => l + 1)
185+
observable(fail = fail).foldLeft(0)((l: Int, i) => l + 1)
186186
}
187187

188188
var results = 0
@@ -204,7 +204,7 @@ class ScalaObservableSpec extends BaseSpec {
204204
results should equal(1 to 100)
205205

206206
var errorSeen: Option[Throwable] = None
207-
observable[Int](fail = true)
207+
observable(fail = true)
208208
.recover({ case e: ArithmeticException => 999 })
209209
.subscribe((s: Int) => (), (fail: Throwable) => errorSeen = Some(fail))
210210
errorSeen.getOrElse(None) shouldBe a[Throwable]
@@ -229,8 +229,8 @@ class ScalaObservableSpec extends BaseSpec {
229229
results = ArrayBuffer[Int]()
230230
var errorSeen: Option[Throwable] = None
231231
completed = false
232-
observable[Int](fail = true)
233-
.recoverWith({ case e: ArithmeticException => observable[Int](1000 to 1001) })
232+
observable(fail = true)
233+
.recoverWith({ case e: ArithmeticException => observable(1000 to 1001) })
234234
.subscribe((i: Int) => results += i, (fail: Throwable) => errorSeen = Some(fail), () => completed = true)
235235
errorSeen.getOrElse(None) shouldBe a[Throwable]
236236
results should equal(1 to 50)
@@ -254,32 +254,32 @@ class ScalaObservableSpec extends BaseSpec {
254254

255255
it should "have a zip method" in {
256256
val results = ArrayBuffer[(Int, String)]()
257-
observable[Int]().zip(observable().map(i => i.toString)).subscribe((res: (Int, String)) => results += res)
257+
observable().zip(observable().map(i => i.toString)).subscribe((res: (Int, String)) => results += res)
258258
results should equal((1 to 100).zip((1 to 100).map(_.toString)))
259259
}
260260

261261
it should "have a fallBackTo method" in {
262262
var results = ArrayBuffer[Int]()
263-
observable().fallbackTo(observable[Int](1000 to 1001)).subscribe((i: Int) => results += i)
263+
observable().fallbackTo(observable(1000 to 1001)).subscribe((i: Int) => results += i)
264264
results should equal(1 to 100)
265265

266266
results = ArrayBuffer[Int]()
267267
observable(fail = true)
268-
.fallbackTo(observable[Int](1000 to 1001))
268+
.fallbackTo(observable(1000 to 1001))
269269
.subscribe((i: Int) => results += i)
270270
results should equal((1 to 50) ++ (1000 to 1001))
271271

272272
var errorMessage = ""
273-
TestObservable[Int](1 to 100, 10, "Original Error")
274-
.fallbackTo(TestObservable[Int](1000 to 1001, 1000, "Fallback Error"))
273+
TestObservable(1 to 100, 10, "Original Error")
274+
.fallbackTo(TestObservable(1000 to 1001, 1000, "Fallback Error"))
275275
.subscribe((i: Int) => i, (t: Throwable) => errorMessage = t.getMessage)
276276
errorMessage should equal("Original Error")
277277
}
278278

279279
it should "have an andThen method" in {
280280
var results = ArrayBuffer[Int]()
281281
def myObservable(fail: Boolean = false): Observable[Int] = {
282-
observable[Int](1 to 100, fail = fail) andThen {
282+
observable(1 to 100, fail = fail) andThen {
283283
case Success(r) => results += 999
284284
case Failure(ex) => results += -999
285285
}
@@ -357,7 +357,7 @@ class ScalaObservableSpec extends BaseSpec {
357357
it should "convert to a Future" in {
358358
var results = ArrayBuffer[Int]()
359359
var errorSeen: Option[Throwable] = None
360-
val happyFuture = observable[Int]().toFuture()
360+
val happyFuture = observable().toFuture()
361361
var latch = new CountDownLatch(1)
362362

363363
happyFuture.onComplete({
@@ -372,7 +372,7 @@ class ScalaObservableSpec extends BaseSpec {
372372

373373
results = ArrayBuffer[Int]()
374374
latch = new CountDownLatch(1)
375-
val unhappyFuture = observable[Int](fail = true).toFuture()
375+
val unhappyFuture = observable(fail = true).toFuture()
376376
unhappyFuture.onComplete({
377377
case Success(res) => results ++= res
378378
case Failure(throwable) =>
@@ -389,30 +389,30 @@ class ScalaObservableSpec extends BaseSpec {
389389
}
390390

391391
it should "provide a headOption method" in {
392-
Await.result(observable[Int]().headOption(), Duration(10, TimeUnit.SECONDS)) should equal(Some(1))
393-
Await.result(observable[Int](fail = true).headOption(), Duration(10, TimeUnit.SECONDS)) should equal(Some(1))
392+
Await.result(observable().headOption(), Duration(10, TimeUnit.SECONDS)) should equal(Some(1))
393+
Await.result(observable(fail = true).headOption(), Duration(10, TimeUnit.SECONDS)) should equal(Some(1))
394394

395395
intercept[MongoException] {
396396
Await.result(
397-
TestObservable[Int](Observable[Int](1 to 10), failOn = 1).headOption(),
397+
TestObservable(observable(1 to 10), failOn = 1).headOption(),
398398
Duration(10, TimeUnit.SECONDS)
399399
)
400400
}
401401

402-
Await.result(TestObservable[Int](Observable(List[Int]())).headOption(), Duration(10, TimeUnit.SECONDS)) should equal(
402+
Await.result(TestObservable(Observable(List[Int]())).headOption(), Duration(10, TimeUnit.SECONDS)) should equal(
403403
None
404404
)
405405
}
406406

407407
it should "provide a head method" in {
408-
Await.result(observable[Int]().head(), Duration(10, TimeUnit.SECONDS)) should equal(1)
409-
Await.result(observable[Int](fail = true).head(), Duration(10, TimeUnit.SECONDS)) should equal(1)
408+
Await.result(observable().head(), Duration(10, TimeUnit.SECONDS)) should equal(1)
409+
Await.result(observable(fail = true).head(), Duration(10, TimeUnit.SECONDS)) should equal(1)
410410

411411
intercept[MongoException] {
412-
Await.result(TestObservable[Int](Observable[Int](1 to 10), failOn = 1).head(), Duration(10, TimeUnit.SECONDS))
412+
Await.result(TestObservable(observable(1 to 10), failOn = 1).head(), Duration(10, TimeUnit.SECONDS))
413413
}
414414

415-
Option(Await.result(TestObservable[Int](Observable(List[Int]())).head(), Duration(10, TimeUnit.SECONDS))) should equal(
415+
Option(Await.result(TestObservable(Observable(List[Int]())).head(), Duration(10, TimeUnit.SECONDS))) should equal(
416416
None
417417
)
418418
}
@@ -510,7 +510,7 @@ class ScalaObservableSpec extends BaseSpec {
510510
override def onNext(result: Int): Unit = results += result
511511
}
512512

513-
observable[Int]().subscribe(observer)
513+
observable().subscribe(observer)
514514
latch.await(10, TimeUnit.SECONDS)
515515
results should equal(1 to 100)
516516

@@ -559,10 +559,11 @@ class ScalaObservableSpec extends BaseSpec {
559559
observeOnThreadId1 should not be observeOnThreadId2
560560
}
561561

562-
def observable[A](from: Iterable[A] = (1 to 100), fail: Boolean = false): Observable[A] = {
563-
fail match {
564-
case true => TestObservable[A](from, failOn = 51)
565-
case false => TestObservable[A](from)
562+
def observable(from: Iterable[Int] = (1 to 100), fail: Boolean = false): Observable[Int] = {
563+
if (fail) {
564+
TestObservable(from, failOn = 51)
565+
} else {
566+
TestObservable(from)
566567
}
567568
}
568569

0 commit comments

Comments
 (0)