Fixed a concurrency bug in BillTest. Added some validation tests. Modified the format...

[aquarium] / src / main / java / gr / grnet / aquarium / message / avro / gen / BillEntryMsg.java

diff --git a/src/main/java/gr/grnet/aquarium/message/avro/gen/BillEntryMsg.java b/src/main/java/gr/grnet/aquarium/message/avro/gen/BillEntryMsg.java
index c0bd3be..43364ab 100644 (file)
--- a/src/main/java/gr/grnet/aquarium/message/avro/gen/BillEntryMsg.java
+++ b/src/main/java/gr/grnet/aquarium/message/avro/gen/BillEntryMsg.java
@@ -6,7 +6,7 @@
 package gr.grnet.aquarium.message.avro.gen;  
 @SuppressWarnings("all")
 public class BillEntryMsg extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"BillEntryMsg\",\"namespace\":\"gr.grnet.aquarium.message.avro.gen\",\"fields\":[{\"name\":\"id\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"userID\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"status\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"remainingCredits\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"deductedCredits\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"startTime\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"endTime\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"bill\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"ServiceEntryMsg\",\"fields\":[{\"name\":\"serviceName\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"totalCredits\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"totalElapsedTime\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"totalUnits\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"unitName\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"details\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"ResourceEntryMsg\",\"fields\":[{\"name\":\"resourceName\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"resourceType\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"unitName\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"totalCredits\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"totalElapsedTime\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"totalUnits\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"details\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"EventEntryMsg\",\"fields\":[{\"name\":\"eventType\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"details\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"ChargeEntryMsg\",\"fields\":[{\"name\":\"id\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"unitPrice\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"startTime\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"endTime\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"elapsedTime\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"units\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"credits\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}}]}}}]}}}]}}}]}}}]}");
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"BillEntryMsg\",\"namespace\":\"gr.grnet.aquarium.message.avro.gen\",\"fields\":[{\"name\":\"id\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"userID\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"status\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"remainingCredits\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"deductedCredits\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"startTime\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"endTime\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"details\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"ServiceEntryMsg\",\"fields\":[{\"name\":\"serviceName\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"totalCredits\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"totalElapsedTime\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"totalUnits\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"unitName\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"details\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"ResourceEntryMsg\",\"fields\":[{\"name\":\"resourceName\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"resourceType\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"unitName\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"totalCredits\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"totalElapsedTime\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"totalUnits\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"details\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"EventEntryMsg\",\"fields\":[{\"name\":\"eventType\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"details\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"ChargeEntryMsg\",\"fields\":[{\"name\":\"id\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"unitPrice\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"startTime\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"endTime\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"totalCredits\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"totalElapsedTime\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"totalUnits\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}}]}}}]}}}]}}}]}}}]}");
   @Deprecated public java.lang.String id;
   @Deprecated public java.lang.String userID;
   @Deprecated public java.lang.String status;
@@ -14,7 +14,7 @@ public class BillEntryMsg extends org.apache.avro.specific.SpecificRecordBase im
   @Deprecated public java.lang.String deductedCredits;
   @Deprecated public java.lang.String startTime;
   @Deprecated public java.lang.String endTime;
-  @Deprecated public java.util.List<gr.grnet.aquarium.message.avro.gen.ServiceEntryMsg> bill;
+  @Deprecated public java.util.List<gr.grnet.aquarium.message.avro.gen.ServiceEntryMsg> details;
   public org.apache.avro.Schema getSchema() { return SCHEMA$; }
   // Used by DatumWriter.  Applications should not call. 
   public java.lang.Object get(int field$) {
@@ -26,7 +26,7 @@ public class BillEntryMsg extends org.apache.avro.specific.SpecificRecordBase im
     case 4: return deductedCredits;
     case 5: return startTime;
     case 6: return endTime;
-    case 7: return bill;
+    case 7: return details;
     default: throw new org.apache.avro.AvroRuntimeException("Bad index");
     }
   }
@@ -41,7 +41,7 @@ public class BillEntryMsg extends org.apache.avro.specific.SpecificRecordBase im
     case 4: deductedCredits = (java.lang.String)value$; break;
     case 5: startTime = (java.lang.String)value$; break;
     case 6: endTime = (java.lang.String)value$; break;
-    case 7: bill = (java.util.List<gr.grnet.aquarium.message.avro.gen.ServiceEntryMsg>)value$; break;
+    case 7: details = (java.util.List<gr.grnet.aquarium.message.avro.gen.ServiceEntryMsg>)value$; break;
     default: throw new org.apache.avro.AvroRuntimeException("Bad index");
     }
   }
@@ -152,18 +152,18 @@ public class BillEntryMsg extends org.apache.avro.specific.SpecificRecordBase im
   }
 
   /**
-   * Gets the value of the 'bill' field.
+   * Gets the value of the 'details' field.
    */
-  public java.util.List<gr.grnet.aquarium.message.avro.gen.ServiceEntryMsg> getBill() {
-    return bill;
+  public java.util.List<gr.grnet.aquarium.message.avro.gen.ServiceEntryMsg> getDetails() {
+    return details;
   }
 
   /**
-   * Sets the value of the 'bill' field.
+   * Sets the value of the 'details' field.
    * @param value the value to set.
    */
-  public void setBill(java.util.List<gr.grnet.aquarium.message.avro.gen.ServiceEntryMsg> value) {
-    this.bill = value;
+  public void setDetails(java.util.List<gr.grnet.aquarium.message.avro.gen.ServiceEntryMsg> value) {
+    this.details = value;
   }
 
   /** Creates a new BillEntryMsg RecordBuilder */
@@ -194,7 +194,7 @@ public class BillEntryMsg extends org.apache.avro.specific.SpecificRecordBase im
     private java.lang.String deductedCredits;
     private java.lang.String startTime;
     private java.lang.String endTime;
-    private java.util.List<gr.grnet.aquarium.message.avro.gen.ServiceEntryMsg> bill;
+    private java.util.List<gr.grnet.aquarium.message.avro.gen.ServiceEntryMsg> details;
 
     /** Creates a new Builder */
     private Builder() {
@@ -237,8 +237,8 @@ public class BillEntryMsg extends org.apache.avro.specific.SpecificRecordBase im
         this.endTime = (java.lang.String) data().deepCopy(fields()[6].schema(), other.endTime);
         fieldSetFlags()[6] = true;
       }
-      if (isValidValue(fields()[7], other.bill)) {
-        this.bill = (java.util.List<gr.grnet.aquarium.message.avro.gen.ServiceEntryMsg>) data().deepCopy(fields()[7].schema(), other.bill);
+      if (isValidValue(fields()[7], other.details)) {
+        this.details = (java.util.List<gr.grnet.aquarium.message.avro.gen.ServiceEntryMsg>) data().deepCopy(fields()[7].schema(), other.details);
         fieldSetFlags()[7] = true;
       }
     }
@@ -418,27 +418,27 @@ public class BillEntryMsg extends org.apache.avro.specific.SpecificRecordBase im
       return this;
     }
 
-    /** Gets the value of the 'bill' field */
-    public java.util.List<gr.grnet.aquarium.message.avro.gen.ServiceEntryMsg> getBill() {
-      return bill;
+    /** Gets the value of the 'details' field */
+    public java.util.List<gr.grnet.aquarium.message.avro.gen.ServiceEntryMsg> getDetails() {
+      return details;
     }
     
-    /** Sets the value of the 'bill' field */
-    public gr.grnet.aquarium.message.avro.gen.BillEntryMsg.Builder setBill(java.util.List<gr.grnet.aquarium.message.avro.gen.ServiceEntryMsg> value) {
+    /** Sets the value of the 'details' field */
+    public gr.grnet.aquarium.message.avro.gen.BillEntryMsg.Builder setDetails(java.util.List<gr.grnet.aquarium.message.avro.gen.ServiceEntryMsg> value) {
       validate(fields()[7], value);
-      this.bill = value;
+      this.details = value;
       fieldSetFlags()[7] = true;
       return this; 
     }
     
-    /** Checks whether the 'bill' field has been set */
-    public boolean hasBill() {
+    /** Checks whether the 'details' field has been set */
+    public boolean hasDetails() {
       return fieldSetFlags()[7];
     }
     
-    /** Clears the value of the 'bill' field */
-    public gr.grnet.aquarium.message.avro.gen.BillEntryMsg.Builder clearBill() {
-      bill = null;
+    /** Clears the value of the 'details' field */
+    public gr.grnet.aquarium.message.avro.gen.BillEntryMsg.Builder clearDetails() {
+      details = null;
       fieldSetFlags()[7] = false;
       return this;
     }
@@ -454,7 +454,7 @@ public class BillEntryMsg extends org.apache.avro.specific.SpecificRecordBase im
         record.deductedCredits = fieldSetFlags()[4] ? this.deductedCredits : (java.lang.String) defaultValue(fields()[4]);
         record.startTime = fieldSetFlags()[5] ? this.startTime : (java.lang.String) defaultValue(fields()[5]);
         record.endTime = fieldSetFlags()[6] ? this.endTime : (java.lang.String) defaultValue(fields()[6]);
-        record.bill = fieldSetFlags()[7] ? this.bill : (java.util.List<gr.grnet.aquarium.message.avro.gen.ServiceEntryMsg>) defaultValue(fields()[7]);
+        record.details = fieldSetFlags()[7] ? this.details : (java.util.List<gr.grnet.aquarium.message.avro.gen.ServiceEntryMsg>) defaultValue(fields()[7]);
         return record;
       } catch (Exception e) {
         throw new org.apache.avro.AvroRuntimeException(e);