Projects >> genability-java >>c86bd3e02258f4fa2bb220254d419fafd6e2647d

Chunk
Conflicting content 
	public List getQueryParams() {

List qparams = super.getQueryParams();
<<<<<<< HEAD
		
	if(keyName_ != null)
	{	
	addParam(qparams,"keyName", keyName_);
	}
	if(subPropertyKeyName_ != null)
	{	
	addParam(qparams,"subKeyName", subPropertyKeyName_);
	}
	
	if(fromDateTime !=null) {
		addParam(qparams,"fromDateTime", fromDateTime);
		
	}
	if(toDateTime != null){
		addParam(qparams,"toDateTime", toDateTime);
	}
	
=======

		addParam(qparams,"keyName", keyName);
>>>>>>> 2f07a5be4360e72a40cc9babf485f9cffa274dda
		return qparams;
	}
Solution content 
	public List getQueryParams() {

List qparams = super.getQueryParams();
		
	if(keyName != null)
	{	
	addParam(qparams,"keyName", keyName);
	}
	if(subPropertyKeyName != null)
	{	
	addParam(qparams,"subKeyName", subPropertyKeyName);
	}
	
	if(fromDateTime !=null) {
		addParam(qparams,"fromDateTime", fromDateTime);
		
	}
	if(toDateTime != null){
		addParam(qparams,"toDateTime", toDateTime);
	}
	
		return qparams;
	}
File
GetPropertyLookupRequest.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
	public Response getPropertyLookups(GetPropertyLookupRequest request) {
		if(log.isDebugEnabled()) log.debug("getAccount called");

<<<<<<< HEAD
		String uri = "public/properties";
		if (request.getKeyName_() != null && request.getKeyName_().length() !=0) {
			uri += "/" + request.getKeyName_() + "/lookups";
=======
		String uri = "public/properties/";
		if (request.getKeyName() != null && request.getKeyName().length() !=0) {
			uri += "/" + request.getKeyName() + "/lookups";
>>>>>>> 2f07a5be4360e72a40cc9babf485f9cffa274dda
		}

		Response response = this.callGet(uri,request.getQueryParams(),PROPERTY_LOOKUP_RESPONSE_TYPEREF);
Solution content 
	public Response getPropertyLookups(GetPropertyLookupRequest request) {
		if(log.isDebugEnabled()) log.debug("getAccount called");

		String uri = "public/properties";
		if (request.getKeyName() != null && request.getKeyName().length() !=0) {
			uri += "/" + request.getKeyName() + "/lookups";
		}

		Response response = this.callGet(uri,request.getQueryParams(),PROPERTY_LOOKUP_RESPONSE_TYPEREF);
File
PropertyService.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
	public void testGetPropertyKey() {
		
		GetPropertyKeyRequest request = new GetPropertyKeyRequest();
<<<<<<< HEAD
		request.setKeyName_("qosVariableRateKeyHourly");
=======
		request.setKeyName("hourlyPricingOntario");
	
		// set key name 
		//to date
		//from date
>>>>>>> 2f07a5be4360e72a40cc9babf485f9cffa274dda

		Response restResponse = propertyService.getPropertyKey(request);
Solution content 
	public void testGetPropertyKey() {
		
		GetPropertyKeyRequest request = new GetPropertyKeyRequest();
		request.setKeyName("qosVariableRateKeyHourly");

		Response restResponse = propertyService.getPropertyKey(request);
File
PropertyServiceTests.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
	@Test
	}
		
		DateTime fromDateTime = new DateTime("2014-01-01T00:00:00.000-05:00");
		DateTime toDateTime = new DateTime("2014-01-02T00:00:00.000-05:00");
<<<<<<< HEAD
		request.setKeyName_("qosVariableRateKeyHourly");
		request.setFromDateTime(fromDateTime);
		request.setToDateTime(toDateTime);
		
		Response restResponse = propertyService.getPropertyLookups(request);
		
		assertNotNull("restResponse null", restResponse);
		assertEquals("bad status",restResponse.getStatus(),Response.STATUS_SUCCESS);
		assertEquals("bad type",restResponse.getType(),PropertyLookup.REST_TYPE);

	
	public void testGetPropertyLookupsWithSubkey() {
		
		GetPropertyLookupRequest request = new GetPropertyLookupRequest();
		
		DateTime fromDateTime = new DateTime("2014-01-01T00:00:00.000-05:00");
		DateTime toDateTime = new DateTime("2014-01-02T00:00:00.000-05:00");
		request.setKeyName_("qosVariableRateKeyHourlyWithSubkey_51291");
=======
		request.setKeyName("hourlyPricingOntario");
>>>>>>> 2f07a5be4360e72a40cc9babf485f9cffa274dda
		request.setFromDateTime(fromDateTime);
		request.setToDateTime(toDateTime);
Solution content 
		
		DateTime fromDateTime = new DateTime("2014-01-01T00:00:00.000-05:00");
		DateTime toDateTime = new DateTime("2014-01-02T00:00:00.000-05:00");
		request.setKeyName("qosVariableRateKeyHourly");
		request.setFromDateTime(fromDateTime);
		request.setToDateTime(toDateTime);
		
		Response restResponse = propertyService.getPropertyLookups(request);
		
		assertNotNull("restResponse null", restResponse);
		assertEquals("bad status",restResponse.getStatus(),Response.STATUS_SUCCESS);
		assertEquals("bad type",restResponse.getType(),PropertyLookup.REST_TYPE);

	}
	
	@Test
	public void testGetPropertyLookupsWithSubkey() {
		
		GetPropertyLookupRequest request = new GetPropertyLookupRequest();
		
		DateTime fromDateTime = new DateTime("2014-01-01T00:00:00.000-05:00");
		DateTime toDateTime = new DateTime("2014-01-02T00:00:00.000-05:00");
		request.setKeyName("qosVariableRateKeyHourlyWithSubkey_51291");
		request.setFromDateTime(fromDateTime);
		request.setToDateTime(toDateTime);
File
PropertyServiceTests.java
Developer's decision
Manual
Kind of conflict
Annotation
Method invocation
Method signature
Variable
Chunk
Conflicting content 
	public void testGetPropertyStats() {
		
		GetPropertyKeyRequest request = new GetPropertyKeyRequest();
<<<<<<< HEAD
		request.setKeyName_("qosVariableRateKeyHourly");
=======
		request.setKeyName("hourlyPricingOntario");
>>>>>>> 2f07a5be4360e72a40cc9babf485f9cffa274dda

		//check if request.key != null
		Response restResponse = propertyService.getPropertyStats(request);
Solution content 
	public void testGetPropertyStats() {
		
		GetPropertyKeyRequest request = new GetPropertyKeyRequest();
		request.setKeyName("qosVariableRateKeyHourly");

		//check if request.key != null
		Response restResponse = propertyService.getPropertyStats(request);
File
PropertyServiceTests.java
Developer's decision
Manual
Kind of conflict
Method invocation