diff --git a/src/integrationTest/java/app/mealsmadeeasy/api/recipe/RecipeControllerTests.java b/src/integrationTest/java/app/mealsmadeeasy/api/recipe/RecipeControllerTests.java index 5cb89e5..f5ab00f 100644 --- a/src/integrationTest/java/app/mealsmadeeasy/api/recipe/RecipeControllerTests.java +++ b/src/integrationTest/java/app/mealsmadeeasy/api/recipe/RecipeControllerTests.java @@ -323,7 +323,7 @@ public class RecipeControllerTests { final RecipeUpdateSpec.MainImageUpdateSpec mainImageUpdateSpec = new RecipeUpdateSpec.MainImageUpdateSpec(); mainImageUpdateSpec.setUsername(hal9000.getOwner().getUsername()); mainImageUpdateSpec.setFilename(hal9000.getUserFilename()); - updateSpec.setMainImageUpdateSpec(mainImageUpdateSpec); + updateSpec.setMainImage(mainImageUpdateSpec); final String body = this.objectMapper.writeValueAsString(updateSpec); final String accessToken = this.getAccessToken(owner); diff --git a/src/main/java/app/mealsmadeeasy/api/recipe/RecipeServiceImpl.java b/src/main/java/app/mealsmadeeasy/api/recipe/RecipeServiceImpl.java index 51b889c..a734e8a 100644 --- a/src/main/java/app/mealsmadeeasy/api/recipe/RecipeServiceImpl.java +++ b/src/main/java/app/mealsmadeeasy/api/recipe/RecipeServiceImpl.java @@ -219,12 +219,12 @@ public class RecipeServiceImpl implements RecipeService { recipe.setPublic(spec.getIsPublic()); final S3ImageEntity mainImage; - if (spec.getMainImageUpdateSpec() == null) { + if (spec.getMainImage() == null) { mainImage = null; } else { mainImage = (S3ImageEntity) this.imageService.getByUsernameAndFilename( - spec.getMainImageUpdateSpec().getUsername(), - spec.getMainImageUpdateSpec().getFilename(), + spec.getMainImage().getUsername(), + spec.getMainImage().getFilename(), modifier ); } diff --git a/src/main/java/app/mealsmadeeasy/api/recipe/spec/RecipeUpdateSpec.java b/src/main/java/app/mealsmadeeasy/api/recipe/spec/RecipeUpdateSpec.java index 1bf8293..4ba0727 100644 --- a/src/main/java/app/mealsmadeeasy/api/recipe/spec/RecipeUpdateSpec.java +++ b/src/main/java/app/mealsmadeeasy/api/recipe/spec/RecipeUpdateSpec.java @@ -38,7 +38,7 @@ public class RecipeUpdateSpec { private @Nullable Integer totalTime; private String rawText; private boolean isPublic; - private @Nullable MainImageUpdateSpec mainImageUpdateSpec; + private @Nullable MainImageUpdateSpec mainImage; public RecipeUpdateSpec() {} @@ -56,9 +56,9 @@ public class RecipeUpdateSpec { this.isPublic = recipe.isPublic(); final @Nullable Image mainImage = recipe.getMainImage(); if (mainImage != null) { - this.mainImageUpdateSpec = new MainImageUpdateSpec(); - this.mainImageUpdateSpec.setUsername(mainImage.getOwner().getUsername()); - this.mainImageUpdateSpec.setFilename(mainImage.getUserFilename()); + this.mainImage = new MainImageUpdateSpec(); + this.mainImage.setUsername(mainImage.getOwner().getUsername()); + this.mainImage.setFilename(mainImage.getUserFilename()); } } @@ -110,12 +110,12 @@ public class RecipeUpdateSpec { this.isPublic = isPublic; } - public @Nullable MainImageUpdateSpec getMainImageUpdateSpec() { - return this.mainImageUpdateSpec; + public @Nullable MainImageUpdateSpec getMainImage() { + return this.mainImage; } - public void setMainImageUpdateSpec(@Nullable MainImageUpdateSpec mainImageUpdateSpec) { - this.mainImageUpdateSpec = mainImageUpdateSpec; + public void setMainImage(@Nullable MainImageUpdateSpec mainImage) { + this.mainImage = mainImage; } }