Support new Java 8 GAE platform (close #51)

easymock · May 26, 2017 · b4273d9 · b4273d9
1 parent d3424ae
commit b4273d9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/gae/README.md b/gae/README.md
@@ -10,3 +10,5 @@ Deployment
 ----------
 
 `mvn appengine:update`
+
+Open [objenesis.appspot.com](https://objenesis.appspot.com).
diff --git a/gae/src/main/webapp/WEB-INF/appengine-web.xml b/gae/src/main/webapp/WEB-INF/appengine-web.xml
@@ -20,7 +20,8 @@
     <application>${app.id}</application>
     <version>${app.version}</version>
     <threadsafe>true</threadsafe>
-
+    <runtime>java8</runtime>
+
     <system-properties>
         <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
     </system-properties>

diff --git a/gae/src/main/webapp/index.jsp b/gae/src/main/webapp/index.jsp
@@ -16,8 +16,8 @@
 
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ page import="main.java.org.objenesis.gae.JspReporter" %>
-<%@ page import="main.java.org.objenesis.gae.JspWriterListener" %>
+<%@ page import="org.objenesis.gae.JspReporter" %>
+<%@ page import="org.objenesis.gae.JspWriterListener" %>
 <%@ page import="org.objenesis.strategy.PlatformDescription" %>
 <%@ page import="org.objenesis.tck.Main" %>
 <%@ page import="org.objenesis.tck.candidates.SerializableNoConstructor" %>

diff --git a/main/src/main/java/org/objenesis/strategy/SerializingInstantiatorStrategy.java b/main/src/main/java/org/objenesis/strategy/SerializingInstantiatorStrategy.java
@@ -58,7 +58,8 @@ public <T> ObjectInstantiator<T> newInstantiatorOf(Class<T> type) {
          throw new ObjenesisException(new NotSerializableException(type+" not serializable"));
       }
       if(JVM_NAME.startsWith(HOTSPOT) || PlatformDescription.isThisJVM(OPENJDK)) {
-         if(isGoogleAppEngine()) {
+         // Java 7 GAE was under a security manager so we use a degraded system
+         if(isGoogleAppEngine() && PlatformDescription.SPECIFICATION_VERSION.equals("1.7")) {
             return new ObjectInputStreamInstantiator<T>(type);
          }
          // ObjectStreamClassInstantiator uses setAccessible which isn't supported on JDK9

diff --git a/main/src/main/java/org/objenesis/strategy/StdInstantiatorStrategy.java b/main/src/main/java/org/objenesis/strategy/StdInstantiatorStrategy.java
@@ -56,7 +56,8 @@ public class StdInstantiatorStrategy extends BaseInstantiatorStrategy {
    public <T> ObjectInstantiator<T> newInstantiatorOf(Class<T> type) {
 
       if(PlatformDescription.isThisJVM(HOTSPOT) || PlatformDescription.isThisJVM(OPENJDK)) {
-         if(PlatformDescription.isGoogleAppEngine()) {
+         // Java 7 GAE was under a security manager so we use a degraded system
+         if(PlatformDescription.isGoogleAppEngine() && PlatformDescription.SPECIFICATION_VERSION.equals("1.7")) {
             if(Serializable.class.isAssignableFrom(type)) {
                return new ObjectInputStreamInstantiator<T>(type);
             }