Add finals and annotations

sentry/src/main/java/io/sentry/Hub.java

@@ -932,7 +932,7 @@ private IScope buildLocalScope(
               "Instance is disabled and this 'captureReplay' call is a no-op.");
     } else {
       try {
-        StackItem item = stack.peek();
+        final @NotNull StackItem item = stack.peek();
         sentryId = item.getClient().captureReplayEvent(replay, item.getScope(), hint);
       } catch (Throwable e) {
         options.getLogger().log(SentryLevel.ERROR, "Error while capturing replay", e);

sentry/src/main/java/io/sentry/MainEventProcessor.java

@@ -150,7 +150,8 @@ private void processNonCachedEvent(final @NotNull SentryBaseEvent event) {
   }
 
   @Override
-  public @NotNull SentryReplayEvent process(@NotNull SentryReplayEvent event, @NotNull Hint hint) {
+  public @NotNull SentryReplayEvent process(
+      final @NotNull SentryReplayEvent event, final @NotNull Hint hint) {
     setCommons(event);
     // TODO: maybe later it's needed to deobfuscate something (e.g. view hierarchy), for now the
     // TODO: protocol does not support it

sentry/src/main/java/io/sentry/ReplayRecording.java

@@ -31,7 +31,7 @@ public Integer getSegmentId() {
     return segmentId;
   }
 
-  public void setSegmentId(@Nullable Integer segmentId) {
+  public void setSegmentId(final @Nullable Integer segmentId) {
     this.segmentId = segmentId;
   }
 
@@ -40,7 +40,7 @@ public List<? extends RRWebEvent> getPayload() {
     return payload;
   }
 
-  public void setPayload(@Nullable List<? extends RRWebEvent> payload) {
+  public void setPayload(final @Nullable List<? extends RRWebEvent> payload) {
     this.payload = payload;
   }
 
@@ -136,11 +136,11 @@ public static final class Deserializer implements JsonDeserializer<ReplayRecordi
           if (event instanceof Map) {
             final Map<String, Object> eventMap = (Map<String, Object>) event;
             final ObjectReader mapReader = new MapObjectReader(eventMap);
-            for (Map.Entry<String, Object> entry : eventMap.entrySet()) {
+            for (final Map.Entry<String, Object> entry : eventMap.entrySet()) {
               final String key = entry.getKey();
               final Object value = entry.getValue();
               if (key.equals("type")) {
-                RRWebEventType type = RRWebEventType.values()[(int) value];
+                final RRWebEventType type = RRWebEventType.values()[(int) value];
                 switch (type) {
                   case Meta:
                     final RRWebEvent metaEvent =

sentry/src/main/java/io/sentry/SentryEnvelopeItem.java

@@ -425,32 +425,34 @@ public CachedItem(final @Nullable Callable<byte[]> dataFactory) {
     }
   }
 
-  @SuppressWarnings({"CharsetObjectCanBeUsed", "UnnecessaryParentheses"})
-  private static byte[] serializeToMsgpack(Map<String, byte[]> map) throws IOException {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-    // Write map header
-    baos.write((byte) (0x80 | map.size()));
-
-    // Iterate over the map and serialize each key-value pair
-    for (Map.Entry<String, byte[]> entry : map.entrySet()) {
-      // Pack the key as a string
-      byte[] keyBytes = entry.getKey().getBytes(UTF_8);
-      int keyLength = keyBytes.length;
-      // string up to 255 chars
-      baos.write((byte) (0xd9));
-      baos.write((byte) (keyLength));
-      baos.write(keyBytes);
-
-      // Pack the value as a binary string
-      byte[] valueBytes = entry.getValue();
-      int valueLength = valueBytes.length;
-      // We will always use the 4 bytes data length for simplicity.
-      baos.write((byte) (0xc6));
-      baos.write(ByteBuffer.allocate(4).order(ByteOrder.BIG_ENDIAN).putInt(valueLength).array());
-      baos.write(valueBytes);
-    }
+  @SuppressWarnings({"UnnecessaryParentheses"})
+  private static byte[] serializeToMsgpack(final @NotNull Map<String, byte[]> map)
+      throws IOException {
+    try (final ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+
+      // Write map header
+      baos.write((byte) (0x80 | map.size()));
+
+      // Iterate over the map and serialize each key-value pair
+      for (final Map.Entry<String, byte[]> entry : map.entrySet()) {
+        // Pack the key as a string
+        final byte[] keyBytes = entry.getKey().getBytes(UTF_8);
+        final int keyLength = keyBytes.length;
+        // string up to 255 chars
+        baos.write((byte) (0xd9));
+        baos.write((byte) (keyLength));
+        baos.write(keyBytes);
+
+        // Pack the value as a binary string
+        final byte[] valueBytes = entry.getValue();
+        final int valueLength = valueBytes.length;
+        // We will always use the 4 bytes data length for simplicity.
+        baos.write((byte) (0xc6));
+        baos.write(ByteBuffer.allocate(4).order(ByteOrder.BIG_ENDIAN).putInt(valueLength).array());
+        baos.write(valueBytes);
+      }
 
-    return baos.toByteArray();
+      return baos.toByteArray();
+    }
   }
 }

sentry/src/main/java/io/sentry/SentryReplayEvent.java

@@ -22,15 +22,15 @@ public enum ReplayType implements JsonSerializable {
     BUFFER;
 
     @Override
-    public void serialize(@NotNull ObjectWriter writer, @NotNull ILogger logger)
+    public void serialize(final @NotNull ObjectWriter writer, final @NotNull ILogger logger)
         throws IOException {
       writer.value(name().toLowerCase(Locale.ROOT));
     }
 
     public static final class Deserializer implements JsonDeserializer<ReplayType> {
       @Override
-      public @NotNull ReplayType deserialize(@NotNull ObjectReader reader, @NotNull ILogger logger)
-          throws Exception {
+      public @NotNull ReplayType deserialize(
+          final @NotNull ObjectReader reader, final @NotNull ILogger logger) throws Exception {
         return ReplayType.valueOf(reader.nextString().toUpperCase(Locale.ROOT));
       }
     }
@@ -236,7 +236,7 @@ public static final class Deserializer implements JsonDeserializer<SentryReplayE
     public @NotNull SentryReplayEvent deserialize(
         final @NotNull ObjectReader reader, final @NotNull ILogger logger) throws Exception {
 
-      SentryBaseEvent.Deserializer baseEventDeserializer = new SentryBaseEvent.Deserializer();
+      final SentryBaseEvent.Deserializer baseEventDeserializer = new SentryBaseEvent.Deserializer();
 
       final SentryReplayEvent replay = new SentryReplayEvent();
 

sentry/src/main/java/io/sentry/rrweb/RRWebEvent.java

@@ -60,7 +60,9 @@ public static final class JsonKeys {
 
   public static final class Serializer {
     public void serialize(
-        @NotNull RRWebEvent baseEvent, @NotNull ObjectWriter writer, @NotNull ILogger logger)
+        final @NotNull RRWebEvent baseEvent,
+        final @NotNull ObjectWriter writer,
+        final @NotNull ILogger logger)
         throws IOException {
       writer.name(JsonKeys.TYPE).value(logger, baseEvent.type);
       writer.name(JsonKeys.TIMESTAMP).value(baseEvent.timestamp);
@@ -70,10 +72,10 @@ public void serialize(
   public static final class Deserializer {
     @SuppressWarnings("unchecked")
     public boolean deserializeValue(
-        @NotNull RRWebEvent baseEvent,
-        @NotNull String nextName,
-        @NotNull ObjectReader reader,
-        @NotNull ILogger logger)
+        final @NotNull RRWebEvent baseEvent,
+        final @NotNull String nextName,
+        final @NotNull ObjectReader reader,
+        final @NotNull ILogger logger)
         throws Exception {
       switch (nextName) {
         case JsonKeys.TYPE:

sentry/src/main/java/io/sentry/rrweb/RRWebEventType.java

@@ -18,14 +18,15 @@ public enum RRWebEventType implements JsonSerializable {
   Plugin;
 
   @Override
-  public void serialize(@NotNull ObjectWriter writer, @NotNull ILogger logger) throws IOException {
+  public void serialize(final @NotNull ObjectWriter writer, final @NotNull ILogger logger)
+      throws IOException {
     writer.value(ordinal());
   }
 
   public static final class Deserializer implements JsonDeserializer<RRWebEventType> {
     @Override
     public @NotNull RRWebEventType deserialize(
-        @NotNull ObjectReader reader, @NotNull ILogger logger) throws Exception {
+        final @NotNull ObjectReader reader, final @NotNull ILogger logger) throws Exception {
       return RRWebEventType.values()[reader.nextInt()];
     }
   }

sentry/src/main/java/io/sentry/rrweb/RRWebMetaEvent.java

@@ -127,11 +127,11 @@ public static final class Deserializer implements JsonDeserializer<RRWebMetaEven
     @SuppressWarnings("unchecked")
     @Override
     public @NotNull RRWebMetaEvent deserialize(
-        @NotNull ObjectReader reader, @NotNull ILogger logger) throws Exception {
+        final @NotNull ObjectReader reader, final @NotNull ILogger logger) throws Exception {
       reader.beginObject();
-      Map<String, Object> unknown = null;
-      RRWebMetaEvent event = new RRWebMetaEvent();
-      RRWebEvent.Deserializer baseEventDeserializer = new RRWebEvent.Deserializer();
+      @Nullable Map<String, Object> unknown = null;
+      final RRWebMetaEvent event = new RRWebMetaEvent();
+      final RRWebEvent.Deserializer baseEventDeserializer = new RRWebEvent.Deserializer();
 
       while (reader.peek() == JsonToken.NAME) {
         final String nextName = reader.nextName();
@@ -159,7 +159,7 @@ private void deserializeData(
         final @NotNull ObjectReader reader,
         final @NotNull ILogger logger)
         throws Exception {
-      Map<String, Object> unknown = null;
+      @Nullable Map<String, Object> unknown = null;
 
       reader.beginObject();
       while (reader.peek() == JsonToken.NAME) {

sentry/src/main/java/io/sentry/rrweb/RRWebVideoEvent.java

@@ -242,14 +242,15 @@ public static final class JsonKeys {
   }
 
   @Override
-  public void serialize(@NotNull ObjectWriter writer, @NotNull ILogger logger) throws IOException {
+  public void serialize(final @NotNull ObjectWriter writer, final @NotNull ILogger logger)
+      throws IOException {
     writer.beginObject();
     new RRWebEvent.Serializer().serialize(this, writer, logger);
     writer.name(JsonKeys.DATA);
     serializeData(writer, logger);
     if (unknown != null) {
-      for (String key : unknown.keySet()) {
-        Object value = unknown.get(key);
+      for (final String key : unknown.keySet()) {
+        final Object value = unknown.get(key);
         writer.name(key);
         writer.value(logger, value);
       }
@@ -289,8 +290,8 @@ private void serializePayload(final @NotNull ObjectWriter writer, final @NotNull
     writer.name(JsonKeys.LEFT).value(left);
     writer.name(JsonKeys.TOP).value(top);
     if (payloadUnknown != null) {
-      for (String key : payloadUnknown.keySet()) {
-        Object value = payloadUnknown.get(key);
+      for (final String key : payloadUnknown.keySet()) {
+        final Object value = payloadUnknown.get(key);
         writer.name(key);
         writer.value(logger, value);
       }
@@ -303,12 +304,12 @@ public static final class Deserializer implements JsonDeserializer<RRWebVideoEve
     @SuppressWarnings("unchecked")
     @Override
     public @NotNull RRWebVideoEvent deserialize(
-        @NotNull ObjectReader reader, @NotNull ILogger logger) throws Exception {
+        final @NotNull ObjectReader reader, final @NotNull ILogger logger) throws Exception {
       reader.beginObject();
-      Map<String, Object> unknown = null;
+      @Nullable Map<String, Object> unknown = null;
 
-      RRWebVideoEvent event = new RRWebVideoEvent();
-      RRWebEvent.Deserializer baseEventDeserializer = new RRWebEvent.Deserializer();
+      final RRWebVideoEvent event = new RRWebVideoEvent();
+      final RRWebEvent.Deserializer baseEventDeserializer = new RRWebEvent.Deserializer();
 
       while (reader.peek() == JsonToken.NAME) {
         final String nextName = reader.nextName();
@@ -336,7 +337,7 @@ private void deserializeData(
         final @NotNull ObjectReader reader,
         final @NotNull ILogger logger)
         throws Exception {
-      Map<String, Object> dataUnknown = null;
+      @Nullable Map<String, Object> dataUnknown = null;
 
       reader.beginObject();
       while (reader.peek() == JsonToken.NAME) {
@@ -365,7 +366,7 @@ private void deserializePayload(
         final @NotNull ObjectReader reader,
         final @NotNull ILogger logger)
         throws Exception {
-      Map<String, Object> payloadUnknown = null;
+      @Nullable Map<String, Object> payloadUnknown = null;
 
       reader.beginObject();
       while (reader.peek() == JsonToken.NAME) {