diff --git a/README.adoc b/README.adoc index 68f2e24..7962c56 100644 --- a/README.adoc +++ b/README.adoc @@ -47,7 +47,7 @@ class AppConfig { … } NOTE: it is possible to change the used `java.util.Map` implementation via `@EnableMapRepositories(mapType=….class)`. -Create the domain type and use `@KeySpace` to explicitly group values into one region. By default the types class name is used. +Create the domain type and use `@KeySpace` to explicitly group values into one region. By default, the type class name is used. [source, java] ---- diff --git a/src/main/java/org/springframework/data/keyvalue/core/CriteriaAccessor.java b/src/main/java/org/springframework/data/keyvalue/core/CriteriaAccessor.java index dd61ca8..810cba3 100644 --- a/src/main/java/org/springframework/data/keyvalue/core/CriteriaAccessor.java +++ b/src/main/java/org/springframework/data/keyvalue/core/CriteriaAccessor.java @@ -31,8 +31,8 @@ public interface CriteriaAccessor { * * @param query can be {@literal null}. * @return the criteria extracted from the query. - * @throws IllegalArgumentException in case the criteria is not valid for usage with specific {@link CriteriaAccessor} - * . + * @throws IllegalArgumentException in case the criteria is not valid for usage with specific + * {@link CriteriaAccessor}. */ T resolve(KeyValueQuery query); } diff --git a/src/main/java/org/springframework/data/keyvalue/core/GeneratingIdAccessor.java b/src/main/java/org/springframework/data/keyvalue/core/GeneratingIdAccessor.java index 971346b..704014c 100644 --- a/src/main/java/org/springframework/data/keyvalue/core/GeneratingIdAccessor.java +++ b/src/main/java/org/springframework/data/keyvalue/core/GeneratingIdAccessor.java @@ -42,7 +42,7 @@ class GeneratingIdAccessor implements IdentifierAccessor { * @param identifierProperty must not be {@literal null}. * @param generator must not be {@literal null}. */ - public GeneratingIdAccessor(PersistentPropertyAccessor accessor, PersistentProperty identifierProperty, + GeneratingIdAccessor(PersistentPropertyAccessor accessor, PersistentProperty identifierProperty, IdentifierGenerator generator) { Assert.notNull(accessor, "PersistentPropertyAccessor must not be null!"); @@ -69,7 +69,7 @@ class GeneratingIdAccessor implements IdentifierAccessor { * * @return */ - public Object getOrGenerateIdentifier() { + Object getOrGenerateIdentifier() { Object existingIdentifier = getIdentifier(); diff --git a/src/main/java/org/springframework/data/keyvalue/core/KeyValueTemplate.java b/src/main/java/org/springframework/data/keyvalue/core/KeyValueTemplate.java index cae03bf..cef7703 100644 --- a/src/main/java/org/springframework/data/keyvalue/core/KeyValueTemplate.java +++ b/src/main/java/org/springframework/data/keyvalue/core/KeyValueTemplate.java @@ -140,10 +140,6 @@ public class KeyValueTemplate implements KeyValueOperations, ApplicationEventPub return objectToInsert; } - private KeyValuePersistentEntity getKeyValuePersistentEntity(Object objectToInsert) { - return this.mappingContext.getRequiredPersistentEntity(ClassUtils.getUserClass(objectToInsert)); - } - /* * (non-Javadoc) * @see org.springframework.data.keyvalue.core.KeyValueOperations#insert(java.lang.Object, java.lang.Object) @@ -230,7 +226,7 @@ public class KeyValueTemplate implements KeyValueOperations, ApplicationEventPub ArrayList filtered = new ArrayList<>(); for (Object candidate : values) { if (typeCheck(type, candidate)) { - filtered.add((T) candidate); + filtered.add(type.cast(candidate)); } } @@ -436,6 +432,12 @@ public class KeyValueTemplate implements KeyValueOperations, ApplicationEventPub this.adapter.clear(); } + @SuppressWarnings("unchecked") + private KeyValuePersistentEntity getKeyValuePersistentEntity(Object objectToInsert) { + return this.mappingContext.getRequiredPersistentEntity(ClassUtils.getUserClass(objectToInsert)); + } + + @SuppressWarnings("unchecked") private String resolveKeySpace(Class type) { return this.mappingContext.getRequiredPersistentEntity(type).getKeySpace(); } diff --git a/src/main/java/org/springframework/data/keyvalue/core/QueryEngine.java b/src/main/java/org/springframework/data/keyvalue/core/QueryEngine.java index 85c9b64..0477608 100644 --- a/src/main/java/org/springframework/data/keyvalue/core/QueryEngine.java +++ b/src/main/java/org/springframework/data/keyvalue/core/QueryEngine.java @@ -21,7 +21,7 @@ import org.springframework.data.keyvalue.core.query.KeyValueQuery; /** * Base implementation for accessing and executing {@link KeyValueQuery} against a {@link KeyValueAdapter}. - * + * * @author Christoph Strobl * @param * @param @@ -42,7 +42,7 @@ public abstract class QueryEngine Collection execute(CRITERIA criteria, SORT sort, long offset, int rows, String keyspace, Class type) { return (Collection) execute(criteria, sort, offset, rows, keyspace); @@ -117,7 +118,7 @@ public abstract class QueryEngine> { /** * @param parser must not be {@literal null}. */ - public SpelSortAccessor(SpelExpressionParser parser) { + SpelSortAccessor(SpelExpressionParser parser) { Assert.notNull(parser, "SpelExpressionParser must not be null!"); this.parser = parser; @@ -66,7 +66,7 @@ class SpelSortAccessor implements SortAccessor> { spelSort.desc(); - if (order.getNullHandling() != null && !NullHandling.NATIVE.equals(order.getNullHandling())) { + if (!NullHandling.NATIVE.equals(order.getNullHandling())) { spelSort = NullHandling.NULLS_FIRST.equals(order.getNullHandling()) ? spelSort.nullsFirst() : spelSort.nullsLast(); } diff --git a/src/main/java/org/springframework/data/keyvalue/core/event/KeyValueEvent.java b/src/main/java/org/springframework/data/keyvalue/core/event/KeyValueEvent.java index b044174..4377214 100644 --- a/src/main/java/org/springframework/data/keyvalue/core/event/KeyValueEvent.java +++ b/src/main/java/org/springframework/data/keyvalue/core/event/KeyValueEvent.java @@ -186,7 +186,7 @@ public class KeyValueEvent extends ApplicationEvent { private Object key; private Class type; - protected KeyBasedEvent(Object key, String keyspace, Class type) { + KeyBasedEvent(Object key, String keyspace, Class type) { super(type, keyspace); this.key = key; @@ -225,7 +225,7 @@ public class KeyValueEvent extends ApplicationEvent { private final T payload; - public KeyBasedEventWithPayload(Object key, String keyspace, Class type, T payload) { + KeyBasedEventWithPayload(Object key, String keyspace, Class type, T payload) { super(key, keyspace, type); this.payload = payload; } diff --git a/src/main/java/org/springframework/data/keyvalue/core/mapping/KeyValuePersistentProperty.java b/src/main/java/org/springframework/data/keyvalue/core/mapping/KeyValuePersistentProperty.java index cb34863..5e82920 100644 --- a/src/main/java/org/springframework/data/keyvalue/core/mapping/KeyValuePersistentProperty.java +++ b/src/main/java/org/springframework/data/keyvalue/core/mapping/KeyValuePersistentProperty.java @@ -26,6 +26,7 @@ import org.springframework.data.mapping.model.SimpleTypeHolder; * Most trivial implementation of {@link PersistentProperty}. * * @author Christoph Strobl + * @author Mark Paluch */ public class KeyValuePersistentProperty

> extends AnnotationBasedPersistentProperty

{ @@ -40,6 +41,7 @@ public class KeyValuePersistentProperty

> * @see org.springframework.data.mapping.model.AbstractPersistentProperty#createAssociation() */ @Override + @SuppressWarnings("unchecked") protected Association

createAssociation() { return new Association<>((P) this, null); } diff --git a/src/main/java/org/springframework/data/keyvalue/core/mapping/context/KeyValueMappingContext.java b/src/main/java/org/springframework/data/keyvalue/core/mapping/context/KeyValueMappingContext.java index bb9cdfe..1eda7f3 100644 --- a/src/main/java/org/springframework/data/keyvalue/core/mapping/context/KeyValueMappingContext.java +++ b/src/main/java/org/springframework/data/keyvalue/core/mapping/context/KeyValueMappingContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2015 the original author or authors. + * Copyright 2014-2017 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. @@ -28,9 +28,10 @@ import org.springframework.data.util.TypeInformation; /** * Default implementation of a {@link MappingContext} using {@link KeyValuePersistentEntity} and * {@link KeyValuePersistentProperty} as primary abstractions. - * + * * @author Christoph Strobl * @author Oliver Gierke + * @author Mark Paluch */ public class KeyValueMappingContext, P extends KeyValuePersistentProperty

> extends AbstractMappingContext { @@ -39,7 +40,7 @@ public class KeyValueMappingContext, P /** * Configures the {@link KeySpaceResolver} to be used if not explicit key space is annotated to the domain type. - * + * * @param fallbackKeySpaceResolver can be {@literal null}. */ public void setFallbackKeySpaceResolver(KeySpaceResolver fallbackKeySpaceResolver) { @@ -47,11 +48,13 @@ public class KeyValueMappingContext, P } @Override + @SuppressWarnings("unchecked") protected E createPersistentEntity(TypeInformation typeInformation) { return (E) new BasicKeyValuePersistentEntity(typeInformation, fallbackKeySpaceResolver); } @Override + @SuppressWarnings("unchecked") protected P createPersistentProperty(Property property, E owner, SimpleTypeHolder simpleTypeHolder) { return (P) new KeyValuePersistentProperty(property, owner, simpleTypeHolder); } diff --git a/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueQuerydslUtils.java b/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueQuerydslUtils.java index c6e00a0..2e574e1 100644 --- a/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueQuerydslUtils.java +++ b/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueQuerydslUtils.java @@ -51,7 +51,7 @@ abstract class KeyValueQuerydslUtils { * @param builder must not be {@literal null}. * @return empty {@code OrderSpecifier[]} when sort is {@literal null}. */ - public static OrderSpecifier[] toOrderSpecifier(Sort sort, PathBuilder builder) { + static OrderSpecifier[] toOrderSpecifier(Sort sort, PathBuilder builder) { Assert.notNull(builder, "Builder must not be 'null'."); diff --git a/src/main/java/org/springframework/data/keyvalue/repository/support/SimpleKeyValueRepository.java b/src/main/java/org/springframework/data/keyvalue/repository/support/SimpleKeyValueRepository.java index 7e8550b..5fc929b 100644 --- a/src/main/java/org/springframework/data/keyvalue/repository/support/SimpleKeyValueRepository.java +++ b/src/main/java/org/springframework/data/keyvalue/repository/support/SimpleKeyValueRepository.java @@ -74,7 +74,9 @@ public class SimpleKeyValueRepository implements KeyValueRepository findAll(Pageable pageable) { - if (pageable == null) { + Assert.notNull(pageable, "Pageable must not be null!"); + + if (pageable.isUnpaged()) { List result = findAll(); return new PageImpl<>(result, Pageable.unpaged(), result.size()); } @@ -110,9 +112,7 @@ public class SimpleKeyValueRepository implements KeyValueRepository Iterable saveAll(Iterable entities) { - for (S entity : entities) { - save(entity); - } + entities.forEach(this::save); return entities; } @@ -153,9 +153,7 @@ public class SimpleKeyValueRepository implements KeyValueRepository result = new ArrayList<>(); - for (ID id : ids) { - findById(id).ifPresent(result::add); - } + ids.forEach(id -> findById(id).ifPresent(result::add)); return result; } @@ -193,10 +191,7 @@ public class SimpleKeyValueRepository implements KeyValueRepository entities) { - - for (T entity : entities) { - delete(entity); - } + entities.forEach(this::delete); } /* diff --git a/src/test/java/org/springframework/data/keyvalue/Person.java b/src/test/java/org/springframework/data/keyvalue/Person.java index 870e6af..e352686 100644 --- a/src/test/java/org/springframework/data/keyvalue/Person.java +++ b/src/test/java/org/springframework/data/keyvalue/Person.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2015 the original author or authors. + * Copyright 2014-2017 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. @@ -15,15 +15,18 @@ */ package org.springframework.data.keyvalue; +import lombok.Data; + import org.springframework.data.annotation.Id; -import org.springframework.util.ObjectUtils; import com.querydsl.core.annotations.QueryEntity; /** * @author Christoph Strobl + * @author Mark Paluch */ @QueryEntity +@Data public class Person { private @Id String id; @@ -35,68 +38,4 @@ public class Person { this.firstname = firstname; this.age = age; } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getAge() { - return age; - } - - public void setAge(int age) { - this.age = age; - } - - public String getFirstname() { - return firstname; - } - - public void setFirstname(String firstname) { - this.firstname = firstname; - } - - @Override - public String toString() { - return "Person [id=" + id + ", firstname=" + firstname + ", age=" + age + "]"; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + age; - result = prime * result + ObjectUtils.nullSafeHashCode(this.firstname); - result = prime * result + ObjectUtils.nullSafeHashCode(this.id); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (!(obj instanceof Person)) { - return false; - } - Person other = (Person) obj; - if (!ObjectUtils.nullSafeEquals(this.id, other.id)) { - return false; - } - if (!ObjectUtils.nullSafeEquals(this.firstname, other.firstname)) { - return false; - } - if (!ObjectUtils.nullSafeEquals(this.age, other.age)) { - return false; - } - return true; - } - } diff --git a/src/test/java/org/springframework/data/keyvalue/TypeWithCustomComposedKeySpaceAnnotationUsingAliasFor.java b/src/test/java/org/springframework/data/keyvalue/TypeWithCustomComposedKeySpaceAnnotationUsingAliasFor.java index 33ad6d6..a5c0a23 100644 --- a/src/test/java/org/springframework/data/keyvalue/TypeWithCustomComposedKeySpaceAnnotationUsingAliasFor.java +++ b/src/test/java/org/springframework/data/keyvalue/TypeWithCustomComposedKeySpaceAnnotationUsingAliasFor.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 the original author or authors. + * Copyright 2016-2017 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. @@ -15,16 +15,19 @@ */ package org.springframework.data.keyvalue; +import lombok.Data; + import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Persistent; -import org.springframework.util.ObjectUtils; /** * A {@link Persistent} type with {@link CustomKeySpaceAnnotationWithAliasFor}. - * + * * @author Christoph Strobl + * @author Mark Paluch */ @CustomKeySpaceAnnotationWithAliasFor(name = "aliased") +@Data public class TypeWithCustomComposedKeySpaceAnnotationUsingAliasFor { @Id String id; @@ -33,51 +36,4 @@ public class TypeWithCustomComposedKeySpaceAnnotationUsingAliasFor { public TypeWithCustomComposedKeySpaceAnnotationUsingAliasFor(String name) { this.name = name; } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ObjectUtils.nullSafeHashCode(this.id); - result = prime * result + ObjectUtils.nullSafeHashCode(this.name); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (!(obj instanceof TypeWithCustomComposedKeySpaceAnnotationUsingAliasFor)) { - return false; - } - TypeWithCustomComposedKeySpaceAnnotationUsingAliasFor other = (TypeWithCustomComposedKeySpaceAnnotationUsingAliasFor) obj; - if (!ObjectUtils.nullSafeEquals(this.id, other.id)) { - return false; - } - if (!ObjectUtils.nullSafeEquals(this.name, other.name)) { - return false; - } - return true; - } - } diff --git a/src/test/java/org/springframework/data/keyvalue/core/ForwardingCloseableIteratorUnitTests.java b/src/test/java/org/springframework/data/keyvalue/core/ForwardingCloseableIteratorUnitTests.java index 0d389c4..03024b5 100644 --- a/src/test/java/org/springframework/data/keyvalue/core/ForwardingCloseableIteratorUnitTests.java +++ b/src/test/java/org/springframework/data/keyvalue/core/ForwardingCloseableIteratorUnitTests.java @@ -42,7 +42,7 @@ public class ForwardingCloseableIteratorUnitTests { @Mock Runnable closeActionMock; @Test // DATAKV-99 - public void hasNextShoudDelegateToWrappedIterator() { + public void hasNextShouldDelegateToWrappedIterator() { when(iteratorMock.hasNext()).thenReturn(true); @@ -58,7 +58,7 @@ public class ForwardingCloseableIteratorUnitTests { @Test // DATAKV-99 @SuppressWarnings("unchecked") - public void nextShoudDelegateToWrappedIterator() { + public void nextShouldDelegateToWrappedIterator() { when(iteratorMock.next()).thenReturn((Entry) mock(Map.Entry.class)); @@ -73,7 +73,7 @@ public class ForwardingCloseableIteratorUnitTests { } @Test(expected = NoSuchElementException.class) // DATAKV-99 - public void nextShoudThrowErrorWhenWrappedIteratorHasNoMoreElements() { + public void nextShouldThrowErrorWhenWrappedIteratorHasNoMoreElements() { when(iteratorMock.next()).thenThrow(new NoSuchElementException()); diff --git a/src/test/java/org/springframework/data/keyvalue/core/KeyValueTemplateUnitTests.java b/src/test/java/org/springframework/data/keyvalue/core/KeyValueTemplateUnitTests.java index 7ef3daa..f34a1f7 100644 --- a/src/test/java/org/springframework/data/keyvalue/core/KeyValueTemplateUnitTests.java +++ b/src/test/java/org/springframework/data/keyvalue/core/KeyValueTemplateUnitTests.java @@ -18,6 +18,7 @@ package org.springframework.data.keyvalue.core; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; import static org.mockito.Mockito.*; +import static org.mockito.Mockito.any; import lombok.AllArgsConstructor; import lombok.Data; @@ -414,7 +415,7 @@ public class KeyValueTemplateUnitTests { assertThat(captor.getValue().getKey(), is("1")); assertThat(captor.getValue().getKeyspace(), is(Foo.class.getName())); - assertThat(captor.getValue().getPayload(), is((Object) FOO_ONE)); + assertThat(captor.getValue().getPayload(), is(FOO_ONE)); } @Test // DATAKV-91, DATAKV-104, DATAKV-187 @@ -432,7 +433,7 @@ public class KeyValueTemplateUnitTests { assertThat(captor.getValue().getKey(), is("1")); assertThat(captor.getValue().getKeyspace(), is(Foo.class.getName())); - assertThat(captor.getValue().getPayload(), is((Object) FOO_ONE)); + assertThat(captor.getValue().getPayload(), is(FOO_ONE)); } @Test // DATAKV-91, DATAKV-104, DATAKV-187 @@ -450,7 +451,7 @@ public class KeyValueTemplateUnitTests { assertThat(captor.getValue().getKey(), is("1")); assertThat(captor.getValue().getKeyspace(), is(Foo.class.getName())); - assertThat(captor.getValue().getPayload(), is((Object) FOO_ONE)); + assertThat(captor.getValue().getPayload(), is(FOO_ONE)); } @Test // DATAKV-91, DATAKV-104, DATAKV-187 @@ -486,7 +487,7 @@ public class KeyValueTemplateUnitTests { assertThat(captor.getValue().getKey(), is("1")); assertThat(captor.getValue().getKeyspace(), is(Foo.class.getName())); - assertThat(captor.getValue().getPayload(), is((Object) FOO_ONE)); + assertThat(captor.getValue().getPayload(), is(FOO_ONE)); } @Test // DATAKV-91, DATAKV-104, DATAKV-187 @@ -525,7 +526,7 @@ public class KeyValueTemplateUnitTests { assertThat(captor.getValue().getKey(), is("1")); assertThat(captor.getValue().getKeyspace(), is(Foo.class.getName())); - assertThat(captor.getValue().getPayload(), is((Object) FOO_ONE)); + assertThat(captor.getValue().getPayload(), is(FOO_ONE)); } @Test // DATAKV-91, DATAKV-104, DATAKV-187 @@ -552,8 +553,9 @@ public class KeyValueTemplateUnitTests { verify(adapterMock, times(1)).put("1", ALIASED_USING_ALIAS_FOR, "aliased"); } + @SafeVarargs @SuppressWarnings("rawtypes") - private void setEventsToPublish(Class... events) { + private final void setEventsToPublish(Class... events) { template.setEventTypesToPublish(new HashSet<>(Arrays.asList(events))); } diff --git a/src/test/java/org/springframework/data/keyvalue/core/mapping/AnnotationBasedKeySpaceResolverUnitTests.java b/src/test/java/org/springframework/data/keyvalue/core/mapping/AnnotationBasedKeySpaceResolverUnitTests.java index 45438b6..8f84b29 100644 --- a/src/test/java/org/springframework/data/keyvalue/core/mapping/AnnotationBasedKeySpaceResolverUnitTests.java +++ b/src/test/java/org/springframework/data/keyvalue/core/mapping/AnnotationBasedKeySpaceResolverUnitTests.java @@ -34,7 +34,7 @@ import org.springframework.data.keyvalue.annotation.KeySpace; /** * Unit tests for {@link AnnotationBasedKeySpaceResolver}. - * + * * @author Christoph Strobl * @author Oliver Gierke */ @@ -114,7 +114,7 @@ public class AnnotationBasedKeySpaceResolverUnitTests { @AliasFor(annotation = KeySpace.class, attribute = "value") String firstname() default "daenerys"; - String lastnamne() default "targaryen"; + String lastname() default "targaryen"; } diff --git a/src/test/java/org/springframework/data/keyvalue/repository/SimpleKeyValueRepositoryUnitTests.java b/src/test/java/org/springframework/data/keyvalue/repository/SimpleKeyValueRepositoryUnitTests.java index 7cb6212..5249153 100644 --- a/src/test/java/org/springframework/data/keyvalue/repository/SimpleKeyValueRepositoryUnitTests.java +++ b/src/test/java/org/springframework/data/keyvalue/repository/SimpleKeyValueRepositoryUnitTests.java @@ -165,7 +165,7 @@ public class SimpleKeyValueRepositoryUnitTests { @Test // DATACMNS-525 public void findAllShouldFallbackToFindAllOfWhenGivenNullPageable() { - repo.findAll((Pageable) null); + repo.findAll(Pageable.unpaged()); verify(opsMock, times(1)).findAll(eq(Foo.class)); } diff --git a/src/test/java/org/springframework/data/keyvalue/repository/query/KeyValuePartTreeQueryUnitTests.java b/src/test/java/org/springframework/data/keyvalue/repository/query/KeyValuePartTreeQueryUnitTests.java index 2913a37..d05827a 100644 --- a/src/test/java/org/springframework/data/keyvalue/repository/query/KeyValuePartTreeQueryUnitTests.java +++ b/src/test/java/org/springframework/data/keyvalue/repository/query/KeyValuePartTreeQueryUnitTests.java @@ -128,7 +128,7 @@ public class KeyValuePartTreeQueryUnitTests { assertThat(query.getRows(), is(3)); } - static interface Repo { + interface Repo { List findByFirstname(String firstname); diff --git a/src/test/java/org/springframework/data/keyvalue/repository/query/SpelQueryCreatorUnitTests.java b/src/test/java/org/springframework/data/keyvalue/repository/query/SpelQueryCreatorUnitTests.java index f975415..8633374 100644 --- a/src/test/java/org/springframework/data/keyvalue/repository/query/SpelQueryCreatorUnitTests.java +++ b/src/test/java/org/springframework/data/keyvalue/repository/query/SpelQueryCreatorUnitTests.java @@ -19,6 +19,8 @@ import static org.hamcrest.core.Is.*; import static org.junit.Assert.*; import static org.mockito.Mockito.*; +import lombok.Data; + import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Date; @@ -43,6 +45,7 @@ import org.springframework.util.ObjectUtils; /** * @author Christoph Strobl + * @author Mark Paluch */ @RunWith(MockitoJUnitRunner.class) public class SpelQueryCreatorUnitTests { @@ -341,7 +344,8 @@ public class SpelQueryCreatorUnitTests { return q; } - static interface PersonRepository { + @SuppressWarnings("unused") + interface PersonRepository { // No arguments Person findBy(); @@ -423,9 +427,9 @@ public class SpelQueryCreatorUnitTests { expression.getEvaluationContext().setVariable("it", candidate); return expression.getValue(Boolean.class); } - } + @Data static class Person { private @Id String id; @@ -442,54 +446,6 @@ public class SpelQueryCreatorUnitTests { this.age = age; } - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFirstname() { - return firstname; - } - - public void setFirstname(String firstname) { - this.firstname = firstname; - } - - public String getLastname() { - return lastname; - } - - public void setLastname(String lastname) { - this.lastname = lastname; - } - - public int getAge() { - return age; - } - - public void setAge(int age) { - this.age = age; - } - - public Date getBirthday() { - return birthday; - } - - public void setBirthday(Date birthday) { - this.birthday = birthday; - } - - public boolean isSkinChanger() { - return isSkinChanger; - } - - public void setSkinChanger(boolean isSkinChanger) { - this.isSkinChanger = isSkinChanger; - } - public Person skinChanger(boolean isSkinChanger) { this.isSkinChanger = isSkinChanger; return this; diff --git a/src/test/java/org/springframework/data/map/AbstractRepositoryUnitTests.java b/src/test/java/org/springframework/data/map/AbstractRepositoryUnitTests.java index 5dec113..b982ead 100644 --- a/src/test/java/org/springframework/data/map/AbstractRepositoryUnitTests.java +++ b/src/test/java/org/springframework/data/map/AbstractRepositoryUnitTests.java @@ -56,7 +56,6 @@ public abstract class AbstractRepositoryUnitTests { + interface PersonRepository extends CrudRepository { List findByFirstname(String firstname); } diff --git a/src/test/java/org/springframework/data/map/repository/config/MapRepositoryRegistrarWithTemplateDefinitionIntegrationTests.java b/src/test/java/org/springframework/data/map/repository/config/MapRepositoryRegistrarWithTemplateDefinitionIntegrationTests.java index a631e43..dadedd2 100644 --- a/src/test/java/org/springframework/data/map/repository/config/MapRepositoryRegistrarWithTemplateDefinitionIntegrationTests.java +++ b/src/test/java/org/springframework/data/map/repository/config/MapRepositoryRegistrarWithTemplateDefinitionIntegrationTests.java @@ -18,6 +18,8 @@ package org.springframework.data.map.repository.config; import static org.hamcrest.core.IsNull.*; import static org.junit.Assert.*; +import lombok.Data; + import java.util.List; import org.junit.Test; @@ -35,8 +37,9 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * Integration tests for {@link MapRepositoriesRegistrar} with complete defaulting. - * + * * @author Christoph Strobl + * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration @@ -59,30 +62,14 @@ public class MapRepositoryRegistrarWithTemplateDefinitionIntegrationTests { assertThat(repo, notNullValue()); } + @Data static class Person { @Id String id; String firstname; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFirstname() { - return firstname; - } - - public void setFirstname(String firstname) { - this.firstname = firstname; - } - } - static interface PersonRepository extends CrudRepository { + interface PersonRepository extends CrudRepository { List findByFirstname(String firstname); }