[jbpm-commits] JBoss JBPM SVN: r5562 - in projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4: connector and 1 other directories.

Author: jim.ma Date: 2009-08-27 06:28:06 -0400 (Thu, 27 Aug 2009) New Revision: 5562 Added: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/util/ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/util/StringUtil.java Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ActivityComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ExceptionJobDiscoveryComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ExceptionalJobComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/InstanceJobDiscoveryComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/JobComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDefComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDefDiscoveryComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentDiscoveryComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineDiscoveryComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceDiscoveryComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceHistoryComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceHistoryDiscoveryComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TaskComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TaskDiscoveryComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TimerDiscoveryComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnection.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnector.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/LocalJBPMEngineConnector.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/RemoteJBPMEngineConnector.java Log: Refactored the code to filter the null value Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ActivityComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ActivityComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ActivityComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -27,6 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jbpm.api.ProcessDefinition; + import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.measurement.MeasurementDataTrait; import org.rhq.core.domain.measurement.MeasurementReport; @@ -35,6 +36,7 @@ import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.measurement.MeasurementFacet; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; +import org.rhq.plugins.jbpm4.util.StringUtil; public class ActivityComponent implements ResourceComponent<ProcessDefComponent> , MeasurementFacet { private ResourceContext<ProcessDefComponent> resourceContext; @@ -56,13 +58,13 @@ String activityName = resourceContext.getResourceKey(); Long duration = map.get(activityName); MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(duration)); + StringUtil.replaceNull(duration)); report.addData(value); } if (request.getName().equals("name")) { String activityName = resourceContext.getResourceKey(); MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(activityName)); + StringUtil.replaceNull(activityName)); report.addData(value); } } Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ExceptionJobDiscoveryComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ExceptionJobDiscoveryComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ExceptionJobDiscoveryComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -32,7 +32,7 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; /** - * @author ema(a)redhat.com + * @author <a href mailto=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> * */ public class ExceptionJobDiscoveryComponent implements ResourceDiscoveryComponent<ProcessEngineComponent> { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ExceptionalJobComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ExceptionalJobComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ExceptionalJobComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -25,7 +25,7 @@ import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; /** - * @author ema(a)redhat.com + * @author <a href mailto=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> * */ public class ExceptionalJobComponent extends JobComponent implements OperationFacet { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/InstanceJobDiscoveryComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/InstanceJobDiscoveryComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/InstanceJobDiscoveryComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -32,7 +32,7 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; /** - * @author ema(a)redhat.com + * @author <a href mailto=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> * */ public class InstanceJobDiscoveryComponent implements ResourceDiscoveryComponent<ProcessInstanceComponent> { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/JobComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/JobComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/JobComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -34,8 +34,9 @@ import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.measurement.MeasurementFacet; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; +import org.rhq.plugins.jbpm4.util.StringUtil; /** - * @author ema(a)redhat.com + * @author <a href mailto=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> * */ public class JobComponent implements ResourceComponent , MeasurementFacet { @@ -64,30 +65,30 @@ if (request.getName().equals("id")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(job.getId())); + StringUtil.replaceNull(job.getId())); report.addData(value); } if (request.getName().equals("duedate")) { - MeasurementDataTrait value = new MeasurementDataTrait(request,String.valueOf(job.getDueDate() == null ? "--" : job.getDueDate())); + MeasurementDataTrait value = new MeasurementDataTrait(request,StringUtil.replaceNull(job.getDueDate())); report.addData(value); } if (request.getName().equals("lockExpirationTime")) { - MeasurementDataTrait value = new MeasurementDataTrait(request,String.valueOf(job.getLockExpirationTime() == null ? "--" : job.getLockExpirationTime())); + MeasurementDataTrait value = new MeasurementDataTrait(request,StringUtil.replaceNull(job.getLockExpirationTime())); report.addData(value); } if (request.getName().equals("lockOwner")) { - MeasurementDataTrait value = new MeasurementDataTrait(request,String.valueOf(job.getLockOwner() == null ? "--" : job.getLockOwner())); + MeasurementDataTrait value = new MeasurementDataTrait(request,StringUtil.replaceNull(job.getLockOwner())); report.addData(value); } if (request.getName().equals("isExclusive")) { - MeasurementDataTrait value = new MeasurementDataTrait(request,String.valueOf(job.isExclusive())); + MeasurementDataTrait value = new MeasurementDataTrait(request,StringUtil.replaceNull(job.isExclusive())); report.addData(value); } if (request.getName().equals("exception")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, job.getException() == null ? "" : job.getException()); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(job.getException())); report.addData(value); } Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDefComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDefComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDefComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -40,8 +40,9 @@ import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.measurement.MeasurementFacet; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; +import org.rhq.plugins.jbpm4.util.StringUtil; /** - * @author ema(a)redhat.com + * @author <a href mailto=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> * */ public class ProcessDefComponent implements ResourceComponent<ProcessEngineComponent> , MeasurementFacet, CreateChildResourceFacet { @@ -62,23 +63,23 @@ for (MeasurementScheduleRequest request : metrics) { if (request.getName().equals("version")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(processDef.getVersion())); + StringUtil.replaceNull((processDef.getVersion()))); report.addData(value); } if (request.getName().equals("id")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(processDef.getId())); + StringUtil.replaceNull(processDef.getId())); report.addData(value); } if (request.getName().equals("description")) { - MeasurementDataTrait value = new MeasurementDataTrait(request,processDef.getDescription()); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(processDef.getDescription())); report.addData(value); } if (request.getName().equals("avgPerProcessInstanceDuration")) { - String duration = getAverageProcessInstanceDuration() == null ? "--" : String.valueOf(getAverageProcessInstanceDuration()); + String duration = StringUtil.replaceNull(getAverageProcessInstanceDuration()); MeasurementDataTrait value = new MeasurementDataTrait(request, duration); report.addData(value); } Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDefDiscoveryComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDefDiscoveryComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDefDiscoveryComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -33,7 +33,7 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; /** - * @author ema(a)redhat.com + * @author <a href mailto=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> * */ public class ProcessDefDiscoveryComponent implements ResourceDiscoveryComponent<ProcessEngineComponent> { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -47,8 +47,9 @@ import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.measurement.MeasurementFacet; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; +import org.rhq.plugins.jbpm4.util.StringUtil; /** - * @author ema(a)redhat.com + * @author <a href mailto=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> * */ public class ProcessDeploymentComponent implements ResourceComponent<ProcessEngineComponent> , MeasurementFacet, ContentFacet, DeleteResourceFacet { @@ -70,23 +71,23 @@ if (request.getName().equals("id")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(deployment.getId())); + StringUtil.replaceNull(deployment.getId())); report.addData(value); } if (request.getName().equals("name")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(deployment.getName())); + StringUtil.replaceNull(deployment.getName())); report.addData(value); } if (request.getName().equals("timestamp")) { - MeasurementDataTrait value = new MeasurementDataTrait(request,String.valueOf(deployment.getTimestamp())); + MeasurementDataTrait value = new MeasurementDataTrait(request,StringUtil.replaceNull(deployment.getTimestamp())); report.addData(value); } if (request.getName().equals("state")) { - MeasurementDataTrait value = new MeasurementDataTrait(request,String.valueOf(deployment.getState())); + MeasurementDataTrait value = new MeasurementDataTrait(request,StringUtil.replaceNull(deployment.getState())); report.addData(value); } } Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentDiscoveryComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentDiscoveryComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentDiscoveryComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -32,7 +32,7 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; /** - * @author ema(a)redhat.com + * @author <a href mailto=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> * */ public class ProcessDeploymentDiscoveryComponent implements ResourceDiscoveryComponent<ProcessEngineComponent> { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -26,6 +26,7 @@ import org.rhq.plugins.jbpm4.connector.JBPMEngineConnector; import org.rhq.plugins.jbpm4.connector.LocalJBPMEngineConnector; import org.rhq.plugins.jbpm4.connector.RemoteJBPMEngineConnector; +import org.rhq.plugins.jbpm4.util.StringUtil; import org.rhq.plugins.jmx.MBeanResourceComponent; public class ProcessEngineComponent extends MBeanResourceComponent implements CreateChildResourceFacet { @@ -67,27 +68,27 @@ for (MeasurementScheduleRequest request : metricRequests) { if (request.getName().equals("deployedProcessNumber")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(this.jbpmConnection.getProcessDefs().size())); + StringUtil.replaceNull(this.jbpmConnection.getProcessDefs().size())); report.addData(value); } if (request.getName().equals("processInstancNumber")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(this.jbpmConnection.getAllProcessInstance().size())); + StringUtil.replaceNull(this.jbpmConnection.getAllProcessInstance().size())); report.addData(value); } if (request.getName().equals("jobsNumber")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(this.jbpmConnection.queryJob(false, false, false, null).size())); + StringUtil.replaceNull(this.jbpmConnection.queryJob(false, false, false, null).size())); report.addData(value); } if (request.getName().equals("exceptionalJobsNumber")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(this.jbpmConnection.queryJob(false, false, true, null).size())); + StringUtil.replaceNull(this.jbpmConnection.queryJob(false, false, true, null).size())); report.addData(value); } } Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineDiscoveryComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineDiscoveryComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineDiscoveryComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -40,7 +40,7 @@ import org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent; /** - * @author ema(a)redhat.com + * @author <a href mailto=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> * */ public class ProcessEngineDiscoveryComponent extends MBeanResourceDiscoveryComponent implements ClassLoaderFacet { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -36,8 +36,9 @@ import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.measurement.MeasurementFacet; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; +import org.rhq.plugins.jbpm4.util.StringUtil; /** - * @author ema(a)redhat.com + * @author <a href mailto=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> * */ public class ProcessInstanceComponent implements ResourceComponent<ProcessDefComponent>, MeasurementFacet, DeleteResourceFacet { @@ -67,42 +68,42 @@ if (request.getName().equals("id")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getId())); + StringUtil.replaceNull(instance.getId())); report.addData(value); } if (request.getName().equals("key")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getKey() == null ? "--" : instance.getKey())); + StringUtil.replaceNull(instance.getKey())); report.addData(value); } if (request.getName().equals("name")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getName() == null ? "--" : instance.getName())); + StringUtil.replaceNull(instance.getName())); report.addData(value); } if (request.getName().equals("priority")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getPriority())); + StringUtil.replaceNull(instance.getPriority())); report.addData(value); } if (request.getName().equals("definitionId")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getProcessDefinitionId())); + StringUtil.replaceNull(instance.getProcessDefinitionId())); report.addData(value); } if (request.getName().equals("status")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getState())); + StringUtil.replaceNull(instance.getState())); report.addData(value); } } Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceDiscoveryComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceDiscoveryComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceDiscoveryComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -31,7 +31,7 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; /** - * @author ema(a)redhat.com + * @author <a href mailto=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> * */ public class ProcessInstanceDiscoveryComponent implements ResourceDiscoveryComponent<ProcessDefComponent> { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceHistoryComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceHistoryComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceHistoryComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -26,20 +26,18 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jbpm.api.Execution; -import org.jbpm.api.ProcessInstance; import org.jbpm.api.history.HistoryProcessInstance; import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.measurement.MeasurementDataTrait; import org.rhq.core.domain.measurement.MeasurementReport; import org.rhq.core.domain.measurement.MeasurementScheduleRequest; -import org.rhq.core.pluginapi.inventory.DeleteResourceFacet; import org.rhq.core.pluginapi.inventory.ResourceComponent; import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.measurement.MeasurementFacet; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; +import org.rhq.plugins.jbpm4.util.StringUtil; /** - * @author ema(a)redhat.com + * @author <a href mailto=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> * */ public class ProcessInstanceHistoryComponent implements ResourceComponent<ProcessDefComponent>, MeasurementFacet { @@ -66,48 +64,48 @@ if (request.getName().equals("key")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getKey())); + StringUtil.replaceNull(instance.getKey())); report.addData(value); } if (request.getName().equals("processDefinitionId")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getProcessDefinitionId())); + StringUtil.replaceNull(instance.getProcessDefinitionId())); report.addData(value); } if (request.getName().equals("processInstanceId")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getProcessInstanceId())); + StringUtil.replaceNull(instance.getProcessInstanceId())); report.addData(value); } if (request.getName().equals("duration")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getDuration())); + StringUtil.replaceNull(instance.getDuration())); report.addData(value); } if (request.getName().equals("startTime")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getStartTime())); + StringUtil.replaceNull(instance.getStartTime())); report.addData(value); } if (request.getName().equals("endTime")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getEndTime())); + StringUtil.replaceNull(instance.getEndTime())); report.addData(value); } if (request.getName().equals("state")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getState())); + StringUtil.replaceNull(instance.getState())); report.addData(value); } Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceHistoryDiscoveryComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceHistoryDiscoveryComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceHistoryDiscoveryComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -33,7 +33,7 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; /** - * @author ema(a)redhat.com + * @author <a href mailto=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> * */ public class ProcessInstanceHistoryDiscoveryComponent implements ResourceDiscoveryComponent<ProcessDefComponent> { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TaskComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TaskComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TaskComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -35,10 +35,8 @@ import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.measurement.MeasurementFacet; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; -/** - * @author ema(a)redhat.com - * - */ +import org.rhq.plugins.jbpm4.util.StringUtil; + public class TaskComponent implements ResourceComponent<ProcessInstanceComponent> , MeasurementFacet { private ResourceContext<ProcessInstanceComponent> resourceContext; private Log log = LogFactory.getLog(this.getClass()); @@ -57,60 +55,58 @@ public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) { for (MeasurementScheduleRequest request : metrics) { if (request.getName().equals("id")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, task.getId()); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(task.getId())); report.addData(value); } if (request.getName().equals("name")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, task.getName()); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(task.getName())); report.addData(value); } if (request.getName().equals("createTime")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, String.valueOf(task.getCreateTime())); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(task.getCreateTime())); report.addData(value); } if (request.getName().equals("dueDate")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, String.valueOf(task.getDuedate())); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(task.getDuedate())); report.addData(value); } if (request.getName().equals("priority")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, String.valueOf(task.getPriority())); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(task.getPriority())); report.addData(value); } if (request.getName().equals("activityName")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, task.getActivityName()); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(task.getActivityName())); report.addData(value); } if (request.getName().equals("assignee")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, task.getAssignee()); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(task.getAssignee())); report.addData(value); } if (request.getName().equals("description")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, task.getDescription()); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(task.getDescription())); report.addData(value); } if (request.getName().equals("executionId")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, task.getExecutionId()); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(task.getExecutionId())); report.addData(value); } if (request.getName().equals("formResourceName")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, task.getFormResourceName()); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(task.getFormResourceName())); report.addData(value); } - } - } Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TaskDiscoveryComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TaskDiscoveryComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TaskDiscoveryComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -32,7 +32,7 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; /** - * @author ema(a)redhat.com + * @author <a href mailto=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> * */ public class TaskDiscoveryComponent implements ResourceDiscoveryComponent<ProcessInstanceComponent> { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TimerDiscoveryComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TimerDiscoveryComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TimerDiscoveryComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -32,7 +32,7 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; /** - * @author ema(a)redhat.com + * @author <a href mailto=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> * */ public class TimerDiscoveryComponent implements ResourceDiscoveryComponent<ProcessEngineComponent> { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnection.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnection.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnection.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -32,7 +32,7 @@ import org.jbpm.api.job.Job; import org.jbpm.api.task.Task; /** - * @author ema(a)redhat.com + * @author <a href mailto=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> * */ public interface JBPMEngineConnection { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnector.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnector.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnector.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -22,7 +22,7 @@ package org.rhq.plugins.jbpm4.connector; /** - * @author ema(a)redhat.com + * @author <a href mailto=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> * */ public interface JBPMEngineConnector { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/LocalJBPMEngineConnector.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/LocalJBPMEngineConnector.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/LocalJBPMEngineConnector.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -48,7 +48,7 @@ import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.pvm.internal.cmd.ExecuteJobCmd; /** - * @author ema(a)redhat.com + * @author <a href mailto=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> * */ public class LocalJBPMEngineConnector implements JBPMEngineConnector, JBPMEngineConnection { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/RemoteJBPMEngineConnector.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/RemoteJBPMEngineConnector.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/RemoteJBPMEngineConnector.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** - * @author ema(a)redhat.com + * @author <a href mailto=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> * */ public class RemoteJBPMEngineConnector implements JBPMEngineConnector { Added: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/util/StringUtil.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/util/StringUtil.java (rev 0) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/util/StringUtil.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -0,0 +1,33 @@ +/* + * 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.rhq.plugins.jbpm4.util; +/** + * @author <a href mailto=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> + * + */ +public class StringUtil { + public static String DEFAULT_STRING = "--"; + public static String replaceNull(Object input) { + return input == null ? DEFAULT_STRING : String.valueOf(input); + } + +}