chore: bump lithium without legacy javax deps. (#145)

* chore: bump lithium * chore: bump lithium * chore: add domain to metadata
wireapp · Apr 15, 2024 · ae6f0a4 · ae6f0a4
1 parent 0cfb25e
commit ae6f0a4
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/backend/pom.xml b/backend/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.wire.bots</groupId>
     <artifactId>roman</artifactId>
-    <version>1.19.0</version>
+    <version>1.19.3</version>
 
     <name>Roman</name>
     <description>Wire Bot API Proxy</description>
@@ -28,7 +28,7 @@
 
         <maven.test.skip>true</maven.test.skip>
 
-        <lithium.version>3.6.0</lithium.version>
+        <lithium.version>3.6.4</lithium.version>
         <dropwizard.version>4.0.0</dropwizard.version>
         <jwt.version>0.11.5</jwt.version>
         <junit5.version>5.8.2</junit5.version>
@@ -67,6 +67,14 @@
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-servlets</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.dropwizard</groupId>
+            <artifactId>dropwizard-jdbi3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.dropwizard</groupId>
+            <artifactId>dropwizard-client</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.smoketurner</groupId>
             <artifactId>dropwizard-swagger</artifactId>

diff --git a/backend/src/main/java/com/wire/bots/roman/Sender.java b/backend/src/main/java/com/wire/bots/roman/Sender.java
@@ -8,7 +8,17 @@
 import com.wire.bots.roman.model.Mention;
 import com.wire.lithium.ClientRepo;
 import com.wire.xenon.WireClient;
-import com.wire.xenon.assets.*;
+import com.wire.xenon.assets.AssetBase;
+import com.wire.xenon.assets.AudioAsset;
+import com.wire.xenon.assets.AudioPreview;
+import com.wire.xenon.assets.ButtonActionConfirmation;
+import com.wire.xenon.assets.Calling;
+import com.wire.xenon.assets.FileAsset;
+import com.wire.xenon.assets.FileAssetPreview;
+import com.wire.xenon.assets.ImageAsset;
+import com.wire.xenon.assets.ImagePreview;
+import com.wire.xenon.assets.MessageText;
+import com.wire.xenon.assets.Poll;
 import com.wire.xenon.backend.models.Conversation;
 import com.wire.xenon.exceptions.MissingStateException;
 import com.wire.xenon.models.AssetKey;
@@ -230,6 +240,7 @@ private void setAssetMetadata(AssetBase asset, AssetMeta meta) {
         asset.setAssetToken(meta.assetToken);
         asset.setSha256(Base64.getDecoder().decode(meta.sha256));
         asset.setOtrKey(Base64.getDecoder().decode(meta.otrKey));
+        asset.setDomain(meta.domain);
     }
 
     private AssetKey uploadAssetData(WireClient wireClient, AssetBase asset) throws Exception {

diff --git a/backend/src/main/java/com/wire/bots/roman/model/AssetMeta.java b/backend/src/main/java/com/wire/bots/roman/model/AssetMeta.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import jakarta.validation.constraints.NotNull;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -21,4 +20,8 @@ public class AssetMeta {
     @JsonProperty
     @NotNull
     public String otrKey;
+
+    @JsonProperty
+    @NotNull
+    public String domain;
 }