Skip to content

Commit 9b4a60f

Browse files
stefanseifertstefanseifert
committed
Apply automatic Spotless formatting for Java and POM files
1 parent 10eba86 commit 9b4a60f

32 files changed

Lines changed: 648 additions & 171 deletions

‎conga-ansible-plugin/pom.xml‎

Lines changed: 3 additions & 4 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-ansible-plugin.git</connection>
4241
<developerConnection>scm:git:https://github.com/wcm-io-devops/conga-ansible-plugin.git</developerConnection>
43-
<url>https://github.com/wcm-io-devops/conga-ansible-plugin</url>
4442
<tag>HEAD</tag>
43+
<url>https://github.com/wcm-io-devops/conga-ansible-plugin</url>
4544
</scm>
4645

4746
<properties>
@@ -122,18 +121,18 @@
122121
<id>before-integration-test-execution</id>
123122
<goals>
124123
<goal>prepare-agent-integration</goal>
125-
</goals>
124+
</goals>
126125
<configuration>
127126
<destFile>${project.build.directory}/jacoco-output/jacoco-integration-tests.exec</destFile>
128127
<propertyName>invoker.jacoco.args</propertyName>
129128
</configuration>
130129
</execution>
131130
<execution>
132131
<id>merge-unit-and-integration</id>
133-
<phase>post-integration-test</phase>
134132
<goals>
135133
<goal>merge</goal>
136134
</goals>
135+
<phase>post-integration-test</phase>
137136
<configuration>
138137
<fileSets>
139138
<fileSet>

‎conga-ansible-plugin/src/main/java/io/wcm/devops/conga/plugins/ansible/util/AnsibleVaultPasswordMissing.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
* Exception is throws when the Ansible Vault password is not set.
2424
*/
2525
public class AnsibleVaultPasswordMissing extends RuntimeException {
26+
2627
private static final long serialVersionUID = 1L;
2728

2829
/**

‎conga-ansible-plugin/src/main/java/io/wcm/devops/conga/plugins/ansible/valueprovider/AnsibleInventoryValueProviderPlugin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ private Map<String, List<String>> inventoryToConfig(AnsibleInventory inventory)
182182
Map<String, List<String>> config = new HashMap<>();
183183
for (AnsibleGroup group : inventory.getGroups()) {
184184
config.put(group.getName(), group.getHosts().stream()
185-
.map(AnsibleHost::getName)
186-
.toList());
185+
.map(AnsibleHost::getName)
186+
.toList());
187187
}
188188
return config;
189189
}

‎conga-ansible-plugin/src/main/java/it/andreascarpino/ansible/inventory/type/AnsibleConstants.java‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
/*
2+
* #%L
3+
* wcm.io
4+
* %%
5+
* Copyright (C) 2016 wcm.io
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* #L%
19+
*/
20+
package it.andreascarpino.ansible.inventory.type;
21+
122
/*
223
* The MIT License (MIT)
324
* Copyright (c) 2016 Andrea Scarpino <me@andreascarpino.it>
@@ -16,7 +37,6 @@
1637
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1738
*/
1839
//CHECKSTYLE:OFF
19-
package it.andreascarpino.ansible.inventory.type;
2040

2141
/**
2242
* @author Andrea Scarpino
@@ -204,8 +224,7 @@ public final class AnsibleConstants {
204224
*/
205225
public static final String ALL_GROUP = "all";
206226

207-
private AnsibleConstants() {
208-
}
227+
private AnsibleConstants() {}
209228

210229
/**
211230
* @author Andrea Scarpino
@@ -222,8 +241,7 @@ public static final class AnsibleConnection {
222241

223242
public static final String WINRM = "winrm";
224243

225-
private AnsibleConnection() {
226-
}
244+
private AnsibleConnection() {}
227245

228246
}
229247

@@ -236,8 +254,7 @@ public static final class AnsibleWinRMScheme {
236254

237255
public static final String HTTPS = "https";
238256

239-
private AnsibleWinRMScheme() {
240-
}
257+
private AnsibleWinRMScheme() {}
241258

242259
}
243260

@@ -252,8 +269,7 @@ public static final class AnsibleWinRMTransport {
252269

253270
public static final String PLAINTEXT = "plaintext";
254271

255-
private AnsibleWinRMTransport() {
256-
}
272+
private AnsibleWinRMTransport() {}
257273
}
258274

259275
/**
@@ -265,8 +281,7 @@ public static final class AnsibleWinRMServerCertValidation {
265281

266282
public static final String VALIDATE = "validate";
267283

268-
private AnsibleWinRMServerCertValidation() {
269-
}
284+
private AnsibleWinRMServerCertValidation() {}
270285

271286
}
272287

‎conga-ansible-plugin/src/main/java/it/andreascarpino/ansible/inventory/type/AnsibleGroup.java‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
/*
2+
* #%L
3+
* wcm.io
4+
* %%
5+
* Copyright (C) 2016 wcm.io
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* #L%
19+
*/
20+
package it.andreascarpino.ansible.inventory.type;
21+
122
/*
223
* The MIT License (MIT)
324
* Copyright (c) 2016 Andrea Scarpino <me@andreascarpino.it>
@@ -16,7 +37,6 @@
1637
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1738
*/
1839
//CHECKSTYLE:OFF
19-
package it.andreascarpino.ansible.inventory.type;
2040

2141
import java.util.Collection;
2242
import java.util.LinkedHashMap;
@@ -140,7 +160,7 @@ public boolean equals(Object o) {
140160
return false;
141161
}
142162

143-
AnsibleGroup group = (AnsibleGroup) o;
163+
AnsibleGroup group = (AnsibleGroup)o;
144164

145165
return name.equals(group.name);
146166
}

‎conga-ansible-plugin/src/main/java/it/andreascarpino/ansible/inventory/type/AnsibleHost.java‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
/*
2+
* #%L
3+
* wcm.io
4+
* %%
5+
* Copyright (C) 2016 wcm.io
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* #L%
19+
*/
20+
package it.andreascarpino.ansible.inventory.type;
21+
122
/*
223
* The MIT License (MIT)
324
* Copyright (c) 2016 Andrea Scarpino <me@andreascarpino.it>
@@ -16,7 +37,6 @@
1637
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1738
*/
1839
//CHECKSTYLE:OFF
19-
package it.andreascarpino.ansible.inventory.type;
2040

2141
import java.util.HashSet;
2242
import java.util.Iterator;
@@ -102,7 +122,7 @@ public boolean equals(Object o) {
102122
return false;
103123
}
104124

105-
AnsibleHost host = (AnsibleHost) o;
125+
AnsibleHost host = (AnsibleHost)o;
106126

107127
return name.equals(host.name);
108128
}

‎conga-ansible-plugin/src/main/java/it/andreascarpino/ansible/inventory/type/AnsibleInventory.java‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
/*
2+
* #%L
3+
* wcm.io
4+
* %%
5+
* Copyright (C) 2016 wcm.io
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* #L%
19+
*/
20+
package it.andreascarpino.ansible.inventory.type;
21+
122
/*
223
* The MIT License (MIT)
324
* Copyright (c) 2016 Andrea Scarpino <me@andreascarpino.it>
@@ -16,7 +37,6 @@
1637
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1738
*/
1839
//CHECKSTYLE:OFF
19-
package it.andreascarpino.ansible.inventory.type;
2040

2141
import java.util.Collection;
2242
import java.util.LinkedHashMap;

0 commit comments

Comments
 (0)