From 2b0dc21a11bafcd27414e561be5b5420812a634c Mon Sep 17 00:00:00 2001 From: Sivanand Date: Wed, 27 May 2015 16:31:26 +0530 Subject: [PATCH 1/3] ConfigFactory import is duplicated --- .../src/main/scala/com/databricks/apps/WeatherClientApp.scala | 2 -- 1 file changed, 2 deletions(-) diff --git a/timeseries/scala/timeseries-weather/src/main/scala/com/databricks/apps/WeatherClientApp.scala b/timeseries/scala/timeseries-weather/src/main/scala/com/databricks/apps/WeatherClientApp.scala index 9c8d3b1..1a4b242 100644 --- a/timeseries/scala/timeseries-weather/src/main/scala/com/databricks/apps/WeatherClientApp.scala +++ b/timeseries/scala/timeseries-weather/src/main/scala/com/databricks/apps/WeatherClientApp.scala @@ -15,8 +15,6 @@ */ package com.databricks.apps -import com.sun.deploy.config.ConfigFactory - import scala.collection.immutable import akka.actor._ import akka.cluster.Cluster From 4f122a8ced7b29c1a7a942e27641101fe5c051ba Mon Sep 17 00:00:00 2001 From: Sivanand Date: Wed, 27 May 2015 16:35:40 +0530 Subject: [PATCH 2/3] Scala compile errors fixed --- .../scala/com/databricks/apps/weather/WeatherApiQueries.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/timeseries/scala/timeseries-weather/src/main/scala/com/databricks/apps/weather/WeatherApiQueries.scala b/timeseries/scala/timeseries-weather/src/main/scala/com/databricks/apps/weather/WeatherApiQueries.scala index 03a8d59..71db779 100644 --- a/timeseries/scala/timeseries-weather/src/main/scala/com/databricks/apps/weather/WeatherApiQueries.scala +++ b/timeseries/scala/timeseries-weather/src/main/scala/com/databricks/apps/weather/WeatherApiQueries.scala @@ -22,6 +22,7 @@ import scala.concurrent.duration._ import akka.actor._ import com.datastax.spark.connector.embedded.Event import org.joda.time.{DateTime, DateTimeZone} +import scala.collection.JavaConversions._ class WeatherApiQueries(settings: WeatherSettings, actor: ActorSelection) extends AggregationActor with ActorLogging { @@ -78,7 +79,7 @@ class WeatherApiQueries(settings: WeatherSettings, actor: ActorSelection) log.info("Requesting weather station {}", sample.wsid) actor ! GetWeatherStation(sample.wsid) - queried += sample + queried + sample } def getLines(file: JFile): Stream[String] = { From 28f7bcd9c03c359dd2df6d9831368a475220fd39 Mon Sep 17 00:00:00 2001 From: Sivanand Date: Wed, 27 May 2015 16:52:56 +0530 Subject: [PATCH 3/3] Scala compile errors fixed --- .../scala/com/databricks/apps/weather/WeatherApiQueries.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/timeseries/scala/timeseries-weather/src/main/scala/com/databricks/apps/weather/WeatherApiQueries.scala b/timeseries/scala/timeseries-weather/src/main/scala/com/databricks/apps/weather/WeatherApiQueries.scala index 71db779..25ca48c 100644 --- a/timeseries/scala/timeseries-weather/src/main/scala/com/databricks/apps/weather/WeatherApiQueries.scala +++ b/timeseries/scala/timeseries-weather/src/main/scala/com/databricks/apps/weather/WeatherApiQueries.scala @@ -79,7 +79,7 @@ class WeatherApiQueries(settings: WeatherSettings, actor: ActorSelection) log.info("Requesting weather station {}", sample.wsid) actor ! GetWeatherStation(sample.wsid) - queried + sample + queried = queried + sample } def getLines(file: JFile): Stream[String] = {