- use java naming conventions (no underscores in non-capitalized identifiers) consistently

7 files changed, 29 insertions, 29 deletions

diff --git a/src/main/java/org/gnunet/dht/ClientGetStopMessage.java b/src/main/java/org/gnunet/dht/ClientGetStopMessage.java
index 4cdee12..39915de 100644
--- a/src/main/java/org/gnunet/dht/ClientGetStopMessage.java
+++ b/src/main/java/org/gnunet/dht/ClientGetStopMessage.java
@@ -39,7 +39,7 @@ public class ClientGetStopMessage implements GnunetMessage.Body {
     @UInt32
     public int reserved = 0;
     @UInt64
-    public long unique_id;
+    public long uniqueId;
     @NestedMessage
     public HashCode key;
 }
diff --git a/src/main/java/org/gnunet/dht/DistributedHashTable.java b/src/main/java/org/gnunet/dht/DistributedHashTable.java
index 0a561bf..10ac00e 100644
--- a/src/main/java/org/gnunet/dht/DistributedHashTable.java
+++ b/src/main/java/org/gnunet/dht/DistributedHashTable.java
@@ -122,7 +122,7 @@ public class DistributedHashTable {
         public Envelope assembleRequest() {
             MonitorStartStop mss = new MonitorStartStop();
             if (key != null) {
-                mss.filter_key = 1;
+                mss.filterKey = 1;
                 mss.key = key;
             } else {
                 mss.key = new HashCode();
@@ -177,14 +177,14 @@ public class DistributedHashTable {
 
         public void visit(MonitorGetMessage monitorGetMessage) {
             for (MonitorRequest monitorRequest : monitorRequests.iter()) {
-                boolean type_ok = (monitorGetMessage.type == BlockType.ANY.val)
+                boolean typeOk = (monitorGetMessage.type == BlockType.ANY.val)
                         || (monitorGetMessage.type == monitorRequest.blockType);
-                boolean key_ok = monitorGetMessage.key.isAllZero()
+                boolean keyOk = monitorGetMessage.key.isAllZero()
                         || monitorGetMessage.key.equals(monitorRequest.key);
 
-                if (key_ok && type_ok && monitorRequest.getHandler != null) {
+                if (keyOk && typeOk && monitorRequest.getHandler != null) {
                     monitorRequest.getHandler.onGet(monitorGetMessage.options, monitorGetMessage.type,
-                            monitorGetMessage.hop_count, monitorGetMessage.desired_replication_level, monitorGetMessage.getPath,
+                            monitorGetMessage.hopCount, monitorGetMessage.desiredReplicationLevel, monitorGetMessage.getPath,
                             monitorGetMessage.key);
                 }
             }
@@ -192,12 +192,12 @@ public class DistributedHashTable {
 
         public void visit(MonitorGetRespMessage monitorGetRespMessage) {
             for (MonitorRequest monitorRequest : monitorRequests.iter()) {
-                boolean type_ok = (monitorGetRespMessage.type == BlockType.ANY.val)
+                boolean typeOk = (monitorGetRespMessage.type == BlockType.ANY.val)
                         || (monitorGetRespMessage.type == monitorRequest.blockType);
-                boolean key_ok = monitorGetRespMessage.key.isAllZero()
+                boolean keyOk = monitorGetRespMessage.key.isAllZero()
                         || monitorGetRespMessage.key.equals(monitorRequest.key);
 
-                if (key_ok && type_ok && monitorRequest.getResponseHandler != null) {
+                if (keyOk && typeOk && monitorRequest.getResponseHandler != null) {
                     monitorRequest.getResponseHandler.onGetResponse(
                             monitorGetRespMessage.type,
                             monitorGetRespMessage.getPath,
@@ -212,14 +212,14 @@ public class DistributedHashTable {
 
         public void visit(MonitorPutMessage monitorPutMessage) {
             for (MonitorRequest monitorRequest : monitorRequests.iter()) {
-                boolean type_ok = (monitorPutMessage.type == BlockType.ANY.val)
+                boolean typeOk = (monitorPutMessage.type == BlockType.ANY.val)
                         || (monitorPutMessage.type == monitorRequest.blockType);
-                boolean key_ok = monitorPutMessage.key.isAllZero()
+                boolean keyOk = monitorPutMessage.key.isAllZero()
                         || monitorPutMessage.key.equals(monitorRequest.key);
 
-                if (key_ok && type_ok && monitorRequest.putHandler != null) {
+                if (keyOk && typeOk && monitorRequest.putHandler != null) {
                     monitorRequest.putHandler.onPut(monitorPutMessage.options, monitorPutMessage.type,
-                            monitorPutMessage.hop_count, monitorPutMessage.expirationTime,
+                            monitorPutMessage.hopCount, monitorPutMessage.expirationTime,
                             monitorPutMessage.putPath, monitorPutMessage.key, monitorPutMessage.data);
                 }
             }
@@ -402,8 +402,8 @@ public class DistributedHashTable {
                     dht.startMonitor(BlockType.TEST.val, null,
                             new MonitorGetHandler() {
                                 @Override
-                                public void onGet(int options, int type, int hop_count,
-                                                  int desired_replication_level, PeerIdentity[] getPath, HashCode key) {
+                                public void onGet(int options, int type, int hopCount,
+                                                  int desiredReplicationLevel, PeerIdentity[] getPath, HashCode key) {
                                     System.out.println("get monitored");
                                 }
                             },
diff --git a/src/main/java/org/gnunet/dht/MonitorGetHandler.java b/src/main/java/org/gnunet/dht/MonitorGetHandler.java
index c7dad7c..d3f5d5f 100644
--- a/src/main/java/org/gnunet/dht/MonitorGetHandler.java
+++ b/src/main/java/org/gnunet/dht/MonitorGetHandler.java
@@ -25,6 +25,6 @@ import org.gnunet.util.PeerIdentity;
 
 
 public interface MonitorGetHandler {
-    void onGet(int options, int type, int hop_count, int desired_replication_level, PeerIdentity[] getPath,
+    void onGet(int options, int type, int hopCount, int desiredReplicationLevel, PeerIdentity[] getPath,
                HashCode key);
 }
diff --git a/src/main/java/org/gnunet/dht/MonitorGetMessage.java b/src/main/java/org/gnunet/dht/MonitorGetMessage.java
index e96ec96..a3e6297 100644
--- a/src/main/java/org/gnunet/dht/MonitorGetMessage.java
+++ b/src/main/java/org/gnunet/dht/MonitorGetMessage.java
@@ -49,20 +49,20 @@ public class MonitorGetMessage implements GnunetMessage.Body {
      * Hop count
      */
     @UInt32
-    public int hop_count;
+    public int hopCount;
 
     /**
      * Replication level for this message
      */
     @UInt32
-    public int desired_replication_level;
+    public int desiredReplicationLevel;
 
     /**
      * Number of peers recorded in the outgoing path from source to the
      * storage location of this message.
      */
     @UInt32
-    public int get_path_length;
+    public int getPathLength;
 
     /**
      * The key to store the value under.
@@ -70,6 +70,6 @@ public class MonitorGetMessage implements GnunetMessage.Body {
     @NestedMessage
     public HashCode key;
 
-    @VariableSizeArray(lengthField = "get_path_length")
+    @VariableSizeArray(lengthField = "getPathLength")
     public PeerIdentity[] getPath;
 }
diff --git a/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java b/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java
index 3bf145b..6a25440 100644
--- a/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java
+++ b/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java
@@ -41,13 +41,13 @@ public class MonitorGetRespMessage implements GnunetMessage.Body {
      * Length of the PUT path that follows (if tracked).
      */
     @UInt32
-    int put_path_length;
+    int putPathLength;
 
     /**
      * Length of the GET path that follows (if tracked).
      */
     @UInt32
-    int get_path_length;
+    int getPathLength;
 
     /**
      * When does the content expire?
@@ -61,10 +61,10 @@ public class MonitorGetRespMessage implements GnunetMessage.Body {
     @NestedMessage
     public HashCode key;
 
-    @VariableSizeArray(lengthField = "put_path_length")
+    @VariableSizeArray(lengthField = "putPathLength")
     public PeerIdentity[] putPath;
 
-    @VariableSizeArray(lengthField = "get_path_length")
+    @VariableSizeArray(lengthField = "getPathLength")
     public PeerIdentity[] getPath;
 
     @FillWith @UInt8
diff --git a/src/main/java/org/gnunet/dht/MonitorPutMessage.java b/src/main/java/org/gnunet/dht/MonitorPutMessage.java
index 103c05b..cf6b1fd 100644
--- a/src/main/java/org/gnunet/dht/MonitorPutMessage.java
+++ b/src/main/java/org/gnunet/dht/MonitorPutMessage.java
@@ -47,20 +47,20 @@ public class MonitorPutMessage implements GnunetMessage.Body {
      * Hop count so far.
      */
     @UInt32
-    public int hop_count;
+    public int hopCount;
 
     /**
      * Replication level for this message
      */
     @UInt32
-    public int desired_replication_level;
+    public int desiredReplicationLevel;
 
     /**
      * Number of peers recorded in the outgoing path from source to the
      * storage location of this message.
      */
     @UInt32
-    public int put_path_length;
+    public int putPathLength;
 
     /**
      * How long should this data persist?
@@ -74,7 +74,7 @@ public class MonitorPutMessage implements GnunetMessage.Body {
     @NestedMessage
     public HashCode key;
 
-    @VariableSizeArray(lengthField = "put_path_length")
+    @VariableSizeArray(lengthField = "putPathLength")
     public PeerIdentity[] putPath;
 
     @FillWith @UInt8
diff --git a/src/main/java/org/gnunet/dht/MonitorStartStop.java b/src/main/java/org/gnunet/dht/MonitorStartStop.java
index b3f3268..b79ec3e 100644
--- a/src/main/java/org/gnunet/dht/MonitorStartStop.java
+++ b/src/main/java/org/gnunet/dht/MonitorStartStop.java
@@ -60,7 +60,7 @@ public class MonitorStartStop implements GnunetMessage.Body {
      * Flag whether to use the provided key to filter messages.
      */
     @UInt16
-    public int filter_key;
+    public int filterKey;
 
     /*
     The key to filter messages by.