Merge branch 'arch_24825/user_version_2_2_1_of_license_lib_pr' into b…

…ranches/rudder/7.3
Normation · May 15, 2024 · 7d4336a · 7d4336a
2 parents 482ae48 + 09ee4a5
commit 7d4336a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/plugins-common-private/pom-template.xml b/plugins-common-private/pom-template.xml
@@ -34,7 +34,7 @@
     <dependency>
       <groupId>com.normation</groupId>
       <artifactId>license-lib</artifactId>
-      <version>2.2.0</version>
+      <version>2.2.1</version>
     </dependency>
   </dependencies>
   <repositories>

diff --git a/plugins-common-private/src/main/scala/com/normation/plugins/ParsePluginLicense.scala b/plugins-common-private/src/main/scala/com/normation/plugins/ParsePluginLicense.scala
@@ -37,7 +37,8 @@
 
 package com.normation.plugins
 
-import com.normation.license._
+import com.normation.license.*
+import com.normation.license.MaybeLicenseError.Maybe
 import com.normation.rudder.domain.logger.PluginLogger
 import java.nio.file.Files
 import java.nio.file.Paths
@@ -75,14 +76,14 @@ trait LicensedPluginCheck extends PluginStatus {
   /*
    * we don't want to check each time if the license is ok or not. So we only change if license or key file is updated
    */
-  def getModDate(path: String): Option[FileTime] = {
+  def getModDate(path: String): Option[FileTime]                         = {
     try {
       Some(Files.getLastModifiedTime(Paths.get(path)))
     } catch {
       case NonFatal(ex) => None
     }
   }
-  def readLicense = {
+  def readLicense:              Maybe[(License.CheckedLicense, Version)] = {
     val lic = LicenseReader.readAndCheckLicenseFS(
       pluginResourceLicense,
       pluginResourcePublickey,
@@ -105,7 +106,7 @@ trait LicensedPluginCheck extends PluginStatus {
     LicenseError.IO("License not initialized yet or missing licenses related files.")
   )
 
-  def maybeLicense = {
+  def maybeLicense: Maybe[(License.CheckedLicense, Version)] = {
     val licenseMod = getModDate(pluginResourceLicense)
     val pubkeyMod  = getModDate(pluginResourcePublickey)
     if (licenseMod != licenseModDate || pubkeyMod != pubkeyModDate) {