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

[<cl...@hy...>]

Author: clee
Date: 2008-09-28 21:04:54 -0700 (Sun, 28 Sep 2008)
New Revision: 11326
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=11326

Modified:
   trunk/src/org/hyperic/hq/appdef/server/session/VirtualDAO.java
   trunk/src/org/hyperic/hq/appdef/server/session/VirtualManagerEJBImpl.java
   trunk/src/org/hyperic/hq/authz/server/session/ResourceGroupManagerEJBImpl.java
   trunk/src/org/hyperic/hq/authz/server/session/ResourceManagerEJBImpl.java
Log:
Remove unused API and unnecessary ResourceValue conversions


Modified: trunk/src/org/hyperic/hq/appdef/server/session/VirtualDAO.java
===================================================================
--- trunk/src/org/hyperic/hq/appdef/server/session/VirtualDAO.java	2008-09-29 04:02:28 UTC (rev 11325)
+++ trunk/src/org/hyperic/hq/appdef/server/session/VirtualDAO.java	2008-09-29 04:04:54 UTC (rev 11326)
@@ -6,7 +6,7 @@
  * normal use of the program, and does *not* fall under the heading of 
  * "derived work". 
  *  
- * Copyright (C) [2004, 2005, 2006], Hyperic, Inc. 
+ * Copyright (C) [2004-2008], Hyperic, Inc. 
  * This file is part of HQ.         
  *  
  * HQ is free software; you can redistribute it and/or modify 
@@ -29,8 +29,8 @@
 
 import org.hyperic.dao.DAOFactory;
 import org.hyperic.hq.authz.server.session.Resource;
+import org.hyperic.hq.authz.server.session.ResourceDAO;
 import org.hyperic.hq.authz.server.session.Virtual;
-import org.hyperic.hq.authz.shared.ResourceValue;
 import org.hyperic.hq.dao.HibernateDAO;
 
 public class VirtualDAO extends HibernateDAO {
@@ -46,9 +46,9 @@
         super.remove(entity);
     }
     
-    public void createVirtual(ResourceValue res, Integer processId) {
-        Resource resource = 
-            DAOFactory.getDAOFactory().getResourceDAO().findById(res.getId());
+    public void createVirtual(Resource res, Integer processId) {
+        Resource resource = new ResourceDAO(DAOFactory.getDAOFactory())
+            .findById(res.getId());
         Virtual virt = new Virtual();
         virt.setResource(resource);
         virt.setProcessId(processId);

Modified: trunk/src/org/hyperic/hq/appdef/server/session/VirtualManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/appdef/server/session/VirtualManagerEJBImpl.java	2008-09-29 04:02:28 UTC (rev 11325)
+++ trunk/src/org/hyperic/hq/appdef/server/session/VirtualManagerEJBImpl.java	2008-09-29 04:04:54 UTC (rev 11326)
@@ -54,7 +54,6 @@
 import org.hyperic.hq.authz.shared.PermissionException;
 import org.hyperic.hq.authz.shared.ResourceManagerLocal;
 import org.hyperic.hq.authz.shared.ResourceManagerUtil;
-import org.hyperic.hq.authz.shared.ResourceValue;
 import org.hyperic.hq.common.SystemException;
 
 /**
@@ -193,7 +192,7 @@
             for (int i = 0; i < aeids.length; i++) {
                String typeStr =
                    AppdefUtil.appdefTypeIdToAuthzTypeStr(aeids[i].getType());
-               ResourceValue res =
+               Resource res =
                    resMan.findResourceByTypeAndInstanceId(typeStr,
                                                           aeids[i].getId());
                dao.createVirtual(res, processId);

Modified: trunk/src/org/hyperic/hq/authz/server/session/ResourceGroupManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/authz/server/session/ResourceGroupManagerEJBImpl.java	2008-09-29 04:02:28 UTC (rev 11325)
+++ trunk/src/org/hyperic/hq/authz/server/session/ResourceGroupManagerEJBImpl.java	2008-09-29 04:04:54 UTC (rev 11326)
@@ -1018,10 +1018,10 @@
     {
         ResourceManagerLocal rmLoc = ResourceManagerEJBImpl.getOne();
 
-        ResourceValue gResource =
+        Resource gResource =
             rmLoc.findResourceByInstanceId(rmLoc.findResourceTypeByName(
                 AuthzConstants.groupResourceTypeName), gid);
-        return gResource.getAuthzSubjectValue();
+        return gResource.getOwner();
     }
 
 

Modified: trunk/src/org/hyperic/hq/authz/server/session/ResourceManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/authz/server/session/ResourceManagerEJBImpl.java	2008-09-29 04:02:28 UTC (rev 11325)
+++ trunk/src/org/hyperic/hq/authz/server/session/ResourceManagerEJBImpl.java	2008-09-29 04:04:54 UTC (rev 11326)
@@ -314,8 +314,8 @@
      * @return The value-object of the Resource of the given ID.
      * @ejb:interface-method
      */
-    public ResourceValue findResourceByInstanceId(ResourceType type,
-                                                  Integer instanceId) {
+    public Resource findResourceByInstanceId(ResourceType type,
+                                             Integer instanceId) {
         Resource resource = getResourceDAO().findByInstanceId(type.getId(),
                                                               instanceId);
         
@@ -324,7 +324,7 @@
                                        type.getId() + " instanceId=" + 
                                        instanceId);
         }
-        return resource.getResourceValue();
+        return resource;
     }
 
     /**
@@ -346,16 +346,6 @@
     }
 
     /**
-     * Find the Resource that has the given ID 
-     * @param id id for the resource you're looking for.
-     * @return The value-object of the Resource of the given ID.
-     * @ejb:interface-method
-     */
-    public ResourceValue findResourceById(Integer id) {
-        return findResourcePojoById(id).getResourceValue();
-    }
-    
-    /**
      * Find's the root (id=0) resource
      * @ejb:interface-method
      */
@@ -377,12 +367,10 @@
      * @return The value-object of the Resource of the given ID.
      * @ejb:interface-method
      */
-    public ResourceValue findResourceByTypeAndInstanceId(String type,
-                                                  Integer instanceId) {
+    public Resource findResourceByTypeAndInstanceId(String type,
+                                                    Integer instanceId) {
         ResourceType resType = getResourceTypeDAO().findByName(type);
-        Resource resource = getResourceDAO().findByInstanceId(resType.getId(),
-                                                              instanceId);
-        return resource.getResourceValue();
+        return getResourceDAO().findByInstanceId(resType.getId(), instanceId);
     }
 
     /**