TMF: Change some constant names to comply with a naming convention

Change-Id: If742b4c47aa421991c53dac17d103f9b81c60f8b
Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net>
Reviewed-on: https://git.eclipse.org/r/37519
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Hudson CI

diff --git a/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/event/matching/TcpLttngEventMatching.java b/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/event/matching/TcpLttngEventMatching.java
index d628c22e25895e217005cbb3a21626c72221a2b7..3f47b102cef39320d8fbe415004ebc48458d00d7 100644 (file)
--- a/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/event/matching/TcpLttngEventMatching.java
+++ b/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/event/matching/TcpLttngEventMatching.java
@@ -41,9 +41,9 @@ import com.google.common.collect.ImmutableSet;
  */
 public class TcpLttngEventMatching implements ITmfNetworkMatchDefinition {
 
-    private static final String[] key_seq = { TcpEventStrings.TRANSPORT_FIELDS, TcpEventStrings.TYPE_TCP, TcpEventStrings.SEQ };
-    private static final String[] key_ackseq = { TcpEventStrings.TRANSPORT_FIELDS, TcpEventStrings.TYPE_TCP, TcpEventStrings.ACKSEQ };
-    private static final String[] key_flags = { TcpEventStrings.TRANSPORT_FIELDS, TcpEventStrings.TYPE_TCP, TcpEventStrings.FLAGS };
+    private static final String[] KEY_SEQ = { TcpEventStrings.TRANSPORT_FIELDS, TcpEventStrings.TYPE_TCP, TcpEventStrings.SEQ };
+    private static final String[] KEY_ACKSEQ = { TcpEventStrings.TRANSPORT_FIELDS, TcpEventStrings.TYPE_TCP, TcpEventStrings.ACKSEQ };
+    private static final String[] KEY_FLAGS = { TcpEventStrings.TRANSPORT_FIELDS, TcpEventStrings.TYPE_TCP, TcpEventStrings.FLAGS };
 
     private static final ImmutableSet<String> REQUIRED_EVENTS = ImmutableSet.of(
             TcpEventStrings.NET_DEV_QUEUE,
@@ -97,19 +97,19 @@ public class TcpLttngEventMatching implements ITmfNetworkMatchDefinition {
         ITmfEventField data;
 
         long seq = -1, ackseq = -1, flags = -1;
-        data = field.getSubField(key_seq);
+        data = field.getSubField(KEY_SEQ);
         if (data != null) {
             seq = (long) data.getValue();
         } else {
             return null;
         }
-        data = field.getSubField(key_ackseq);
+        data = field.getSubField(KEY_ACKSEQ);
         if (data != null) {
             ackseq = (long) data.getValue();
         } else {
             return null;
         }
-        data = field.getSubField(key_flags);
+        data = field.getSubField(KEY_FLAGS);
         if (data != null) {
             flags = (long) data.getValue();
         } else {

diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/matching/TcpEventKey.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/matching/TcpEventKey.java
index 1fd832903d491be575324bcb172bee3e7ca9c68e..a19364127bbf6cf6975173398f9968f4ae9e89cf 100644 (file)
--- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/matching/TcpEventKey.java
+++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/matching/TcpEventKey.java
@@ -34,7 +34,7 @@ import com.google.common.hash.Hashing;
 public class TcpEventKey implements IEventMatchingKey {
 
     @SuppressWarnings("null")
-    private static final @NonNull HashFunction hf = Hashing.goodFastHash(32);
+    private static final @NonNull HashFunction HF = Hashing.goodFastHash(32);
     private final long fSeq;
     private final long fAckseq;
     private final long fFlags;
@@ -58,7 +58,7 @@ public class TcpEventKey implements IEventMatchingKey {
 
     @Override
     public int hashCode() {
-        return hf.newHasher()
+        return HF.newHasher()
                 .putLong(fSeq)
                 .putLong(fAckseq)
                 .putLong(fFlags).hash().asInt();