collectd-java(5): Updated the documentation.

diff --git a/bindings/java/org/collectd/api/CollectdConfigInterface.java b/bindings/java/org/collectd/api/CollectdConfigInterface.java
index fae4aa5a5ffcc897fda7e82b2ee443b5e4305d91..87530729e642ab01a545405153909bfeb9016091 100644 (file)
--- a/bindings/java/org/collectd/api/CollectdConfigInterface.java
+++ b/bindings/java/org/collectd/api/CollectdConfigInterface.java
@@ -23,5 +23,5 @@ package org.collectd.api;
 
 public interface CollectdConfigInterface
 {
-       int Config (OConfigItem ci);
+       public int Config (OConfigItem ci);
 }

diff --git a/bindings/java/org/collectd/api/CollectdInitInterface.java b/bindings/java/org/collectd/api/CollectdInitInterface.java
index 46379fe81c14b67222c826532f239bbb53dabb61..09a2ab756257f451c7fa52840771bcd44dd2b849 100644 (file)
--- a/bindings/java/org/collectd/api/CollectdInitInterface.java
+++ b/bindings/java/org/collectd/api/CollectdInitInterface.java
@@ -23,5 +23,5 @@ package org.collectd.api;
 
 public interface CollectdInitInterface
 {
-       int Init ();
+       public int Init ();
 }

diff --git a/bindings/java/org/collectd/api/CollectdReadInterface.java b/bindings/java/org/collectd/api/CollectdReadInterface.java
index 6b3e1ad86bca657d3327aaec41a567a618f993a3..d5b924b24945dc93551c2c62446a56770ab95d31 100644 (file)
--- a/bindings/java/org/collectd/api/CollectdReadInterface.java
+++ b/bindings/java/org/collectd/api/CollectdReadInterface.java
@@ -23,5 +23,5 @@ package org.collectd.api;
 
 public interface CollectdReadInterface
 {
-       int Read ();
+       public int Read ();
 }

diff --git a/bindings/java/org/collectd/api/CollectdShutdownInterface.java b/bindings/java/org/collectd/api/CollectdShutdownInterface.java
index 909f849e8560b366e88c2a974bb7a4742698fa12..f0ccba0c8cd014a85b67c1fd39fea9a1fbdca76d 100644 (file)
--- a/bindings/java/org/collectd/api/CollectdShutdownInterface.java
+++ b/bindings/java/org/collectd/api/CollectdShutdownInterface.java
@@ -23,5 +23,5 @@ package org.collectd.api;
 
 public interface CollectdShutdownInterface
 {
-       int Shutdown ();
+       public int Shutdown ();
 }

diff --git a/src/collectd-java.pod b/src/collectd-java.pod
index b9e80a2bce092bfe002d258a68b466bf56e35958..97204bc44eb0e8d1e8c95e938ea3d08e93d01d70 100644 (file)
--- a/src/collectd-java.pod
+++ b/src/collectd-java.pod
@@ -35,7 +35,7 @@ please read L<collectd.conf(5)/Plugin C<java>>.
 When writing additions for collectd in Java, the underlying C base is mostly
 hidden from you. All complex data types are converted to their Java counterparts
 before they're passed to your functions. These Java classes reside in the
-I<org.collectd.api> and I<org.collectd.protocol> namespaces.
+I<org.collectd.api> namespace.
 
 The available classes are:
 
@@ -49,71 +49,39 @@ Corresponds to C<oconfig_value_t>, defined in F<src/liboconfig/oconfig.h>.
 
 Corresponds to C<oconfig_item_t>, defined in F<src/liboconfig/oconfig.h>.
 
-=item B<org.collectd.protocol.DataSource>
+=item B<org.collectd.api.DataSource>
 
 Corresponds to C<data_source_t>, defined in F<src/plugin.h>.
 
-=item B<java.util.ListE<lt>org.collectd.protocol.DataSourceE<gt>>
+=item B<org.collectd.api.DataSet>
 
 Corresponds to C<data_set_t>, defined in F<src/plugin.h>.
 
-=item B<org.collectd.protocol.ValueList>
+=item B<org.collectd.api.ValueList>
 
 Corresponds to C<value_list_t>, defined in F<src/plugin.h>.
 
 =back
 
+In the remainder of this document, we'll use the short form of these names, for
+example B<ValueList>. In order to be able to use these abbreviated names, you
+need to B<import> the classes.
+
 The API functions that are available from Java are implemented as I<static>
 functions of the B<org.collectd.api.CollectdAPI> class.
 See L<"CALLING API FUNCTIONS"> below for details.
 
-=head1 CREATING CALLBACKS
-
-Callback functions, i.E<nbsp>e. functions that are called by collectd, differ
-from their C equivalents in that they don't need to be "registered". Instead,
-they have a fixed name, argument list and return value, usually called
-I<"signature">.
-
-When starting up, the plugin will instantiate one object of your class, using
-the constructor without arguments. All other functions called by the Java
-plugin are methods of this object.
-
-Currently used callback methods are:
-
-=over 4
-
-=item Constructor ()
-
-Used to create an object of the custom class. The name of the constructor
-depends on your classes' name, of course. It must have the signature shown
-above, i.E<nbsp>e. an empty argument list, though.
-
-=item I<int> B<Config> (I<org.collectd.api.OConfigItem>)
-
-Configuration for the plugin. This is the first method that is called after the
-object has been created.
-
-=item I<int> B<Init> ()
-
-Initialization of the plugin. This item is called after B<Config> has been
-called.
-
-=item I<int> B<Read> ()
-
-Called when the plugin should acquire new values.
-
-=item I<int> B<Write> (I<org.collectd.protocol.ValueList>)
-
-Called to have the plugin store values.
-
-=item I<int> B<Shutdown> ()
+=head1 REGISTERING CALLBACKS
 
-Called when the daemon is shutting down.
+When starting up, collectd creates an object of each configured class. The
+constructor of this class should then register "callbacks" with the daemon,
+using the appropriate static functions in B<CollectdAPI>,
+see L<"CALLING API FUNCTIONS"> below. To register a callback, the object being
+passed to one of the register functions must implement an appropriate
+interface, which are all in the B<org.collectd.api> namespace.
 
-=back
-
-A plugin may implement any number of these callbacks, from all to none. An
-object without callback methods is never called by collectd, but may still
+A constructor may register any number of these callbacks, even none. An object
+without callback methods is never actively called by collectd, but may still
 call the exported API functions. One could, for example, start a new thread in
 the constructor and dispatch (submit to the daemon) values asynchronously,
 whenever one is available.
@@ -122,7 +90,9 @@ Each callback method is now explained in more detail:
 
 =head2 Config callback
 
-Signature: I<int> B<Config> (I<org.collectd.api.OConfigItem>)
+Interface: B<org.collectd.api.CollectdConfigInterface>
+
+Signature: I<int> B<Config> (I<OConfigItem>)
 
 This method is passed a B<OConfigItem> object, if both, method and
 configuration, are available. B<OConfigItem> is the root of a tree representing
@@ -135,6 +105,8 @@ considered an error condition and the plugin will be disabled entirely.
 
 =head2 Init callback
 
+Interface: B<org.collectd.api.CollectdInitInterface>
+
 Signature: I<int> B<Init> ()
 
 This method is called after the configuration has been handled. It is
@@ -146,6 +118,8 @@ considered an error condition and the plugin will be disabled entirely.
 
 =head2 Read callback
 
+Interface: B<org.collectd.api.CollectdReadInterface>
+
 Signature: I<int> B<Read> ()
 
 This method is called periodically and is supposed to gather statistics in
@@ -161,7 +135,9 @@ Java "read"-methods are not suspended for increasing intervals like C
 
 =head2 Write callback
 
-Signature: I<int> B<Write> (I<org.collectd.protocol.ValueList>)
+Interface: B<org.collectd.api.CollectdWriteInterface>
+
+Signature: I<int> B<Write> (I<ValueList>)
 
 This method is called whenever a value is dispatched to the daemon. The
 corresponding C "write"-functions are passed a C<data_set_t>, so they can
@@ -174,6 +150,8 @@ considered an error condition and cause an appropriate message to be logged.
 
 =head2 Shutdown callback
 
+Interface: B<org.collectd.api.CollectdShutdownInterface>
+
 Signature: I<int> B<Shutdown> ()
 
 This method is called when the daemon is shutting down. You should not rely on
@@ -182,6 +160,33 @@ the destructor to clean up behind the object but use this function instead.
 To signal success, this method has to return zero. Anything else will be
 considered an error condition and cause an appropriate message to be logged.
 
+=head2 Example
+
+This short example demonstrates how to register a read callback with the
+daemon:
+
+  import org.collectd.api.CollectdAPI;
+  import org.collectd.api.ValueList;
+  
+  import org.collectd.api.CollectdReadInterface;
+  
+  public class Foobar implements CollectdReadInterface
+  {
+    public Foobar ()
+    {
+      CollectdAPI.RegisterRead ("Foobar", this);
+    }
+    
+    public int Read ()
+    {
+      ValueList vl;
+      
+      /* Do something... */
+      
+      CollectdAPI.DispatchValues (vl);
+    }
+  }
+
 =head1 CALLING API FUNCTIONS
 
 All collectd API functions that are available to Java plugins are implemented
@@ -190,19 +195,31 @@ class. This makes calling these functions pretty straight forward.
 
 The currently exported functions are:
 
-=over 4
+=head2 RegisterRead
 
-=item I<int> B<DispatchValues> (I<org.collectd.protocol.ValueList>)
+Signature: I<int> B<RegisterRead> (I<String> name,
+I<CollectdReadInterface> object)
 
-Corresponds to C<plugin_dispatch_values>, defined in F<src/plugin.h>.
+Registers the B<Read> function of I<object> with the daemon.
+For a description of the B<CollectdReadInterface> interface, see
+L<"REGISTERING CALLBACKS"> above.
 
-=back
+Returns zero upon success and non-zero when an error occurred.
+
+=head2 RegisterWrite
+
+Signature: I<int> B<RegisterWrite> (I<String> name,
+I<CollectdWriteInterface> object)
 
-Each API function is now explained in more detail:
+Registers the B<Write> function of I<object> with the daemon.
+For a description of the B<CollectdWriteInterface> interface, see
+L<"REGISTERING CALLBACKS"> above.
+
+Returns zero upon success and non-zero when an error occurred.
 
 =head2 DispatchValues
 
-Signature: I<int> B<DispatchValues> (I<org.collectd.protocol.ValueList>)
+Signature: I<int> B<DispatchValues> (I<ValueList>)
 
 Passes the values represented by the B<ValueList> object to the
 C<plugin_dispatch_values> function of the daemon. The "data set" (or list of
@@ -212,6 +229,12 @@ is therefore absolutely okay to leave this blank.
 
 Returns zero upon success or non-zero upon failure.
 
+=head2 GetDS
+
+Signature: I<DataSet> B<GetDS> (I<String>)
+
+Returns the approrpate I<type> or B<null> if the type is not defined.
+
 =head1 SEE ALSO
 
 L<collectd(1)>,