[SPARK-1406] Adjusted imported order according to the guidelines

markhamstra · Nov 29, 2014 · 3ae8ae5 · 3ae8ae5
1 parent c67ce81
commit 3ae8ae5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 28 deletions.
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/export/ModelExportFactory.scala b/mllib/src/main/scala/org/apache/spark/mllib/export/ModelExportFactory.scala
@@ -18,12 +18,13 @@
 package org.apache.spark.mllib.export
 
 import org.apache.spark.mllib.clustering.KMeansModel
+import org.apache.spark.mllib.export.ModelExportType.ModelExportType
+import org.apache.spark.mllib.export.ModelExportType.PMML
+import org.apache.spark.mllib.export.pmml.GeneralizedLinearPMMLModelExport
 import org.apache.spark.mllib.export.pmml.KMeansPMMLModelExport
-import org.apache.spark.mllib.export.ModelExportType._
+import org.apache.spark.mllib.regression.LassoModel
 import org.apache.spark.mllib.regression.LinearRegressionModel
-import org.apache.spark.mllib.export.pmml.GeneralizedLinearPMMLModelExport
 import org.apache.spark.mllib.regression.RidgeRegressionModel
-import org.apache.spark.mllib.regression.LassoModel
 
 private[mllib] object ModelExportFactory {
 

diff --git a/.../src/main/scala/org/apache/spark/mllib/export/pmml/GeneralizedLinearPMMLModelExport.scala b/.../src/main/scala/org/apache/spark/mllib/export/pmml/GeneralizedLinearPMMLModelExport.scala
@@ -17,14 +17,6 @@
 
 package org.apache.spark.mllib.export.pmml
 
-import org.dmg.pmml.Array.Type
-import org.dmg.pmml.Cluster
-import org.dmg.pmml.ClusteringField
-import org.dmg.pmml.ClusteringModel
-import org.dmg.pmml.ClusteringModel.ModelClass
-import org.dmg.pmml.CompareFunctionType
-import org.dmg.pmml.ComparisonMeasure
-import org.dmg.pmml.ComparisonMeasure.Kind
 import org.dmg.pmml.DataDictionary
 import org.dmg.pmml.DataField
 import org.dmg.pmml.DataType
@@ -33,14 +25,12 @@ import org.dmg.pmml.FieldUsageType
 import org.dmg.pmml.MiningField
 import org.dmg.pmml.MiningFunctionType
 import org.dmg.pmml.MiningSchema
+import org.dmg.pmml.NumericPredictor
 import org.dmg.pmml.OpType
-import org.dmg.pmml.SquaredEuclidean
-import org.apache.spark.mllib.clustering.KMeansModel
-import org.apache.spark.mllib.regression.LinearRegressionModel
-import org.apache.spark.mllib.regression.GeneralizedLinearModel
 import org.dmg.pmml.RegressionModel
 import org.dmg.pmml.RegressionTable
-import org.dmg.pmml.NumericPredictor
+
+import org.apache.spark.mllib.regression.GeneralizedLinearModel
 
 /**
  * PMML Model Export for GeneralizedLinear abstract class

diff --git a/mllib/src/test/scala/org/apache/spark/mllib/export/ModelExportFactorySuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/export/ModelExportFactorySuite.scala
@@ -17,16 +17,16 @@
 
 package org.apache.spark.mllib.export
 
-import scala.annotation.varargs
+import org.scalatest.FunSuite
+
 import org.apache.spark.mllib.clustering.KMeansModel
 import org.apache.spark.mllib.linalg.Vectors
-import org.scalatest.FunSuite
-import org.apache.spark.mllib.export.pmml.KMeansPMMLModelExport
-import org.apache.spark.mllib.util.LinearDataGenerator
-import org.apache.spark.mllib.regression.LinearRegressionModel
-import org.apache.spark.mllib.export.pmml.GeneralizedLinearPMMLModelExport
 import org.apache.spark.mllib.regression.LassoModel
+import org.apache.spark.mllib.regression.LinearRegressionModel
 import org.apache.spark.mllib.regression.RidgeRegressionModel
+import org.apache.spark.mllib.util.LinearDataGenerator
+import org.apache.spark.mllib.export.pmml.GeneralizedLinearPMMLModelExport
+import org.apache.spark.mllib.export.pmml.KMeansPMMLModelExport
 
 class ModelExportFactorySuite extends FunSuite{
 

diff --git a/...test/scala/org/apache/spark/mllib/export/pmml/GeneralizedLinearPMMLModelExportSuite.scala b/...test/scala/org/apache/spark/mllib/export/pmml/GeneralizedLinearPMMLModelExportSuite.scala
@@ -17,15 +17,15 @@
 
 package org.apache.spark.mllib.export.pmml
 
-import org.apache.spark.annotation.DeveloperApi
+import org.dmg.pmml.RegressionModel
+import org.scalatest.FunSuite
+
 import org.apache.spark.mllib.export.ModelExportFactory
 import org.apache.spark.mllib.export.ModelExportType
 import org.apache.spark.mllib.regression.LassoModel
 import org.apache.spark.mllib.regression.LinearRegressionModel
 import org.apache.spark.mllib.regression.RidgeRegressionModel
 import org.apache.spark.mllib.util.LinearDataGenerator
-import org.scalatest.FunSuite
-import org.dmg.pmml.RegressionModel
 
 class GeneralizedLinearPMMLModelExportSuite extends FunSuite{
 

diff --git a/mllib/src/test/scala/org/apache/spark/mllib/export/pmml/KMeansPMMLModelExportSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/export/pmml/KMeansPMMLModelExportSuite.scala
@@ -17,13 +17,13 @@
 
 package org.apache.spark.mllib.export.pmml
 
-import scala.annotation.varargs
+import org.dmg.pmml.ClusteringModel
+import org.scalatest.FunSuite
+
 import org.apache.spark.mllib.clustering.KMeansModel
 import org.apache.spark.mllib.export.ModelExportFactory
 import org.apache.spark.mllib.export.ModelExportType
 import org.apache.spark.mllib.linalg.Vectors
-import org.scalatest.FunSuite
-import org.dmg.pmml.ClusteringModel
 
 class KMeansPMMLModelExportSuite extends FunSuite{