From 7f68b9d846d8b3c35234e294de54b0213b7b8282 Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Tue, 19 Jan 2021 22:48:29 +1300 Subject: [PATCH] No effective change - tidy whitespace in BeanDescriptorCacheHelp --- .../deploy/BeanDescriptorCacheHelp.java | 40 ------------------- 1 file changed, 40 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java index 70377a540..0b547b9a9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java @@ -89,7 +89,6 @@ final class BeanDescriptorCacheHelp { BeanDescriptorCacheHelp(BeanDescriptor desc, SpiCacheManager cacheManager, CacheOptions cacheOptions, boolean cacheSharableBeans, BeanPropertyAssocOne[] propertiesOneImported) { - this.desc = desc; this.beanType = desc.rootBeanType; this.cacheName = beanType.getSimpleName(); @@ -99,7 +98,6 @@ final class BeanDescriptorCacheHelp { this.cacheSharableBeans = cacheSharableBeans; this.propertiesOneImported = propertiesOneImported; this.naturalKey = cacheOptions.getNaturalKey(); - if (!cacheOptions.isEnableQueryCache()) { this.queryCache = null; } else { @@ -133,7 +131,6 @@ final class BeanDescriptorCacheHelp { void deriveNotifyFlags() { cacheNotifyOnAll = (invalidateQueryCache || beanCache != null || queryCache != null); cacheNotifyOnDelete = !cacheNotifyOnAll && isNotifyOnDeletes(); - if (logger.isDebugEnabled()) { if (cacheNotifyOnAll || cacheNotifyOnDelete) { String notifyMode = cacheNotifyOnAll ? "All" : "Delete"; @@ -292,7 +289,6 @@ final class BeanDescriptorCacheHelp { * Try to load the bean collection from cache return true if successful. */ boolean manyPropLoad(BeanPropertyAssocMany many, BeanCollection bc, Object parentId, Boolean readOnly) { - if (many.isElementCollection()) { // held as part of the bean cache so skip return false; @@ -307,7 +303,6 @@ final class BeanDescriptorCacheHelp { EntityBean ownerBean = bc.getOwnerBean(); EntityBeanIntercept ebi = ownerBean._ebean_getIntercept(); PersistenceContext persistenceContext = ebi.getPersistenceContext(); - BeanDescriptor targetDescriptor = many.getTargetDescriptor(); List idList = entry.getIdList(); @@ -322,7 +317,6 @@ final class BeanDescriptorCacheHelp { * Put the beanCollection into the cache. */ void manyPropPut(BeanPropertyAssocMany many, Object details, Object parentId) { - if (many.isElementCollection()) { CachedBeanData data = (CachedBeanData) beanCache.get(parentId); if (data != null) { @@ -350,7 +344,6 @@ final class BeanDescriptorCacheHelp { } void cachePutManyIds(Object parentId, String manyName, CachedManyIds entry) { - ServerCache collectionIdsCache = cacheManager.getCollectionIdsCache(beanType, manyName); if (manyLog.isDebugEnabled()) { manyLog.debug(" PUT {}({}).{} - ids:{}", cacheName, parentId, manyName, entry); @@ -359,7 +352,6 @@ final class BeanDescriptorCacheHelp { } private CachedManyIds createManyIds(BeanPropertyAssocMany many, Object details) { - Collection actualDetails = BeanCollectionUtil.getActualDetails(details); if (actualDetails == null) { return null; @@ -377,7 +369,6 @@ final class BeanDescriptorCacheHelp { * Hit the bean cache with the given ids returning the hits. */ BeanCacheResult cacheIdLookup(PersistenceContext context, Collection ids) { - Set keys = new HashSet<>(ids.size()); for (Object id : ids) { keys.add(desc.cacheKey(id)); @@ -394,7 +385,6 @@ final class BeanDescriptorCacheHelp { T bean = convertToBean(entry.getKey(), false, context, cachedBeanData); result.add(bean, desc.getBeanId(bean)); } - return result; } @@ -402,14 +392,12 @@ final class BeanDescriptorCacheHelp { * Use natural keys to hit the bean cache and return resulting hits. */ BeanCacheResult naturalKeyLookup(PersistenceContext context, Set keys) { - if (context == null) { context = new DefaultPersistenceContext(); } // naturalKey -> Id map Map naturalKeyMap = naturalKeyCache.getAll(keys); - if (natLog.isTraceEnabled()) { natLog.trace(" MLOOKUP {}({}) - hits:{}", cacheName, keys, naturalKeyMap); } @@ -432,15 +420,12 @@ final class BeanDescriptorCacheHelp { } // process the hits into beans etc for (Map.Entry entry : beanDataMap.entrySet()) { - Object id = entry.getKey(); CachedBeanData cachedBeanData = (CachedBeanData) entry.getValue(); - T bean = convertToBean(id, false, context, cachedBeanData); Object naturalKey = reverseMap.get(id); result.add(bean, naturalKey); } - return result; } @@ -451,7 +436,6 @@ final class BeanDescriptorCacheHelp { if (context == null) { context = new DefaultPersistenceContext(); } - // Not using a loadContext for beans coming out of L2 cache // so that means no batch lazy loading for these beans EntityBean entityBean = (EntityBean) bean; @@ -521,7 +505,6 @@ final class BeanDescriptorCacheHelp { * Put a bean into the bean cache. */ void beanCachePut(EntityBean bean) { - if (desc.inheritInfo != null) { desc.descOf(bean.getClass()).cacheBeanPutDirect(bean); } else { @@ -530,7 +513,6 @@ final class BeanDescriptorCacheHelp { } void beanCachePutAllDirect(Collection beans) { - Map natKeys = null; if (naturalKey != null) { natKeys = new LinkedHashMap<>(); @@ -565,15 +547,12 @@ final class BeanDescriptorCacheHelp { * Put the bean into the bean cache. */ void beanCachePutDirect(EntityBean bean) { - CachedBeanData beanData = beanExtractData(desc, bean); - String key = desc.cacheKeyForBean(bean); if (beanLog.isDebugEnabled()) { beanLog.debug(" PUT {}({}) data:{}", cacheName, key, beanData); } getBeanCache().put(key, beanData); - if (naturalKey != null) { String naturalKey = calculateNaturalKey(beanData); if (naturalKey != null) { @@ -617,7 +596,6 @@ final class BeanDescriptorCacheHelp { * Return a bean from the bean cache. */ private T beanCacheGetInternal(String key, Boolean readOnly, PersistenceContext context) { - CachedBeanData data = (CachedBeanData) getBeanCache().get(key); if (data == null) { if (beanLog.isTraceEnabled()) { @@ -645,7 +623,6 @@ final class BeanDescriptorCacheHelp { return (T) bean; } } - return (T) loadBean(id, readOnly, data, context); } @@ -653,7 +630,6 @@ final class BeanDescriptorCacheHelp { * Load the entity bean taking into account inheritance. */ private EntityBean loadBean(Object id, Boolean readOnly, CachedBeanData data, PersistenceContext context) { - String discValue = data.getDiscValue(); if (discValue == null) { return loadBeanDirect(id, readOnly, data, context); @@ -673,7 +649,6 @@ final class BeanDescriptorCacheHelp { * Load the entity bean from cache data given this is the root bean type. */ EntityBean loadBeanDirect(Object id, Boolean readOnly, CachedBeanData data, PersistenceContext context) { - id = desc.convertId(id); EntityBean bean = null; if (context == null) { @@ -681,7 +656,6 @@ final class BeanDescriptorCacheHelp { } else { bean = (EntityBean) desc.contextGet(context, id); } - if (bean == null) { bean = desc.createEntityBean(); desc.setId(id, bean); @@ -697,7 +671,6 @@ final class BeanDescriptorCacheHelp { } CachedBeanDataToBean.load(desc, bean, data, context); - if (desc.isReadAuditing()) { desc.readAuditBean("l2", "", bean); } @@ -708,7 +681,6 @@ final class BeanDescriptorCacheHelp { * Load the embedded bean checking for inheritance. */ EntityBean embeddedBeanLoad(CachedBeanData data, PersistenceContext context) { - String discValue = data.getDiscValue(); if (discValue == null) { return embeddedBeanLoadDirect(data, context); @@ -745,25 +717,20 @@ final class BeanDescriptorCacheHelp { * Load a batch of entities from L2 bean cache checking the lazy loaded property is loaded. */ Set beanCacheLoadAll(List list, PersistenceContext context, int lazyLoadProperty, String propertyName) { - Map ebis = new HashMap<>(); for (EntityBeanIntercept ebi : list) { ebis.put(desc.cacheKeyForBean(ebi.getOwner()), ebi); } - Map hits = getBeanCache().getAll(ebis.keySet()); - if (beanLog.isTraceEnabled()) { beanLog.trace(" MLOAD {}({}) - got hits ({})", cacheName, ebis.keySet(), hits.size()); } Set loaded = new HashSet<>(); - Iterator> iterator = hits.entrySet().iterator(); while (iterator.hasNext()) { Map.Entry hit = iterator.next(); - Object key = hit.getKey(); EntityBeanIntercept ebi = ebis.remove(key); CachedBeanData cacheData = (CachedBeanData) hit.getValue(); @@ -773,7 +740,6 @@ final class BeanDescriptorCacheHelp { beanLog.trace(" load {}({}) - cache miss on property({})", cacheName, key, propertyName); } iterator.remove(); - } else { CachedBeanDataToBean.load(desc, ebi.getOwner(), cacheData, context); loaded.add(ebi); @@ -782,11 +748,9 @@ final class BeanDescriptorCacheHelp { } } } - if (!ebis.isEmpty() && beanLog.isTraceEnabled()) { beanLog.trace(" load {}({}) - cache miss", cacheName, ebis.keySet()); } - return loaded; } @@ -794,7 +758,6 @@ final class BeanDescriptorCacheHelp { * Returns true if it managed to populate/load the single bean from the cache. */ boolean beanCacheLoad(EntityBean bean, EntityBeanIntercept ebi, String key, PersistenceContext context) { - CachedBeanData cacheData = (CachedBeanData) getBeanCache().get(key); if (cacheData == null) { if (beanLog.isTraceEnabled()) { @@ -809,7 +772,6 @@ final class BeanDescriptorCacheHelp { } return false; } - CachedBeanDataToBean.load(desc, bean, cacheData, context); if (beanLog.isDebugEnabled()) { beanLog.debug(" LOAD {}({}) - hit", cacheName, key); @@ -931,7 +893,6 @@ final class BeanDescriptorCacheHelp { * Apply changes to the bean cache entry. */ void cacheBeanUpdate(String key, Map changes, boolean updateNaturalKey, long version) { - ServerCache cache = getBeanCache(); CachedBeanData existingData = (CachedBeanData) cache.get(key); if (existingData != null) { @@ -951,7 +912,6 @@ final class BeanDescriptorCacheHelp { } cache.put(key, newData); } - if (updateNaturalKey) { Object oldKey = calculateNaturalKey(existingData); if (oldKey != null) {