diff --git a/patches/enterprise-license.patch b/patches/enterprise-license.patch index 9d4d999..74b9b8c 100644 --- a/patches/enterprise-license.patch +++ b/patches/enterprise-license.patch @@ -1,8 +1,8 @@ -diff --git a/src/main/java/stirling/software/SPDF/EE/LicenseKeyChecker.java b/src/main/java/stirling/software/SPDF/EE/LicenseKeyChecker.java -index 8e5633f4..0822555b 100644 ---- a/src/main/java/stirling/software/SPDF/EE/LicenseKeyChecker.java -+++ b/src/main/java/stirling/software/SPDF/EE/LicenseKeyChecker.java -@@ -42,9 +42,10 @@ public class LicenseKeyChecker { +diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/LicenseKeyChecker.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/LicenseKeyChecker.java +index 987d5fb6f..b209c6b23 100644 +--- a/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/LicenseKeyChecker.java ++++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/LicenseKeyChecker.java +@@ -41,9 +41,10 @@ public class LicenseKeyChecker { if (!applicationProperties.getPremium().isEnabled()) { premiumEnabledResult = License.NORMAL; } else { @@ -15,16 +15,19 @@ index 8e5633f4..0822555b 100644 if (License.ENTERPRISE == premiumEnabledResult) { log.info("License key is Enterprise."); } else if (License.PRO == premiumEnabledResult) { -diff --git a/src/test/java/stirling/software/SPDF/EE/LicenseKeyCheckerTest.java b/src/test/java/stirling/software/SPDF/EE/LicenseKeyCheckerTest.java +diff --git a/app/proprietary/src/test/java/stirling/software/proprietary/security/configuration/ee/LicenseKeyCheckerTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/security/configuration/ee/LicenseKeyCheckerTest.java deleted file mode 100644 -index 90754ee0..00000000 ---- a/src/test/java/stirling/software/SPDF/EE/LicenseKeyCheckerTest.java +index 4a6e7ad65..000000000 +--- a/app/proprietary/src/test/java/stirling/software/proprietary/security/configuration/ee/LicenseKeyCheckerTest.java +++ /dev/null -@@ -1,77 +0,0 @@ --package stirling.software.SPDF.EE; +@@ -1,79 +0,0 @@ +-package stirling.software.proprietary.security.configuration.ee; - --import static org.junit.jupiter.api.Assertions.*; --import static org.mockito.Mockito.*; +-import static org.junit.jupiter.api.Assertions.assertEquals; +-import static org.mockito.Mockito.verify; +-import static org.mockito.Mockito.verifyNoInteractions; +-import static org.mockito.Mockito.when; +-import static stirling.software.proprietary.security.configuration.ee.KeygenLicenseVerifier.License; - -import java.io.IOException; -import java.nio.file.Files; @@ -36,8 +39,7 @@ index 90754ee0..00000000 -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; - --import stirling.software.SPDF.EE.KeygenLicenseVerifier.License; --import stirling.software.SPDF.model.ApplicationProperties; +-import stirling.software.common.model.ApplicationProperties; - -@ExtendWith(MockitoExtension.class) -class LicenseKeyCheckerTest {