use ${project.build.outputDirectory} instead of

${project.build.directory}/classes

Author: davidburkhart

src/main/java/de/andrena/tools/nopackagecycles/NoPackageCyclesRule.java

@@ -1,77 +1,75 @@
-package de.andrena.tools.nopackagecycles;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import jdepend.framework.JDepend;
-import jdepend.framework.JavaPackage;
-
-import org.apache.maven.enforcer.rule.api.EnforcerRule;
-import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
-import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
-import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
-
-public class NoPackageCyclesRule implements EnforcerRule {
-
-	public static final String MAVEN_CLASSES_DIR = "classes";
-	public static final String MAVEN_PROJECT_BUILD_DIRECTORY_VAR = "${project.build.directory}";
-
-	public void execute(EnforcerRuleHelper helper) throws EnforcerRuleException {
-		try {
-			executePackageCycleCheckIfNecessary(helper);
-		} catch (ExpressionEvaluationException e) {
-			throw new EnforcerRuleException("Unable to lookup an expression " + e.getLocalizedMessage(), e);
-		} catch (IOException e) {
-			throw new EnforcerRuleException("Unable to access target directory " + e.getLocalizedMessage(), e);
-		}
-	}
-
-	private void executePackageCycleCheckIfNecessary(EnforcerRuleHelper helper) throws ExpressionEvaluationException,
-			IOException, EnforcerRuleException {
-		File targetDir = new File((String) helper.evaluate(MAVEN_PROJECT_BUILD_DIRECTORY_VAR));
-		File classesDir = new File(targetDir, MAVEN_CLASSES_DIR);
-		helper.getLog().info("Searching directory " + classesDir.getAbsolutePath() + " for package cycles.");
-		if (checkIsNecessary(classesDir)) {
-			executePackageCycleCheck(classesDir);
-		} else {
-			helper.getLog().info("Directory " + classesDir.getAbsolutePath() + " could not be found.");
-		}
-	}
-
-	private void executePackageCycleCheck(File classesDir) throws IOException, EnforcerRuleException {
-		JDepend jdepend = createJDepend();
-		jdepend.addDirectory(classesDir.getAbsolutePath());
-		jdepend.analyze();
-		if (jdepend.containsCycles()) {
-			throw new EnforcerRuleException("There are package cycles:" + getPackageCycles(jdepend));
-		}
-	}
-
-	protected JDepend createJDepend() {
-		return new JDepend();
-	}
-
-	private String getPackageCycles(JDepend jdepend) {
-		@SuppressWarnings("unchecked")
-		Collection<JavaPackage> packages = jdepend.getPackages();
-		return new PackageCycleOutput(new ArrayList<JavaPackage>(packages)).getOutput();
-	}
-
-	private boolean checkIsNecessary(File classesDir) {
-		return classesDir.exists();
-	}
-
-	public String getCacheId() {
-		return "";
-	}
-
-	public boolean isCacheable() {
-		return false;
-	}
-
-	public boolean isResultValid(EnforcerRule arg0) {
-		return false;
-	}
+package de.andrena.tools.nopackagecycles;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import jdepend.framework.JDepend;
+import jdepend.framework.JavaPackage;
+
+import org.apache.maven.enforcer.rule.api.EnforcerRule;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
+import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
+
+public class NoPackageCyclesRule implements EnforcerRule {
+
+	public static final String MAVEN_PROJECT_BUILD_OUTPUT_DIRECTORY_VAR = "${project.build.outputDirectory}";
+
+	public void execute(EnforcerRuleHelper helper) throws EnforcerRuleException {
+		try {
+			executePackageCycleCheckIfNecessary(helper);
+		} catch (ExpressionEvaluationException e) {
+			throw new EnforcerRuleException("Unable to lookup an expression " + e.getLocalizedMessage(), e);
+		} catch (IOException e) {
+			throw new EnforcerRuleException("Unable to access target directory " + e.getLocalizedMessage(), e);
+		}
+	}
+
+	private void executePackageCycleCheckIfNecessary(EnforcerRuleHelper helper) throws ExpressionEvaluationException,
+			IOException, EnforcerRuleException {
+		File classesDir = new File((String) helper.evaluate(MAVEN_PROJECT_BUILD_OUTPUT_DIRECTORY_VAR));
+		helper.getLog().info("Searching directory " + classesDir.getAbsolutePath() + " for package cycles.");
+		if (checkIsNecessary(classesDir)) {
+			executePackageCycleCheck(classesDir);
+		} else {
+			helper.getLog().info("Directory " + classesDir.getAbsolutePath() + " could not be found.");
+		}
+	}
+
+	private void executePackageCycleCheck(File classesDir) throws IOException, EnforcerRuleException {
+		JDepend jdepend = createJDepend();
+		jdepend.addDirectory(classesDir.getAbsolutePath());
+		jdepend.analyze();
+		if (jdepend.containsCycles()) {
+			throw new EnforcerRuleException("There are package cycles:" + getPackageCycles(jdepend));
+		}
+	}
+
+	protected JDepend createJDepend() {
+		return new JDepend();
+	}
+
+	private String getPackageCycles(JDepend jdepend) {
+		@SuppressWarnings("unchecked")
+		Collection<JavaPackage> packages = jdepend.getPackages();
+		return new PackageCycleOutput(new ArrayList<JavaPackage>(packages)).getOutput();
+	}
+
+	private boolean checkIsNecessary(File classesDir) {
+		return classesDir.exists();
+	}
+
+	public String getCacheId() {
+		return "";
+	}
+
+	public boolean isCacheable() {
+		return false;
+	}
+
+	public boolean isResultValid(EnforcerRule arg0) {
+		return false;
+	}
 }

src/test/java/de/andrena/tools/nopackagecycles/NoPackageCyclesRuleTest.java

@@ -43,7 +43,6 @@ protected JDepend createJDepend() {
 	public void setUp() throws Exception {
 		jdependMock = new JDependMock();
 		rule = new NoPackageCyclesRuleMock();
-		temporaryFolder.newFolder(NoPackageCyclesRule.MAVEN_CLASSES_DIR);
 		helper = new EnforcerRuleHelperMock();
 		helper.setTargetDir(temporaryFolder.getRoot());
 	}
@@ -65,13 +64,13 @@ public void result_IsNotValid() {
 
 	@Test
 	public void execute_checkNotNecessary_ClassesDirNotFound() throws Exception {
-		File newFolder = temporaryFolder.newFolder();
-		helper.setTargetDir(newFolder);
+		File nonExistentFolder = new File(temporaryFolder.getRoot(), "non-existent-classes-dir");
+		helper.setTargetDir(nonExistentFolder);
 		rule.execute(helper);
 		List<String> infoLogs = helper.getLogMock().getInfo();
 		assertThat(infoLogs, hasSize(2));
-		assertSearchingInfo(newFolder, infoLogs);
-		assertThat(infoLogs.get(1), is("Directory " + getTargetDirectory(newFolder) + " could not be found."));
+		assertSearchingInfo(nonExistentFolder, infoLogs);
+		assertThat(infoLogs.get(1), is("Directory " + nonExistentFolder.getAbsolutePath() + " could not be found."));
 	}
 
 	@Test
@@ -107,11 +106,7 @@ public void execute_ContainsCycles() throws Exception {
 	}
 
 	private void assertSearchingInfo(File projectDirectory, List<String> infoLogs) {
-		assertThat(infoLogs.get(0), is("Searching directory " + getTargetDirectory(projectDirectory)
+		assertThat(infoLogs.get(0), is("Searching directory " + projectDirectory.getAbsolutePath()
 				+ " for package cycles."));
 	}
-
-	private String getTargetDirectory(File newFolder) {
-		return new File(newFolder, NoPackageCyclesRule.MAVEN_CLASSES_DIR).getAbsolutePath();
-	}
 }

src/test/java/de/andrena/tools/nopackagecycles/mock/EnforcerRuleHelperMock.java

@@ -38,7 +38,7 @@ public Object evaluate(String variable) throws ExpressionEvaluationException {
 		if (evaluateThrowsException) {
 			throw new ExpressionEvaluationException("");
 		}
-		if (NoPackageCyclesRule.MAVEN_PROJECT_BUILD_DIRECTORY_VAR.equals(variable)) {
+		if (NoPackageCyclesRule.MAVEN_PROJECT_BUILD_OUTPUT_DIRECTORY_VAR.equals(variable)) {
 			return targetDir.getPath();
 		}
 		return null;