Simplify code for persisting entities by cascading this operation from primary entity.

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/dao/GibbonsCatalogDao.java

@@ -20,6 +20,7 @@
 import java.util.Date;
 import java.util.Set;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
@@ -65,19 +66,19 @@ public class Series {
 	@Column(nullable = false)
 	private Boolean perforated;
 
-	@ManyToMany(fetch = FetchType.EAGER)
+	@ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
 	@OrderBy
 	private Set<MichelCatalog> michel;
 
-	@ManyToMany(fetch = FetchType.EAGER)
+	@ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
 	@OrderBy
 	private Set<ScottCatalog> scott;
 
-	@ManyToMany(fetch = FetchType.EAGER)
+	@ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
 	@OrderBy
 	private Set<YvertCatalog> yvert;
 
-	@ManyToMany(fetch = FetchType.EAGER)
+	@ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
 	@OrderBy
 	private Set<GibbonsCatalog> gibbons;
 

src/main/java/ru/mystamps/web/dao/MichelCatalogDao.java

@@ -32,11 +32,7 @@
 
 import org.apache.commons.lang3.Validate;
 
-import ru.mystamps.web.dao.GibbonsCatalogDao;
-import ru.mystamps.web.dao.MichelCatalogDao;
-import ru.mystamps.web.dao.ScottCatalogDao;
 import ru.mystamps.web.dao.SeriesDao;
-import ru.mystamps.web.dao.YvertCatalogDao;
 import ru.mystamps.web.entity.GibbonsCatalog;
 import ru.mystamps.web.entity.MichelCatalog;
 import ru.mystamps.web.entity.ScottCatalog;
@@ -52,18 +48,6 @@ public class SeriesService {
 	@Inject
 	private SeriesDao seriesDao;
 
-	@Inject
-	private MichelCatalogDao michelCatalogDao;
-	
-	@Inject
-	private ScottCatalogDao scottCatalogDao;
-	
-	@Inject
-	private YvertCatalogDao yvertCatalogDao;
-	
-	@Inject
-	private GibbonsCatalogDao gibbonsCatalogDao;
-	
 	@Inject
 	private ImageService imageService;
 
@@ -130,7 +114,6 @@ private void setMichelNumbersIfProvided(AddSeriesDto dto, Series series) {
 		Set<MichelCatalog> michelNumbers =
 			CatalogUtils.fromString(dto.getMichelNumbers(), MichelCatalog.class);
 		if (!michelNumbers.isEmpty()) {
-			michelCatalogDao.save(michelNumbers);
 			series.setMichel(michelNumbers);
 		}
 	}
@@ -139,7 +122,6 @@ private void setScottNumbersIfProvided(AddSeriesDto dto, Series series) {
 		Set<ScottCatalog> scottNumbers =
 			CatalogUtils.fromString(dto.getScottNumbers(), ScottCatalog.class);
 		if (!scottNumbers.isEmpty()) {
-			scottCatalogDao.save(scottNumbers);
 			series.setScott(scottNumbers);
 		}
 	}
@@ -148,7 +130,6 @@ private void setYvertNumbersIfProvided(AddSeriesDto dto, Series series) {
 		Set<YvertCatalog> yvertNumbers =
 			CatalogUtils.fromString(dto.getYvertNumbers(), YvertCatalog.class);
 		if (!yvertNumbers.isEmpty()) {
-			yvertCatalogDao.save(yvertNumbers);
 			series.setYvert(yvertNumbers);
 		}
 	}
@@ -157,7 +138,6 @@ private void setGibbonsNumbersIfProvided(AddSeriesDto dto, Series series) {
 		Set<GibbonsCatalog> gibbonsNumbers =
 			CatalogUtils.fromString(dto.getGibbonsNumbers(), GibbonsCatalog.class);
 		if (!gibbonsNumbers.isEmpty()) {
-			gibbonsCatalogDao.save(gibbonsNumbers);
 			series.setGibbons(gibbonsNumbers);
 		}
 	}

src/main/java/ru/mystamps/web/dao/ScottCatalogDao.java

@@ -43,11 +43,7 @@
 import static org.fest.assertions.api.Assertions.assertThat;
 
 import ru.mystamps.web.dao.CountryDao;
-import ru.mystamps.web.dao.GibbonsCatalogDao;
-import ru.mystamps.web.dao.MichelCatalogDao;
-import ru.mystamps.web.dao.ScottCatalogDao;
 import ru.mystamps.web.dao.SeriesDao;
-import ru.mystamps.web.dao.YvertCatalogDao;
 import ru.mystamps.web.entity.Country;
 import ru.mystamps.web.entity.GibbonsCatalog;
 import ru.mystamps.web.entity.MetaInfo;
@@ -65,18 +61,6 @@ public class SeriesServiceTest {
 	@Mock
 	private CountryDao countryDao;
 
-	@Mock
-	private MichelCatalogDao michelCatalogDao;
-	
-	@Mock
-	private ScottCatalogDao scottCatalogDao;
-	
-	@Mock
-	private YvertCatalogDao yvertCatalogDao;
-	
-	@Mock
-	private GibbonsCatalogDao gibbonsCatalogDao;
-	
 	@Mock
 	private ImageService imageService;
 
@@ -89,18 +73,6 @@ public class SeriesServiceTest {
 	@Captor
 	private ArgumentCaptor<Series> seriesCaptor;
 
-	@Captor
-	private ArgumentCaptor<Set<MichelCatalog>> michelCatalogCaptor;
-	
-	@Captor
-	private ArgumentCaptor<Set<ScottCatalog>> scottCatalogCaptor;
-	
-	@Captor
-	private ArgumentCaptor<Set<YvertCatalog>> yvertCatalogCaptor;
-	
-	@Captor
-	private ArgumentCaptor<Set<GibbonsCatalog>> gibbonsCatalogCaptor;
-	
 	@Captor
 	private ArgumentCaptor<MultipartFile> multipartFileCaptor;
 
@@ -221,20 +193,6 @@ public void addShouldPassNullToSeriesDaoIfMichelNumbersIsNull() {
 		assertThat(seriesCaptor.getValue().getMichel()).isNull();
 	}
 
-	@Test
-	public void addShouldSaveMichelNumbers() {
-		Set<MichelCatalog> expectedNumbers = newSet(
-			new MichelCatalog("1"),
-			new MichelCatalog("2")
-		);
-		form.setMichelNumbers(StringUtils.join(expectedNumbers, ','));
-		
-		service.add(form, user);
-		
-		verify(michelCatalogDao).save(michelCatalogCaptor.capture());
-		assertThat(michelCatalogCaptor.getValue()).isEqualTo(expectedNumbers);
-	}
-	
 	@Test
 	public void addShouldPassMichelNumbersToSeriesDao() {
 		Set<MichelCatalog> expectedNumbers = newSet(
@@ -260,20 +218,6 @@ public void addShouldPassNullToSeriesDaoIfScottNumbersIsNull() {
 		assertThat(seriesCaptor.getValue().getScott()).isNull();
 	}
 
-	@Test
-	public void addShouldSaveScottNumbers() {
-		Set<ScottCatalog> expectedNumbers = newSet(
-			new ScottCatalog("1"),
-			new ScottCatalog("2")
-		);
-		form.setScottNumbers(StringUtils.join(expectedNumbers, ','));
-		
-		service.add(form, user);
-		
-		verify(scottCatalogDao).save(scottCatalogCaptor.capture());
-		assertThat(scottCatalogCaptor.getValue()).isEqualTo(expectedNumbers);
-	}
-	
 	@Test
 	public void addShouldPassScottNumbersToSeriesDao() {
 		Set<ScottCatalog> expectedNumbers = newSet(
@@ -299,20 +243,6 @@ public void addShouldPassNullToSeriesDaoIfYvertNumbersIsNull() {
 		assertThat(seriesCaptor.getValue().getYvert()).isNull();
 	}
 
-	@Test
-	public void addShouldSaveYvertNumbers() {
-		Set<YvertCatalog> expectedNumbers = newSet(
-			new YvertCatalog("1"),
-			new YvertCatalog("2")
-		);
-		form.setYvertNumbers(StringUtils.join(expectedNumbers, ','));
-		
-		service.add(form, user);
-		
-		verify(yvertCatalogDao).save(yvertCatalogCaptor.capture());
-		assertThat(yvertCatalogCaptor.getValue()).isEqualTo(expectedNumbers);
-	}
-	
 	@Test
 	public void addShouldPassYvertNumbersToSeriesDao() {
 		Set<YvertCatalog> expectedNumbers = newSet(
@@ -338,20 +268,6 @@ public void addShouldPassNullToSeriesDaoIfGibbonsNumbersIsNull() {
 		assertThat(seriesCaptor.getValue().getGibbons()).isNull();
 	}
 
-	@Test
-	public void addShouldSaveGibbonsNumbers() {
-		Set<GibbonsCatalog> expectedNumbers = newSet(
-			new GibbonsCatalog("1"),
-			new GibbonsCatalog("2")
-		);
-		form.setGibbonsNumbers(StringUtils.join(expectedNumbers, ','));
-		
-		service.add(form, user);
-		
-		verify(gibbonsCatalogDao).save(gibbonsCatalogCaptor.capture());
-		assertThat(gibbonsCatalogCaptor.getValue()).isEqualTo(expectedNumbers);
-	}
-	
 	@Test
 	public void addShouldPassGibbonsNumbersToSeriesDao() {
 		Set<GibbonsCatalog> expectedNumbers = newSet(