From d0ca9361d319c49ded1d03384f40e0bbee62022e Mon Sep 17 00:00:00 2001 From: Ludy87 Date: Thu, 9 Jul 2026 10:50:05 +0200 Subject: [PATCH] SpringBoot 4.1.0 --- .../repository/ResourceGrantRepository.java | 2 -- .../DeviceCredentialRepository.java | 2 -- .../IntegrationConfigRepository.java | 2 -- .../source/SourceDocCountRepository.java | 2 -- .../source/SourceDocTotalRepository.java | 2 -- .../policy/source/SourceRepository.java | 2 -- .../policy/store/PolicyRepository.java | 2 -- .../PersistentAuditEventRepository.java | 2 -- .../repository/AuthorityRepository.java | 2 -- .../repository/PersistentLoginRepository.java | 2 -- .../repository/SessionRepository.java | 2 -- .../database/repository/UserRepository.java | 2 -- .../repository/InviteTokenRepository.java | 2 -- .../security/repository/TeamRepository.java | 2 -- .../UserLicenseSettingsRepository.java | 2 -- .../UserServerCertificateRepository.java | 2 -- .../WorkflowParticipantRepository.java | 2 -- .../repository/WorkflowSessionRepository.java | 2 -- .../BillingSubscriptionRepository.java | 2 -- .../software/saas/config/SaasJpaConfig.java | 4 ++-- .../repository/JobArtifactHashRepository.java | 2 -- .../PaygMeterEventLogRepository.java | 2 -- .../PaygShadowChargeRepository.java | 2 -- .../PaygTeamExtensionsRepository.java | 2 -- .../repository/PricingPolicyRepository.java | 2 -- .../repository/ProcessingJobRepository.java | 2 -- .../ProcessingJobStepRepository.java | 2 -- .../WalletEntitlementSnapshotRepository.java | 2 -- .../repository/WalletLedgerRepository.java | 2 -- .../repository/WalletPolicyRepository.java | 3 --- .../SaasTeamExtensionsRepository.java | 2 -- .../SaasUserExtensionsRepository.java | 2 -- .../repository/SupabaseUserRepository.java | 3 --- .../repository/TeamInvitationRepository.java | 3 --- .../repository/TeamMembershipRepository.java | 2 -- .../saas/config/SaasJpaConfigScanTest.java | 2 +- build.gradle | 24 +++++++++++++++---- 37 files changed, 23 insertions(+), 78 deletions(-) diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/access/repository/ResourceGrantRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/access/repository/ResourceGrantRepository.java index 76209c1abe..eb026e62ab 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/access/repository/ResourceGrantRepository.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/access/repository/ResourceGrantRepository.java @@ -3,13 +3,11 @@ package stirling.software.proprietary.access.repository; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; import stirling.software.proprietary.access.model.PrincipalType; import stirling.software.proprietary.access.model.ResourceGrant; import stirling.software.proprietary.access.model.ResourceType; -@Repository public interface ResourceGrantRepository extends JpaRepository { List findByResourceTypeAndResourceId( diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/accountlink/DeviceCredentialRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/accountlink/DeviceCredentialRepository.java index 792731e589..bbeddd3781 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/accountlink/DeviceCredentialRepository.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/accountlink/DeviceCredentialRepository.java @@ -3,9 +3,7 @@ package stirling.software.proprietary.accountlink; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -@Repository public interface DeviceCredentialRepository extends JpaRepository { /** The singleton credential, if this instance has linked. */ diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/integration/repository/IntegrationConfigRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/integration/repository/IntegrationConfigRepository.java index 6efb45d745..5d3e8056c6 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/integration/repository/IntegrationConfigRepository.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/integration/repository/IntegrationConfigRepository.java @@ -3,14 +3,12 @@ package stirling.software.proprietary.integration.repository; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; import stirling.software.proprietary.access.model.OwnerScope; import stirling.software.proprietary.integration.model.IntegrationConfig; import stirling.software.proprietary.model.Team; import stirling.software.proprietary.security.model.User; -@Repository public interface IntegrationConfigRepository extends JpaRepository { List findByOwnerUser(User ownerUser); diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/policy/source/SourceDocCountRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/policy/source/SourceDocCountRepository.java index 53a6965e28..6ae9a85d6a 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/policy/source/SourceDocCountRepository.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/policy/source/SourceDocCountRepository.java @@ -7,10 +7,8 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -@Repository public interface SourceDocCountRepository extends JpaRepository { diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/policy/source/SourceDocTotalRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/policy/source/SourceDocTotalRepository.java index 6542e98787..3985b059e9 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/policy/source/SourceDocTotalRepository.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/policy/source/SourceDocTotalRepository.java @@ -7,10 +7,8 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -@Repository public interface SourceDocTotalRepository extends JpaRepository { /** diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/policy/source/SourceRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/policy/source/SourceRepository.java index b8968fea1a..c2dc4f6b78 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/policy/source/SourceRepository.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/policy/source/SourceRepository.java @@ -5,9 +5,7 @@ import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; -@Repository public interface SourceRepository extends JpaRepository { /** diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/policy/store/PolicyRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/policy/store/PolicyRepository.java index 8cb36b73d8..a3905f5441 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/policy/store/PolicyRepository.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/policy/store/PolicyRepository.java @@ -5,9 +5,7 @@ import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; -@Repository public interface PolicyRepository extends JpaRepository { /** Enabled policies of a given trigger type, for background triggers to activate. */ diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/repository/PersistentAuditEventRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/repository/PersistentAuditEventRepository.java index 7c0081dd7c..e6dcecbfed 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/repository/PersistentAuditEventRepository.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/repository/PersistentAuditEventRepository.java @@ -10,12 +10,10 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; import stirling.software.proprietary.model.security.PersistentAuditEvent; -@Repository public interface PersistentAuditEventRepository extends JpaRepository { // Basic queries diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/AuthorityRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/AuthorityRepository.java index e8d74ec01f..bc326bffa9 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/AuthorityRepository.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/AuthorityRepository.java @@ -3,11 +3,9 @@ package stirling.software.proprietary.security.database.repository; import java.util.Set; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; import stirling.software.proprietary.security.model.Authority; -@Repository public interface AuthorityRepository extends JpaRepository { // Set findByUsername(String username); Set findByUser_Username(String username); diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/PersistentLoginRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/PersistentLoginRepository.java index 2ab9566763..b48764ff2a 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/PersistentLoginRepository.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/PersistentLoginRepository.java @@ -1,11 +1,9 @@ package stirling.software.proprietary.security.database.repository; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; import stirling.software.proprietary.security.model.PersistentLogin; -@Repository public interface PersistentLoginRepository extends JpaRepository { void deleteByUsername(String username); } diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/SessionRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/SessionRepository.java index db5d5a9b33..246b5d898b 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/SessionRepository.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/SessionRepository.java @@ -7,13 +7,11 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import jakarta.transaction.Transactional; import stirling.software.proprietary.security.model.SessionEntity; -@Repository public interface SessionRepository extends JpaRepository { List findByPrincipalName(String principalName); diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/UserRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/UserRepository.java index acae6044de..505b0bf7a6 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/UserRepository.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/UserRepository.java @@ -10,12 +10,10 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import stirling.software.proprietary.model.Team; import stirling.software.proprietary.security.model.User; -@Repository public interface UserRepository extends JpaRepository { Optional findByUsernameIgnoreCase(String username); diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/repository/InviteTokenRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/repository/InviteTokenRepository.java index be3cd9c9e0..090933a68d 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/repository/InviteTokenRepository.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/repository/InviteTokenRepository.java @@ -8,11 +8,9 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import stirling.software.proprietary.security.model.InviteToken; -@Repository public interface InviteTokenRepository extends JpaRepository { Optional findByToken(String token); diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/repository/TeamRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/repository/TeamRepository.java index ccf72be0a8..f0cff93f1f 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/repository/TeamRepository.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/repository/TeamRepository.java @@ -5,12 +5,10 @@ import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; import stirling.software.proprietary.model.Team; import stirling.software.proprietary.model.dto.TeamWithUserCountDTO; -@Repository public interface TeamRepository extends JpaRepository { Optional findByName(String name); diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/repository/UserLicenseSettingsRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/repository/UserLicenseSettingsRepository.java index 15b35e1bf4..2b65dee606 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/repository/UserLicenseSettingsRepository.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/repository/UserLicenseSettingsRepository.java @@ -3,11 +3,9 @@ package stirling.software.proprietary.security.repository; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; import stirling.software.proprietary.model.UserLicenseSettings; -@Repository public interface UserLicenseSettingsRepository extends JpaRepository { /** diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/workflow/repository/UserServerCertificateRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/workflow/repository/UserServerCertificateRepository.java index fead8da9b9..247364e847 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/workflow/repository/UserServerCertificateRepository.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/workflow/repository/UserServerCertificateRepository.java @@ -5,11 +5,9 @@ import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import stirling.software.proprietary.workflow.model.UserServerCertificateEntity; -@Repository public interface UserServerCertificateRepository extends JpaRepository { diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/workflow/repository/WorkflowParticipantRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/workflow/repository/WorkflowParticipantRepository.java index 8f31d8c4a4..ce18f6d373 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/workflow/repository/WorkflowParticipantRepository.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/workflow/repository/WorkflowParticipantRepository.java @@ -7,7 +7,6 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; import stirling.software.proprietary.security.model.User; @@ -15,7 +14,6 @@ import stirling.software.proprietary.workflow.model.ParticipantStatus; import stirling.software.proprietary.workflow.model.WorkflowParticipant; import stirling.software.proprietary.workflow.model.WorkflowSession; -@Repository public interface WorkflowParticipantRepository extends JpaRepository { /** Find participant by share token */ diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/workflow/repository/WorkflowSessionRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/workflow/repository/WorkflowSessionRepository.java index 7605caab8b..3c45b7680c 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/workflow/repository/WorkflowSessionRepository.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/workflow/repository/WorkflowSessionRepository.java @@ -6,14 +6,12 @@ import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import stirling.software.proprietary.security.model.User; import stirling.software.proprietary.workflow.model.WorkflowSession; import stirling.software.proprietary.workflow.model.WorkflowStatus; import stirling.software.proprietary.workflow.model.WorkflowType; -@Repository public interface WorkflowSessionRepository extends JpaRepository { /** Find workflow session by unique session ID */ diff --git a/app/saas/src/main/java/stirling/software/saas/billing/repository/BillingSubscriptionRepository.java b/app/saas/src/main/java/stirling/software/saas/billing/repository/BillingSubscriptionRepository.java index 39953e59e5..69d7011db1 100644 --- a/app/saas/src/main/java/stirling/software/saas/billing/repository/BillingSubscriptionRepository.java +++ b/app/saas/src/main/java/stirling/software/saas/billing/repository/BillingSubscriptionRepository.java @@ -7,12 +7,10 @@ import java.util.UUID; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import stirling.software.saas.billing.model.BillingSubscription; /** Read/write access to the Stripe subscription mirror table. */ -@Repository public interface BillingSubscriptionRepository extends JpaRepository { List findByUserId(UUID userId); diff --git a/app/saas/src/main/java/stirling/software/saas/config/SaasJpaConfig.java b/app/saas/src/main/java/stirling/software/saas/config/SaasJpaConfig.java index 53a5f34c15..27430f087f 100644 --- a/app/saas/src/main/java/stirling/software/saas/config/SaasJpaConfig.java +++ b/app/saas/src/main/java/stirling/software/saas/config/SaasJpaConfig.java @@ -7,8 +7,8 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories; /** * Registers the {@code :saas} module's entities and repositories with Spring Data JPA. Any new - * package holding {@code @Repository} or {@code @Entity} classes must be added here, or the beans - * won't wire at startup. + * package holding repository interfaces or {@code @Entity} classes must be added here, or the + * beans won't wire at startup. */ @Configuration @Profile("saas") diff --git a/app/saas/src/main/java/stirling/software/saas/payg/repository/JobArtifactHashRepository.java b/app/saas/src/main/java/stirling/software/saas/payg/repository/JobArtifactHashRepository.java index 0c3af74dbe..bed10d2805 100644 --- a/app/saas/src/main/java/stirling/software/saas/payg/repository/JobArtifactHashRepository.java +++ b/app/saas/src/main/java/stirling/software/saas/payg/repository/JobArtifactHashRepository.java @@ -9,14 +9,12 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import stirling.software.saas.payg.job.JobArtifactHash; import stirling.software.saas.payg.job.JobArtifactHash.JobArtifactHashId; import stirling.software.saas.payg.lineage.LineageMatch; import stirling.software.saas.payg.model.JobStatus; -@Repository public interface JobArtifactHashRepository extends JpaRepository { diff --git a/app/saas/src/main/java/stirling/software/saas/payg/repository/PaygMeterEventLogRepository.java b/app/saas/src/main/java/stirling/software/saas/payg/repository/PaygMeterEventLogRepository.java index 7d752bd14f..d9d74feb79 100644 --- a/app/saas/src/main/java/stirling/software/saas/payg/repository/PaygMeterEventLogRepository.java +++ b/app/saas/src/main/java/stirling/software/saas/payg/repository/PaygMeterEventLogRepository.java @@ -9,12 +9,10 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; import stirling.software.saas.payg.meter.PaygMeterEventLog; -@Repository public interface PaygMeterEventLogRepository extends JpaRepository { /** diff --git a/app/saas/src/main/java/stirling/software/saas/payg/repository/PaygShadowChargeRepository.java b/app/saas/src/main/java/stirling/software/saas/payg/repository/PaygShadowChargeRepository.java index 8a2911f9c4..341dd6a54c 100644 --- a/app/saas/src/main/java/stirling/software/saas/payg/repository/PaygShadowChargeRepository.java +++ b/app/saas/src/main/java/stirling/software/saas/payg/repository/PaygShadowChargeRepository.java @@ -8,11 +8,9 @@ import java.util.UUID; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import stirling.software.saas.payg.shadow.PaygShadowCharge; -@Repository public interface PaygShadowChargeRepository extends JpaRepository { @Query( diff --git a/app/saas/src/main/java/stirling/software/saas/payg/repository/PaygTeamExtensionsRepository.java b/app/saas/src/main/java/stirling/software/saas/payg/repository/PaygTeamExtensionsRepository.java index 35fb6bbf7a..448b14eec1 100644 --- a/app/saas/src/main/java/stirling/software/saas/payg/repository/PaygTeamExtensionsRepository.java +++ b/app/saas/src/main/java/stirling/software/saas/payg/repository/PaygTeamExtensionsRepository.java @@ -7,13 +7,11 @@ import org.springframework.data.jpa.repository.Lock; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import jakarta.persistence.LockModeType; import stirling.software.saas.payg.policy.PaygTeamExtensions; -@Repository public interface PaygTeamExtensionsRepository extends JpaRepository { Optional findByStripeCustomerId(String stripeCustomerId); diff --git a/app/saas/src/main/java/stirling/software/saas/payg/repository/PricingPolicyRepository.java b/app/saas/src/main/java/stirling/software/saas/payg/repository/PricingPolicyRepository.java index 0a5b2075e0..bc76d641d5 100644 --- a/app/saas/src/main/java/stirling/software/saas/payg/repository/PricingPolicyRepository.java +++ b/app/saas/src/main/java/stirling/software/saas/payg/repository/PricingPolicyRepository.java @@ -5,11 +5,9 @@ import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; import stirling.software.saas.payg.policy.PricingPolicy; -@Repository public interface PricingPolicyRepository extends JpaRepository { Optional findByVersion(String version); diff --git a/app/saas/src/main/java/stirling/software/saas/payg/repository/ProcessingJobRepository.java b/app/saas/src/main/java/stirling/software/saas/payg/repository/ProcessingJobRepository.java index a930a2bb36..75fae51e08 100644 --- a/app/saas/src/main/java/stirling/software/saas/payg/repository/ProcessingJobRepository.java +++ b/app/saas/src/main/java/stirling/software/saas/payg/repository/ProcessingJobRepository.java @@ -7,12 +7,10 @@ import java.util.UUID; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import stirling.software.saas.payg.job.ProcessingJob; import stirling.software.saas.payg.model.JobStatus; -@Repository public interface ProcessingJobRepository extends JpaRepository { List findByOwnerUserIdAndStatus(Long ownerUserId, JobStatus status); diff --git a/app/saas/src/main/java/stirling/software/saas/payg/repository/ProcessingJobStepRepository.java b/app/saas/src/main/java/stirling/software/saas/payg/repository/ProcessingJobStepRepository.java index 3958c6a5cd..11555d1dba 100644 --- a/app/saas/src/main/java/stirling/software/saas/payg/repository/ProcessingJobStepRepository.java +++ b/app/saas/src/main/java/stirling/software/saas/payg/repository/ProcessingJobStepRepository.java @@ -4,11 +4,9 @@ import java.util.List; import java.util.UUID; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; import stirling.software.saas.payg.job.ProcessingJobStep; -@Repository public interface ProcessingJobStepRepository extends JpaRepository { List findByJobIdOrderByStartedAtAsc(UUID jobId); diff --git a/app/saas/src/main/java/stirling/software/saas/payg/repository/WalletEntitlementSnapshotRepository.java b/app/saas/src/main/java/stirling/software/saas/payg/repository/WalletEntitlementSnapshotRepository.java index e15222c21e..59cb156b72 100644 --- a/app/saas/src/main/java/stirling/software/saas/payg/repository/WalletEntitlementSnapshotRepository.java +++ b/app/saas/src/main/java/stirling/software/saas/payg/repository/WalletEntitlementSnapshotRepository.java @@ -3,12 +3,10 @@ package stirling.software.saas.payg.repository; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; import stirling.software.saas.payg.entitlement.WalletEntitlementSnapshot; import stirling.software.saas.payg.entitlement.WalletEntitlementSnapshot.WalletEntitlementSnapshotId; -@Repository public interface WalletEntitlementSnapshotRepository extends JpaRepository { diff --git a/app/saas/src/main/java/stirling/software/saas/payg/repository/WalletLedgerRepository.java b/app/saas/src/main/java/stirling/software/saas/payg/repository/WalletLedgerRepository.java index 095f6cb924..1e89d6be03 100644 --- a/app/saas/src/main/java/stirling/software/saas/payg/repository/WalletLedgerRepository.java +++ b/app/saas/src/main/java/stirling/software/saas/payg/repository/WalletLedgerRepository.java @@ -6,12 +6,10 @@ import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import stirling.software.saas.payg.model.LedgerEntryType; import stirling.software.saas.payg.wallet.WalletLedgerEntry; -@Repository public interface WalletLedgerRepository extends JpaRepository { /** Most recent entries for the Plan page activity feed. */ diff --git a/app/saas/src/main/java/stirling/software/saas/payg/repository/WalletPolicyRepository.java b/app/saas/src/main/java/stirling/software/saas/payg/repository/WalletPolicyRepository.java index f8c3076e53..4186668b7f 100644 --- a/app/saas/src/main/java/stirling/software/saas/payg/repository/WalletPolicyRepository.java +++ b/app/saas/src/main/java/stirling/software/saas/payg/repository/WalletPolicyRepository.java @@ -3,11 +3,8 @@ package stirling.software.saas.payg.repository; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - import stirling.software.saas.payg.wallet.WalletPolicy; -@Repository public interface WalletPolicyRepository extends JpaRepository { Optional findByTeamId(Long teamId); diff --git a/app/saas/src/main/java/stirling/software/saas/repository/SaasTeamExtensionsRepository.java b/app/saas/src/main/java/stirling/software/saas/repository/SaasTeamExtensionsRepository.java index 5ca25cca6b..36c8bcef17 100644 --- a/app/saas/src/main/java/stirling/software/saas/repository/SaasTeamExtensionsRepository.java +++ b/app/saas/src/main/java/stirling/software/saas/repository/SaasTeamExtensionsRepository.java @@ -6,11 +6,9 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import stirling.software.saas.model.SaasTeamExtensions; -@Repository public interface SaasTeamExtensionsRepository extends JpaRepository { Optional findByTeamId(Long teamId); diff --git a/app/saas/src/main/java/stirling/software/saas/repository/SaasUserExtensionsRepository.java b/app/saas/src/main/java/stirling/software/saas/repository/SaasUserExtensionsRepository.java index 1f9574174b..e730ef2533 100644 --- a/app/saas/src/main/java/stirling/software/saas/repository/SaasUserExtensionsRepository.java +++ b/app/saas/src/main/java/stirling/software/saas/repository/SaasUserExtensionsRepository.java @@ -6,11 +6,9 @@ import java.util.UUID; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import stirling.software.saas.model.SaasUserExtensions; -@Repository public interface SaasUserExtensionsRepository extends JpaRepository { Optional findByUserId(Long userId); diff --git a/app/saas/src/main/java/stirling/software/saas/repository/SupabaseUserRepository.java b/app/saas/src/main/java/stirling/software/saas/repository/SupabaseUserRepository.java index 4e61de4145..fc0ef54b02 100644 --- a/app/saas/src/main/java/stirling/software/saas/repository/SupabaseUserRepository.java +++ b/app/saas/src/main/java/stirling/software/saas/repository/SupabaseUserRepository.java @@ -9,11 +9,8 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - import stirling.software.saas.model.SupabaseUser; -@Repository public interface SupabaseUserRepository extends JpaRepository { /** diff --git a/app/saas/src/main/java/stirling/software/saas/repository/TeamInvitationRepository.java b/app/saas/src/main/java/stirling/software/saas/repository/TeamInvitationRepository.java index 38877c56b6..17068e31bd 100644 --- a/app/saas/src/main/java/stirling/software/saas/repository/TeamInvitationRepository.java +++ b/app/saas/src/main/java/stirling/software/saas/repository/TeamInvitationRepository.java @@ -8,12 +8,9 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - import stirling.software.common.model.enumeration.InvitationStatus; import stirling.software.saas.model.TeamInvitation; -@Repository public interface TeamInvitationRepository extends JpaRepository { /** diff --git a/app/saas/src/main/java/stirling/software/saas/repository/TeamMembershipRepository.java b/app/saas/src/main/java/stirling/software/saas/repository/TeamMembershipRepository.java index 36c04f09c3..5bfc18a46f 100644 --- a/app/saas/src/main/java/stirling/software/saas/repository/TeamMembershipRepository.java +++ b/app/saas/src/main/java/stirling/software/saas/repository/TeamMembershipRepository.java @@ -6,12 +6,10 @@ import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import stirling.software.common.model.enumeration.TeamRole; import stirling.software.saas.model.TeamMembership; -@Repository public interface TeamMembershipRepository extends JpaRepository { /** diff --git a/app/saas/src/test/java/stirling/software/saas/config/SaasJpaConfigScanTest.java b/app/saas/src/test/java/stirling/software/saas/config/SaasJpaConfigScanTest.java index faf7f561ec..d2a5eff6ce 100644 --- a/app/saas/src/test/java/stirling/software/saas/config/SaasJpaConfigScanTest.java +++ b/app/saas/src/test/java/stirling/software/saas/config/SaasJpaConfigScanTest.java @@ -43,7 +43,7 @@ class SaasJpaConfigScanTest { Set actual = Set.copyOf(Arrays.asList(annotation.basePackages())); assertThat(actual) - .as("Every package holding @Repository interfaces must be listed") + .as("Every package holding repository interfaces must be listed") .containsAll(EXPECTED_REPO_PACKAGES); } diff --git a/build.gradle b/build.gradle index 5c89fd7af2..5bd913298b 100644 --- a/build.gradle +++ b/build.gradle @@ -2,11 +2,11 @@ plugins { id "java" id "jacoco" id "io.spring.dependency-management" version "1.1.7" - id "org.springframework.boot" version "4.0.6" + id "org.springframework.boot" version "4.1.0" id "org.springdoc.openapi-gradle-plugin" version "1.9.0" id "io.swagger.swaggerhub" version "1.3.2" id "com.diffplug.spotless" version "8.5.0" - id "com.github.jk1.dependency-license-report" version "3.1.2" + id "com.github.jk1.dependency-license-report" version "3.1.4" //id "nebula.lint" version "19.0.3" id "org.sonarqube" version "7.2.3.7755" } @@ -20,12 +20,12 @@ import org.gradle.api.tasks.testing.Test import org.gradle.jvm.toolchain.JavaLanguageVersion ext { - springBootVersion = "4.0.6" + springBootVersion = "4.1.0" pdfboxVersion = "3.0.7" imageioVersion = "3.13.1" lombokVersion = "1.18.46" bouncycastleVersion = "1.84" - springSecuritySamlVersion = "7.0.5" + springSecuritySamlVersion = "7.1.0" openSamlVersion = "5.2.1" commonmarkVersion = "0.28.0" googleJavaFormatVersion = "1.28.0" @@ -62,6 +62,19 @@ ext.isSecurityDisabled = { -> System.getProperty('DISABLE_ADDITIONAL_FEATURES') == 'true') } +ext.getEnv = { -> + def sel = System.getenv('SECURITY_ENABLELOGIN') + logger.lifecycle("SECURITY_ENABLELOGIN: ${sel}") + def des = System.getenv('DOCKER_ENABLE_SECURITY') + logger.lifecycle("DOCKER_ENABLE_SECURITY: ${des}") + def flavorValue = System.getenv('STIRLING_FLAVOR') + logger.lifecycle("STIRLING_FLAVOR: ${flavorValue}") + def saas = System.getenv('ENABLE_SAAS') + logger.lifecycle("ENABLE_SAAS: ${saas}") + def daf = System.getenv('DISABLE_ADDITIONAL_FEATURES') + logger.lifecycle("DISABLE_ADDITIONAL_FEATURES: ${daf}") +} + ext.mavenUrl = System.getenv("MAVEN_PUBLIC_URL") ?: "" ext.username = System.getenv('MAVEN_USER') ?: "" ext.password = System.getenv('MAVEN_PASSWORD') ?: "" @@ -226,6 +239,8 @@ subprojects { resolutionStrategy.force "org.bouncycastle:bcprov-jdk18on:${bouncycastleVersion}" resolutionStrategy.force "org.bouncycastle:bcpkix-jdk18on:${bouncycastleVersion}" resolutionStrategy.force "org.bouncycastle:bcutil-jdk18on:${bouncycastleVersion}" + resolutionStrategy.force "org.apache.santuario:xmlsec:4.0.4" + resolutionStrategy.force "com.google.guava:guava:${guavaVersion}" } dependencyManagement { @@ -608,6 +623,7 @@ dependencies { if (rootProject.ext.isSecurityDisabled()) { implementation project(':proprietary') } + rootProject.ext.getEnv() testImplementation 'org.springframework.boot:spring-boot-starter-test' testRuntimeOnly "org.junit.platform:junit-platform-launcher"