fixup! ISSUE-1048 [PublicAsset] PublicAsset/set create JMAP method - …

…reuse `url.prefix` for `publicAsset.publicURIPrefix`
linagora · May 22, 2024 · 933d890 · 933d890
1 parent f165c07
commit 933d890
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/.../protocols/jmap/src/test/java/com/linagora/tmail/module/LinagoraTestJMAPServerModule.java b/.../protocols/jmap/src/test/java/com/linagora/tmail/module/LinagoraTestJMAPServerModule.java
@@ -16,7 +16,6 @@ public class LinagoraTestJMAPServerModule extends TestJMAPServerModule {
     Configuration provideConfiguration() {
         Configuration configuration = new PropertiesConfiguration();
         configuration.addProperty("calendarEvent.reply.mailTemplateLocation", "classpath://eml/");
-        configuration.addProperty("publicAsset.uri.prefix", "http://localhost:8000/");
         return configuration;
     }
 }
diff --git a/...ions/src/main/scala/com/linagora/tmail/james/jmap/publicAsset/PublicAssetSetService.scala b/...ions/src/main/scala/com/linagora/tmail/james/jmap/publicAsset/PublicAssetSetService.scala
@@ -3,19 +3,18 @@ package com.linagora.tmail.james.jmap.publicAsset
 import java.net.URI
 
 import com.google.common.base.Preconditions
-import jakarta.inject.{Inject, Named}
-import org.apache.commons.configuration2.Configuration
+import jakarta.inject.Inject
 import org.apache.james.jmap.api.model.IdentityId
-import org.apache.james.jmap.core.AccountId
+import org.apache.james.jmap.core.{AccountId, JmapRfc8621Configuration}
 import org.apache.james.jmap.method.IdentityResolver
 import org.apache.james.mailbox.MailboxSession
 import reactor.core.scala.publisher.{SFlux, SMono}
 
 class PublicAssetSetService @Inject()(val identityResolver: IdentityResolver,
-                                      @Named("jmap") jmapConfiguration: Configuration) {
+                                      jmapConfiguration: JmapRfc8621Configuration) {
   private val publicURIPrefix: URI = {
-    val publicAssetUriPrefix = jmapConfiguration.getString("publicAsset.uri.prefix", null)
-    Preconditions.checkArgument(publicAssetUriPrefix != null, "publicAsset.uri.prefix is mandatory".asInstanceOf[Object])
+    val publicAssetUriPrefix = jmapConfiguration.urlPrefixString
+    Preconditions.checkArgument(publicAssetUriPrefix != null, "publicAssetUriPrefix is mandatory".asInstanceOf[Object])
     new URI(publicAssetUriPrefix)
   }