Fixed warnings and broken tests because of upgrade to scala 2.10

devans · devans · commit bdd947a91c17 · 2013-04-10T18:16:46.000-04:00
diff --git a/admin-shell/src/main/scala/org/totalgrid/reef/shell/admin/AdminCommands.scala b/admin-shell/src/main/scala/org/totalgrid/reef/shell/admin/AdminCommands.scala
@@ -100,7 +100,7 @@ class ResetDatabaseCommand extends ReefCommandSupport {
         }
       }
     } catch {
-      case ex => println("Reset failed: " + ex.toString)
+      case ex: Throwable => println("Reset failed: " + ex.toString)
     }
 
     mstore.disconnect()
diff --git a/benchmarks/src/main/scala/org/totalgrid/reef/benchmarks/AllBenchmarksEntryPoint.scala b/benchmarks/src/main/scala/org/totalgrid/reef/benchmarks/AllBenchmarksEntryPoint.scala
@@ -87,7 +87,7 @@ object AllBenchmarksEntryPoint {
         args = args drop 1
       }
     } catch {
-      case ex =>
+      case ex: Throwable =>
         printf("Exception: " + ex.toString)
         usage
     }
diff --git a/benchmarks/src/main/scala/org/totalgrid/reef/benchmarks/system/ModelCreationUtilities.scala b/benchmarks/src/main/scala/org/totalgrid/reef/benchmarks/system/ModelCreationUtilities.scala
@@ -88,7 +88,7 @@ object ModelCreationUtilities {
             else startNext()
           } catch {
             case rse: ReefServiceException => prom.setFailure(rse)
-            case ex => prom.setFailure(new UnknownServiceException(ex.toString))
+            case ex: Throwable => prom.setFailure(new UnknownServiceException(ex.toString))
           }
         }
       }
diff --git a/calculations/calculations-library/src/test/scala/org/totalgrid/reef/calc/lib/MeasInputManagerTest.scala b/calculations/calculations-library/src/test/scala/org/totalgrid/reef/calc/lib/MeasInputManagerTest.scala
@@ -38,7 +38,7 @@ class MeasInputManagerTest extends FunSuite with ShouldMatchers {
 
   class MockInputBucket(val variable: String, val getSnapshot: Option[List[Measurement]]) extends InputBucket {
 
-    def onReceived(m: Measurement) = null
+    def onReceived(m: Measurement) {}
 
     def getMeasRequest = null
   }
diff --git a/fep/src/main/scala/org/totalgrid/reef/frontend/FrontEndConnections.scala b/fep/src/main/scala/org/totalgrid/reef/frontend/FrontEndConnections.scala
@@ -104,7 +104,7 @@ class FrontEndConnections(protocolManagers: Map[String, ProtocolManager], newCli
       val result = services.alterEndpointConnectionState(c.getId, EndpointConnection.State.ERROR).await()
       logger.info("Updated endpoint state: " + endpointName + " state: " + result.getState)
     } catch {
-      case ex => logger.error("Couldn't update endpointState: " + ex.getMessage)
+      case ex: Throwable => logger.error("Couldn't update endpointState: " + ex.getMessage)
     }
   }
 }
diff --git a/fep/src/main/scala/org/totalgrid/reef/frontend/ProtocolTraitToManagerShim.scala b/fep/src/main/scala/org/totalgrid/reef/frontend/ProtocolTraitToManagerShim.scala
@@ -72,7 +72,7 @@ class ProtocolTraitToManagerShim(protocol: Protocol) extends ProtocolManager wit
         services.publishMeasurements(value, new AddressableDestination(routingKey)).await()
         logger.info("Published a measurement batch of size: " + value.getMeasCount + " to " + routingKey + " " + " in " + (System.currentTimeMillis() - startTime) + " ms")
       } catch {
-        case ex => logger.error("Couldn't publish measurements: " + ex.getMessage)
+        case ex: Throwable => logger.error("Couldn't publish measurements: " + ex.getMessage)
       }
     }
   }
@@ -83,7 +83,7 @@ class ProtocolTraitToManagerShim(protocol: Protocol) extends ProtocolManager wit
         val result = services.alterEndpointConnectionState(connectionId, state).await()
         logger.info("Updated endpoint state: " + endpointName + " state: " + result.getState)
       } catch {
-        case ex => logger.error("Couldn't update endpointState: " + ex.getMessage)
+        case ex: Throwable => logger.error("Couldn't update endpointState: " + ex.getMessage)
       }
     }
   }
@@ -94,7 +94,7 @@ class ProtocolTraitToManagerShim(protocol: Protocol) extends ProtocolManager wit
         val result = services.alterCommunicationChannelState(channelUuid, state).await()
         logger.info("Updated channel state: " + result.getName + " state: " + result.getState)
       } catch {
-        case ex => logger.error("Couldn't update channelState: " + ex.getMessage)
+        case ex: Throwable => logger.error("Couldn't update channelState: " + ex.getMessage)
       }
     }
   }
diff --git a/loader-xml/src/main/scala/org/totalgrid/reef/loader/ExceptionCollector.scala b/loader-xml/src/main/scala/org/totalgrid/reef/loader/ExceptionCollector.scala
@@ -61,7 +61,7 @@ class LoadingExceptionCollector extends ExceptionCollector with Logging {
         val nameString = try {
           name
         } catch {
-          case _ => "<unknown>"
+          case _: Throwable => "<unknown>"
         }
         logger.info("exception encountered during loading: " + nameString + ": " + ex.getMessage)
         //        logger.debug("DEBUG: exception encountered during loading: " + nameString + ": " + ex.getMessage + ": ", ex)
diff --git a/loader-xml/src/main/scala/org/totalgrid/reef/loader/LoadManager.scala b/loader-xml/src/main/scala/org/totalgrid/reef/loader/LoadManager.scala
@@ -68,7 +68,7 @@ object LoadManager extends Logging {
 
       (loader, valid)
     } catch {
-      case ex =>
+      case ex: Throwable =>
         println("Error loading configuration file '" + filename + "' " + ex.getMessage)
         throw ex
     }
diff --git a/loader-xml/src/main/scala/org/totalgrid/reef/loader/StandaloneLoader.scala b/loader-xml/src/main/scala/org/totalgrid/reef/loader/StandaloneLoader.scala
@@ -90,7 +90,7 @@ object StandaloneLoader {
       }
 
     } catch {
-      case ex =>
+      case ex: Throwable =>
         printf("Exception: " + ex.toString)
         usage
     }
diff --git a/loader-xml/src/main/scala/org/totalgrid/reef/loader/helpers/ModelContainer.scala b/loader-xml/src/main/scala/org/totalgrid/reef/loader/helpers/ModelContainer.scala
@@ -88,7 +88,6 @@ class ModelContainer extends Logging {
 
   def add(eventConfig: EventConfig) {
     addModel(eventConfig)
-    eventConfig
   }
 
   def add(endpointConfig: Endpoint): Endpoint =
diff --git a/measurementstore-api/src/main/scala/org/totalgrid/reef/measurementstore/encoders/NullMeasEncoder.scala b/measurementstore-api/src/main/scala/org/totalgrid/reef/measurementstore/encoders/NullMeasEncoder.scala
@@ -47,6 +47,7 @@ class NullMeasEncoder extends MeasEncoder {
       case Meas.Type.BOOL => ret.setBoolVal(m.getBoolVal)
       case Meas.Type.DOUBLE => ret.setDoubleVal(JDouble.longBitsToDouble(m.getDoubleVal))
       case Meas.Type.STRING => ret.setStringVal(m.getStringVal)
+      case Meas.Type.NONE =>
     }
     ret.build
   }
@@ -59,6 +60,7 @@ class NullMeasEncoder extends MeasEncoder {
       case Meas.Type.BOOL => ret.setBoolVal(m.getBoolVal)
       case Meas.Type.DOUBLE => ret.setDoubleVal(JDouble.doubleToLongBits(m.getDoubleVal))
       case Meas.Type.STRING => ret.setStringVal(m.getStringVal)
+      case Meas.Type.NONE =>
     }
     ret.build
   }
diff --git a/measurementstore-api/src/main/scala/org/totalgrid/reef/measurementstore/encoders/SimpleMeasEncoder.scala b/measurementstore-api/src/main/scala/org/totalgrid/reef/measurementstore/encoders/SimpleMeasEncoder.scala
@@ -75,6 +75,7 @@ class SimpleMeasEncoder extends MeasEncoder {
       case Meas.Type.BOOL => ret.setBoolVal(ei.meas.getBoolVal)
       case Meas.Type.DOUBLE => ret.setDoubleVal(JDouble.longBitsToDouble(dblVal))
       case Meas.Type.STRING => ret.setStringVal(ei.meas.getStringVal)
+      case Meas.Type.NONE =>
     }
     EncInfo(ret.build, Last(time, quality, intVal, dblVal))
   }
@@ -95,6 +96,7 @@ class SimpleMeasEncoder extends MeasEncoder {
       case Meas.Type.BOOL => ret.setBoolVal(ei.meas.getBoolVal)
       case Meas.Type.DOUBLE => ret.setDoubleVal(dblVal - ei.last.dblVal)
       case Meas.Type.STRING => ret.setStringVal(ei.meas.getStringVal)
+      case Meas.Type.NONE =>
     }
 
     EncInfo(ret.build, Last(ei.meas.getTime, ei.meas.getQuality, intVal, dblVal))
diff --git a/proto-shell/src/main/scala/org/totalgrid/reef/shell/proto/MeasCommand.scala b/proto-shell/src/main/scala/org/totalgrid/reef/shell/proto/MeasCommand.scala
@@ -149,7 +149,7 @@ class MeasOverrideCommand extends ReefCommandSupport {
     } catch {
       case ex: NumberFormatException =>
         Console.println("ERROR: Expected measurement value of type " + typ.toString + ", but found '" + value + "' instead.")
-      case ex => throw ex
+      case ex: Throwable => throw ex
     }
   }
 }
diff --git a/proto-shell/src/main/scala/org/totalgrid/reef/shell/proto/ReefCommandSupport.scala b/proto-shell/src/main/scala/org/totalgrid/reef/shell/proto/ReefCommandSupport.scala
@@ -188,7 +188,7 @@ abstract class ReefCommandSupport extends OsgiCommandSupport with Logging {
           ReefCommandSupport.attemptLogin(this.session, connectionInfo, userSettings, handleDisconnect)
           doCommand()
         } catch {
-          case _ =>
+          case _: Throwable =>
             println("Cannot auto-login see \"reef:login --help\"")
         }
       } else doCommand()
diff --git a/protocol-api/src/main/scala/org/totalgrid/reef/protocol/api/AddRemoveValidation.scala b/protocol-api/src/main/scala/org/totalgrid/reef/protocol/api/AddRemoveValidation.scala
@@ -61,7 +61,7 @@ trait AddRemoveValidation extends Protocol with Logging {
     }
   }
 
-  abstract override def removeChannel(channel: String): Unit = {
+  abstract override def removeChannel(channel: String) {
     channels.get(channel) match {
       case Some(Channel(_, listener)) =>
         // if a channel is removed, check to see that all of the endpoints using the channel have been removed
@@ -75,19 +75,17 @@ trait AddRemoveValidation extends Protocol with Logging {
           channels -= channel
           super.removeChannel(channel)
         }
-        listener
       case None =>
         throw new IllegalArgumentException("Cannot remove unknown channel " + channel)
     }
   }
 
   /// remove the device from the map and its channel's device list
-  abstract override def removeEndpoint(endpoint: String): Unit = {
+  abstract override def removeEndpoint(endpoint: String) {
     endpoints.get(endpoint) match {
       case Some(Endpoint(_, _, _, listener)) =>
         endpoints -= endpoint
         super.removeEndpoint(endpoint)
-        listener
       case None =>
         throw new IllegalArgumentException("Cannot remove unknown endpoint " + endpoint)
     }
diff --git a/protocol-dnp3/src/test/scala/org/totalgrid/reef/protocol/dnp3/slave/SlaveCommandProxyTest.scala b/protocol-dnp3/src/test/scala/org/totalgrid/reef/protocol/dnp3/slave/SlaveCommandProxyTest.scala
@@ -156,9 +156,8 @@ class SlaveCommandProxyTest extends FunSuite with ShouldMatchers {
         called = true
       }
     }
-    val ret = func(response)
+    func(response)
     called should equal(true)
-    ret
   }
 
   def getWorkingCommandService(commandName: String, _result: ProtoCommandStatus, cmdType: ModelCommandType) = {
diff --git a/services/services-core/src/main/scala/org/totalgrid/reef/services/core/MeasurementStatisticsService.scala b/services/services-core/src/main/scala/org/totalgrid/reef/services/core/MeasurementStatisticsService.scala
@@ -40,7 +40,7 @@ class MeasurementStatisticsService(cm: Historian)
 
   override def doGet(context: RequestContext, req: MeasurementStatistics): MeasurementStatistics = {
 
-    if (req.point.name == None && req.point.uuid == None) {
+    if (req.point.name == None && req.point.uuid.getOption == None) {
       throw new ReefServiceException("Must include point name or UUID", Status.BAD_REQUEST)
     }
 
diff --git a/services/services-core/src/main/scala/org/totalgrid/reef/services/core/ProcessStatusService.scala b/services/services-core/src/main/scala/org/totalgrid/reef/services/core/ProcessStatusService.scala
@@ -105,7 +105,7 @@ class ProcessStatusServiceModel(
 
     val existing = table.where(h => h.applicationId === app.id)
 
-    val ret = if (existing.size == 1) {
+    if (existing.size == 1) {
       logger.info("App " + hbSql.instanceName.value + ": is being marked back online at " + now + " id: " + processId)
       update(context, hbSql, existing.head)
     } else {
@@ -114,8 +114,6 @@ class ProcessStatusServiceModel(
     }
 
     notifyModels(context, app, true, capabilities)
-
-    ret
   }
 
   def handleOfflineHeartbeat(context: RequestContext, hbeat: HeartbeatStatus, now: Long = System.currentTimeMillis) = {
diff --git a/services/services-core/src/test/scala/org/totalgrid/reef/services/core/EndpointRelatedTestBase.scala b/services/services-core/src/test/scala/org/totalgrid/reef/services/core/EndpointRelatedTestBase.scala
@@ -189,8 +189,6 @@ abstract class EndpointRelatedTestBase extends DatabaseUsingTestNotTransactionSa
       conns.foreach(c => mockMeas.onMeasProcAssign(Event(Envelope.SubscriptionEventType.ADDED, c)))
 
       measProcMap += (name -> mockMeas)
-
-      meas
     }
 
     def addDevice(name: String, pname: String = "test_point", autoAssigned: Boolean = true): Endpoint = {
diff --git a/simulator/default-simulator/src/main/scala/org/totalgrid/reef/simulator/random/RandomValues.scala b/simulator/default-simulator/src/main/scala/org/totalgrid/reef/simulator/random/RandomValues.scala
@@ -35,6 +35,8 @@ object RandomValues {
       case Type.BOOL => BooleanValue(config.getInitial.toInt == 0, config.getChangeChance)
       case Type.DOUBLE => DoubleValue(config.getInitial, config.getMin, config.getMax, config.getMaxDelta, config.getChangeChance)
       case Type.INT => IntValue(config.getInitial.toInt, config.getMin.toInt, config.getMax.toInt, config.getMaxDelta.toInt, config.getChangeChance)
+      case Type.STRING => throw new Exception("Can't generate random value for type string")
+      case Type.NONE => throw new Exception("Can't generate random value for type none")
     }
   }
 
diff --git a/simulator/protocol-simulator/src/test/scala/org/totalgrid/reef/protocol/simulator/SimulatedProtocolTest.scala b/simulator/protocol-simulator/src/test/scala/org/totalgrid/reef/protocol/simulator/SimulatedProtocolTest.scala
@@ -103,7 +103,7 @@ class SimulatedProtocolTest extends FunSuite with ShouldMatchers {
 
       def name = "mock"
       def factory: SimulatorPluginFactory = parent
-      def simLevel: Int = simLevel
+      def simLevel: Int = 0
       def issue(cr: Commands.CommandRequest): Commands.CommandStatus = response
       def shutdown() = map.find(x => x._2.equals(this)) match {
         case Some((name, plugin)) =>
diff --git a/util/src/main/scala/org/totalgrid/reef/util/Conversion.scala b/util/src/main/scala/org/totalgrid/reef/util/Conversion.scala
@@ -50,7 +50,7 @@ object Unappliers {
     def unapply(s: String): Option[Boolean] = try {
       Some(s.toBoolean)
     } catch {
-      case _: java.lang.NumberFormatException => None
+      case _: java.lang.IllegalArgumentException => None
     }
   }
   object Double {

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ class ResetDatabaseCommand extends ReefCommandSupport {`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`	`} catch {`
`103`		`- case ex => println("Reset failed: " + ex.toString)`
	`103`	`+ case ex: Throwable => println("Reset failed: " + ex.toString)`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`mstore.disconnect()`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ object AllBenchmarksEntryPoint {`
`87`	`87`	`args = args drop 1`
`88`	`88`	`}`
`89`	`89`	`} catch {`
`90`		`- case ex =>`
	`90`	`+ case ex: Throwable =>`
`91`	`91`	`printf("Exception: " + ex.toString)`
`92`	`92`	`usage`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ object ModelCreationUtilities {`
`88`	`88`	`else startNext()`
`89`	`89`	`} catch {`
`90`	`90`	`case rse: ReefServiceException => prom.setFailure(rse)`
`91`		`- case ex => prom.setFailure(new UnknownServiceException(ex.toString))`
	`91`	`+ case ex: Throwable => prom.setFailure(new UnknownServiceException(ex.toString))`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class MeasInputManagerTest extends FunSuite with ShouldMatchers {`
`38`	`38`
`39`	`39`	`class MockInputBucket(val variable: String, val getSnapshot: Option[List[Measurement]]) extends InputBucket {`
`40`	`40`
`41`		`- def onReceived(m: Measurement) = null`
	`41`	`+ def onReceived(m: Measurement) {}`
`42`	`42`
`43`	`43`	`def getMeasRequest = null`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ class FrontEndConnections(protocolManagers: Map[String, ProtocolManager], newCli`
`104`	`104`	`val result = services.alterEndpointConnectionState(c.getId, EndpointConnection.State.ERROR).await()`
`105`	`105`	`logger.info("Updated endpoint state: " + endpointName + " state: " + result.getState)`
`106`	`106`	`} catch {`
`107`		`- case ex => logger.error("Couldn't update endpointState: " + ex.getMessage)`
	`107`	`+ case ex: Throwable => logger.error("Couldn't update endpointState: " + ex.getMessage)`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ class ProtocolTraitToManagerShim(protocol: Protocol) extends ProtocolManager wit`
`72`	`72`	`services.publishMeasurements(value, new AddressableDestination(routingKey)).await()`
`73`	`73`	`logger.info("Published a measurement batch of size: " + value.getMeasCount + " to " + routingKey + " " + " in " + (System.currentTimeMillis() - startTime) + " ms")`
`74`	`74`	`} catch {`
`75`		`- case ex => logger.error("Couldn't publish measurements: " + ex.getMessage)`
	`75`	`+ case ex: Throwable => logger.error("Couldn't publish measurements: " + ex.getMessage)`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`}`
`@@ -83,7 +83,7 @@ class ProtocolTraitToManagerShim(protocol: Protocol) extends ProtocolManager wit`
`83`	`83`	`val result = services.alterEndpointConnectionState(connectionId, state).await()`
`84`	`84`	`logger.info("Updated endpoint state: " + endpointName + " state: " + result.getState)`
`85`	`85`	`} catch {`
`86`		`- case ex => logger.error("Couldn't update endpointState: " + ex.getMessage)`
	`86`	`+ case ex: Throwable => logger.error("Couldn't update endpointState: " + ex.getMessage)`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`	`}`
`@@ -94,7 +94,7 @@ class ProtocolTraitToManagerShim(protocol: Protocol) extends ProtocolManager wit`
`94`	`94`	`val result = services.alterCommunicationChannelState(channelUuid, state).await()`
`95`	`95`	`logger.info("Updated channel state: " + result.getName + " state: " + result.getState)`
`96`	`96`	`} catch {`
`97`		`- case ex => logger.error("Couldn't update channelState: " + ex.getMessage)`
	`97`	`+ case ex: Throwable => logger.error("Couldn't update channelState: " + ex.getMessage)`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class LoadingExceptionCollector extends ExceptionCollector with Logging {`
`61`	`61`	`val nameString = try {`
`62`	`62`	`name`
`63`	`63`	`} catch {`
`64`		`- case _ => "<unknown>"`
	`64`	`+ case _: Throwable => "<unknown>"`
`65`	`65`	`}`
`66`	`66`	`logger.info("exception encountered during loading: " + nameString + ": " + ex.getMessage)`
`67`	`67`	`// logger.debug("DEBUG: exception encountered during loading: " + nameString + ": " + ex.getMessage + ": ", ex)`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ object LoadManager extends Logging {`
`68`	`68`
`69`	`69`	`(loader, valid)`
`70`	`70`	`} catch {`
`71`		`- case ex =>`
	`71`	`+ case ex: Throwable =>`
`72`	`72`	`println("Error loading configuration file '" + filename + "' " + ex.getMessage)`
`73`	`73`	`throw ex`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ object StandaloneLoader {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`} catch {`
`93`		`- case ex =>`
	`93`	`+ case ex: Throwable =>`
`94`	`94`	`printf("Exception: " + ex.toString)`
`95`	`95`	`usage`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,6 @@ class ModelContainer extends Logging {`
`88`	`88`
`89`	`89`	`def add(eventConfig: EventConfig) {`
`90`	`90`	`addModel(eventConfig)`
`91`		`- eventConfig`
`92`	`91`	`}`
`93`	`92`
`94`	`93`	`def add(endpointConfig: Endpoint): Endpoint =`