You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2021/01/30 21:48:32 UTC
[maven] branch avoid-empty-locations created (now d08e3ef)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch avoid-empty-locations
in repository https://gitbox.apache.org/repos/asf/maven.git.
at d08e3ef Test for empty locations and avoid printing them
This branch includes the following new commits:
new d08e3ef Test for empty locations and avoid printing them
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven] 01/01: Test for empty locations and avoid printing them
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch avoid-empty-locations
in repository https://gitbox.apache.org/repos/asf/maven.git
commit d08e3efe5a9c3e587dcb9de1a672db441816647e
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Jan 30 22:48:14 2021 +0100
Test for empty locations and avoid printing them
---
.../src/main/java/org/apache/maven/building/DefaultProblem.java | 8 +++++++-
.../java/org/apache/maven/exception/DefaultExceptionHandler.java | 2 +-
.../src/main/java/org/apache/maven/project/MavenProject.java | 9 ++-------
.../java/org/apache/maven/project/ProjectBuildingException.java | 8 ++++++--
.../org/apache/maven/model/building/ModelBuildingException.java | 8 ++++++--
.../apache/maven/settings/building/DefaultSettingsProblem.java | 7 ++++++-
.../maven/settings/building/SettingsBuildingException.java | 8 ++++++--
7 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java b/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java
index c4bfe1e..212eaa1 100644
--- a/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java
+++ b/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java
@@ -153,7 +153,13 @@ class DefaultProblem
buffer.append( '[' ).append( getSeverity() ).append( "] " );
buffer.append( getMessage() );
- buffer.append( " @ " ).append( getLocation() );
+ String location = getLocation();
+ if ( !location.isEmpty() )
+ {
+ buffer.append( " @ " );
+ buffer.append( location );
+ }
+
return buffer.toString();
}
diff --git a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
index 4a5b281..30b73f4 100644
--- a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
+++ b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
@@ -163,7 +163,7 @@ public class DefaultExceptionHandler
String location = ModelProblemUtils.formatLocation( problem, projectId );
- if ( StringUtils.isNotEmpty( location ) )
+ if ( !location.isEmpty() )
{
message += " @ " + location;
}
diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
index 958df1e..57069a5 100644
--- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
+++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
@@ -1154,16 +1154,11 @@ public class MavenProject
sb.append( getArtifactId() );
sb.append( ':' );
sb.append( getVersion() );
- sb.append( " @ " );
-
- try
+ if ( getFile() != null )
{
+ sb.append( " @ " );
sb.append( getFile().getPath() );
}
- catch ( NullPointerException e )
- {
- // don't log it.
- }
return sb.toString();
}
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
index 7786c90..3ace7a4 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
@@ -135,8 +135,12 @@ public class ProjectBuildingException
writer.print( problem.getSeverity() );
writer.print( "] " );
writer.print( problem.getMessage() );
- writer.print( " @ " );
- writer.println( ModelProblemUtils.formatLocation( problem, result.getProjectId() ) );
+ String location = ModelProblemUtils.formatLocation( problem, result.getProjectId() );
+ if ( !location.isEmpty() )
+ {
+ writer.print( " @ " );
+ writer.println( location );
+ }
}
}
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
index b527438..e9d18e4 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
@@ -170,8 +170,12 @@ public class ModelBuildingException
writer.print( problem.getSeverity() );
writer.print( "] " );
writer.print( problem.getMessage() );
- writer.print( " @ " );
- writer.println( ModelProblemUtils.formatLocation( problem, modelId ) );
+ String location = ModelProblemUtils.formatLocation( problem, modelId );
+ if ( !location.isEmpty() )
+ {
+ writer.print( " @ " );
+ writer.println( location );
+ }
}
return buffer.toString();
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java
index a8eb909..ac06109 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java
@@ -158,7 +158,12 @@ public class DefaultSettingsProblem
buffer.append( '[' ).append( getSeverity() ).append( "] " );
buffer.append( getMessage() );
- buffer.append( " @ " ).append( getLocation() );
+ String location = getLocation();
+ if ( !location.isEmpty() )
+ {
+ buffer.append( " @ " );
+ buffer.append( location );
+ }
return buffer.toString();
}
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java
index 0f2ade2..530d522 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java
@@ -80,8 +80,12 @@ public class SettingsBuildingException
writer.print( problem.getSeverity() );
writer.print( "] " );
writer.print( problem.getMessage() );
- writer.print( " @ " );
- writer.println( problem.getLocation() );
+ String location = problem.getLocation();
+ if ( !location.isEmpty() )
+ {
+ writer.print( " @ " );
+ writer.println( location );
+ }
}
return buffer.toString();