[jboss-svn-commits] JBL Code SVN: r5222 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl: . protocol/db

[jboss-svn-commits at lists.jboss.org]

Author: wrzep
Date: 2006-07-21 13:44:40 -0400 (Fri, 21 Jul 2006)
New Revision: 5222

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBServiceImpl.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/db/PluginValuesEntity.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/db/PluginsValuesEntity.java
Log:
JBLAB-689
Optymalized query.

Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBServiceImpl.java	2006-07-21 16:32:51 UTC (rev 5221)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBServiceImpl.java	2006-07-21 17:44:40 UTC (rev 5222)
@@ -61,9 +61,14 @@
 
 	public PluginsValues get(Calendar date) {
 	
+		List list = null;
+		
 		Query query = em.createQuery(
-				"SELECT c FROM PluginsValuesEntity c LEFT JOIN FETCH c.v");
-		List list = query.getResultList();
+				" SELECT c FROM PluginsValuesEntity c " +
+				" LEFT JOIN FETCH c.values cv " + "" +
+				" LEFT JOIN FETCH cv.values");
+
+		list = query.getResultList();
 		
 		System.out.println("get(0): " + list.get(0));
 		

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/db/PluginValuesEntity.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/db/PluginValuesEntity.java	2006-07-21 16:32:51 UTC (rev 5221)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/db/PluginValuesEntity.java	2006-07-21 17:44:40 UTC (rev 5222)
@@ -35,8 +35,6 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.MapKey;
 import javax.persistence.OneToMany;
-import javax.persistence.PostLoad;
-import javax.persistence.PreUpdate;
 import javax.persistence.Table;
 
 import org.jboss.forge.status.plugins.Plugin;

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/db/PluginsValuesEntity.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/db/PluginsValuesEntity.java	2006-07-21 16:32:51 UTC (rev 5221)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/db/PluginsValuesEntity.java	2006-07-21 17:44:40 UTC (rev 5222)
@@ -24,7 +24,6 @@
 package org.jboss.forge.status.service.impl.protocol.db;
 
 import java.util.Calendar;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -32,14 +31,11 @@
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.MapKey;
 import javax.persistence.OneToMany;
-import javax.persistence.PostLoad;
-import javax.persistence.PreUpdate;
 import javax.persistence.Table;
 
 import org.jboss.forge.common.projects.Projects;
@@ -68,8 +64,6 @@
     
 	/** Map : pluginId -> pluginValue */
 	private Map<String,PluginValuesEntity> values;
-  
-	private Collection<PluginValuesEntity> v;
 	
     /**
      * Default constructor
@@ -120,16 +114,6 @@
 
 	@OneToMany(cascade={CascadeType.ALL})
 	@JoinColumn(name="plugins_values_id")
-	public Collection<PluginValuesEntity> getV() {
-		return v;
-	}
-
-	public void setV(Collection<PluginValuesEntity> v) {
-		this.v = v;
-	}
-
-	@OneToMany(cascade={CascadeType.ALL})
-	@JoinColumn(name="plugins_values_id")
 	@MapKey(name="pluginId") 
 	public Map<String, PluginValuesEntity> getValues() {
 		return values;