Enabled domain classes conversion via conversion service.

@see http://static.springsource.org/spring-data/data-jpa/docs/current/reference/html/#web-domain-class-binding
@see http://stackoverflow.com/q/12421485

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/config/MvcConfig.java

@@ -17,13 +17,17 @@
  */
 package ru.mystamps.web.config;
 
+import javax.inject.Inject;
+
 import java.util.List;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.MessageSource;
 import org.springframework.context.support.ReloadableResourceBundleMessageSource;
+import org.springframework.data.repository.support.DomainClassConverter;
+import org.springframework.format.support.FormattingConversionService;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 import org.springframework.validation.Validator;
@@ -122,5 +126,11 @@ public MessageSource getMessageSource() {
 	public MultipartResolver getMultipartResolver() {
 		return new CommonsMultipartResolver();
 	}
-
+	
+	@Bean
+	@Inject
+	public DomainClassConverter<?> getDomainClassConverter(FormattingConversionService service) {
+		return new DomainClassConverter<FormattingConversionService>(service);
+	}
+	
 }

src/main/java/ru/mystamps/web/model/AddSeriesForm.java

@@ -26,6 +26,7 @@
 
 import org.springframework.web.multipart.MultipartFile;
 
+import ru.mystamps.web.entity.Country;
 import ru.mystamps.web.service.dto.AddSeriesDto;
 import ru.mystamps.web.validation.jsr303.CatalogNumbers;
 import ru.mystamps.web.validation.jsr303.NotEmptyFile;
@@ -41,7 +42,7 @@
 @Getter
 @Setter
 public class AddSeriesForm implements AddSeriesDto {
-	private Integer country;
+	private Country country;
 	private Integer year;
 
 	@NotNull

src/main/java/ru/mystamps/web/service/SeriesService.java

@@ -32,7 +32,6 @@
 
 import org.apache.commons.lang3.Validate;
 
-import ru.mystamps.web.dao.CountryDao;
 import ru.mystamps.web.dao.GibbonsCatalogDao;
 import ru.mystamps.web.dao.MichelCatalogDao;
 import ru.mystamps.web.dao.ScottCatalogDao;
@@ -50,9 +49,6 @@
 @Service
 public class SeriesService {
 
-	@Inject
-	private CountryDao countryDao;
-	
 	@Inject
 	private SeriesDao seriesDao;
 
@@ -87,7 +83,7 @@ public Series add(AddSeriesDto dto) {
 		Series series = new Series();
 
 		if (dto.getCountry() != null) {
-			series.setCountry(countryDao.findOne(dto.getCountry()));
+			series.setCountry(dto.getCountry());
 		}
 
 		if (dto.getYear() != null) {

src/main/java/ru/mystamps/web/service/dto/AddSeriesDto.java

@@ -20,8 +20,10 @@
 
 import org.springframework.web.multipart.MultipartFile;
 
+import ru.mystamps.web.entity.Country;
+
 public interface AddSeriesDto {
-	Integer getCountry();
+	Country getCountry();
 	Integer getYear();
 	Integer getQuantity();
 	Boolean getPerforated();

src/test/java/ru/mystamps/web/service/SeriesServiceTest.java

@@ -157,21 +157,15 @@ public void addShouldPassEntityToSeriesDao() {
 	@Test
 	public void addShouldLoadAndPassCountryToSeriesDaoIfCountryPresent() {
 		Country expectedCountry = CountryServiceTest.getCountry();
-		Integer expectedId      = expectedCountry.getId();
-		String expectedName     = expectedCountry.getName();
 
-		form.setCountry(expectedId);
-		
-		when(countryDao.findOne(anyInt())).thenReturn(expectedCountry);
+		form.setCountry(expectedCountry);
 
 		service.add(form);
 
-		verify(countryDao).findOne(eq(expectedId));
 		verify(seriesDao).save(seriesCaptor.capture());
 
 		assertThat(seriesCaptor.getValue().getCountry()).isNotNull();
-		assertThat(seriesCaptor.getValue().getCountry().getId()).isEqualTo(expectedId);
-		assertThat(seriesCaptor.getValue().getCountry().getName()).isEqualTo(expectedName);
+		assertThat(seriesCaptor.getValue().getCountry()).isEqualTo(expectedCountry);
 	}
 
 	@Test