Projects >> evrythng-java-sdk >>6a71714fc017739f100675c850ae0a445fe9fc57

Chunk
Conflicting content 
	 *
	 * @deprecated use {@link #abstractPropertyUpdater(String, String, AbstractProperty)}  instead
	 */
<<<<<<< HEAD
=======
	// TODO _MS_
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	@Deprecated
	public Builder> propertyUpdater(final String productId, final String key, final Property value)
			throws EvrythngClientException {
Solution content 
	 *
	 * @deprecated use {@link #abstractPropertyUpdater(String, String, AbstractProperty)}  instead
	 */
	@Deprecated
	public Builder> propertyUpdater(final String productId, final String key, final Property value)
			throws EvrythngClientException {
File
ProductService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	 * @see #propertiesCreator(String, List)
	 * @deprecated use {@link #abstractPropertiesCreator(String, java.util.List)} instead
	 */
<<<<<<< HEAD
=======
	// TODO _MS_
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	@Deprecated
	public Builder> propertiesCreator(final String productId, final Property property)
			throws EvrythngClientException {
Solution content 
	 * @see #propertiesCreator(String, List)
	 * @deprecated use {@link #abstractPropertiesCreator(String, java.util.List)} instead
	 */
	@Deprecated
	public Builder> propertiesCreator(final String productId, final Property property)
			throws EvrythngClientException {
File
ProductService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	 *
	 * @deprecated use {@link #abstractPropertiesCreator(String, java.util.List)} instead
	 */
<<<<<<< HEAD
=======
	// TODO _MS_
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	@Deprecated
	public Builder> propertiesCreator(final String productId, final List properties)
			throws EvrythngClientException {
Solution content 
	 *
	 * @deprecated use {@link #abstractPropertiesCreator(String, java.util.List)} instead
	 */
	@Deprecated
	public Builder> propertiesCreator(final String productId, final List properties)
			throws EvrythngClientException {
File
ProductService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	@Deprecated
	 *
	 * @deprecated use {@link #abstractPropertiesReader(String)} instead
	 */
<<<<<<< HEAD
=======
	// TODO _MS_
	public Builder> propertiesReader(final String productId) throws EvrythngClientException {
Solution content 
	 *
	 * @deprecated use {@link #abstractPropertiesReader(String)} instead
	 */
	@Deprecated
	public Builder> propertiesReader(final String productId) throws EvrythngClientException {
File
ProductService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	 *
	 * @deprecated use {@link #abstractPropertyReader(String, String)} instead
	 */
<<<<<<< HEAD
=======
	// TODO _MS_
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	@Deprecated
	public Builder> propertyReader(final String productId, final String key) throws EvrythngClientException {
Solution content 
	 *
	 * @deprecated use {@link #abstractPropertyReader(String, String)} instead
	 */
	@Deprecated
	public Builder> propertyReader(final String productId, final String key) throws EvrythngClientException {
File
ProductService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	 * @see #propertiesCreator(String, Property)
	 * @deprecated use {@link #abstractPropertyUpdater(String, String, AbstractProperty)}  instead
	 */
<<<<<<< HEAD
=======
	// TODO _MS_
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	@Deprecated
	public Builder> propertyUpdater(final String productId, final String key, final String value)
			throws EvrythngClientException {
Solution content 
	 * @see #propertiesCreator(String, Property)
	 * @deprecated use {@link #abstractPropertyUpdater(String, String, AbstractProperty)}  instead
	 */
	@Deprecated
	public Builder> propertyUpdater(final String productId, final String key, final String value)
			throws EvrythngClientException {
File
ProductService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	 * @see #propertiesCreator(String, Property)
	 * @deprecated use {@link #abstractPropertyUpdater(String, String, AbstractProperty)}  instead
	 */
<<<<<<< HEAD
=======
	// TODO _MS_
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	@Deprecated
	public Builder> propertyUpdater(final String productId, final String key, final String value,
	                                               final long timestamp) throws EvrythngClientException {
Solution content 
	 * @see #propertiesCreator(String, Property)
	 * @deprecated use {@link #abstractPropertyUpdater(String, String, AbstractProperty)}  instead
	 */
	@Deprecated
	public Builder> propertyUpdater(final String productId, final String key, final String value,
	                                               final long timestamp) throws EvrythngClientException {
File
ProductService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	 * POST {@value #PATH_THNGS}
	 *
	 * @param thng {@link Thng} instance
<<<<<<< HEAD
	 *
=======
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * @return a pre-configured {@link Builder}
	 */
	public Builder thngCreator(final Thng thng) throws EvrythngClientException {
Solution content 
	 * POST {@value #PATH_THNGS}
	 *
	 * @param thng {@link Thng} instance
	 * @return a pre-configured {@link Builder}
	 */
	public Builder thngCreator(final Thng thng) throws EvrythngClientException {
File
ThngService.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
	 * GET {@value #PATH_THNG}
	 *
	 * @param thngId thng id
<<<<<<< HEAD
	 *
=======
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * @return a pre-configured {@link Builder}
	 */
	public Builder thngReader(final String thngId) throws EvrythngClientException {
Solution content 
	 * GET {@value #PATH_THNG}
	 *
	 * @param thngId thng id
	 * @return a pre-configured {@link Builder}
	 */
	public Builder thngReader(final String thngId) throws EvrythngClientException {
File
ThngService.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
	 *
	 * @param thngId thng id
	 * @param thng   {@link Thng} instance
<<<<<<< HEAD
	 *
=======
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * @return a pre-configured {@link Builder}
	 */
	public Builder thngUpdater(final String thngId, final Thng thng) throws EvrythngClientException {
Solution content 
	 *
	 * @param thngId thng id
	 * @param thng   {@link Thng} instance
	 * @return a pre-configured {@link Builder}
	 */
	public Builder thngUpdater(final String thngId, final Thng thng) throws EvrythngClientException {
File
ThngService.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
	 * PUT {@value #PATH_THNGS}
	 *
	 * @param thng {@link Thng} instance
<<<<<<< HEAD
	 *
=======
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * @return a pre-configured {@link Builder}
	 */
	public Builder thngsUpdater(final Thng thng) throws EvrythngClientException {
Solution content 
	 * PUT {@value #PATH_THNGS}
	 *
	 * @param thng {@link Thng} instance
	 * @return a pre-configured {@link Builder}
	 */
	public Builder thngsUpdater(final Thng thng) throws EvrythngClientException {
File
ThngService.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
	 * DELETE {@value #PATH_THNG}
	 *
	 * @param thngId thng id
<<<<<<< HEAD
	 *
=======
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * @return a pre-configured {@link Builder}
	 */
	public Builder thngDeleter(final String thngId) throws EvrythngClientException {
Solution content 
	 * DELETE {@value #PATH_THNG}
	 *
	 * @param thngId thng id
	 * @return a pre-configured {@link Builder}
	 */
	public Builder thngDeleter(final String thngId) throws EvrythngClientException {
File
ThngService.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
	 * @see #propertiesCreator(String, List)
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 */
	@Deprecated
	 *
	 * @param thngId   thng id
	 * @param property {@link Property} instance
<<<<<<< HEAD
	 *
	 * @return a pre-configured {@link Builder}
	 *
	 * @deprecated use {@link #abstractPropertiesCreator(String, java.util.List)} instead
=======
	 * @return a pre-configured {@link Builder}
	public Builder> propertiesCreator(final String thngId, final Property property)
Solution content 
	 *
	 * @param thngId   thng id
	 * @param property {@link Property} instance
	 *
	 * @return a pre-configured {@link Builder}
	 *
	 * @deprecated use {@link #abstractPropertiesCreator(String, java.util.List)} instead
	 */
	@Deprecated
	public Builder> propertiesCreator(final String thngId, final Property property)
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	 *
	 * @param thngId     thng id
	 * @param properties list of {@link Property} instances
<<<<<<< HEAD
	 *
	 * @return a pre-configured {@link Builder}
	 *
	 * @deprecated use {@link #abstractPropertiesCreator(String, java.util.List)}} instead
=======
	 * @return a pre-configured {@link Builder}
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 */
	@Deprecated
	public Builder> propertiesCreator(final String thngId, final List properties)
Solution content 
	 *
	 * @param thngId     thng id
	 * @param properties list of {@link Property} instances
	 *
	 * @return a pre-configured {@link Builder}
	 *
	 * @deprecated use {@link #abstractPropertiesCreator(String, java.util.List)}} instead
	 */
	@Deprecated
	public Builder> propertiesCreator(final String thngId, final List properties)
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	}

	/**
<<<<<<< HEAD
	 * Creates multiple {@link Property} resources on the referenced {@link Thng}.
=======
	 * Creates multiple {@link Property} resources on the referenced
	 * {@link Thng}.
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * 

	 * PUT {@value #PATH_THNG_PROPERTIES}
	 *
Solution content 
	}

	/**
	 * Creates multiple {@link Property} resources on the referenced {@link Thng}.
	 * 

	 * PUT {@value #PATH_THNG_PROPERTIES}
	 *
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	 *
	 * @param thngId     thng id
	 * @param properties list of {@link Property} instances
<<<<<<< HEAD
	 *
=======
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * @return a pre-configured {@link Builder}
	 */
	public Builder>> abstractPropertiesCreator(final String thngId,
Solution content 
	 *
	 * @param thngId     thng id
	 * @param properties list of {@link Property} instances
	 *
	 * @return a pre-configured {@link Builder}
	 */
	public Builder>> abstractPropertiesCreator(final String thngId,
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	}

	/**
<<<<<<< HEAD
	 * Retrieves the last updated {@link Property} resources from the referenced {@link Thng}.
=======
	 * Retrieves the last updated {@link Property} resources from the referenced
	 * {@link Thng}.
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * 

	 * GET {@value #PATH_THNG_PROPERTIES}
	 *
Solution content 
	/**
	}
	 * Retrieves the last updated {@link Property} resources from the referenced {@link Thng}.
	 * 

	 * GET {@value #PATH_THNG_PROPERTIES}
	 *
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	 * GET {@value #PATH_THNG_PROPERTIES}
	 *
	 * @param thngId thng id
<<<<<<< HEAD
	 *
	 * @return a pre-configured {@link Builder}
	 *
=======
	 * @return a pre-configured {@link Builder}
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * @deprecated use {@link #abstractPropertiesReader(String)} instead
	 */
	@Deprecated
Solution content 
	 * GET {@value #PATH_THNG_PROPERTIES}
	 *
	 * @param thngId thng id
	 *
	 * @return a pre-configured {@link Builder}
	 *
	 * @deprecated use {@link #abstractPropertiesReader(String)} instead
	 */
	@Deprecated
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	}

	/**
<<<<<<< HEAD
	 * Retrieves the last updated {@link Property} resources from the referenced {@link Thng}.
=======
	 * Retrieves the last updated {@link Property} resources from the referenced
	 * {@link Thng}.
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * 

	 * GET {@value #PATH_THNG_PROPERTIES}
	 *
Solution content 
	}

	/**
	 * Retrieves the last updated {@link Property} resources from the referenced {@link Thng}.
	 * 

	 * GET {@value #PATH_THNG_PROPERTIES}
	 *
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	 * GET {@value #PATH_THNG_PROPERTIES}
	 *
	 * @param thngId thng id
<<<<<<< HEAD
	 *
=======
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * @return a pre-configured {@link Builder}
	 */
	public Builder>> abstractPropertiesReader(final String thngId) throws EvrythngClientException {
Solution content 
	 * GET {@value #PATH_THNG_PROPERTIES}
	 *
	 * @param thngId thng id
	 *
	 * @return a pre-configured {@link Builder}
	 */
	public Builder>> abstractPropertiesReader(final String thngId) throws EvrythngClientException {
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	 * DELETE {@value #PATH_THNG_PROPERTIES}
	 *
	 * @param thngId thng id
<<<<<<< HEAD
	 *
=======
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * @return a pre-configured {@link Builder}
	 */
	public Builder propertiesDeleter(final String thngId) throws EvrythngClientException {
Solution content 
	 * DELETE {@value #PATH_THNG_PROPERTIES}
	 *
	 * @param thngId thng id
	 *
	 * @return a pre-configured {@link Builder}
	 */
	public Builder propertiesDeleter(final String thngId) throws EvrythngClientException {
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	 *
	 * @param thngId thng id
	 * @param key    key
<<<<<<< HEAD
	 *
	 * @return a pre-configured {@link Builder}
	 *
=======
	 * @return a pre-configured {@link Builder}
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * @deprecated use {@link #abstractPropertyReader(String, String)} instead
	 */
	@Deprecated
Solution content 
	 *
	 * @param thngId thng id
	 * @param key    key
	 *
	 * @return a pre-configured {@link Builder}
	 *
	 * @deprecated use {@link #abstractPropertyReader(String, String)} instead
	 */
	@Deprecated
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	}

	/**
<<<<<<< HEAD
	 * Retrieves the last values of the {@link Property} named {@code key} from the referenced {@link Thng}.
=======
	 * Retrieves the last values of the {@link Property} named {@code key} from
	 * the referenced {@link Thng}.
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * 

	 * GET {@value #PATH_THNG_PROPERTY}
	 *
Solution content 
	}

	/**
	 * Retrieves the last values of the {@link Property} named {@code key} from the referenced {@link Thng}.
	 * 

	 * GET {@value #PATH_THNG_PROPERTY}
	 *
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	 *
	 * @param thngId thng id
	 * @param key    key
<<<<<<< HEAD
	 *
=======
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * @return a pre-configured {@link Builder}
	 */
	public Builder>> abstractPropertyReader(final String thngId, final String key)
Solution content 
	 *
	 * @param thngId thng id
	 * @param key    key
	 *
	 * @return a pre-configured {@link Builder}
	 */
	public Builder>> abstractPropertyReader(final String thngId, final String key)
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	}

	/**
<<<<<<< HEAD
	 * Updates the {@link Property} named {@code key} of the referenced {@link Thng}.
=======
	 * Updates the {@link Property} named {@code key} of the referenced
	 * {@link Thng}.
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * 

	 * PUT {@value #PATH_THNG_PROPERTY}
	 *
Solution content 
	}

	/**
	 * Updates the {@link Property} named {@code key} of the referenced {@link Thng}.
	 * 

	 * PUT {@value #PATH_THNG_PROPERTY}
	 *
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	 * @param thngId thng id
	 * @param key    key
	 * @param value  value
<<<<<<< HEAD
	 *
	 * @return a pre-configured {@link Builder}
	 *
	 * @see #propertiesCreator(String, Property)
	 * @deprecated use {@link #abstractPropertyUpdater(String, String, com.evrythng.thng.resource.model.store.AbstractProperty)}
	 * instead
	 */
	@Deprecated
	public Builder> propertyUpdater(final String thngId, final String key, final String value)
			throws EvrythngClientException {
=======
	 * @return a pre-configured {@link Builder}
	 * @see #propertiesCreator(String, Property)
	 * @deprecated use {@link #abstractPropertyUpdater(String, String, String)} instead
	 */
	@Deprecated
	public Builder> propertyUpdater(final String thngId, final String key, final String value) throws EvrythngClientException {
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673

		return propertyUpdater(thngId, key, new Property(null, value));
	}
Solution content 
	 * @param thngId thng id
	 * @param key    key
	 * @param value  value
	 *
	 * @return a pre-configured {@link Builder}
	 *
	 * @see #propertiesCreator(String, Property)
	 * @deprecated use {@link #abstractPropertyUpdater(String, String, com.evrythng.thng.resource.model.store.AbstractProperty)}
	 * instead
	 */
	@Deprecated
	public Builder> propertyUpdater(final String thngId, final String key, final String value)
			throws EvrythngClientException {

		return propertyUpdater(thngId, key, new Property(null, value));
	}
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
Method signature
Chunk
Conflicting content 
	/**
	 * Updates the {@link Property} named {@code key} of the referenced {@link Thng}.
<<<<<<< HEAD
=======
	 * 

	 * PUT {@value #PATH_THNG_PROPERTY}
	 *
	 * @param thngId thng id
	 * @param key    key
	 * @param value  value
	 *
	 * @return a pre-configured {@link Builder}
	 *
	 * @see #propertiesCreator(String, Property)
	 */
	// TODO _MS_ generify
	public Builder>> abstractPropertyUpdater(final String thngId, final String key, final String value)
			throws EvrythngClientException {

		return abstractPropertyUpdater(thngId, key, new Property(null, value));
	}

	/**
	 * Updates the {@link Property} named {@code key} of the referenced
	 * {@link Thng}.
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * 

	 * PUT {@value #PATH_THNG_PROPERTY}
	 *
Solution content 
	/**
	 * Updates the {@link Property} named {@code key} of the referenced {@link Thng}.
	 * 

	 * PUT {@value #PATH_THNG_PROPERTY}
	 *
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
	 * @param key       key
	 * @param value     value
	 * @param timestamp timestamp
<<<<<<< HEAD
	 *
	 * @return a pre-configured {@link Builder}
	 *
	 * @see #propertiesCreator(String, Property)
	 * @deprecated use {@link #abstractPropertyUpdater(String, String, com.evrythng.thng.resource.model.store.AbstractProperty)}
	 * instead
	 */
	@Deprecated
	public Builder> propertyUpdater(final String thngId, final String key, final String value,
	                                               final long timestamp) throws EvrythngClientException {
=======
	 * @return a pre-configured {@link Builder}
	 * @see #propertiesCreator(String, Property)
	 * @deprecated use {@link #abstractPropertyUpdater(String, String, String, long)} instead
	 */
	@Deprecated
	public Builder> propertyUpdater(final String thngId, final String key, final String value, final long timestamp) throws EvrythngClientException {
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673

		return propertyUpdater(thngId, key, new Property(null, value, timestamp));
	}
Solution content 
	 * @param key       key
	 * @param value     value
	 * @param timestamp timestamp
	 *
	 * @return a pre-configured {@link Builder}
	 *
	 * @see #propertiesCreator(String, Property)
	 * @deprecated use {@link #abstractPropertyUpdater(String, String, com.evrythng.thng.resource.model.store.AbstractProperty)}
	 * instead
	 */
	@Deprecated
	public Builder> propertyUpdater(final String thngId, final String key, final String value,
	                                               final long timestamp) throws EvrythngClientException {

		return propertyUpdater(thngId, key, new Property(null, value, timestamp));
	}
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
Method signature
Chunk
Conflicting content 
=======
	 * 


	/**
	 * Updates the {@link Property} named {@code key} of the referenced {@link Thng}.
<<<<<<< HEAD
	 * PUT {@value #PATH_THNG_PROPERTY}
	 *
	 * @param thngId    thng id
	 * @param key       key
	 * @param value     value
	 * @param timestamp timestamp
	 *
	 * @return a pre-configured {@link Builder}
	 *
	 * @see #propertiesCreator(String, Property)
	 */
	// TODO _MS_ generify
	public Builder>> abstractPropertyUpdater(final String thngId, final String key, final String value,
	                                                                  final long timestamp) throws EvrythngClientException {

		return abstractPropertyUpdater(thngId, key, new Property(null, value, timestamp));
	}

	/**
	 * Updates the {@link Property} named {@code key} of the referenced
	 * {@link Thng}.
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * 

	 * PUT {@value #PATH_THNG_PROPERTY}
	 *
Solution content 
	 *

	/**
	 * Updates the {@link Property} named {@code key} of the referenced {@link Thng}.
	 * 

	 * PUT {@value #PATH_THNG_PROPERTY}
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
	 * @param thngId thng id
	 * @param key    key
	 * @param value  value
<<<<<<< HEAD
	 *
	 * @return a pre-configured {@link Builder}
	 *
	 * @deprecated use {@link #abstractPropertyUpdater(String, String, AbstractProperty)} instead
	 */
	@Deprecated
	public Builder> propertyUpdater(final String thngId, final String key, final Property value)
			throws EvrythngClientException {

		return put(String.format(PATH_THNG_PROPERTY, thngId, key), Collections.singletonList(value),
		           new TypeReference>() {
=======
	 * @return a pre-configured {@link Builder}
	 * @deprecated use {@link #abstractPropertyUpdater(String, String, AbstractProperty)} instead
	 */
	@Deprecated
	public Builder> propertyUpdater(final String thngId, final String key, final Property value) throws EvrythngClientException {

		return put(String.format(PATH_THNG_PROPERTY, thngId, key), Collections.singletonList(value),
		           new TypeReference>() {

		           });
	}

	/**
	 * Updates the {@link Property} named {@code key} of the referenced {@link Thng}.
	 * 

	 * PUT {@value #PATH_THNG_PROPERTY}
	 *
	 * @param thngId thng id
	 * @param key    key
	 * @param update property update
	 *
	 * @return a pre-configured {@link Builder}
	 */
	// TODO _MS_ generify
	public Builder>> abstractPropertyUpdater(final String thngId, final String key,
	                                                                  final AbstractProperty update)
			throws EvrythngClientException {

		return put(String.format(PATH_THNG_PROPERTY, thngId, key), Collections.singletonList(update), new TypeReference>>() {
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673

		           });
	}
Solution content 
	 * @param key    key
	 * @param thngId thng id
	 * @param value  value
	 *
	 * @return a pre-configured {@link Builder}
	 *
	 * @deprecated use {@link #abstractPropertyUpdater(String, String, AbstractProperty)} instead
	 */
	@Deprecated
	public Builder> propertyUpdater(final String thngId, final String key, final Property value)
			throws EvrythngClientException {

		return put(String.format(PATH_THNG_PROPERTY, thngId, key), Collections.singletonList(value),
		           new TypeReference>() {

		           });
	}
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
Method declaration
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
	 *
	 * @param thngId thng id
	 * @param key    key
<<<<<<< HEAD
	 *
=======
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * @return a pre-configured {@link Builder}
	 */
	public Builder propertyDeleter(final String thngId, final String key) throws EvrythngClientException {
Solution content 
	 *
	 * @param thngId thng id
	 * @param key    key
	 *
	 * @return a pre-configured {@link Builder}
	 */
	public Builder propertyDeleter(final String thngId, final String key) throws EvrythngClientException {
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	 * GET {@value #PATH_THNG_LOCATION}
	 *
	 * @param thngId thng id
<<<<<<< HEAD
	 *
=======
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * @return a pre-configured {@link Builder}
	 */
	public Builder> locationReader(final String thngId) throws EvrythngClientException {
Solution content 
	 * GET {@value #PATH_THNG_LOCATION}
	 *
	 * @param thngId thng id
	 *
	 * @return a pre-configured {@link Builder}
	 */
	public Builder> locationReader(final String thngId) throws EvrythngClientException {
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	 *
	 * @param thngId   thng id
	 * @param location {@link Location} instance
<<<<<<< HEAD
	 *
	 * @return a pre-configured {@link Builder}
	 *
=======
	 * @return a pre-configured {@link Builder}
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * @see #locationUpdater(String, List)
	 */
	public Builder> locationUpdater(final String thngId, final Location location) throws EvrythngClientException {
Solution content 
	 *
	 * @param thngId   thng id
	 * @param location {@link Location} instance
	 * @return a preconfigured {@link Builder}
	 * @see #locationUpdater(String, List)
	 */
	public Builder> locationUpdater(final String thngId, final Location location) throws EvrythngClientException {
File
ThngService.java
Developer's decision
Manual
Kind of conflict
Comment
Chunk
Conflicting content 
	 *
	 * @param thngId    thng id
	 * @param locations list of {@link Location}
<<<<<<< HEAD
	 *
=======
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * @return a pre-configured {@link Builder}
	 */
	public Builder> locationUpdater(final String thngId, final List locations)
Solution content 
	 *
	 * @param thngId    thng id
	 * @param locations list of {@link Location}
	 *
	 * @return a pre-configured {@link Builder}
	 */
	public Builder> locationUpdater(final String thngId, final List locations)
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	 * DELETE {@value #PATH_THNG_LOCATION}
	 *
	 * @param thngId thng id
<<<<<<< HEAD
	 *
=======
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * @return a pre-configured {@link Builder}
	 */
	public Builder locationDeleter(final String thngId) throws EvrythngClientException {
Solution content 
	 * DELETE {@value #PATH_THNG_LOCATION}
	 *
	 * @param thngId thng id
	 *
	 * @return a pre-configured {@link Builder}
	 */
	public Builder locationDeleter(final String thngId) throws EvrythngClientException {
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	 *
	 * @param thngId      thng id
	 * @param redirection {@link Redirector} instance
<<<<<<< HEAD
	 *
=======
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * @return a pre-configured {@link Builder}
	 */
	public Builder redirectorCreator(final String thngId, final Redirector redirection)
Solution content 
	 *
	 * @param thngId      thng id
	 * @param redirection {@link Redirector} instance
	 *
	 * @return a pre-configured {@link Builder}
	 */
	public Builder redirectorCreator(final String thngId, final Redirector redirection)
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	 * Retrieves the redirector for the Thng.
	 *
	 * @param thngId thng id
<<<<<<< HEAD
	 *
=======
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * @return a pre-configured {@link Builder}
	 */
	public Builder redirectorReader(final String thngId) throws EvrythngClientException {
Solution content 
	 * Retrieves the redirector for the Thng.
	 *
	 * @param thngId thng id
	 *
	 * @return a pre-configured {@link Builder}
	 */
	public Builder redirectorReader(final String thngId) throws EvrythngClientException {
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	 * Deletes the redirector for the Thng.
	 *
	 * @param thngId thng id
<<<<<<< HEAD
	 *
=======
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * @return a pre-configured {@link Builder}
	 */
	public Builder redirectorDeleter(final String thngId) throws EvrythngClientException {
Solution content 
	 * Deletes the redirector for the Thng.
	 *
	 * @param thngId thng id
	 *
	 * @return a pre-configured {@link Builder}
	 */
	public Builder redirectorDeleter(final String thngId) throws EvrythngClientException {
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	 *
	 * @param thngId      thng id
	 * @param redirection {@link Redirector} instance
<<<<<<< HEAD
	 *
=======
>>>>>>> 9d289705fa3e30ba57b2f2e4d63df6d20545d673
	 * @return a pre-configured {@link Builder}
	 */
	public Builder redirectorUpdater(final String thngId, final Redirector redirection)
Solution content 
	 *
	 * @param thngId      thng id
	 * @param redirection {@link Redirector} instance
	 *
	 * @return a pre-configured {@link Builder}
	 */
	public Builder redirectorUpdater(final String thngId, final Redirector redirection)
File
ThngService.java
Developer's decision
Version 1
Kind of conflict
Comment