[ISSUE-1254] Move PublicAssetTotalSizeLimit constant to API

linagora · Dec 10, 2024 · f018c83 · f018c83
1 parent ff4fcf4
commit f018c83
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/...tensions-api/src/main/scala/com/linagora/tmail/james/jmap/PublicAssetTotalSizeLimit.scala b/...tensions-api/src/main/scala/com/linagora/tmail/james/jmap/PublicAssetTotalSizeLimit.scala
@@ -7,6 +7,8 @@ import org.apache.james.util.Size
 import scala.util.{Failure, Success, Try}
 
 object PublicAssetTotalSizeLimit {
+  val DEFAULT: PublicAssetTotalSizeLimit = PublicAssetTotalSizeLimit.of(Size.of(20L, Size.Unit.M)).get
+
   def of(size: Size): Try[PublicAssetTotalSizeLimit] = refined.refineV[UnsignedIntConstraint](size.asBytes()) match {
     case Right(value) => Success(PublicAssetTotalSizeLimit(value))
     case Left(error) => Failure(new NumberFormatException(error))

diff --git a/...src/test/scala/com/linagora/tmail/james/jmap/publicAsset/PublicAssetServiceContract.scala b/...src/test/scala/com/linagora/tmail/james/jmap/publicAsset/PublicAssetServiceContract.scala
@@ -30,7 +30,7 @@ object PublicAssetServiceContract {
 
   val identityRepository: IdentityRepository = mock(classOf[IdentityRepository])
 
-  val PUBLIC_ASSET_TOTAL_SIZE_LIMIT_IN_CONFIGURED: Long = PublicAssetTotalSizeLimit.of(org.apache.james.util.Size.of(20L, org.apache.james.util.Size.Unit.M)).get.asLong()
+  val PUBLIC_ASSET_TOTAL_SIZE_LIMIT_IN_CONFIGURED: Long = PublicAssetTotalSizeLimit.DEFAULT.asLong()
 
   val CLOCK = new UpdatableTickingClock(Instant.now())
 }

diff --git a/...st/java/com/linagora/tmail/james/jmap/publicAsset/CassandraPublicAssetRepositoryTest.java b/...st/java/com/linagora/tmail/james/jmap/publicAsset/CassandraPublicAssetRepositoryTest.java
@@ -19,8 +19,7 @@ class CassandraPublicAssetRepositoryTest implements PublicAssetRepositoryContrac
 
     @BeforeEach
     void setup(CassandraCluster cassandra) {
-        PublicAssetTotalSizeLimit publicAssetTotalSizeLimit =
-            PublicAssetTotalSizeLimit.of(Size.of(20L, Size.Unit.M)).get();
+        PublicAssetTotalSizeLimit publicAssetTotalSizeLimit = PublicAssetTotalSizeLimit.DEFAULT();
         publicAssetRepository = new CassandraPublicAssetRepository(
             new CassandraPublicAssetDAO(cassandra.getConf(), blobIdFactory()),
             new DeDuplicationBlobStore(new MemoryBlobStoreDAO(), BucketName.DEFAULT, blobIdFactory()),

diff --git a/.../test/java/com/linagora/tmail/james/jmap/publicAsset/CassandraPublicAssetServiceTest.java b/.../test/java/com/linagora/tmail/james/jmap/publicAsset/CassandraPublicAssetServiceTest.java
@@ -22,8 +22,7 @@ class CassandraPublicAssetServiceTest implements PublicAssetServiceContract {
 
     @BeforeEach
     void setup(CassandraCluster cassandra) {
-        PublicAssetTotalSizeLimit publicAssetTotalSizeLimit =
-            PublicAssetTotalSizeLimit.of(Size.of(20L, Size.Unit.M)).get();
+        PublicAssetTotalSizeLimit publicAssetTotalSizeLimit = PublicAssetTotalSizeLimit.DEFAULT();
         publicAssetRepository = new CassandraPublicAssetRepository(
             new CassandraPublicAssetDAO(cassandra.getConf(), blobIdFactory()),
             new DeDuplicationBlobStore(new MemoryBlobStoreDAO(), BucketName.DEFAULT, blobIdFactory()),

diff --git a/.../extensions/src/main/scala/com/linagora/tmail/james/jmap/JMAPExtensionConfiguration.scala b/.../extensions/src/main/scala/com/linagora/tmail/james/jmap/JMAPExtensionConfiguration.scala
@@ -18,7 +18,7 @@ import scala.util.{Failure, Success, Try}
 
 object JMAPExtensionConfiguration {
   val PUBLIC_ASSET_TOTAL_SIZE_LIMIT_PROPERTY: String = "public.asset.total.size"
-  val PUBLIC_ASSET_TOTAL_SIZE_LIMIT_DEFAULT: PublicAssetTotalSizeLimit = PublicAssetTotalSizeLimit.of(Size.of(20L, Size.Unit.M)).get
+  val PUBLIC_ASSET_TOTAL_SIZE_LIMIT_DEFAULT: PublicAssetTotalSizeLimit = PublicAssetTotalSizeLimit.DEFAULT
   val TICKET_IP_VALIDATION_PROPERTY: String = "authentication.strategy.rfc8621.tickets.ip.validation.enabled"
   val TICKET_IP_VALIDATION_ENABLED: TicketIpValidationEnable = TicketIpValidationEnable(true)
   val CALENDAR_EVENT_REPLY_SUPPORTED_LANGUAGES_PROPERTY: String = "calendarEvent.reply.supportedLanguages"