shopizer-developers

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/service/OrderServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/order/service/OrderServiceImpl.java
index 146f3d6..448636a 100755
--- a/sm-core/src/main/java/com/salesmanager/core/business/order/service/OrderServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/service/OrderServiceImpl.java
@@ -169,7 +169,7 @@ public class OrderServiceImpl  extends SalesManagerEntityServiceImpl<Long, Order
         List<OrderTotal> orderTotals = new ArrayList<OrderTotal>();
         Map<String,OrderTotal> otherPricesTotals = new HashMap<String,OrderTotal>();
 
-        ShippingConfiguration shippingConfiguration = null;
+        ShippingConfiguration shippingConfiguration;
 
         BigDecimal grandTotal = new BigDecimal(0);
         grandTotal.setScale(2, RoundingMode.HALF_UP);

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/init/service/InitializationDatabaseImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/init/service/InitializationDatabaseImpl.java
index 1f7c3f0..d46c625 100755
--- a/sm-core/src/main/java/com/salesmanager/core/business/reference/init/service/InitializationDatabaseImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/init/service/InitializationDatabaseImpl.java
@@ -150,7 +150,7 @@ public class InitializationDatabaseImpl implements InitializationDatabase {
 		LOGGER.info(String.format("%s : Populating Zones ", name));
         try {
 
-    		  Map<String,Zone> zonesMap = new HashMap<String,Zone>();
+    		  Map<String,Zone> zonesMap;
     		  zonesMap = zonesLoader.loadZones("reference/zoneconfig.json");
               
               for (Map.Entry<String, Zone> entry : zonesMap.entrySet()) {

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shipping/service/ShippingServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/shipping/service/ShippingServiceImpl.java
index 062d3de..763c9a3 100755
--- a/sm-core/src/main/java/com/salesmanager/core/business/shipping/service/ShippingServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shipping/service/ShippingServiceImpl.java
@@ -519,7 +519,7 @@ public class ShippingServiceImpl implements ShippingService {
 			}
 
 			//invoke module
-			List<ShippingOption> shippingOptions = null;
+			List<ShippingOption> shippingOptions;
 					
 			try {
 				shippingOptions = shippingQuoteModule.getShippingQuotes(shippingQuote, packages, orderTotal, delivery, shippingOrigin, store, configuration, shippingModule, shippingConfiguration, locale);
@@ -746,7 +746,7 @@ public class ShippingServiceImpl implements ShippingService {
 			List<ShippingProduct> products, MerchantStore store)
 			throws ServiceException {
 		
-		List<PackageDetails> packages = null;
+		List<PackageDetails> packages;
 		
 		ShippingConfiguration shippingConfiguration = this.getShippingConfiguration(store);
 		//determine if the system has to use BOX or ITEM

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/service/ShoppingCartServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/service/ShoppingCartServiceImpl.java
index 8f4e078..ddea670 100755
--- a/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/service/ShoppingCartServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/service/ShoppingCartServiceImpl.java
@@ -314,7 +314,7 @@ public class ShoppingCartServiceImpl extends SalesManagerEntityServiceImpl<Long,
 
 	private void populateItem(final ShoppingCartItem item) throws Exception {
 
-		Product product = null;
+		Product product;
 
 		Long productId = item.getProductId();
 		product = productService.getById(productId);

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxServiceImpl.java
index 1671534..b83b68e 100755
--- a/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxServiceImpl.java
@@ -229,7 +229,7 @@ public class TaxServiceImpl
 		for(Long taxClassId : taxClassAmountMap.keySet()) {
 			
 			//get taxRate by tax class
-			List<TaxRate> taxRates = null; 
+			List<TaxRate> taxRates; 
 			if(!StringUtils.isBlank(stateProvince)&& zone==null) {
 				taxRates = taxRateService.listByCountryStateProvinceAndTaxClass(country, stateProvince, taxClasses.get(taxClassId), store, language);
 			} else {
@@ -239,7 +239,7 @@ public class TaxServiceImpl
 			if(taxRates==null || taxRates.size()==0){
 				continue;
 			}
-			BigDecimal taxedItemValue = null;
+			BigDecimal taxedItemValue;
 			BigDecimal totalTaxedItemValue = new BigDecimal(0);
 			totalTaxedItemValue.setScale(2, RoundingMode.HALF_UP);
 			BigDecimal beforeTaxeAmount = taxClassAmountMap.get(taxClassId);

diff --git a/sm-core/src/main/java/com/salesmanager/core/modules/cms/content/CmsStaticContentFileManagerInfinispanImpl.java b/sm-core/src/main/java/com/salesmanager/core/modules/cms/content/CmsStaticContentFileManagerInfinispanImpl.java
index df01248..71e2567 100755
--- a/sm-core/src/main/java/com/salesmanager/core/modules/cms/content/CmsStaticContentFileManagerInfinispanImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/modules/cms/content/CmsStaticContentFileManagerInfinispanImpl.java
@@ -188,8 +188,8 @@ public class CmsStaticContentFileManagerInfinispanImpl implements FilePut,FileGe
         {
             throw new ServiceException( "CmsStaticContentFileManagerInfinispan has a null cacheManager.getTreeCache()" );
         }
-        OutputContentFile outputStaticContentData=null;
-        InputStream input = null;
+        OutputContentFile outputStaticContentData;
+        InputStream input;
         try
         {
             

diff --git a/sm-core/src/main/java/com/salesmanager/core/modules/integration/payment/impl/BeanStreamPayment.java b/sm-core/src/main/java/com/salesmanager/core/modules/integration/payment/impl/BeanStreamPayment.java
index 71bacf4..9982862 100755
--- a/sm-core/src/main/java/com/salesmanager/core/modules/integration/payment/impl/BeanStreamPayment.java
+++ b/sm-core/src/main/java/com/salesmanager/core/modules/integration/payment/impl/BeanStreamPayment.java
@@ -165,7 +165,7 @@ public class BeanStreamPayment implements PaymentModule {
 				bSandbox = true;
 			}
 
-			String server = "";
+			String server;
 
 
 			ModuleConfig configs = module.getModuleConfigs().get("PROD");
@@ -262,7 +262,7 @@ public class BeanStreamPayment implements PaymentModule {
 		
 		String agent = "Mozilla/4.0";
 		String respText = "";
-		Map<String,String> nvp = null;
+		Map<String,String> nvp;
 		DataOutputStream output = null;
 		DataInputStream in = null;
 		BufferedReader is = null;
@@ -314,7 +314,7 @@ public class BeanStreamPayment implements PaymentModule {
 				bSandbox = true;
 			}
 
-			String server = "";
+			String server;
 			
 			ModuleConfig configs = module.getModuleConfigs().get("PROD");
 
@@ -368,7 +368,7 @@ public class BeanStreamPayment implements PaymentModule {
 			if (rc != -1) {
 				is = new BufferedReader(new InputStreamReader(conn
 						.getInputStream()));
-				String _line = null;
+				String _line;
 				while (((_line = is.readLine()) != null)) {
 					respText = respText + _line;
 				}
@@ -481,7 +481,7 @@ public class BeanStreamPayment implements PaymentModule {
 			bSandbox = true;
 		}
 
-		String server = "";
+		String server;
 
 		ModuleConfig configs = module.getModuleConfigs().get("PROD");
 

diff --git a/sm-core/src/main/java/com/salesmanager/core/modules/integration/payment/impl/PayPalExpressCheckoutPayment.java b/sm-core/src/main/java/com/salesmanager/core/modules/integration/payment/impl/PayPalExpressCheckoutPayment.java
index 58b6132..823bc23 100755
--- a/sm-core/src/main/java/com/salesmanager/core/modules/integration/payment/impl/PayPalExpressCheckoutPayment.java
+++ b/sm-core/src/main/java/com/salesmanager/core/modules/integration/payment/impl/PayPalExpressCheckoutPayment.java
@@ -593,7 +593,7 @@ public class PayPalExpressCheckoutPayment implements PaymentModule {
 				// configuration file for your credentials and endpoint
 				PayPalAPIInterfaceServiceService service = new PayPalAPIInterfaceServiceService(configurationMap);
 				
-				DoCaptureResponseType doCaptureResponse = null;
+				DoCaptureResponseType doCaptureResponse;
 
 					// ## Making API call
 					// Invoke the appropriate method corresponding to API in service

diff --git a/sm-core/src/main/java/com/salesmanager/core/modules/integration/payment/impl/StripePayment.java b/sm-core/src/main/java/com/salesmanager/core/modules/integration/payment/impl/StripePayment.java
index 2d71efc..1eef4d9 100644
--- a/sm-core/src/main/java/com/salesmanager/core/modules/integration/payment/impl/StripePayment.java
+++ b/sm-core/src/main/java/com/salesmanager/core/modules/integration/payment/impl/StripePayment.java
@@ -165,7 +165,7 @@ public class StripePayment implements PaymentModule {
 				bSandbox = true;
 			}
 
-			String server = "";
+			String server;
 
 
 			ModuleConfig configs = module.getModuleConfigs().get("PROD");
@@ -262,7 +262,7 @@ public class StripePayment implements PaymentModule {
 		
 		String agent = "Mozilla/4.0";
 		String respText = "";
-		Map<String,String> nvp = null;
+		Map<String,String> nvp;
 		DataOutputStream output = null;
 		DataInputStream in = null;
 		BufferedReader is = null;
@@ -314,7 +314,7 @@ public class StripePayment implements PaymentModule {
 				bSandbox = true;
 			}
 
-			String server = "";
+			String server;
 			
 			ModuleConfig configs = module.getModuleConfigs().get("PROD");
 
@@ -368,7 +368,7 @@ public class StripePayment implements PaymentModule {
 			if (rc != -1) {
 				is = new BufferedReader(new InputStreamReader(conn
 						.getInputStream()));
-				String _line = null;
+				String _line;
 				while (((_line = is.readLine()) != null)) {
 					respText = respText + _line;
 				}
@@ -481,7 +481,7 @@ public class StripePayment implements PaymentModule {
 			bSandbox = true;
 		}
 
-		String server = "";
+		String server;
 
 		ModuleConfig configs = module.getModuleConfigs().get("PROD");
 

diff --git a/sm-core/src/main/java/com/salesmanager/core/modules/integration/shipping/impl/CanadaPostShippingQuote.java b/sm-core/src/main/java/com/salesmanager/core/modules/integration/shipping/impl/CanadaPostShippingQuote.java
index 50ae130..0c76cfb 100755
--- a/sm-core/src/main/java/com/salesmanager/core/modules/integration/shipping/impl/CanadaPostShippingQuote.java
+++ b/sm-core/src/main/java/com/salesmanager/core/modules/integration/shipping/impl/CanadaPostShippingQuote.java
@@ -135,7 +135,7 @@ public class CanadaPostShippingQuote implements ShippingQuoteModule {
 
 		
 		PostMethod httppost = null;
-		CanadaPostParsedElements canadaPost = null;
+		CanadaPostParsedElements canadaPost;
 
 		try {
 			

diff --git a/sm-core/src/main/java/com/salesmanager/core/modules/integration/shipping/impl/DefaultPackagingImpl.java b/sm-core/src/main/java/com/salesmanager/core/modules/integration/shipping/impl/DefaultPackagingImpl.java
index 1a95a72..558b554 100755
--- a/sm-core/src/main/java/com/salesmanager/core/modules/integration/shipping/impl/DefaultPackagingImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/modules/integration/shipping/impl/DefaultPackagingImpl.java
@@ -44,11 +44,11 @@ public class DefaultPackagingImpl implements Packaging {
 			throw new ServiceException("Product list cannot be null !!");
 		}
 
-		double width = 0;
-		double length = 0;
-		double height = 0;
-		double weight = 0;
-		double maxweight = 0;
+		double width;
+		double length;
+		double height;
+		double weight;
+		double maxweight;
 
 		//int treshold = 0;
 		
@@ -178,7 +178,7 @@ public class DefaultPackagingImpl implements Packaging {
 			assignedProducts = new ArrayList<Product>();
 		}
 
-		boolean productAssigned = false;
+		boolean productAssigned;
 
 		for(Product p : individualProducts) {
 

diff --git a/sm-core/src/main/java/com/salesmanager/core/modules/integration/shipping/impl/UPSShippingQuote.java b/sm-core/src/main/java/com/salesmanager/core/modules/integration/shipping/impl/UPSShippingQuote.java
index 765acd6..10ffea1 100755
--- a/sm-core/src/main/java/com/salesmanager/core/modules/integration/shipping/impl/UPSShippingQuote.java
+++ b/sm-core/src/main/java/com/salesmanager/core/modules/integration/shipping/impl/UPSShippingQuote.java
@@ -365,7 +365,7 @@ public class UPSShippingQuote implements ShippingQuoteModule {
 
 			LOGGER.debug("UPS QUOTE REQUEST " + xmlbuffer.toString());
 
-			String data = "";
+			String data;
 
 
 			HttpClient client = new HttpClient();

diff --git a/sm-core/src/main/java/com/salesmanager/core/modules/integration/shipping/impl/USPSShippingQuote.java b/sm-core/src/main/java/com/salesmanager/core/modules/integration/shipping/impl/USPSShippingQuote.java
index b87ea35..f4c4c27 100755
--- a/sm-core/src/main/java/com/salesmanager/core/modules/integration/shipping/impl/USPSShippingQuote.java
+++ b/sm-core/src/main/java/com/salesmanager/core/modules/integration/shipping/impl/USPSShippingQuote.java
@@ -278,7 +278,7 @@ public class USPSShippingQuote implements ShippingQuoteModule {
 				ounces = ouncesString.substring(ouncesIndex + 1);
 			}
 
-			String size = "REGULAR";
+			String size;
 		
 			if (totalL + totalG <= 64) {
 				size = "REGULAR";
@@ -414,7 +414,7 @@ public class USPSShippingQuote implements ShippingQuoteModule {
 
 			LOGGER.debug("USPS QUOTE REQUEST " + xmlbuffer.toString());
 
-			String data = "";
+			String data;
 
 
 			HttpClient client = new HttpClient();

diff --git a/sm-core/src/main/java/com/salesmanager/core/modules/order/ODSInvoiceModule.java b/sm-core/src/main/java/com/salesmanager/core/modules/order/ODSInvoiceModule.java
index b46f888..00aea57 100755
--- a/sm-core/src/main/java/com/salesmanager/core/modules/order/ODSInvoiceModule.java
+++ b/sm-core/src/main/java/com/salesmanager/core/modules/order/ODSInvoiceModule.java
@@ -81,7 +81,7 @@ public class ODSInvoiceModule implements InvoiceModule {
 			String template = new StringBuilder().append(INVOICE_TEMPLATE).append("_").append(language.getCode().toLowerCase()).append(INVOICE_TEMPLATE_EXTENSION).toString();
 			
 			//try by language
-			InputStream is = null;
+			InputStream is;
 			try {
 				is = getClass().getClassLoader().getResourceAsStream(template);
 			} catch (Exception e) {

diff --git a/sm-core/src/main/java/com/salesmanager/core/utils/reference/ZonesLoader.java b/sm-core/src/main/java/com/salesmanager/core/utils/reference/ZonesLoader.java
index 6df0953..e396701 100755
--- a/sm-core/src/main/java/com/salesmanager/core/utils/reference/ZonesLoader.java
+++ b/sm-core/src/main/java/com/salesmanager/core/utils/reference/ZonesLoader.java
@@ -70,8 +70,8 @@ List<Language> languages = languageService.list();
 		                    ZoneDescription zoneDescription = new ZoneDescription();
 		                    zoneDescription.setLanguage(l);
 		                    zoneDescription.setName(e.get("zoneName"));
-		                    Zone zone = null;
-		                    List<ZoneDescription> descriptions = null;
+		                    Zone zone;
+		                    List<ZoneDescription> descriptions;
 		                    if(!zonesMap.containsKey(zoneCode)) {
 		                    	zone = new Zone();
 		                    	Country country = countriesMap.get(e.get("countryCode"));

diff --git a/sm-core/src/test/java/com/salesmanager/test/content/StaticContentTestCase.java b/sm-core/src/test/java/com/salesmanager/test/content/StaticContentTestCase.java
index 3b56cc0..36f91b5 100755
--- a/sm-core/src/test/java/com/salesmanager/test/content/StaticContentTestCase.java
+++ b/sm-core/src/test/java/com/salesmanager/test/content/StaticContentTestCase.java
@@ -92,7 +92,7 @@ public class StaticContentTestCase extends AbstractSalesManagerCoreTestCase {
         }
 
         byte[] is;
-        ByteArrayInputStream inputStream = null;
+        ByteArrayInputStream inputStream;
 
 		is = IOUtils.toByteArray( new FileInputStream( file ) );
 		inputStream = new ByteArrayInputStream( is );
@@ -144,7 +144,7 @@ public class StaticContentTestCase extends AbstractSalesManagerCoreTestCase {
         }
 
         byte[] is;
-        ByteArrayInputStream inputStream = null;
+        ByteArrayInputStream inputStream;
 
 		is = IOUtils.toByteArray( new FileInputStream( file ) );
 		inputStream = new ByteArrayInputStream( is );
@@ -164,7 +164,7 @@ public class StaticContentTestCase extends AbstractSalesManagerCoreTestCase {
         }
 
         byte[] is2;
-        ByteArrayInputStream inputStream2 = null;
+        ByteArrayInputStream inputStream2;
 
 		is2 = IOUtils.toByteArray( new FileInputStream( file2 ) );
 		inputStream2 = new ByteArrayInputStream( is2 );

diff --git a/sm-core/src/test/java/com/salesmanager/test/order/OrderSalesManagerTestCase.java b/sm-core/src/test/java/com/salesmanager/test/order/OrderSalesManagerTestCase.java
index 3d5c166..6548ea5 100755
--- a/sm-core/src/test/java/com/salesmanager/test/order/OrderSalesManagerTestCase.java
+++ b/sm-core/src/test/java/com/salesmanager/test/order/OrderSalesManagerTestCase.java
@@ -251,7 +251,7 @@ public class OrderSalesManagerTestCase extends AbstractSalesManagerCoreTestCase 
 	@Test
 	public void getMerchantOrders() throws ServiceException {
 		
-		List<Order> merchantOrders= new ArrayList<Order>();
+		List<Order> merchantOrders;
 		
 		Language language = languageService.getByCode(ENGLISH_LANGUAGE_CODE);
 		Currency currency = currencyService.getByCode(EURO_CURRENCY_CODE);

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/customers/CustomerController.java b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/customers/CustomerController.java
index fcea8de..8a50a99 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/customers/CustomerController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/customers/CustomerController.java
@@ -126,7 +126,7 @@ public class CustomerController {
 
 		model.addAttribute("languages",languages);
 		
-		Customer customer = null;
+		Customer customer;
 		
 		//if request.attribute contains id then get this customer from customerService
 		if(id!=null && id!=0) {//edit mode
@@ -429,8 +429,8 @@ public class CustomerController {
 			try {
 				
 				String[] parameterKey = parameterName.split("-");
-				com.salesmanager.core.business.customer.model.attribute.CustomerOption customerOption = null;
-				com.salesmanager.core.business.customer.model.attribute.CustomerOptionValue customerOptionValue = null;
+				com.salesmanager.core.business.customer.model.attribute.CustomerOption customerOption;
+				com.salesmanager.core.business.customer.model.attribute.CustomerOptionValue customerOptionValue;
 
 				
 				if(CUSTOMER_ID_PARAMETER.equals(parameterName)) {

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/customers/CustomerOptionsController.java b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/customers/CustomerOptionsController.java
index 6fb6b83..e00d3f3 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/customers/CustomerOptionsController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/customers/CustomerOptionsController.java
@@ -154,7 +154,7 @@ public class CustomerOptionsController {
 		setMenu(model,request);
 		
 		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		CustomerOption dbEntity =	null;	
+		CustomerOption dbEntity;	
 
 		if(option.getId() != null && option.getId() >0) { //edit entry
 			
@@ -236,7 +236,7 @@ public class CustomerOptionsController {
 		
 			MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
 			
-			List<CustomerOption> options = null;
+			List<CustomerOption> options;
 					
 
 				

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/customers/CustomerOptionsSetController.java b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/customers/CustomerOptionsSetController.java
index 6239edb..9f9143a 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/customers/CustomerOptionsSetController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/customers/CustomerOptionsSetController.java
@@ -125,7 +125,7 @@ public class CustomerOptionsSetController {
 		}
 		
 		//see if association already exist
-		CustomerOption option =	null;	
+		CustomerOption option;	
 
 		//get from DB
 		//option = customerOptionService.getById(optionSet.getPk().getCustomerOption().getId());

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/customers/CustomerOptionsValueController.java b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/customers/CustomerOptionsValueController.java
index b6fc8d0..d7230c9 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/customers/CustomerOptionsValueController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/customers/CustomerOptionsValueController.java
@@ -171,7 +171,7 @@ public class CustomerOptionsValueController {
 		setMenu(model,request);
 		
 		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		CustomerOptionValue dbEntity =	null;	
+		CustomerOptionValue dbEntity;	
 
 		if(optionValue.getId() != null && optionValue.getId() >0) { //edit entry
 			
@@ -256,7 +256,7 @@ public class CustomerOptionsValueController {
 		
 			MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
 			
-			List<CustomerOptionValue> options = null;
+			List<CustomerOptionValue> options;
 					
 	
 			options = customerOptionValueService.listByStore(store, language);

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/merchant/MerchantStoreController.java b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/merchant/MerchantStoreController.java
index 05afaf1..f29d846 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/merchant/MerchantStoreController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/merchant/MerchantStoreController.java
@@ -228,7 +228,7 @@ public class MerchantStoreController {
 			}
 		}
 		
-		Date date = new Date();
+		Date date;
 		if(!StringUtils.isBlank(store.getDateBusinessSince())) {
 			try {
 				date = DateUtil.getDate(store.getDateBusinessSince());

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/orders/OrderActionsControler.java b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/orders/OrderActionsControler.java
index 6a9c97e..29e1d1a 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/orders/OrderActionsControler.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/orders/OrderActionsControler.java
@@ -148,7 +148,7 @@ private static final Logger LOGGER = LoggerFactory.getLogger(OrderActionsControl
 		
 		AjaxResponse resp = new AjaxResponse();
 
-		BigDecimal submitedAmount = null;
+		BigDecimal submitedAmount;
 		
 		try {
 			

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ManufacturerController.java b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ManufacturerController.java
index 050f405..1c7c9b4 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ManufacturerController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ManufacturerController.java
@@ -339,7 +339,7 @@ public class ManufacturerController {
 			Language language = (Language)request.getAttribute("LANGUAGE");	
 			MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
 			
-			List<Manufacturer> manufacturers = null;				
+			List<Manufacturer> manufacturers;				
 			manufacturers = manufacturerService.listByStore(store, language);
 			
 				

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/OptionsController.java b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/OptionsController.java
index bb596e0..0c53c63 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/OptionsController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/OptionsController.java
@@ -161,7 +161,7 @@ public class OptionsController {
 		setMenu(model,request);
 		
 		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		ProductOption dbEntity =	null;	
+		ProductOption dbEntity;	
 
 		if(option.getId() != null && option.getId() >0) { //edit entry
 			//get from DB
@@ -238,7 +238,7 @@ public class OptionsController {
 		
 			MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
 			
-			List<ProductOption> options = null;
+			List<ProductOption> options;
 					
 			if(!StringUtils.isBlank(optionName)) {
 				

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/OptionsValueController.java b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/OptionsValueController.java
index a9e226b..8d688ec 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/OptionsValueController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/OptionsValueController.java
@@ -172,7 +172,7 @@ public class OptionsValueController {
 		setMenu(model,request);
 		
 		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		ProductOptionValue dbEntity =	null;	
+		ProductOptionValue dbEntity;	
 
 		if(optionValue.getId() != null && optionValue.getId() >0) { //edit entry
 			

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductAttributeController.java b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductAttributeController.java
index 61fef22..3fb21d7 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductAttributeController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductAttributeController.java
@@ -109,7 +109,7 @@ public class ProductAttributeController {
 		AjaxResponse resp = new AjaxResponse();
 		
 		Long productId;
-		Product product = null;
+		Product product;
 		
 		try {
 			productId = Long.parseLong(sProductId);
@@ -211,7 +211,7 @@ public class ProductAttributeController {
 		
 		List<Language> languages = store.getLanguages();
 		
-		ProductAttribute attribute = null;
+		ProductAttribute attribute;
 		
 		//get Options
 		List<ProductOption> options = productOptionService.listByStore(store, language);
@@ -294,7 +294,7 @@ public class ProductAttributeController {
 		}
 		
 		//validate price
-		BigDecimal submitedPrice = null;
+		BigDecimal submitedPrice;
 		try {
 			submitedPrice = priceUtil.getAmount(attribute.getAttributePrice());
 			attribute.setProductAttributePrice(submitedPrice);
@@ -459,7 +459,7 @@ public class ProductAttributeController {
 		AjaxResponse resp = new AjaxResponse();
 		
 		Long prodoptionId;
-		ProductOption productOption = null;
+		ProductOption productOption;
 		
 		try {
 			prodoptionId = Long.parseLong(sOptionId);

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductController.java b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductController.java
index d3d8e0d..fc0649d 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductController.java
@@ -835,7 +835,7 @@ public class ProductController {
 		AjaxResponse resp = new AjaxResponse();
 		
 		Long productId;
-		Product product = null;
+		Product product;
 		
 		try {
 			productId = Long.parseLong(sProductId);

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductImagesController.java b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductImagesController.java
index 94d731d..e1dc7a9 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductImagesController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductImagesController.java
@@ -96,7 +96,7 @@ public class ProductImagesController {
 		AjaxResponse resp = new AjaxResponse();
 		
 		Long productId;
-		Product product = null;
+		Product product;
 		
 		try {
 			productId = Long.parseLong(sProductId);

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductKeywordsController.java b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductKeywordsController.java
index f4799c5..a81e754 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductKeywordsController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductKeywordsController.java
@@ -251,7 +251,7 @@ public class ProductKeywordsController {
 		AjaxResponse resp = new AjaxResponse();
 		
 		Long productId;
-		Product product = null;
+		Product product;
 		
 		try {
 			productId = Long.parseLong(sProductId);

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductPriceController.java b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductPriceController.java
index 33f5569..574f6e9 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductPriceController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductPriceController.java
@@ -110,7 +110,7 @@ public class ProductPriceController {
 		AjaxResponse resp = new AjaxResponse();
 		
 		Long productId;
-		Product product = null;
+		Product product;
 		
 		try {
 			productId = Long.parseLong(sProductId);

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductReviewController.java b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductReviewController.java
index c0c3060..39219f8 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductReviewController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductReviewController.java
@@ -90,7 +90,7 @@ public class ProductReviewController {
 		AjaxResponse resp = new AjaxResponse();
 		
 		Long productId;
-		Product product = null;
+		Product product;
 		
 		try {
 			productId = Long.parseLong(sProductId);

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductsController.java b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductsController.java
index 30fe579..79fbabe 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductsController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/products/ProductsController.java
@@ -102,7 +102,7 @@ public class ProductsController {
 			if(!StringUtils.isBlank(categoryId) && !categoryId.equals("-1")) {
 				
 				//get other filters
-				Long lcategoryId = 0L;
+				Long lcategoryId;
 				try {
 					lcategoryId = Long.parseLong(categoryId);
 				} catch (Exception e) {

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/shipping/ShippingOptionsController.java b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/shipping/ShippingOptionsController.java
index deab242..de938e9 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/shipping/ShippingOptionsController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/shipping/ShippingOptionsController.java
@@ -117,7 +117,7 @@ public class ShippingOptionsController {
 			shippingConfiguration = new ShippingConfiguration();
 		}
 		
-		BigDecimal submitedOrderPrice = null;
+		BigDecimal submitedOrderPrice;
 		if(!StringUtils.isBlank(configuration.getOrderTotalFreeShippingText())){
 			try {
 				submitedOrderPrice = priceUtil.getAmount(configuration.getOrderTotalFreeShippingText());
@@ -128,7 +128,7 @@ public class ShippingOptionsController {
 			}
 		}
 		
-		BigDecimal submitedHandlingPrice = null;
+		BigDecimal submitedHandlingPrice;
 		if(!StringUtils.isBlank(configuration.getHandlingFeesText())){
 			try {
 				submitedHandlingPrice = priceUtil.getAmount(configuration.getHandlingFeesText());

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/tax/TaxClassController.java b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/tax/TaxClassController.java
index b79cd59..ac28d16 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/tax/TaxClassController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/tax/TaxClassController.java
@@ -256,7 +256,7 @@ public class TaxClassController {
 
 		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
 
-		TaxClass taxClass = null;
+		TaxClass taxClass;
 		try {
 			Long taxClassId = Long.parseLong(id);
 			taxClass = taxClassService.getById(taxClassId);

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/tax/TaxRatesController.java b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/tax/TaxRatesController.java
index bf108b5..4d7c1fa 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/tax/TaxRatesController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/tax/TaxRatesController.java
@@ -111,7 +111,7 @@ public class TaxRatesController {
 
 		try {
 			
-			NumberFormat nf = null;
+			NumberFormat nf;
 
 			
 			nf = NumberFormat.getInstance(Locale.US);
@@ -398,7 +398,7 @@ public class TaxRatesController {
 		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
 		Language language = (Language)request.getAttribute("LANGUAGE");
 
-		TaxRate taxRate = null;
+		TaxRate taxRate;
 		try {
 			Long taxRateId = Long.parseLong(id);
 			taxRate = taxRateService.getById(taxRateId);
@@ -412,7 +412,7 @@ public class TaxRatesController {
 		}
 		
 		
-		NumberFormat nf = null;
+		NumberFormat nf;
 
 		
 		nf = NumberFormat.getInstance(Locale.US);

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/user/PermissionController.java b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/user/PermissionController.java
index 24e0541..2234671 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/user/PermissionController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/user/PermissionController.java
@@ -71,7 +71,7 @@ public class PermissionController {
 
 		try {
 
-			List<Permission> permissions = null;
+			List<Permission> permissions;
 			permissions = permissionService.listPermission();
 
 			for (Permission permission : permissions) {

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/user/UserController.java b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/user/UserController.java
index 5b6e343..cceff43 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/controller/user/UserController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/controller/user/UserController.java
@@ -121,7 +121,7 @@ public class UserController {
 		try {
 
 			User currentUser = userService.getByUserName(sCurrentUser);
-			List<User> users = null;
+			List<User> users;
 			if(UserUtils.userInGroup(currentUser, Constants.GROUP_SUPERADMIN) ) {
 				users = userService.listUser();
 			} else {
@@ -307,7 +307,7 @@ public class UserController {
 		}
 		
 		
-		List<MerchantStore> stores = new ArrayList<MerchantStore>();
+		List<MerchantStore> stores;
 		//stores.add(store);
 		stores = merchantStoreService.list();
 		
@@ -781,8 +781,8 @@ public class UserController {
 	public @ResponseBody String resetPasswordSecurityQtn(@ModelAttribute(value="userReset") UserReset userReset,HttpServletRequest request, HttpServletResponse response, Locale locale) {
 		
 		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		Language userLanguage = null; 
-		Locale userLocale =  null; 
+		Language userLanguage; 
+		Locale userLocale; 
 		AjaxResponse resp = new AjaxResponse();
 		
 		//String question1 = request.getParameter("question1");

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/entity/userpassword/UserReset.java b/sm-shop/src/main/java/com/salesmanager/web/admin/entity/userpassword/UserReset.java
index 2cef668..5915f18 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/entity/userpassword/UserReset.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/entity/userpassword/UserReset.java
@@ -34,7 +34,7 @@ public class UserReset
 
   private static int getRandomNumber()
   {
-    int randomInt = 0;
+    int randomInt;
     Random randomGenerator = new Random();
     randomInt = randomGenerator.nextInt(CHAR_LIST.length());
     if (randomInt - 1 == -1) {

diff --git a/sm-shop/src/main/java/com/salesmanager/web/admin/security/UserServicesImpl.java b/sm-shop/src/main/java/com/salesmanager/web/admin/security/UserServicesImpl.java
index 84ef591..9c2c851 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/admin/security/UserServicesImpl.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/admin/security/UserServicesImpl.java
@@ -62,7 +62,7 @@ public class UserServicesImpl implements WebUserServices{
 	public UserDetails loadUserByUsername(String userName)
 			throws UsernameNotFoundException, DataAccessException {
 
-		com.salesmanager.core.business.user.model.User user = null;
+		com.salesmanager.core.business.user.model.User user;
 		Collection<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
 		
 		try {

diff --git a/sm-shop/src/main/java/com/salesmanager/web/filter/StoreFilter.java b/sm-shop/src/main/java/com/salesmanager/web/filter/StoreFilter.java
index 0bdb15c..8db0340 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/filter/StoreFilter.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/filter/StoreFilter.java
@@ -380,7 +380,7 @@ public class StoreFilter extends HandlerInterceptorAdapter {
 			.append(configKey.toString())
 			.append(Constants.MISSED_CACHE_KEY);
 			
-			Map<String, Object> configs = null;
+			Map<String, Object> configs;
 			
 			if(store.isUseCache()) {
 			
@@ -447,7 +447,7 @@ public class StoreFilter extends HandlerInterceptorAdapter {
 				.append(contentKey.toString())
 				.append(Constants.MISSED_CACHE_KEY);
 				
-				Map<String, List<ContentDescription>> contents = null;
+				Map<String, List<ContentDescription>> contents;
 				
 				if(store.isUseCache()) {
 				
@@ -519,7 +519,7 @@ public class StoreFilter extends HandlerInterceptorAdapter {
 			.append(contentKey.toString())
 			.append(Constants.MISSED_CACHE_KEY);
 			
-			Map<String, List<Content>> contents = null;
+			Map<String, List<Content>> contents;
 			
 			if(store.isUseCache()) {
 			
@@ -593,8 +593,8 @@ public class StoreFilter extends HandlerInterceptorAdapter {
 		
 		
 		//language code - List of category
-		Map<String, List<ReadableCategory>> objects = null;
-		List<ReadableCategory> loadedCategories = null;
+		Map<String, List<ReadableCategory>> objects;
+		List<ReadableCategory> loadedCategories;
 		
 		if(store.isUseCache()) {
 			objects = (Map<String, List<ReadableCategory>>) webApplicationCache.getFromCache(categoriesKey.toString());
@@ -725,7 +725,7 @@ public class StoreFilter extends HandlerInterceptorAdapter {
 						.append(Constants.CONTENT_PAGE_CACHE_KEY)
 						.append("-")
 						.append(lang.getCode()).toString();
-						List<ContentDescription> contentList = null;
+						List<ContentDescription> contentList;
 						if(contents==null || contents.size()==0) {
 							contents = new HashMap<String, List<ContentDescription>>();
 						}
@@ -772,7 +772,7 @@ public class StoreFilter extends HandlerInterceptorAdapter {
 							.append(Constants.CONTENT_CACHE_KEY)
 							.append("-")
 							.append(lang.getCode()).toString();
-							List<Content> contentList = null;
+							List<Content> contentList;
 							if(contents==null || contents.size()==0) {
 								contents = new HashMap<String, List<Content>>();
 							}
@@ -843,7 +843,7 @@ public class StoreFilter extends HandlerInterceptorAdapter {
 								if(category.getDepth().intValue() == 0) {
 								
 									//List<Category> cacheCategories = null;
-									List<ReadableCategory> cacheCategories = null;
+									List<ReadableCategory> cacheCategories;
 									if(objects==null || objects.size()==0) {
 										//objects = new HashMap<String, List<Category>>();
 										objects = new HashMap<String, List<ReadableCategory>>();

diff --git a/sm-shop/src/main/java/com/salesmanager/web/populator/catalog/PersistableCategoryPopulator.java b/sm-shop/src/main/java/com/salesmanager/web/populator/catalog/PersistableCategoryPopulator.java
index 0d9ff13..c6d4346 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/populator/catalog/PersistableCategoryPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/populator/catalog/PersistableCategoryPopulator.java
@@ -67,7 +67,7 @@ public class PersistableCategoryPopulator extends
 			target.setDepth(0);
 
 		} else {
-			Category parent = null;
+			Category parent;
 			if(!StringUtils.isBlank(source.getParent().getCode())) {
 				 parent = categoryService.getByCode(store.getCode(), source.getParent().getCode());
 			} else if(source.getParent().getId()!=null) {

diff --git a/sm-shop/src/main/java/com/salesmanager/web/populator/catalog/PersistableProductPopulator.java b/sm-shop/src/main/java/com/salesmanager/web/populator/catalog/PersistableProductPopulator.java
index 06ad070..160e512 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/populator/catalog/PersistableProductPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/populator/catalog/PersistableProductPopulator.java
@@ -74,7 +74,7 @@ public class PersistableProductPopulator extends
 
 			if(source.getManufacturer()!=null) {
 				
-				Manufacturer manuf = null;
+				Manufacturer manuf;
 				if(!StringUtils.isBlank(source.getManufacturer().getCode())) {
 					manuf = manufacturerService.getByCode(store, source.getManufacturer().getCode());
 				} else {
@@ -206,7 +206,7 @@ public class PersistableProductPopulator extends
 			if(source.getAttributes()!=null) {
 				for(com.salesmanager.web.entity.catalog.product.attribute.ProductAttributeEntity attr : source.getAttributes()) {
 					
-					ProductOption productOption = null;
+					ProductOption productOption;
 							
 					if(!StringUtils.isBlank(attr.getOption().getCode())) {
 						productOption = productOptionService.getByCode(store, attr.getOption().getCode());
@@ -219,7 +219,7 @@ public class PersistableProductPopulator extends
 						throw new ConversionException("Product option id " + attr.getOption().getId() + " does not exist");
 					}
 					
-					ProductOptionValue productOptionValue = null;
+					ProductOptionValue productOptionValue;
 					
 					if(!StringUtils.isBlank(attr.getOptionValue().getCode())) {
 						productOptionValue = productOptionValueService.getByCode(store, attr.getOptionValue().getCode());
@@ -256,7 +256,7 @@ public class PersistableProductPopulator extends
 			if(!CollectionUtils.isEmpty(source.getCategories())) {
 				for(com.salesmanager.web.entity.catalog.category.Category categ : source.getCategories()) {
 					
-					Category c = null;
+					Category c;
 					if(!StringUtils.isBlank(categ.getCode())) {
 						c = categoryService.getByCode(store, categ.getCode());
 					} else {

diff --git a/sm-shop/src/main/java/com/salesmanager/web/populator/customer/CustomerPopulator.java b/sm-shop/src/main/java/com/salesmanager/web/populator/customer/CustomerPopulator.java
index 8797508..4e3958b 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/populator/customer/CustomerPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/populator/customer/CustomerPopulator.java
@@ -112,7 +112,7 @@ public class CustomerPopulator extends
 			if(target.getBilling() ==null && source.getBilling()!=null){
 			    LOG.info( "Setting default values for billing" );
 			    Billing billing = new Billing();
-			    Country billingCountry = null;
+			    Country billingCountry;
 			    if(StringUtils.isNotBlank( source.getBilling().getCountry() )) {
                     billingCountry = countries.get(source.getBilling().getCountry());
                     if(billingCountry==null) {
@@ -158,7 +158,7 @@ public class CustomerPopulator extends
 			if(target.getDelivery() ==null && source.getDelivery()!=null){
 			    LOG.info( "Setting default value for delivery" );
 			    Delivery delivery = new Delivery();
-			    Country deliveryCountry = null;
+			    Country deliveryCountry;
                 if(StringUtils.isNotBlank( source.getDelivery().getCountry() )) {
                     deliveryCountry = countries.get(source.getDelivery().getCountry());
                     if(deliveryCountry==null) {

diff --git a/sm-shop/src/main/java/com/salesmanager/web/populator/order/PersistableOrderPopulator.java b/sm-shop/src/main/java/com/salesmanager/web/populator/order/PersistableOrderPopulator.java
index a074b28..3da6c06 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/populator/order/PersistableOrderPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/populator/order/PersistableOrderPopulator.java
@@ -95,7 +95,7 @@ public class PersistableOrderPopulator extends
 				target.setCreditCard(creditCard);
 			}
 			
-			Currency currency = null;
+			Currency currency;
 			try {
 				currency = currencyService.getByCode(source.getCurrency());
 			} catch(Exception e) {

diff --git a/sm-shop/src/main/java/com/salesmanager/web/reference/ReferenceController.java b/sm-shop/src/main/java/com/salesmanager/web/reference/ReferenceController.java
index ad6ee0f..1986429 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/reference/ReferenceController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/reference/ReferenceController.java
@@ -176,7 +176,7 @@ public class ReferenceController {
 	public @ResponseBody String getCreditCardDates(HttpServletRequest request, HttpServletResponse response) {
 		
 
-		List<String> years = null;
+		List<String> years;
 		String serialized = null;
 		try {
 			
@@ -219,7 +219,7 @@ public class ReferenceController {
 	public @ResponseBody String getMonthsOfYear(HttpServletRequest request, HttpServletResponse response) {
 		
 
-		List<String> days = null;
+		List<String> days;
 		String serialized = null;
 		
 		try {	

diff --git a/sm-shop/src/main/java/com/salesmanager/web/services/security/CustomerServicesImpl.java b/sm-shop/src/main/java/com/salesmanager/web/services/security/CustomerServicesImpl.java
index eca1e31..b075854 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/services/security/CustomerServicesImpl.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/services/security/CustomerServicesImpl.java
@@ -55,7 +55,7 @@ public class CustomerServicesImpl implements UserDetailsService{
 	public UserDetails loadUserByUsername(String userName)
 			throws UsernameNotFoundException, DataAccessException {
 
-		Customer user = null;
+		Customer user;
 		Collection<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
 
 		try {

diff --git a/sm-shop/src/main/java/com/salesmanager/web/shop/controller/AbstractController.java b/sm-shop/src/main/java/com/salesmanager/web/shop/controller/AbstractController.java
index 8844345..802bfc8 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/shop/controller/AbstractController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/shop/controller/AbstractController.java
@@ -58,7 +58,7 @@ public abstract class AbstractController {
 		
 		
 		MerchantStore store = getSessionAttribute(Constants.MERCHANT_STORE, request);
-		StringBuilder template = null;
+		StringBuilder template;
 		//ModelAndView model = null;
 		if(ex instanceof AccessDeniedException) {
 			

diff --git a/sm-shop/src/main/java/com/salesmanager/web/shop/controller/category/ShoppingCategoryController.java b/sm-shop/src/main/java/com/salesmanager/web/shop/controller/category/ShoppingCategoryController.java
index ef168e5..e491c8b 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/shop/controller/category/ShoppingCategoryController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/shop/controller/category/ShoppingCategoryController.java
@@ -201,8 +201,8 @@ public class ShoppingCategoryController {
 		.append(Constants.MISSED_CACHE_KEY);
 		
 		List<BigDecimal> prices = new ArrayList<BigDecimal>();
-		List<ReadableCategory> subCategories = null;
-		Map<Long,Long> countProductsByCategories = null;
+		List<ReadableCategory> subCategories;
+		Map<Long,Long> countProductsByCategories;
 
 		if(store.isUseCache()) {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/web/shop/controller/customer/CustomerAccountController.java b/sm-shop/src/main/java/com/salesmanager/web/shop/controller/customer/CustomerAccountController.java
index 2e12e35..aac1ae0 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/shop/controller/customer/CustomerAccountController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/shop/controller/customer/CustomerAccountController.java
@@ -158,7 +158,7 @@ public class CustomerAccountController extends AbstractController {
 		MerchantStore store = getSessionAttribute(Constants.MERCHANT_STORE, request);
 		
 		Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-		Customer customer = null;
+		Customer customer;
     	if(auth != null &&
         		 request.isUserInRole("AUTH_CUSTOMER")) {
     		customer = customerFacade.getCustomerByUserName(auth.getName(), store);
@@ -349,8 +349,8 @@ public class CustomerAccountController extends AbstractController {
 			try {
 				
 				String[] parameterKey = parameterName.split("-");
-				com.salesmanager.core.business.customer.model.attribute.CustomerOption customerOption = null;
-				com.salesmanager.core.business.customer.model.attribute.CustomerOptionValue customerOptionValue = null;
+				com.salesmanager.core.business.customer.model.attribute.CustomerOption customerOption;
+				com.salesmanager.core.business.customer.model.attribute.CustomerOptionValue customerOptionValue;
 
 				
 				if(CUSTOMER_ID_PARAMETER.equals(parameterName)) {

diff --git a/sm-shop/src/main/java/com/salesmanager/web/shop/controller/customer/CustomerOrdersController.java b/sm-shop/src/main/java/com/salesmanager/web/shop/controller/customer/CustomerOrdersController.java
index a18a218..7781aae 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/shop/controller/customer/CustomerOrdersController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/shop/controller/customer/CustomerOrdersController.java
@@ -114,7 +114,7 @@ public class CustomerOrdersController extends AbstractController {
         LOGGER.info( "Fetching order details for Id " +orderId);
         
         //get order id
-        Long lOrderId = null;
+        Long lOrderId;
         try {
         	lOrderId = Long.parseLong(orderId);
         } catch(NumberFormatException nfe) {

diff --git a/sm-shop/src/main/java/com/salesmanager/web/shop/controller/customer/facade/CustomerFacadeImpl.java b/sm-shop/src/main/java/com/salesmanager/web/shop/controller/customer/facade/CustomerFacadeImpl.java
index c459639..bacfee9 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/shop/controller/customer/facade/CustomerFacadeImpl.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/shop/controller/customer/facade/CustomerFacadeImpl.java
@@ -317,7 +317,7 @@ public class CustomerFacadeImpl implements CustomerFacade
     public Customer getCustomerModel(final PersistableCustomer customer,final MerchantStore merchantStore, Language language) throws Exception {
         
         LOG.info( "Starting to populate customer model from customer data" );
-        Customer customerModel=null;
+        Customer customerModel;
         CustomerPopulator populator = new CustomerPopulator();
         populator.setCountryService(countryService);
         populator.setCustomerOptionService(customerOptionService);
@@ -439,7 +439,7 @@ public class CustomerFacadeImpl implements CustomerFacade
         throws Exception
     {
 	     LOG.info( "Fetching customer for id {} ", userId);
-        Address address=null;
+        Address address;
         final Customer customerModel=customerService.getById( userId );
         
         if(customerModel == null){

diff --git a/sm-shop/src/main/java/com/salesmanager/web/shop/controller/order/facade/OrderFacadeImpl.java b/sm-shop/src/main/java/com/salesmanager/web/shop/controller/order/facade/OrderFacadeImpl.java
index b8a7cab..5bb028a 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/shop/controller/order/facade/OrderFacadeImpl.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/shop/controller/order/facade/OrderFacadeImpl.java
@@ -189,7 +189,7 @@ public class OrderFacadeImpl implements OrderFacade {
 	
 	private OrderTotalSummary calculateOrderTotal(MerchantStore store, Customer customer, PersistableOrder order, Language language) throws Exception {
 		
-		OrderTotalSummary orderTotalSummary = null;
+		OrderTotalSummary orderTotalSummary;
 		
 		OrderSummary summary = new OrderSummary();
 		

diff --git a/sm-shop/src/main/java/com/salesmanager/web/shop/controller/order/ShoppingOrderController.java b/sm-shop/src/main/java/com/salesmanager/web/shop/controller/order/ShoppingOrderController.java
index 39202e3..c55f231 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/shop/controller/order/ShoppingOrderController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/shop/controller/order/ShoppingOrderController.java
@@ -156,12 +156,12 @@ public class ShoppingOrderController extends AbstractController {
 		 */
 		
 		//check if an existing order exist
-		ShopOrder order = null;
+		ShopOrder order;
 		order = super.getSessionAttribute(Constants.ORDER, request);
 	
 		//Get the cart from the DB
 		String shoppingCartCode  = (String)request.getSession().getAttribute(Constants.SHOPPING_CART);
-		com.salesmanager.core.business.shoppingcart.model.ShoppingCart cart = null;
+		com.salesmanager.core.business.shoppingcart.model.ShoppingCart cart;
 	
 	    if(StringUtils.isBlank(shoppingCartCode)) {
 				
@@ -410,7 +410,7 @@ public class ShoppingOrderController extends AbstractController {
 	        
 
 
-			Customer modelCustomer = null;
+			Customer modelCustomer;
 			try {//set groups
 				if(authCustomer==null) {//not authenticated, create a new volatile user
 					modelCustomer = customerFacade.getCustomerModel(customer, store, language);
@@ -427,7 +427,7 @@ public class ShoppingOrderController extends AbstractController {
 	        
            
 	        
-	        Order modelOrder = null;
+	        Order modelOrder;
 	        Transaction initialTransaction = (Transaction)super.getSessionAttribute(Constants.INIT_TRANSACTION_KEY, request);
 	        if(initialTransaction!=null) {
 	        	modelOrder=orderFacade.processOrder(order, modelCustomer, initialTransaction, store, language);
@@ -543,7 +543,7 @@ public class ShoppingOrderController extends AbstractController {
 					}
 					shoppingCartCode = merchantCookie[1];
 				}
-				com.salesmanager.core.business.shoppingcart.model.ShoppingCart cart = null;
+				com.salesmanager.core.business.shoppingcart.model.ShoppingCart cart;
 			
 			    if(StringUtils.isBlank(shoppingCartCode)) {
 					StringBuilder template = new StringBuilder().append(ControllerConstants.Tiles.Pages.timeout).append(".").append(store.getStoreTemplate());

diff --git a/sm-shop/src/main/java/com/salesmanager/web/shop/controller/order/ShoppingOrderDownloadController.java b/sm-shop/src/main/java/com/salesmanager/web/shop/controller/order/ShoppingOrderDownloadController.java
index d19cea4..5200d78 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/shop/controller/order/ShoppingOrderDownloadController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/shop/controller/order/ShoppingOrderDownloadController.java
@@ -79,7 +79,7 @@ public class ShoppingOrderDownloadController extends AbstractController {
 		}
 
 		
-		String fileName = null;//get it from OrderProductDownlaod
+		String fileName;//get it from OrderProductDownlaod
 		OrderProductDownload download = orderProductDownloadService.getById(id);
 		if(download==null) {
 			LOGGER.warn("OrderProductDownload is null for id " + id);

diff --git a/sm-shop/src/main/java/com/salesmanager/web/shop/controller/product/ShopProductController.java b/sm-shop/src/main/java/com/salesmanager/web/shop/controller/product/ShopProductController.java
index 9a3043d..fedb8ac 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/shop/controller/product/ShopProductController.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/shop/controller/product/ShopProductController.java
@@ -178,8 +178,8 @@ public class ShopProductController {
 		.append(relatedItemsCacheKey.toString())
 		.append(Constants.MISSED_CACHE_KEY);
 		
-		Map<Long,List<ReadableProduct>> relatedItemsMap = null;
-		List<ReadableProduct> relatedItems = null;
+		Map<Long,List<ReadableProduct>> relatedItemsMap;
+		List<ReadableProduct> relatedItems;
 		
 		if(store.isUseCache()) {
 
@@ -215,7 +215,7 @@ public class ShopProductController {
 		
 		if(!CollectionUtils.isEmpty(attributes)) {
 			for(ProductAttribute attribute : attributes) {
-				Attribute attr = null;
+				Attribute attr;
 				AttributeValue attrValue = new AttributeValue();
 				ProductOptionValue optionValue = attribute.getProductOptionValue();
 				

diff --git a/sm-shop/src/main/java/com/salesmanager/web/tags/ShopProductPriceFormatTag.java b/sm-shop/src/main/java/com/salesmanager/web/tags/ShopProductPriceFormatTag.java
index b33e4f9..062d828 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/tags/ShopProductPriceFormatTag.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/tags/ShopProductPriceFormatTag.java
@@ -70,7 +70,7 @@ public class ShopProductPriceFormatTag extends RequestContextAwareTag  {
 
 		MerchantStore store = (MerchantStore)request.getAttribute(Constants.MERCHANT_STORE);
 
-		String formatedPrice = null;
+		String formatedPrice;
 		
 		if(this.getCurrency()!=null) {
 			formatedPrice = productPriceUtils.getFormatedAmountWithCurrency(this.getCurrency(), this.getValue());

diff --git a/sm-shop/src/main/java/com/salesmanager/web/tags/ShopProductRelationshipTag.java b/sm-shop/src/main/java/com/salesmanager/web/tags/ShopProductRelationshipTag.java
index f413c57..3d41e6b 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/tags/ShopProductRelationshipTag.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/tags/ShopProductRelationshipTag.java
@@ -90,7 +90,7 @@ public class ShopProductRelationshipTag extends RequestContextAwareTag  {
 		.append(groupKey.toString())
 		.append(Constants.MISSED_CACHE_KEY);
 		
-		List<ReadableProduct> objects = null;
+		List<ReadableProduct> objects;
 		
 		if(store.isUseCache()) {
 		

diff --git a/sm-shop/src/main/java/com/salesmanager/web/utils/LanguageUtils.java b/sm-shop/src/main/java/com/salesmanager/web/utils/LanguageUtils.java
index a8f5ad4..7029382 100755
--- a/sm-shop/src/main/java/com/salesmanager/web/utils/LanguageUtils.java
+++ b/sm-shop/src/main/java/com/salesmanager/web/utils/LanguageUtils.java
@@ -29,7 +29,7 @@ public class LanguageUtils {
 	 */
 	public Language getRequestLanguage(HttpServletRequest request, HttpServletResponse response) {
 		
-		Locale locale = null;
+		Locale locale;
 		
 		Language language = (Language) request.getSession().getAttribute(Constants.LANGUAGE);