CR

Author: adinauer

sentry/src/main/java/io/sentry/protocol/User.java

@@ -150,7 +150,7 @@ public void setIpAddress(final @Nullable String ipAddress) {
   /**
    * Gets other user related data.
    *
-   * @deprecated use getData instead
+   * @deprecated use {{@link User#getData()}} instead
    * @return the other user data.
    */
   @Deprecated
@@ -162,7 +162,7 @@ public void setIpAddress(final @Nullable String ipAddress) {
   /**
    * Sets other user related data.
    *
-   * @deprecated use setData instead
+   * @deprecated use {{@link User#setData(Map)}} instead
    * @param other the other user related data..
    */
   @Deprecated
@@ -276,6 +276,7 @@ public static final class Deserializer implements JsonDeserializer<User> {
                     (Map<String, String>) reader.nextObjectOrNull());
             break;
           case JsonKeys.OTHER:
+            // restore `other` from legacy JSON
             if (user.data == null || user.data.isEmpty()) {
               user.data =
                   CollectionUtils.newConcurrentHashMap(

sentry/src/test/java/io/sentry/protocol/UserSerializationTest.kt

@@ -44,7 +44,7 @@ class UserSerializationTest {
     }
 
     @Test
-    fun deserializeLegacy() {
+    fun `deserialize legacy`() {
         val inputJson = sanitizedFile("json/user_legacy.json")
         val expectedJson = sanitizedFile("json/user.json")
         val actual = deserialize(inputJson)