diff --git a/grails-core/src/main/groovy/grails/compiler/traits/TraitInjector.java b/grails-core/src/main/groovy/grails/compiler/traits/TraitInjector.java index 08aaf74ea8a..9e4c4765279 100644 --- a/grails-core/src/main/groovy/grails/compiler/traits/TraitInjector.java +++ b/grails-core/src/main/groovy/grails/compiler/traits/TraitInjector.java @@ -27,8 +27,6 @@ public interface TraitInjector { Class getTrait(); - boolean shouldInject(URL url); - String[] getArtefactTypes(); } diff --git a/grails-plugin-controllers/src/main/groovy/grails/compiler/traits/ControllerTraitInjector.groovy b/grails-plugin-controllers/src/main/groovy/grails/compiler/traits/ControllerTraitInjector.groovy index fcff50f2ebd..d19db33e5f4 100644 --- a/grails-plugin-controllers/src/main/groovy/grails/compiler/traits/ControllerTraitInjector.groovy +++ b/grails-plugin-controllers/src/main/groovy/grails/compiler/traits/ControllerTraitInjector.groovy @@ -18,10 +18,6 @@ package grails.compiler.traits import grails.artefact.Controller import groovy.transform.CompileStatic -import java.util.regex.Pattern - -import org.grails.io.support.GrailsResourceUtils - /** * * A {@link TraitInjector} that injects controllers with the {@link Controller} trait @@ -35,19 +31,11 @@ import org.grails.io.support.GrailsResourceUtils @CompileStatic class ControllerTraitInjector implements TraitInjector { - static Pattern CONTROLLER_PATTERN = Pattern.compile(".+/" + - GrailsResourceUtils.GRAILS_APP_DIR + "/controllers/(.+)Controller\\.groovy"); - @Override Class getTrait() { Controller } - - @Override - boolean shouldInject(URL url) { - return url != null && CONTROLLER_PATTERN.matcher(url.getFile()).find(); - } - + @Override String[] getArtefactTypes() { ['Controller'] as String[] diff --git a/grails-plugin-domain-class/src/main/groovy/grails/compiler/traits/DomainClassTraitInjector.groovy b/grails-plugin-domain-class/src/main/groovy/grails/compiler/traits/DomainClassTraitInjector.groovy index 0ce88e4bba7..08dedacbdc0 100644 --- a/grails-plugin-domain-class/src/main/groovy/grails/compiler/traits/DomainClassTraitInjector.groovy +++ b/grails-plugin-domain-class/src/main/groovy/grails/compiler/traits/DomainClassTraitInjector.groovy @@ -16,9 +16,7 @@ package grails.compiler.traits import grails.artefact.DomainClass - import org.grails.core.artefact.DomainClassArtefactHandler -import org.grails.io.support.GrailsResourceUtils /** * @@ -32,14 +30,9 @@ class DomainClassTraitInjector implements TraitInjector { DomainClass } - @Override - boolean shouldInject(URL url) { - GrailsResourceUtils.isDomainClass(url) - } @Override String[] getArtefactTypes() { [DomainClassArtefactHandler.TYPE] } - } diff --git a/grails-plugin-interceptors/src/main/groovy/grails/compiler/traits/InterceptorTraitInjector.groovy b/grails-plugin-interceptors/src/main/groovy/grails/compiler/traits/InterceptorTraitInjector.groovy index 4d1ac733d06..dd6807de704 100644 --- a/grails-plugin-interceptors/src/main/groovy/grails/compiler/traits/InterceptorTraitInjector.groovy +++ b/grails-plugin-interceptors/src/main/groovy/grails/compiler/traits/InterceptorTraitInjector.groovy @@ -17,10 +17,6 @@ package grails.compiler.traits import grails.artefact.Interceptor import groovy.transform.CompileStatic -import org.grails.io.support.GrailsResourceUtils - -import java.util.regex.Pattern - /** * Injects the {@link Interceptor} trait by convention @@ -31,19 +27,11 @@ import java.util.regex.Pattern @CompileStatic class InterceptorTraitInjector implements TraitInjector { - static Pattern INTERCEPTOR_PATTERN = Pattern.compile(".+/" + - GrailsResourceUtils.GRAILS_APP_DIR + "/controllers/(.+)Interceptor\\.groovy"); - @Override Class getTrait() { Interceptor } - @Override - boolean shouldInject(URL url) { - return url != null && INTERCEPTOR_PATTERN.matcher(url.getFile()).find(); - } - @Override String[] getArtefactTypes() { ['Interceptor'] as String[] diff --git a/grails-plugin-services/src/main/groovy/grails/compiler/traits/ServiceTraitInjector.groovy b/grails-plugin-services/src/main/groovy/grails/compiler/traits/ServiceTraitInjector.groovy index 80953b66afe..10cc478b906 100644 --- a/grails-plugin-services/src/main/groovy/grails/compiler/traits/ServiceTraitInjector.groovy +++ b/grails-plugin-services/src/main/groovy/grails/compiler/traits/ServiceTraitInjector.groovy @@ -17,10 +17,6 @@ package grails.compiler.traits import grails.artefact.Service -import org.grails.io.support.GrailsResourceUtils - -import java.util.regex.Pattern - /** * A {@link TraitInjector} for services @@ -30,19 +26,11 @@ import java.util.regex.Pattern */ class ServiceTraitInjector implements TraitInjector { - static Pattern SERVICE_PATTERN = Pattern.compile(".+/" + - GrailsResourceUtils.GRAILS_APP_DIR + "/services/(.+)Service\\.groovy"); - @Override Class getTrait() { Service } - @Override - boolean shouldInject(URL url) { - return url != null && SERVICE_PATTERN.matcher(url.getFile()).find(); - } - @Override String[] getArtefactTypes() { ['Service'] as String[] diff --git a/grails-web-databinding/src/main/groovy/grails/compiler/traits/WebDataBindingTraitInjector.groovy b/grails-web-databinding/src/main/groovy/grails/compiler/traits/WebDataBindingTraitInjector.groovy index 9a974f5e8b8..2ab75745cb0 100644 --- a/grails-web-databinding/src/main/groovy/grails/compiler/traits/WebDataBindingTraitInjector.groovy +++ b/grails-web-databinding/src/main/groovy/grails/compiler/traits/WebDataBindingTraitInjector.groovy @@ -16,9 +16,7 @@ package grails.compiler.traits import grails.web.databinding.WebDataBinding - import org.grails.core.artefact.DomainClassArtefactHandler -import org.grails.io.support.GrailsResourceUtils /** * @@ -32,11 +30,6 @@ class WebDataBindingTraitInjector implements TraitInjector { WebDataBinding } - @Override - boolean shouldInject(URL url) { - GrailsResourceUtils.isDomainClass(url) - } - @Override String[] getArtefactTypes() { [DomainClassArtefactHandler.TYPE] diff --git a/grails-web-taglib/src/main/groovy/grails/compiler/traits/TagLibraryTraitInjector.groovy b/grails-web-taglib/src/main/groovy/grails/compiler/traits/TagLibraryTraitInjector.groovy index 935dbdd185a..2b626b52fc7 100644 --- a/grails-web-taglib/src/main/groovy/grails/compiler/traits/TagLibraryTraitInjector.groovy +++ b/grails-web-taglib/src/main/groovy/grails/compiler/traits/TagLibraryTraitInjector.groovy @@ -17,10 +17,6 @@ package grails.compiler.traits import grails.artefact.TagLibrary -import java.util.regex.Pattern - -import org.grails.io.support.GrailsResourceUtils - /** * * @since 3.0 @@ -29,19 +25,11 @@ import org.grails.io.support.GrailsResourceUtils */ class TagLibraryTraitInjector implements TraitInjector { - static Pattern TAGLIB_PATTERN = Pattern.compile(".+/" + - GrailsResourceUtils.GRAILS_APP_DIR + "/taglib/(.+)TagLib\\.groovy") - @Override Class getTrait() { TagLibrary } - - @Override - boolean shouldInject(URL url) { - return url != null && TAGLIB_PATTERN.matcher(url.getFile()).find(); - } - + @Override String[] getArtefactTypes() { ['TagLibrary', 'TagLib'] as String[]