Merge remote-tracking branch 'upstream/BroadleafCommerce-4.0.x' into BroadleafCommerce-4.0.x

Author: jefffischer

README.md

@@ -149,3 +149,9 @@ See [CONTRIBUTING.md](CONTRIBUTING.md)
 Broadleaf Commerce core is released under the terms of the Apache Software License 2 (see license.txt). However, various commercial modules that are also available (for instance, price list management) are released under a different commercial license. These are not included with the core Broadleaf framework.
 
 We also offer various levels of [enterprise support licenses](http://broadleafcommerce.com/support). Please [contact us](http://broadleafcommerce.com/contact) for information.
+
+## New Version
+
+Our latest version is 5.0 and is licensed under a new dual license format. It may be used under the terms of the Fair Use License 1.0 (http://license.broadleafcommerce.org/fair_use_license-1.0.txt) unless the restrictions on use therein are violated and require payment to Broadleaf, in which case the Broadleaf End User License Agreement (EULA), Version 1.1 (http://license.broadleafcommerce.org/commercial_license-1.1.txt) shall apply. Alternatively, the Commercial License may be replaced with a mutually agreed upon license between you and Broadleaf Commerce.
+
+To get started with the latest version of Broadleaf Commerce, please visit our getting started page on the web: http://www.broadleafcommerce.com/docs/core/current/getting-started

common/src/main/java/org/broadleafcommerce/common/i18n/service/TranslationServiceImpl.java

@@ -175,10 +175,13 @@ public String getTranslatedValue(Object entity, String property, Locale locale)
             localeCountryCode += "_" + locale.getCountry();
         }
 
-        if (TranslationBatchReadCache.getCache() != null) {
+        if (TranslationBatchReadCache.getCache() != null && TranslationBatchReadCache.getCache().getSize() != 0) {
             Translation translation = TranslationBatchReadCache.getFromCache(entityType, entityId, property, localeCountryCode);
             if (translation != null) {
                 return translation.getTranslatedValue();
+            } else {
+                // There is no translation for this entity if it is not in the cache
+                return null;
             }
         }
 

core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/search/service/solr/I18nSolrSearchServiceExtensionHandler.java

@@ -32,7 +32,9 @@
 import org.broadleafcommerce.common.util.BLCSystemProperty;
 import org.broadleafcommerce.common.web.BroadleafRequestContext;
 import org.broadleafcommerce.core.catalog.domain.Product;
+import org.broadleafcommerce.core.catalog.domain.ProductAttribute;
 import org.broadleafcommerce.core.catalog.domain.Sku;
+import org.broadleafcommerce.core.catalog.domain.SkuAttribute;
 import org.broadleafcommerce.core.search.domain.Field;
 import org.broadleafcommerce.core.search.domain.solr.FieldType;
 import org.springframework.stereotype.Service;
@@ -204,28 +206,50 @@ protected ExtensionResultStatusType getLocalePrefix(Field field, List<String> pr
      */
     @Override
     public ExtensionResultStatusType startBatchEvent(List<Product> products) {
-        List<String> defaultSkuIds = new ArrayList<String>(products.size());
-        List<String> productIds = new ArrayList<String>(products.size());
-        for (Product product : products) {
-            productIds.add(product.getId().toString());
-            defaultSkuIds.add(product.getDefaultSku().getId().toString());
+        List<String> skuIds = new ArrayList<String>(products.size());
+        List<String> productIds = new ArrayList<String>();
+        List<String> skuAttributeIds = new ArrayList<String>();
+        List<String> productAttributeIds = new ArrayList<String>();
+        for (Product indexable : products) {
+            Sku sku = null;
+            if (Product.class.isAssignableFrom(indexable.getClass())) {
+                Product product = indexable;
+                productIds.add(product.getId().toString());
+                for (Map.Entry<String, ProductAttribute> attributeEntry :  product.getProductAttributes().entrySet()) {
+                    ProductAttribute attribute = attributeEntry.getValue();
+                    productAttributeIds.add(attribute.getId().toString());
+                }
+                sku = product.getDefaultSku();
+            }
+            
+            if (sku != null) {
+                skuIds.add(sku.getId().toString());
+                for (Map.Entry<String, SkuAttribute> attributeEntry :  sku.getSkuAttributes().entrySet()) {
+                    SkuAttribute attribute = attributeEntry.getValue();
+                    skuAttributeIds.add(attribute.getId().toString());
+                }
+            }
         }
-        
-        List<Translation> defaultSkuTranslations = translationDao.readAllTranslationEntries(TranslatedEntity.SKU, ResultType.STANDARD, defaultSkuIds);
-        TranslationBatchReadCache.addToCache(defaultSkuTranslations);
-        
-        List<Translation> productTranslations = translationDao.readAllTranslationEntries(TranslatedEntity.PRODUCT, ResultType.STANDARD, productIds);
-        TranslationBatchReadCache.addToCache(productTranslations);
-        
+
+        addEntitiesToTranslationCache(skuIds, TranslatedEntity.SKU);
+        addEntitiesToTranslationCache(productIds, TranslatedEntity.PRODUCT);
+        addEntitiesToTranslationCache(skuAttributeIds, TranslatedEntity.SKU_ATTRIBUTE);
+        addEntitiesToTranslationCache(productAttributeIds, TranslatedEntity.PRODUCT_ATTRIBUTE);
+
         return ExtensionResultStatusType.HANDLED_CONTINUE;
     }
-    
+
+    private void addEntitiesToTranslationCache(List<String> entityIds, TranslatedEntity translatedEntity) {
+        List<Translation> translations = translationDao.readAllTranslationEntries(translatedEntity, ResultType.STANDARD, entityIds);
+        TranslationBatchReadCache.addToCache(translations);
+    }
+
     @Override
     public ExtensionResultStatusType endBatchEvent() {
         TranslationBatchReadCache.clearCache();
         return ExtensionResultStatusType.HANDLED_CONTINUE;
     }
-
+    
     @Override
     public int getPriority() {
         return 1000;