to fix incompatibilities with scala v2.12

Author: fupelaqu

core/src/main/scala/app/softnetwork/elastic/client/MappingComparator.scala

@@ -3,7 +3,8 @@ package app.softnetwork.elastic.client
 import com.google.gson._
 import com.typesafe.scalalogging.StrictLogging
 
-import scala.jdk.CollectionConverters._
+//import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.util.{Failure, Success, Try}
 
 object MappingComparator extends StrictLogging {

core/src/main/scala/app/softnetwork/elastic/client/package.scala

@@ -13,7 +13,8 @@ import scala.collection.mutable
 import scala.language.reflectiveCalls
 import scala.util.{Failure, Success, Try}
 
-import scala.jdk.CollectionConverters._
+//import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 
 /** Created by smanciot on 30/06/2018.
   */

es6/jest/src/main/scala/app/softnetwork/elastic/client/jest/JestClientApi.scala

@@ -21,7 +21,8 @@ import io.searchbox.indices.settings.{GetSettings, UpdateSettings}
 import io.searchbox.params.Parameters
 import org.json4s.Formats
 
-import scala.jdk.CollectionConverters._
+//import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.concurrent.{ExecutionContext, Future, Promise}
 import scala.language.implicitConversions
 import scala.util.{Failure, Success, Try}

es6/jest/src/main/scala/app/softnetwork/elastic/client/jest/JestClientCompanion.scala

@@ -10,7 +10,8 @@ import org.apache.http.HttpHost
 import java.io.IOException
 import java.util
 import java.util.concurrent.TimeUnit
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
+//import scala.jdk.CollectionConverters._
 import scala.language.reflectiveCalls
 import scala.util.{Failure, Success, Try}
 

es6/jest/src/main/scala/app/softnetwork/elastic/persistence/query/JestProvider.scala

@@ -1,7 +1,6 @@
 package app.softnetwork.elastic.persistence.query
 
 import app.softnetwork.elastic.client.jest.JestClientApi
-import app.softnetwork.elastic.persistence.query.ElasticProvider
 import app.softnetwork.persistence.ManifestWrapper
 import app.softnetwork.persistence.model.Timestamped
 

es6/rest/src/main/scala/app/softnetwork/elastic/client/rest/RestHighLevelClientApi.scala

@@ -49,7 +49,8 @@ import org.elasticsearch.search.builder.SearchSourceBuilder
 import org.json4s.Formats
 
 import java.io.ByteArrayInputStream
-import scala.jdk.CollectionConverters._
+//import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 import scala.concurrent.{ExecutionContext, Future, Promise}
 import scala.language.implicitConversions
 import scala.util.{Failure, Success, Try}

es6/rest/src/main/scala/app/softnetwork/elastic/client/rest/RestHighLevelClientCompanion.scala

@@ -12,14 +12,16 @@ import org.elasticsearch.common.xcontent.NamedXContentRegistry
 import org.elasticsearch.plugins.SearchPlugin
 import org.elasticsearch.search.SearchModule
 
+import scala.collection.JavaConverters._
+
 trait RestHighLevelClientCompanion extends Logging {
 
   def elasticConfig: ElasticConfig
 
   private var client: Option[RestHighLevelClient] = None
 
   lazy val namedXContentRegistry: NamedXContentRegistry = {
-    import scala.jdk.CollectionConverters._
+    // import scala.jdk.CollectionConverters._
     val searchModule = new SearchModule(Settings.EMPTY, false, List.empty[SearchPlugin].asJava)
     new NamedXContentRegistry(searchModule.getNamedXContents)
   }

es6/rest/src/main/scala/app/softnetwork/elastic/persistence/query/RestHighLevelClientProvider.scala

@@ -1,7 +1,6 @@
 package app.softnetwork.elastic.persistence.query
 
 import app.softnetwork.elastic.client.rest.RestHighLevelClientApi
-import app.softnetwork.elastic.persistence.query.ElasticProvider
 import app.softnetwork.persistence.ManifestWrapper
 import app.softnetwork.persistence.model.Timestamped
 

es6/sql-bridge/src/test/scala/app/softnetwork/elastic/sql/SQLQuerySpec.scala

@@ -7,7 +7,8 @@ import com.google.gson.{JsonArray, JsonObject, JsonParser, JsonPrimitive}
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 
-import scala.jdk.CollectionConverters._
+//import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 
 /** Created by smanciot on 13/04/17.
   */

es7/rest/src/main/scala/app/softnetwork/elastic/client/rest/RestHighLevelClientCompanion.scala

@@ -12,6 +12,8 @@ import org.elasticsearch.plugins.SearchPlugin
 import org.elasticsearch.search.SearchModule
 import org.slf4j.{Logger, LoggerFactory}
 
+import scala.collection.JavaConverters._
+
 trait RestHighLevelClientCompanion {
 
   val logger: Logger = LoggerFactory getLogger getClass.getName
@@ -21,7 +23,7 @@ trait RestHighLevelClientCompanion {
   private var client: Option[RestHighLevelClient] = None
 
   lazy val namedXContentRegistry: NamedXContentRegistry = {
-    import scala.jdk.CollectionConverters._
+//    import scala.jdk.CollectionConverters._
     val searchModule = new SearchModule(Settings.EMPTY, false, List.empty[SearchPlugin].asJava)
     new NamedXContentRegistry(searchModule.getNamedXContents)
   }