Skip to content

Commit b4affbf

Browse files
committed
Apply automatic Spotless formatting for Java and POM files
1 parent 9985a4b commit b4affbf

38 files changed

+252
-235
lines changed

conga-aem-plugin/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
limitations under the License.
1919
#L%
2020
-->
21-
2221
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2322
<modelVersion>4.0.0</modelVersion>
2423

@@ -40,8 +39,8 @@
4039
<scm>
4140
<connection>scm:git:https://github.com/wcm-io-devops/conga-aem-plugin.git</connection>
4241
<developerConnection>scm:git:https://github.com/wcm-io-devops/conga-aem-plugin.git</developerConnection>
43-
<url>https://github.com/wcm-io-devops/conga-aem-plugin</url>
4442
<tag>HEAD</tag>
43+
<url>https://github.com/wcm-io-devops/conga-aem-plugin</url>
4544
</scm>
4645

4746
<properties>
@@ -201,10 +200,10 @@
201200
<artifactId>maven-shade-plugin</artifactId>
202201
<executions>
203202
<execution>
204-
<phase>package</phase>
205203
<goals>
206204
<goal>shade</goal>
207205
</goals>
206+
<phase>package</phase>
208207
<configuration>
209208
<artifactSet>
210209
<includes>

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/escaping/AnyEscapingStrategy.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,9 @@ public class AnyEscapingStrategy implements EscapingStrategyPlugin {
4343
/**
4444
* Defines translations for strings in ANY files.
4545
*/
46-
private static final CharSequenceTranslator ESCAPE_ANY =
47-
new LookupTranslator(Map.of(
48-
"\"", "\\\"",
49-
"\\", "\\\\"));
46+
private static final CharSequenceTranslator ESCAPE_ANY = new LookupTranslator(Map.of(
47+
"\"", "\\\"",
48+
"\\", "\\\\"));
5049

5150
@Override
5251
public String getName() {

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/AbstractCloudManagerConditionalHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ protected abstract void renderBodyContent(Buffer buffer, CharSequence bodyConten
9393

9494
private List<CloudManagerConditional> getCloudManagerConditional(Map<String, Object> cloudManagerConditional) {
9595
return ENVIRONMENTS.stream()
96-
.map(env -> new CloudManagerConditional(env, cloudManagerConditional.getOrDefault(env, Map.of())))
97-
.toList();
96+
.map(env -> new CloudManagerConditional(env, cloudManagerConditional.getOrDefault(env, Map.of())))
97+
.toList();
9898
}
9999

100100
/**

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/AbstractFilterHelper.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@
3333
abstract class AbstractFilterHelper implements HelperPlugin<Object> {
3434

3535
@Override
36-
@SuppressWarnings({ "PMD.PreserveStackTrace", "PMD.AvoidThrowingNewInstanceOfSameException" })
36+
@SuppressWarnings({
37+
"PMD.PreserveStackTrace", "PMD.AvoidThrowingNewInstanceOfSameException"
38+
})
3739
public final Object apply(Object context, Options options, HelperContext pluginContext) throws IOException {
3840
if (!(context instanceof Map)) {
3941
throw new IllegalArgumentException("Excpected map object for filter rule.");

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/AbstractHostHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
/*-
1+
/*
22
* #%L
33
* wcm.io
44
* %%
5-
* Copyright (C) 2015 - 2018 wcm.io DevOps
5+
* Copyright (C) 2015-2018 wcm.io
66
* %%
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/AemCryptoEncryptHelper.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ public String getName() {
6363
}
6464

6565
@Override
66-
@SuppressWarnings({ "java:S3776", "java:S5411", "PMD.ExceptionAsFlowControl" }) // ignore complexity
66+
@SuppressWarnings({
67+
"java:S3776", "java:S5411", "PMD.ExceptionAsFlowControl"
68+
}) // ignore complexity
6769
public Object apply(Object context, Options options, HelperContext pluginContext) throws IOException {
6870
if (context == null) {
6971
return null;

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/AemDispatcherFilterHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ protected String generateFilter(Map<String, Object> filterMap, Options options)
4646
DispatcherFilter filter = new DispatcherFilter(filterMap);
4747

4848
StringBuilder sb = new StringBuilder()
49-
.append("{ ");
49+
.append("{ ");
5050

5151
applySimpleValue(sb, "type", filter.getType().toString());
5252

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/AemHttpdFilterHelper.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ protected String generateFilter(Map<String, Object> filterMap, Options options)
7373
allowFrom, allowFromHost);
7474
}
7575

76-
@SuppressWarnings({ "java:S3776", "java:S1192" }) // ignore complexity
76+
@SuppressWarnings({
77+
"java:S3776", "java:S1192"
78+
}) // ignore complexity
7779
private String generateRule(String ruleType, String ruleExpression, HttpdFilterType filterType,
7880
String allowFrom, String allowFromHost) {
7981
StringBuilder sb = new StringBuilder();
@@ -82,16 +84,16 @@ private String generateRule(String ruleType, String ruleExpression, HttpdFilterT
8284

8385
if (filterType == HttpdFilterType.ALLOW) {
8486
sb.append(" <IfVersion < 2.4>\n")
85-
.append(" Allow from all\n")
86-
.append(" </IfVersion>\n")
87-
.append(" <IfVersion >= 2.4>\n")
88-
.append(" Require all granted\n")
89-
.append(" </IfVersion>\n");
87+
.append(" Allow from all\n")
88+
.append(" </IfVersion>\n")
89+
.append(" <IfVersion >= 2.4>\n")
90+
.append(" Require all granted\n")
91+
.append(" </IfVersion>\n");
9092
}
9193
else {
9294
sb.append(" <IfVersion < 2.4>\n")
93-
.append(" Order Deny,Allow\n")
94-
.append(" Deny from all\n");
95+
.append(" Order Deny,Allow\n")
96+
.append(" Deny from all\n");
9597
if (filterType == HttpdFilterType.DENY_ALLOW_ADMIN) {
9698
if (StringUtils.isNotBlank(allowFrom)) {
9799
sb.append(" Allow from ").append(allowFrom).append("\n");
@@ -101,8 +103,8 @@ private String generateRule(String ruleType, String ruleExpression, HttpdFilterT
101103
}
102104
}
103105
sb.append(" </IfVersion>\n")
104-
.append(" <IfVersion >= 2.4>\n")
105-
.append(" Require all denied\n");
106+
.append(" <IfVersion >= 2.4>\n")
107+
.append(" Require all denied\n");
106108
if (filterType == HttpdFilterType.DENY_ALLOW_ADMIN) {
107109
if (StringUtils.isNotBlank(allowFrom)) {
108110
sb.append(" Require ip ").append(allowFrom).append("\n");

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/NoClassNameOmitNullsStyle.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.apache.commons.lang3.builder.ToStringStyle;
2323

2424
final class NoClassNameOmitNullsStyle extends ToStringStyle {
25+
2526
private static final long serialVersionUID = 1L;
2627

2728
/**

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/WebConsolePasswordHashHelper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
import io.wcm.devops.conga.generator.spi.handlebars.context.HelperContext;
3434

3535
/**
36-
* Handlebars helper that builds a password hash for a given password string for the Apache Felix Webconsole (felix.webconsole.password).
36+
* Handlebars helper that builds a password hash for a given password string for the Apache Felix Webconsole
37+
* (felix.webconsole.password).
3738
*/
3839
public class WebConsolePasswordHashHelper implements HelperPlugin<Object> {
3940

0 commit comments

Comments
 (0)