Projects >> platform >>34cc952030c81ed8ed27d75ac923ea1ec7c52267

Chunk
Conflicting content 
	
	@Override
	public void init(RuleConfiguration ruleConfig) {
<<<<<<< HEAD
		minOrderValue = new Money(BigDecimal.valueOf(Double.valueOf(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.MIN_ORDER_VALUE.name()))));
		discountPercentage = BigDecimal.valueOf(Double.valueOf(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.DISCOUNT_PERCENTAGE.name())));
		maxDiscountPerUse = new Money (BigDecimal.valueOf(Double.valueOf(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.MAX_DISCOUNT_CEIL_IN_VALUE.name()))));
		StrTokenizer strTokClients = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.CLIENT_LIST.name()),",");
		clientList = StringToIntegerList.convert((List)strTokClients.getTokenList());
		log.info("minOrderValue : " + minOrderValue.toString() + ", discountPercentage : " + discountPercentage.toString() + " ,maxDiscountPerUse" + maxDiscountPerUse.toString());
=======
		discountPercentage = BigDecimal.valueOf(Double.valueOf(ruleConfig.getConfigItemValue(RuleConfigConstants.DISCOUNT_PERCENTAGE)));
		maxDiscountPerUse = new Money (BigDecimal.valueOf(Double.valueOf(ruleConfig.getConfigItemValue(RuleConfigConstants.MAX_DISCOUNT_CEIL_IN_VALUE))));
		if(ruleConfig.isConfigItemPresent(RuleConfigConstants.CATEGORY_INCLUDE_LIST)){
			StrTokenizer strTokCategories = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigConstants.CATEGORY_INCLUDE_LIST),",");
			includeCategoryList = StringToIntegerList.convert((List)strTokCategories.getTokenList());
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigConstants.CATEGORY_EXCLUDE_LIST)){
			StrTokenizer strTokCategories = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigConstants.CATEGORY_EXCLUDE_LIST),",");
			excludeCategoryList = StringToIntegerList.convert((List)strTokCategories.getTokenList());
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigConstants.CLIENT_LIST)){
			StrTokenizer strTokClients = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigConstants.CLIENT_LIST),",");
			clientList = StringToIntegerList.convert((List)strTokClients.getTokenList());
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigConstants.MIN_ORDER_VALUE)){
			minOrderValue = new Money(BigDecimal.valueOf(Double.valueOf(ruleConfig.getConfigItemValue(RuleConfigConstants.MIN_ORDER_VALUE))));
			log.info("minOrderValue : " + minOrderValue.toString());
		}
		else{
			log.warn("Minimum Order Value not specified for this rule");
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigConstants.BRAND_LIST)){
			StrTokenizer strTokCategories = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigConstants.BRAND_LIST),",");
			brands = StringToIntegerList.convert((List)strTokCategories.getTokenList());
		}
		log.info("discountPercentage : " + discountPercentage.toString() + " ,maxDiscountPerUse" + maxDiscountPerUse.toString());
>>>>>>> 5f12c2f9a8805703a70e111e294f013f51f8c037
	}

	@Override
Solution content 
	
	@Override
	public void init(RuleConfiguration ruleConfig) {

		discountPercentage = BigDecimal.valueOf(Double.valueOf(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.DISCOUNT_PERCENTAGE.name())));
		maxDiscountPerUse = new Money (BigDecimal.valueOf(Double.valueOf(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.MAX_DISCOUNT_CEIL_IN_VALUE.name()))));
		if(ruleConfig.isConfigItemPresent(RuleConfigDescriptorEnum.CATEGORY_INCLUDE_LIST.name())){
			StrTokenizer strTokCategories = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.CATEGORY_INCLUDE_LIST.name()),",");
			includeCategoryList = StringToIntegerList.convert((List)strTokCategories.getTokenList());
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigDescriptorEnum.CATEGORY_EXCLUDE_LIST.name())){
			StrTokenizer strTokCategories = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.CATEGORY_EXCLUDE_LIST.name()),",");
			excludeCategoryList = StringToIntegerList.convert((List)strTokCategories.getTokenList());
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigDescriptorEnum.CLIENT_LIST.name())){
			StrTokenizer strTokClients = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.CLIENT_LIST.name()),",");
			clientList = StringToIntegerList.convert((List)strTokClients.getTokenList());
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigDescriptorEnum.MIN_ORDER_VALUE.name())){
			minOrderValue = new Money(BigDecimal.valueOf(Double.valueOf(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.MIN_ORDER_VALUE.name()))));
			log.info("minOrderValue : " + minOrderValue.toString());
		}
		else{
			log.warn("Minimum Order Value not specified for this rule");
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigDescriptorEnum.BRAND_LIST.name())){
			StrTokenizer strTokCategories = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.BRAND_LIST.name()),",");
			brands = StringToIntegerList.convert((List)strTokCategories.getTokenList());
		}
		log.info("minOrderValue : " + minOrderValue + ", discountPercentage : " + discountPercentage.toString() + " ,maxDiscountPerUse" + maxDiscountPerUse.toString());
	}

	@Override
File
BuyWorthXGetYPercentOffRuleImpl.java
Developer's decision
Manual
Kind of conflict
Attribute
If statement
Method invocation
Variable
Chunk
Conflicting content 
	
	@Override
	public void init(RuleConfiguration ruleConfig) {
<<<<<<< HEAD
		minOrderValue = new Money(BigDecimal.valueOf(Double.valueOf(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.MIN_ORDER_VALUE.name()))));
		fixedRsOff = new Money (BigDecimal.valueOf(Double.valueOf(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.FIXED_DISCOUNT_RS_OFF.name()))));
		StrTokenizer strTokClients = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.CLIENT_LIST.name()),",");
		clientList = StringToIntegerList.convert((List)strTokClients.getTokenList());
		log.info("minOrderValue : " + minOrderValue.toString() + ", fixedRsOff : " + fixedRsOff.toString());
=======
		if(ruleConfig.isConfigItemPresent(RuleConfigConstants.CATEGORY_INCLUDE_LIST)){
			StrTokenizer strTokCategories = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigConstants.CATEGORY_INCLUDE_LIST),",");
			includeCategoryList = StringToIntegerList.convert((List)strTokCategories.getTokenList());
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigConstants.CATEGORY_EXCLUDE_LIST)){
			StrTokenizer strTokCategories = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigConstants.CATEGORY_EXCLUDE_LIST),",");
			excludeCategoryList = StringToIntegerList.convert((List)strTokCategories.getTokenList());
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigConstants.CLIENT_LIST)){
			StrTokenizer strTokClients = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigConstants.CLIENT_LIST),",");
			clientList = StringToIntegerList.convert((List)strTokClients.getTokenList());
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigConstants.MIN_ORDER_VALUE)){
			minOrderValue = new Money(BigDecimal.valueOf(Double.valueOf(ruleConfig.getConfigItemValue(RuleConfigConstants.MIN_ORDER_VALUE))));
			log.info("minOrderValue : " + minOrderValue.toString());
		}
		else{
			log.warn("Minimum Order Value not specified for this rule");
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigConstants.BRAND_LIST)){
			StrTokenizer strTokCategories = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigConstants.BRAND_LIST),",");
			brands = StringToIntegerList.convert((List)strTokCategories.getTokenList());
		}
		fixedRsOff = new Money (BigDecimal.valueOf(Double.valueOf(ruleConfig.getConfigItemValue(RuleConfigConstants.FIXED_DISCOUNT_RS_OFF))));
		log.info("fixedRsOff : " + fixedRsOff.toString());
>>>>>>> 5f12c2f9a8805703a70e111e294f013f51f8c037
	}

	@Override
Solution content 
	
	@Override
	public void init(RuleConfiguration ruleConfig) {

		if(ruleConfig.isConfigItemPresent(RuleConfigDescriptorEnum.CATEGORY_INCLUDE_LIST)){
			StrTokenizer strTokCategories = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.CATEGORY_INCLUDE_LIST),",");
			includeCategoryList = StringToIntegerList.convert((List)strTokCategories.getTokenList());
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigDescriptorEnum.CATEGORY_EXCLUDE_LIST)){
			StrTokenizer strTokCategories = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.CATEGORY_EXCLUDE_LIST),",");
			excludeCategoryList = StringToIntegerList.convert((List)strTokCategories.getTokenList());
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigDescriptorEnum.CLIENT_LIST)){
			StrTokenizer strTokClients = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.CLIENT_LIST),",");
			clientList = StringToIntegerList.convert((List)strTokClients.getTokenList());
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigDescriptorEnum.MIN_ORDER_VALUE)){
			minOrderValue = new Money(BigDecimal.valueOf(Double.valueOf(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.MIN_ORDER_VALUE))));
			log.info("minOrderValue : " + minOrderValue.toString());
		}
		else{
			log.warn("Minimum Order Value not specified for this rule");
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigDescriptorEnum.BRAND_LIST)){
			StrTokenizer strTokCategories = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.BRAND_LIST),",");
			brands = StringToIntegerList.convert((List)strTokCategories.getTokenList());
		}
		fixedRsOff = new Money (BigDecimal.valueOf(Double.valueOf(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.FIXED_DISCOUNT_RS_OFF))));
		log.info("fixedRsOff : " + fixedRsOff.toString());
		log.info("minOrderValue : " + minOrderValue);
	}

	@Override
File
BuyWorthXGetYRsOffRuleImpl.java
Developer's decision
Manual
Kind of conflict
Attribute
If statement
Method invocation
Variable
Chunk
Conflicting content 
	@Override
	public void init(RuleConfiguration ruleConfig) {
<<<<<<< HEAD
		minOrderValue = new Money(BigDecimal.valueOf(Double.valueOf(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.MIN_ORDER_VALUE.name()))));
		fixedRsOff = new Money (BigDecimal.valueOf(Double.valueOf(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.FIXED_DISCOUNT_RS_OFF.name()))));
		StrTokenizer strTokCategories = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.CATEGORY_LIST.name()),",");
		categories = StringToIntegerList.convert((List)strTokCategories.getTokenList());
		StrTokenizer strTokClients = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.CLIENT_LIST.name()),",");
		clientList = StringToIntegerList.convert((List)strTokClients.getTokenList());
=======
		fixedRsOff = new Money (BigDecimal.valueOf(Double.valueOf(ruleConfig.getConfigItemValue(RuleConfigConstants.FIXED_DISCOUNT_RS_OFF))));
		if(ruleConfig.isConfigItemPresent(RuleConfigConstants.CATEGORY_INCLUDE_LIST)){
			StrTokenizer strTokCategories = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigConstants.CATEGORY_INCLUDE_LIST),",");
			includeCategoryList = StringToIntegerList.convert((List)strTokCategories.getTokenList());
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigConstants.CATEGORY_EXCLUDE_LIST)){
			StrTokenizer strTokCategories = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigConstants.CATEGORY_EXCLUDE_LIST),",");
			excludeCategoryList = StringToIntegerList.convert((List)strTokCategories.getTokenList());
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigConstants.CLIENT_LIST)){
			StrTokenizer strTokClients = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigConstants.CLIENT_LIST),",");
			clientList = StringToIntegerList.convert((List)strTokClients.getTokenList());
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigConstants.MIN_ORDER_VALUE)){
			minOrderValue = new Money(BigDecimal.valueOf(Double.valueOf(ruleConfig.getConfigItemValue(RuleConfigConstants.MIN_ORDER_VALUE))));
			log.info("minOrderValue : " + minOrderValue.toString());
		}
		else{
			log.warn("Minimum Order Value not specified for this rule");
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigConstants.BRAND_LIST)){
			StrTokenizer strTokCategories = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigConstants.BRAND_LIST),",");
			brands = StringToIntegerList.convert((List)strTokCategories.getTokenList());
		}
>>>>>>> 5f12c2f9a8805703a70e111e294f013f51f8c037
		log.info("minOrderValue : " + minOrderValue.toString() + ", fixedRsOff : " + fixedRsOff.toString());
	}
Solution content 
	@Override
	public void init(RuleConfiguration ruleConfig) {
		fixedRsOff = new Money (BigDecimal.valueOf(Double.valueOf(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.FIXED_DISCOUNT_RS_OFF.name()))));
		if(ruleConfig.isConfigItemPresent(RuleConfigDescriptorEnum.CATEGORY_INCLUDE_LIST.name())){
			StrTokenizer strTokCategories = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.CATEGORY_INCLUDE_LIST.name()),",");
			includeCategoryList = StringToIntegerList.convert((List)strTokCategories.getTokenList());
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigDescriptorEnum.CATEGORY_EXCLUDE_LIST.name())){
			StrTokenizer strTokCategories = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.CATEGORY_EXCLUDE_LIST.name()),",");
			excludeCategoryList = StringToIntegerList.convert((List)strTokCategories.getTokenList());
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigDescriptorEnum.CLIENT_LIST.name())){
			StrTokenizer strTokClients = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.CLIENT_LIST.name()),",");
			clientList = StringToIntegerList.convert((List)strTokClients.getTokenList());
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigDescriptorEnum.MIN_ORDER_VALUE.name())){
			minOrderValue = new Money(BigDecimal.valueOf(Double.valueOf(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.MIN_ORDER_VALUE.name()))));
			log.info("minOrderValue : " + minOrderValue.toString());
		}
		else{
			log.warn("Minimum Order Value not specified for this rule");
		}
		if(ruleConfig.isConfigItemPresent(RuleConfigDescriptorEnum.BRAND_LIST.name())){
			StrTokenizer strTokCategories = new StrTokenizer(ruleConfig.getConfigItemValue(RuleConfigDescriptorEnum.BRAND_LIST.name()),",");
			brands = StringToIntegerList.convert((List)strTokCategories.getTokenList());
		}

		log.info("minOrderValue : " + minOrderValue.toString() + ", fixedRsOff : " + fixedRsOff.toString());
	}
File
FirstPurchaseBuyWorthXGetYRsOffRuleImpl.java
Developer's decision
Manual
Kind of conflict
Attribute
If statement
Method invocation
Variable
Chunk
Conflicting content 
			rule = new BuyWorthXGetYPercentOffRuleImpl();
			break;
			
<<<<<<< HEAD
		case BUY_WORTH_X_GET_Y_RS_OFF_ON_Z_CATEGORY:
			rule = new BuyWorthXGetYRsOffOnZCategoryRuleImpl();
			break;
			
=======
>>>>>>> 5f12c2f9a8805703a70e111e294f013f51f8c037
		case BUY_X_BRAND_GET_Y_RS_OFF_ON_Z_PRODUCT:
			rule = new BuyXBrandGetYRsOffOnZProductRuleImpl();
			break;
Solution content 
			rule = new BuyWorthXGetYPercentOffRuleImpl();
			break;
			
		/*case BUY_WORTH_X_GET_Y_RS_OFF_ON_Z_CATEGORY:
			rule = new BuyWorthXGetYRsOffOnZCategoryRuleImpl();
			break;
			
=======*/
		case BUY_X_BRAND_GET_Y_RS_OFF_ON_Z_PRODUCT:
			rule = new BuyXBrandGetYRsOffOnZProductRuleImpl();
			break;
File
PromotionRuleFactory.java
Developer's decision
Manual
Kind of conflict
Break statement
Case statement
Method invocation
Variable
Chunk
Conflicting content 
			rule = new BuyXBrandGetYRsOffOnZProductRuleImpl();
			break;
			
<<<<<<< HEAD
		case BUY_WORTH_X_GET_Y_PERCENT_OFF_ON_Z_CATEGORY:
			rule = new BuyWorthXGetYPercentOffOnZCategoryRuleImpl();
			break;
			
=======
>>>>>>> 5f12c2f9a8805703a70e111e294f013f51f8c037
		case FIRST_PURCHASE_BUY_WORTH_X_GET_Y_RS_OFF:
			rule = new FirstPurchaseBuyWorthXGetYRsOffRuleImpl();
			((FirstPurchaseBuyWorthXGetYRsOffRuleImpl)rule).setOrderDao(orderDao);
Solution content 
			rule = new BuyXBrandGetYRsOffOnZProductRuleImpl();
			break;
			
/*<<<<<<< HEAD
		case BUY_WORTH_X_GET_Y_PERCENT_OFF_ON_Z_CATEGORY:
			rule = new BuyWorthXGetYPercentOffOnZCategoryRuleImpl();
			break;
			
=======*/

		case FIRST_PURCHASE_BUY_WORTH_X_GET_Y_RS_OFF:
			rule = new FirstPurchaseBuyWorthXGetYRsOffRuleImpl();
			((FirstPurchaseBuyWorthXGetYRsOffRuleImpl)rule).setOrderDao(orderDao);
File
PromotionRuleFactory.java
Developer's decision
Manual
Kind of conflict
Break statement
Case statement
Method invocation
Variable