[GNUnet-SVN] r21374 - in gnunet-java/src/org/gnunet: construct dht statistics util

[gnunet]

Author: dold
Date: 2012-05-09 13:44:27 +0200 (Wed, 09 May 2012)
New Revision: 21374

Added:
   gnunet-java/src/org/gnunet/util/Continuation.java
   gnunet-java/src/org/gnunet/util/TESTMessage.java
Modified:
   gnunet-java/src/org/gnunet/construct/MsgMap.txt
   gnunet-java/src/org/gnunet/dht/DistributedHashTable.java
   gnunet-java/src/org/gnunet/statistics/Statistics.java
Log:
refactoring

Modified: gnunet-java/src/org/gnunet/construct/MsgMap.txt
===================================================================
--- gnunet-java/src/org/gnunet/construct/MsgMap.txt     2012-05-09 11:35:34 UTC 
(rev 21373)
+++ gnunet-java/src/org/gnunet/construct/MsgMap.txt     2012-05-09 11:44:27 UTC 
(rev 21374)
@@ -3,6 +3,7 @@
 org.gnunet.util.Resolver$Address|0=org.gnunet.util.Resolver$TextualAddress
 org.gnunet.util.Resolver$Address|1=org.gnunet.util.Resolver$NumericAddress
 
org.gnunet.util.GnunetMessage$Body|68=org.gnunet.core.Core$DisconnectNotifyMessage
+org.gnunet.util.GnunetMessage$Body|1=org.gnunet.statistics.Statistics$TESTMessage
 
org.gnunet.util.GnunetMessage$Body|70=org.gnunet.core.Core$NotifyInboundTrafficMessage
 
org.gnunet.util.GnunetMessage$Body|71=org.gnunet.core.Core$NotifyOutboundTrafficMessage
 org.gnunet.util.GnunetMessage$Body|4=org.gnunet.util.Resolver$GetMessage
@@ -24,8 +25,10 @@
 org.gnunet.util.GnunetMessage$Body|149=org.gnunet.dht.MonitorGetMessage
 org.gnunet.util.GnunetMessage$Body|150=org.gnunet.dht.MonitorGetRespMessage
 org.gnunet.util.GnunetMessage$Body|151=org.gnunet.dht.MonitorPutMessage
-org.gnunet.util.GnunetMessage$Body|171=org.gnunet.statistics.ResponseEndMessage
-org.gnunet.util.GnunetMessage$Body|170=org.gnunet.statistics.ResponseValueMessage
-org.gnunet.util.GnunetMessage$Body|169=org.gnunet.statistics.RequestMessage
+org.gnunet.util.GnunetMessage$Body|171=org.gnunet.statistics.GetResponseEndMessage
+org.gnunet.util.GnunetMessage$Body|170=org.gnunet.statistics.GetResponseMessage
+org.gnunet.util.GnunetMessage$Body|169=org.gnunet.statistics.GetMessage
 org.gnunet.util.GnunetMessage$Body|168=org.gnunet.statistics.SetMessage
-# generated 2012/05/02 20:26:30
+org.gnunet.util.GnunetMessage$Body|173=org.gnunet.statistics.WatchResponseMessage
+org.gnunet.util.GnunetMessage$Body|172=org.gnunet.statistics.WatchMessage
+# generated 2012/05/09 02:24:00

Modified: gnunet-java/src/org/gnunet/dht/DistributedHashTable.java
===================================================================
--- gnunet-java/src/org/gnunet/dht/DistributedHashTable.java    2012-05-09 
11:35:34 UTC (rev 21373)
+++ gnunet-java/src/org/gnunet/dht/DistributedHashTable.java    2012-05-09 
11:44:27 UTC (rev 21374)
@@ -24,6 +24,8 @@
 
     private Configuration cfg;
 
+    private RequestQueue requestQueue;
+
     /**
      * Callback object for requests to the dht
      */
@@ -43,13 +45,6 @@
                                  BlockType type, byte[] data);
     }
 
-    public interface Continuation {
-        public void onSuccess();
-
-        public void onError();
-    }
-
-
     private Client client;
     private long uid = 1;
 
@@ -65,7 +60,7 @@
 
 
     /**
-     * Put data into the dht.
+     * Put data into the dht. Put request cannot be queued.
      *
      * @param key              key key to store the data under
      * @param data             data data to store
@@ -77,14 +72,14 @@
      * @param cont             called after the put operation failed or 
succeeded
      */
     public void put(HashCode key, byte[] data, int replicationLevel, 
Set<RouteOption> routeOptions,
-                    BlockType type, AbsoluteTime expiration,
+                    int type, AbsoluteTime expiration,
                     RelativeTime timeout, final Continuation cont) {
         final ClientPutMessage cpm = new ClientPutMessage();
         cpm.data = data;
         cpm.hash = key;
         cpm.desiredReplicationLevel = replicationLevel;
         cpm.expiration = expiration.asMessage();
-        cpm.type = type.val;
+        cpm.type = type;
 
         client.notifyTransmitReady(timeout, true,
                 0, new MessageTransmitter() {
@@ -92,17 +87,16 @@
             public void transmit(Connection.MessageSink sink) {
                 sink.send(cpm);
                 // is there no way to get an ack from the dht service?
-                cont.onSuccess();
+                cont.cont(true);
             }
 
             @Override
             public void handleError() {
-                cont.onError();
+                cont.cont(false);
             }
         });
     }
 
-
     private class GetRequest implements Cancelable {
         public long uid;
         public HashCode key;
@@ -336,17 +330,16 @@
                     final DistributedHashTable dht = new 
DistributedHashTable(cfg);
 
                     dht.put(new HashCode(key), data.getBytes(), replication, 
EnumSet.of(RouteOption.NONE),
-                            BlockType.TEST, 
AbsoluteTime.now().add(RelativeTime.HOUR),
+                            BlockType.TEST.val, 
AbsoluteTime.now().add(RelativeTime.HOUR),
                             RelativeTime.SECOND, new Continuation() {
                         @Override
-                        public void onSuccess() {
-                            System.out.println("put request sent");
+                        public void cont(boolean success) {
+                            if (success) {
+                                System.out.println("put request sent");
+                            } else {
+                                System.out.println("error");
+                            }
                         }
-
-                        @Override
-                        public void onError() {
-                            System.out.println("error");
-                        }
                     });
                 } else {
                     if (data != null) {

Modified: gnunet-java/src/org/gnunet/statistics/Statistics.java
===================================================================
--- gnunet-java/src/org/gnunet/statistics/Statistics.java       2012-05-09 
11:35:34 UTC (rev 21373)
+++ gnunet-java/src/org/gnunet/statistics/Statistics.java       2012-05-09 
11:44:27 UTC (rev 21374)
@@ -6,7 +6,6 @@
 
 package org.gnunet.statistics;
 
-import org.gnunet.construct.UnionCase;
 import org.gnunet.util.*;
 import org.gnunet.util.getopt.Option;
 import org.gnunet.util.getopt.OptionAction;
@@ -53,10 +52,6 @@
         public void onReceive(String subsystem, String name, long value);
     }
 
-    public interface Continuation {
-        public void cont(boolean success);
-    }
-
     /**
      * A request to the statistics service.
      */
@@ -375,11 +370,6 @@
     }
 
 
-    @UnionCase(1)
-    public static class TESTMessage implements GnunetMessage.Body {
-        // empty
-    }
-
     private class TESTRequest extends RequestQueue.Request {
         public boolean onDestroy() {
             // keep on destroy

Added: gnunet-java/src/org/gnunet/util/Continuation.java
===================================================================
--- gnunet-java/src/org/gnunet/util/Continuation.java                           
(rev 0)
+++ gnunet-java/src/org/gnunet/util/Continuation.java   2012-05-09 11:44:27 UTC 
(rev 21374)
@@ -0,0 +1,5 @@
+package org.gnunet.util;
+
+public interface Continuation {
+    public void cont(boolean success);
+}

Added: gnunet-java/src/org/gnunet/util/TESTMessage.java
===================================================================
--- gnunet-java/src/org/gnunet/util/TESTMessage.java                            
(rev 0)
+++ gnunet-java/src/org/gnunet/util/TESTMessage.java    2012-05-09 11:44:27 UTC 
(rev 21374)
@@ -0,0 +1,11 @@
+package org.gnunet.util;
+
+import org.gnunet.construct.UnionCase;
+
+/**
+ * Sent back when a client sends this message to a service.
+ */
address@hidden(1)
+public class TESTMessage implements GnunetMessage.Body {
+    // empty
+}