[Hyperic-hq-discuss] hq r13494 - in trunk/src/org/hyperic/hq/appdef: server/session shared

[<rm...@hy...>]

Author: rmorgan
Date: 2009-07-09 15:24:42 -0700 (Thu, 09 Jul 2009)
New Revision: 13494
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13494

Modified:
   trunk/src/org/hyperic/hq/appdef/server/session/Service.java
   trunk/src/org/hyperic/hq/appdef/shared/ServiceValue.java
Log:
[HHQ-3235] Add autoinventoryIdentifier field to ServiceValue to match the recent 
addition of this field to the Service pojo.  This is required to allow updates of
this field from updateService(AuthzSubject, ServiceValue), which is used in HQApi.



Modified: trunk/src/org/hyperic/hq/appdef/server/session/Service.java
===================================================================
--- trunk/src/org/hyperic/hq/appdef/server/session/Service.java	2009-07-09 22:08:03 UTC (rev 13493)
+++ trunk/src/org/hyperic/hq/appdef/server/session/Service.java	2009-07-09 22:24:42 UTC (rev 13494)
@@ -165,6 +165,7 @@
     {
         _serviceValue.setSortName(getSortName());
         _serviceValue.setAutodiscoveryZombie(isAutodiscoveryZombie());
+        _serviceValue.setAutoinventoryIdentifier(getAutoinventoryIdentifier());
         _serviceValue.setServiceRt(isServiceRt());
         _serviceValue.setEndUserRt(isEndUserRt());
         _serviceValue.setModifiedBy(getModifiedBy());
@@ -221,6 +222,9 @@
             (getLocation() != null ?
                 getLocation().equals(obj.getLocation())
                 : (obj.getLocation() == null)) &&
+            (getAutoinventoryIdentifier() != null ?
+                getAutoinventoryIdentifier().equals(obj.getAutoinventoryIdentifier())
+                : (obj.getAutoinventoryIdentifier() == null)) &&
             (isEndUserRt() == obj.getEndUserRt()) &&
             (isServiceRt() == obj.getServiceRt());
         return matches;
@@ -234,6 +238,7 @@
      * included in the value object. This is for speed/locking reasons
      */
     void updateService(ServiceValue valueHolder) {
+        setAutoinventoryIdentifier(valueHolder.getAutoinventoryIdentifier());
         setDescription( valueHolder.getDescription() );
         setAutodiscoveryZombie( valueHolder.getAutodiscoveryZombie() );
         setServiceRt( valueHolder.getServiceRt() );

Modified: trunk/src/org/hyperic/hq/appdef/shared/ServiceValue.java
===================================================================
--- trunk/src/org/hyperic/hq/appdef/shared/ServiceValue.java	2009-07-09 22:08:03 UTC (rev 13493)
+++ trunk/src/org/hyperic/hq/appdef/shared/ServiceValue.java	2009-07-09 22:24:42 UTC (rev 13494)
@@ -72,7 +72,8 @@
     private boolean ResourceGroupHasBeenSet = false;
     private ServiceTypeValue ServiceType;
     private boolean ServiceTypeHasBeenSet = false;
-
+    private String _autoinventoryIdentifier;
+    
     public ServiceValue()
     {
     }
@@ -393,6 +394,14 @@
         ServiceTypeHasBeenSet = true;
     }
 
+    public String getAutoinventoryIdentifier() {
+        return _autoinventoryIdentifier;
+    }
+
+    public void setAutoinventoryIdentifier(String aiid) {
+        _autoinventoryIdentifier = aiid;
+    }
+
     public String toString()
     {
         StringBuffer str = new StringBuffer("{");