Projects >> Synapse-Repository-Services >>3df1b29b600f072ec5e5b209de87455800c69257

Chunk
Conflicting content 
	public static final String PATH_DATASET_ANNOTATIONS = "dataset/{"+KEY_DATASET_ID+"}/annotations";

	public static final String KEY_LAYER_ID = "idLayerKey";
<<<<<<< HEAD
	public static final String PATH_LAYER = "repo/v1/dataset/{"+KEY_DATASET_ID+"}/layer/{"+ KEY_LAYER_ID +"}";
	public static final String PATH_LAYER_PREVIEW = "repo/v1/dataset/{"+KEY_DATASET_ID+"}/layer/{"+ KEY_LAYER_ID +"}/preview";
	public static final String PATH_LAYER_PREVIEW_AS_MAP = "repo/v1/dataset/{"+KEY_DATASET_ID+"}/layer/{"+ KEY_LAYER_ID +"}/previewAsMap";
	public static final String PATH_LAYER_DOWNLOAD_S3 = "repo/v1/dataset/{"+KEY_DATASET_ID+"}/layer/{"+ KEY_LAYER_ID +"}/awsS3Location";
=======
	public static final String PATH_LAYER = "dataset/{"+KEY_DATASET_ID+"}/layer/{"+ KEY_LAYER_ID +"}";
	public static final String PATH_LAYER_PREVIEW = "dataset/{"+KEY_DATASET_ID+"}/layer/{"+ KEY_LAYER_ID +"}/preview";
	public static final String PATH_LAYER_PREVIEW_AS_MAP = "dataset/{"+KEY_DATASET_ID+"}/layer/{"+ KEY_LAYER_ID +"}/previewAsMap";
>>>>>>> df3abfa91ad1ffcf197d037b59b1e4bf312ed855

	
	private RestTemplateProvider templateProvider = null;
Solution content 
	public static final String PATH_DATASET_ANNOTATIONS = "dataset/{"+KEY_DATASET_ID+"}/annotations";

	public static final String KEY_LAYER_ID = "idLayerKey";
	public static final String PATH_LAYER = "dataset/{"+KEY_DATASET_ID+"}/layer/{"+ KEY_LAYER_ID +"}";
	public static final String PATH_LAYER_PREVIEW = "dataset/{"+KEY_DATASET_ID+"}/layer/{"+ KEY_LAYER_ID +"}/preview";
	public static final String PATH_LAYER_PREVIEW_AS_MAP = "dataset/{"+KEY_DATASET_ID+"}/layer/{"+ KEY_LAYER_ID +"}/previewAsMap";
	public static final String PATH_LAYER_DOWNLOAD_S3 = "repo/v1/dataset/{"+KEY_DATASET_ID+"}/layer/{"+ KEY_LAYER_ID +"}/awsS3Location";

	
	private RestTemplateProvider templateProvider = null;
File
DatasetServiceImpl.java
Developer's decision
Combination
Kind of conflict
Attribute