From 9e7af871d573517d4c0ba6527daead719aca42ba Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Sat, 16 Nov 2024 22:43:32 +0000 Subject: [PATCH 1/2] refactor: Replace Plexus AbstractLogEnabled with SLF4J Use this link to re-run the recipe: https://app.moderne.io/builder/LgpIkYTbY?organizationId=ZTY0ODBjZGQtMTIyOC00MzA4LTlhZmQtODM2ZmYxOWFjNzM2 Co-authored-by: Moderne --- .../archetype/DefaultArchetypeManager.java | 25 ++-- .../DefaultArchetypeArtifactManager.java | 33 ++--- .../common/DefaultArchetypeFilesResolver.java | 40 +++--- .../archetype/common/DefaultPomManager.java | 21 +-- .../common/util/FileCharsetDetector.java | 6 +- .../creator/FilesetArchetypeCreator.java | 136 +++++++++--------- .../generator/DefaultArchetypeGenerator.java | 6 +- .../DefaultFilesetArchetypeGenerator.java | 117 ++++++++------- .../archetype/old/DefaultOldArchetype.java | 43 +++--- .../DefaultRepositoryCrawler.java | 16 ++- .../source/CatalogArchetypeDataSource.java | 6 +- .../InternalCatalogArchetypeDataSource.java | 3 + .../LocalCatalogArchetypeDataSource.java | 13 +- .../RemoteCatalogArchetypeDataSource.java | 3 + .../archetype/ui/DefaultArchetypeFactory.java | 36 ++--- .../DefaultArchetypeCreationConfigurator.java | 58 ++++---- .../DefaultArchetypeCreationQueryer.java | 6 +- ...efaultArchetypeGenerationConfigurator.java | 25 ++-- .../DefaultArchetypeGenerationQueryer.java | 6 +- .../DefaultArchetypeSelectionQueryer.java | 6 +- .../generation/DefaultArchetypeSelector.java | 29 ++-- 21 files changed, 325 insertions(+), 309 deletions(-) diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java b/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java index 56e7e54e..21d31afa 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java @@ -37,17 +37,19 @@ import org.apache.maven.archetype.generator.ArchetypeGenerator; import org.apache.maven.archetype.source.ArchetypeDataSource; import org.apache.maven.archetype.source.ArchetypeDataSourceException; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.IOUtil; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.repository.RemoteRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author Jason van Zyl */ @Named @Singleton -public class DefaultArchetypeManager extends AbstractLogEnabled implements ArchetypeManager { +public class DefaultArchetypeManager implements ArchetypeManager { + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultArchetypeManager.class); @Inject @Named("fileset") @@ -92,7 +94,7 @@ public void zip(File sourceDirectory, File archive) throws IOException { } if (!archive.exists() && !archive.createNewFile()) { - getLogger().warn("Could not create new file \"" + archive.getPath() + "\" or the file already exists."); + LOGGER.warn("Could not create new file \"" + archive.getPath() + "\" or the file already exists."); } try (ZipOutputStream zos = new ZipOutputStream(Files.newOutputStream(archive.toPath()))) { @@ -146,10 +148,9 @@ public ArchetypeCatalog getInternalCatalog() { return source.getArchetypeCatalog(null, null); } catch (ArchetypeDataSourceException e) { - getLogger() - .warn( + LOGGER.warn( "failed to read catalog: " + e.getMessage(), - getLogger().isDebugEnabled() ? e : null); + LOGGER.isDebugEnabled() ? e : null); return new ArchetypeCatalog(); } } @@ -161,10 +162,9 @@ public ArchetypeCatalog getLocalCatalog(RepositorySystemSession repositorySessio return source.getArchetypeCatalog(repositorySession, null); } catch (ArchetypeDataSourceException e) { - getLogger() - .warn( + LOGGER.warn( "failed to read catalog: " + e.getMessage(), - getLogger().isDebugEnabled() ? e : null); + LOGGER.isDebugEnabled() ? e : null); return new ArchetypeCatalog(); } } @@ -177,10 +177,9 @@ public ArchetypeCatalog getRemoteCatalog( return source.getArchetypeCatalog(repositorySession, remoteRepositories); } catch (ArchetypeDataSourceException e) { - getLogger() - .warn( + LOGGER.warn( "failed to download from remote" + e.getMessage(), - getLogger().isDebugEnabled() ? e : null); + LOGGER.isDebugEnabled() ? e : null); return new ArchetypeCatalog(); } } @@ -192,7 +191,7 @@ public File updateLocalCatalog(RepositorySystemSession repositorySystemSession, return source.updateCatalog(repositorySystemSession, archetype); } catch (ArchetypeDataSourceException e) { - getLogger().warn("failed to update catalog", e); + LOGGER.warn("failed to update catalog", e); } return null; } diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java b/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java index e06d4f3d..a346552b 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java @@ -47,14 +47,16 @@ import org.apache.maven.archetype.metadata.io.xpp3.ArchetypeDescriptorXpp3Reader; import org.apache.maven.archetype.old.descriptor.ArchetypeDescriptorBuilder; import org.apache.maven.model.Model; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.repository.RemoteRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Named @Singleton -public class DefaultArchetypeArtifactManager extends AbstractLogEnabled implements ArchetypeArtifactManager { +public class DefaultArchetypeArtifactManager implements ArchetypeArtifactManager { + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultArchetypeArtifactManager.class); @Inject private Downloader downloader; @@ -138,24 +140,24 @@ public ZipFile getArchetypeZipFile(File archetypeFile) throws UnknownArchetype { @Override public boolean isFileSetArchetype(File archetypeFile) { - getLogger().debug("checking fileset archetype status on " + archetypeFile); + LOGGER.debug("checking fileset archetype status on " + archetypeFile); try (ZipFile zipFile = getArchetypeZipFile(archetypeFile)) { return isFileSetArchetype(zipFile); } catch (IOException | UnknownArchetype e) { - getLogger().debug(e.toString()); + LOGGER.debug(e.toString()); return false; } } @Override public boolean isOldArchetype(File archetypeFile) { - getLogger().debug("checking old archetype status on " + archetypeFile); + LOGGER.debug("checking old archetype status on " + archetypeFile); try (ZipFile zipFile = getArchetypeZipFile(archetypeFile)) { return isOldArchetype(zipFile); } catch (IOException | UnknownArchetype e) { - getLogger().debug(e.toString()); + LOGGER.debug(e.toString()); return false; } } @@ -181,8 +183,7 @@ public boolean exists( return archetype.exists(); } catch (DownloadException e) { - getLogger() - .debug( + LOGGER.debug( "Archetype " + archetypeGroupId + ":" + archetypeArtifactId + ":" + archetypeVersion + " doesn't exist", e); @@ -211,7 +212,7 @@ public ArchetypeDescriptor getFileSetArchetypeDescriptor(File archetypeFile) thr @Override public List getFilesetArchetypeResources(File archetypeFile) throws UnknownArchetype { - getLogger().debug("getFilesetArchetypeResources( \"" + archetypeFile.getAbsolutePath() + "\" )"); + LOGGER.debug("getFilesetArchetypeResources( \"" + archetypeFile.getAbsolutePath() + "\" )"); List archetypeResources = new ArrayList<>(); try (ZipFile zipFile = getArchetypeZipFile(archetypeFile)) { @@ -222,11 +223,11 @@ public List getFilesetArchetypeResources(File archetypeFile) throws Unkn if (entry.getName().startsWith(Constants.ARCHETYPE_RESOURCES)) { // not supposed to be file.separator String resource = entry.getName().substring(Constants.ARCHETYPE_RESOURCES.length() + 1); - getLogger().debug(" - found resource (" + Constants.ARCHETYPE_RESOURCES + "/)" + resource); + LOGGER.debug(" - found resource (" + Constants.ARCHETYPE_RESOURCES + "/)" + resource); // TODO:FIXME archetypeResources.add(resource); } else { - getLogger().debug(" - ignored resource " + entry.getName()); + LOGGER.debug(" - ignored resource " + entry.getName()); } } return archetypeResources; @@ -249,12 +250,12 @@ private File getArchetype(String archetypeGroupId, String archetypeArtifactId, S String key = archetypeGroupId + ":" + archetypeArtifactId + ":" + archetypeVersion; if (archetypeCache.containsKey(key)) { - getLogger().debug("Found archetype " + key + " in cache: " + archetypeCache.get(key)); + LOGGER.debug("Found archetype " + key + " in cache: " + archetypeCache.get(key)); return archetypeCache.get(key); } - getLogger().debug("Not found archetype " + key + " in cache"); + LOGGER.debug("Not found archetype " + key + " in cache"); return null; } @@ -335,15 +336,15 @@ private Reader getDescriptorReader(ZipFile zipFile, String descriptor) throws IO } private ZipEntry searchEntry(ZipFile zipFile, String searchString) { - getLogger().debug("Searching for " + searchString + " inside " + zipFile.getName()); + LOGGER.debug("Searching for " + searchString + " inside " + zipFile.getName()); Enumeration enu = zipFile.entries(); while (enu.hasMoreElements()) { ZipEntry entryfound = enu.nextElement(); - getLogger().debug(" - " + entryfound.getName()); + LOGGER.debug(" - " + entryfound.getName()); if (searchString.equals(entryfound.getName())) { - getLogger().debug("Entry found"); + LOGGER.debug("Entry found"); return entryfound; } } diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java b/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java index 1130b2cd..8f2994ef 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java @@ -31,13 +31,16 @@ import org.apache.maven.archetype.common.util.ListScanner; import org.apache.maven.archetype.common.util.PathUtils; import org.apache.maven.archetype.metadata.FileSet; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Named @Singleton -public class DefaultArchetypeFilesResolver extends AbstractLogEnabled implements ArchetypeFilesResolver { +public class DefaultArchetypeFilesResolver implements ArchetypeFilesResolver { + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultArchetypeFilesResolver.class); + @Override public List getFilesWithExtension(List files, String extension) { ListScanner scanner = new ListScanner(); @@ -58,7 +61,7 @@ public List getFilteredFiles(List files, String filtered) { scanner.setExcludes(""); List result = scanner.scan(files); - getLogger().debug("Scanned " + result.size() + " filtered files in " + files.size() + " files"); + LOGGER.debug("Scanned " + result.size() + " filtered files in " + files.size() + " files"); return result; } @@ -91,8 +94,7 @@ public List findOtherResources(int level, List files, String lan scanner.setExcludes(languages); List result = scanner.scan(files); - getLogger() - .debug("Scanned " + result.size() + " other resources in " + files.size() + " files at level " + level); + LOGGER.debug("Scanned " + result.size() + " other resources in " + files.size() + " files at level " + level); return result; } @@ -119,8 +121,7 @@ public List findOtherResources(int level, List files, List result = scanner.scan(files); - getLogger() - .debug("Scanned " + result.size() + " other resources in " + files.size() + " files at level " + level); + LOGGER.debug("Scanned " + result.size() + " other resources in " + files.size() + " files at level " + level); return result; } @@ -144,8 +145,7 @@ public List findOtherSources(int level, List files, String langu scanner.setIncludes(includes.toString()); List result = scanner.scan(files); - getLogger() - .debug("Scanned " + result.size() + " other sources in " + files.size() + " files at level " + level); + LOGGER.debug("Scanned " + result.size() + " other sources in " + files.size() + " files at level " + level); return result; } @@ -159,7 +159,7 @@ public List findResourcesMainFiles(List files, String languages) scanner.setExcludes(languages); List result = scanner.scan(files); - getLogger().debug("Scanned " + result.size() + " resources in " + files.size() + " files"); + LOGGER.debug("Scanned " + result.size() + " resources in " + files.size() + " files"); return result; } @@ -173,7 +173,7 @@ public List findResourcesTestFiles(List files, String languages) scanner.setExcludes(languages); List result = scanner.scan(files); - getLogger().debug("Scanned " + result.size() + " test resources in " + files.size() + " files"); + LOGGER.debug("Scanned " + result.size() + " test resources in " + files.size() + " files"); return result; } @@ -187,7 +187,7 @@ public List findSiteFiles(List files, String languages) { scanner.setExcludes(languages); List result = scanner.scan(files); - getLogger().debug("Scanned " + result.size() + " site resources in " + files.size() + " files"); + LOGGER.debug("Scanned " + result.size() + " site resources in " + files.size() + " files"); return result; } @@ -200,7 +200,7 @@ public List findSourcesMainFiles(List files, String languages) { scanner.setIncludes(languages); List result = scanner.scan(files); - getLogger().debug("Scanned " + result.size() + " sources in " + files.size() + " files"); + LOGGER.debug("Scanned " + result.size() + " sources in " + files.size() + " files"); return result; } @@ -213,7 +213,7 @@ public List findSourcesTestFiles(List files, String languages) { scanner.setIncludes(languages); List result = scanner.scan(files); - getLogger().debug("Scanned " + result.size() + " test sources in " + files.size() + " files"); + LOGGER.debug("Scanned " + result.size() + " test sources in " + files.size() + " files"); return result; } @@ -226,13 +226,13 @@ public List getPackagedFiles(List files, String packageName) { packagedFiles.add(file.substring(packageName.length() + 1)); } } - getLogger().debug("Scanned " + packagedFiles.size() + " packaged files in " + files.size() + " files"); + LOGGER.debug("Scanned " + packagedFiles.size() + " packaged files in " + files.size() + " files"); return packagedFiles; } @Override public String resolvePackage(File basedir, List languages) throws IOException { - getLogger().debug("Resolving package in " + basedir + " using languages " + languages); + LOGGER.debug("Resolving package in " + basedir + " using languages " + languages); List files = resolveFiles(basedir, languages); @@ -247,7 +247,7 @@ public List getUnpackagedFiles(List files, String packageName) { unpackagedFiles.add(file); } } - getLogger().debug("Scanned " + unpackagedFiles.size() + " unpackaged files in " + files.size() + " files"); + LOGGER.debug("Scanned " + unpackagedFiles.size() + " unpackaged files in " + files.size() + " files"); return unpackagedFiles; } @@ -283,7 +283,7 @@ private List resolveFiles(File basedir, List languages) throws I List absoluteFiles = FileUtils.getFiles(basedir, StringUtils.join(languagesPathesArray, ","), excludes); - getLogger().debug("Found " + absoluteFiles.size() + " potential archetype files"); + LOGGER.debug("Found " + absoluteFiles.size() + " potential archetype files"); List files = new ArrayList<>(absoluteFiles.size()); @@ -303,7 +303,7 @@ private List resolveFiles(File basedir, List languages) throws I } } - getLogger().debug("Found " + files.size() + " archetype files for package resolution "); + LOGGER.debug("Found " + files.size() + " archetype files for package resolution "); return files; } @@ -325,7 +325,7 @@ private String resolvePackage(List files) { } } - getLogger().debug("Package resolved to " + packageName); + LOGGER.debug("Package resolved to " + packageName); return packageName; } diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java b/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java index 4b2a1352..2a461147 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java @@ -54,7 +54,6 @@ import org.apache.maven.model.Reporting; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.apache.maven.model.io.xpp3.MavenXpp3Writer; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.XmlStreamReader; @@ -63,11 +62,15 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.jdom2.JDOMException; import org.jdom2.input.SAXBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.xml.sax.SAXException; @Named @Singleton -public class DefaultPomManager extends AbstractLogEnabled implements PomManager { +public class DefaultPomManager implements PomManager { + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultPomManager.class); + @Override public void addModule(File pom, String artifactId) throws IOException, ParserConfigurationException, TransformerException, SAXException, InvalidPackaging, @@ -83,7 +86,7 @@ public void addModule(File pom, String artifactId) public void addParent(File pom, File parentPom) throws IOException, XmlPullParserException { Model generatedModel = readPom(pom); if (null != generatedModel.getParent()) { - getLogger().info("Parent element not overwritten in " + pom); + LOGGER.info("Parent element not overwritten in " + pom); return; } @@ -212,7 +215,7 @@ public void writePom(final Model model, final File pomFile, final File initialPo } if (!pomFile.exists() && !pomFile.createNewFile()) { - getLogger().warn("Could not create new file \"" + pomFile.getPath() + "\" or the file already exists."); + LOGGER.warn("Could not create new file \"" + pomFile.getPath() + "\" or the file already exists."); } try (Writer outputStreamWriter = new OutputStreamWriter(new FileOutputStream(pomFile), fileEncoding)) { @@ -223,7 +226,7 @@ public void writePom(final Model model, final File pomFile, final File initialPo Format form = Format.getRawFormat().setEncoding(fileEncoding).setLineSeparator(ls); writer.write(model, doc, outputStreamWriter, form); } catch (FileNotFoundException e) { - getLogger().debug("Creating pom file " + pomFile); + LOGGER.debug("Creating pom file " + pomFile); try (Writer pomWriter = new OutputStreamWriter(Files.newOutputStream(pomFile.toPath()), fileEncoding)) { MavenXpp3Writer writer = new MavenXpp3Writer(); @@ -271,7 +274,7 @@ private void mergeProfiles(Model model, Model generatedModel) { if (!modelProfileIdMap.containsKey(generatedProfileId)) { model.addProfile(generatedProfile); } else { - getLogger().warn("Try to merge profiles with id " + generatedProfileId); + LOGGER.warn("Try to merge profiles with id " + generatedProfileId); mergeModelBase(modelProfileIdMap.get(generatedProfileId), generatedProfile); mergeProfileBuild(modelProfileIdMap.get(generatedProfileId), generatedProfile); } @@ -299,7 +302,7 @@ private void mergeModelBase(ModelBase model, ModelBase generatedModel) { if (!dependenciesByIds.containsKey(generatedDependencyId)) { model.addDependency(generatedDependenciesByIds.get(generatedDependencyId)); } else { - getLogger().warn("Can not override property: " + generatedDependencyId); + LOGGER.warn("Can not override property: " + generatedDependencyId); } // TODO: maybe warn, if a property key gets overridden? @@ -324,7 +327,7 @@ private void mergeReportPlugins(Model model, Model generatedModel) { if (!reportPluginsByIds.containsKey(generatedReportPluginsId)) { model.getReporting().addPlugin(generatedReportPluginsByIds.get(generatedReportPluginsId)); } else { - getLogger().warn("Can not override report: " + generatedReportPluginsId); + LOGGER.warn("Can not override report: " + generatedReportPluginsId); } } } @@ -341,7 +344,7 @@ private void mergeBuildPlugins(BuildBase modelBuild, BuildBase generatedModelBui if (!pluginsByIds.containsKey(generatedPluginsId)) { modelBuild.addPlugin(generatedPlugin); } else { - getLogger().info("Try to merge plugin configuration of plugins with id: " + generatedPluginsId); + LOGGER.info("Try to merge plugin configuration of plugins with id: " + generatedPluginsId); Plugin modelPlugin = pluginsByIds.get(generatedPluginsId); modelPlugin.setConfiguration(Xpp3DomUtils.mergeXpp3Dom( diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/common/util/FileCharsetDetector.java b/archetype-common/src/main/java/org/apache/maven/archetype/common/util/FileCharsetDetector.java index 4845edc2..b8af7b26 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/common/util/FileCharsetDetector.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/common/util/FileCharsetDetector.java @@ -27,12 +27,14 @@ import com.ibm.icu.text.CharsetDetector; import com.ibm.icu.text.CharsetMatch; -import org.codehaus.plexus.logging.AbstractLogEnabled; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author rafale */ -public class FileCharsetDetector extends AbstractLogEnabled { +public class FileCharsetDetector { + private static final Logger LOGGER = LoggerFactory.getLogger(FileCharsetDetector.class); private final String charset; public FileCharsetDetector(File detectedFile) throws IOException { diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java index 48be58dc..88edf488 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java @@ -67,7 +67,6 @@ import org.apache.maven.shared.invoker.InvocationRequest; import org.apache.maven.shared.invoker.InvocationResult; import org.apache.maven.shared.invoker.Invoker; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.DirectoryScanner; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.IOUtil; @@ -76,6 +75,8 @@ import org.codehaus.plexus.util.xml.XmlStreamWriter; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.apache.commons.io.IOUtils.write; @@ -85,7 +86,8 @@ */ @Named("fileset") @Singleton -public class FilesetArchetypeCreator extends AbstractLogEnabled implements ArchetypeCreator { +public class FilesetArchetypeCreator implements ArchetypeCreator { + private static final Logger LOGGER = LoggerFactory.getLogger(FilesetArchetypeCreator.class); private static final String DEFAULT_OUTPUT_DIRECTORY = "target" + File.separator + "generated-sources" + File.separator + "archetype"; @@ -121,12 +123,12 @@ public void createArchetype(ArchetypeCreationRequest request, ArchetypeCreationR extractPropertiesFromProject(project, properties, configurationProperties, request.getPackageName()); if (outputDirectory == null) { - getLogger().debug("No output directory defined, using default: " + DEFAULT_OUTPUT_DIRECTORY); + LOGGER.debug("No output directory defined, using default: " + DEFAULT_OUTPUT_DIRECTORY); outputDirectory = FileUtils.resolveFile(basedir, DEFAULT_OUTPUT_DIRECTORY); } outputDirectory.mkdirs(); - getLogger().debug("Creating archetype in " + outputDirectory); + LOGGER.debug("Creating archetype in " + outputDirectory); try { File archetypePomFile = createArchetypeProjectPom(project, configurationProperties, outputDirectory); @@ -134,7 +136,7 @@ public void createArchetype(ArchetypeCreationRequest request, ArchetypeCreationR File archetypeResourcesDirectory = new File(outputDirectory, getTemplateOutputDirectory()); File archetypeFilesDirectory = new File(archetypeResourcesDirectory, Constants.ARCHETYPE_RESOURCES); - getLogger().debug("Archetype's files output directory " + archetypeFilesDirectory); + LOGGER.debug("Archetype's files output directory " + archetypeFilesDirectory); File archetypeDescriptorFile = new File(archetypeResourcesDirectory, Constants.ARCHETYPE_DESCRIPTOR); archetypeDescriptorFile.getParentFile().mkdirs(); @@ -155,7 +157,7 @@ public void createArchetype(ArchetypeCreationRequest request, ArchetypeCreationR } } - getLogger().debug("Starting archetype's descriptor " + project.getArtifactId()); + LOGGER.debug("Starting archetype's descriptor " + project.getArtifactId()); ArchetypeDescriptor archetypeDescriptor = new ArchetypeDescriptor(); archetypeDescriptor.setName(project.getArtifactId()); @@ -181,16 +183,16 @@ public void createArchetype(ArchetypeCreationRequest request, ArchetypeCreationR : Collections.emptyList(); List fileNames = resolveFileNames(pom, basedir, excludePatterns); - if (getLogger().isDebugEnabled()) { - getLogger().debug("Scanned for files " + fileNames.size()); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Scanned for files " + fileNames.size()); for (String name : fileNames) { - getLogger().debug("- " + name); + LOGGER.debug("- " + name); } } List filesets = resolveFileSets(packageName, fileNames, languages, filtereds, defaultEncoding); - getLogger().debug("Resolved filesets for " + archetypeDescriptor.getName()); + LOGGER.debug("Resolved filesets for " + archetypeDescriptor.getName()); archetypeDescriptor.setFileSets(filesets); @@ -202,7 +204,7 @@ public void createArchetype(ArchetypeCreationRequest request, ArchetypeCreationR archetypeFilesDirectory, defaultEncoding, excludePatterns); - getLogger().debug("Created files for " + archetypeDescriptor.getName()); + LOGGER.debug("Created files for " + archetypeDescriptor.getName()); setParentArtifactId(reverseProperties, configurationProperties.getProperty(Constants.ARTIFACT_ID)); @@ -214,7 +216,7 @@ public void createArchetype(ArchetypeCreationRequest request, ArchetypeCreationR moduleIdDirectory = StringUtils.replace(moduleId, rootArtifactId, "__rootArtifactId__"); } - getLogger().debug("Creating module " + moduleId); + LOGGER.debug("Creating module " + moduleId); ModuleDescriptor moduleDescriptor = createModule( reverseProperties, @@ -231,8 +233,7 @@ public void createArchetype(ArchetypeCreationRequest request, ArchetypeCreationR archetypeDescriptor.addModule(moduleDescriptor); - getLogger() - .debug("Added module " + moduleDescriptor.getName() + " in " + archetypeDescriptor.getName()); + LOGGER.debug("Added module " + moduleDescriptor.getName() + " in " + archetypeDescriptor.getName()); } restoreParentArtifactId(reverseProperties, null); @@ -248,14 +249,14 @@ public void createArchetype(ArchetypeCreationRequest request, ArchetypeCreationR pomReversedProperties, preserveCData, keepParent); - getLogger().debug("Created Archetype " + archetypeDescriptor.getName() + " template pom(s)"); + LOGGER.debug("Created Archetype " + archetypeDescriptor.getName() + " template pom(s)"); try (Writer out = new XmlStreamWriter(archetypeDescriptorFile)) { ArchetypeDescriptorXpp3Writer writer = new ArchetypeDescriptorXpp3Writer(); writer.write(out, archetypeDescriptor); - getLogger().debug("Archetype " + archetypeDescriptor.getName() + " descriptor written"); + LOGGER.debug("Archetype " + archetypeDescriptor.getName() + " descriptor written"); } createArchetypeBasicIt(archetypeDescriptor, outputDirectory); @@ -270,8 +271,7 @@ public void createArchetype(ArchetypeCreationRequest request, ArchetypeCreationR + File.separator + "projects"); if (archetypeIntegrationTestInputFolder.exists()) { - getLogger() - .info("Copying: " + archetypeIntegrationTestInputFolder.getAbsolutePath() + " into " + LOGGER.info("Copying: " + archetypeIntegrationTestInputFolder.getAbsolutePath() + " into " + archetypeIntegrationTestOutputFolder.getAbsolutePath()); FileUtils.copyDirectoryStructure( @@ -321,8 +321,7 @@ private void createArchetypeBasicIt(ArchetypeDescriptor archetypeDescriptor, Fil File archetypePropertiesFile = new File(basicItDirectory, "archetype.properties"); if (!archetypePropertiesFile.exists() && !archetypePropertiesFile.createNewFile()) { - getLogger() - .warn("Could not create new file \"" + archetypePropertiesFile.getPath() + LOGGER.warn("Could not create new file \"" + archetypePropertiesFile.getPath() + "\" or the file already exists."); } @@ -340,7 +339,7 @@ private void createArchetypeBasicIt(ArchetypeDescriptor archetypeDescriptor, Fil copyResource("goal.txt", new File(basicItDirectory, "goal.txt")); - getLogger().debug("Added basic integration test"); + LOGGER.debug("Added basic integration test"); } private void extractPropertiesFromProject( @@ -428,7 +427,7 @@ private File createArchetypeProjectPom(MavenProject project, Properties configur pluginManagement.addPlugin(plugin); model.getBuild().setPluginManagement(pluginManagement); - getLogger().debug("Creating archetype's pom"); + LOGGER.debug("Creating archetype's pom"); File archetypePomFile = new File(projectDir, Constants.ARCHETYPE_POM); @@ -443,7 +442,7 @@ private File createArchetypeProjectPom(MavenProject project, Properties configur private void copyResource(String name, File destination) throws IOException { if (!destination.exists() && !destination.createNewFile()) { - getLogger().warn("Could not create new file \"" + destination.getPath() + "\" or the file already exists."); + LOGGER.warn("Could not create new file \"" + destination.getPath() + "\" or the file already exists."); } try (InputStream in = FilesetArchetypeCreator.class.getResourceAsStream(name); @@ -473,8 +472,7 @@ private void addRequiredProperties(ArchetypeDescriptor archetypeDescriptor, Prop archetypeDescriptor.addRequiredProperty(requiredProperty); - getLogger() - .debug("Adding requiredProperty " + propertyKey + "=" + requiredProperties.getProperty(propertyKey) + LOGGER.debug("Adding requiredProperty " + propertyKey + "=" + requiredProperties.getProperty(propertyKey) + " to archetype's descriptor"); } } @@ -757,14 +755,14 @@ private void copyFiles( throws IOException { String packageAsDirectory = StringUtils.replace(packageName, ".", File.separator); - getLogger().debug("Package as Directory: Package:" + packageName + "->" + packageAsDirectory); + LOGGER.debug("Package as Directory: Package:" + packageName + "->" + packageAsDirectory); for (String inputFileName : fileSetResources) { String outputFileName = packaged ? StringUtils.replace(inputFileName, packageAsDirectory + File.separator, "") : inputFileName; - getLogger().debug("InputFileName:" + inputFileName); - getLogger().debug("OutputFileName:" + outputFileName); + LOGGER.debug("InputFileName:" + inputFileName); + LOGGER.debug("OutputFileName:" + outputFileName); reverseProperties.remove("archetype.languages"); @@ -789,7 +787,7 @@ private void createArchetypeFiles( String defaultEncoding, List excludePatterns) throws IOException { - getLogger().debug("Creating Archetype/Module files from " + basedir + " to " + archetypeFilesDirectory); + LOGGER.debug("Creating Archetype/Module files from " + basedir + " to " + archetypeFilesDirectory); for (FileSet fileSet : fileSets) { DirectoryScanner scanner = new DirectoryScanner(); @@ -799,11 +797,11 @@ private void createArchetypeFiles( scanner.setExcludes(addLists(fileSet.getExcludes(), excludePatterns) .toArray(new String[fileSet.getExcludes().size()])); scanner.addDefaultExcludes(); - getLogger().debug("Using fileset " + fileSet); + LOGGER.debug("Using fileset " + fileSet); scanner.scan(); List fileSetResources = Arrays.asList(scanner.getIncludedFiles()); - getLogger().debug("Scanned " + fileSetResources.size() + " resources"); + LOGGER.debug("Scanned " + fileSetResources.size() + " resources"); if (fileSet.isFiltered()) { processFileSet( @@ -815,7 +813,7 @@ private void createArchetypeFiles( packageName, reverseProperties, defaultEncoding); - getLogger().debug("Processed " + fileSet.getDirectory() + " files"); + LOGGER.debug("Processed " + fileSet.getDirectory() + " files"); } else { copyFiles( basedir, @@ -825,7 +823,7 @@ private void createArchetypeFiles( fileSet.isPackaged(), packageName, reverseProperties); - getLogger().debug("Copied " + fileSet.getDirectory() + " files"); + LOGGER.debug("Copied " + fileSet.getDirectory() + " files"); } } } @@ -841,7 +839,7 @@ private void createArchetypePom( File outputFile = FileUtils.resolveFile(archetypeFilesDirectory, Constants.ARCHETYPE_POM); if (preserveCData) { - getLogger().debug("Preserving CDATA parts of pom"); + LOGGER.debug("Preserving CDATA parts of pom"); File inputFile = FileUtils.resolveFile(archetypeFilesDirectory, Constants.ARCHETYPE_POM + ".tmp"); FileUtils.copyFile(initialPomFile, inputFile); @@ -887,8 +885,7 @@ private void createArchetypePom( String property = (String) properties.next(); if (initialcontent.indexOf("${" + property + "}") > 0) { - getLogger() - .warn("Archetype uses ${" + property + "} for internal processing, but file " + LOGGER.warn("Archetype uses ${" + property + "} for internal processing, but file " + initialPomFile + " contains this property already"); } } @@ -911,7 +908,7 @@ private FileSet createFileSet( fileSet.setExcludes(excludes); fileSet.setEncoding(defaultEncoding); - getLogger().debug("Created Fileset " + fileSet); + LOGGER.debug("Created Fileset " + fileSet); return fileSet; } @@ -926,8 +923,7 @@ private List createFileSets( List fileSets = new ArrayList<>(); if (!files.isEmpty()) { - getLogger() - .debug("Creating filesets" + (packaged ? (" packaged (" + packageName + ")") : "") + LOGGER.debug("Creating filesets" + (packaged ? (" packaged (" + packageName + ")") : "") + (filtered ? " filtered" : "") + " at level " + level); if (level == 0) { List includes = new ArrayList<>(files); @@ -940,7 +936,7 @@ private List createFileSets( Map> groups = getGroupsMap(files, level); for (String group : groups.keySet()) { - getLogger().debug("Creating filesets for group " + group); + LOGGER.debug("Creating filesets for group " + group); if (!packaged) { fileSets.add(getUnpackagedFileSet(filtered, group, groups.get(group), defaultEncoding)); @@ -951,7 +947,7 @@ private List createFileSets( } } // end if - getLogger().debug("Resolved fileSets " + fileSets); + LOGGER.debug("Resolved fileSets " + fileSets); } // end if return fileSets; @@ -972,10 +968,10 @@ private ModuleDescriptor createModule( boolean keepParent) throws IOException, XmlPullParserException { ModuleDescriptor archetypeDescriptor = new ModuleDescriptor(); - getLogger().debug("Starting module's descriptor " + moduleId); + LOGGER.debug("Starting module's descriptor " + moduleId); archetypeFilesDirectory.mkdirs(); - getLogger().debug("Module's files output directory " + archetypeFilesDirectory); + LOGGER.debug("Module's files output directory " + archetypeFilesDirectory); Model pom = pomManager.readPom(FileUtils.resolveFile(basedir, Constants.ARCHETYPE_POM)); String replacementId = pom.getArtifactId(); @@ -1003,7 +999,7 @@ private ModuleDescriptor createModule( List fileNames = resolveFileNames(pom, basedir, excludePatterns); List filesets = resolveFileSets(packageName, fileNames, languages, filtereds, defaultEncoding); - getLogger().debug("Resolved filesets for module " + archetypeDescriptor.getName()); + LOGGER.debug("Resolved filesets for module " + archetypeDescriptor.getName()); archetypeDescriptor.setFileSets(filesets); @@ -1015,7 +1011,7 @@ private ModuleDescriptor createModule( archetypeFilesDirectory, defaultEncoding, excludePatterns); - getLogger().debug("Created files for module " + archetypeDescriptor.getName()); + LOGGER.debug("Created files for module " + archetypeDescriptor.getName()); String parentArtifactId = reverseProperties.getProperty(Constants.PARENT_ARTIFACT_ID); setParentArtifactId(reverseProperties, pom.getArtifactId()); @@ -1026,7 +1022,7 @@ private ModuleDescriptor createModule( subModuleIdDirectory = StringUtils.replace(subModuleId, rootArtifactId, "__rootArtifactId__"); } - getLogger().debug("Creating module " + subModuleId); + LOGGER.debug("Creating module " + subModuleId); ModuleDescriptor moduleDescriptor = createModule( reverseProperties, @@ -1043,13 +1039,13 @@ private ModuleDescriptor createModule( archetypeDescriptor.addModule(moduleDescriptor); - getLogger().debug("Added module " + moduleDescriptor.getName() + " in " + archetypeDescriptor.getName()); + LOGGER.debug("Added module " + moduleDescriptor.getName() + " in " + archetypeDescriptor.getName()); } restoreParentArtifactId(reverseProperties, parentArtifactId); restoreArtifactId(reverseProperties, pom.getArtifactId()); - getLogger().debug("Created Module " + archetypeDescriptor.getName() + " pom"); + LOGGER.debug("Created Module " + archetypeDescriptor.getName() + " pom"); return archetypeDescriptor; } @@ -1066,7 +1062,7 @@ private void createModulePom( File outputFile = FileUtils.resolveFile(archetypeFilesDirectory, Constants.ARCHETYPE_POM); if (preserveCData) { - getLogger().debug("Preserving CDATA parts of pom"); + LOGGER.debug("Preserving CDATA parts of pom"); File inputFile = FileUtils.resolveFile(archetypeFilesDirectory, Constants.ARCHETYPE_POM + ".tmp"); FileUtils.copyFile(initialPomFile, inputFile); @@ -1131,8 +1127,7 @@ private void createModulePom( String property = (String) properties.next(); if (initialcontent.indexOf("${" + property + "}") > 0) { - getLogger() - .warn("OldArchetype uses ${" + property + "} for internal processing, but file " + LOGGER.warn("OldArchetype uses ${" + property + "} for internal processing, but file " + initialPomFile + " contains this property already"); } } @@ -1170,8 +1165,8 @@ private Map> getGroupsMap(final List files, final i group.add(innerPath); } - getLogger().debug("Sorted " + groups.size() + " groups in " + files.size() + " files"); - getLogger().debug("Sorted Files: " + files); + LOGGER.debug("Sorted " + groups.size() + " groups in " + files.size() + " files"); + LOGGER.debug("Sorted Files: " + files); return groups; } @@ -1207,13 +1202,13 @@ private List getPackagedFileSets( List packagedFileSets = new ArrayList<>(); List packagedFiles = archetypeFilesResolver.getPackagedFiles(groupFiles, packageAsDir); - getLogger().debug("Found packaged Files:" + packagedFiles); + LOGGER.debug("Found packaged Files:" + packagedFiles); List unpackagedFiles = archetypeFilesResolver.getUnpackagedFiles(groupFiles, packageAsDir); - getLogger().debug("Found unpackaged Files:" + unpackagedFiles); + LOGGER.debug("Found unpackaged Files:" + unpackagedFiles); Set packagedExtensions = getExtensions(packagedFiles); - getLogger().debug("Found packaged extensions " + packagedExtensions); + LOGGER.debug("Found packaged extensions " + packagedExtensions); Set unpackagedExtensions = getExtensions(unpackagedFiles); @@ -1223,7 +1218,7 @@ private List getPackagedFileSets( } if (!unpackagedExtensions.isEmpty()) { - getLogger().debug("Found unpackaged extensions " + unpackagedExtensions); + LOGGER.debug("Found unpackaged extensions " + unpackagedExtensions); packagedFileSets.add(getUnpackagedFileSet( filtered, unpackagedExtensions, unpackagedFiles, group, packagedExtensions, defaultEncoding)); @@ -1249,14 +1244,14 @@ private void processFileSet( throws IOException { String packageAsDirectory = StringUtils.replace(packageName, ".", File.separator); - getLogger().debug("Package as Directory: Package:" + packageName + "->" + packageAsDirectory); + LOGGER.debug("Package as Directory: Package:" + packageName + "->" + packageAsDirectory); for (String inputFileName : fileSetResources) { String initialFilename = packaged ? StringUtils.replace(inputFileName, packageAsDirectory + File.separator, "") : inputFileName; - getLogger().debug("InputFileName:" + inputFileName); + LOGGER.debug("InputFileName:" + inputFileName); File inputFile = new File(basedir, inputFileName); @@ -1270,8 +1265,7 @@ private void processFileSet( String property = (String) properties.next(); if (initialcontent.indexOf("${" + property + "}") > 0) { - getLogger() - .warn("Archetype uses ${" + property + "} for internal processing, but file " + inputFile + LOGGER.warn("Archetype uses ${" + property + "} for internal processing, but file " + inputFile + " contains this property already"); } } @@ -1279,14 +1273,13 @@ private void processFileSet( String content = getReversedContent(initialcontent, reverseProperties); String outputFilename = getReversedFilename(initialFilename, reverseProperties); - getLogger().debug("OutputFileName:" + outputFilename); + LOGGER.debug("OutputFileName:" + outputFilename); File outputFile = new File(archetypeFilesDirectory, outputFilename); outputFile.getParentFile().mkdirs(); if (!outputFile.exists() && !outputFile.createNewFile()) { - getLogger() - .warn("Could not create new file \"" + outputFile.getPath() + "\" or the file already exists."); + LOGGER.warn("Could not create new file \"" + outputFile.getPath() + "\" or the file already exists."); } try (OutputStream os = Files.newOutputStream(outputFile.toPath())) { @@ -1317,7 +1310,7 @@ private Properties getReversedProperties(ArchetypeDescriptor archetypeDescriptor private List resolveFileNames(final Model pom, final File basedir, List excludePatterns) throws IOException { - getLogger().debug("Resolving files for " + pom.getId() + " in " + basedir); + LOGGER.debug("Resolving files for " + pom.getId() + " in " + basedir); StringBuilder buff = new StringBuilder("pom.xml*,archetype.properties*,target/**,"); for (String module : pom.getModules()) { @@ -1336,8 +1329,8 @@ private List resolveFileNames(final Model pom, final File basedir, List< List fileNames = FileUtils.getFileNames(basedir, "**,.*,**/.*", excludes, false); - getLogger().debug("Resolved " + fileNames.size() + " files"); - getLogger().debug("Resolved Files:" + fileNames); + LOGGER.debug("Resolved " + fileNames.size() + " files"); + LOGGER.debug("Resolved Files:" + fileNames); return fileNames; } @@ -1350,8 +1343,7 @@ private List resolveFileSets( List filtereds, String defaultEncoding) { List resolvedFileSets = new ArrayList<>(); - getLogger() - .debug("Resolving filesets with package=" + packageName + ", languages=" + languages + LOGGER.debug("Resolving filesets with package=" + packageName + ", languages=" + languages + " and extentions=" + filtereds); List files = new ArrayList<>(fileNames); @@ -1362,7 +1354,7 @@ private List resolveFileSets( languageIncludes.append(((languageIncludes.length() == 0) ? "" : ",") + language + "/**"); } - getLogger().debug("Using languages includes " + languageIncludes); + LOGGER.debug("Using languages includes " + languageIncludes); StringBuilder filteredIncludes = new StringBuilder(); for (String filtered : filtereds) { @@ -1370,7 +1362,7 @@ private List resolveFileSets( + (filtered.startsWith(".") ? "" : "*.") + filtered); } - getLogger().debug("Using filtered includes " + filteredIncludes); + LOGGER.debug("Using filtered includes " + filteredIncludes); /* sourcesMainFiles */ List sourcesMainFiles = archetypeFilesResolver.findSourcesMainFiles(files, languageIncludes.toString()); @@ -1562,7 +1554,7 @@ private List resolveFileSets( /**/ if (!files.isEmpty()) { - getLogger().info("Ignored files: " + files); + LOGGER.info("Ignored files: " + files); } return resolvedFileSets; diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java index f859f3ed..0bae553e 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java @@ -36,16 +36,18 @@ import org.apache.maven.archetype.exception.InvalidPackaging; import org.apache.maven.archetype.exception.UnknownArchetype; import org.apache.maven.archetype.old.OldArchetype; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.StringUtils; import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.repository.RemoteRepository; import org.eclipse.aether.repository.RepositoryPolicy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Named @Singleton -public class DefaultArchetypeGenerator extends AbstractLogEnabled implements ArchetypeGenerator { +public class DefaultArchetypeGenerator implements ArchetypeGenerator { + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultArchetypeGenerator.class); @Inject private ArchetypeArtifactManager archetypeArtifactManager; diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java index c57eb8f6..a06e2adb 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java @@ -63,17 +63,19 @@ import org.apache.maven.archetype.metadata.RequiredProperty; import org.apache.velocity.VelocityContext; import org.apache.velocity.context.Context; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.codehaus.plexus.velocity.VelocityComponent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.xml.sax.SAXException; @Named @Singleton -public class DefaultFilesetArchetypeGenerator extends AbstractLogEnabled implements FilesetArchetypeGenerator { +public class DefaultFilesetArchetypeGenerator implements FilesetArchetypeGenerator { + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultFilesetArchetypeGenerator.class); @Inject private ArchetypeArtifactManager archetypeArtifactManager; @@ -141,7 +143,7 @@ public void generateArchetype(ArchetypeGenerationRequest request, File archetype Thread.currentThread().setContextClassLoader(archetypeJarLoader); if (archetypeDescriptor.isPartial()) { - getLogger().debug("Processing partial archetype " + archetypeDescriptor.getName()); + LOGGER.debug("Processing partial archetype " + archetypeDescriptor.getName()); if (outputDirectoryFile.exists()) { if (!pom.exists()) { throw new PomFileExists("This is a partial archetype and the pom.xml file doesn't exist."); @@ -184,17 +186,17 @@ public void generateArchetype(ArchetypeGenerationRequest request, File archetype } if (!archetypeDescriptor.getModules().isEmpty()) { - getLogger().info("Modules ignored in partial mode"); + LOGGER.info("Modules ignored in partial mode"); } } else { - getLogger().debug("Processing complete archetype " + archetypeDescriptor.getName()); + LOGGER.debug("Processing complete archetype " + archetypeDescriptor.getName()); if (outputDirectoryFile.exists() && pom.exists()) { throw new ProjectDirectoryExists( "A Maven project already exists in the directory " + outputDirectoryFile.getPath()); } if (outputDirectoryFile.exists()) { - getLogger().warn("The directory " + outputDirectoryFile.getPath() + " already exists."); + LOGGER.warn("The directory " + outputDirectoryFile.getPath() + " already exists."); } context.put("rootArtifactId", artifactId); @@ -215,7 +217,7 @@ public void generateArchetype(ArchetypeGenerationRequest request, File archetype String postGenerationScript = archetypeArtifactManager.getPostGenerationScript(archetypeFile); if (postGenerationScript != null) { - getLogger().info("Executing " + Constants.ARCHETYPE_POST_GENERATION_SCRIPT + " post-generation script"); + LOGGER.info("Executing " + Constants.ARCHETYPE_POST_GENERATION_SCRIPT + " post-generation script"); Binding binding = new Binding(); @@ -239,8 +241,8 @@ public void generateArchetype(ArchetypeGenerationRequest request, File archetype // ---------------------------------------------------------------------- // Log message on OldArchetype creation // ---------------------------------------------------------------------- - if (getLogger().isInfoEnabled()) { - getLogger().info("Project created from Archetype in dir: " + outputDirectoryFile.getAbsolutePath()); + if (LOGGER.isInfoEnabled()) { + LOGGER.info("Project created from Archetype in dir: " + outputDirectoryFile.getAbsolutePath()); } } catch (IOException | XmlPullParserException @@ -260,12 +262,12 @@ public String getPackageAsDirectory(String packageName) { private boolean copyFile( final File outFile, final String template, final boolean failIfExists, final ZipFile archetypeZipFile) throws OutputFileExists, IOException { - getLogger().debug("Copying file " + template); + LOGGER.debug("Copying file " + template); if (failIfExists && outFile.exists()) { throw new OutputFileExists("Don't rewrite file " + outFile.getName()); } else if (outFile.exists()) { - getLogger().warn("CP Don't override file " + outFile); + LOGGER.warn("CP Don't override file " + outFile); return false; } @@ -277,7 +279,7 @@ private boolean copyFile( } else { outFile.getParentFile().mkdirs(); if (!outFile.exists() && !outFile.createNewFile()) { - getLogger().warn("Could not create new file \"" + outFile.getPath() + "\" or the file already exists."); + LOGGER.warn("Could not create new file \"" + outFile.getPath() + "\" or the file already exists."); } try (InputStream inputStream = archetypeZipFile.getInputStream(input); @@ -358,24 +360,22 @@ private String replaceFilenameTokens(final String filePath, final Context contex String propertyToken = matcher.group(1); String contextPropertyValue = (String) context.get(propertyToken); if (contextPropertyValue != null && !contextPropertyValue.trim().isEmpty()) { - if (getLogger().isDebugEnabled()) { - getLogger() - .debug("Replacing property '" + propertyToken + "' in file path '" + filePath + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Replacing property '" + propertyToken + "' in file path '" + filePath + "' with value '" + contextPropertyValue + "'."); } matcher.appendReplacement(interpolatedResult, contextPropertyValue); } else { // Need to skip the undefined property - getLogger() - .warn("Property '" + propertyToken + "' was not specified, so the token in '" + filePath + LOGGER.warn("Property '" + propertyToken + "' was not specified, so the token in '" + filePath + "' is not being replaced."); } } matcher.appendTail(interpolatedResult); - if (getLogger().isDebugEnabled()) { - getLogger().debug("Final interpolated file path: '" + interpolatedResult + "'"); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Final interpolated file path: '" + interpolatedResult + "'"); } return interpolatedResult.toString(); @@ -408,19 +408,18 @@ private Context prepareVelocityContext(ArchetypeGenerationRequest request) { final String packageInPathFormat = getPackageInPathFormat(request.getPackage()); context.put(Constants.PACKAGE_IN_PATH_FORMAT, packageInPathFormat); - if (getLogger().isInfoEnabled()) { - getLogger().info("----------------------------------------------------------------------------"); + if (LOGGER.isInfoEnabled()) { + LOGGER.info("----------------------------------------------------------------------------"); - getLogger() - .info("Using following parameters for creating project from Archetype: " + LOGGER.info("Using following parameters for creating project from Archetype: " + request.getArchetypeArtifactId() + ":" + request.getArchetypeVersion()); - getLogger().info("----------------------------------------------------------------------------"); - getLogger().info("Parameter: " + Constants.GROUP_ID + ", Value: " + request.getGroupId()); - getLogger().info("Parameter: " + Constants.ARTIFACT_ID + ", Value: " + request.getArtifactId()); - getLogger().info("Parameter: " + Constants.VERSION + ", Value: " + request.getVersion()); - getLogger().info("Parameter: " + Constants.PACKAGE + ", Value: " + request.getPackage()); - getLogger().info("Parameter: " + Constants.PACKAGE_IN_PATH_FORMAT + ", Value: " + packageInPathFormat); + LOGGER.info("----------------------------------------------------------------------------"); + LOGGER.info("Parameter: " + Constants.GROUP_ID + ", Value: " + request.getGroupId()); + LOGGER.info("Parameter: " + Constants.ARTIFACT_ID + ", Value: " + request.getArtifactId()); + LOGGER.info("Parameter: " + Constants.VERSION + ", Value: " + request.getVersion()); + LOGGER.info("Parameter: " + Constants.PACKAGE + ", Value: " + request.getPackage()); + LOGGER.info("Parameter: " + Constants.PACKAGE_IN_PATH_FORMAT + ", Value: " + packageInPathFormat); } for (Iterator iterator = request.getProperties().keySet().iterator(); iterator.hasNext(); ) { @@ -434,8 +433,8 @@ private Context prepareVelocityContext(ArchetypeGenerationRequest request) { context.put(key, value); - if (getLogger().isInfoEnabled()) { - getLogger().info("Parameter: " + key + ", Value: " + value); + if (LOGGER.isInfoEnabled()) { + LOGGER.info("Parameter: " + key + ", Value: " + value); } } return context; @@ -541,11 +540,11 @@ private void processFilesetModule( throws XmlPullParserException, IOException, ParserConfigurationException, SAXException, TransformerException, OutputFileExists, ArchetypeGenerationFailure, InvalidPackaging { outputDirectoryFile.mkdirs(); - getLogger().debug("Processing module " + artifactId); - getLogger().debug("Processing module rootArtifactId " + rootArtifactId); - getLogger().debug("Processing module pom " + pom); - getLogger().debug("Processing module moduleOffset " + moduleOffset); - getLogger().debug("Processing module outputDirectoryFile " + outputDirectoryFile); + LOGGER.debug("Processing module " + artifactId); + LOGGER.debug("Processing module rootArtifactId " + rootArtifactId); + LOGGER.debug("Processing module pom " + pom); + LOGGER.debug("Processing module moduleOffset " + moduleOffset); + LOGGER.debug("Processing module outputDirectoryFile " + outputDirectoryFile); processFilesetProject( archetypeDescriptor, @@ -565,7 +564,7 @@ private void processFilesetModule( archetypeDescriptor.getModules().iterator(); if (subprojects.hasNext()) { - getLogger().debug(artifactId + " has modules (" + archetypeDescriptor.getModules() + ")"); + LOGGER.debug(artifactId + " has modules (" + archetypeDescriptor.getModules() + ")"); setParentArtifactId(context, StringUtils.replace(artifactId, "${rootArtifactId}", rootArtifactId)); } @@ -601,7 +600,7 @@ private void processFilesetModule( restoreParentArtifactId(context, parentArtifactId); - getLogger().debug("Processed " + artifactId); + LOGGER.debug("Processed " + artifactId); } @SuppressWarnings("checkstyle:ParameterNumber") @@ -618,11 +617,11 @@ private void processFilesetProject( final File basedirPom) throws XmlPullParserException, IOException, ParserConfigurationException, SAXException, TransformerException, OutputFileExists, ArchetypeGenerationFailure, InvalidPackaging { - getLogger().debug("Processing fileset project moduleId " + moduleId); - getLogger().debug("Processing fileset project pom " + pom); - getLogger().debug("Processing fileset project moduleOffset " + moduleOffset); - getLogger().debug("Processing fileset project outputDirectoryFile " + outputDirectoryFile); - getLogger().debug("Processing fileset project basedirPom " + basedirPom); + LOGGER.debug("Processing fileset project moduleId " + moduleId); + LOGGER.debug("Processing fileset project pom " + pom); + LOGGER.debug("Processing fileset project moduleOffset " + moduleOffset); + LOGGER.debug("Processing fileset project outputDirectoryFile " + outputDirectoryFile); + LOGGER.debug("Processing fileset project basedirPom " + basedirPom); if (basedirPom.exists()) { processPomWithParent(context, pom, moduleOffset, basedirPom, moduleId); @@ -642,7 +641,7 @@ private void processFilesetProject( private void processPom(Context context, File pom, String moduleOffset) throws IOException, OutputFileExists, ArchetypeGenerationFailure { - getLogger().debug("Processing pom " + pom); + LOGGER.debug("Processing pom " + pom); processTemplate( pom, @@ -654,7 +653,7 @@ private void processPom(Context context, File pom, String moduleOffset) private void processPomWithMerge(Context context, File pom, String moduleOffset) throws OutputFileExists, IOException, XmlPullParserException, ArchetypeGenerationFailure { - getLogger().debug("Processing pom " + pom + " with merge"); + LOGGER.debug("Processing pom " + pom + " with merge"); File temporaryPom = getTemporaryFile(pom); @@ -679,7 +678,7 @@ private void processPomWithMerge(Context context, File pom, String moduleOffset) private void processPomWithParent(Context context, File pom, String moduleOffset, File basedirPom, String moduleId) throws XmlPullParserException, IOException, ParserConfigurationException, SAXException, TransformerException, OutputFileExists, ArchetypeGenerationFailure, InvalidPackaging { - getLogger().debug("Processing pom " + pom + " with parent " + basedirPom); + LOGGER.debug("Processing pom " + pom + " with parent " + basedirPom); processTemplate( pom, @@ -688,7 +687,7 @@ private void processPomWithParent(Context context, File pom, String moduleOffset getEncoding(null), true); - getLogger().debug("Adding module " + moduleId); + LOGGER.debug("Adding module " + moduleId); pomManager.addModule(basedirPom, moduleId); @@ -708,20 +707,20 @@ private boolean processTemplate( templateFileName = localTemplateFileName; } - getLogger().debug("Processing template " + templateFileName); + LOGGER.debug("Processing template " + templateFileName); if (outFile.exists()) { if (failIfExists) { throw new OutputFileExists("Don't override file " + outFile.getAbsolutePath()); } - getLogger().warn("Don't override file " + outFile); + LOGGER.warn("Don't override file " + outFile); return false; } if (templateFileName.endsWith("/")) { - getLogger().debug("Creating directory " + outFile); + LOGGER.debug("Creating directory " + outFile); outFile.mkdirs(); @@ -733,10 +732,10 @@ private boolean processTemplate( } if (!outFile.exists() && !outFile.createNewFile()) { - getLogger().warn("Could not create new file \"" + outFile.getPath() + "\" or the file already exists."); + LOGGER.warn("Could not create new file \"" + outFile.getPath() + "\" or the file already exists."); } - getLogger().debug("Merging into " + outFile); + LOGGER.debug("Merging into " + outFile); try (Writer writer = new OutputStreamWriter(Files.newOutputStream(outFile.toPath()), encoding)) { StringWriter stringWriter = new StringWriter(); @@ -764,7 +763,7 @@ private void processTemplates( throws OutputFileExists, ArchetypeGenerationFailure, IOException { Iterator iterator = archetypeDescriptor.getFileSets().iterator(); if (iterator.hasNext()) { - getLogger().debug("Processing filesets" + "\n " + archetypeResources); + LOGGER.debug("Processing filesets" + "\n " + archetypeResources); } int count = 0; @@ -788,8 +787,7 @@ private void processTemplates( .mkdirs(); if (fileSet.isFiltered()) { - getLogger() - .debug(" Processing fileset " + fileSet + " -> " + fileSetResources.size() + ":\n " + LOGGER.debug(" Processing fileset " + fileSet + " -> " + fileSetResources.size() + ":\n " + fileSetResources); int processed = processFileSet( @@ -803,10 +801,9 @@ private void processTemplates( getEncoding(fileSet.getEncoding()), failIfExists); - getLogger().debug(" Processed " + processed + " files."); + LOGGER.debug(" Processed " + processed + " files."); } else { - getLogger() - .debug(" Copying fileset " + fileSet + " -> " + fileSetResources.size() + ":\n " + LOGGER.debug(" Copying fileset " + fileSet + " -> " + fileSetResources.size() + ":\n " + fileSetResources); int copied = copyFiles( @@ -820,11 +817,11 @@ private void processTemplates( failIfExists, context); - getLogger().debug(" Copied " + copied + " files."); + LOGGER.debug(" Copied " + copied + " files."); } } - getLogger().debug("Processed " + count + " filesets"); + LOGGER.debug("Processed " + count + " filesets"); } private void restoreParentArtifactId(Context context, String parentArtifactId) { diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java b/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java index 05a7d19e..776020f6 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java @@ -57,7 +57,6 @@ import org.apache.maven.model.io.xpp3.MavenXpp3Writer; import org.apache.velocity.VelocityContext; import org.apache.velocity.context.Context; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringUtils; @@ -65,6 +64,8 @@ import org.codehaus.plexus.util.xml.XmlStreamWriter; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.codehaus.plexus.velocity.VelocityComponent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.xml.sax.SAXException; /** @@ -73,7 +74,8 @@ */ @Named @Singleton -public class DefaultOldArchetype extends AbstractLogEnabled implements OldArchetype { +public class DefaultOldArchetype implements OldArchetype { + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultOldArchetype.class); private static final String DEFAULT_TEST_RESOURCE_DIR = "/src/test/resources"; private static final String DEFAULT_TEST_SOURCE_DIR = "/src/test/java"; @@ -139,21 +141,20 @@ public void createArchetype(ArchetypeGenerationRequest request, File archetypeFi // --------------------------------------------------------------------- // Get Logger and display all parameters used // --------------------------------------------------------------------- - if (getLogger().isInfoEnabled()) { - getLogger().info("----------------------------------------------------------------------------"); + if (LOGGER.isInfoEnabled()) { + LOGGER.info("----------------------------------------------------------------------------"); - getLogger() - .info("Using following parameters for creating project from Old (1.x) Archetype: " + LOGGER.info("Using following parameters for creating project from Old (1.x) Archetype: " + request.getArchetypeArtifactId() + ":" + request.getArchetypeVersion()); - getLogger().info("----------------------------------------------------------------------------"); + LOGGER.info("----------------------------------------------------------------------------"); for (Map.Entry entry : parameters.entrySet()) { String parameterName = entry.getKey(); String parameterValue = entry.getValue(); - getLogger().info("Parameter: " + parameterName + ", Value: " + parameterValue); + LOGGER.info("Parameter: " + parameterName + ", Value: " + parameterValue); } } @@ -323,8 +324,8 @@ public void createArchetype(ArchetypeGenerationRequest request, File archetypeFi // ---------------------------------------------------------------------- // Log message on OldArchetype creation // ---------------------------------------------------------------------- - if (getLogger().isInfoEnabled()) { - getLogger().info("project created from Old (1.x) Archetype in dir: " + outputDirectory); + if (LOGGER.isInfoEnabled()) { + LOGGER.info("project created from Old (1.x) Archetype in dir: " + outputDirectory); } } @@ -411,16 +412,15 @@ private void processTemplates( boolean foundBuildElement = build != null; - if (getLogger().isDebugEnabled()) { - getLogger() - .debug( + if (LOGGER.isDebugEnabled()) { + LOGGER.debug( "********************* Debug info for resources created from generated Model ***********************"); - getLogger().debug("Was build element found in generated POM?: " + foundBuildElement); + LOGGER.debug("Was build element found in generated POM?: " + foundBuildElement); } // create source directory if specified in POM if (foundBuildElement && null != build.getSourceDirectory()) { - getLogger().debug("Overriding default source directory "); + LOGGER.debug("Overriding default source directory "); overrideSrcDir = true; @@ -433,7 +433,7 @@ private void processTemplates( // create script source directory if specified in POM if (foundBuildElement && null != build.getScriptSourceDirectory()) { - getLogger().debug("Overriding default script source directory "); + LOGGER.debug("Overriding default script source directory "); String scriptSourceDirectory = build.getScriptSourceDirectory(); @@ -444,7 +444,7 @@ private void processTemplates( // create resource director(y/ies) if specified in POM if (foundBuildElement && !build.getResources().isEmpty()) { - getLogger().debug("Overriding default resource directory "); + LOGGER.debug("Overriding default resource directory "); overrideResourceDir = true; @@ -462,7 +462,7 @@ private void processTemplates( } // create test source directory if specified in POM if (foundBuildElement && null != build.getTestSourceDirectory()) { - getLogger().debug("Overriding default test directory "); + LOGGER.debug("Overriding default test directory "); overrideTestSrcDir = true; @@ -475,7 +475,7 @@ private void processTemplates( // create test resource directory if specified in POM if (foundBuildElement && !build.getTestResources().isEmpty()) { - getLogger().debug("Overriding default test resource directory "); + LOGGER.debug("Overriding default test resource directory "); overrideTestResourceDir = true; @@ -492,8 +492,7 @@ private void processTemplates( } } - getLogger() - .debug( + LOGGER.debug( "********************* End of debug info from resources from generated POM ***********************"); // ---------------------------------------------------------------------- @@ -690,7 +689,7 @@ protected void processTemplate( } if (!f.exists() && !f.createNewFile()) { - getLogger().warn("Could not create new file \"" + f.getPath() + "\" or the file already exists."); + LOGGER.warn("Could not create new file \"" + f.getPath() + "\" or the file already exists."); } if (descriptor.isFiltered()) { diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawler.java b/archetype-common/src/main/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawler.java index b56e7ad8..1fa8789c 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawler.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawler.java @@ -34,24 +34,26 @@ import org.apache.maven.archetype.common.ArchetypeArtifactManager; import org.apache.maven.archetype.exception.UnknownArchetype; import org.apache.maven.model.Model; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.XmlStreamWriter; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author rafale */ @Named @Singleton -public class DefaultRepositoryCrawler extends AbstractLogEnabled implements RepositoryCrawler { +public class DefaultRepositoryCrawler implements RepositoryCrawler { + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultRepositoryCrawler.class); @Inject private ArchetypeArtifactManager archetypeArtifactManager; @Override public ArchetypeCatalog crawl(File repository) { if (!repository.isDirectory()) { - getLogger().warn("File is not a directory"); + LOGGER.warn("File is not a directory"); return null; } @@ -62,7 +64,7 @@ public ArchetypeCatalog crawl(File repository) { while (jars.hasNext()) { File jar = jars.next(); - getLogger().info("Scanning " + jar); + LOGGER.info("Scanning " + jar); if (archetypeArtifactManager.isFileSetArchetype(jar) || archetypeArtifactManager.isOldArchetype(jar)) { try { Archetype archetype = new Archetype(); @@ -90,7 +92,7 @@ public ArchetypeCatalog crawl(File repository) { } else { archetype.setVersion(pom.getParent().getVersion()); } - getLogger().info("\tArchetype " + archetype + " found in pom"); + LOGGER.info("\tArchetype " + archetype + " found in pom"); } else { String version = jar.getParentFile().getName(); @@ -111,7 +113,7 @@ public ArchetypeCatalog crawl(File repository) { archetype.setArtifactId(artifactId); archetype.setVersion(version); - getLogger().info("\tArchetype " + archetype + " defined by repository path"); + LOGGER.info("\tArchetype " + archetype + " defined by repository path"); } // end if-else catalog.addArchetype(archetype); @@ -135,7 +137,7 @@ public boolean writeCatalog(ArchetypeCatalog archetypeCatalog, File archetypeCat catalogWriter.write(fileWriter, archetypeCatalog); return true; } catch (IOException ex) { - getLogger().warn("Catalog can not be writen to " + archetypeCatalogFile, ex); + LOGGER.warn("Catalog can not be writen to " + archetypeCatalogFile, ex); return false; } } diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java b/archetype-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java index 6cd6b115..154599db 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/source/CatalogArchetypeDataSource.java @@ -26,14 +26,16 @@ import org.apache.maven.archetype.catalog.ArchetypeCatalog; import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Reader; import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.xml.XmlStreamWriter; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author Jason van Zyl */ -public abstract class CatalogArchetypeDataSource extends AbstractLogEnabled implements ArchetypeDataSource { +public abstract class CatalogArchetypeDataSource implements ArchetypeDataSource { + private static final Logger LOGGER = LoggerFactory.getLogger(CatalogArchetypeDataSource.class); protected void writeLocalCatalog(ArchetypeCatalog catalog, File catalogFile) throws ArchetypeDataSourceException { try (Writer writer = new XmlStreamWriter(catalogFile)) { diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/source/InternalCatalogArchetypeDataSource.java b/archetype-common/src/main/java/org/apache/maven/archetype/source/InternalCatalogArchetypeDataSource.java index 9b5c4515..d051ff53 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/source/InternalCatalogArchetypeDataSource.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/source/InternalCatalogArchetypeDataSource.java @@ -32,6 +32,8 @@ import org.codehaus.plexus.util.xml.XmlStreamReader; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.repository.RemoteRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author Jason van Zyl @@ -39,6 +41,7 @@ @Named("internal-catalog") @Singleton public class InternalCatalogArchetypeDataSource extends CatalogArchetypeDataSource { + private static final Logger LOGGER = LoggerFactory.getLogger(InternalCatalogArchetypeDataSource.class); @Override public ArchetypeCatalog getArchetypeCatalog( diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/source/LocalCatalogArchetypeDataSource.java b/archetype-common/src/main/java/org/apache/maven/archetype/source/LocalCatalogArchetypeDataSource.java index 55d8069f..812d0ca1 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/source/LocalCatalogArchetypeDataSource.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/source/LocalCatalogArchetypeDataSource.java @@ -33,10 +33,13 @@ import org.codehaus.plexus.util.xml.XmlStreamReader; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.repository.RemoteRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Named("catalog") @Singleton public class LocalCatalogArchetypeDataSource extends CatalogArchetypeDataSource { + private static final Logger LOGGER = LoggerFactory.getLogger(LocalCatalogArchetypeDataSource.class); @Override public File updateCatalog(RepositorySystemSession repositorySession, Archetype archetype) @@ -45,21 +48,21 @@ public File updateCatalog(RepositorySystemSession repositorySession, Archetype a File catalogFile = new File(localRepo, ARCHETYPE_CATALOG_FILENAME); - getLogger().debug("Catalog to be used for update: " + catalogFile.getAbsolutePath()); + LOGGER.debug("Catalog to be used for update: " + catalogFile.getAbsolutePath()); ArchetypeCatalog catalog; if (catalogFile.exists()) { try (Reader reader = new XmlStreamReader(catalogFile)) { - getLogger().debug("Reading catalog to be updated: " + catalogFile); + LOGGER.debug("Reading catalog to be updated: " + catalogFile); catalog = readCatalog(reader); } catch (FileNotFoundException ex) { - getLogger().debug("Catalog file don't exist"); + LOGGER.debug("Catalog file don't exist"); catalog = new ArchetypeCatalog(); } catch (IOException e) { throw new ArchetypeDataSourceException("Error reading archetype catalog.", e); } } else { - getLogger().debug("Catalog file don't exist"); + LOGGER.debug("Catalog file don't exist"); catalog = new ArchetypeCatalog(); } @@ -100,7 +103,7 @@ public ArchetypeCatalog getArchetypeCatalog( if (catalogFile.exists() && catalogFile.isDirectory()) { catalogFile = new File(catalogFile, ARCHETYPE_CATALOG_FILENAME); } - getLogger().debug("Getting archetypes from catalog: " + catalogFile); + LOGGER.debug("Getting archetypes from catalog: " + catalogFile); if (catalogFile.exists()) { try { diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java b/archetype-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java index d85c1517..8be32970 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java @@ -37,6 +37,8 @@ import org.eclipse.aether.repository.RemoteRepository; import org.eclipse.aether.resolution.MetadataRequest; import org.eclipse.aether.resolution.MetadataResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author Jason van Zyl @@ -44,6 +46,7 @@ @Named("remote-catalog") @Singleton public class RemoteCatalogArchetypeDataSource extends CatalogArchetypeDataSource implements ArchetypeDataSource { + private static final Logger LOGGER = LoggerFactory.getLogger(RemoteCatalogArchetypeDataSource.class); @Inject private RepositorySystem repositorySystem; diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java index affd4eae..709be2a0 100644 --- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java +++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java @@ -27,11 +27,14 @@ import org.apache.maven.archetype.common.Constants; import org.apache.maven.archetype.metadata.RequiredProperty; import org.apache.maven.project.MavenProject; -import org.codehaus.plexus.logging.AbstractLogEnabled; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Named("default") @Singleton -public class DefaultArchetypeFactory extends AbstractLogEnabled implements ArchetypeFactory { +public class DefaultArchetypeFactory implements ArchetypeFactory { + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultArchetypeFactory.class); + @Override public ArchetypeDefinition createArchetypeDefinition(Properties properties) { ArchetypeDefinition definition = new ArchetypeDefinition(); @@ -57,7 +60,7 @@ private void addOldRequiredProperty( String key, String defaultValue, boolean initPropertyWithDefault) { - getLogger().debug("Adding requiredProperty " + key); + LOGGER.debug("Adding requiredProperty " + key); configuration.addRequiredProperty(key); @@ -73,14 +76,14 @@ private void addOldRequiredProperty( configuration.setDefaultProperty(key, defaultValue); } - getLogger().debug("Setting property " + key + "=" + configuration.getProperty(key)); + LOGGER.debug("Setting property " + key + "=" + configuration.getProperty(key)); } @Override @SuppressWarnings("checkstyle:linelength") public ArchetypeConfiguration createArchetypeConfiguration( org.apache.maven.archetype.old.descriptor.ArchetypeDescriptor archetypeDescriptor, Properties properties) { - getLogger().debug("Creating ArchetypeConfiguration from legacy descriptor and Properties"); + LOGGER.debug("Creating ArchetypeConfiguration from legacy descriptor and Properties"); ArchetypeConfiguration configuration = createArchetypeConfiguration(properties); @@ -113,7 +116,7 @@ private void addRequiredProperty( @SuppressWarnings("checkstyle:linelength") public ArchetypeConfiguration createArchetypeConfiguration( org.apache.maven.archetype.metadata.ArchetypeDescriptor archetypeDescriptor, Properties properties) { - getLogger().debug("Creating ArchetypeConfiguration from fileset descriptor and Properties"); + LOGGER.debug("Creating ArchetypeConfiguration from fileset descriptor and Properties"); ArchetypeConfiguration configuration = createArchetypeConfiguration(properties); @@ -121,7 +124,7 @@ public ArchetypeConfiguration createArchetypeConfiguration( for (RequiredProperty requiredProperty : archetypeDescriptor.getRequiredProperties()) { String key = requiredProperty.getKey(); - getLogger().debug("Adding requiredProperty " + key); + LOGGER.debug("Adding requiredProperty " + key); configuration.addRequiredProperty(key); @@ -132,21 +135,21 @@ public ArchetypeConfiguration createArchetypeConfiguration( // using value defined in properties, which overrides any default String value = properties.getProperty(key); configuration.setProperty(key, value); - getLogger().debug("Setting property " + key + "=" + value); + LOGGER.debug("Setting property " + key + "=" + value); } else if ((defaultValue != null) && !containsInnerProperty(defaultValue)) { // using default value configuration.setProperty(key, defaultValue); - getLogger().debug("Setting property " + key + "=" + defaultValue); + LOGGER.debug("Setting property " + key + "=" + defaultValue); } if (defaultValue != null) { configuration.setDefaultProperty(key, defaultValue); - getLogger().debug("Setting defaultProperty " + key + "=" + defaultValue); + LOGGER.debug("Setting defaultProperty " + key + "=" + defaultValue); } if (validationRegex != null) { configuration.setPropertyValidationRegex(key, validationRegex); - getLogger().debug("Setting validation regular expression " + key + "=" + defaultValue); + LOGGER.debug("Setting validation regular expression " + key + "=" + defaultValue); } } @@ -169,7 +172,7 @@ public ArchetypeConfiguration createArchetypeConfiguration( private void addRequiredProperty( ArchetypeConfiguration configuration, Properties properties, String key, String defaultValue) { - getLogger().debug("Adding requiredProperty " + key); + LOGGER.debug("Adding requiredProperty " + key); configuration.addRequiredProperty(key); @@ -180,7 +183,7 @@ private void addRequiredProperty( if (properties.getProperty(key) != null) { configuration.setProperty(key, properties.getProperty(key)); - getLogger().debug("Setting property " + key + "=" + configuration.getProperty(Constants.GROUP_ID)); + LOGGER.debug("Setting property " + key + "=" + configuration.getProperty(Constants.GROUP_ID)); } } @@ -195,7 +198,7 @@ private void setProperty(ArchetypeConfiguration configuration, Properties proper @Override public ArchetypeConfiguration createArchetypeConfiguration( MavenProject project, ArchetypeDefinition archetypeDefinition, Properties properties) { - getLogger().debug("Creating ArchetypeConfiguration from ArchetypeDefinition, MavenProject and Properties"); + LOGGER.debug("Creating ArchetypeConfiguration from ArchetypeDefinition, MavenProject and Properties"); ArchetypeConfiguration configuration = createArchetypeConfiguration(properties); @@ -203,12 +206,11 @@ public ArchetypeConfiguration createArchetypeConfiguration( String requiredProperty = (String) requiredProperties.next(); if (!requiredProperty.contains(".")) { - getLogger().debug("Adding requiredProperty " + requiredProperty); + LOGGER.debug("Adding requiredProperty " + requiredProperty); configuration.addRequiredProperty(requiredProperty); configuration.setProperty(requiredProperty, properties.getProperty(requiredProperty)); - getLogger() - .debug("Setting property " + requiredProperty + "=" + LOGGER.debug("Setting property " + requiredProperty + "=" + configuration.getProperty(requiredProperty)); } } diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationConfigurator.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationConfigurator.java index 11f76ab9..65466056 100644 --- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationConfigurator.java +++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationConfigurator.java @@ -39,12 +39,14 @@ import org.apache.maven.archetype.ui.ArchetypeFactory; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.components.interactivity.PrompterException; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Named("default") @Singleton -public class DefaultArchetypeCreationConfigurator extends AbstractLogEnabled implements ArchetypeCreationConfigurator { +public class DefaultArchetypeCreationConfigurator implements ArchetypeCreationConfigurator { + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultArchetypeCreationConfigurator.class); @Inject private ArchetypeCreationQueryer archetypeCreationQueryer; @@ -81,25 +83,25 @@ public Properties configureArchetypeCreation( } if (interactiveMode.booleanValue()) { - getLogger().debug("Entering interactive mode"); + LOGGER.debug("Entering interactive mode"); boolean confirmed = false; while (!confirmed) { if (!archetypeDefinition.isDefined()) // { - getLogger().debug("Archetype is yet not defined"); + LOGGER.debug("Archetype is yet not defined"); if (!archetypeDefinition.isGroupDefined()) { - getLogger().debug("Asking for archetype's groupId"); + LOGGER.debug("Asking for archetype's groupId"); archetypeDefinition.setGroupId( archetypeCreationQueryer.getArchetypeGroupId(project.getGroupId())); } if (!archetypeDefinition.isArtifactDefined()) { - getLogger().debug("Asking for archetype's artifactId"); + LOGGER.debug("Asking for archetype's artifactId"); archetypeDefinition.setArtifactId(archetypeCreationQueryer.getArchetypeArtifactId( project.getArtifactId() + Constants.ARCHETYPE_SUFFIX)); } if (!archetypeDefinition.isVersionDefined()) { - getLogger().debug("Asking for archetype's version"); + LOGGER.debug("Asking for archetype's version"); archetypeDefinition.setVersion( archetypeCreationQueryer.getArchetypeVersion(project.getVersion())); } @@ -109,30 +111,30 @@ public Properties configureArchetypeCreation( if (!archetypeConfiguration.isConfigured()) // { - getLogger().debug("Archetype is not yet configured"); + LOGGER.debug("Archetype is not yet configured"); if (!archetypeConfiguration.isConfigured(Constants.GROUP_ID)) { - getLogger().debug("Asking for project's groupId"); + LOGGER.debug("Asking for project's groupId"); archetypeConfiguration.setProperty( Constants.GROUP_ID, archetypeCreationQueryer.getGroupId( archetypeConfiguration.getDefaultValue(Constants.GROUP_ID))); } if (!archetypeConfiguration.isConfigured(Constants.ARTIFACT_ID)) { - getLogger().debug("Asking for project's artifactId"); + LOGGER.debug("Asking for project's artifactId"); archetypeConfiguration.setProperty( Constants.ARTIFACT_ID, archetypeCreationQueryer.getArtifactId( archetypeConfiguration.getDefaultValue(Constants.ARTIFACT_ID))); } if (!archetypeConfiguration.isConfigured(Constants.VERSION)) { - getLogger().debug("Asking for project's version"); + LOGGER.debug("Asking for project's version"); archetypeConfiguration.setProperty( Constants.VERSION, archetypeCreationQueryer.getVersion( archetypeConfiguration.getDefaultValue(Constants.VERSION))); } if (!archetypeConfiguration.isConfigured(Constants.PACKAGE)) { - getLogger().debug("Asking for project's package"); + LOGGER.debug("Asking for project's package"); archetypeConfiguration.setProperty( Constants.PACKAGE, archetypeCreationQueryer.getPackage( @@ -144,14 +146,14 @@ public Properties configureArchetypeCreation( boolean stopAddingProperties = false; while (!stopAddingProperties) { - getLogger().debug("Asking for another required property"); + LOGGER.debug("Asking for another required property"); stopAddingProperties = !archetypeCreationQueryer.askAddAnotherProperty(); if (!stopAddingProperties) { - getLogger().debug("Asking for required property key"); + LOGGER.debug("Asking for required property key"); String propertyKey = archetypeCreationQueryer.askNewPropertyKey(); - getLogger().debug("Asking for required property value"); + LOGGER.debug("Asking for required property value"); String replacementValue = archetypeCreationQueryer.askReplacementValue( propertyKey, archetypeConfiguration.getDefaultValue(propertyKey)); @@ -160,17 +162,17 @@ public Properties configureArchetypeCreation( } } - getLogger().debug("Asking for configuration confirmation"); + LOGGER.debug("Asking for configuration confirmation"); if (archetypeCreationQueryer.confirmConfiguration(archetypeConfiguration)) { confirmed = true; } else { - getLogger().debug("Reseting archetype's definition and configuration"); + LOGGER.debug("Reseting archetype's definition and configuration"); archetypeConfiguration.reset(); archetypeDefinition.reset(); } } // end while } else { - getLogger().debug("Entering batch mode"); + LOGGER.debug("Entering batch mode"); if (!archetypeDefinition.isDefined()) { throw new ArchetypeNotDefined("The archetype is not defined"); } else if (!archetypeConfiguration.isConfigured()) { @@ -202,33 +204,33 @@ private ArchetypeConfiguration defineDefaultConfiguration( String resolvedPackage, Properties properties) { if (StringUtils.isEmpty(properties.getProperty(Constants.GROUP_ID))) { - getLogger().info("Setting default groupId: " + project.getGroupId()); + LOGGER.info("Setting default groupId: " + project.getGroupId()); properties.setProperty(Constants.GROUP_ID, project.getGroupId()); } if (StringUtils.isEmpty(properties.getProperty(Constants.ARTIFACT_ID))) { - getLogger().info("Setting default artifactId: " + project.getArtifactId()); + LOGGER.info("Setting default artifactId: " + project.getArtifactId()); properties.setProperty(Constants.ARTIFACT_ID, project.getArtifactId()); } if (StringUtils.isEmpty(properties.getProperty(Constants.VERSION))) { - getLogger().info("Setting default version: " + project.getVersion()); + LOGGER.info("Setting default version: " + project.getVersion()); properties.setProperty(Constants.VERSION, project.getVersion()); } if (StringUtils.isEmpty(properties.getProperty(Constants.ARCHETYPE_GROUP_ID))) { - getLogger().info("Setting default archetype's groupId: " + project.getGroupId()); + LOGGER.info("Setting default archetype's groupId: " + project.getGroupId()); properties.setProperty(Constants.ARCHETYPE_GROUP_ID, project.getGroupId()); } if (StringUtils.isEmpty(properties.getProperty(Constants.ARCHETYPE_ARTIFACT_ID))) { - getLogger().info("Setting default archetype's artifactId: " + project.getArtifactId()); + LOGGER.info("Setting default archetype's artifactId: " + project.getArtifactId()); properties.setProperty( Constants.ARCHETYPE_ARTIFACT_ID, project.getArtifactId() + Constants.ARCHETYPE_SUFFIX); } if (StringUtils.isEmpty(properties.getProperty(Constants.ARCHETYPE_VERSION))) { - getLogger().info("Setting default archetype's version: " + project.getVersion()); + LOGGER.info("Setting default archetype's version: " + project.getVersion()); properties.setProperty(Constants.ARCHETYPE_VERSION, project.getVersion()); } @@ -237,7 +239,7 @@ private ArchetypeConfiguration defineDefaultConfiguration( if (resolvedPackage == null || resolvedPackage.isEmpty()) { resolvedPackage = project.getGroupId(); } - getLogger().info("Setting default package: " + resolvedPackage); + LOGGER.info("Setting default package: " + resolvedPackage); /* properties.setProperty ( Constants.PACKAGE_NAME, resolvedPackage ); */ properties.setProperty(Constants.PACKAGE, resolvedPackage); } @@ -246,12 +248,12 @@ private ArchetypeConfiguration defineDefaultConfiguration( } private void readProperties(Properties properties, File propertyFile) throws IOException { - getLogger().debug("Reading property file " + propertyFile); + LOGGER.debug("Reading property file " + propertyFile); try (InputStream is = Files.newInputStream(propertyFile.toPath())) { properties.load(is); - getLogger().debug("Read " + properties.size() + " properties"); + LOGGER.debug("Read " + properties.size() + " properties"); } } @@ -263,7 +265,7 @@ private Properties initialiseArchetypeProperties(Properties commandLinePropertie try { readProperties(properties, propertyFile); } catch (NoSuchFileException ex) { - getLogger().debug(propertyFile.getName() + " does not exist"); + LOGGER.debug(propertyFile.getName() + " does not exist"); } } diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationQueryer.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationQueryer.java index f9481b98..adc02ca0 100644 --- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationQueryer.java +++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationQueryer.java @@ -28,11 +28,13 @@ import org.apache.maven.archetype.ui.ArchetypeConfiguration; import org.codehaus.plexus.components.interactivity.Prompter; import org.codehaus.plexus.components.interactivity.PrompterException; -import org.codehaus.plexus.logging.AbstractLogEnabled; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Named("default") @Singleton -public class DefaultArchetypeCreationQueryer extends AbstractLogEnabled implements ArchetypeCreationQueryer { +public class DefaultArchetypeCreationQueryer implements ArchetypeCreationQueryer { + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultArchetypeCreationQueryer.class); @Inject private Prompter prompter; diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java index 570e19c9..dc93ba91 100644 --- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java +++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java @@ -57,19 +57,21 @@ import org.apache.velocity.runtime.parser.node.SimpleNode; import org.apache.velocity.runtime.visitor.BaseVisitor; import org.codehaus.plexus.components.interactivity.PrompterException; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.velocity.VelocityComponent; import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.repository.RemoteRepository; import org.eclipse.aether.repository.RepositoryPolicy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; // TODO: this seems to have more responsibilities than just a configurator @Named("default") @Singleton -public class DefaultArchetypeGenerationConfigurator extends AbstractLogEnabled +public class DefaultArchetypeGenerationConfigurator implements ArchetypeGenerationConfigurator { + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultArchetypeGenerationConfigurator.class); @Inject private ArchetypeArtifactManager archetypeArtifactManager; @@ -159,8 +161,7 @@ public void configureArchetype( while (!confirmed) { if (archetypeConfiguration.isConfigured()) { for (String requiredProperty : propertiesRequired) { - getLogger() - .info("Using property: " + requiredProperty + " = " + LOGGER.info("Using property: " + requiredProperty + " = " + archetypeConfiguration.getProperty(requiredProperty)); } } else { @@ -169,8 +170,7 @@ public void configureArchetype( if (archetypeConfiguration.isConfigured(requiredProperty) && !request.isAskForDefaultPropertyValues()) { - getLogger() - .info("Using property: " + requiredProperty + " = " + LOGGER.info("Using property: " + requiredProperty + " = " + archetypeConfiguration.getProperty(requiredProperty)); value = archetypeConfiguration.getProperty(requiredProperty); @@ -194,13 +194,13 @@ public void configureArchetype( } if (!archetypeConfiguration.isConfigured()) { - getLogger().warn("Archetype is not fully configured"); + LOGGER.warn("Archetype is not fully configured"); } else if (!archetypeGenerationQueryer.confirmConfiguration(archetypeConfiguration)) { - getLogger().debug("Archetype generation configuration not confirmed"); + LOGGER.debug("Archetype generation configuration not confirmed"); archetypeConfiguration.reset(); restoreCommandLineProperties(archetypeConfiguration, executionProperties); } else { - getLogger().debug("Archetype generation configuration confirmed"); + LOGGER.debug("Archetype generation configuration confirmed"); confirmed = true; } @@ -239,8 +239,7 @@ public void configureArchetype( exceptionMessage.append(requiredProperty); missingProperties.add(requiredProperty); exceptionMessage.append(" is missing."); - getLogger() - .warn("Property " + requiredProperty + " is missing. Add -D" + requiredProperty + LOGGER.warn("Property " + requiredProperty + " is missing. Add -D" + requiredProperty + "=someValue"); } } @@ -278,12 +277,12 @@ private String expandEmbeddedTemplateExpressions(String originalText, String tex private void restoreCommandLineProperties( ArchetypeConfiguration archetypeConfiguration, Properties executionProperties) { - getLogger().debug("Restoring command line properties"); + LOGGER.debug("Restoring command line properties"); for (String property : archetypeConfiguration.getRequiredProperties()) { if (executionProperties.containsKey(property)) { archetypeConfiguration.setProperty(property, executionProperties.getProperty(property)); - getLogger().debug("Restored " + property + "=" + archetypeConfiguration.getProperty(property)); + LOGGER.debug("Restored " + property + "=" + archetypeConfiguration.getProperty(property)); } } } diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationQueryer.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationQueryer.java index 8c4659f2..7df8eee3 100644 --- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationQueryer.java +++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationQueryer.java @@ -27,11 +27,13 @@ import org.apache.maven.archetype.ui.ArchetypeConfiguration; import org.codehaus.plexus.components.interactivity.Prompter; import org.codehaus.plexus.components.interactivity.PrompterException; -import org.codehaus.plexus.logging.AbstractLogEnabled; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Named("default") @Singleton -public class DefaultArchetypeGenerationQueryer extends AbstractLogEnabled implements ArchetypeGenerationQueryer { +public class DefaultArchetypeGenerationQueryer implements ArchetypeGenerationQueryer { + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultArchetypeGenerationQueryer.class); @Inject private Prompter prompter; diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelectionQueryer.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelectionQueryer.java index 59b1c85e..1bed628f 100644 --- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelectionQueryer.java +++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelectionQueryer.java @@ -38,11 +38,13 @@ import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.codehaus.plexus.components.interactivity.Prompter; import org.codehaus.plexus.components.interactivity.PrompterException; -import org.codehaus.plexus.logging.AbstractLogEnabled; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Named("default") @Singleton -public class DefaultArchetypeSelectionQueryer extends AbstractLogEnabled implements ArchetypeSelectionQueryer { +public class DefaultArchetypeSelectionQueryer implements ArchetypeSelectionQueryer { + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultArchetypeSelectionQueryer.class); @Inject @Named("archetype") diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java index 290f8234..657d9115 100644 --- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java +++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java @@ -34,13 +34,15 @@ import org.apache.maven.archetype.exception.ArchetypeSelectionFailure; import org.apache.maven.archetype.ui.ArchetypeDefinition; import org.codehaus.plexus.components.interactivity.PrompterException; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.repository.RemoteRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Named("default") @Singleton -public class DefaultArchetypeSelector extends AbstractLogEnabled implements ArchetypeSelector { +public class DefaultArchetypeSelector implements ArchetypeSelector { + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultArchetypeSelector.class); static final String DEFAULT_ARCHETYPE_GROUPID = "org.apache.maven.archetypes"; static final String DEFAULT_ARCHETYPE_VERSION = "1.0"; @@ -59,7 +61,7 @@ public void selectArchetype(ArchetypeGenerationRequest request, Boolean interact ArchetypeDefinition definition = new ArchetypeDefinition(request); if (definition.isDefined() && StringUtils.isNotEmpty(request.getArchetypeRepository())) { - getLogger().info("Archetype defined by properties"); + LOGGER.info("Archetype defined by properties"); return; } @@ -70,7 +72,7 @@ public void selectArchetype(ArchetypeGenerationRequest request, Boolean interact // applying some filtering depending on filter parameter archetypes = ArchetypeSelectorUtils.getFilteredArchetypesByCatalog(archetypes, request.getFilter()); if (archetypes.isEmpty()) { - getLogger().info("Your filter doesn't match any archetype, so try again with another value."); + LOGGER.info("Your filter doesn't match any archetype, so try again with another value."); return; } } @@ -85,13 +87,11 @@ public void selectArchetype(ArchetypeGenerationRequest request, Boolean interact updateRepository(definition, archetype); - getLogger() - .info("Archetype repository not defined. Using the one from " + archetype + " found in catalog " + LOGGER.info("Archetype repository not defined. Using the one from " + archetype + " found in catalog " + catalogKey); } else { - getLogger().warn("Archetype not found in any catalog. Falling back to central repository."); - getLogger() - .warn( + LOGGER.warn("Archetype not found in any catalog. Falling back to central repository."); + LOGGER.warn( "Add a repository with id 'archetype' in your settings.xml if archetype's repository is elsewhere."); } } else if (definition.isPartiallyDefined()) { @@ -104,9 +104,9 @@ public void selectArchetype(ArchetypeGenerationRequest request, Boolean interact updateDefinition(definition, archetype); - getLogger().info("Archetype " + archetype + " found in catalog " + catalogKey); + LOGGER.info("Archetype " + archetype + " found in catalog " + catalogKey); } else { - getLogger().warn("Specified archetype not found."); + LOGGER.warn("Specified archetype not found."); if (interactiveMode.booleanValue()) { definition.setVersion(null); definition.setGroupId(null); @@ -126,8 +126,7 @@ public void selectArchetype(ArchetypeGenerationRequest request, Boolean interact if (!definition.isPartiallyDefined()) { // if artifact ID is set to its default, we still prompt to confirm if (definition.getArtifactId() == null) { - getLogger() - .info("No archetype defined. Using " + DEFAULT_ARCHETYPE_ARTIFACTID + " (" + LOGGER.info("No archetype defined. Using " + DEFAULT_ARCHETYPE_ARTIFACTID + " (" + definition.getGroupId() + ":" + DEFAULT_ARCHETYPE_ARTIFACTID + ":" + definition.getVersion() + ")"); definition.setArtifactId(DEFAULT_ARCHETYPE_ARTIFACTID); @@ -173,7 +172,7 @@ private Map> getArchetypesByCatalog( if (!archetypesFromRemote.isEmpty()) { archetypes.put("remote", archetypesFromRemote); } else { - getLogger().warn("No archetype found in remote catalog. Defaulting to internal catalog"); + LOGGER.warn("No archetype found in remote catalog. Defaulting to internal catalog"); archetypes.put( "internal", archetypeManager.getInternalCatalog().getArchetypes()); } @@ -184,7 +183,7 @@ private Map> getArchetypesByCatalog( } if (archetypes.isEmpty()) { - getLogger().info("No catalog defined. Using internal catalog"); + LOGGER.info("No catalog defined. Using internal catalog"); archetypes.put("internal", archetypeManager.getInternalCatalog().getArchetypes()); } From 0f7cc5021f7ff713a0933794d3a425898b571e8a Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Sat, 16 Nov 2024 23:58:28 +0100 Subject: [PATCH 2/2] Fix checkstyle violations --- .../archetype/DefaultArchetypeManager.java | 12 +++-------- .../DefaultArchetypeArtifactManager.java | 7 ++++--- .../creator/FilesetArchetypeCreator.java | 20 +++++++++---------- .../DefaultFilesetArchetypeGenerator.java | 11 +++++----- .../archetype/old/DefaultOldArchetype.java | 6 +++--- .../DefaultRepositoryCrawler.java | 1 + .../archetype/ui/DefaultArchetypeFactory.java | 4 ++-- .../DefaultArchetypeCreationConfigurator.java | 1 + .../DefaultArchetypeCreationQueryer.java | 1 + ...efaultArchetypeGenerationConfigurator.java | 9 ++++----- .../DefaultArchetypeGenerationQueryer.java | 1 + .../generation/DefaultArchetypeSelector.java | 8 ++++---- 12 files changed, 40 insertions(+), 41 deletions(-) diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java b/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java index 21d31afa..ce4b28f0 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java @@ -148,9 +148,7 @@ public ArchetypeCatalog getInternalCatalog() { return source.getArchetypeCatalog(null, null); } catch (ArchetypeDataSourceException e) { - LOGGER.warn( - "failed to read catalog: " + e.getMessage(), - LOGGER.isDebugEnabled() ? e : null); + LOGGER.warn("failed to read catalog: " + e.getMessage(), LOGGER.isDebugEnabled() ? e : null); return new ArchetypeCatalog(); } } @@ -162,9 +160,7 @@ public ArchetypeCatalog getLocalCatalog(RepositorySystemSession repositorySessio return source.getArchetypeCatalog(repositorySession, null); } catch (ArchetypeDataSourceException e) { - LOGGER.warn( - "failed to read catalog: " + e.getMessage(), - LOGGER.isDebugEnabled() ? e : null); + LOGGER.warn("failed to read catalog: " + e.getMessage(), LOGGER.isDebugEnabled() ? e : null); return new ArchetypeCatalog(); } } @@ -177,9 +173,7 @@ public ArchetypeCatalog getRemoteCatalog( return source.getArchetypeCatalog(repositorySession, remoteRepositories); } catch (ArchetypeDataSourceException e) { - LOGGER.warn( - "failed to download from remote" + e.getMessage(), - LOGGER.isDebugEnabled() ? e : null); + LOGGER.warn("failed to download from remote" + e.getMessage(), LOGGER.isDebugEnabled() ? e : null); return new ArchetypeCatalog(); } } diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java b/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java index a346552b..4aabe474 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java @@ -57,6 +57,7 @@ @Singleton public class DefaultArchetypeArtifactManager implements ArchetypeArtifactManager { private static final Logger LOGGER = LoggerFactory.getLogger(DefaultArchetypeArtifactManager.class); + @Inject private Downloader downloader; @@ -184,9 +185,9 @@ public boolean exists( return archetype.exists(); } catch (DownloadException e) { LOGGER.debug( - "Archetype " + archetypeGroupId + ":" + archetypeArtifactId + ":" + archetypeVersion - + " doesn't exist", - e); + "Archetype " + archetypeGroupId + ":" + archetypeArtifactId + ":" + archetypeVersion + + " doesn't exist", + e); return false; } } diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java index 88edf488..846787f6 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java @@ -272,7 +272,7 @@ public void createArchetype(ArchetypeCreationRequest request, ArchetypeCreationR if (archetypeIntegrationTestInputFolder.exists()) { LOGGER.info("Copying: " + archetypeIntegrationTestInputFolder.getAbsolutePath() + " into " - + archetypeIntegrationTestOutputFolder.getAbsolutePath()); + + archetypeIntegrationTestOutputFolder.getAbsolutePath()); FileUtils.copyDirectoryStructure( archetypeIntegrationTestInputFolder, archetypeIntegrationTestOutputFolder); @@ -322,7 +322,7 @@ private void createArchetypeBasicIt(ArchetypeDescriptor archetypeDescriptor, Fil File archetypePropertiesFile = new File(basicItDirectory, "archetype.properties"); if (!archetypePropertiesFile.exists() && !archetypePropertiesFile.createNewFile()) { LOGGER.warn("Could not create new file \"" + archetypePropertiesFile.getPath() - + "\" or the file already exists."); + + "\" or the file already exists."); } try (InputStream in = FilesetArchetypeCreator.class.getResourceAsStream("archetype.properties"); @@ -473,7 +473,7 @@ private void addRequiredProperties(ArchetypeDescriptor archetypeDescriptor, Prop archetypeDescriptor.addRequiredProperty(requiredProperty); LOGGER.debug("Adding requiredProperty " + propertyKey + "=" + requiredProperties.getProperty(propertyKey) - + " to archetype's descriptor"); + + " to archetype's descriptor"); } } @@ -885,8 +885,8 @@ private void createArchetypePom( String property = (String) properties.next(); if (initialcontent.indexOf("${" + property + "}") > 0) { - LOGGER.warn("Archetype uses ${" + property + "} for internal processing, but file " - + initialPomFile + " contains this property already"); + LOGGER.warn("Archetype uses ${" + property + "} for internal processing, but file " + initialPomFile + + " contains this property already"); } } } @@ -924,7 +924,7 @@ private List createFileSets( if (!files.isEmpty()) { LOGGER.debug("Creating filesets" + (packaged ? (" packaged (" + packageName + ")") : "") - + (filtered ? " filtered" : "") + " at level " + level); + + (filtered ? " filtered" : "") + " at level " + level); if (level == 0) { List includes = new ArrayList<>(files); List excludes = new ArrayList<>(); @@ -1128,7 +1128,7 @@ private void createModulePom( if (initialcontent.indexOf("${" + property + "}") > 0) { LOGGER.warn("OldArchetype uses ${" + property + "} for internal processing, but file " - + initialPomFile + " contains this property already"); + + initialPomFile + " contains this property already"); } } } @@ -1266,7 +1266,7 @@ private void processFileSet( if (initialcontent.indexOf("${" + property + "}") > 0) { LOGGER.warn("Archetype uses ${" + property + "} for internal processing, but file " + inputFile - + " contains this property already"); + + " contains this property already"); } } @@ -1343,8 +1343,8 @@ private List resolveFileSets( List filtereds, String defaultEncoding) { List resolvedFileSets = new ArrayList<>(); - LOGGER.debug("Resolving filesets with package=" + packageName + ", languages=" + languages - + " and extentions=" + filtereds); + LOGGER.debug("Resolving filesets with package=" + packageName + ", languages=" + languages + " and extentions=" + + filtereds); List files = new ArrayList<>(fileNames); diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java index a06e2adb..8ce51c66 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java @@ -76,6 +76,7 @@ @Singleton public class DefaultFilesetArchetypeGenerator implements FilesetArchetypeGenerator { private static final Logger LOGGER = LoggerFactory.getLogger(DefaultFilesetArchetypeGenerator.class); + @Inject private ArchetypeArtifactManager archetypeArtifactManager; @@ -362,13 +363,13 @@ private String replaceFilenameTokens(final String filePath, final Context contex if (contextPropertyValue != null && !contextPropertyValue.trim().isEmpty()) { if (LOGGER.isDebugEnabled()) { LOGGER.debug("Replacing property '" + propertyToken + "' in file path '" + filePath - + "' with value '" + contextPropertyValue + "'."); + + "' with value '" + contextPropertyValue + "'."); } matcher.appendReplacement(interpolatedResult, contextPropertyValue); } else { // Need to skip the undefined property LOGGER.warn("Property '" + propertyToken + "' was not specified, so the token in '" + filePath - + "' is not being replaced."); + + "' is not being replaced."); } } @@ -412,7 +413,7 @@ private Context prepareVelocityContext(ArchetypeGenerationRequest request) { LOGGER.info("----------------------------------------------------------------------------"); LOGGER.info("Using following parameters for creating project from Archetype: " - + request.getArchetypeArtifactId() + ":" + request.getArchetypeVersion()); + + request.getArchetypeArtifactId() + ":" + request.getArchetypeVersion()); LOGGER.info("----------------------------------------------------------------------------"); LOGGER.info("Parameter: " + Constants.GROUP_ID + ", Value: " + request.getGroupId()); @@ -788,7 +789,7 @@ private void processTemplates( if (fileSet.isFiltered()) { LOGGER.debug(" Processing fileset " + fileSet + " -> " + fileSetResources.size() + ":\n " - + fileSetResources); + + fileSetResources); int processed = processFileSet( fileSet.getDirectory(), @@ -804,7 +805,7 @@ private void processTemplates( LOGGER.debug(" Processed " + processed + " files."); } else { LOGGER.debug(" Copying fileset " + fileSet + " -> " + fileSetResources.size() + ":\n " - + fileSetResources); + + fileSetResources); int copied = copyFiles( fileSet.getDirectory(), diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java b/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java index 776020f6..07812170 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java @@ -145,7 +145,7 @@ public void createArchetype(ArchetypeGenerationRequest request, File archetypeFi LOGGER.info("----------------------------------------------------------------------------"); LOGGER.info("Using following parameters for creating project from Old (1.x) Archetype: " - + request.getArchetypeArtifactId() + ":" + request.getArchetypeVersion()); + + request.getArchetypeArtifactId() + ":" + request.getArchetypeVersion()); LOGGER.info("----------------------------------------------------------------------------"); @@ -414,7 +414,7 @@ private void processTemplates( if (LOGGER.isDebugEnabled()) { LOGGER.debug( - "********************* Debug info for resources created from generated Model ***********************"); + "********************* Debug info for resources created from generated Model ***********************"); LOGGER.debug("Was build element found in generated POM?: " + foundBuildElement); } @@ -493,7 +493,7 @@ private void processTemplates( } LOGGER.debug( - "********************* End of debug info from resources from generated POM ***********************"); + "********************* End of debug info from resources from generated POM ***********************"); // ---------------------------------------------------------------------- // Main diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawler.java b/archetype-common/src/main/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawler.java index 1fa8789c..e7f350ce 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawler.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawler.java @@ -47,6 +47,7 @@ @Singleton public class DefaultRepositoryCrawler implements RepositoryCrawler { private static final Logger LOGGER = LoggerFactory.getLogger(DefaultRepositoryCrawler.class); + @Inject private ArchetypeArtifactManager archetypeArtifactManager; diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java index 709be2a0..81568f68 100644 --- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java +++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java @@ -210,8 +210,8 @@ public ArchetypeConfiguration createArchetypeConfiguration( configuration.addRequiredProperty(requiredProperty); configuration.setProperty(requiredProperty, properties.getProperty(requiredProperty)); - LOGGER.debug("Setting property " + requiredProperty + "=" - + configuration.getProperty(requiredProperty)); + LOGGER.debug( + "Setting property " + requiredProperty + "=" + configuration.getProperty(requiredProperty)); } } diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationConfigurator.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationConfigurator.java index 65466056..dc8a6b7a 100644 --- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationConfigurator.java +++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationConfigurator.java @@ -47,6 +47,7 @@ @Singleton public class DefaultArchetypeCreationConfigurator implements ArchetypeCreationConfigurator { private static final Logger LOGGER = LoggerFactory.getLogger(DefaultArchetypeCreationConfigurator.class); + @Inject private ArchetypeCreationQueryer archetypeCreationQueryer; diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationQueryer.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationQueryer.java index adc02ca0..06698c5f 100644 --- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationQueryer.java +++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/creation/DefaultArchetypeCreationQueryer.java @@ -35,6 +35,7 @@ @Singleton public class DefaultArchetypeCreationQueryer implements ArchetypeCreationQueryer { private static final Logger LOGGER = LoggerFactory.getLogger(DefaultArchetypeCreationQueryer.class); + @Inject private Prompter prompter; diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java index dc93ba91..876aebab 100644 --- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java +++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java @@ -69,8 +69,7 @@ // TODO: this seems to have more responsibilities than just a configurator @Named("default") @Singleton -public class DefaultArchetypeGenerationConfigurator - implements ArchetypeGenerationConfigurator { +public class DefaultArchetypeGenerationConfigurator implements ArchetypeGenerationConfigurator { private static final Logger LOGGER = LoggerFactory.getLogger(DefaultArchetypeGenerationConfigurator.class); @Inject @@ -162,7 +161,7 @@ public void configureArchetype( if (archetypeConfiguration.isConfigured()) { for (String requiredProperty : propertiesRequired) { LOGGER.info("Using property: " + requiredProperty + " = " - + archetypeConfiguration.getProperty(requiredProperty)); + + archetypeConfiguration.getProperty(requiredProperty)); } } else { for (String requiredProperty : propertiesRequired) { @@ -171,7 +170,7 @@ public void configureArchetype( if (archetypeConfiguration.isConfigured(requiredProperty) && !request.isAskForDefaultPropertyValues()) { LOGGER.info("Using property: " + requiredProperty + " = " - + archetypeConfiguration.getProperty(requiredProperty)); + + archetypeConfiguration.getProperty(requiredProperty)); value = archetypeConfiguration.getProperty(requiredProperty); } else { @@ -240,7 +239,7 @@ public void configureArchetype( missingProperties.add(requiredProperty); exceptionMessage.append(" is missing."); LOGGER.warn("Property " + requiredProperty + " is missing. Add -D" + requiredProperty - + "=someValue"); + + "=someValue"); } } diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationQueryer.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationQueryer.java index 7df8eee3..71fbf659 100644 --- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationQueryer.java +++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationQueryer.java @@ -34,6 +34,7 @@ @Singleton public class DefaultArchetypeGenerationQueryer implements ArchetypeGenerationQueryer { private static final Logger LOGGER = LoggerFactory.getLogger(DefaultArchetypeGenerationQueryer.class); + @Inject private Prompter prompter; diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java index 657d9115..433c3157 100644 --- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java +++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java @@ -88,11 +88,11 @@ public void selectArchetype(ArchetypeGenerationRequest request, Boolean interact updateRepository(definition, archetype); LOGGER.info("Archetype repository not defined. Using the one from " + archetype + " found in catalog " - + catalogKey); + + catalogKey); } else { LOGGER.warn("Archetype not found in any catalog. Falling back to central repository."); LOGGER.warn( - "Add a repository with id 'archetype' in your settings.xml if archetype's repository is elsewhere."); + "Add a repository with id 'archetype' in your settings.xml if archetype's repository is elsewhere."); } } else if (definition.isPartiallyDefined()) { Map.Entry found = @@ -127,8 +127,8 @@ public void selectArchetype(ArchetypeGenerationRequest request, Boolean interact // if artifact ID is set to its default, we still prompt to confirm if (definition.getArtifactId() == null) { LOGGER.info("No archetype defined. Using " + DEFAULT_ARCHETYPE_ARTIFACTID + " (" - + definition.getGroupId() + ":" + DEFAULT_ARCHETYPE_ARTIFACTID + ":" - + definition.getVersion() + ")"); + + definition.getGroupId() + ":" + DEFAULT_ARCHETYPE_ARTIFACTID + ":" + + definition.getVersion() + ")"); definition.setArtifactId(DEFAULT_ARCHETYPE_ARTIFACTID); }