style

core/src/main/scala/com/salesforce/op/stages/impl/selector/SelectedCombiner.scala

@@ -81,7 +81,7 @@ class SelectedCombiner
  private def getSummary(feature: TransientFeature) =
  ModelSelectorSummary.fromMetadata(getInputSchema()(feature.name).metadata.getSummaryMetadata())
 
- override def onSetInput() = {
+ override def onSetInput(): Unit = {
  super.onSetInput()
 
  require(
@@ -136,11 +136,11 @@ class SelectedCombiner
  def makeMeta(model: SelectedCombinerModel): Unit = {
  def updateKeys(map: Map[String, Any], string: String) = map.map{ case (k, v) => k + string -> v }
 
- if (model.strategy == CombinationStrategy.Best && model.weight1 > 0.5)
+ if (model.strategy == CombinationStrategy.Best && model.weight1 > 0.5) {
  setMetadata(summary1.toMetadata().toSummaryMetadata())
- else if (model.strategy == CombinationStrategy.Best)
+ } else if (model.strategy == CombinationStrategy.Best) {
  setMetadata(summary2.toMetadata().toSummaryMetadata())
- else {
+ } else {
  val summary = new ModelSelectorSummary(
  validationType = summary1.validationType,
  validationParameters = updateKeys(summary1.validationParameters, "_1") ++

core/src/test/scala/com/salesforce/op/stages/impl/selector/SelectedCombinerTest.scala

@@ -1,3 +1,32 @@
+/*
+ * Copyright (c) 2017, Salesforce.com, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.salesforce.op.stages.impl.selector
 
 import com.salesforce.op.OpWorkflow