Projects >> twilio-java >>2c8b2d247990652c3806f41c03dc765a7cf73ba9

Chunk
Conflicting content
package com.twilio.sdk.resource.instance.taskrouter;

<<<<<<< HEAD
import java.util.Calendar;
=======
>>>>>>> 48212026fb07f0a8c97798583a3fd9cf49bf1262
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
Solution content
package com.twilio.sdk.resource.instance.taskrouter;

import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
File
Worker.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content
import java.util.HashMap;
import java.util.Map;

<<<<<<< HEAD
import org.apache.commons.lang3.StringUtils;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;

import com.twilio.sdk.TwilioRestException;
import com.twilio.sdk.TwilioTaskRouterClient;
import com.twilio.sdk.resource.NextGenInstanceResource;
=======
import com.twilio.sdk.TwilioTaskRouterClient;
import com.twilio.sdk.resource.NextGenInstanceResource;
import com.twilio.sdk.resource.list.taskrouter.WorkerReservationList;
>>>>>>> 48212026fb07f0a8c97798583a3fd9cf49bf1262

/**
 * Workers represent an entity that is able to perform tasks, such as an agent working in a call center,
Solution content
import java.util.HashMap;
import java.util.Map;

import org.apache.commons.lang3.StringUtils;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;

import com.twilio.sdk.TwilioRestException;
import com.twilio.sdk.TwilioTaskRouterClient;
import com.twilio.sdk.resource.NextGenInstanceResource;
import com.twilio.sdk.TwilioTaskRouterClient;
import com.twilio.sdk.resource.NextGenInstanceResource;
import com.twilio.sdk.resource.list.taskrouter.WorkerReservationList;

/**
 * Workers represent an entity that is able to perform tasks, such as an agent working in a call center,
File
Worker.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content
	}
	
	/**
<<<<<<< HEAD
	 * Get worker statistics.
	 * @return worker statistics
	 */
	public WorkerStatistics getStatistics() {
		return getWorkerStatistics(new HashMap());
	}
	
	/**
	 * Get worker statistics.
	 *
	 * @param queryBuilder query builder which contains all parameters for the stats query request
	 * @return worker statistics
	 */
	public WorkerStatistics getWorkerStatistics(final StatisticsQueryBuilder queryBuilder) {
		Map filters = new HashMap();
		Calendar startDate = queryBuilder.getStartDate();
		Calendar endDate = queryBuilder.getEndDate();
		Integer minutes = queryBuilder.getMinutes();
		if(startDate != null) {
			filters.put("StartDate", formatCalendar(startDate));
		}
		if(endDate != null) {
			filters.put("EndDate", formatCalendar(endDate));
		}
		if(minutes != null) {
			filters.put("Minutes", minutes.toString());
		}
		return getWorkerStatistics(filters);
	}

	/**
	 * Get worker statistics.
	 *
	 * @param filters the filters
	 * @return worker statistics
	 */
	public WorkerStatistics getWorkerStatistics(final Map filters) {
		final String startDate = filters.get("StartDate");
		final String endDate = filters.get("EndDate");
		final String minutes = filters.get("Minutes");
		if((startDate != null || endDate != null) && minutes != null) {
			throw new IllegalArgumentException("Cannot provide Minutes in combination with StartDate or EndDate");
		}
		WorkerStatistics statistics = new WorkerStatistics(this.getClient(), this.getWorkspaceSid(), this.getSid(), filters);
		return statistics;
=======
	 * Retrieves the {@link com.twilio.sdk.resource.list.taskrouter.WorkerReservationList} for this {@link
	 * com.twilio.sdk.resource.instance.taskrouter.Workspace}.
	 *
	 * @return the {@link com.twilio.sdk.resource.list.taskrouter.WorkerReservationList}
	 */
	public WorkerReservationList getReservations() {
		return getReservations(null);
	}
	
	/**
	 * Retrieves the {@link com.twilio.sdk.resource.list.taskrouter.WorkerReservationList} for this {@link
	 * com.twilio.sdk.resource.instance.taskrouter.Workspace}.
	 *
	 * @param filters for reservations
	 * @return the {@link com.twilio.sdk.resource.list.taskrouter.WorkerReservationList}
	 */
	public WorkerReservationList getReservations(final Map filters) {
		return new WorkerReservationList(getClient(), getWorkspaceSid(), getSid(), filters);
>>>>>>> 48212026fb07f0a8c97798583a3fd9cf49bf1262
	}

	@Override
Solution content
  /**
   * A human-readable name for this Worker.
   *
   * @return the friendly name
   */
  public String getFriendlyName() {
    return getProperty("friendly_name");
  }
File
Worker.java
Developer's decision
Manual
Kind of conflict
Comment
If statement
Method declaration
Method invocation
Method signature
Return statement
Variable