Fixed merge conflicts

TouristGuideApp · Nov 26, 2022 · 6b42cfa · 6b42cfa
1 parent 99796a9
commit 6b42cfa
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/main/java/gr/thegoodsideofe1/tourguide/controllers/ImageController.java b/src/main/java/gr/thegoodsideofe1/tourguide/controllers/ImageController.java
@@ -66,11 +66,6 @@ public ResponseEntity<?> imageByTitle(@PathVariable String title,
         if (imagesCount != 0){
             Pageable paging = PageRequest.of(page, size);
             Page<Image> imagesPage = imageRepository.findAllImagesByTitle(title, paging);
-            if (imagesPage.getContent().isEmpty()) {
-                if (getFlickr(title)) {
-                    imagesPage = imageService.getImageByTitle(title, paging);
-                }
-            }
             return new ResponseEntity<>(imagesPage, HttpStatus.OK);
          }
          HashMap<String, String> returnMap = new HashMap<String, String>();