[SPARK-22830] Requested changes are being addressed

examples/src/main/scala/org/apache/spark/examples/DFSReadWriteTest.scala

@@ -49,10 +49,10 @@ object DFSReadWriteTest {
   }
 
   private def printUsage(): Unit = {
-    val usage = s"""DFS Read-Write Test 
-    Usage: localFile dfsDir
-    localFile - (string) local file to use in test
-    dfsDir - (string) DFS directory for read/write tests"""
+    val usage = """DFS Read-Write Test
+    |Usage: localFile dfsDir
+    |localFile - (string) local file to use in test
+    |dfsDir - (string) DFS directory for read/write tests""".stripMargin
 
     println(usage)
   }

examples/src/main/scala/org/apache/spark/examples/LocalALS.scala

@@ -95,7 +95,7 @@ object LocalALS {
 
   def showWarning() {
     System.err.println(
-      s"""WARN: This is a naive implementation of ALS and is given as an example!
+      """WARN: This is a naive implementation of ALS and is given as an example!
         |Please use org.apache.spark.ml.recommendation.ALS
         |for more conventional use.
       """.stripMargin)

examples/src/main/scala/org/apache/spark/examples/LocalFileLR.scala

@@ -41,7 +41,7 @@ object LocalFileLR {
 
   def showWarning() {
     System.err.println(
-      s"""WARN: This is a naive implementation of Logistic Regression and is given as an example!
+      """WARN: This is a naive implementation of Logistic Regression and is given as an example!
         |Please use org.apache.spark.ml.classification.LogisticRegression
         |for more conventional use.
       """.stripMargin)

examples/src/main/scala/org/apache/spark/examples/LocalKMeans.scala

@@ -64,7 +64,7 @@ object LocalKMeans {
 
   def showWarning() {
     System.err.println(
-      s"""WARN: This is a naive implementation of KMeans Clustering and is given as an example!
+      """WARN: This is a naive implementation of KMeans Clustering and is given as an example!
         |Please use org.apache.spark.ml.clustering.KMeans
         |for more conventional use.
       """.stripMargin)

examples/src/main/scala/org/apache/spark/examples/LocalLR.scala

@@ -48,7 +48,7 @@ object LocalLR {
 
   def showWarning() {
     System.err.println(
-      s"""WARN: This is a naive implementation of Logistic Regression and is given as an example!
+      """WARN: This is a naive implementation of Logistic Regression and is given as an example!
         |Please use org.apache.spark.ml.classification.LogisticRegression
         |for more conventional use.
       """.stripMargin)

examples/src/main/scala/org/apache/spark/examples/LogQuery.scala

@@ -27,7 +27,7 @@ import org.apache.spark.{SparkConf, SparkContext}
  */
 object LogQuery {
   val exampleApacheLogs = List(
-    s"""10.10.10.10 - "FRED" [18/Jan/2013:17:56:07 +1100] "GET http://images.com/2013/Generic.jpg
+    """10.10.10.10 - "FRED" [18/Jan/2013:17:56:07 +1100] "GET http://images.com/2013/Generic.jpg
       | HTTP/1.1" 304 315 "http://referall.com/" "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1;
       | GTB7.4; .NET CLR 2.0.50727; .NET CLR 3.0.04506.30; .NET CLR 3.0.04506.648; .NET CLR
       | 3.5.21022; .NET CLR 3.0.4506.2152; .NET CLR 1.0.3705; .NET CLR 1.1.4322; .NET CLR

examples/src/main/scala/org/apache/spark/examples/SparkHdfsLR.scala

@@ -51,7 +51,7 @@ object SparkHdfsLR {
 
   def showWarning() {
     System.err.println(
-      s"""WARN: This is a naive implementation of Logistic Regression and is given as an example!
+      """WARN: This is a naive implementation of Logistic Regression and is given as an example!
         |Please use org.apache.spark.ml.classification.LogisticRegression
         |for more conventional use.
       """.stripMargin)

examples/src/main/scala/org/apache/spark/examples/SparkKMeans.scala

@@ -51,7 +51,7 @@ object SparkKMeans {
 
   def showWarning() {
     System.err.println(
-      s"""WARN: This is a naive implementation of KMeans Clustering and is given as an example!
+      """WARN: This is a naive implementation of KMeans Clustering and is given as an example!
         |Please use org.apache.spark.ml.clustering.KMeans
         |for more conventional use.
       """.stripMargin)

examples/src/main/scala/org/apache/spark/examples/SparkLR.scala

@@ -53,7 +53,7 @@ object SparkLR {
 
   def showWarning() {
     System.err.println(
-      s"""WARN: This is a naive implementation of Logistic Regression and is given as an example!
+      """WARN: This is a naive implementation of Logistic Regression and is given as an example!
         |Please use org.apache.spark.ml.classification.LogisticRegression
         |for more conventional use.
       """.stripMargin)

examples/src/main/scala/org/apache/spark/examples/SparkPageRank.scala

@@ -41,7 +41,7 @@ object SparkPageRank {
 
   def showWarning() {
     System.err.println(
-      s"""WARN: This is a naive implementation of PageRank and is given as an example!
+      """WARN: This is a naive implementation of PageRank and is given as an example!
         |Please use the PageRank implementation found in org.apache.spark.graphx.lib.PageRank
         |for more conventional use.
       """.stripMargin)

examples/src/main/scala/org/apache/spark/examples/graphx/Analytics.scala

@@ -35,12 +35,12 @@ object Analytics extends Logging {
 
   def main(args: Array[String]): Unit = {
     if (args.length < 2) {
-      val usage = s"""
-      Usage: Analytics <taskType> <file> --numEPart=<num_edge_partitions> [other options]
-      Supported 'taskType' as follows:
-      pagerank    Compute PageRank
-      cc          Compute the connected components of vertices
-      triangles   Count the number of triangles"""
+      val usage = """
+      |Usage: Analytics <taskType> <file> --numEPart=<num_edge_partitions> [other options]
+      |Supported 'taskType' as follows:
+      |pagerank    Compute PageRank
+      |cc          Compute the connected components of vertices
+      |triangles   Count the number of triangles""".stripMargin
 
       System.err.println(usage)
       System.exit(1)