Projects >> spring-data-redis >>c61144b42596f3d5d355ebf28418ca9e04157724

Chunk
Conflicting content 
		return delegate.setNX(key, value);
	}

<<<<<<< HEAD
	public void setRange(byte[] key, byte[] value, long start) {
		delegate.setRange(key, value, start);
=======
	public void setRange(byte[] key, long start, byte[] value) {
		delegate.setRange(key, start, value);
>>>>>>> a1a562c7863153ae29d634d34d6600af6b034ab2
	}

	public void shutdown() {
Solution content 
		return delegate.setNX(key, value);
	}

	public void setRange(byte[] key, byte[] value, long start) {
		delegate.setRange(key, value, start);
	}

	public void shutdown() {
File
DefaultStringRedisConnection.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Chunk
Conflicting content 
	}

	@Override
<<<<<<< HEAD
	public void setRange(String key, long start, String value) {
		delegate.setRange(serialize(key), serialize(value), start);
=======
	public void setRange(String key, long offset, String value) {
		delegate.setRange(serialize(key), offset, serialize(value));
>>>>>>> a1a562c7863153ae29d634d34d6600af6b034ab2
	}

	@Override
Solution content 
	}

	@Override
	public void setRange(String key, long start, String value) {
		delegate.setRange(serialize(key), serialize(value), start);
	}

	@Override
File
DefaultStringRedisConnection.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Chunk
Conflicting content 
	byte[] getRange(byte[] key, long begin, long end);

<<<<<<< HEAD
	void setRange(byte[] key, byte[] value, long offset);
=======
	void setRange(byte[] key, long offset, byte[] value);
>>>>>>> a1a562c7863153ae29d634d34d6600af6b034ab2

	Boolean getBit(byte[] key, long offset);
Solution content 
	byte[] getRange(byte[] key, long begin, long end);

	void setRange(byte[] key, byte[] value, long offset);

	Boolean getBit(byte[] key, long offset);
File
RedisStringCommands.java
Developer's decision
Version 1
Kind of conflict
Method interface
Chunk
Conflicting content 
	}

	@Override
<<<<<<< HEAD
	public void setRange(byte[] key, byte[] value, long start) {
=======
	public void setRange(byte[] key, long start, byte[] value) {
>>>>>>> a1a562c7863153ae29d634d34d6600af6b034ab2
		throw new UnsupportedOperationException();
	}
Solution content 
	}

	@Override
	public void setRange(byte[] key, byte[] value, long start) {
		throw new UnsupportedOperationException();
	}
File
JedisConnection.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
	}

	@Override
<<<<<<< HEAD
	public void setRange(byte[] key, byte[] value, long start) {
=======
	public void setRange(byte[] key, long start, byte[] value) {
>>>>>>> a1a562c7863153ae29d634d34d6600af6b034ab2
		throw new UnsupportedOperationException();
	}
Solution content 
	}

	@Override
	public void setRange(byte[] key, byte[] value, long start) {
		throw new UnsupportedOperationException();
	}
File
JredisConnection.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
	Integer append(String value);

<<<<<<< HEAD
=======
	String get(long start, long end);

	void set(long offset, V value);

>>>>>>> a1a562c7863153ae29d634d34d6600af6b034ab2
	Long size();
}
Solution content 
	Integer append(String value);

	Long size();
}
File
BoundValueOperations.java
Developer's decision
Version 1
Kind of conflict
Method interface
Chunk
Conflicting content 
	}

	@Override
<<<<<<< HEAD
	public void set(V value, long offset) {
		ops.set(getKey(), value, offset);
=======
	public void set(long offset, V value) {
		ops.set(getKey(), offset, null);
>>>>>>> a1a562c7863153ae29d634d34d6600af6b034ab2
	}

	@Override
Solution content 
	}

	@Override
	public void set(V value, long offset) {
		ops.set(getKey(), value, offset);
	}

	@Override
File
DefaultBoundValueOperations.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Chunk
Conflicting content 

	@Override
<<<<<<< HEAD
	public void set(K key, final V value, final long offset) {
=======
	public void set(K key, final long offset, V value) {
>>>>>>> a1a562c7863153ae29d634d34d6600af6b034ab2
		final byte[] rawKey = rawKey(key);
		final byte[] rawValue = rawValue(value);
Solution content 

	@Override
	public void set(K key, final V value, final long offset) {
		final byte[] rawKey = rawKey(key);
		final byte[] rawValue = rawValue(value);
File
DefaultValueOperations.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
		execute(new RedisCallback() {
			@Override
			public Object doInRedis(RedisConnection connection) {
<<<<<<< HEAD
				connection.setRange(rawKey, rawValue, offset);
=======
				connection.setRange(rawKey, offset, rawValue);
>>>>>>> a1a562c7863153ae29d634d34d6600af6b034ab2
				return null;
			}
		}, true);
Solution content 
		execute(new RedisCallback() {
			@Override
			public Object doInRedis(RedisConnection connection) {
				connection.setRange(rawKey, rawValue, offset);
				return null;
			}
		}, true);
File
DefaultValueOperations.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
	String get(K key, long start, long end);

<<<<<<< HEAD
	void set(K key, V value, long offset);
=======
	void set(K key, long offset, V value);
>>>>>>> a1a562c7863153ae29d634d34d6600af6b034ab2

	Long size(K key);
Solution content 
	String get(K key, long start, long end);

	void set(K key, V value, long offset);

	Long size(K key);
File
ValueOperations.java
Developer's decision
Version 1
Kind of conflict
Method interface