Do cosmetic subscription mgmt code improvements

Evolveum · Jan 25, 2024 · f208781 · f208781
1 parent 6d6d3c9
commit f208781
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
@@ -14,8 +14,6 @@
 import java.util.*;
 import javax.xml.datatype.Duration;
 
-import com.evolveum.midpoint.repo.common.subscription.SubscriptionId;
-
 import com.evolveum.midpoint.repo.common.subscription.SubscriptionStateCache;
 
 import jakarta.servlet.ServletContext;

diff --git a/...mmon/src/main/java/com/evolveum/midpoint/repo/common/subscription/JarSignatureHolder.java b/...mmon/src/main/java/com/evolveum/midpoint/repo/common/subscription/JarSignatureHolder.java
@@ -14,7 +14,7 @@
  */
 public class JarSignatureHolder {
 
-    public static Validity jarSignatureValidity;
+    private static Validity jarSignatureValidity;
 
     public static void setJarSignatureValidity(Validity validity) {
         jarSignatureValidity = validity;

diff --git a/...on/src/main/java/com/evolveum/midpoint/repo/common/subscription/SubscriptionPolicies.java b/...on/src/main/java/com/evolveum/midpoint/repo/common/subscription/SubscriptionPolicies.java
@@ -23,15 +23,15 @@
  * . Effectively a utility class. Should not be instantiated.
  * . These methods should not throw any exceptions.
  */
-public class SubscriptionPolicies {
+class SubscriptionPolicies {
 
     /**
      * How long is the grace period? It may be zero.
      *
      * Assumes that there IS a well-formed subscription ID.
      * (Otherwise, there's no point in asking about grace period.)
      */
-    public static @NotNull Period getGracePeriod(@NotNull SubscriptionId subscriptionId) {
+    static @NotNull Period getGracePeriod(@NotNull SubscriptionId subscriptionId) {
         argCheck(subscriptionId.isWellFormed(), "Subscription ID is not well-formed");
 
         return !subscriptionId.isDemo() ? Period.ofMonths(3) : Period.ZERO;
@@ -40,9 +40,9 @@ public class SubscriptionPolicies {
     /**
      * This is how we estimate we are in a production environment.
      */
-    public static boolean isProductionEnvironment(@NotNull SubscriptionId subscriptionId, @NotNull SystemFeatures features) {
+    static boolean isProductionEnvironment(@NotNull SubscriptionId subscriptionId, @NotNull SystemFeatures features) {
         int productionFeatures = count(
-            subscriptionId.isWellFormed() && !subscriptionId.isDemo(),
+                subscriptionId.isWellFormed() && !subscriptionId.isDemo(),
                 features.areRealNotificationsEnabled(),
                 features.isPublicHttpsUrlPatternDefined(),
                 features.isRemoteHostAddressHeaderDefined(),