This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
The following commit(s) were added to refs/heads/master by this push:
new a9187d7 [MNG-6847] Use diamond operator (#115)
a9187d7 is described below
commit a9187d7b174b1dd920f763fc41eeca86e58c14c5
Author: Tim te Beek <[email protected]>
AuthorDate: Wed Aug 30 13:26:50 2023 +0200
[MNG-6847] Use diamond operator (#115)
Use this link to re-run the recipe:
https://app.moderne.io/recipes/org.openrewrite.staticanalysis.UseDiamondOperator?organizationId=QXBhY2hlIE1hdmVu
Co-authored-by: Moderne <[email protected]>
---
.../main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java | 4 ++--
.../src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java | 8 ++++----
.../java/org/apache/maven/doxia/tools/stubs/MavenProjectStub.java | 8 ++++----
.../apache/maven/doxia/tools/stubs/SiteToolMavenProjectStub.java | 4 ++--
.../site/inheritance/DefaultSiteModelInheritanceAssembler.java | 6 +++---
.../org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java | 4 ++--
.../apache/maven/doxia/siterenderer/DocumentRenderingContext.java | 2 +-
.../org/apache/maven/doxia/siterenderer/SiteRenderingContext.java | 4 ++--
.../apache/maven/doxia/siterenderer/sink/SiteRendererSink.java | 2 +-
.../apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java | 8 ++++----
.../org/apache/maven/doxia/siterenderer/JavascriptVerifier.java | 2 +-
11 files changed, 26 insertions(+), 26 deletions(-)
diff --git
a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
index f0eaf31..e42b279 100644
---
a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
+++
b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
@@ -674,7 +674,7 @@ public class DefaultSiteTool implements SiteTool {
}
String[] localesArray = StringUtils.split(locales, ",");
- List<Locale> localesList = new ArrayList<Locale>(localesArray.length);
+ List<Locale> localesList = new ArrayList<>(localesArray.length);
List<Locale> availableLocales =
Arrays.asList(Locale.getAvailableLocales());
for (String localeString : localesArray) {
@@ -1063,7 +1063,7 @@ public class DefaultSiteTool implements SiteTool {
parentDistMgmnt == null ? projectDistMgmnt :
parentDistMgmnt);
}
- return new AbstractMap.SimpleEntry<SiteModel, MavenProject>(siteModel,
parentProject);
+ return new AbstractMap.SimpleEntry<>(siteModel, parentProject);
}
/**
diff --git
a/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
b/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
index 7aa20f3..e4782e2 100644
---
a/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
+++
b/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
@@ -355,7 +355,7 @@ public class SiteToolTest {
assertNotNull(tool);
SiteToolMavenProjectStub project = new
SiteToolMavenProjectStub("site-tool-test");
- List<MavenProject> reactorProjects = new ArrayList<MavenProject>();
+ List<MavenProject> reactorProjects = new ArrayList<>();
// model from current local build
SiteModel model = tool.getSiteModel(
@@ -410,7 +410,7 @@ public class SiteToolTest {
SiteToolMavenProjectStub project = new
SiteToolMavenProjectStub("no-site-test");
String siteDirectory = "src/site";
- List<MavenProject> reactorProjects = new ArrayList<MavenProject>();
+ List<MavenProject> reactorProjects = new ArrayList<>();
SiteModel model = tool.getSiteModel(
new File(project.getBasedir(), siteDirectory),
@@ -455,8 +455,8 @@ public class SiteToolTest {
SiteToolMavenProjectStub project = new
SiteToolMavenProjectStub("interpolated-site");
List<MavenProject> reactorProjects =
Collections.<MavenProject>singletonList(project);
- siteDescriptorContent = tool.getInterpolatedSiteDescriptorContent(
- new HashMap<String, String>(), project, siteDescriptorContent);
+ siteDescriptorContent =
+ tool.getInterpolatedSiteDescriptorContent(new HashMap<>(),
project, siteDescriptorContent);
assertNotNull(siteDescriptorContent);
assertFalse(siteDescriptorContent.contains("${project.name}"));
assertTrue(siteDescriptorContent.contains(
diff --git
a/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/stubs/MavenProjectStub.java
b/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/stubs/MavenProjectStub.java
index 97697ac..e6a3b99 100644
---
a/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/stubs/MavenProjectStub.java
+++
b/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/stubs/MavenProjectStub.java
@@ -310,7 +310,7 @@ public class MavenProjectStub extends MavenProject {
/** {@inheritDoc} */
public void addCompileSourceRoot(String string) {
if (compileSourceRoots == null) {
- compileSourceRoots = new
ArrayList<String>(Collections.singletonList(string));
+ compileSourceRoots = new
ArrayList<>(Collections.singletonList(string));
} else {
compileSourceRoots.add(string);
}
@@ -319,7 +319,7 @@ public class MavenProjectStub extends MavenProject {
/** {@inheritDoc} */
public void addScriptSourceRoot(String string) {
if (scriptSourceRoots == null) {
- scriptSourceRoots = new
ArrayList<String>(Collections.singletonList(string));
+ scriptSourceRoots = new
ArrayList<>(Collections.singletonList(string));
} else {
scriptSourceRoots.add(string);
}
@@ -328,7 +328,7 @@ public class MavenProjectStub extends MavenProject {
/** {@inheritDoc} */
public void addTestCompileSourceRoot(String string) {
if (testCompileSourceRoots == null) {
- testCompileSourceRoots = new
ArrayList<String>(Collections.singletonList(string));
+ testCompileSourceRoots = new
ArrayList<>(Collections.singletonList(string));
} else {
testCompileSourceRoots.add(string);
}
@@ -1165,7 +1165,7 @@ public class MavenProjectStub extends MavenProject {
/** {@inheritDoc} */
public void addAttachedArtifact(Artifact artifact) {
if (attachedArtifacts == null) {
- this.attachedArtifacts = new
ArrayList<Artifact>(Collections.singletonList(artifact));
+ this.attachedArtifacts = new
ArrayList<>(Collections.singletonList(artifact));
} else {
attachedArtifacts.add(artifact);
}
diff --git
a/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/stubs/SiteToolMavenProjectStub.java
b/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/stubs/SiteToolMavenProjectStub.java
index eecf089..ba9619c 100644
---
a/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/stubs/SiteToolMavenProjectStub.java
+++
b/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/stubs/SiteToolMavenProjectStub.java
@@ -76,11 +76,11 @@ public class SiteToolMavenProjectStub extends
MavenProjectStub {
build.setTestSourceDirectory(getBasedir() + "/src/test/java");
build.setTestOutputDirectory(build.getDirectory() + "/test-classes");
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add(getBasedir() + "/src/main/java");
setCompileSourceRoots(compileSourceRoots);
- List<String> testCompileSourceRoots = new ArrayList<String>();
+ List<String> testCompileSourceRoots = new ArrayList<>();
testCompileSourceRoots.add(getBasedir() + "/src/test/java");
setTestCompileSourceRoots(testCompileSourceRoots);
}
diff --git
a/doxia-site-model/src/main/java/org/apache/maven/doxia/site/inheritance/DefaultSiteModelInheritanceAssembler.java
b/doxia-site-model/src/main/java/org/apache/maven/doxia/site/inheritance/DefaultSiteModelInheritanceAssembler.java
index 0ef6bf8..ff758df 100644
---
a/doxia-site-model/src/main/java/org/apache/maven/doxia/site/inheritance/DefaultSiteModelInheritanceAssembler.java
+++
b/doxia-site-model/src/main/java/org/apache/maven/doxia/site/inheritance/DefaultSiteModelInheritanceAssembler.java
@@ -195,7 +195,7 @@ public class DefaultSiteModelInheritanceAssembler
implements SiteModelInheritanc
private List<Menu> mergeMenus(
final List<Menu> childMenus, final List<Menu> parentMenus, final
URLRebaser urlContainer) {
- List<Menu> menus = new ArrayList<Menu>(childMenus.size() +
parentMenus.size());
+ List<Menu> menus = new ArrayList<>(childMenus.size() +
parentMenus.size());
for (Menu menu : childMenus) {
menus.add(menu);
@@ -259,7 +259,7 @@ public class DefaultSiteModelInheritanceAssembler
implements SiteModelInheritanc
final List<LinkItem> parentList,
final URLRebaser urlContainer,
boolean cutParentAfterDuplicate) {
- List<LinkItem> items = new ArrayList<LinkItem>(childList.size() +
parentList.size());
+ List<LinkItem> items = new ArrayList<>(childList.size() +
parentList.size());
for (LinkItem item : parentList) {
if (!items.contains(item) && !childList.contains(item)) {
@@ -287,7 +287,7 @@ public class DefaultSiteModelInheritanceAssembler
implements SiteModelInheritanc
private List<Logo> mergePoweredByLists(
final List<Logo> childList, final List<Logo> parentList, final
URLRebaser urlContainer) {
- List<Logo> logos = new ArrayList<Logo>(childList.size() +
parentList.size());
+ List<Logo> logos = new ArrayList<>(childList.size() +
parentList.size());
for (Logo logo : parentList) {
if (!logos.contains(logo)) {
diff --git
a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
index 9a544ab..8ac4c14 100644
---
a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
+++
b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
@@ -154,7 +154,7 @@ public class DefaultSiteRenderer implements Renderer {
/** {@inheritDoc} */
public Map<String, DocumentRenderer> locateDocumentFiles(
SiteRenderingContext siteRenderingContext, boolean editable)
throws IOException, RendererException {
- Map<String, DocumentRenderer> files = new LinkedHashMap<String,
DocumentRenderer>();
+ Map<String, DocumentRenderer> files = new LinkedHashMap<>();
Map<String, String> moduleExcludes =
siteRenderingContext.getModuleExcludes();
// look in every site directory (in general src/site or
target/generated-site)
@@ -177,7 +177,7 @@ public class DefaultSiteRenderer implements Renderer {
}
private List<String> filterExtensionIgnoreCase(List<String> fileNames,
String extension) {
- List<String> filtered = new LinkedList<String>(fileNames);
+ List<String> filtered = new LinkedList<>(fileNames);
for (Iterator<String> it = filtered.iterator(); it.hasNext(); ) {
String name = it.next();
diff --git
a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderingContext.java
b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderingContext.java
index b7ba4a7..ac27bf8 100644
---
a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderingContext.java
+++
b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderingContext.java
@@ -105,7 +105,7 @@ public class DocumentRenderingContext {
this.parserId = parserId;
this.extension = extension;
this.generator = generator;
- this.attributes = new HashMap<String, String>();
+ this.attributes = new HashMap<>();
document = document.replace('\\', '/');
this.inputName = document;
diff --git
a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
index 081d393..12733d0 100644
---
a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
+++
b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
@@ -50,7 +50,7 @@ public class SiteRenderingContext {
private Locale locale = Locale.ROOT;
- private List<Locale> siteLocales = new ArrayList<Locale>();
+ private List<Locale> siteLocales = new ArrayList<>();
private SiteModel siteModel;
@@ -62,7 +62,7 @@ public class SiteRenderingContext {
private File rootDirectory;
- private List<File> siteDirectories = new ArrayList<File>();
+ private List<File> siteDirectories = new ArrayList<>();
private Map<String, String> moduleExcludes;
diff --git
a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
index bf1cb46..a30d879 100644
---
a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
+++
b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
@@ -42,7 +42,7 @@ public class SiteRendererSink extends Xhtml5Sink implements
DocumentContent {
private String title;
- private List<String> authors = new ArrayList<String>();
+ private List<String> authors = new ArrayList<>();
private final StringWriter headWriter;
diff --git
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
index 9822168..8a42399 100644
---
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
+++
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
@@ -260,7 +260,7 @@ public class DefaultSiteRendererTest {
SiteRenderingContext siteRenderingContext = new SiteRenderingContext();
siteRenderingContext.setSiteModel(new SiteModel());
- Map<String, Object> attributes = new HashMap<String, Object>();
+ Map<String, Object> attributes = new HashMap<>();
/*
* We need to add doxiaSiteRendererVersion manually because version
property from pom.properties
@@ -289,7 +289,7 @@ public class DefaultSiteRendererTest {
File skinFile = skinJar;
- Map<String, Object> attributes = new HashMap<String, Object>();
+ Map<String, Object> attributes = new HashMap<>();
/*
* We need to add doxiaSiteRendererVersion manually because version
property from pom.properties
@@ -322,7 +322,7 @@ public class DefaultSiteRendererTest {
throws RendererException, IOException {
File skinFile = minimalSkinJar;
- final Map<String, String> attributes = new HashMap<String, String>();
+ final Map<String, String> attributes = new HashMap<>();
attributes.put("outputEncoding", "UTF-8");
Artifact skin = new DefaultArtifact(
@@ -498,7 +498,7 @@ public class DefaultSiteRendererTest {
/** {@inheritDoc} */
protected Map<String, String> getTestDocuments() throws IOException {
- Map<String, String> testDocs = new HashMap<String, String>();
+ Map<String, String> testDocs = new HashMap<>();
File dir = new File(getBasedir(), "target/output");
diff --git
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/JavascriptVerifier.java
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/JavascriptVerifier.java
index c8dd8a5..f4e69df 100644
---
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/JavascriptVerifier.java
+++
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/JavascriptVerifier.java
@@ -61,7 +61,7 @@ public class JavascriptVerifier extends AbstractVerifier {
try (WebClient webClient = new WebClient()) {
webClient.getOptions().setCssEnabled(false);
- final List<String> collectedAlerts = new ArrayList<String>(4);
+ final List<String> collectedAlerts = new ArrayList<>(4);
webClient.setAlertHandler(new
CollectingAlertHandler(collectedAlerts));
HtmlPage page = (HtmlPage)
webClient.getPage(jsTest.toURI().toURL());
