From 39872324a2f14a0bcf23512897560673b40a20b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Mat=C4=9Bjka?= Date: Wed, 2 Mar 2016 18:58:45 +0100 Subject: [PATCH] Deprecating CompilerConfiguration.output as it is not used for anything. --- .../groovy/control/CompilerConfiguration.java | 12 ++++++------ .../groovy/tools/javac/JavacJavaCompiler.java | 1 - .../groovy/control/CompilerConfigurationTest.java | 12 ------------ 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/main/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/org/codehaus/groovy/control/CompilerConfiguration.java index f71808ffbad..119cd404095 100644 --- a/src/main/org/codehaus/groovy/control/CompilerConfiguration.java +++ b/src/main/org/codehaus/groovy/control/CompilerConfiguration.java @@ -85,8 +85,10 @@ public class CompilerConfiguration { */ private String sourceEncoding; + /** - * A PrintWriter for communicating with the user + * The PrintWriter does nothing. + * @Deprecated */ private PrintWriter output; @@ -206,6 +208,7 @@ public CompilerConfiguration() { // IGNORE } + String target = safeGetSystemProperty("groovy.target.directory"); if (target != null) { setTargetDirectory(target); @@ -297,7 +300,6 @@ public CompilerConfiguration(CompilerConfiguration configuration) { setTargetBytecode(configuration.getTargetBytecode()); setDefaultScriptExtension(configuration.getDefaultScriptExtension()); setSourceEncoding(configuration.getSourceEncoding()); - setOutput(configuration.getOutput()); setTargetDirectory(configuration.getTargetDirectory()); Map jointCompilationOptions = configuration.getJointCompilationOptions(); if (jointCompilationOptions != null) { @@ -335,10 +337,6 @@ public CompilerConfiguration(CompilerConfiguration configuration) { * CompilerConfiguration myConfiguration = new CompilerConfiguration(CompilerConfiguration.DEFAULT); * myConfiguration.setDebug(true); * - * Another reason to use the copy constructor rather than this one is that you - * must call {@link #setOutput}. Calling setOutput(null) is valid and will - * set up a PrintWriter to a bit bucket. The copy constructor will of course set - * the same one as the original. *

* * @@ -555,6 +553,7 @@ public void setSourceEncoding(String encoding) { /** * Gets the currently configured output writer. + * @Deprecated */ public PrintWriter getOutput() { return this.output; @@ -562,6 +561,7 @@ public PrintWriter getOutput() { /** * Sets the output writer. + * @Deprecated */ public void setOutput(PrintWriter output) { if (output == null) { diff --git a/src/main/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java b/src/main/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java index 80dddc6df40..606dd67d84b 100644 --- a/src/main/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java +++ b/src/main/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java @@ -62,7 +62,6 @@ public void compile(List files, CompilationUnit cu) { Object ret = method.invoke(null, new Object[]{javacParameters}); javacReturnValue = (Integer) ret; } - cu.getConfiguration().getOutput(); } catch (InvocationTargetException ite) { cu.getErrorCollector().addFatalError(new ExceptionMessage((Exception) ite.getCause(), true, cu)); } catch (Exception e) { diff --git a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java index 7ec6742c70f..3be37cc643a 100644 --- a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java +++ b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java @@ -64,7 +64,6 @@ public void testDefaultConstructor() { assertNotNull(listCP); assertEquals(0, listCP.size()); } - assertNotNull(config.getOutput()); assertNull(config.getTargetDirectory()); assertEquals(".groovy", config.getDefaultScriptExtension()); assertNull(config.getJointCompilationOptions()); @@ -102,7 +101,6 @@ public void testSetViaSystemProperties() { assertNotNull(listCP); assertEquals(0, listCP.size()); } - assertNotNull(config.getOutput()); assertNull(config.getTargetDirectory()); assertEquals(".groovy", config.getDefaultScriptExtension()); assertNull(config.getJointCompilationOptions()); @@ -124,9 +122,6 @@ public void testCopyConstructor1() { init.setRecompileGroovySource(true); init.setClasspath("File1" + File.pathSeparator + "Somewhere"); - final PrintWriter initOut = new PrintWriter(System.out); - init.setOutput(initOut); - final File initTDFile = new File("A wandering path"); init.setTargetDirectory(initTDFile); init.setDefaultScriptExtension(".jpp"); @@ -153,7 +148,6 @@ public void testCopyConstructor1() { assertEquals("File1", listCP.get(0)); assertEquals("Somewhere", listCP.get(1)); } - assertEquals(initOut, init.getOutput()); assertEquals(initTDFile, init.getTargetDirectory()); assertEquals(".jpp", init.getDefaultScriptExtension()); assertEquals(initJoint, init.getJointCompilationOptions()); @@ -175,7 +169,6 @@ public void testCopyConstructor1() { assertEquals("File1", listCP.get(0)); assertEquals("Somewhere", listCP.get(1)); } - assertEquals(initOut, config.getOutput()); assertEquals(initTDFile, config.getTargetDirectory()); assertEquals(".jpp", config.getDefaultScriptExtension()); assertEquals(initJoint, config.getJointCompilationOptions()); @@ -198,9 +191,6 @@ public void testCopyConstructor2() { init.setRecompileGroovySource(false); init.setClasspath(""); - final PrintWriter initOut = new PrintWriter(System.out); - init.setOutput(initOut); - final File initTDFile = new File("A wandering path"); init.setTargetDirectory(initTDFile); @@ -219,7 +209,6 @@ public void testCopyConstructor2() { assertNotNull(listCP); assertEquals(0, listCP.size()); } - assertEquals(initOut, init.getOutput()); assertEquals(initTDFile, init.getTargetDirectory()); final CompilerConfiguration config = new CompilerConfiguration(init); @@ -237,7 +226,6 @@ public void testCopyConstructor2() { final List listCP = config.getClasspath(); assertEquals(0, listCP.size()); } - assertEquals(initOut, config.getOutput()); assertEquals(initTDFile, config.getTargetDirectory()); } }