update default configuration for kubernetes-api + update time tools

Author: fupelaqu

build.sbt

@@ -30,7 +30,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "generic-persistence-api"
 
-ThisBuild / version := "0.2.6.1"
+ThisBuild / version := "0.2.6.2"
 
 ThisBuild / scalaVersion := "2.12.11"
 

common/src/main/scala/app/softnetwork/time/package.scala

@@ -1,49 +1,58 @@
 package app.softnetwork
 
 import java.time.temporal.ChronoField
-import java.time.{Instant, LocalDate, LocalDateTime, ZoneOffset, ZonedDateTime}
+import java.time.{Instant, LocalDate, LocalDateTime, ZoneId, ZonedDateTime}
 import java.util.Date
 import scala.language.implicitConversions
 
 /** Created by smanciot on 10/05/2021.
   */
 package object time {
 
-  def now(): ZonedDateTime = ZonedDateTime.now()
+  implicit def zoneId: ZoneId = ZoneId.systemDefault()
 
-  implicit class DateExtensions(date: Date) {
-    lazy val zdt: ZonedDateTime = ZonedDateTime.ofInstant(date.toInstant, ZoneOffset.UTC)
-    lazy val toLocalDateTime: LocalDateTime = zdt.toLocalDateTime
-    lazy val toLocalDate: LocalDate = zdt.toLocalDate
-    lazy val toEpochSecond: Long = zdt.toEpochSecond
+  implicit def epochSecondToInstant(epochSecond: Long): Instant = {
+    Instant.ofEpochSecond(epochSecond)
+  }
+
+  implicit def instantToDate(instant: Instant): Date = {
+    Date.from(instant)
   }
 
   implicit def epochSecondToDate(epochSecond: Long): Date = {
-    Date.from(Instant.ofEpochSecond(epochSecond).atZone(ZoneOffset.UTC).toInstant)
+    Date.from(epochSecond)
   }
 
-  implicit def epochSecondToLocalDate(epochSecond: Long): LocalDate = {
-    Instant.ofEpochSecond(epochSecond).atZone(ZoneOffset.UTC).toLocalDate
+  implicit def localDateToDate(ld: LocalDate): Date = {
+    Date.from(ld.atStartOfDay(zoneId).toInstant)
+  }
+
+  implicit def localDateTimeToDate(ldt: LocalDateTime): Date = {
+    Date.from(ldt.atZone(zoneId).toInstant)
+  }
+
+  implicit def zonedDateTimeToDate(zdt: ZonedDateTime): Date = {
+    Date.from(zdt.toInstant)
   }
 
-  implicit def toLocalDate(d: Date): LocalDate = {
-    d.toLocalDate
+  implicit def epochSecondToLocalDate(epochSecond: Long): LocalDate = {
+    Instant.ofEpochSecond(epochSecond).atZone(zoneId).toLocalDate
   }
 
-  implicit class LocalDateExtensions(ld: LocalDate) {
-    lazy val toDate: Date = Date.from(ld.atStartOfDay(ZoneOffset.UTC).toInstant)
+  implicit def dateToEpochSecond(d: Date): Long = {
+    d.toInstant.getEpochSecond
   }
 
-  implicit def toDate(ld: LocalDate): Date = {
-    ld.toDate
+  implicit def dateToLocalDate(d: Date): LocalDate = {
+    ZonedDateTime.ofInstant(d.toInstant, zoneId).toLocalDate
   }
 
-  implicit class LocalDateTimeExtensions(ldt: LocalDateTime) {
-    lazy val toDate: Date = Date.from(ldt.atZone(ZoneOffset.UTC).toInstant)
+  implicit def dateToLocalDateTime(d: Date): LocalDateTime = {
+    ZonedDateTime.ofInstant(d.toInstant, zoneId).toLocalDateTime
   }
 
-  implicit def toDate(ldt: LocalDateTime): Date = {
-    ldt.toDate
+  implicit def dateToZonedDateTime(d: Date): ZonedDateTime = {
+    ZonedDateTime.ofInstant(d.toInstant, zoneId)
   }
 
   def weekNumber(ld: LocalDate = LocalDate.now()): Int = {

core/src/main/resources/softnetwork-kubernetes-discovery.conf

@@ -6,6 +6,10 @@ akka {
     shutdown-after-unsuccessful-join-seed-nodes = ${?JOIN_SEED_NODES_TIMEOUT}
   }
 
+  discovery {
+    method = kubernetes-api
+  }
+
   management {
     cluster{
       bootstrap {

core/src/main/resources/softnetwork-persistence.conf

@@ -71,10 +71,19 @@ akka {
   # By default, just bind to loopback and do not allow access from the network
   remote {
     artery {
-      canonical.hostname = "127.0.0.1" # external (logical) hostname
-      canonical.hostname = ${?CLUSTER_IP}
-      canonical.port = 25520 # external (logical) port
-      canonical.port = ${?CLUSTER_PORT}
+      canonical {
+        # Hostname clients should connect to. Can be set to an ip, hostname
+        # or one of the following special values:
+        #   "<getHostAddress>"   InetAddress.getLocalHost.getHostAddress
+        #   "<getHostName>"      InetAddress.getLocalHost.getHostName
+        hostname = "<getHostAddress>" # external (logical) hostname
+        hostname = ${?CLUSTER_IP}
+        # The default remote server port clients should connect to.
+        # Default is 25520, use 0 if you want a random available port
+        # This port needs to be unique for each actor system on the same machine.
+        port = 25520 # external (logical) port
+        port = ${?CLUSTER_PORT}
+      }
     }
   }
 
@@ -173,13 +182,15 @@ akka {
   discovery{
     method = aggregate
     aggregate {
+      # List of service discovery methods to try in order. E.g config then fall back to DNS
+      # ["config", "akka-dns"]
       discovery-methods = ["akka-dns", "config"]
     }
     config.services = {
       local = {
         endpoints = [
           {
-            host = "127.0.0.1"
+            host = "<getHostAddress>"
             host = ${?CLUSTER_MANAGEMENT_HOST}
             port = 8558
             port = ${?CLUSTER_MANAGEMENT_PORT}
@@ -247,7 +258,14 @@ akka {
         required-contact-point-nr = 1
         required-contact-point-nr = ${?REQUIRED_CONTACT_POINT_NR}
         service-name = local
-        service-name = ${?CONTACT_POINT_SERVICE_NAME}
+        service-name = ${?CONTACT_POINT_SERVICE_NAME} #AKKA_CLUSTER_BOOTSTRAP_SERVICE_NAME
+        # Added as suffix to the service-name to build the effective-service name used in the contact-point service lookups
+        # If undefined, nothing will be appended to the service-name.
+        #
+        # Examples, set this to:
+        # "default.svc.cluster.local" or "my-namespace.svc.cluster.local" for kubernetes clusters.
+        service-namespace = "<service-namespace>"
+        service-namespace = ${?CONTACT_POINT_SERVICE_NAMESPACE}
       }
     }
   }

core/src/main/scala/app/softnetwork/persistence/package.scala

@@ -1,12 +1,11 @@
 package app.softnetwork
 
-import java.util.{Calendar, Date, UUID}
-
+import java.util.{Date, UUID}
 import app.softnetwork.build.info.persistence.core.BuildInfo
 import app.softnetwork.security._
-
 import app.softnetwork.persistence.model.Timestamped
 
+import java.time.Instant
 import scala.language.implicitConversions
 
 /** Created by smanciot on 13/04/2020.
@@ -24,7 +23,7 @@ package object persistence {
       case _               => UUID.randomUUID().toString
     }
 
-  def now(): Date = Calendar.getInstance().getTime
+  def now(): Date = Date.from(Instant.now())
 
   def getType[T <: Timestamped](implicit m: Manifest[T]): String = {
     m.runtimeClass.getSimpleName.toLowerCase

project/src/main/scala/app/softnetwork/sbt/build/Versions.scala

@@ -8,9 +8,9 @@ object Versions {
 
   val akkaPersistenceJdbc = "3.5.2"
 
-  val akkaManagement = "1.1.4" // 1.0.10 -> 1.1.4
+  val akkaManagement = "1.1.4" // 1.1.4 -> 1.2
 
-  val postgresql = "42.2.18" //"9.4.1210"
+  val postgresql = "42.2.18"
 
   val scalatest = "3.1.1"
 
@@ -20,7 +20,7 @@ object Versions {
 
   val jackson = "2.11.4"
 
-  val json4s = "3.6.12" // 3.6.7 -> 3.6.12
+  val json4s = "3.6.12"
 
   val scalaLogging = "3.9.2"