check if article.image is null

This commit is contained in:
Hendrik Schutter 2020-06-01 10:53:10 +02:00
parent 1a1502b38c
commit 38fcda708f
2 changed files with 15 additions and 7 deletions

View File

@ -148,9 +148,9 @@ public class InternArticleController {
File tmpFile = new File(defaultImagePath);
// test if default img file exits
if (!tmpFile.exists()) {
// fallback if the file not exists
// fallback if the file not exists
// create new file
BufferedImage bufferedImage = new BufferedImage(422, 428, BufferedImage.TYPE_INT_RGB);
BufferedImage bufferedImage = new BufferedImage(422, 428, BufferedImage.TYPE_INT_RGB);
try {
ImageIO.write(bufferedImage, "jpg", new File(defaultImagePath)); // save new file on disk
} catch (IOException e) {
@ -208,7 +208,10 @@ public class InternArticleController {
public long id;
void addListedArticle(Article article, int stock) {
this.imgPath = article.image.path;
if (article.image != null) {
this.imgPath = article.image.path;
}
this.title = article.title;
this.price_netto = String.format("%.2f", ((float) article.shopPricePerUnitNetCent / 100));
this.price = String.format("%.2f", ((float) article.getPriceGross() / 100));
@ -338,7 +341,9 @@ public class InternArticleController {
}
void addArticle(Article article, int stock) {
this.imgPath = article.image.path;
if (article.image != null) {
this.imgPath = article.image.path;
}
this.title = article.title;
this.price_netto = String.format("%.2f", ((float) article.shopPricePerUnitNetCent / 100));
this.price = String.format("%.2f", ((float) article.getPriceGross() / 100));

View File

@ -100,8 +100,11 @@ public class ShopArticleController {
@PathVariable("id") Long id
) throws IOException {
Article article = articleRepository.findArticleById(id);
InputStream in = new FileInputStream(article.image.path);
response.setContentType(MediaType.IMAGE_JPEG_VALUE);
IOUtils.copy(in, response.getOutputStream());
if(article.image != null) {
InputStream in = new FileInputStream(article.image.path);
response.setContentType(MediaType.IMAGE_JPEG_VALUE);
IOUtils.copy(in, response.getOutputStream());
}
}
}