#752: Fixed compiler warnings in maven (#775)

* #752: Fixed compiler warnings in maven

Author: jozefbakus

pom.xml

@@ -18,7 +18,6 @@
 
     <modelVersion>4.0.0</modelVersion>
     <version>0.5.15-SNAPSHOT</version>
-    <groupId>za.co.absa</groupId>
 
     <parent>
         <groupId>za.co.absa</groupId>
@@ -439,6 +438,7 @@
             <plugin>
                 <groupId>net.alchim31.maven</groupId>
                 <artifactId>scala-maven-plugin</artifactId>
+                <version>${scala-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>scala-compile</id>

src/main/scala/za/co/absa/hyperdrive/trigger/api/rest/WebMvcConfig.scala

@@ -21,7 +21,7 @@ import org.springframework.web.servlet.config.annotation.{ViewControllerRegistry
 
 @Configuration
 class WebMvcConfig extends WebMvcConfigurer {
-  override def addViewControllers(registry: ViewControllerRegistry) {
-    registry.addViewController("/").setViewName("forward:/index.html");
+  override def addViewControllers(registry: ViewControllerRegistry): Unit = {
+    registry.addViewController("/").setViewName("forward:/index.html")
   }
 }

src/main/scala/za/co/absa/hyperdrive/trigger/api/rest/WebSecurityConfig.scala

@@ -76,7 +76,7 @@ class WebSecurityConfig @Inject() (val beanFactory: BeanFactory, authConfig: Aut
       // Disable security for isManager endpoint
       web.ignoring.antMatchers("/admin/isManager")
 
-    override def configure(http: HttpSecurity) {
+    override def configure(http: HttpSecurity): Unit = {
       http
         .csrf()
         .ignoringAntMatchers("/login")
@@ -117,18 +117,16 @@ class WebSecurityConfig @Inject() (val beanFactory: BeanFactory, authConfig: Aut
     }
 
     override def configure(auth: AuthenticationManagerBuilder): Unit =
-      this.getAuthentication().configure(auth)
+      this.getAuthentication.configure(auth)
 
-    private def getAuthentication(): HyperdriverAuthentication =
+    private def getAuthentication: HyperdriverAuthentication =
       authMechanism.toLowerCase match {
-        case "inmemory" => {
+        case "inmemory" =>
           logger.info(s"Using $authMechanism authentication")
           beanFactory.getBean(classOf[InMemoryAuthentication])
-        }
-        case "ldap" => {
+        case "ldap" =>
           logger.info(s"Using $authMechanism authentication")
           beanFactory.getBean(classOf[LdapAuthentication])
-        }
         case _ => throw new IllegalArgumentException("Invalid authentication mechanism - use one of: inmemory, ldap")
       }
 

src/main/scala/za/co/absa/hyperdrive/trigger/api/rest/auth/HyperdriverAuthentication.scala

@@ -18,5 +18,5 @@ package za.co.absa.hyperdrive.trigger.api.rest.auth
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder
 
 trait HyperdriverAuthentication {
-  def configure(auth: AuthenticationManagerBuilder)
+  def configure(auth: AuthenticationManagerBuilder): Unit
 }

src/main/scala/za/co/absa/hyperdrive/trigger/api/rest/auth/InMemoryAuthentication.scala

@@ -16,7 +16,8 @@
 package za.co.absa.hyperdrive.trigger.api.rest.auth
 
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder
-import org.springframework.security.crypto.password.NoOpPasswordEncoder
+import org.springframework.security.crypto.factory.PasswordEncoderFactories
+import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.stereotype.Component
 import za.co.absa.hyperdrive.trigger.configuration.application.AuthConfig
 
@@ -31,24 +32,24 @@ class InMemoryAuthentication @Inject() (authConfig: AuthConfig) extends Hyperdri
   val adminPassword: String = authConfig.inMemoryAdminPassword
   val adminRole: Option[String] = authConfig.adminRole
 
-  def validateParams() {
+  def validateParams(): Unit = {
     if (username.isEmpty || password.isEmpty) {
       throw new IllegalArgumentException("Both username and password have to configured for inmemory authentication.")
     }
   }
 
-  override def configure(auth: AuthenticationManagerBuilder) {
+  override def configure(auth: AuthenticationManagerBuilder): Unit = {
+    val encoder: PasswordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder()
+
     this.validateParams()
     auth
       .inMemoryAuthentication()
-      .passwordEncoder(NoOpPasswordEncoder.getInstance())
       .withUser(username)
-      .password(password)
+      .password(encoder.encode(password))
       .authorities(ROLE_USER)
       .and()
-      .passwordEncoder(NoOpPasswordEncoder.getInstance())
       .withUser(adminUsername)
-      .password(adminPassword)
+      .password(encoder.encode(adminPassword))
       .authorities(adminRole.getOrElse(ROLE_USER))
   }
 }

src/main/scala/za/co/absa/hyperdrive/trigger/api/rest/auth/LdapAuthentication.scala

@@ -37,7 +37,7 @@ class LdapAuthentication @Inject() (authConfig: AuthConfig) extends HyperdriverA
     (ldapSearchFilter, "auth.ldap.search.filter")
   )
 
-  private def validateParams() {
+  private def validateParams(): Unit = {
     requiredParameters.foreach {
       case param if param._1.isEmpty =>
         throw new IllegalArgumentException(s"${param._2} has to be configured in order to use ldap authentication")

src/main/scala/za/co/absa/hyperdrive/trigger/api/rest/auth/LdapGrantedAuthoritiesMapper.scala

@@ -22,14 +22,17 @@ import org.springframework.security.core.authority.{AuthorityUtils, SimpleGrante
 import java.util
 
 class LdapGrantedAuthoritiesMapper extends GrantedAuthoritiesMapper {
-  import scala.collection.JavaConversions._
+  import scala.collection.JavaConverters._
 
   override def mapAuthorities(
     grantedAuthorities: util.Collection[_ <: GrantedAuthority]
   ): util.Collection[_ <: GrantedAuthority] =
     if (grantedAuthorities == null) {
       AuthorityUtils.NO_AUTHORITIES
     } else {
-      grantedAuthorities.map(grantedAuthority => new SimpleGrantedAuthority(grantedAuthority.getAuthority)).toList
+      grantedAuthorities.asScala
+        .map(grantedAuthority => new SimpleGrantedAuthority(grantedAuthority.getAuthority))
+        .toList
+        .asJava
     }
 }

src/main/scala/za/co/absa/hyperdrive/trigger/api/rest/controllers/NotificationRuleController.scala

@@ -37,7 +37,7 @@ class NotificationRuleController @Inject() (notificationRuleService: Notificatio
     notificationRuleService.getNotificationRule(id).toJava.toCompletableFuture
 
   @GetMapping(path = Array("/notificationRules"))
-  def getNotificationRules(): CompletableFuture[Seq[NotificationRule]] =
+  def getNotificationRules: CompletableFuture[Seq[NotificationRule]] =
     notificationRuleService.getNotificationRules().toJava.toCompletableFuture
 
   @PostMapping(path = Array("/notificationRule"))

src/main/scala/za/co/absa/hyperdrive/trigger/api/rest/controllers/UtilController.scala

@@ -40,7 +40,7 @@ class UtilController {
       )
       QuartzExpressionDetail(expression = expression, isValid = true, explained = description)
     } catch {
-      case e: CronExpressionParseException if CronExpression.isValidExpression(expression) =>
+      case _: CronExpressionParseException if CronExpression.isValidExpression(expression) =>
         QuartzExpressionDetail(
           expression = expression,
           isValid = true,

src/main/scala/za/co/absa/hyperdrive/trigger/api/rest/controllers/WorkflowController.scala

@@ -52,7 +52,7 @@ class WorkflowController @Inject() (workflowService: WorkflowService, generalCon
     workflowService.getWorkflow(id).toJava.toCompletableFuture
 
   @GetMapping(path = Array("/workflows"))
-  def getWorkflows(): CompletableFuture[Seq[Workflow]] =
+  def getWorkflows: CompletableFuture[Seq[Workflow]] =
     workflowService.getWorkflows.toJava.toCompletableFuture
 
   @PostMapping(path = Array("/workflows/search"))
@@ -85,15 +85,15 @@ class WorkflowController @Inject() (workflowService: WorkflowService, generalCon
     workflowService.updateWorkflowsIsActive(jobIdsWrapper.jobIds, isActiveNewValue).toJava.toCompletableFuture
 
   @GetMapping(path = Array("/workflows/projectNames"))
-  def getProjectNames(): CompletableFuture[Set[String]] =
+  def getProjectNames: CompletableFuture[Set[String]] =
     workflowService.getProjectNames.toJava.toCompletableFuture
 
   @GetMapping(path = Array("/workflows/projects"))
-  def getProjects(): CompletableFuture[Seq[Project]] =
+  def getProjects: CompletableFuture[Seq[Project]] =
     workflowService.getProjects.toJava.toCompletableFuture
 
   @GetMapping(path = Array("/workflows/projectsInfo"))
-  def getProjectsInfo(): CompletableFuture[Seq[ProjectInfo]] =
+  def getProjectsInfo: CompletableFuture[Seq[ProjectInfo]] =
     workflowService.getProjectsInfo().toJava.toCompletableFuture
 
   @PutMapping(path = Array("/workflows/run"))
@@ -144,7 +144,7 @@ class WorkflowController @Inject() (workflowService: WorkflowService, generalCon
     ResponseEntity
       .ok()
       .contentType(MediaType.parseMediaType("application/zip"))
-      .header(HttpHeaders.CONTENT_DISPOSITION, s"attachment; filename=workflows-${environment}.zip")
+      .header(HttpHeaders.CONTENT_DISPOSITION, s"attachment; filename=workflows-$environment.zip")
       .body(new ByteArrayResource(baos.toByteArray))
   }