Skip to content

Commit f97cc25

Browse files
slawekjaranowskislawekjaranowski
committed
Enable checkstyle and spotless plugins - code reformat
1 parent 8a9addf commit f97cc25

32 files changed

+1873
-2372
lines changed

‎pom.xml

+18-16
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212

1313
<name>Extra Enforcer Rules</name>
1414

15-
<description>
16-
Extra Enforcer Rules. These are extra rules for Apache Maven's Enforcer Plugin.
17-
</description>
15+
<description>Extra Enforcer Rules. These are extra rules for Apache Maven's Enforcer Plugin.</description>
1816
<url>https://www.mojohaus.org/extra-enforcer-rules/</url>
1917

2018
<inceptionYear>2011</inceptionYear>
@@ -27,13 +25,6 @@
2725
</license>
2826
</licenses>
2927

30-
<scm>
31-
<connection>scm:git:https://github.com/mojohaus/extra-enforcer-rules.git</connection>
32-
<developerConnection>scm:git:ssh://git@github.com/mojohaus/extra-enforcer-rules.git</developerConnection>
33-
<url>https://github.com/mojohaus/extra-enforcer-rules/tree/master</url>
34-
<tag>HEAD</tag>
35-
</scm>
36-
3728
<developers>
3829
<developer>
3930
<name>Stephen Connolly</name>
@@ -58,6 +49,13 @@
5849
</developer>
5950
</developers>
6051

52+
<scm>
53+
<connection>scm:git:https://github.com/mojohaus/extra-enforcer-rules.git</connection>
54+
<developerConnection>scm:git:ssh://git@github.com/mojohaus/extra-enforcer-rules.git</developerConnection>
55+
<tag>HEAD</tag>
56+
<url>https://github.com/mojohaus/extra-enforcer-rules/tree/master</url>
57+
</scm>
58+
6159
<properties>
6260
<!-- some of plugins requires JDK 11 -->
6361
<recommendedJavaBuildVersion>11</recommendedJavaBuildVersion>
@@ -159,12 +157,12 @@
159157
</build>
160158

161159
<reporting>
162-
<plugins>
163-
<plugin>
164-
<groupId>org.apache.maven.plugins</groupId>
165-
<artifactId>maven-invoker-plugin</artifactId>
166-
</plugin>
167-
</plugins>
160+
<plugins>
161+
<plugin>
162+
<groupId>org.apache.maven.plugins</groupId>
163+
<artifactId>maven-invoker-plugin</artifactId>
164+
</plugin>
165+
</plugins>
168166
</reporting>
169167

170168
<profiles>
@@ -220,6 +218,10 @@
220218
<jdk>[11,)</jdk>
221219
</activation>
222220

221+
<properties>
222+
<checkstyle.violation.ignore>MagicNumber</checkstyle.violation.ignore>
223+
</properties>
224+
223225
<build>
224226
<!--- newer versions of plugins requires JDK 11 -->
225227
<plugins>

‎src/main/java/org/apache/maven/plugins/enforcer/AbstractMojoHausEnforcerRule.java

+3-7
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,15 @@
2222
import org.apache.maven.enforcer.rule.api.EnforcerLevel;
2323
import org.apache.maven.enforcer.rule.api.EnforcerRule2;
2424

25-
abstract class AbstractMojoHausEnforcerRule
26-
implements EnforcerRule2
27-
{
25+
abstract class AbstractMojoHausEnforcerRule implements EnforcerRule2 {
2826
private EnforcerLevel level = EnforcerLevel.ERROR;
2927

3028
@Override
31-
public EnforcerLevel getLevel()
32-
{
29+
public EnforcerLevel getLevel() {
3330
return level;
3431
}
3532

36-
public void setLevel( EnforcerLevel level )
37-
{
33+
public void setLevel(EnforcerLevel level) {
3834
this.level = level;
3935
}
4036
}

‎src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireRoles.java

+48-71
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@
4040
* @author Mirko Friedenhagen
4141
* @since 1.0-alpha-3
4242
*/
43-
abstract class AbstractRequireRoles<T extends Contributor> extends AbstractMojoHausEnforcerRule
44-
{
43+
abstract class AbstractRequireRoles<T extends Contributor> extends AbstractMojoHausEnforcerRule {
4544
/**
4645
* Specify the required roles as comma separated list.
4746
*/
@@ -54,51 +53,45 @@ abstract class AbstractRequireRoles<T extends Contributor> extends AbstractMojoH
5453

5554
/**
5655
* Execute the rule.
57-
*
56+
*
5857
* @param helper the helper
5958
* @throws EnforcerRuleException the enforcer rule exception
6059
*/
61-
public void execute( EnforcerRuleHelper helper )
62-
throws EnforcerRuleException
63-
{
64-
MavenProject mavenProject = getMavenProject( helper );
60+
public void execute(EnforcerRuleHelper helper) throws EnforcerRuleException {
61+
MavenProject mavenProject = getMavenProject(helper);
6562

6663
// Trying to prevent side-effects with unmodifiable sets (already got burned)
67-
final Set<String> requiredRolesSet = Collections.unmodifiableSet( getRolesFromString( requiredRoles ) );
68-
final Set<String> rolesFromProject = Collections.unmodifiableSet(getRolesFromProject( mavenProject ));
64+
final Set<String> requiredRolesSet = Collections.unmodifiableSet(getRolesFromString(requiredRoles));
65+
final Set<String> rolesFromProject = Collections.unmodifiableSet(getRolesFromProject(mavenProject));
6966

70-
checkRequiredRoles( requiredRolesSet, rolesFromProject );
71-
checkValidRoles( requiredRolesSet, rolesFromProject );
67+
checkRequiredRoles(requiredRolesSet, rolesFromProject);
68+
checkValidRoles(requiredRolesSet, rolesFromProject);
7269
}
7370

74-
private void checkRequiredRoles( final Set<String> requiredRolesSet, final Set<String> rolesFromProject )
75-
throws EnforcerRuleException
76-
{
71+
private void checkRequiredRoles(final Set<String> requiredRolesSet, final Set<String> rolesFromProject)
72+
throws EnforcerRuleException {
7773
final Set<String> copyOfRequiredRolesSet = new LinkedHashSet<>(requiredRolesSet);
78-
copyOfRequiredRolesSet.removeAll( rolesFromProject );
79-
if ( copyOfRequiredRolesSet.size() > 0 )
80-
{
74+
copyOfRequiredRolesSet.removeAll(rolesFromProject);
75+
if (copyOfRequiredRolesSet.size() > 0) {
8176
final String message =
82-
String.format( "Found no %s representing role(s) '%s'", getRoleName(), copyOfRequiredRolesSet );
83-
throw new EnforcerRuleException( message );
77+
String.format("Found no %s representing role(s) '%s'", getRoleName(), copyOfRequiredRolesSet);
78+
throw new EnforcerRuleException(message);
8479
}
8580
}
8681

87-
private void checkValidRoles( final Set<String> requiredRolesSet, final Set<String> rolesFromProject )
88-
throws EnforcerRuleException
89-
{
82+
private void checkValidRoles(final Set<String> requiredRolesSet, final Set<String> rolesFromProject)
83+
throws EnforcerRuleException {
9084
final Set<String> copyOfRolesFromProject = new LinkedHashSet<>(rolesFromProject);
91-
final Set<String> allowedRoles = getRolesFromString( validRoles );
92-
if ( !allowedRoles.contains( "*" ) )
93-
{
94-
allowedRoles.addAll( requiredRolesSet );
85+
final Set<String> allowedRoles = getRolesFromString(validRoles);
86+
if (!allowedRoles.contains("*")) {
87+
allowedRoles.addAll(requiredRolesSet);
9588

9689
// results in invalid roles
97-
copyOfRolesFromProject.removeAll( allowedRoles );
98-
if ( copyOfRolesFromProject.size() > 0 )
99-
{
100-
final String message = String.format( "Found invalid %s role(s) '%s'", getRoleName(), copyOfRolesFromProject );
101-
throw new EnforcerRuleException( message );
90+
copyOfRolesFromProject.removeAll(allowedRoles);
91+
if (copyOfRolesFromProject.size() > 0) {
92+
final String message =
93+
String.format("Found invalid %s role(s) '%s'", getRoleName(), copyOfRolesFromProject);
94+
throw new EnforcerRuleException(message);
10295
}
10396
}
10497
}
@@ -109,19 +102,16 @@ private void checkValidRoles( final Set<String> requiredRolesSet, final Set<Stri
109102
* @param mavenProject
110103
* @return roles from POM.
111104
*/
112-
@SuppressWarnings( "unchecked" )
113-
final Set<String> getRolesFromProject( MavenProject mavenProject )
114-
{
105+
@SuppressWarnings("unchecked")
106+
final Set<String> getRolesFromProject(MavenProject mavenProject) {
115107
final Set<String> result = new HashSet<>();
116-
for ( final T roleFromPom : getRoles( mavenProject ) )
117-
{
108+
for (final T roleFromPom : getRoles(mavenProject)) {
118109
List<String> roles = roleFromPom.getRoles();
119110
result.addAll(roles);
120111
}
121112
return result;
122113
}
123114

124-
125115
/**
126116
* Returns the rolename.
127117
*
@@ -135,26 +125,23 @@ final Set<String> getRolesFromProject( MavenProject mavenProject )
135125
* @param mavenProject
136126
* @return the list of {@link Contributor}s or {@link Developer}s.
137127
*/
138-
protected abstract List<T> getRoles( final MavenProject mavenProject );
128+
protected abstract List<T> getRoles(MavenProject mavenProject);
139129

140130
/**
141131
* Returns the set of required roles from the property.
142132
*
143133
* @param csRoles comma-separated roles to be split
144134
* @return
145135
*/
146-
Set<String> getRolesFromString( final String csRoles )
147-
{
148-
return splitCsvToSet( csRoles );
136+
Set<String> getRolesFromString(final String csRoles) {
137+
return splitCsvToSet(csRoles);
149138
}
150139

151-
static Set<String> splitCsvToSet( final String csv )
152-
{
153-
final String [] splitValues = StringUtils.split( csv, "," );
140+
static Set<String> splitCsvToSet(final String csv) {
141+
final String[] splitValues = StringUtils.split(csv, ",");
154142
final Set<String> result = new HashSet<>();
155-
for ( String value : splitValues )
156-
{
157-
result.add( value.trim() );
143+
for (String value : splitValues) {
144+
result.add(value.trim());
158145
}
159146
return result;
160147
}
@@ -167,56 +154,46 @@ static Set<String> splitCsvToSet( final String csv )
167154
*
168155
* @throws EnforcerRuleException
169156
*/
170-
MavenProject getMavenProject( EnforcerRuleHelper helper ) throws EnforcerRuleException
171-
{
172-
try
173-
{
174-
return ( MavenProject ) helper.evaluate( "${project}" );
175-
}
176-
catch ( ExpressionEvaluationException eee )
177-
{
178-
throw new EnforcerRuleException( "Unable to get project.", eee );
157+
MavenProject getMavenProject(EnforcerRuleHelper helper) throws EnforcerRuleException {
158+
try {
159+
return (MavenProject) helper.evaluate("${project}");
160+
} catch (ExpressionEvaluationException eee) {
161+
throw new EnforcerRuleException("Unable to get project.", eee);
179162
}
180163
}
181164

182165
// HELPER methods for unittests.
183166
/**
184167
* @param requiredRoles the requiredRoles to set.
185168
*/
186-
void setRequiredRoles( String requiredRoles )
187-
{
169+
void setRequiredRoles(String requiredRoles) {
188170
this.requiredRoles = requiredRoles;
189171
}
190-
191-
void setValidRoles( String validRoles )
192-
{
172+
173+
void setValidRoles(String validRoles) {
193174
this.validRoles = validRoles;
194175
}
195-
196176

197-
//*********************
198-
177+
// *********************
178+
199179
/**
200180
* {@inheritDoc}
201181
*/
202-
public String getCacheId()
203-
{
182+
public String getCacheId() {
204183
return "0";
205184
}
206185

207186
/**
208187
* {@inheritDoc}
209188
*/
210-
public boolean isCacheable()
211-
{
189+
public boolean isCacheable() {
212190
return false;
213191
}
214192

215193
/**
216194
* {@inheritDoc}
217195
*/
218-
public boolean isResultValid( EnforcerRule cachedRule )
219-
{
196+
public boolean isResultValid(EnforcerRule cachedRule) {
220197
return false;
221198
}
222-
}
199+
}

0 commit comments

Comments
 (0)