SeriesServiceImpl: extract Price.valueOf() method.

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/entity/Price.java

@@ -26,6 +26,8 @@
 import javax.persistence.Enumerated;
 import javax.persistence.EnumType;
 
+import org.apache.commons.lang3.Validate;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -49,6 +51,16 @@ public class Price {
 	@Column(length = MAX_CURRENCY_LEGNTH)
 	private Currency currency;
 
+	public static Price valueOf(Double price, Currency currency) {
+		if (price == null) {
+			return null;
+		}
+		
+		Validate.isTrue(currency != null, "Currency must be non null when price is specified");
+		
+		return new Price(price, currency);
+	}
+	
 	@Override
 	public String toString() {
 		// TODO(performance): specify initial capacity explicitly

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

@@ -77,16 +77,16 @@ public Series add(AddSeriesDto dto, User user, boolean userCanAddComments) {
 		series.setPerforated(dto.getPerforated());
 
 		setMichelNumbersIfProvided(dto, series);
-		setMichelPriceIfProvided(dto, series);
+		series.setMichelPrice(Price.valueOf(dto.getMichelPrice(), dto.getMichelCurrency()));
 
 		setScottNumbersIfProvided(dto, series);
-		setScottPriceIfProvided(dto, series);
+		series.setScottPrice(Price.valueOf(dto.getScottPrice(), dto.getScottCurrency()));
 
 		setYvertNumbersIfProvided(dto, series);
-		setYvertPriceIfProvided(dto, series);
+		series.setYvertPrice(Price.valueOf(dto.getYvertPrice(), dto.getYvertCurrency()));
 
 		setGibbonsNumbersIfProvided(dto, series);
-		setGibbonsPriceIfProvided(dto, series);
+		series.setGibbonsPrice(Price.valueOf(dto.getGibbonsPrice(), dto.getGibbonsCurrency()));
 
 		String imageUrl = imageService.save(dto.getImage());
 		Validate.validState(imageUrl != null, "Image url must be non null");
@@ -204,18 +204,6 @@ private static void setMichelNumbersIfProvided(AddSeriesDto dto, Series series)
 		}
 	}
 
-	private static void setMichelPriceIfProvided(AddSeriesDto dto, Series series) {
-		if (dto.getMichelPrice() == null) {
-			return;
-		}
-		
-		Validate.isTrue(
-			dto.getMichelCurrency() != null,
-			"Michel currency must be non null when price is specified"
-		);
-		series.setMichelPrice(new Price(dto.getMichelPrice(), dto.getMichelCurrency()));
-	}
-	
 	private static void setScottNumbersIfProvided(AddSeriesDto dto, Series series) {
 		Set<ScottCatalog> scottNumbers =
 			CatalogUtils.fromString(dto.getScottNumbers(), ScottCatalog.class);
@@ -224,18 +212,6 @@ private static void setScottNumbersIfProvided(AddSeriesDto dto, Series series) {
 		}
 	}
 
-	private static void setScottPriceIfProvided(AddSeriesDto dto, Series series) {
-		if (dto.getScottPrice() == null) {
-			return;
-		}
-		
-		Validate.isTrue(
-			dto.getScottCurrency() != null,
-			"Scott currency must be non null when price is specified"
-		);
-		series.setScottPrice(new Price(dto.getScottPrice(), dto.getScottCurrency()));
-	}
-	
 	private static void setYvertNumbersIfProvided(AddSeriesDto dto, Series series) {
 		Set<YvertCatalog> yvertNumbers =
 			CatalogUtils.fromString(dto.getYvertNumbers(), YvertCatalog.class);
@@ -244,18 +220,6 @@ private static void setYvertNumbersIfProvided(AddSeriesDto dto, Series series) {
 		}
 	}
 
-	private static void setYvertPriceIfProvided(AddSeriesDto dto, Series series) {
-		if (dto.getYvertPrice() == null) {
-			return;
-		}
-		
-		Validate.isTrue(
-			dto.getYvertCurrency() != null,
-			"Yvert currency must be non null when price is specified"
-		);
-		series.setYvertPrice(new Price(dto.getYvertPrice(), dto.getYvertCurrency()));
-	}
-	
 	private static void setGibbonsNumbersIfProvided(AddSeriesDto dto, Series series) {
 		Set<GibbonsCatalog> gibbonsNumbers =
 			CatalogUtils.fromString(dto.getGibbonsNumbers(), GibbonsCatalog.class);
@@ -264,16 +228,4 @@ private static void setGibbonsNumbersIfProvided(AddSeriesDto dto, Series series)
 		}
 	}
 
-	private static void setGibbonsPriceIfProvided(AddSeriesDto dto, Series series) {
-		if (dto.getGibbonsPrice() == null) {
-			return;
-		}
-		
-		Validate.isTrue(
-			dto.getGibbonsCurrency() != null,
-			"Gibbons currency must be non null when price is specified"
-		);
-		series.setGibbonsPrice(new Price(dto.getGibbonsPrice(), dto.getGibbonsCurrency()));
-	}
-	
 }