You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ba...@apache.org on 2015/04/15 05:52:39 UTC

svn commit: r1673631 - /continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/

Author: batkinson
Date: Wed Apr 15 03:52:39 2015
New Revision: 1673631

URL: http://svn.apache.org/r1673631
Log:
Removed casts made unnecessary by generic dao methods.

Modified:
    continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java
    continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java
    continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildQueueDaoImpl.java
    continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java
    continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java
    continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java
    continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DistributedDirectoryPurgeConfigurationDaoImpl.java
    continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DistributedRepositoryPurgeConfigurationDaoImpl.java
    continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java
    continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java
    continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java
    continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java
    continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java
    continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java
    continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java
    continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java
    continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java?rev=1673631&r1=1673630&r2=1673631&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java Wed Apr 15 03:52:39 2015
@@ -65,7 +65,7 @@ public class BuildDefinitionDaoImpl
     public BuildDefinition getBuildDefinition( int buildDefinitionId )
         throws ContinuumStoreException
     {
-        return (BuildDefinition) getObjectById( BuildDefinition.class, buildDefinitionId );
+        return getObjectById( BuildDefinition.class, buildDefinitionId );
     }
 
     public void removeBuildDefinition( BuildDefinition buildDefinition )
@@ -85,7 +85,7 @@ public class BuildDefinitionDaoImpl
     public BuildDefinition addBuildDefinition( BuildDefinition buildDefinition )
         throws ContinuumStoreException
     {
-        return (BuildDefinition) addObject( buildDefinition );
+        return addObject( buildDefinition );
     }
 
     public List<BuildDefinition> getAllBuildDefinitions()

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java?rev=1673631&r1=1673630&r2=1673631&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java Wed Apr 15 03:52:39 2015
@@ -24,12 +24,12 @@ import org.apache.maven.continuum.store.
 import org.codehaus.plexus.component.annotations.Component;
 import org.springframework.stereotype.Repository;
 
-import java.util.Collections;
-import java.util.List;
 import javax.jdo.Extent;
 import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
 import javax.jdo.Transaction;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -76,14 +76,14 @@ public class BuildDefinitionTemplateDaoI
     public BuildDefinitionTemplate getBuildDefinitionTemplate( int id )
         throws ContinuumStoreException
     {
-        return (BuildDefinitionTemplate) getObjectById( BuildDefinitionTemplate.class, id,
+        return getObjectById( BuildDefinitionTemplate.class, id,
                                                         BUILD_TEMPLATE_BUILD_DEFINITIONS );
     }
 
     public BuildDefinitionTemplate addBuildDefinitionTemplate( BuildDefinitionTemplate buildDefinitionTemplate )
         throws ContinuumStoreException
     {
-        return (BuildDefinitionTemplate) addObject( buildDefinitionTemplate );
+        return addObject( buildDefinitionTemplate );
     }
 
     public BuildDefinitionTemplate updateBuildDefinitionTemplate( BuildDefinitionTemplate buildDefinitionTemplate )

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildQueueDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildQueueDaoImpl.java?rev=1673631&r1=1673630&r2=1673631&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildQueueDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildQueueDaoImpl.java Wed Apr 15 03:52:39 2015
@@ -26,13 +26,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
 import javax.jdo.Extent;
 import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
 import javax.jdo.Transaction;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
@@ -48,7 +48,7 @@ public class BuildQueueDaoImpl
     public BuildQueue addBuildQueue( BuildQueue buildQueue )
         throws ContinuumStoreException
     {
-        return (BuildQueue) addObject( buildQueue );
+        return addObject( buildQueue );
     }
 
     public List<BuildQueue> getAllBuildQueues()
@@ -81,7 +81,7 @@ public class BuildQueueDaoImpl
     public BuildQueue getBuildQueue( int buildQueueId )
         throws ContinuumStoreException
     {
-        return (BuildQueue) getObjectById( BuildQueue.class, buildQueueId );
+        return getObjectById( BuildQueue.class, buildQueueId );
     }
 
     public BuildQueue getBuildQueueByName( String name )

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java?rev=1673631&r1=1673630&r2=1673631&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java Wed Apr 15 03:52:39 2015
@@ -105,7 +105,7 @@ public class BuildResultDaoImpl
 
             project = (Project) pm.getObjectById( objectId );
 
-            build = (BuildResult) makePersistent( pm, build, false );
+            build = makePersistent( pm, build, false );
 
             // TODO: these are in the wrong spot - set them on success (though
             // currently some depend on latest build being the one in progress)
@@ -379,7 +379,7 @@ public class BuildResultDaoImpl
     public BuildResult getBuildResult( int buildId )
         throws ContinuumStoreException
     {
-        return (BuildResult) getObjectById( BuildResult.class, buildId, BUILD_RESULT_WITH_DETAILS_FETCH_GROUP );
+        return getObjectById( BuildResult.class, buildId, BUILD_RESULT_WITH_DETAILS_FETCH_GROUP );
     }
 
     public List<BuildResult> getBuildResultByBuildNumber( int projectId, int buildNumber )

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java?rev=1673631&r1=1673630&r2=1673631&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java Wed Apr 15 03:52:39 2015
@@ -25,12 +25,12 @@ import org.apache.maven.continuum.store.
 import org.codehaus.plexus.component.annotations.Component;
 import org.springframework.stereotype.Repository;
 
-import java.util.Collection;
-import java.util.List;
 import javax.jdo.Extent;
 import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
 import javax.jdo.Transaction;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * @author <a href="mailto:ctan@apache.org">Maria Catherine Tan</a>
@@ -44,7 +44,7 @@ public class ContinuumReleaseResultDaoIm
     public ContinuumReleaseResult addContinuumReleaseResult( ContinuumReleaseResult releaseResult )
         throws ContinuumStoreException
     {
-        return (ContinuumReleaseResult) addObject( releaseResult );
+        return addObject( releaseResult );
     }
 
     public List<ContinuumReleaseResult> getAllContinuumReleaseResults()
@@ -55,7 +55,7 @@ public class ContinuumReleaseResultDaoIm
     public ContinuumReleaseResult getContinuumReleaseResult( int releaseResultId )
         throws ContinuumObjectNotFoundException, ContinuumStoreException
     {
-        return (ContinuumReleaseResult) getObjectById( ContinuumReleaseResult.class, releaseResultId );
+        return getObjectById( ContinuumReleaseResult.class, releaseResultId );
     }
 
     public ContinuumReleaseResult getContinuumReleaseResult( int projectId, String releaseGoal, long startTime,

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java?rev=1673631&r1=1673630&r2=1673631&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java Wed Apr 15 03:52:39 2015
@@ -24,12 +24,12 @@ import org.apache.maven.continuum.store.
 import org.codehaus.plexus.component.annotations.Component;
 import org.springframework.stereotype.Repository;
 
-import java.util.Collections;
-import java.util.List;
 import javax.jdo.Extent;
 import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
 import javax.jdo.Transaction;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -172,13 +172,13 @@ public class DirectoryPurgeConfiguration
     public DirectoryPurgeConfiguration getDirectoryPurgeConfiguration( int configurationId )
         throws ContinuumStoreException
     {
-        return (DirectoryPurgeConfiguration) getObjectById( DirectoryPurgeConfiguration.class, configurationId );
+        return getObjectById( DirectoryPurgeConfiguration.class, configurationId );
     }
 
     public DirectoryPurgeConfiguration addDirectoryPurgeConfiguration( DirectoryPurgeConfiguration purgeConfiguration )
         throws ContinuumStoreException
     {
-        return (DirectoryPurgeConfiguration) addObject( purgeConfiguration );
+        return addObject( purgeConfiguration );
     }
 
     public void updateDirectoryPurgeConfiguration( DirectoryPurgeConfiguration purgeConfiguration )

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DistributedDirectoryPurgeConfigurationDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DistributedDirectoryPurgeConfigurationDaoImpl.java?rev=1673631&r1=1673630&r2=1673631&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DistributedDirectoryPurgeConfigurationDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DistributedDirectoryPurgeConfigurationDaoImpl.java Wed Apr 15 03:52:39 2015
@@ -24,12 +24,12 @@ import org.apache.maven.continuum.store.
 import org.codehaus.plexus.component.annotations.Component;
 import org.springframework.stereotype.Repository;
 
-import java.util.Collections;
-import java.util.List;
 import javax.jdo.Extent;
 import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
 import javax.jdo.Transaction;
+import java.util.Collections;
+import java.util.List;
 
 @Repository( "distributedDirectoryPurgeConfigurationDao" )
 @Component( role = org.apache.continuum.dao.DistributedDirectoryPurgeConfigurationDao.class )
@@ -139,15 +139,14 @@ public class DistributedDirectoryPurgeCo
     public DistributedDirectoryPurgeConfiguration getDistributedDirectoryPurgeConfiguration( int configurationId )
         throws ContinuumStoreException
     {
-        return (DistributedDirectoryPurgeConfiguration) getObjectById( DistributedDirectoryPurgeConfiguration.class,
-                                                                       configurationId );
+        return getObjectById( DistributedDirectoryPurgeConfiguration.class, configurationId );
     }
 
     public DistributedDirectoryPurgeConfiguration addDistributedDirectoryPurgeConfiguration(
         DistributedDirectoryPurgeConfiguration purgeConfiguration )
         throws ContinuumStoreException
     {
-        return (DistributedDirectoryPurgeConfiguration) addObject( purgeConfiguration );
+        return addObject( purgeConfiguration );
     }
 
     public void updateDistributedDirectoryPurgeConfiguration(

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DistributedRepositoryPurgeConfigurationDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DistributedRepositoryPurgeConfigurationDaoImpl.java?rev=1673631&r1=1673630&r2=1673631&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DistributedRepositoryPurgeConfigurationDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DistributedRepositoryPurgeConfigurationDaoImpl.java Wed Apr 15 03:52:39 2015
@@ -25,7 +25,7 @@ public class DistributedRepositoryPurgeC
         DistributedRepositoryPurgeConfiguration purgeConfiguration )
         throws ContinuumStoreException
     {
-        return (DistributedRepositoryPurgeConfiguration) addObject( purgeConfiguration );
+        return addObject( purgeConfiguration );
     }
 
     public void removeDistributedRepositoryPurgeConfiguration(
@@ -37,8 +37,7 @@ public class DistributedRepositoryPurgeC
     public DistributedRepositoryPurgeConfiguration getDistributedRepositoryPurgeConfiguration( int configId )
         throws ContinuumStoreException
     {
-        return (DistributedRepositoryPurgeConfiguration) getObjectById( DistributedRepositoryPurgeConfiguration.class,
-                                                                        configId );
+        return getObjectById( DistributedRepositoryPurgeConfiguration.class, configId );
     }
 
     public void updateDistributedRepositoryPurgeConfiguration( DistributedRepositoryPurgeConfiguration purgeConfig )

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java?rev=1673631&r1=1673630&r2=1673631&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java Wed Apr 15 03:52:39 2015
@@ -26,13 +26,13 @@ import org.codehaus.plexus.component.ann
 import org.codehaus.plexus.util.StringUtils;
 import org.springframework.stereotype.Repository;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
 import javax.jdo.Extent;
 import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
 import javax.jdo.Transaction;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -45,7 +45,7 @@ public class InstallationDaoImpl
 {
     public Installation addInstallation( Installation installation )
     {
-        return (Installation) addObject( installation );
+        return addObject( installation );
     }
 
     public List<Installation> getAllInstallations()

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java?rev=1673631&r1=1673630&r2=1673631&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java Wed Apr 15 03:52:39 2015
@@ -24,13 +24,13 @@ import org.apache.maven.continuum.store.
 import org.codehaus.plexus.component.annotations.Component;
 import org.springframework.stereotype.Repository;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
 import javax.jdo.Extent;
 import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
 import javax.jdo.Transaction;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -44,7 +44,7 @@ public class LocalRepositoryDaoImpl
     public LocalRepository addLocalRepository( LocalRepository repository )
         throws ContinuumStoreException
     {
-        return (LocalRepository) addObject( repository );
+        return addObject( repository );
     }
 
     public void updateLocalRepository( LocalRepository repository )
@@ -99,7 +99,7 @@ public class LocalRepositoryDaoImpl
     public LocalRepository getLocalRepository( int repositoryId )
         throws ContinuumStoreException
     {
-        return (LocalRepository) getObjectById( LocalRepository.class, repositoryId );
+        return getObjectById( LocalRepository.class, repositoryId );
     }
 
     public LocalRepository getLocalRepositoryByName( String name )

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java?rev=1673631&r1=1673630&r2=1673631&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java Wed Apr 15 03:52:39 2015
@@ -24,12 +24,12 @@ import org.apache.maven.continuum.store.
 import org.codehaus.plexus.component.annotations.Component;
 import org.springframework.stereotype.Repository;
 
-import java.util.Collection;
-import java.util.List;
 import javax.jdo.Extent;
 import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
 import javax.jdo.Transaction;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -89,13 +89,13 @@ public class ProfileDaoImpl
 
     public Profile addProfile( Profile profile )
     {
-        return (Profile) addObject( profile );
+        return addObject( profile );
     }
 
     public Profile getProfile( int profileId )
         throws ContinuumStoreException
     {
-        return (Profile) getObjectById( Profile.class, profileId );
+        return getObjectById( Profile.class, profileId );
     }
 
     public void updateProfile( Profile profile )

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java?rev=1673631&r1=1673630&r2=1673631&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java Wed Apr 15 03:52:39 2015
@@ -60,7 +60,7 @@ public class ProjectDaoImpl
     public Project getProject( int projectId )
         throws ContinuumStoreException
     {
-        return (Project) getObjectById( Project.class, projectId );
+        return getObjectById( Project.class, projectId );
     }
 
     public Project getProject( String groupId, String artifactId, String version )
@@ -184,19 +184,19 @@ public class ProjectDaoImpl
     public Project getProjectWithBuilds( int projectId )
         throws ContinuumStoreException
     {
-        return (Project) getObjectById( Project.class, projectId, PROJECT_WITH_BUILDS_FETCH_GROUP );
+        return getObjectById( Project.class, projectId, PROJECT_WITH_BUILDS_FETCH_GROUP );
     }
 
     public Project getProjectWithBuildDetails( int projectId )
         throws ContinuumStoreException
     {
-        return (Project) getObjectById( Project.class, projectId, PROJECT_BUILD_DETAILS_FETCH_GROUP );
+        return getObjectById( Project.class, projectId, PROJECT_BUILD_DETAILS_FETCH_GROUP );
     }
 
     public Project getProjectWithCheckoutResult( int projectId )
         throws ContinuumStoreException
     {
-        return (Project) getObjectById( Project.class, projectId, PROJECT_WITH_CHECKOUT_RESULT_FETCH_GROUP );
+        return getObjectById( Project.class, projectId, PROJECT_WITH_CHECKOUT_RESULT_FETCH_GROUP );
     }
 
     public List<Project> getProjectsInGroup( int projectGroupId )
@@ -268,7 +268,7 @@ public class ProjectDaoImpl
     public Project getProjectWithAllDetails( int projectId )
         throws ContinuumStoreException
     {
-        return (Project) getObjectById( Project.class, projectId, PROJECT_ALL_DETAILS_FETCH_GROUP );
+        return getObjectById( Project.class, projectId, PROJECT_ALL_DETAILS_FETCH_GROUP );
     }
 
     public List<Project> getAllProjectsByName()
@@ -304,7 +304,7 @@ public class ProjectDaoImpl
     public Project getProjectWithDependencies( int projectId )
         throws ContinuumStoreException
     {
-        return (Project) getObjectById( Project.class, projectId, PROJECT_DEPENDENCIES_FETCH_GROUP );
+        return getObjectById( Project.class, projectId, PROJECT_DEPENDENCIES_FETCH_GROUP );
     }
 
     public Map<Integer, ProjectGroupSummary> getProjectsSummary()

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java?rev=1673631&r1=1673630&r2=1673631&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java Wed Apr 15 03:52:39 2015
@@ -57,7 +57,7 @@ public class ProjectGroupDaoImpl
 
     public ProjectGroup addProjectGroup( ProjectGroup group )
     {
-        return (ProjectGroup) addObject( group );
+        return addObject( group );
     }
 
     public void removeProjectGroup( ProjectGroup projectGroup )
@@ -117,27 +117,25 @@ public class ProjectGroupDaoImpl
     public ProjectGroup getProjectGroup( int projectGroupId )
         throws ContinuumStoreException
     {
-        return (ProjectGroup) getObjectById( ProjectGroup.class, projectGroupId );
+        return getObjectById( ProjectGroup.class, projectGroupId );
     }
 
     public ProjectGroup getProjectGroupByGroupId( String groupId )
         throws ContinuumStoreException
     {
-        return (ProjectGroup) getObjectFromQuery( ProjectGroup.class, "groupId", groupId, null );
+        return getObjectFromQuery( ProjectGroup.class, "groupId", groupId, null );
     }
 
     public ProjectGroup getProjectGroupByGroupIdWithBuildDetails( String groupId )
         throws ContinuumStoreException
     {
-        return (ProjectGroup) getObjectFromQuery( ProjectGroup.class, "groupId", groupId,
-                                                  PROJECT_BUILD_DETAILS_FETCH_GROUP );
+        return getObjectFromQuery( ProjectGroup.class, "groupId", groupId, PROJECT_BUILD_DETAILS_FETCH_GROUP );
     }
 
     public ProjectGroup getProjectGroupByGroupIdWithProjects( String groupId )
         throws ContinuumStoreException
     {
-        return (ProjectGroup) getObjectFromQuery( ProjectGroup.class, "groupId", groupId,
-                                                  PROJECTGROUP_PROJECTS_FETCH_GROUP );
+        return getObjectFromQuery( ProjectGroup.class, "groupId", groupId, PROJECTGROUP_PROJECTS_FETCH_GROUP );
     }
 
     public ProjectGroup getProjectGroupByProjectId( int projectId )
@@ -170,7 +168,7 @@ public class ProjectGroupDaoImpl
     public ProjectGroup getProjectGroupWithProjects( int projectGroupId )
         throws ContinuumStoreException
     {
-        return (ProjectGroup) getObjectById( ProjectGroup.class, projectGroupId, PROJECTGROUP_PROJECTS_FETCH_GROUP );
+        return getObjectById( ProjectGroup.class, projectGroupId, PROJECTGROUP_PROJECTS_FETCH_GROUP );
     }
 
     public Collection<ProjectGroup> getAllProjectGroupsWithProjects()
@@ -201,7 +199,7 @@ public class ProjectGroupDaoImpl
     public ProjectGroup getProjectGroupWithBuildDetailsByProjectGroupId( int projectGroupId )
         throws ContinuumStoreException
     {
-        return (ProjectGroup) getObjectById( ProjectGroup.class, projectGroupId, PROJECT_BUILD_DETAILS_FETCH_GROUP );
+        return getObjectById( ProjectGroup.class, projectGroupId, PROJECT_BUILD_DETAILS_FETCH_GROUP );
     }
 
     public List<ProjectGroup> getProjectGroupByRepository( int repositoryId )

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java?rev=1673631&r1=1673630&r2=1673631&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java Wed Apr 15 03:52:39 2015
@@ -44,7 +44,7 @@ public class ProjectScmRootDaoImpl
     public ProjectScmRoot addProjectScmRoot( ProjectScmRoot projectScmRoot )
         throws ContinuumStoreException
     {
-        return (ProjectScmRoot) addObject( projectScmRoot );
+        return addObject( projectScmRoot );
     }
 
     public List<ProjectScmRoot> getAllProjectScmRoots()
@@ -141,6 +141,6 @@ public class ProjectScmRootDaoImpl
     public ProjectScmRoot getProjectScmRoot( int projectScmRootId )
         throws ContinuumObjectNotFoundException, ContinuumStoreException
     {
-        return (ProjectScmRoot) getObjectById( ProjectScmRoot.class, projectScmRootId );
+        return getObjectById( ProjectScmRoot.class, projectScmRootId );
     }
 }

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java?rev=1673631&r1=1673630&r2=1673631&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java Wed Apr 15 03:52:39 2015
@@ -138,14 +138,14 @@ public class RepositoryPurgeConfiguratio
     public RepositoryPurgeConfiguration getRepositoryPurgeConfiguration( int configurationId )
         throws ContinuumStoreException
     {
-        return (RepositoryPurgeConfiguration) getObjectById( RepositoryPurgeConfiguration.class, configurationId );
+        return getObjectById( RepositoryPurgeConfiguration.class, configurationId );
     }
 
     public RepositoryPurgeConfiguration addRepositoryPurgeConfiguration(
         RepositoryPurgeConfiguration purgeConfiguration )
         throws ContinuumStoreException
     {
-        return (RepositoryPurgeConfiguration) addObject( purgeConfiguration );
+        return addObject( purgeConfiguration );
     }
 
     public void updateRepositoryPurgeConfiguration( RepositoryPurgeConfiguration purgeConfiguration )

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java?rev=1673631&r1=1673630&r2=1673631&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java Wed Apr 15 03:52:39 2015
@@ -47,7 +47,7 @@ public class ScheduleDaoImpl
 
     public Schedule addSchedule( Schedule schedule )
     {
-        return (Schedule) addObject( schedule );
+        return addObject( schedule );
     }
 
     public Schedule getScheduleByName( String name )
@@ -114,6 +114,6 @@ public class ScheduleDaoImpl
     public Schedule getSchedule( int scheduleId )
         throws ContinuumStoreException
     {
-        return (Schedule) getObjectById( Schedule.class, scheduleId );
+        return getObjectById( Schedule.class, scheduleId );
     }
 }

Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java?rev=1673631&r1=1673630&r2=1673631&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java Wed Apr 15 03:52:39 2015
@@ -37,7 +37,7 @@ public class SystemConfigurationDaoImpl
 {
     public SystemConfiguration addSystemConfiguration( SystemConfiguration systemConf )
     {
-        return (SystemConfiguration) addObject( systemConf );
+        return addObject( systemConf );
     }
 
     public void updateSystemConfiguration( SystemConfiguration systemConf )