From 90c4b62428bd0daa6eb6cfcf8e802fb161e1e301 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 5 Jun 2013 23:50:28 +0200 Subject: [PATCH] DATAREST-93 - Removed compiler warnings. Removed dependency on jMock. --- build.gradle | 6 +-- .../data/rest/AbstractJMockTests.java | 17 -------- .../DelegatingConversionServiceUnitTests.java | 41 +++++++++---------- .../repository/BaseUriAwareResources.java | 2 +- .../repository/PersistentEntityResource.java | 13 +++--- ...epositoryConstraintViolationException.java | 4 +- .../repository/UriDomainClassConverter.java | 4 +- .../rest/repository/ValidationErrors.java | 10 +++-- .../repository/context/AfterCreateEvent.java | 3 ++ .../repository/context/AfterDeleteEvent.java | 8 ++-- .../context/AfterLinkDeleteEvent.java | 5 ++- .../context/AfterLinkSaveEvent.java | 8 ++-- .../repository/context/AfterSaveEvent.java | 5 ++- .../repository/context/BeforeCreateEvent.java | 3 ++ .../repository/context/BeforeDeleteEvent.java | 5 ++- .../context/BeforeLinkDeleteEvent.java | 5 ++- .../context/BeforeLinkSaveEvent.java | 8 ++-- .../repository/context/BeforeSaveEvent.java | 3 ++ .../repository/context/ExceptionEvent.java | 5 ++- .../repository/context/LinkSaveEvent.java | 6 +-- .../repository/context/RepositoryEvent.java | 5 ++- .../ValidatingRepositoryEventListener.java | 4 +- .../MethodParameterConversionService.java | 1 - .../invoke/RepositoryMethodInvoker.java | 1 - .../invoke/RepositoryMethodResponse.java | 2 +- .../data/rest/repository/json/JsonSchema.java | 3 +- .../json/PersistentEntityJackson2Module.java | 34 +++++++-------- ...PersistentEntityToJsonSchemaConverter.java | 4 +- .../support/DomainObjectMerger.java | 8 ++-- .../support/RepositoryInformationSupport.java | 2 +- .../support/ResourceMappingUtils.java | 4 +- .../data/rest/AbstractJMockTests.java | 17 -------- .../PersistentEntitySerializationTests.java | 31 +++++--------- ...agingAndSortingMethodArgumentResolver.java | 1 + ...ResourceHandlerMethodArgumentResolver.java | 4 +- .../webmvc/RepositoryRestHandlerMapping.java | 1 - .../rest/webmvc/RepositoryRestRequest.java | 8 ++-- .../webmvc/ResourceNotFoundException.java | 5 ++- .../webmvc/support/BaseUriLinkBuilder.java | 2 +- .../ConstraintViolationExceptionMessage.java | 2 +- .../data/rest/webmvc/support/JpaHelper.java | 6 +-- ...ryConstraintViolationExceptionMessage.java | 2 - .../webmvc/support/RepositoryEntityLinks.java | 11 ++--- .../data/rest/webmvc/AbstractJMockTests.java | 17 -------- .../webmvc/AbstractServerEnabledTest.java | 23 ----------- 45 files changed, 155 insertions(+), 204 deletions(-) delete mode 100644 spring-data-rest-core/src/test/java/org/springframework/data/rest/AbstractJMockTests.java delete mode 100644 spring-data-rest-repository/src/test/java/org/springframework/data/rest/AbstractJMockTests.java delete mode 100644 spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/AbstractJMockTests.java delete mode 100644 spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/AbstractServerEnabledTest.java diff --git a/build.gradle b/build.gradle index 5c2e1269d..5363eedfd 100644 --- a/build.gradle +++ b/build.gradle @@ -34,14 +34,13 @@ ext { junitVersion = "4.11" hamcrestVersion = "1.3" jsonpathVersion = "0.8.1" - jmockVersion = "2.6.0" + mockitoVersion = "1.9.5" jettyVersion = "8.1.9.v20130131" } buildscript { repositories { maven { url "http://repo.springsource.org/plugins-release" } - //maven { url "http://repo.springsource.org/plugins-snapshot" } } dependencies { classpath "org.springframework.build.gradle:docbook-reference-plugin:0.2.6" @@ -85,8 +84,7 @@ configure(allprojects) { testCompile "junit:junit-dep:$junitVersion" testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion" testCompile "com.jayway.jsonpath:json-path:$jsonpathVersion" - testCompile "org.jmock:jmock-junit4:$jmockVersion" - testCompile "org.jmock:jmock-legacy:$jmockVersion" + testCompile "org.mockito:mockito-core:$mockitoVersion" testCompile("org.springframework:spring-test:$springVersion") { force = true } testRuntime("org.springframework:spring-context-support:$springVersion") { force = true } testRuntime "ch.qos.logback:logback-classic:$logbackVersion" diff --git a/spring-data-rest-core/src/test/java/org/springframework/data/rest/AbstractJMockTests.java b/spring-data-rest-core/src/test/java/org/springframework/data/rest/AbstractJMockTests.java deleted file mode 100644 index 10f2463c0..000000000 --- a/spring-data-rest-core/src/test/java/org/springframework/data/rest/AbstractJMockTests.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.springframework.data.rest; - -import org.jmock.integration.junit4.JUnitRuleMockery; -import org.jmock.lib.legacy.ClassImposteriser; - -/** - * Abstract base classes for JUnit tests that use JMock. - * - * @author Jon Brisbin - */ -public abstract class AbstractJMockTests { - - protected JUnitRuleMockery context = new JUnitRuleMockery() {{ - setImposteriser(ClassImposteriser.INSTANCE); - }}; - -} diff --git a/spring-data-rest-core/src/test/java/org/springframework/data/rest/convert/DelegatingConversionServiceUnitTests.java b/spring-data-rest-core/src/test/java/org/springframework/data/rest/convert/DelegatingConversionServiceUnitTests.java index 3da9fd1e3..480922b2e 100644 --- a/spring-data-rest-core/src/test/java/org/springframework/data/rest/convert/DelegatingConversionServiceUnitTests.java +++ b/spring-data-rest-core/src/test/java/org/springframework/data/rest/convert/DelegatingConversionServiceUnitTests.java @@ -2,14 +2,17 @@ package org.springframework.data.rest.convert; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; +import static org.mockito.Mockito.*; import java.util.UUID; -import org.jmock.Expectations; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Matchers; +import org.mockito.Mock; +import org.mockito.runners.MockitoJUnitRunner; import org.springframework.core.convert.ConversionService; -import org.springframework.data.rest.AbstractJMockTests; import org.springframework.format.support.DefaultFormattingConversionService; /** @@ -17,48 +20,44 @@ import org.springframework.format.support.DefaultFormattingConversionService; * org.springframework.core.convert.ConversionService} that is appropriate for the given source and return types. * * @author Jon Brisbin + * @author Oliver Gierke */ -public class DelegatingConversionServiceUnitTests extends AbstractJMockTests { +@RunWith(MockitoJUnitRunner.class) +public class DelegatingConversionServiceUnitTests { private static final UUID RANDOM_UUID = UUID.fromString("9deccfd7-f892-4e26-a4d5-c92893392e78"); - private ConversionService conversionService; - private DelegatingConversionService delegatingConversionService; + @Mock ConversionService conversionService; + DelegatingConversionService delegatingConversionService; @Before public void setup() { - conversionService = context.mock(ConversionService.class); DefaultFormattingConversionService cs = new DefaultFormattingConversionService(false); cs.addConverter(UUIDConverter.INSTANCE); - delegatingConversionService = new DelegatingConversionService( - conversionService, - cs - ); - - context.checking(new Expectations() {{ - allowing(conversionService).canConvert(String.class, UUID.class); - will(returnValue(false)); - allowing(conversionService).canConvert(UUID.class, String.class); - will(returnValue(false)); - - // Ensure the first ConversionService is never asked to convert this String into a UUID - never(conversionService).convert(with(any(String.class)), with(UUID.class)); - never(conversionService).convert(with(any(UUID.class)), with(String.class)); - }}); + delegatingConversionService = new DelegatingConversionService(conversionService, cs); + + when(conversionService.canConvert(String.class, UUID.class)).thenReturn(false); + when(conversionService.canConvert(UUID.class, String.class)).thenReturn(false); } @Test public void shouldDelegateToProperConversionService() throws Exception { assertThat(delegatingConversionService.canConvert(String.class, UUID.class), is(true)); assertThat(delegatingConversionService.convert(RANDOM_UUID.toString(), UUID.class), is(RANDOM_UUID)); + verifyConversionService(); } @Test public void shouldConvertUUIDToString() throws Exception { assertThat(delegatingConversionService.canConvert(UUID.class, String.class), is(true)); assertThat(delegatingConversionService.convert(RANDOM_UUID, String.class), is(RANDOM_UUID.toString())); + verifyConversionService(); } + private void verifyConversionService() { + verify(conversionService, times(0)).convert(Matchers.any(String.class), eq(UUID.class)); + verify(conversionService, times(0)).convert(Matchers.any(UUID.class), eq(String.class)); + } } diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/BaseUriAwareResources.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/BaseUriAwareResources.java index 705a92eba..7785403f1 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/BaseUriAwareResources.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/BaseUriAwareResources.java @@ -45,7 +45,7 @@ public class BaseUriAwareResources extends Resources> { List> resources = new ArrayList>(); for(Resource resource : super.getContent()) { if(resource instanceof BaseUriAwareResource) { - resources.add(((BaseUriAwareResource)resource).setBaseUri(baseUri)); + resources.add(((BaseUriAwareResource) resource).setBaseUri(baseUri)); } else { resources.add(new BaseUriAwareResource(resource.getContent(), resource.getLinks()).setBaseUri(baseUri)); } diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/PersistentEntityResource.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/PersistentEntityResource.java index 2d0650788..f0c259ba7 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/PersistentEntityResource.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/PersistentEntityResource.java @@ -15,10 +15,9 @@ import org.springframework.hateoas.Resource; public class PersistentEntityResource extends BaseUriAwareResource { @JsonIgnore - private final PersistentEntity persistentEntity; + private final PersistentEntity persistentEntity; - @SuppressWarnings({"unchecked"}) - public static PersistentEntityResource wrap(PersistentEntity persistentEntity, + public static PersistentEntityResource wrap(PersistentEntity persistentEntity, T obj, URI baseUri) { PersistentEntityResource resource = new PersistentEntityResource(persistentEntity, obj); @@ -26,25 +25,25 @@ public class PersistentEntityResource extends BaseUriAwareResource { return resource; } - public PersistentEntityResource(PersistentEntity persistentEntity) { + public PersistentEntityResource(PersistentEntity persistentEntity) { this.persistentEntity = persistentEntity; } - public PersistentEntityResource(PersistentEntity persistentEntity, + public PersistentEntityResource(PersistentEntity persistentEntity, T content, Link... links) { super(content, links); this.persistentEntity = persistentEntity; } - public PersistentEntityResource(PersistentEntity persistentEntity, + public PersistentEntityResource(PersistentEntity persistentEntity, T content, Iterable links) { super(content, links); this.persistentEntity = persistentEntity; } - public PersistentEntity getPersistentEntity() { + public PersistentEntity getPersistentEntity() { return persistentEntity; } diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/RepositoryConstraintViolationException.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/RepositoryConstraintViolationException.java index 66f26f028..86c13e6bb 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/RepositoryConstraintViolationException.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/RepositoryConstraintViolationException.java @@ -10,7 +10,9 @@ import org.springframework.validation.Errors; */ public class RepositoryConstraintViolationException extends DataIntegrityViolationException { - private Errors errors; + private static final long serialVersionUID = -4789377071564956366L; + + private final Errors errors; public RepositoryConstraintViolationException(Errors errors) { super("Validation failed"); diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/UriDomainClassConverter.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/UriDomainClassConverter.java index 7beab0f41..41f9f37ba 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/UriDomainClassConverter.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/UriDomainClassConverter.java @@ -26,7 +26,7 @@ public class UriDomainClassConverter private static TypeDescriptor STRING_TYPE = TypeDescriptor.valueOf(String.class); @Autowired - private DomainClassConverter domainClassConverter; + private DomainClassConverter domainClassConverter; private Set convertiblePairs = new HashSet(); @Override public void afterPropertiesSet() throws Exception { @@ -45,7 +45,7 @@ public class UriDomainClassConverter } @Override public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - PersistentEntity entity = repositories.getPersistentEntity(targetType.getType()); + PersistentEntity entity = repositories.getPersistentEntity(targetType.getType()); if(null == entity || !domainClassConverter.matches(STRING_TYPE, targetType)) { throw new ConversionFailedException( sourceType, diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/ValidationErrors.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/ValidationErrors.java index 6366e433d..35eb99f3c 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/ValidationErrors.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/ValidationErrors.java @@ -21,13 +21,15 @@ import org.springframework.validation.ObjectError; */ public class ValidationErrors extends AbstractErrors { - private String name; + private static final long serialVersionUID = 8141826537389141361L; + + private String name; private Object entity; - private PersistentEntity persistentEntity; + private PersistentEntity persistentEntity; private List globalErrors = new ArrayList(); private List fieldErrors = new ArrayList(); - public ValidationErrors(String name, Object entity, PersistentEntity persistentEntity) { + public ValidationErrors(String name, Object entity, PersistentEntity persistentEntity) { this.name = name; this.entity = entity; this.persistentEntity = persistentEntity; @@ -64,7 +66,7 @@ public class ValidationErrors extends AbstractErrors { } @Override public Object getFieldValue(String field) { - PersistentProperty prop = (null != persistentEntity ? persistentEntity.getPersistentProperty(field) : null); + PersistentProperty prop = persistentEntity != null ? persistentEntity.getPersistentProperty(field) : null; if(null == prop) { return null; } diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/AfterCreateEvent.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/AfterCreateEvent.java index 38e3bc4e3..de3f61ce8 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/AfterCreateEvent.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/AfterCreateEvent.java @@ -6,6 +6,9 @@ package org.springframework.data.rest.repository.context; * @author Jon Brisbin */ public class AfterCreateEvent extends RepositoryEvent { + + private static final long serialVersionUID = -7673953693485678403L; + public AfterCreateEvent(Object source) { super(source); } diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/AfterDeleteEvent.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/AfterDeleteEvent.java index 93b1ac7fe..255e5ec36 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/AfterDeleteEvent.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/AfterDeleteEvent.java @@ -5,9 +5,11 @@ package org.springframework.data.rest.repository.context; * * @author Jon Brisbin */ -public class AfterDeleteEvent - extends RepositoryEvent { - public AfterDeleteEvent(Object source) { +public class AfterDeleteEvent extends RepositoryEvent { + + private static final long serialVersionUID = -6090615345948638970L; + + public AfterDeleteEvent(Object source) { super(source); } } diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/AfterLinkDeleteEvent.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/AfterLinkDeleteEvent.java index 9e5edc9f6..7c9a9c303 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/AfterLinkDeleteEvent.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/AfterLinkDeleteEvent.java @@ -6,7 +6,10 @@ package org.springframework.data.rest.repository.context; * @author Jon Brisbin */ public class AfterLinkDeleteEvent extends LinkSaveEvent { - public AfterLinkDeleteEvent(Object source, Object linked) { + + private static final long serialVersionUID = 3887575011761146290L; + + public AfterLinkDeleteEvent(Object source, Object linked) { super(source, linked); } } diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/AfterLinkSaveEvent.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/AfterLinkSaveEvent.java index 5158c86aa..5ce117558 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/AfterLinkSaveEvent.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/AfterLinkSaveEvent.java @@ -5,9 +5,11 @@ package org.springframework.data.rest.repository.context; * * @author Jon Brisbin */ -public class AfterLinkSaveEvent - extends LinkSaveEvent { - public AfterLinkSaveEvent(Object source, Object child) { +public class AfterLinkSaveEvent extends LinkSaveEvent { + + private static final long serialVersionUID = 261522353893713633L; + + public AfterLinkSaveEvent(Object source, Object child) { super(source, child); } } diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/AfterSaveEvent.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/AfterSaveEvent.java index 92a3e705d..21db5b160 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/AfterSaveEvent.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/AfterSaveEvent.java @@ -6,7 +6,10 @@ package org.springframework.data.rest.repository.context; * @author Jon Brisbin */ public class AfterSaveEvent extends RepositoryEvent { - public AfterSaveEvent(Object source) { + + private static final long serialVersionUID = 8568843338617401903L; + + public AfterSaveEvent(Object source) { super(source); } } diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/BeforeCreateEvent.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/BeforeCreateEvent.java index 3b9046466..d01911dae 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/BeforeCreateEvent.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/BeforeCreateEvent.java @@ -6,6 +6,9 @@ package org.springframework.data.rest.repository.context; * @author Jon Brisbin */ public class BeforeCreateEvent extends RepositoryEvent { + + private static final long serialVersionUID = -1642841708537223975L; + public BeforeCreateEvent(Object source) { super(source); } diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/BeforeDeleteEvent.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/BeforeDeleteEvent.java index ee61acedb..b0b737961 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/BeforeDeleteEvent.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/BeforeDeleteEvent.java @@ -6,7 +6,10 @@ package org.springframework.data.rest.repository.context; * @author Jon Brisbin */ public class BeforeDeleteEvent extends RepositoryEvent { - public BeforeDeleteEvent(Object source) { + + private static final long serialVersionUID = 9150212393209433211L; + + public BeforeDeleteEvent(Object source) { super(source); } } diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/BeforeLinkDeleteEvent.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/BeforeLinkDeleteEvent.java index 7445c60f4..dda1c936e 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/BeforeLinkDeleteEvent.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/BeforeLinkDeleteEvent.java @@ -6,7 +6,10 @@ package org.springframework.data.rest.repository.context; * @author Jon Brisbin */ public class BeforeLinkDeleteEvent extends LinkSaveEvent { - public BeforeLinkDeleteEvent(Object source, Object linked) { + + private static final long serialVersionUID = -973540913790564962L; + + public BeforeLinkDeleteEvent(Object source, Object linked) { super(source, linked); } } diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/BeforeLinkSaveEvent.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/BeforeLinkSaveEvent.java index d7c5a45d4..27b6ee0d0 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/BeforeLinkSaveEvent.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/BeforeLinkSaveEvent.java @@ -5,9 +5,11 @@ package org.springframework.data.rest.repository.context; * * @author Jon Brisbin */ -public class BeforeLinkSaveEvent - extends LinkSaveEvent { - public BeforeLinkSaveEvent(Object source, Object linked) { +public class BeforeLinkSaveEvent extends LinkSaveEvent { + + private static final long serialVersionUID = 4836932640633578985L; + + public BeforeLinkSaveEvent(Object source, Object linked) { super(source, linked); } } diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/BeforeSaveEvent.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/BeforeSaveEvent.java index 2845d1715..6033f8744 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/BeforeSaveEvent.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/BeforeSaveEvent.java @@ -4,6 +4,9 @@ package org.springframework.data.rest.repository.context; * Emitted before an entity is saved into the repository. */ public class BeforeSaveEvent extends RepositoryEvent { + + private static final long serialVersionUID = -1404580942928384726L; + public BeforeSaveEvent(Object source) { super(source); } diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/ExceptionEvent.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/ExceptionEvent.java index df1be1251..9ec72b57e 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/ExceptionEvent.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/ExceptionEvent.java @@ -6,7 +6,10 @@ package org.springframework.data.rest.repository.context; * @author Jon Brisbin */ public class ExceptionEvent extends RepositoryEvent { - public ExceptionEvent(Throwable t) { + + private static final long serialVersionUID = 6614805546974091704L; + + public ExceptionEvent(Throwable t) { super(t); } diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/LinkSaveEvent.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/LinkSaveEvent.java index 3487faca0..e517c66d2 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/LinkSaveEvent.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/LinkSaveEvent.java @@ -5,10 +5,10 @@ package org.springframework.data.rest.repository.context; * * @author Jon Brisbin */ -public abstract class LinkSaveEvent - extends RepositoryEvent { +public abstract class LinkSaveEvent extends RepositoryEvent { - private final Object linked; + private static final long serialVersionUID = -9071648572128698903L; + private final Object linked; public LinkSaveEvent(Object source, Object linked) { super(source); diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/RepositoryEvent.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/RepositoryEvent.java index 691255c29..eee5d1015 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/RepositoryEvent.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/RepositoryEvent.java @@ -8,7 +8,10 @@ import org.springframework.context.ApplicationEvent; * @author Jon Brisbin */ public abstract class RepositoryEvent extends ApplicationEvent { - protected RepositoryEvent(Object source) { + + private static final long serialVersionUID = -966689410815418259L; + + protected RepositoryEvent(Object source) { super(source); } } diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/ValidatingRepositoryEventListener.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/ValidatingRepositoryEventListener.java index 63b5e6309..04cfe91d6 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/ValidatingRepositoryEventListener.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/ValidatingRepositoryEventListener.java @@ -74,9 +74,9 @@ public class ValidatingRepositoryEventListener } else if(entry.getKey().contains("Delete")) { name = entry.getKey().substring(0, entry.getKey().indexOf("Delete") + 6); } else { - Annotation anno; + for(Class annoType : ANNOTATIONS_TO_FIND) { - if(null != (anno = findAnnotation(v.getClass(), annoType))) { + if(findAnnotation(v.getClass(), annoType) != null) { name = uncapitalize(annoType.getSimpleName().substring(6)); } } diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/invoke/MethodParameterConversionService.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/invoke/MethodParameterConversionService.java index aa4f10638..d9c37d7e1 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/invoke/MethodParameterConversionService.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/invoke/MethodParameterConversionService.java @@ -32,7 +32,6 @@ public class MethodParameterConversionService { || param.hasParameterAnnotation(ConvertWith.class)); } - @SuppressWarnings({"unchecked"}) public T convert(Object source, MethodParameter param) { return convert(source, TypeDescriptor.forObject(source), param); } diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/invoke/RepositoryMethodInvoker.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/invoke/RepositoryMethodInvoker.java index 0cc19fbd6..0a7e47368 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/invoke/RepositoryMethodInvoker.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/invoke/RepositoryMethodInvoker.java @@ -37,7 +37,6 @@ public class RepositoryMethodInvoker implements PagingAndSortingRepository results) { if(null == results) { return this; } diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/json/JsonSchema.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/json/JsonSchema.java index 159137eb7..e466e9c87 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/json/JsonSchema.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/json/JsonSchema.java @@ -14,7 +14,8 @@ import org.springframework.hateoas.Resource; public class JsonSchema extends Resource> { private final String name; - private final String description; + @SuppressWarnings("unused") + private final String description; public JsonSchema(String name, String description) { super(new HashMap()); diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/json/PersistentEntityJackson2Module.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/json/PersistentEntityJackson2Module.java index f3ae92ab9..1723ce979 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/json/PersistentEntityJackson2Module.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/json/PersistentEntityJackson2Module.java @@ -52,6 +52,7 @@ import org.springframework.http.converter.HttpMessageNotReadableException; */ public class PersistentEntityJackson2Module extends SimpleModule implements InitializingBean { + private static final long serialVersionUID = -7289265674870906323L; private static final Logger LOG = LoggerFactory.getLogger(PersistentEntityJackson2Module.class); private static final TypeDescriptor URI_TYPE = TypeDescriptor.valueOf(URI.class); private final ConversionService conversionService; @@ -75,7 +76,7 @@ public class PersistentEntityJackson2Module extends SimpleModule implements Init RepositoryInformation repoInfo, ResourceMapping entityMapping, ResourceMapping propertyMapping, - PersistentProperty persistentProperty, + PersistentProperty persistentProperty, List links) { Class propertyType = persistentProperty.getType(); if(persistentProperty.isCollectionLike() || persistentProperty.isArray()) { @@ -106,10 +107,10 @@ public class PersistentEntityJackson2Module extends SimpleModule implements Init return false; } - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({"unchecked", "rawtypes"}) @Override public void afterPropertiesSet() throws Exception { for(Class domainType : repositories) { - PersistentEntity pe = repositories.getPersistentEntity(domainType); + PersistentEntity pe = repositories.getPersistentEntity(domainType); if(null == pe) { if(LOG.isWarnEnabled()) { LOG.warn("The domain class {} does not have PersistentEntity metadata.", domainType.getName()); @@ -122,20 +123,20 @@ public class PersistentEntityJackson2Module extends SimpleModule implements Init private class ResourceDeserializer extends StdDeserializer { - private final PersistentEntity persistentEntity; + private static final long serialVersionUID = 8195592798684027681L; + private final PersistentEntity persistentEntity; - @SuppressWarnings({"unchecked"}) - private ResourceDeserializer(final PersistentEntity persistentEntity) { + private ResourceDeserializer(final PersistentEntity persistentEntity) { super(persistentEntity.getType()); this.persistentEntity = persistentEntity; } - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({"unchecked", "incomplete-switch", "null", "unused"}) @Override public T deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { Object entity = instantiateClass(getValueClass()); - BeanWrapper wrapper = BeanWrapper.create(entity, conversionService); + BeanWrapper wrapper = BeanWrapper.create(entity, conversionService); ResourceMapping domainMapping = config.getResourceMappingForDomainType(getValueClass()); for(JsonToken tok = jp.nextToken(); tok != JsonToken.END_OBJECT; tok = jp.nextToken()) { @@ -157,7 +158,7 @@ public class PersistentEntityJackson2Module extends SimpleModule implements Init continue; } - PersistentProperty persistentProperty = persistentEntity.getPersistentProperty(name); + PersistentProperty persistentProperty = persistentEntity.getPersistentProperty(name); if(null == persistentProperty) { String errMsg = "Property '" + name + "' not found for entity " + getValueClass().getName(); if(null == domainMapping) { @@ -197,13 +198,13 @@ public class PersistentEntityJackson2Module extends SimpleModule implements Init // Try and read the value of this attribute. // The method of doing that varies based on the type of the property. if(persistentProperty.isCollectionLike()) { - Class ctype = (Class)persistentProperty.getType(); - Collection c = (Collection)wrapper.getProperty(persistentProperty, ctype, false); + Class> ctype = (Class>) persistentProperty.getType(); + Collection c = (Collection) wrapper.getProperty(persistentProperty, ctype, false); if(null == c || c == Collections.EMPTY_LIST || c == Collections.EMPTY_SET) { if(Collection.class.isAssignableFrom(ctype)) { - c = new ArrayList(); + c = new ArrayList(); } else if(Set.class.isAssignableFrom(ctype)) { - c = new HashSet(); + c = new HashSet(); } } @@ -220,10 +221,10 @@ public class PersistentEntityJackson2Module extends SimpleModule implements Init throw new HttpMessageNotReadableException("Cannot read a JSON " + tok + " as a Collection."); } } else if(persistentProperty.isMap()) { - Class mtype = (Class)persistentProperty.getType(); - Map m = (Map)wrapper.getProperty(persistentProperty, mtype, false); + Class> mtype = (Class>)persistentProperty.getType(); + Map m = (Map) wrapper.getProperty(persistentProperty, mtype, false); if(null == m || m == Collections.EMPTY_MAP) { - m = new HashMap(); + m = new HashMap(); } if((tok = jp.nextToken()) == JsonToken.START_OBJECT) { @@ -259,6 +260,7 @@ public class PersistentEntityJackson2Module extends SimpleModule implements Init } } + @SuppressWarnings("rawtypes") private class ResourceSerializer extends StdSerializer { private ResourceSerializer() { diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/json/PersistentEntityToJsonSchemaConverter.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/json/PersistentEntityToJsonSchemaConverter.java index 565eaec7e..564ecf12c 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/json/PersistentEntityToJsonSchemaConverter.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/json/PersistentEntityToJsonSchemaConverter.java @@ -58,9 +58,9 @@ public class PersistentEntityToJsonSchemaConverter return (JsonSchema)convert(domainType, STRING_TYPE, SCHEMA_TYPE); } - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({"unchecked", "rawtypes"}) @Override public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - PersistentEntity persistentEntity = repositories.getPersistentEntity((Class)source); + PersistentEntity persistentEntity = repositories.getPersistentEntity((Class)source); final RepositoryInformation repoInfo = repositories.getRepositoryInformationFor(persistentEntity.getType()); final ResourceMapping repoMapping = getResourceMapping(config, repoInfo); final ResourceMapping entityMapping = getResourceMapping(config, persistentEntity); diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/support/DomainObjectMerger.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/support/DomainObjectMerger.java index b090bccb7..89d40e3a8 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/support/DomainObjectMerger.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/support/DomainObjectMerger.java @@ -25,15 +25,15 @@ public class DomainObjectMerger { this.conversionService = conversionService; } - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({"unchecked", "rawtypes"}) public void merge(Object from, Object target) { if(null == from || null == target) { return; } - final BeanWrapper fromWrapper = BeanWrapper.create(from, conversionService); - final BeanWrapper targetWrapper = BeanWrapper.create(target, conversionService); + final BeanWrapper fromWrapper = BeanWrapper.create(from, conversionService); + final BeanWrapper targetWrapper = BeanWrapper.create(target, conversionService); - PersistentEntity entity = repositories.getPersistentEntity(target.getClass()); + PersistentEntity entity = repositories.getPersistentEntity(target.getClass()); entity.doWithProperties(new PropertyHandler() { @Override public void doWithPersistentProperty(PersistentProperty persistentProperty) { Object fromVal = fromWrapper.getProperty(persistentProperty); diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/support/RepositoryInformationSupport.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/support/RepositoryInformationSupport.java index 3a66a4040..8c21b978a 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/support/RepositoryInformationSupport.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/support/RepositoryInformationSupport.java @@ -66,7 +66,7 @@ public abstract class RepositoryInformationSupport { } protected RepositoryInformation findRepositoryInfoFor(Class domainType) { - PersistentEntity entity = repositories.getPersistentEntity(domainType); + PersistentEntity entity = repositories.getPersistentEntity(domainType); if(null != entity) { return repositories.getRepositoryInformationFor(domainType); } diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/support/ResourceMappingUtils.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/support/ResourceMappingUtils.java index 23986deb7..cfd61241e 100644 --- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/support/ResourceMappingUtils.java +++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/support/ResourceMappingUtils.java @@ -46,7 +46,7 @@ public abstract class ResourceMappingUtils { public static String formatRel(RepositoryRestConfiguration config, RepositoryInformation repoInfo, - PersistentProperty persistentProperty) { + PersistentProperty persistentProperty) { if(null == persistentProperty) { return null; } @@ -104,7 +104,7 @@ public abstract class ResourceMappingUtils { } public static ResourceMapping getResourceMapping(RepositoryRestConfiguration config, - PersistentEntity persistentEntity) { + PersistentEntity persistentEntity) { if(null == persistentEntity) { return null; } diff --git a/spring-data-rest-repository/src/test/java/org/springframework/data/rest/AbstractJMockTests.java b/spring-data-rest-repository/src/test/java/org/springframework/data/rest/AbstractJMockTests.java deleted file mode 100644 index 10f2463c0..000000000 --- a/spring-data-rest-repository/src/test/java/org/springframework/data/rest/AbstractJMockTests.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.springframework.data.rest; - -import org.jmock.integration.junit4.JUnitRuleMockery; -import org.jmock.lib.legacy.ClassImposteriser; - -/** - * Abstract base classes for JUnit tests that use JMock. - * - * @author Jon Brisbin - */ -public abstract class AbstractJMockTests { - - protected JUnitRuleMockery context = new JUnitRuleMockery() {{ - setImposteriser(ClassImposteriser.INSTANCE); - }}; - -} diff --git a/spring-data-rest-repository/src/test/java/org/springframework/data/rest/repository/json/PersistentEntitySerializationTests.java b/spring-data-rest-repository/src/test/java/org/springframework/data/rest/repository/json/PersistentEntitySerializationTests.java index ce091164b..c0db7aba0 100644 --- a/spring-data-rest-repository/src/test/java/org/springframework/data/rest/repository/json/PersistentEntitySerializationTests.java +++ b/spring-data-rest-repository/src/test/java/org/springframework/data/rest/repository/json/PersistentEntitySerializationTests.java @@ -7,25 +7,22 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.net.URI; import java.util.Collections; -import java.util.regex.Pattern; import com.fasterxml.jackson.databind.ObjectMapper; import com.jayway.jsonpath.JsonPath; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.mapping.PersistentEntity; import org.springframework.data.repository.support.Repositories; import org.springframework.data.rest.repository.PersistentEntityResource; import org.springframework.data.rest.repository.RepositoryTestsConfig; import org.springframework.data.rest.repository.domain.jpa.Person; import org.springframework.data.rest.repository.domain.jpa.PersonRepository; import org.springframework.hateoas.Link; -import org.springframework.hateoas.LinkDiscoverer; -import org.springframework.hateoas.core.DefaultLinkDiscoverer; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -37,15 +34,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; public class PersistentEntitySerializationTests { private static final String PERSON_JSON_IN = "{\"firstName\": \"John\",\"lastName\": \"Doe\"}"; - private static final Pattern PERSON_JSON_OUT = Pattern.compile( - "\\{\"lastName\":\"Doe\",\"created\":([0-9]+),\"firstName\":\"John\",\"links\":\\[\\{\"rel\":\"people.person.siblings\",\"href\":\"http://localhost/people/2/siblings\"}]}"); - @Autowired - private ObjectMapper mapper; - @Autowired - private Repositories repositories; - @Autowired - private PersonRepository people; - private LinkDiscoverer links = new DefaultLinkDiscoverer(); + + @Autowired ObjectMapper mapper; + @Autowired Repositories repositories; + @Autowired PersonRepository people; public static Matcher isLinkWithHref(final String href) { return new BaseMatcher() { @@ -68,18 +60,15 @@ public class PersistentEntitySerializationTests { } @Test - @Ignore public void serializesPersonEntity() throws IOException, InterruptedException { + ByteArrayOutputStream out = new ByteArrayOutputStream(); - mapper.writeValue(out, PersistentEntityResource.wrap(repositories.getPersistentEntity(Person.class), - people.save(new Person("John", "Doe")), - URI.create("http://localhost"))); + PersistentEntity persistentEntity = repositories.getPersistentEntity(Person.class); + Person person = people.save(new Person("John", "Doe")); + mapper.writeValue(out, PersistentEntityResource.wrap(persistentEntity, person, URI.create("http://localhost"))); out.flush(); String s = new String(out.toByteArray()); - assertThat("Siblings Link looks correct", - JsonPath.read(s, "$links[0].href").toString(), - endsWith("/2/siblings")); + assertThat("Siblings Link looks correct", JsonPath.read(s, "$links[0].href").toString(), endsWith("/2/siblings")); } - } diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PagingAndSortingMethodArgumentResolver.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PagingAndSortingMethodArgumentResolver.java index 2e0b2234c..36e3e5545 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PagingAndSortingMethodArgumentResolver.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PagingAndSortingMethodArgumentResolver.java @@ -27,6 +27,7 @@ import org.springframework.web.method.support.ModelAndViewContainer; * * @author Jon Brisbin */ +@SuppressWarnings("deprecation") public class PagingAndSortingMethodArgumentResolver implements HandlerMethodArgumentResolver { private static final int DEFAULT_PAGE = 1; // We're 1-based, not 0-based diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PersistentEntityResourceHandlerMethodArgumentResolver.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PersistentEntityResourceHandlerMethodArgumentResolver.java index e0d60e53b..db9a5357b 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PersistentEntityResourceHandlerMethodArgumentResolver.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PersistentEntityResourceHandlerMethodArgumentResolver.java @@ -30,8 +30,8 @@ public class PersistentEntityResourceHandlerMethodArgumentResolver implements Ha return PersistentEntityResource.class.isAssignableFrom(parameter.getParameterType()); } - @SuppressWarnings({"unchecked"}) @Override + @SuppressWarnings({"unchecked", "rawtypes"}) public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, @@ -49,7 +49,7 @@ public class PersistentEntityResourceHandlerMethodArgumentResolver implements Ha } Object obj = converter.read(domainType, request); - return new PersistentEntityResource(repoRequest.getPersistentEntity(), + return new PersistentEntityResource(repoRequest.getPersistentEntity(), obj); } diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMapping.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMapping.java index f1ec0b14d..08d45784c 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMapping.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMapping.java @@ -41,7 +41,6 @@ public class RepositoryRestHandlerMapping extends RequestMappingHandlerMapping { setOrder(Ordered.LOWEST_PRECEDENCE); } - @SuppressWarnings({"unchecked"}) @Override protected HandlerMethod lookupHandlerMethod(String lookupPath, HttpServletRequest origRequest) throws Exception { diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestRequest.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestRequest.java index 071193186..ce77743cb 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestRequest.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestRequest.java @@ -33,7 +33,7 @@ class RepositoryRestRequest { private final Link repoLink; private final Object repository; private final RepositoryMethodInvoker repoMethodInvoker; - private final PersistentEntity persistentEntity; + private final PersistentEntity persistentEntity; private final ResourceMapping entityMapping; public RepositoryRestRequest(RepositoryRestConfiguration config, @@ -95,7 +95,7 @@ class RepositoryRestRequest { return repoMethodInvoker; } - PersistentEntity getPersistentEntity() { + PersistentEntity getPersistentEntity() { return persistentEntity; } @@ -103,7 +103,7 @@ class RepositoryRestRequest { return entityMapping; } - void addNextLink(Page page, List links) { + void addNextLink(Page page, List links) { UriComponentsBuilder builder = UriComponentsBuilder.fromUri(baseUri); // Add existing query parameters addQueryParameters(request, builder); @@ -114,7 +114,7 @@ class RepositoryRestRequest { links.add(new Link(builder.build().toString(), "page.next")); } - void addPrevLink(Page page, List links) { + void addPrevLink(Page page, List links) { UriComponentsBuilder builder = UriComponentsBuilder.fromUri(baseUri); // Add existing query parameters addQueryParameters(request, builder); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/ResourceNotFoundException.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/ResourceNotFoundException.java index 26a9f364c..33b1fad65 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/ResourceNotFoundException.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/ResourceNotFoundException.java @@ -6,7 +6,10 @@ package org.springframework.data.rest.webmvc; * @author Jon Brisbin */ public class ResourceNotFoundException extends RuntimeException { - public ResourceNotFoundException() { + + private static final long serialVersionUID = 7992904489502842099L; + + public ResourceNotFoundException() { super("Resource not found"); } diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/BaseUriLinkBuilder.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/BaseUriLinkBuilder.java index 6465d0a95..7b272c013 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/BaseUriLinkBuilder.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/BaseUriLinkBuilder.java @@ -8,7 +8,7 @@ import org.springframework.web.util.UriComponentsBuilder; /** * @author Jon Brisbin */ -public class BaseUriLinkBuilder extends LinkBuilderSupport { +public class BaseUriLinkBuilder extends LinkBuilderSupport { public BaseUriLinkBuilder(UriComponentsBuilder builder) { super(builder); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/ConstraintViolationExceptionMessage.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/ConstraintViolationExceptionMessage.java index 788740abe..3a23b63d8 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/ConstraintViolationExceptionMessage.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/ConstraintViolationExceptionMessage.java @@ -21,7 +21,7 @@ public class ConstraintViolationExceptionMessage { MessageSource msgSrc, Locale locale) { this.cve = cve; - for(ConstraintViolation cv : cve.getConstraintViolations()) { + for(ConstraintViolation cv : cve.getConstraintViolations()) { messages.add(new ConstraintViolationMessage(cv, msgSrc, locale)); } } diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/JpaHelper.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/JpaHelper.java index ed4bd40b9..5daa56b20 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/JpaHelper.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/JpaHelper.java @@ -10,15 +10,15 @@ import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.orm.jpa.support.OpenEntityManagerInViewInterceptor; +import org.springframework.web.context.request.WebRequestInterceptor; /** * @author Jon Brisbin */ public class JpaHelper implements BeanFactoryAware { - private List interceptor = new ArrayList(); + private List interceptor = new ArrayList(); - @SuppressWarnings({"unchecked"}) @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { String[] beanNames = BeanFactoryUtils.beanNamesForTypeIncludingAncestors( (ListableBeanFactory)beanFactory, @@ -32,7 +32,7 @@ public class JpaHelper implements BeanFactoryAware { } } - public List getInterceptors() { + public List getInterceptors() { return interceptor; } diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryConstraintViolationExceptionMessage.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryConstraintViolationExceptionMessage.java index 4d65f4cb7..ea0bcbf75 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryConstraintViolationExceptionMessage.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryConstraintViolationExceptionMessage.java @@ -14,13 +14,11 @@ import org.springframework.validation.FieldError; */ public class RepositoryConstraintViolationExceptionMessage { - private final RepositoryConstraintViolationException violationException; private final List errors = new ArrayList(); public RepositoryConstraintViolationExceptionMessage(RepositoryConstraintViolationException violationException, MessageSource msgSrc, Locale locale) { - this.violationException = violationException; for(FieldError fe : violationException.getErrors().getFieldErrors()) { List args = new ArrayList(); diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryEntityLinks.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryEntityLinks.java index 0e2c75afc..fa3927120 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryEntityLinks.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/RepositoryEntityLinks.java @@ -36,7 +36,7 @@ public class RepositoryEntityLinks extends AbstractEntityLinks { } @Override public boolean supports(Class delimiter) { - PersistentEntity persistentEntity = repositories.getPersistentEntity(delimiter); + PersistentEntity persistentEntity = repositories.getPersistentEntity(delimiter); return (null != persistentEntity); } @@ -45,7 +45,7 @@ public class RepositoryEntityLinks extends AbstractEntityLinks { if(null == repoInfo) { throw new IllegalArgumentException(type + " is not managed by any repository."); } - PersistentEntity persistentEntity = repositories.getPersistentEntity(type); + PersistentEntity persistentEntity = repositories.getPersistentEntity(type); if(null == persistentEntity) { throw new IllegalArgumentException(type + " is not managed by any repository."); } @@ -71,19 +71,20 @@ public class RepositoryEntityLinks extends AbstractEntityLinks { throw new IllegalArgumentException(type + " is not managed by any repository."); } ResourceMapping repoMapping = getResourceMapping(config, repoInfo); - PersistentEntity persistentEntity = repositories.getPersistentEntity(type); + PersistentEntity persistentEntity = repositories.getPersistentEntity(type); ResourceMapping entityMapping = getResourceMapping(config, persistentEntity); return linkFor(type).slash(id).withRel(repoMapping.getRel() + "." + entityMapping.getRel()); } private class PersistentEntityLinkBuilder implements LinkBuilder { + private final UriComponentsBuilder builder; private final ResourceMapping repoMapping; private final ResourceMapping entityMapping; private PersistentEntityLinkBuilder(URI baseUri, RepositoryInformation repoInfo, - PersistentEntity persistentEntity) { + PersistentEntity persistentEntity) { this.repoMapping = getResourceMapping(config, repoInfo); this.entityMapping = getResourceMapping(config, persistentEntity); if(null == baseUri) { @@ -101,7 +102,7 @@ public class RepositoryEntityLinks extends AbstractEntityLinks { @Override public LinkBuilder slash(Object object) { String path = String.format("%s", object); if(object instanceof PersistentProperty) { - String propName = ((PersistentProperty)object).getName(); + String propName = ((PersistentProperty) object).getName(); if(entityMapping.hasResourceMappingFor(propName)) { path = entityMapping.getResourceMappingFor(propName).getPath(); } diff --git a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/AbstractJMockTests.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/AbstractJMockTests.java deleted file mode 100644 index 16984f07b..000000000 --- a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/AbstractJMockTests.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.springframework.data.rest.webmvc; - -import org.jmock.integration.junit4.JUnitRuleMockery; -import org.jmock.lib.legacy.ClassImposteriser; - -/** - * Abstract base classes for JUnit tests that use JMock. - * - * @author Jon Brisbin - */ -public abstract class AbstractJMockTests { - - protected JUnitRuleMockery context = new JUnitRuleMockery() {{ - setImposteriser(ClassImposteriser.INSTANCE); - }}; - -} diff --git a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/AbstractServerEnabledTest.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/AbstractServerEnabledTest.java deleted file mode 100644 index c000b7f98..000000000 --- a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/AbstractServerEnabledTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.springframework.data.rest.webmvc; - -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.junit.Before; -import org.junit.BeforeClass; - -/** - * @author Jon Brisbin - */ -public abstract class AbstractServerEnabledTest { - - private Server server; - - @Before - public void setup() { - if(null == server) { - server = new Server(0); - - } - } - -}