Skip to content

Commit

Permalink
update debug message
Browse files Browse the repository at this point in the history
  • Loading branch information
@bsorrentino
bsorrentino committed Oct 1, 2020
1 parent fb81aea commit 9646e90
Showing 1 changed file with 28 additions and 26 deletions.
54 changes: 28 additions & 26 deletions processor/src/main/java/org/bsc/maven/plugin/processor/AbstractAnnotationProcessorMojo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@
import org.sonatype.aether.util.artifact.DefaultArtifact;
*/
// 3.1.0
import static java.lang.String.format;
import static java.util.Optional.ofNullable;
import static java.util.stream.Collectors.joining;


/**
Expand Down Expand Up @@ -420,7 +422,7 @@ private String buildModulePath()

return getClasspathElements(new java.util.LinkedHashSet<>())
.stream()
.collect(Collectors.joining( File.pathSeparator) );
.collect(joining( File.pathSeparator) );
}

/**
Expand Down Expand Up @@ -565,7 +567,7 @@ private List<String> prepareOptions( JavaCompiler compiler ) {

if( getLog().isDebugEnabled() ) {
for (String option : options) {
getLog().debug(String.format("javac option: %s", option));
getLog().debug(format("javac option: %s", option));
}
}

Expand Down Expand Up @@ -623,15 +625,15 @@ private boolean areSourceFilesSameAsPreviousRun(List<JavaFileObject> allSources)
Set<String> previousSourceFiles = new HashSet<>(Files.readAllLines(sourceFileList));
Set<String> currentSourceFiles = allSources.stream().map(JavaFileObject::getName).collect(Collectors.toSet());
if (getLog().isDebugEnabled()) {
Set<String> removedSourceFiles = previousSourceFiles.stream()
final String removedSourceFiles = previousSourceFiles.stream()
.filter(f -> !currentSourceFiles.contains(f))
.collect(Collectors.toSet());
getLog().debug("removed source files: " + removedSourceFiles);
.collect(joining("\n"));
getLog().debug(format("removed source files:\n%s", removedSourceFiles));

Set<String> newSourceFiles = currentSourceFiles.stream()
final String newSourceFiles = currentSourceFiles.stream()
.filter(f -> !previousSourceFiles.contains(f))
.collect(Collectors.toSet());
getLog().debug("new source files: " + newSourceFiles);
.collect(joining("\n"));
getLog().debug(format("new source files:\n%s", newSourceFiles));
}
return previousSourceFiles.equals(currentSourceFiles);
} finally {
Expand Down Expand Up @@ -685,14 +687,14 @@ private void executeWithExceptionsHandled() throws Exception
continue;
}

getLog().debug( String.format( "processing source directory [%s]", sourceDir.getPath()) );
getLog().debug( format( "processing source directory [%s]", sourceDir.getPath()) );

if( !sourceDir.exists() ) {
getLog().warn( String.format("source directory [%s] doesn't exist! Processor task will be skipped!", sourceDir.getPath()));
getLog().warn( format("source directory [%s] doesn't exist! Processor task will be skipped!", sourceDir.getPath()));
continue;
}
if( !sourceDir.isDirectory() ) {
getLog().warn( String.format("source directory [%s] is invalid! Processor task will be skipped!", sourceDir.getPath()));
getLog().warn( format("source directory [%s] is invalid! Processor task will be skipped!", sourceDir.getPath()));
continue;
}

Expand All @@ -710,17 +712,17 @@ private void executeWithExceptionsHandled() throws Exception
if (null != kind)
switch (kind) {
case ERROR:
getLog().error(String.format("diagnostic: %s", diagnostic));
getLog().error(format("diagnostic: %s", diagnostic));
break;
case MANDATORY_WARNING:
case WARNING:
getLog().warn(String.format("diagnostic: %s", diagnostic));
getLog().warn(format("diagnostic: %s", diagnostic));
break;
case NOTE:
getLog().info(String.format("diagnostic: %s", diagnostic));
getLog().info(format("diagnostic: %s", diagnostic));
break;
case OTHER:
getLog().info(String.format("diagnostic: %s", diagnostic));
getLog().info(format("diagnostic: %s", diagnostic));
break;
default:
break;
Expand All @@ -732,7 +734,7 @@ private void executeWithExceptionsHandled() throws Exception
java.util.Set< Map.Entry<String,String>> pSet = systemProperties.entrySet();

for ( Map.Entry<String,String> e : pSet ) {
getLog().debug( String.format("set system property : [%s] = [%s]", e.getKey(), e.getValue() ));
getLog().debug( format("set system property : [%s] = [%s]", e.getKey(), e.getValue() ));
System.setProperty(e.getKey(), e.getValue());
}

Expand Down Expand Up @@ -762,10 +764,10 @@ private void executeWithExceptionsHandled() throws Exception
}
}

getLog().debug(String.format("** Discovered %d java sources in %s", sourceCount, f.getAbsolutePath()));
getLog().debug(format("** Discovered %d java sources in %s", sourceCount, f.getAbsolutePath()));

} catch (Exception ex) {
getLog().warn(String.format("Problem reading source archive [%s]", artifact.getFile().getPath()));
getLog().warn(format("Problem reading source archive [%s]", artifact.getFile().getPath()));
getLog().debug(ex);
}
});
Expand Down Expand Up @@ -809,11 +811,11 @@ private void executeWithExceptionsHandled() throws Exception
charset = Charset.forName(encoding);
}
catch( IllegalCharsetNameException ex1 ) {
getLog().warn( String.format("the given charset name [%s] is illegal!. default is used", encoding ));
getLog().warn( format("the given charset name [%s] is illegal!. default is used", encoding ));
charset = null;
}
catch( UnsupportedCharsetException ex2 ) {
getLog().warn( String.format("the given charset name [%s] is unsupported!. default is used", encoding ));
getLog().warn( format("the given charset name [%s] is unsupported!. default is used", encoding ));
charset = null;
}
}
Expand Down Expand Up @@ -898,7 +900,7 @@ private void addCompilerArguments(List<String> options) {
for (String arg : compilerArguments.split(" ")) {
if (!StringUtils.isEmpty(arg)) {
arg = arg.trim();
getLog().debug(String.format("Adding compiler arg: %s", arg));
getLog().debug(format("Adding compiler arg: %s", arg));
options.add(arg);
}
}
Expand All @@ -907,9 +909,9 @@ private void addCompilerArguments(List<String> options) {
for( java.util.Map.Entry<String,Object> e : optionMap.entrySet() ) {

if( !StringUtils.isEmpty(e.getKey()) && e.getValue()!=null ) {
String opt = String.format("-A%s=%s", e.getKey().trim(), e.getValue().toString().trim());
String opt = format("-A%s=%s", e.getKey().trim(), e.getValue().toString().trim());
options.add( opt );
getLog().debug(String.format("Adding compiler arg: %s", opt));
getLog().debug(format("Adding compiler arg: %s", opt));
}
}

Expand All @@ -920,7 +922,7 @@ private void addOutputToSourcesIfNeeded()
{
final Boolean add = addOutputDirectoryToCompilationSources;
if (add == null || add.booleanValue()) {
getLog().debug(String.format("Source directory: %s added", outputDirectory));
getLog().debug(format("Source directory: %s added", outputDirectory));
addCompileSourceRoot(project, outputDirectory.getAbsolutePath());
}
}
Expand Down Expand Up @@ -991,7 +993,7 @@ private Artifact resolveSourceArtifact( Artifact dep ) throws ArtifactResolution
request.setArtifact( artifact );
request.setRepositories(remoteRepos);

getLog().debug( String.format("Resolving artifact %s from %s", artifact, remoteRepos ));
getLog().debug( format("Resolving artifact %s from %s", artifact, remoteRepos ));

final ArtifactResult result = repoSystem.resolveArtifact( repoSession, request );

Expand All @@ -1017,7 +1019,7 @@ private void processSourceArtifacts( Consumer<Artifact> closure ) {
}

} catch (ArtifactResolutionException ex) {
getLog().warn( String.format(" sources for artifact [%s] not found!", dep.toString()));
getLog().warn( format(" sources for artifact [%s] not found!", dep.toString()));
getLog().debug(ex);

}
Expand Down

0 comments on commit 9646e90

Please sign in to comment.