Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MNG-6829] Replace StringUtils#isEmpty(String) and #isNotEmpty(String) #97

Merged
merged 1 commit into from
May 23, 2023
Merged

[MNG-6829] Replace StringUtils#isEmpty(String) and #isNotEmpty(String) #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ private String getBottomText()
*/
private void copyRequiredResources( String dir )
{
if ( StringUtils.isNotEmpty( stylesheet ) )
if ( stylesheet != null && !stylesheet.isEmpty() )
{
File stylesheetFile = new File( stylesheet );
File destStylesheetFile = new File( dir, "stylesheet.css" );
Expand Down Expand Up @@ -493,7 +493,7 @@ protected void executeReport( Locale locale )
private String getTemplateDir()
{
// Check if overridden
if ( StringUtils.isEmpty( templateDir ) )
if ( templateDir == null || templateDir.isEmpty() )
{
if ( javadocTemplatesVersion.isAtLeast( "1.8" ) )
{
Expand Down Expand Up @@ -524,7 +524,7 @@ private void setJavadocTemplatesVersion()
{
JavaVersion javaVersion = JavaVersion.JAVA_SPECIFICATION_VERSION;

if ( StringUtils.isNotEmpty( javadocVersion ) )
if ( javadocVersion != null && !javadocVersion.isEmpty() )
{
javadocTemplatesVersion = JavaVersion.parse( javadocVersion );
}
Expand Down Expand Up @@ -592,7 +592,7 @@ private Path getJavadocLocation()
// Special case: using the site:stage goal
String stagingDirectory = System.getProperty( "stagingDirectory" );

if ( StringUtils.isNotEmpty( stagingDirectory ) )
if ( stagingDirectory != null && !stagingDirectory.isEmpty() )
{
String javadocDestDir = getJavadocDir().getName();
boolean javadocAggregate = JxrReportUtil.isJavadocAggregated( project );
Expand Down
2 changes: 1 addition & 1 deletion maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReportUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ protected static String getMavenJavadocPluginBasicOption( MavenProject project,
}

String attribute = pluginConf.getAttribute( optionName );
if ( StringUtils.isNotEmpty( attribute ) )
if ( attribute != null && !attribute.isEmpty() )
{
return attribute;
}
Expand Down