Use the NonNull utility methods where we can

[deliverable/tracecompass.git] / org.eclipse.tracecompass.pcap.core / src / org / eclipse / tracecompass / internal / pcap / core / protocol / unknown / UnknownPacket.java

diff --git a/org.eclipse.tracecompass.pcap.core/src/org/eclipse/tracecompass/internal/pcap/core/protocol/unknown/UnknownPacket.java b/org.eclipse.tracecompass.pcap.core/src/org/eclipse/tracecompass/internal/pcap/core/protocol/unknown/UnknownPacket.java
index d6a38756fdc5f6c85c2ebadf20c0a64ad5580a12..645484f46845cfa9b601f80d9ed2dbca5134cbf4 100644 (file)
--- a/org.eclipse.tracecompass.pcap.core/src/org/eclipse/tracecompass/internal/pcap/core/protocol/unknown/UnknownPacket.java
+++ b/org.eclipse.tracecompass.pcap.core/src/org/eclipse/tracecompass/internal/pcap/core/protocol/unknown/UnknownPacket.java
@@ -12,11 +12,12 @@
 
 package org.eclipse.tracecompass.internal.pcap.core.protocol.unknown;
 
+import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
+
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.util.Map;
 
-import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.internal.pcap.core.packet.Packet;
 import org.eclipse.tracecompass.internal.pcap.core.protocol.PcapProtocol;
@@ -42,7 +43,7 @@ public class UnknownPacket extends Packet {
     private @Nullable UnknownEndpoint fSourceEndpoint;
     private @Nullable UnknownEndpoint fDestinationEndpoint;
 
-    private @Nullable ImmutableMap<String, String> fFields;
+    private @Nullable Map<String, String> fFields;
 
     /**
      * Constructor of an Unknown Packet object.
@@ -87,8 +88,7 @@ public class UnknownPacket extends Packet {
 
     @Override
     public String toString() {
-        @SuppressWarnings("null")
-        @NonNull byte[] array = fPayload.array();
+        byte[] array = checkNotNull(fPayload.array());
         String string = "Payload: " + ConversionHelper.bytesToHex(array, true); //$NON-NLS-1$
         final Packet child = fChildPacket;
         if (child != null) {
@@ -127,10 +127,9 @@ public class UnknownPacket extends Packet {
 
     @Override
     public Map<String, String> getFields() {
-        ImmutableMap<String, String> map = fFields;
+        Map<String, String> map = fFields;
         if (map == null) {
-            @SuppressWarnings("null")
-            @NonNull byte[] array = fPayload.array();
+            byte[] array = checkNotNull(fPayload.array());
 
             Builder<String, String> builder = ImmutableMap.<String, String> builder()
                     .put("Binary", ConversionHelper.bytesToHex(array, true)); //$NON-NLS-1$
@@ -140,10 +139,8 @@ public class UnknownPacket extends Packet {
             } catch (UnsupportedEncodingException e) {
                 // Do nothing. The string won't be added to the map anyway.
             }
-            @SuppressWarnings("null")
-            @NonNull ImmutableMap<String, String> newMap = builder.build();
-            fFields = newMap;
-            return newMap;
+            fFields = checkNotNull(builder.build());
+            return fFields;
         }
         return map;
     }