diff --git a/src/integrationTest/java/app/mealsmadeeasy/api/recipe/RecipeControllerTests.java b/src/integrationTest/java/app/mealsmadeeasy/api/recipe/RecipeControllerTests.java index 68dbe23..5cb89e5 100644 --- a/src/integrationTest/java/app/mealsmadeeasy/api/recipe/RecipeControllerTests.java +++ b/src/integrationTest/java/app/mealsmadeeasy/api/recipe/RecipeControllerTests.java @@ -147,6 +147,7 @@ public class RecipeControllerTests { .andExpect(jsonPath("$.recipe.starCount").value(0)) .andExpect(jsonPath("$.recipe.viewerCount").value(0)) .andExpect(jsonPath("$.recipe.isPublic").value(true)) + .andExpect(jsonPath("$.recipe.mainImage").value(nullValue())) .andExpect(jsonPath("$.isStarred").value(nullValue())) .andExpect(jsonPath("$.isOwner").value(nullValue())); } @@ -218,7 +219,8 @@ public class RecipeControllerTests { .andExpect(jsonPath("$.content[0].owner.id").value(owner.getId())) .andExpect(jsonPath("$.content[0].owner.username").value(owner.getUsername())) .andExpect(jsonPath("$.content[0].isPublic").value(true)) - .andExpect(jsonPath("$.content[0].starCount").value(0)); + .andExpect(jsonPath("$.content[0].starCount").value(0)) + .andExpect(jsonPath("$.content[0].mainImage").value(nullValue())); } @Test @@ -277,6 +279,7 @@ public class RecipeControllerTests { .andExpect(jsonPath("$.recipe.starCount").value(0)) .andExpect(jsonPath("$.recipe.viewerCount").value(0)) .andExpect(jsonPath("$.recipe.isPublic").value(true)) + .andExpect(jsonPath("$.recipe.mainImage").value(nullValue())) .andExpect(jsonPath("$.isStarred").value(false)) .andExpect(jsonPath("$.isOwner").value(true)); } diff --git a/src/main/java/app/mealsmadeeasy/api/recipe/Recipe.java b/src/main/java/app/mealsmadeeasy/api/recipe/Recipe.java index 11b6d02..b1dcd65 100644 --- a/src/main/java/app/mealsmadeeasy/api/recipe/Recipe.java +++ b/src/main/java/app/mealsmadeeasy/api/recipe/Recipe.java @@ -24,5 +24,5 @@ public interface Recipe { boolean isPublic(); Set getViewers(); Set getComments(); - Image getMainImage(); + @Nullable Image getMainImage(); } diff --git a/src/main/java/app/mealsmadeeasy/api/recipe/RecipeEntity.java b/src/main/java/app/mealsmadeeasy/api/recipe/RecipeEntity.java index ac4d497..65a1131 100644 --- a/src/main/java/app/mealsmadeeasy/api/recipe/RecipeEntity.java +++ b/src/main/java/app/mealsmadeeasy/api/recipe/RecipeEntity.java @@ -224,11 +224,11 @@ public final class RecipeEntity implements Recipe { } @Override - public S3ImageEntity getMainImage() { + public @Nullable S3ImageEntity getMainImage() { return this.mainImage; } - public void setMainImage(S3ImageEntity image) { + public void setMainImage(@Nullable S3ImageEntity image) { this.mainImage = image; } diff --git a/src/main/java/app/mealsmadeeasy/api/recipe/view/FullRecipeView.java b/src/main/java/app/mealsmadeeasy/api/recipe/view/FullRecipeView.java index 0270681..45e31b5 100644 --- a/src/main/java/app/mealsmadeeasy/api/recipe/view/FullRecipeView.java +++ b/src/main/java/app/mealsmadeeasy/api/recipe/view/FullRecipeView.java @@ -17,7 +17,7 @@ public class FullRecipeView { boolean includeRawText, int starCount, int viewerCount, - ImageView mainImage + @Nullable ImageView mainImage ) { final FullRecipeView view = new FullRecipeView(); view.setId(recipe.getId()); @@ -53,7 +53,7 @@ public class FullRecipeView { private UserInfoView owner; private int starCount; private int viewerCount; - private ImageView mainImage; + private @Nullable ImageView mainImage; private boolean isPublic; public long getId() { @@ -161,11 +161,11 @@ public class FullRecipeView { this.viewerCount = viewerCount; } - public ImageView getMainImage() { + public @Nullable ImageView getMainImage() { return this.mainImage; } - public void setMainImage(ImageView mainImage) { + public void setMainImage(@Nullable ImageView mainImage) { this.mainImage = mainImage; }