Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREDIS-294 - TypedTuple should allow sorting using java sort().

Browse Source 
Updated Comparable type information to allow usage with standard java sort.
This commit is contained in:
Christoph Strobl
2014-04-23 15:10:43 +02:00
committed by Thomas Darimont
parent 6d7c5ce9cd
commit 4e4a2961da
3 changed files with 84 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/org/springframework/data/redis/core/DefaultTypedTuple.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2011-2013 the original author or authors.
* Copyright 2011-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -63,7 +63,7 @@ public class DefaultTypedTuple<V> implements TypedTuple<V> {
return false;
if (!(obj instanceof DefaultTypedTuple))
return false;
DefaultTypedTuple other = (DefaultTypedTuple) obj;
DefaultTypedTuple<?> other = (DefaultTypedTuple<?>) obj;
if (score == null) {
if (other.score != null)
return false;
@@ -83,8 +83,20 @@ public class DefaultTypedTuple<V> implements TypedTuple<V> {
}
public int compareTo(Double o) {
Double d = (score == null ? Double.valueOf(0) : score);
Double a = (o == null ? Double.valueOf(0) : o);
return d.compareTo(a);
double thisScore = (score == null ? 0.0 : score);
double otherScore = (o == null ? 0.0 : o);
return Double.compare(thisScore, otherScore);
}
@Override
public int compareTo(TypedTuple<V> o) {
if (o == null) {
return compareTo(Double.valueOf(0));
}
return compareTo(o.getScore());
}
}

5
src/main/java/org/springframework/data/redis/core/ZSetOperations.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2011-2013 the original author or authors.
* Copyright 2011-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,13 +23,14 @@ import java.util.Set;
* Redis ZSet/sorted set specific operations.
*
* @author Costin Leau
* @author Christoph Strobl
*/
public interface ZSetOperations<K, V> {
/**
* Typed ZSet tuple.
*/
public interface TypedTuple<V> extends Comparable<Double> {
public interface TypedTuple<V> extends Comparable<TypedTuple<V>> {
V getValue();
Double getScore();

64
src/test/java/org/springframework/data/redis/core/DefaultTypedTupleUnitTests.java Normal file
View File

@@ -0,0 +1,64 @@
/*
* Copyright 2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.redis.core;
import static org.hamcrest.core.IsEqual.*;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.data.redis.core.ZSetOperations.TypedTuple;
/**
* @author Christoph Strobl
*/
public class DefaultTypedTupleUnitTests {
private static final TypedTuple<String> WITH_SCORE_1 = new DefaultTypedTuple<String>("foo", 1D);
private static final TypedTuple<String> ANOTHER_ONE_WITH_SCORE_1 = new DefaultTypedTuple<String>("another", 1D);
private static final TypedTuple<String> WITH_SCORE_2 = new DefaultTypedTuple<String>("bar", 2D);
private static final TypedTuple<String> WITH_SCORE_NULL = new DefaultTypedTuple<String>("foo", null);
/**
* @see DATAREDIS-294
*/
@Test
public void compareToShouldUseScore() {
assertThat(WITH_SCORE_1.compareTo(WITH_SCORE_2), equalTo(-1));
assertThat(WITH_SCORE_2.compareTo(WITH_SCORE_1), equalTo(1));
assertThat(WITH_SCORE_1.compareTo(ANOTHER_ONE_WITH_SCORE_1), equalTo(0));
}
/**
* @see DATAREDIS-294
*/
@Test
public void compareToShouldConsiderGivenNullAsZeroScore() {
assertThat(WITH_SCORE_1.compareTo(null), equalTo(1));
assertThat(WITH_SCORE_NULL.compareTo(null), equalTo(0));
}
/**
* @see DATAREDIS-294
*/
@Test
public void compareToShouldConsiderNullScoreAsZeroScore() {
assertThat(WITH_SCORE_1.compareTo(WITH_SCORE_NULL), equalTo(1));
assertThat(WITH_SCORE_NULL.compareTo(WITH_SCORE_1), equalTo(-1));
}
}