Swap execution order of compile(String) and compile(Reader)

This allows us to compute a hash on the script as a String even if it was input via the gererating Reader. We need to compute the hash for future recompilation avoidance. Signed-off-by: Squareys <[email protected]>

Author: Squareys

src/main/java/org/scijava/plugins/scripting/java/JavaEngine.java

@@ -168,21 +168,14 @@ public Object eval(Reader reader) throws ScriptException{
  * @return the compiled Java class as{@link Class}.
  */
 publicClass<?> compile(Stringscript) throwsScriptException{
-returncompile(newStringReader(script));
- }
-
-/**
- * Compiles and runs the specified{@code .java} class.
- * 
- * @param reader the reader producing the source code for a Java class
- * @returns the compiled Java class as{@link Class}.
- */
-publicClass<?> compile(Readerreader) throwsScriptException{
 finalStringpath = (String)get(FILENAME);
 Filefile = path == null ? null : newFile(path);
 
 finalWriterwriter = getContext().getErrorWriter();
 try{
+// script may be null, but then we cannot create a StringReader for it,
+// therefore null is passed if script is null.
+finalReaderreader = (script == null) ? null : newStringReader(script);
 finalBuilderbuilder = newBuilder(file, reader, writer);
 finalMavenProjectproject = builder.project;
 StringmainClass = builder.mainClass;
@@ -229,6 +222,23 @@ public Class<?> compile(Reader reader) throws ScriptException{
 returnnull;
  }
 
+/**
+ * Compiles and runs the specified{@code .java} class.
+ *
+ * @param reader the reader producing the source code for a Java class
+ * @return the compiled Java class as{@link Class}.
+ */
+publicClass<?> compile(Readerreader) throwsScriptException{
+Stringscript;
+try{
+script = getReaderContentsAsString(reader);
+ }
+catch (IOExceptione){
+thrownewScriptException(e);
+ }
+returncompile(script);
+ }
+
 /**
  * Compiles the specified{@code .java} file.
  *