Allow file level checks to be excluded

Update the filtering logic so that top-level file checks can also be
excluded.

Closes gh-210

Author: philwebb

spring-javaformat/spring-javaformat-checkstyle/src/main/java/io/spring/javaformat/checkstyle/FilteredModuleFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import com.puppycrawl.tools.checkstyle.TreeWalkerFilter;
 import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
 import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
+import com.puppycrawl.tools.checkstyle.api.Configuration;
 
 class FilteredModuleFactory implements ModuleFactory {
 
@@ -47,17 +48,25 @@ public boolean accept(TreeWalkerAuditEvent treeWalkerAuditEvent) {
 	@Override
 	public Object createModule(String name) throws CheckstyleException {
 		Object module = this.moduleFactory.createModule(name);
-		if (module instanceof AbstractCheck) {
-			module = filter((AbstractCheck) module);
+		if (isFiltered(module)) {
+			if (module instanceof AbstractCheck) {
+				return FILTERED;
+			}
+			throw new IllegalStateException("Unable to filter module " + module.getClass().getName());
 		}
 		return module;
 	}
 
-	private Object filter(AbstractCheck check) {
-		if (this.excludes != null && this.excludes.contains(check.getClass().getName())) {
-			return FILTERED;
-		}
-		return check;
+	boolean nonFiltered(Configuration configuration) {
+		return !isFiltered(configuration.getName());
+	}
+
+	private boolean isFiltered(Object module) {
+		return isFiltered(module.getClass().getName());
+	}
+
+	private boolean isFiltered(String name) {
+		return this.excludes != null && this.excludes.contains(name);
 	}
 
 }

spring-javaformat/spring-javaformat-checkstyle/src/main/java/io/spring/javaformat/checkstyle/SpringChecks.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -87,7 +87,7 @@ public void setModuleFactory(ModuleFactory moduleFactory) {
 
 	@Override
 	public void finishLocalSetup() {
-		ModuleFactory moduleFactory = new FilteredModuleFactory(this.moduleFactory, this.excludes);
+		FilteredModuleFactory moduleFactory = new FilteredModuleFactory(this.moduleFactory, this.excludes);
 		DefaultContext context = new DefaultContext();
 		context.add("classLoader", this.classLoader);
 		context.add("severity", getSeverity());

spring-javaformat/spring-javaformat-checkstyle/src/main/java/io/spring/javaformat/checkstyle/SpringConfigurationLoader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 
 import com.puppycrawl.tools.checkstyle.ConfigurationLoader;
 import com.puppycrawl.tools.checkstyle.ConfigurationLoader.IgnoredModulesOptions;
-import com.puppycrawl.tools.checkstyle.ModuleFactory;
 import com.puppycrawl.tools.checkstyle.PropertyResolver;
 import com.puppycrawl.tools.checkstyle.api.AutomaticBean;
 import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
@@ -42,17 +41,18 @@ class SpringConfigurationLoader {
 
 	private final Context context;
 
-	private final ModuleFactory moduleFactory;
+	private final FilteredModuleFactory moduleFactory;
 
-	SpringConfigurationLoader(Context context, ModuleFactory moduleFactory) {
+	SpringConfigurationLoader(Context context, FilteredModuleFactory moduleFactory) {
 		this.context = context;
 		this.moduleFactory = moduleFactory;
 	}
 
 	public Collection<FileSetCheck> load(PropertyResolver propertyResolver) {
 		Configuration config = loadConfiguration(getClass().getResourceAsStream("spring-checkstyle.xml"),
 				propertyResolver);
-		return Arrays.stream(config.getChildren()).map(this::load).collect(Collectors.toList());
+		return Arrays.stream(config.getChildren()).filter(this.moduleFactory::nonFiltered).map(this::load)
+				.collect(Collectors.toList());
 	}
 
 	private Configuration loadConfiguration(InputStream inputStream, PropertyResolver propertyResolver) {

spring-javaformat/spring-javaformat-checkstyle/src/test/java/io/spring/javaformat/checkstyle/SpringConfigurationLoaderTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 import java.util.Set;
 
 import com.puppycrawl.tools.checkstyle.DefaultContext;
-import com.puppycrawl.tools.checkstyle.ModuleFactory;
 import com.puppycrawl.tools.checkstyle.PackageObjectFactory;
 import com.puppycrawl.tools.checkstyle.PropertiesExpander;
 import com.puppycrawl.tools.checkstyle.PropertyResolver;
@@ -63,13 +62,19 @@ public void loadWithExcludeShouldExcludeChecks() {
 		assertThat(ordinaryChecks).hasSize(59);
 	}
 
+	@Test
+	public void loadWithExcludeHeaderShouldExcludeChecks() {
+		Set<String> excludes = Collections.singleton("io.spring.javaformat.checkstyle.check.SpringHeaderCheck");
+		Object[] checks = load(excludes).stream().toArray();
+		assertThat(checks).hasSize(2);
+	}
+
 	private Collection<FileSetCheck> load(Set<String> excludes) {
 		DefaultContext context = new DefaultContext();
-		ModuleFactory moduleFactory = new PackageObjectFactory(getClass().getPackage().getName(),
-				getClass().getClassLoader());
-		moduleFactory = new FilteredModuleFactory(moduleFactory, excludes);
-		context.add("moduleFactory", moduleFactory);
-		Collection<FileSetCheck> checks = new SpringConfigurationLoader(context, moduleFactory)
+		FilteredModuleFactory filteredModuleFactory = new FilteredModuleFactory(
+				new PackageObjectFactory(getClass().getPackage().getName(), getClass().getClassLoader()), excludes);
+		context.add("moduleFactory", filteredModuleFactory);
+		Collection<FileSetCheck> checks = new SpringConfigurationLoader(context, filteredModuleFactory)
 				.load(getPropertyResolver());
 		return checks;
 	}