ICE-4794 - add overloads for optional Java mapping

1 files changed, 174 insertions, 171 deletions

diff --git a/java/demo/Ice/optional/Client.java b/java/demo/Ice/optional/Client.java
index 45e88587709..028de2a5f5d 100644
--- a/java/demo/Ice/optional/Client.java
+++ b/java/demo/Ice/optional/Client.java
@@ -8,6 +8,7 @@
 // **********************************************************************
 
 import Demo.*;
+import Ice.Optional;
 
 public class Client extends Ice.Application
 {
@@ -36,197 +37,199 @@ public class Client extends Ice.Application
             return 1;
         }
 
-	ContactDBPrx contactdb = ContactDBPrxHelper.checkedCast(communicator().propertyToProxy("ContactDB.Proxy"));
-	if(contactdb == null)
-	{
-	    System.err.println(appName() + ": invalid proxy");
-	    return 1;
-	}
+        ContactDBPrx contactdb = ContactDBPrxHelper.checkedCast(communicator().propertyToProxy("ContactDB.Proxy"));
+        if(contactdb == null)
+        {
+            System.err.println(appName() + ": invalid proxy");
+            return 1;
+        }
 
-	//
-	// Add a contact for "john". All parameters are provided.
-	//
-	String johnNumber = "123-456-7890";
-	contactdb.addContact("john", new Ice.Optional<NumberType>(NumberType.HOME),
-	    new Ice.Optional<String>(johnNumber), new Ice.IntOptional(0));
+        //
+        // Add a contact for "john". In this case since all parameters are provided it isn't
+	// necessary to construct an Optional.
+        //
+        String johnNumber = "123-456-7890";
+        contactdb.addContact("john", NumberType.HOME, johnNumber, 0);
+
+        System.out.print("Checking john... ");
+
+        //
+        // Find the phone number for "john". Note the use of the Ice.Optional
+        // for non-generic types.
+        //
+        Ice.Optional<String> number = contactdb.queryNumber("john");
+
+        //
+        // isSet() tests if an optional value is set.
+        //
+        if(!number.isSet())
+        {
+            System.out.print("number is incorrect ");
+        }
 
-	System.out.print("Checking john... ");
+        //
+        // Call get() to retrieve the optional value.
+        //
+        if(!number.get().equals(johnNumber))
+        {
+            System.out.print("number is incorrect ");
+        }
 
-	//
-	// Find the phone number for "john". Note the use of the Ice.Optional
-	// for non-generic types.
-	//
-	Ice.Optional<String> number = contactdb.queryNumber("john");
+        // Optional can also be used in an out parameter. Note that
+        // primitive types don't use Ice.Optional.
+        Ice.IntOptional dialgroup = new Ice.IntOptional();
+        contactdb.queryDialgroup("john", dialgroup);
+        if(!dialgroup.isSet() || dialgroup.get() != 0)
+        {
+            System.out.print("dialgroup is incorrect ");
+        }
 
-	//
-	// isSet() tests if an optional value is set.
-	//
-	if(!number.isSet())
-	{
-	    System.out.print("number is incorrect ");
-	}
+        Contact info = contactdb.query("john");
 
-	//
-	// Call get() to retrieve the optional value.
-	//
-	if(!number.get().equals(johnNumber))
-	{
-	    System.out.print("number is incorrect ");
-	}
-
-	// Optional can also be used in an out parameter. Note that
-	// primitive types don't use Ice.Optional.
-	Ice.IntOptional dialgroup = new Ice.IntOptional();
-	contactdb.queryDialgroup("john", dialgroup);
-	if(!dialgroup.isSet() || dialgroup.get() != 0)
-	{
-	    System.out.print("dialgroup is incorrect ");
-	}
-
-	Contact info = contactdb.query("john");
+        //
+        // All of the info parameters should be set. On a class call
+        // has<name> to find out whether the value is set.
+        //
+        if(!info.hasType() || !info.hasNumber() || !info.hasDialGroup())
+        {
+            System.out.print("info is incorrect ");
+        }
+        // Call get<name> to retrieve the value.
+        if(info.getType() != NumberType.HOME || !info.getNumber().equals(johnNumber) || info.getDialGroup() != 0)
+        {
+            System.out.print("info is incorrect ");
+        }
+        System.out.println("ok");
+
+        //
+        // Add a contact for "steve". Here we have to construct Optional parameters
+	// since we are not passing the NumberType parameter.
+	//
+	// The behavior of the server is to default construct the
+	// Contact, and then assign  all set parameters.  Since the
+	// default value of NumberType in the slice definition is
+	// NumberType.HOME and in this case the NumberType is unset
+	// it will take the default value.
+        //
+        // The java mapping permits null to be passed to unset optional values.
+        //
+        String steveNumber = "234-567-8901";
+        contactdb.addContact("steve", null, Optional.O(steveNumber), Optional.O(1));
+
+        System.out.print("Checking steve... ");
+        number = contactdb.queryNumber("steve");
+        if(!number.get().equals(steveNumber))
+        {
+            System.out.print("number is incorrect ");
+        }
 
-	//
-	// All of the info parameters should be set. On a class call
-	// has<name> to find out whether the value is set.
-	//
-	if(!info.hasType() || !info.hasNumber() || !info.hasDialGroup())
-	{
-	    System.out.print("info is incorrect ");
-	}
-	// Call get<name> to retrieve the value.
-	if(info.getType() != NumberType.HOME || !info.getNumber().equals(johnNumber) || info.getDialGroup() != 0)
-	{
-	    System.out.print("info is incorrect ");
-	}
-	System.out.println("ok");
+        info = contactdb.query("steve");
+        //
+        // Check the value for the NumberType.
+        //
+        if(!info.hasType() || info.getType() != NumberType.HOME)
+        {
+            System.out.print("info is incorrect ");
+        }
 
-	//
-	// Add a contact for "steve". The behavior of the server is to
-	// default construct the Contact, and then assign  all set parameters.
-	// Since the default value of NumberType in the slice definition
-	// is NumberType.HOME and in this case the NumberType is unset it will take
-	// the default value.
-	//
-	// The java mapping permits null to be passed to unset optional values.
-	//
-	String steveNumber = "234-567-8901";
-	contactdb.addContact("steve", null, new Ice.Optional<String>(steveNumber), new Ice.IntOptional(1));
+        if(!info.getNumber().equals(steveNumber) || info.getDialGroup() != 1)
+        {
+            System.out.print("info is incorrect ");
+        }
 
-	System.out.print("Checking steve... ");
-	number = contactdb.queryNumber("steve");
-	if(!number.get().equals(steveNumber))
-	{
-	    System.out.print("number is incorrect ");
-	}
+        contactdb.queryDialgroup("steve", dialgroup);
+        if(!dialgroup.isSet() || dialgroup.get() != 1)
+        {
+            System.out.print("dialgroup is incorrect ");
+        }
 
-	info = contactdb.query("steve");
-	//
-	// Check the value for the NumberType.
-	//
-	if(!info.hasType() || info.getType() != NumberType.HOME)
-	{
-	    System.out.print("info is incorrect ");
-	}
+        System.out.println("ok");
 
-	if(!info.getNumber().equals(steveNumber) || info.getDialGroup() != 1)
-	{
-	    System.out.print("info is incorrect ");
-	}
+        //
+        // Add a contact from "frank". Here the dialGroup field isn't set.
+        //
+        String frankNumber = "345-678-9012";
+        contactdb.addContact("frank", Optional.O(NumberType.CELL), Optional.O(frankNumber), null);
 
-	contactdb.queryDialgroup("steve", dialgroup);
-	if(!dialgroup.isSet() || dialgroup.get() != 1)
-	{
-	    System.out.print("dialgroup is incorrect ");
-	}
+        System.out.print("Checking frank... ");
 
-	System.out.println("ok");
+        number = contactdb.queryNumber("frank");
+        if(!number.get().equals(frankNumber))
+        {
+            System.out.print("number is incorrect ");
+        }
 
-	//
-	// Add a contact from "frank". Here the dialGroup field isn't set.
-	//
-	String frankNumber = "345-678-9012";
-	contactdb.addContact("frank", new Ice.Optional<NumberType>(NumberType.CELL),
-		new Ice.Optional<String>(frankNumber), null);
+        info = contactdb.query("frank");
+        //
+        // The dial group field should be unset.
+        //
+        if(info.hasDialGroup())
+        {
+            System.out.print("info is incorrect ");
+        }
+        if(info.getType() != NumberType.CELL || !info.getNumber().equals(frankNumber))
+        {
+            System.out.print("info is incorrect ");
+        }
 
-	System.out.print("Checking frank... ");
+        contactdb.queryDialgroup("frank", dialgroup);
+        if(dialgroup.isSet())
+        {
+            System.out.print("dialgroup is incorrect ");
+        }
+        System.out.println("ok");
 
-	number = contactdb.queryNumber("frank");
-	if(!number.get().equals(frankNumber))
-	{
-	    System.out.print("number is incorrect ");
-	}
+        //
+        // Add a contact from "anne". The number field isn't set.
+        //
+        contactdb.addContact("anne", Optional.O(NumberType.OFFICE), null, Optional.O(2));
 
-	info = contactdb.query("frank");
-	//
-	// The dial group field should be unset.
-	//
-	if(info.hasDialGroup())
-	{
-	    System.out.print("info is incorrect ");
-	}
-	if(info.getType() != NumberType.CELL || !info.getNumber().equals(frankNumber))
-	{
-	    System.out.print("info is incorrect ");
-	}
-
-	contactdb.queryDialgroup("frank", dialgroup);
-	if(dialgroup.isSet())
-	{
-	    System.out.print("dialgroup is incorrect ");
-	}
-	System.out.println("ok");
+        System.out.print("Checking anne... ");
+        number = contactdb.queryNumber("anne");
+        if(number.isSet())
+        {
+            System.out.print("number is incorrect ");
+        }
 
-	//
-	// Add a contact from "anne". The number field isn't set.
-	//
-	contactdb.addContact("anne", new Ice.Optional<NumberType>(NumberType.OFFICE), null, new Ice.IntOptional(2));
+        info = contactdb.query("anne");
+        //
+        // The number field should be unset.
+        //
+        if(info.hasNumber())
+        {
+            System.out.print("info is incorrect ");
+        }
+        if(info.getType() != NumberType.OFFICE || info.getDialGroup() != 2)
+        {
+            System.out.print("info is incorrect ");
+        }
 
-	System.out.print("Checking anne... ");
-	number = contactdb.queryNumber("anne");
-	if(number.isSet())
-	{
-	    System.out.print("number is incorrect ");
-	}
+        contactdb.queryDialgroup("anne", dialgroup);
+        if(!dialgroup.isSet() || dialgroup.get() != 2)
+        {
+            System.out.print("dialgroup is incorrect ");
+        }
 
-	info = contactdb.query("anne");
-	//
-	// The number field should be unset.
-	//
-	if(info.hasNumber())
-	{
-	    System.out.print("info is incorrect ");
-	}
-	if(info.getType() != NumberType.OFFICE || info.getDialGroup() != 2)
-	{
-	    System.out.print("info is incorrect ");
-	}
-
-	contactdb.queryDialgroup("anne", dialgroup);
-	if(!dialgroup.isSet() || dialgroup.get() != 2)
-	{
-	    System.out.print("dialgroup is incorrect ");
-	}
+        //
+        // The optional fields can be used to determine what fields to
+        // update on the contact.  Here we update only the number for anne,
+        // the remainder of the fields are unchanged.
+        //
+        String anneNumber = "456-789-0123";
+        contactdb.updateContact("anne", null, Optional.O(anneNumber), null);
+        number = contactdb.queryNumber("anne");
+        if(!number.get().equals(anneNumber))
+        {
+            System.out.print("number is incorrect ");
+        }
+        info = contactdb.query("anne");
+        if(!info.getNumber().equals(anneNumber) || info.getType() != NumberType.OFFICE || info.getDialGroup() != 2)
+        {
+            System.out.print("info is incorrect ");
+        }
+        System.out.println("ok");
 
-	//
-	// The optional fields can be used to determine what fields to
-	// update on the contact.  Here we update only the number for anne,
-	// the remainder of the fields are unchanged.
-	//
-	String anneNumber = "456-789-0123";
-	contactdb.updateContact("anne", null, new Ice.Optional<String>(anneNumber), null);
-	number = contactdb.queryNumber("anne");
-	if(!number.get().equals(anneNumber))
-	{
-	    System.out.print("number is incorrect ");
-	}
-	info = contactdb.query("anne");
-	if(!info.getNumber().equals(anneNumber) || info.getType() != NumberType.OFFICE || info.getDialGroup() != 2)
-	{
-	    System.out.print("info is incorrect ");
-	}
-	System.out.println("ok");
-
-	contactdb.shutdown();
+        contactdb.shutdown();
 
         return 0;
     }