[jboss-svn-commits] JBL Code SVN: r5181 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status: service service/impl service/impl/protocol/db service/impl/protocol/shotoku service/protocol templates
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jul 19 12:10:20 EDT 2006
Author: wrzep
Date: 2006-07-19 12:10:06 -0400 (Wed, 19 Jul 2006)
New Revision: 5181
Removed:
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBScoresTransformer.java
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/DBService.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBScoresRepositoryManager.java
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/ScoresServiceImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ServiceScoresManager.java
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/shotoku/PluginsValuesImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/PluginsValues.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java
Log:
JBLAB-689
Simplified PluginsValues object (easier DB storage).
Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/DBService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/DBService.java 2006-07-19 15:57:33 UTC (rev 5180)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/DBService.java 2006-07-19 16:10:06 UTC (rev 5181)
@@ -29,7 +29,7 @@
*/
public interface DBService {
- public void init(String portalName);
+ public void init();
public void save(PluginsValues pluginsValues);
}
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBScoresRepositoryManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBScoresRepositoryManager.java 2006-07-19 15:57:33 UTC (rev 5180)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBScoresRepositoryManager.java 2006-07-19 16:10:06 UTC (rev 5181)
@@ -47,10 +47,9 @@
private DBService service;
- public DBScoresRepositoryManager(String portalName)
- throws NamingException {
+ public DBScoresRepositoryManager() throws NamingException {
- service = getService(portalName);
+ service = getService();
};
public void save(PluginsValues pluginsValues) throws ScoresSaveException {
@@ -63,7 +62,7 @@
return null;
}
- private DBService getService(String portalName) throws NamingException {
+ private DBService getService() throws NamingException {
Context context = new InitialContext();
@@ -74,7 +73,7 @@
DBService service =
(DBService) PortableRemoteObject.narrow( ref, DBService.class);
- service.init(portalName);
+ service.init();
return service;
}
Deleted: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBScoresTransformer.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBScoresTransformer.java 2006-07-19 15:57:33 UTC (rev 5180)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBScoresTransformer.java 2006-07-19 16:10:06 UTC (rev 5181)
@@ -1,76 +0,0 @@
-
- /*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.forge.status.service.impl;
-
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.jboss.forge.status.service.impl.protocol.db.PluginValuesEntity;
-import org.jboss.forge.status.service.impl.protocol.db.PluginsValuesEntity;
-import org.jboss.forge.status.service.impl.protocol.db.ScoresEntity;
-import org.jboss.forge.status.service.protocol.PluginValues;
-import org.jboss.forge.status.service.protocol.PluginsValues;
-
-/**
- * @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
- */
-
-public class DBScoresTransformer
-{
-
- public static Collection<ScoresEntity> transform(PluginsValues pluginsValues) {
-
- Set<ScoresEntity> ret = new HashSet<ScoresEntity>();
-
- PluginsValuesEntity entity = getEntity(pluginsValues);
- ret.add(entity);
-
- Collection<String> pluginsIds = pluginsValues.getPluginsIds();
-
- for (String pluginId : pluginsIds) {
-
- PluginValues pluginValues = pluginsValues.getPluginValues(pluginId);
- PluginValuesEntity e = getEntity(pluginValues);
- ret.add(e);
- }
-
- return ret;
- }
-
- private static PluginsValuesEntity getEntity(PluginsValues pluginsValues) {
-
- Calendar date = pluginsValues.getDate();
-
- return new PluginsValuesEntity(date);
- }
-
- private static PluginValuesEntity getEntity(PluginValues pluginValues) {
-
- String pluginId = pluginValues.getId();
-
- return new PluginValuesEntity(pluginId);
- }
-}
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-19 15:57:33 UTC (rev 5180)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBServiceImpl.java 2006-07-19 16:10:06 UTC (rev 5181)
@@ -22,8 +22,6 @@
package org.jboss.forge.status.service.impl;
-import java.util.Collection;
-
import javax.ejb.Local;
import javax.ejb.Stateful;
import javax.persistence.EntityManager;
@@ -33,7 +31,6 @@
import org.jboss.forge.status.common.Constants;
import org.jboss.forge.status.service.DBService;
-import org.jboss.forge.status.service.impl.protocol.db.ScoresEntity;
import org.jboss.forge.status.service.protocol.PluginsValues;
@@ -48,25 +45,14 @@
@PersistenceContext (unitName="scores")
protected EntityManager em;
+
+ public void init() {}
- private String portalName;
-
- public void init(String portalName) {
-
- this.portalName = portalName;
- }
-
public void save(PluginsValues pluginsValues) {
- Collection<ScoresEntity> toSave = DBScoresTransformer.transform(pluginsValues);
-
- for (ScoresEntity entity : toSave) {
-
- em.persist(entity);
-
- System.out.println("entity saved");
- }
+ em.persist(pluginsValues);
}
+
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-07-19 15:57:33 UTC (rev 5180)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-07-19 16:10:06 UTC (rev 5181)
@@ -113,7 +113,7 @@
ScoresRepositoryManager dbrm;
try {
- dbrm = new DBScoresRepositoryManager(portalName);
+ dbrm = new DBScoresRepositoryManager();
dbrm.save(pluginsValues);
} catch (NamingException e) {
// TODO Auto-generated catch block
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ServiceScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ServiceScoresManager.java 2006-07-19 15:57:33 UTC (rev 5180)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ServiceScoresManager.java 2006-07-19 16:10:06 UTC (rev 5181)
@@ -41,6 +41,7 @@
import org.jboss.forge.status.service.ScoresServiceLocal;
import org.jboss.forge.status.service.ScoresServiceRemote;
import org.jboss.forge.status.service.protocol.PluginConf;
+import org.jboss.forge.status.service.protocol.PluginValues;
import org.jboss.forge.status.service.protocol.PluginsValues;
import org.jboss.forge.status.service.protocol.ScoresFactory;
import org.jboss.forge.status.service.protocol.ServiceConf;
@@ -183,9 +184,29 @@
PluginsValues pluginsValues = getScores(cal);
- return pluginsValues.getPluginValue(pluginId, projectId);
+ Long val = null;
+ PluginValues pluginValues = pluginsValues.getPluginValues(pluginId);
+
+ if (pluginValues != null) {
+ val = pluginValues.getValue(projectId);
+ }
+
+ if (val == null) {
+ throw new GetScoresException();
+ }
+
+ return val;
}
+ /**
+ * For the given plugin and project ids returns stored value.
+ *
+ * @param pluginId plugin id
+ * @param projectId project id
+ * @return stored plugin value for specified project
+ * @throws GetScoresException
+ * Thrown when requested value was not found
+ */
public long getValue(String id, String projectId,
Calendar start, Calendar end) throws GetScoresException {
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-19 15:57:33 UTC (rev 5180)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/db/PluginsValuesEntity.java 2006-07-19 16:10:06 UTC (rev 5181)
@@ -37,7 +37,7 @@
*
* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
*
- * EJB3 Entity which is used to persist in database all
+ * EJB3 Entity used to persist in database all
* project scores for Status Matrix.
*/
@Entity
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/shotoku/PluginsValuesImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/shotoku/PluginsValuesImpl.java 2006-07-19 15:57:33 UTC (rev 5180)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/shotoku/PluginsValuesImpl.java 2006-07-19 16:10:06 UTC (rev 5181)
@@ -23,7 +23,6 @@
package org.jboss.forge.status.service.impl.protocol.shotoku;
import java.util.Calendar;
-import java.util.Collection;
import java.util.Map;
import java.util.HashMap;
import java.util.Set;
@@ -31,7 +30,6 @@
import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
-import org.jboss.forge.status.exceptions.GetScoresException;
import org.jboss.forge.status.plugins.Plugin;
import org.jboss.forge.status.service.protocol.PluginValues;
import org.jboss.forge.status.service.protocol.PluginsValues;
@@ -72,32 +70,6 @@
values.put(plugin.getId(), pluginValues);
}
}
-
- /**
- * For the given plugin and project ids returns stored value.
- *
- * @param pluginId plugin id
- * @param projectId project id
- * @return stored plugin value for specified project
- * @throws GetScoresException
- * Thrown when requested value was not found
- */
- public long getPluginValue(String pluginId, String projectId)
- throws GetScoresException {
-
- Long val = null;
- PluginValues pluginValues = values.get(pluginId);
-
- if (pluginValues != null) {
- val = pluginValues.getValue(projectId);
- }
-
- if (val == null) {
- throw new GetScoresException();
- }
-
- return val;
- }
/**
* @return creation date
@@ -106,15 +78,7 @@
return cal;
}
- public boolean hasPlugin(String pluginId) {
- return values.containsKey(pluginId);
- }
-
public PluginValues getPluginValues(String pluginId) {
return values.get(pluginId);
}
-
- public Collection<String> getPluginsIds() {
- return values.keySet();
- }
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/PluginsValues.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/PluginsValues.java 2006-07-19 15:57:33 UTC (rev 5180)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/PluginsValues.java 2006-07-19 16:10:06 UTC (rev 5181)
@@ -23,12 +23,9 @@
package org.jboss.forge.status.service.protocol;
import java.util.Calendar;
-import java.util.Collection;
import java.io.Serializable;
-import org.jboss.forge.status.exceptions.GetScoresException;
-
/**
* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
*/
@@ -36,26 +33,10 @@
public interface PluginsValues extends Serializable {
/**
- * For the given plugin and project ids returns stored value.
- *
- * @param pluginId plugin id
- * @param projectId project id
- * @return stored plugin value for specified project
- * @throws GetScoresException
- * Thrown when requested value was not found
- */
- public long getPluginValue(String pluginId, String projectId)
- throws GetScoresException;
-
- /**
* @return creation date
*/
public Calendar getDate();
- public boolean hasPlugin(String pluginId);
-
public PluginValues getPluginValues(String pluginId);
- public Collection<String> getPluginsIds();
-
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-07-19 15:57:33 UTC (rev 5180)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-07-19 16:10:06 UTC (rev 5181)
@@ -208,9 +208,11 @@
Comparator<String> projectsComparator = null;
- if (pluginsValues.hasPlugin(orderPluginId)) {
- projectsComparator = new ProjectsByScoreComparator(
- pluginsValues.getPluginValues(orderPluginId));
+ PluginValues orderPluginValues =
+ pluginsValues.getPluginValues(orderPluginId);
+
+ if (orderPluginValues != null) {
+ projectsComparator = new ProjectsByScoreComparator(orderPluginValues);
} else {
projectsComparator = new ProjectsByNameComparator(projects);
}
More information about the jboss-svn-commits
mailing list