Bring up to date App Engine API 1.9.63

.gitignore

@@ -9,6 +9,7 @@ out
 .classpath
 .project
 .settings
+.DS_Store
 website/war/api
 website/war/WEB-INF/classes
 website/war/WEB-INF/lib

build.gradle

@@ -9,7 +9,7 @@ allprojects {
     }
 
 
-    version = '2.2.1-SNAPSHOT'
+    version = '2.3.0-SNAPSHOT'
     group = 'org.gaelyk'
 }
 

common.gradle

@@ -1,7 +1,7 @@
-project.ext.gaelykGroovyVersion = '2.4.7'
+project.ext.gaelykGroovyVersion = '2.4.15'
 project.ext.gaelykSpockVersion = '1.0-groovy-2.4'
-project.ext.gaelykAppEngineVersion = '1.9.40'
-project.ext.gaelykLatestVersion = '2.2.0'
+project.ext.gaelykAppEngineVersion = '1.9.63'
+project.ext.gaelykLatestVersion = '2.3.0-SNAPSHOT'
 project.ext.gaelykSpockLatestVersion = '0.4'
 project.ext.gaelykGradleVersion = '2.14.1'
 
@@ -17,8 +17,8 @@ apply plugin: 'groovy'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 task wrapper(type: Wrapper) {
     gradleVersion = gaelykGradleVersion

core/.gitignore

@@ -9,3 +9,4 @@ WEB-INF
 *.ipr
 *.iws
 target
+.DS_Store

core/src/main/groovyx/gaelyk/GaelykBindingEnhancer.groovy

@@ -26,10 +26,8 @@ import com.google.appengine.api.oauth.OAuthServiceFactory
 import com.google.appengine.api.urlfetch.URLFetchServiceFactory
 import com.google.appengine.api.users.UserServiceFactory
 import com.google.appengine.api.utils.SystemProperty
-import com.google.appengine.api.xmpp.XMPPServiceFactory
 
 import groovyx.gaelyk.logging.LoggerAccessor
-import com.google.appengine.api.channel.ChannelServiceFactory
 import com.google.appengine.api.LifecycleManager
 import com.google.appengine.api.users.User
 import com.google.appengine.api.prospectivesearch.ProspectiveSearchServiceFactory
@@ -69,9 +67,6 @@ class GaelykBindingEnhancer {
         binding.setVariable("defaultQueue", QueueFactory.defaultQueue)
         binding.setVariable("queues", getQueues())
 
-        // New in GAE SDK 1.2.5: XMPP support
-        binding.setVariable("xmpp", XMPPServiceFactory.XMPPService)
-
         // Tells whether the application is running in local development mode
         // or is deployed on Google's cloud
         binding.setVariable("localMode", getLocalMode())
@@ -93,8 +88,6 @@ class GaelykBindingEnhancer {
         // Capabilities service to know the status of the various GAE services
         binding.setVariable("capabilities", CapabilitiesServiceFactory.capabilitiesService)
 
-        // Channel service in SDK 1.4.0 for Comet-style applications
-        binding.setVariable("channel", ChannelServiceFactory.channelService)
 
         // Backend service and Lifecycle manager in SDK 1.5.0
         binding.setVariable("lifecycle", LifecycleManager.instance)

core/src/main/groovyx/gaelyk/GaelykBindingsTransformation.groovy

@@ -20,8 +20,6 @@ import com.google.appengine.api.blobstore.BlobstoreService
 import com.google.appengine.api.blobstore.BlobstoreServiceFactory
 import com.google.appengine.api.capabilities.CapabilitiesService
 import com.google.appengine.api.capabilities.CapabilitiesServiceFactory
-import com.google.appengine.api.channel.ChannelService
-import com.google.appengine.api.channel.ChannelServiceFactory
 import com.google.appengine.api.datastore.DatastoreService
 import com.google.appengine.api.datastore.DatastoreServiceFactory
 import com.google.appengine.api.mail.MailService
@@ -37,8 +35,6 @@ import com.google.appengine.api.urlfetch.URLFetchServiceFactory
 import com.google.appengine.api.users.User
 import com.google.appengine.api.users.UserService
 import com.google.appengine.api.users.UserServiceFactory
-import com.google.appengine.api.xmpp.XMPPService
-import com.google.appengine.api.xmpp.XMPPServiceFactory
 import groovy.transform.CompileStatic
 import groovyx.gaelyk.logging.LoggerAccessor
 import org.codehaus.groovy.ast.ASTNode
@@ -89,11 +85,8 @@ class GaelykBindingsTransformation implements ASTTransformation {
         addGetterIfNotExists(parent, ImagesServiceWrapper,     "getImages",            ImagesServiceWrapper,       "getInstance")
         addGetterIfNotExists(parent, UserService,              "getUsers",             UserServiceFactory,         "getUserService")
         addGetterIfNotExists(parent, Queue,                    "getDefaultQueue",      QueueFactory,               "getDefaultQueue")
-        addGetterIfNotExists(parent, XMPPService,              "getXmpp",              XMPPServiceFactory,         "getXMPPService")
         addGetterIfNotExists(parent, BlobstoreService,         "getBlobstore",         BlobstoreServiceFactory,    "getBlobstoreService")
         addGetterIfNotExists(parent, OAuthService,             "getOauth",             OAuthServiceFactory,        "getOAuthService")
-        addGetterIfNotExists(parent, CapabilitiesService,      "getCapabilities",      CapabilitiesServiceFactory, "getCapabilitiesService")
-        addGetterIfNotExists(parent, ChannelService,           "getChannel",           ChannelServiceFactory,      "getChannelService")
         addGetterIfNotExists(parent, LifecycleManager,         "getLifecycle",         LifecycleManager,           "getInstance")
         addGetterIfNotExists(parent, ProspectiveSearchService, "getProspectiveSearch", ProspectiveSearchService,   "getProspectiveSearchService")
         addGetterIfNotExists(parent, User,                     "getUser",              GaelykBindingEnhancer,      "getCurrentUser")

core/src/main/groovyx/gaelyk/datastore/DatastoreEntityCoercion.java

@@ -58,7 +58,7 @@ public static Entity convert(DatastoreEntity<?> dsEntity){
         for (String propertyName : dsEntity.getDatastoreIndexedProperties()) {
             Object value = dsEntity.getProperty(propertyName);
             try {
-                entity.setProperty(propertyName, transformValueForStorage(dsEntity.getProperty(propertyName)));
+                entity.setProperty(propertyName, transformValueForStorage(value));
             } catch (Exception e) {
                 throw new IllegalArgumentException("Problem setting value '" + value + "' to indexed property '" + propertyName + "' of entity "
                         + dsEntity.getClass().getSimpleName(), e);