First step in decoupling GT from framework

.run/hello world.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="hello world" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="HelloWorldApp" />
+    <option name="MAIN_CLASS_NAME" value="main.HelloWorldApp" />
     <module name="replay.replay-tests.helloworld.main" />
     <option name="VM_PARAMETERS" value="-ea" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/replay-tests/helloworld" />

excel/src/play/modules/excel/Plugin.java

@@ -140,7 +140,7 @@ public void compile() {
         }
 
         @Override
-        protected String internalRender(Map<String, Object> args) {
+        public String internalRender(Map<String, Object> args) {
             throw null == r_ ? new RenderExcel(file, args) : r_;
         }
     }

fastergt/build.gradle

@@ -3,6 +3,8 @@ dependencies {
   implementation('org.eclipse.jdt:ecj:3.37.0')
   implementation("org.apache.commons:commons-lang3:$commonsLangVersion")
   implementation "org.apache.commons:commons-text:$commonsTextVersion"
+  api("org.codehaus.groovy:groovy:$groovyVersion")
+  api("org.codehaus.groovy:groovy-xml:$groovyVersion")
   testImplementation project(':framework').sourceSets.test.compileClasspath
   testImplementation("org.assertj:assertj-core:$assertjVersion")
 }

fastergt/src/play/modules/gtengineplugin/GTEnginePlugin.java

@@ -1,7 +1,15 @@
 package play.modules.gtengineplugin;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.List;
+import javax.inject.Inject;
 import play.Play;
 import play.PlayPlugin;
+import play.jobs.Job;
+import play.mvc.PlayController;
+import play.templates.FastTags;
+import play.templates.JavaExtensions;
 import play.templates.Template;
 
 import java.io.File;
@@ -44,6 +52,42 @@ public void onLoad() {
     public void onApplicationStart() {
         // need to re-init when app restarts
         init();
+        injectStaticFields();
+    }
+
+    private void injectStaticFields() {
+        injectStaticFields(Play.classes.getAssignableClasses(PlayController.class));
+        injectStaticFields(Play.classes.getAssignableClasses(Job.class));
+        injectStaticFields(Play.classes.getAssignableClasses(FastTags.class));
+        injectStaticFields(Play.classes.getAssignableClasses(JavaExtensions.class));
+    }
+
+    private <T> void injectStaticFields(List<Class<? extends T>> classes) {
+        for (Class<?> clazz : classes) {
+            injectStaticFields(clazz);
+        }
+    }
+
+    private void injectStaticFields(Class<?> clazz) {
+        for (Field field : clazz.getDeclaredFields()) {
+            if (isStaticInjectable(field)) {
+                inject(field);
+            }
+        }
+    }
+
+    private boolean isStaticInjectable(Field field) {
+        return Modifier.isStatic(field.getModifiers()) && field.isAnnotationPresent(Inject.class);
+    }
+
+    private void inject(Field field) {
+        field.setAccessible(true);
+        try {
+            field.set(null, Play.beanSource.getBeanOfType(field.getType()));
+        }
+        catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     @Override

fastergt/src/play/modules/gtengineplugin/GTTemplate.java

@@ -35,7 +35,7 @@ public void compile() {
     }
 
     @Override
-    protected String internalRender(Map<String, Object> args) {
+    public String internalRender(Map<String, Object> args) {
         GTRenderingResult renderingResult = internalGTRender(args);
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         renderingResult.writeOutput(out, UTF_8);

fastergt/src/play/modules/gtengineplugin/PrecompileTemplates.java

@@ -71,7 +71,7 @@ private DummyTemplate() {
     @Override public void compile() {
     }
 
-    @Override protected String internalRender(Map<String, Object> args) {
+    @Override public String internalRender(Map<String, Object> args) {
       throw new UnsupportedOperationException();
     }
   }

framework/src/play/templates/JavaExtensions.java → fastergt/src/play/templates/JavaExtensions.java

@@ -33,6 +33,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
+import play.utils.Utils;
 
 import static org.apache.commons.text.StringEscapeUtils.escapeXml11;
 
@@ -256,16 +257,7 @@ public static String urlEncode(String entity) {
     }
 
     public static String formatSize(Long bytes) {
-        if (bytes < 1024L) {
-            return bytes + " B";
-        }
-        if (bytes < 1048576L) {
-            return bytes / 1024L + "KB";
-        }
-        if (bytes < 1073741824L) {
-            return bytes / 1048576L + "MB";
-        }
-        return bytes / 1073741824L + "GB";
+        return Utils.formatSize(bytes);
     }
 
     public static String formatCurrency(Number number, String currencyCode) {
@@ -396,7 +388,7 @@ public static String camelCase(String string) {
     }
 
     public static String yesno(Object o, String[] values) {
-        boolean value = play.templates.FastTags._evaluateCondition(o);
+        boolean value = FastTags._evaluateCondition(o);
         if (value) {
             return values[0];
         }

framework/test/play/templates/FastTagsTest.java → fastergt/test/play/templates/FastTagsTest.java

@@ -7,6 +7,8 @@
 import play.mvc.Http;
 import play.mvc.Router;
 import play.mvc.Scope.Session;
+import play.templates.ExecutableTemplate;
+import play.templates.FastTags;
 import play.utils.DummyUuidGenerator;
 
 import java.io.PrintWriter;

fastergt/test/play/template2/JavaExtensionTest.java → fastergt/test/play/templates/JavaExtensionTest.java

@@ -1,7 +1,10 @@
-package play.template2;
+package play.templates;
 
 import groovy.lang.GroovyObjectSupport;
 import org.junit.jupiter.api.Test;
+import play.template2.GTTemplateRepoBuilder;
+import play.template2.TemplateRootFolder;
+import play.template2.TemplateSourceRenderer;
 
 import java.lang.reflect.Method;
 import java.math.BigDecimal;

framework/test/play/templates/JavaExtensionsTest.java → fastergt/test/play/templates/JavaExtensionsTest.java

@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import play.templates.JavaExtensions;
 
 import java.util.ArrayList;
 import java.util.List;

framework/build.gradle

@@ -23,9 +23,6 @@ dependencies {
   implementation('ch.qos.reload4j:reload4j:1.2.25')
   implementation('org.ehcache:ehcache:3.10.8')
   api('net.sf.oval:oval:3.2.1')
-  // Groovy 4 can be found in org.apache.groovy
-  api("org.codehaus.groovy:groovy:$groovyVersion")
-  api("org.codehaus.groovy:groovy-xml:$groovyVersion")
   api('org.hibernate:hibernate-core-jakarta:5.6.15.Final')
   // Hibernate 5.6 series is only compatible with persistence-api:3.0.0
   api('jakarta.persistence:jakarta.persistence-api:3.1.0')

framework/src/errors/404.html

@@ -1,18 +1,11 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-    <head>
-        <title>Not found</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=${_response_encoding}"/>
-    </head>
-    <body>
-    	#{if play.mode.name() == 'DEV'}
-                #{404 result /}
-    	#{/if}
-        #{else}
-            <h1>Not found</h1>
-            <p>
-                ${result.message}
-            </p>
-        #{/else}
-    </body>
+<!doctype html>
+<html lang="en">
+  <head>
+    <title>Not found</title>
+    <meta charset="${_response_encoding}"/>
+  </head>
+  <body>
+    #{if play.Play.mode.isDev()} #{404 result /}#{/if}#{else}<h1>Not found</h1>
+    <p>${result.message}</p>#{/else}
+  </body>
 </html>

framework/src/errors/500.html

@@ -1,16 +1,10 @@
-<!DOCTYPE html>
-
-<html>
+<!doctype html>
+<html lang="en">
     <head>
         <title>Application error</title>
         <meta http-equiv="Content-Type" content="text/html; charset=${_response_encoding}"/>
     </head>
     <body>
-        #{if play.mode.name() == 'DEV'}
-            #{500 exception /}
-        #{/if}
-        #{else}
-            <h1>Oops, an error occurred</h1>
-        #{/else}
+        #{if play.Play.mode.isDev()}#{500 exception /}#{/if}#{else}<h1>Oops, an error occurred</h1>#{/else}
     </body>
 </html>

framework/src/play/ErrorHandler.java

@@ -0,0 +1,27 @@
+package play;
+
+import java.nio.charset.Charset;
+import javax.annotation.CheckReturnValue;
+import javax.annotation.Nonnull;
+import play.mvc.Http;
+import play.mvc.Http.Request;
+import play.mvc.Http.Response;
+import play.mvc.Scope.Flash;
+import play.mvc.Scope.RenderArgs;
+import play.mvc.Scope.Session;
+
+public interface ErrorHandler {
+
+  /** Called for errors thrown/returned by the application. */
+  void applicationErrorResponse(play.mvc.results.Error error, Request request, Response response,
+      Session session, RenderArgs renderArgs, Flash flash);
+
+  /**
+   * Called when errors originate in the framework (only 404 and 500).
+   *
+   * <p>When 'e' is of type NotFound we're dealing with a 404, otherwise it's a 500.
+   */
+  @Nonnull
+  @CheckReturnValue
+  String frameworkErrorResponse(Http.Request request, String format, Exception e, Charset encoding);
+}

framework/src/play/Play.java

@@ -1,37 +1,29 @@
 package play;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import java.io.File;
+import java.lang.management.ManagementFactory;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
+import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import play.cache.Cache;
 import play.classloading.ApplicationClasses;
 import play.inject.BeanSource;
 import play.inject.DefaultBeanSource;
 import play.inject.Injector;
-import play.jobs.Job;
 import play.mvc.ActionInvoker;
 import play.mvc.CookieSessionStore;
-import play.mvc.PlayController;
 import play.mvc.Router;
 import play.mvc.SessionStore;
 import play.plugins.PluginCollection;
-import play.templates.FastTags;
-import play.templates.JavaExtensions;
 import play.templates.TemplateLoader;
 
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import java.io.File;
-import java.lang.management.ManagementFactory;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Properties;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
 /**
  * Main framework class
  */
@@ -114,6 +106,8 @@ public boolean isProd() {
 
   private final ActionInvoker actionInvoker;
 
+  public static ErrorHandler errorHandler;
+
   public Play() {
     this(new DefaultBeanSource());
   }
@@ -128,6 +122,13 @@ public Play(ConfLoader confLoader, BeanSource beanSource, SessionStore sessionSt
     this.actionInvoker = new ActionInvoker(sessionStore);
   }
 
+  public Play(ConfLoader confLoader, BeanSource beanSource, SessionStore sessionStore, ErrorHandler errorHandler) {
+    Play.beanSource = beanSource;
+    Play.errorHandler = errorHandler;
+    this.confLoader = confLoader;
+    this.actionInvoker = new ActionInvoker(sessionStore);
+  }
+
   /**
    * Init the framework
    *
@@ -250,7 +251,6 @@ public synchronized void start() {
       Router.detectChanges();
       Cache.init();
       pluginCollection.onApplicationStart();
-      injectStaticFields();
 
       started = true;
       startedAt = System.currentTimeMillis();
@@ -265,41 +265,6 @@ public synchronized void start() {
     }
   }
 
-  private void injectStaticFields() {
-    injectStaticFields(Play.classes.getAssignableClasses(PlayController.class));
-    injectStaticFields(Play.classes.getAssignableClasses(Job.class));
-    injectStaticFields(Play.classes.getAssignableClasses(FastTags.class));
-    injectStaticFields(Play.classes.getAssignableClasses(JavaExtensions.class));
-  }
-
-  private <T> void injectStaticFields(List<Class<? extends T>> classes) {
-    for (Class<?> clazz : classes) {
-      injectStaticFields(clazz);
-    }
-  }
-
-  private void injectStaticFields(Class<?> clazz) {
-    for (Field field : clazz.getDeclaredFields()) {
-      if (isStaticInjectable(field)) {
-        inject(field);
-      }
-    }
-  }
-
-  private boolean isStaticInjectable(Field field) {
-    return Modifier.isStatic(field.getModifiers()) && field.isAnnotationPresent(Inject.class);
-  }
-
-  private void inject(Field field) {
-    field.setAccessible(true);
-    try {
-      field.set(null, beanSource.getBeanOfType(field.getType()));
-    }
-    catch (IllegalAccessException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
   /**
    * Can only register shutdown-hook if running as standalone server
    * registers shutdown hook - Now there's a good chance that we can notify