You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/06/20 08:40:37 UTC
[maven] 30/30: Persist method either succeeds or throws Exception,
so returns void
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-5760
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 1a21145c31883a31f8d15e891ce50bce389b1783
Author: Maarten Mulders <ma...@infosupport.com>
AuthorDate: Thu Jun 18 09:27:45 2020 +0200
Persist method either succeeds or throws Exception, so returns void
---
maven-core/src/main/java/org/apache/maven/DefaultMaven.java | 4 ++--
.../org/apache/maven/execution/BuildResumptionDataRepository.java | 3 +--
.../apache/maven/execution/DefaultBuildResumptionDataRepository.java | 4 +---
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index 167cb7b..51d7752 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -384,8 +384,8 @@ public class DefaultMaven
{
try
{
- boolean canResume = buildResumptionDataRepository.persistResumptionData( rootProject, resumption );
- result.setCanResume( canResume );
+ buildResumptionDataRepository.persistResumptionData( rootProject, resumption );
+ result.setCanResume( true );
}
catch ( BuildResumptionPersistenceException e )
{
diff --git a/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionDataRepository.java b/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionDataRepository.java
index b8a3b22..3d0be6f 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionDataRepository.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionDataRepository.java
@@ -36,9 +36,8 @@ public interface BuildResumptionDataRepository
* @param rootProject The root project that is being built.
* @param buildResumptionData Information needed to resume the build.
* @throws BuildResumptionPersistenceException When an error occurs while persisting data.
- * @return Whether any data was persisted.
*/
- boolean persistResumptionData( final MavenProject rootProject, final BuildResumptionData buildResumptionData )
+ void persistResumptionData( final MavenProject rootProject, final BuildResumptionData buildResumptionData )
throws BuildResumptionPersistenceException;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionDataRepository.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionDataRepository.java
index e7965b3..eea097f 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionDataRepository.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionDataRepository.java
@@ -50,7 +50,7 @@ public class DefaultBuildResumptionDataRepository implements BuildResumptionData
private static final Logger LOGGER = LoggerFactory.getLogger( DefaultBuildResumptionDataRepository.class );
@Override
- public boolean persistResumptionData( MavenProject rootProject, BuildResumptionData buildResumptionData )
+ public void persistResumptionData( MavenProject rootProject, BuildResumptionData buildResumptionData )
throws BuildResumptionPersistenceException
{
Properties properties = convertToProperties( buildResumptionData );
@@ -69,8 +69,6 @@ public class DefaultBuildResumptionDataRepository implements BuildResumptionData
String message = "Could not create " + RESUME_PROPERTIES_FILENAME + " file.";
throw new BuildResumptionPersistenceException( message, e );
}
-
- return true;
}
private Properties convertToProperties( final BuildResumptionData buildResumptionData )