From 1e1f5e4fe08be8bc81d23e1c1d40d0886fef00f4 Mon Sep 17 00:00:00 2001
From: Sandro La Bruzzo <sandro.labruzzo@isti.cnr.it>
Date: Thu, 25 Nov 2021 13:03:17 +0100
Subject: [PATCH] minor fix

---
 dhp-common/pom.xml                            | 37 +++++++++++++++++++
 .../AbstractScalaApplication.scala            | 37 -------------------
 .../application/SparkScalaApplication.scala   | 37 +++++++++++++++++++
 3 files changed, 74 insertions(+), 37 deletions(-)
 delete mode 100644 dhp-common/src/main/java/eu/dnetlib/dhp/application/AbstractScalaApplication.scala

diff --git a/dhp-common/pom.xml b/dhp-common/pom.xml
index 4a13b3459..7b18f0105 100644
--- a/dhp-common/pom.xml
+++ b/dhp-common/pom.xml
@@ -21,6 +21,43 @@
 	</distributionManagement>
 
 	<description>This module contains common utilities meant to be used across the dnet-hadoop submodules</description>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>net.alchim31.maven</groupId>
+				<artifactId>scala-maven-plugin</artifactId>
+				<version>${net.alchim31.maven.version}</version>
+				<executions>
+					<execution>
+						<id>scala-compile-first</id>
+						<phase>initialize</phase>
+						<goals>
+							<goal>add-source</goal>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>scala-test-compile</id>
+						<phase>process-test-resources</phase>
+						<goals>
+							<goal>testCompile</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>scala-doc</id>
+						<phase>process-resources</phase> <!-- or wherever -->
+						<goals>
+							<goal>doc</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<scalaVersion>${scala.version}</scalaVersion>
+				</configuration>
+			</plugin>
+		</plugins>
+
+	</build>
 
 	<dependencies>
 
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/application/AbstractScalaApplication.scala b/dhp-common/src/main/java/eu/dnetlib/dhp/application/AbstractScalaApplication.scala
deleted file mode 100644
index 44dad93eb..000000000
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/application/AbstractScalaApplication.scala
+++ /dev/null
@@ -1,37 +0,0 @@
-package eu.dnetlib.dhp.application
-
-import org.apache.spark.SparkConf
-import org.apache.spark.sql.SparkSession
-import org.slf4j.Logger
-
-abstract class AbstractScalaApplication (val propertyPath:String, val args:Array[String], log:Logger) extends  SparkScalaApplication {
-
-  var parser: ArgumentApplicationParser = null
-
-  var spark:SparkSession = null
-
-
-  def initialize():SparkScalaApplication = {
-    parser = parseArguments(args)
-    spark = createSparkSession()
-    this
-  }
-
-  /**
-   * Utility for creating a spark session starting from parser
-   *
-   * @return a spark Session
-   */
-  private def createSparkSession():SparkSession = {
-    require(parser!= null)
-
-    val conf:SparkConf = new SparkConf()
-    val master = parser.get("master")
-    log.info(s"Creating Spark session: Master: $master")
-    SparkSession.builder().config(conf)
-      .appName(getClass.getSimpleName)
-      .master(master)
-      .getOrCreate()
-  }
-
-}
\ No newline at end of file
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/application/SparkScalaApplication.scala b/dhp-common/src/main/java/eu/dnetlib/dhp/application/SparkScalaApplication.scala
index 247bacac0..6541746b2 100644
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/application/SparkScalaApplication.scala
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/application/SparkScalaApplication.scala
@@ -33,3 +33,40 @@ trait SparkScalaApplication {
    */
   def run(): Unit
 }
+
+
+import org.apache.spark.SparkConf
+import org.apache.spark.sql.SparkSession
+import org.slf4j.Logger
+
+abstract class AbstractScalaApplication (val propertyPath:String, val args:Array[String], log:Logger) extends  SparkScalaApplication {
+
+  var parser: ArgumentApplicationParser = null
+
+  var spark:SparkSession = null
+
+
+  def initialize():SparkScalaApplication = {
+    parser = parseArguments(args)
+    spark = createSparkSession()
+    this
+  }
+
+  /**
+   * Utility for creating a spark session starting from parser
+   *
+   * @return a spark Session
+   */
+  private def createSparkSession():SparkSession = {
+    require(parser!= null)
+
+    val conf:SparkConf = new SparkConf()
+    val master = parser.get("master")
+    log.info(s"Creating Spark session: Master: $master")
+    SparkSession.builder().config(conf)
+      .appName(getClass.getSimpleName)
+      .master(master)
+      .getOrCreate()
+  }
+
+}
\ No newline at end of file