From d70768277b53c21fae5b3a72687b051c674a8691 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Wed, 9 Dec 2015 11:00:21 +1300 Subject: [PATCH] #488 - BeanPropertyAssocManyJsonHelp error when Jackson not in classPath --- .../server/deploy/BeanDescriptor.java | 8 ++++ .../server/deploy/BeanDescriptorManager.java | 10 ++++- .../server/deploy/BeanDescriptorMap.java | 42 +++++++++++-------- .../deploy/BeanPropertyAssocManyJsonHelp.java | 6 ++- 4 files changed, 45 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java index bf5184a3c..944d6b388 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java @@ -12,6 +12,7 @@ import com.avaje.ebean.bean.EntityBean; import com.avaje.ebean.bean.EntityBeanIntercept; import com.avaje.ebean.bean.PersistenceContext; import com.avaje.ebean.config.EncryptKey; +import com.avaje.ebean.config.ServerConfig; import com.avaje.ebean.config.dbplatform.IdGenerator; import com.avaje.ebean.config.dbplatform.IdType; import com.avaje.ebean.event.BeanFindController; @@ -509,6 +510,13 @@ public class BeanDescriptor implements MetaBeanInfo, SpiBeanType { } } + /** + * Return the ServerConfig. + */ + public ServerConfig getServerConfig() { + return owner.getServerConfig(); + } + /** * Set the server. Primarily so that the Many's can lazy load. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java index 71a05588a..1ab76e75d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -125,6 +125,8 @@ public class BeanDescriptorManager implements BeanDescriptorMap { private final String serverName; + private final ServerConfig serverConfig; + private Map, DeployBeanInfo> deplyInfoMap = new HashMap, DeployBeanInfo>(); private final Map, BeanTable> beanTableMap = new HashMap, BeanTable>(); @@ -178,8 +180,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap { */ public BeanDescriptorManager(InternalConfiguration config) { - ServerConfig serverConfig = config.getServerConfig(); - + this.serverConfig = config.getServerConfig(); this.serverName = InternString.intern(serverConfig.getName()); this.cacheManager = config.getCacheManager(); this.xmlConfig = config.getXmlConfig(); @@ -240,6 +241,11 @@ public class BeanDescriptorManager implements BeanDescriptorMap { return (historySupport == null ) ? serverConfig.getAsOfViewSuffix() : historySupport.getVersionsBetweenSuffix(serverConfig.getAsOfViewSuffix()); } + @Override + public ServerConfig getServerConfig() { + return serverConfig; + } + @SuppressWarnings("unchecked") public BeanDescriptor getBeanDescriptor(Class entityType) { return (BeanDescriptor) descMap.get(entityType.getName()); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorMap.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorMap.java index 0f231d923..28284cdf3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorMap.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorMap.java @@ -2,6 +2,7 @@ package com.avaje.ebeaninternal.server.deploy; import com.avaje.ebean.cache.ServerCacheManager; import com.avaje.ebean.config.EncryptKey; +import com.avaje.ebean.config.ServerConfig; import com.avaje.ebeaninternal.server.deploy.id.IdBinder; /** @@ -12,26 +13,31 @@ import com.avaje.ebeaninternal.server.deploy.id.IdBinder; */ public interface BeanDescriptorMap { - /** - * Return the name of the server/database. - */ - String getServerName(); + /** + * Return the name of the server/database. + */ + String getServerName(); - /** - * Return the Cache Manager. - */ - ServerCacheManager getCacheManager(); + /** + * Return the ServerConfig. + */ + ServerConfig getServerConfig(); - /** - * Return the BeanDescriptor for a given class. - */ - BeanDescriptor getBeanDescriptor(Class entityType); + /** + * Return the Cache Manager. + */ + ServerCacheManager getCacheManager(); - /** - * Return the Encrypt key given the table and column name. - */ - EncryptKey getEncryptKey(String tableName, String columnName); - - IdBinder createIdBinder(BeanProperty id); + /** + * Return the BeanDescriptor for a given class. + */ + BeanDescriptor getBeanDescriptor(Class entityType); + + /** + * Return the Encrypt key given the table and column name. + */ + EncryptKey getEncryptKey(String tableName, String columnName); + + IdBinder createIdBinder(BeanProperty id); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java index 3ed83be20..0790b87c8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java @@ -31,7 +31,8 @@ public class BeanPropertyAssocManyJsonHelp { */ public BeanPropertyAssocManyJsonHelp(BeanPropertyAssocMany many) { this.many = many; - this.jsonTransient = new BeanPropertyAssocManyJsonTransient(); + boolean objectMapperPresent = many.getBeanDescriptor().getServerConfig().getClassLoadConfig().isJacksonObjectMapperPresent(); + this.jsonTransient = !objectMapperPresent ? null : new BeanPropertyAssocManyJsonTransient(); } /** @@ -81,6 +82,9 @@ public class BeanPropertyAssocManyJsonHelp { */ private void jsonReadTransientUsingObjectMapper(ReadJson readJson, EntityBean parentBean) throws IOException { + if (jsonTransient == null) { + throw new IllegalStateException("Jackson ObjectMapper is required to read this Transient property "+many.getFullBeanName()); + } jsonTransient.jsonReadUsingObjectMapper(many, readJson, parentBean); } }