tab
This commit is contained in:
Theophyl Hoguet committed
1 parent
d1624e9a9d
commit
5a9f904427
1 file changed
+175
-175
@@ -38,193 +38,193 @@ import java.awt.image.BufferedImage;
|
||||
@RestController
|
||||
public class ImageController {
|
||||
|
||||
@Autowired
|
||||
private ObjectMapper mapper;
|
||||
@Autowired
|
||||
private ObjectMapper mapper;
|
||||
|
||||
private final ImageDao imageDao;
|
||||
private final ImageDao imageDao;
|
||||
|
||||
public ImageController(ImageDao imageDao) {
|
||||
this.imageDao = imageDao;
|
||||
}
|
||||
public ImageController(ImageDao imageDao) {
|
||||
this.imageDao = imageDao;
|
||||
}
|
||||
|
||||
@DeleteMapping(value = "/images/{id}")
|
||||
public ResponseEntity<?> deleteImage(@PathVariable("id") long id) {
|
||||
@DeleteMapping(value = "/images/{id}")
|
||||
public ResponseEntity<?> deleteImage(@PathVariable("id") long id) {
|
||||
|
||||
Optional<Image> image = imageDao.retrieve(id);
|
||||
Optional<Image> image = imageDao.retrieve(id);
|
||||
|
||||
if (image.isPresent()) {
|
||||
imageDao.delete(image.get());
|
||||
return new ResponseEntity<>("Image id=" + id + " deleted.", HttpStatus.OK);
|
||||
}
|
||||
return new ResponseEntity<>("Image id=" + id + " not found.", HttpStatus.NOT_FOUND);
|
||||
}
|
||||
if (image.isPresent()) {
|
||||
imageDao.delete(image.get());
|
||||
return new ResponseEntity<>("Image id=" + id + " deleted.", HttpStatus.OK);
|
||||
}
|
||||
return new ResponseEntity<>("Image id=" + id + " not found.", HttpStatus.NOT_FOUND);
|
||||
}
|
||||
|
||||
@PostMapping(value = "/images")
|
||||
public ResponseEntity<?> addImage(@RequestParam("file") MultipartFile file, RedirectAttributes redirectAttributes) {
|
||||
@PostMapping(value = "/images")
|
||||
public ResponseEntity<?> addImage(@RequestParam("file") MultipartFile file, RedirectAttributes redirectAttributes) {
|
||||
|
||||
String contentType = file.getContentType();
|
||||
if (contentType != null && !contentType.equals(MediaType.IMAGE_JPEG.toString())
|
||||
&& !contentType.equals(MediaType.IMAGE_PNG.toString())) {
|
||||
return new ResponseEntity<>("Only JPEG/PNG file format supported", HttpStatus.UNSUPPORTED_MEDIA_TYPE);
|
||||
}
|
||||
try {
|
||||
imageDao.create(new Image(file.getOriginalFilename(), file.getBytes()));
|
||||
} catch (IOException e) {
|
||||
return new ResponseEntity<>("Failure to read file", HttpStatus.NO_CONTENT);
|
||||
}
|
||||
return new ResponseEntity<>("Image uploaded", HttpStatus.CREATED);
|
||||
}
|
||||
String contentType = file.getContentType();
|
||||
if (contentType != null && !contentType.equals(MediaType.IMAGE_JPEG.toString())
|
||||
&& !contentType.equals(MediaType.IMAGE_PNG.toString())) {
|
||||
return new ResponseEntity<>("Only JPEG/PNG file format supported", HttpStatus.UNSUPPORTED_MEDIA_TYPE);
|
||||
}
|
||||
try {
|
||||
imageDao.create(new Image(file.getOriginalFilename(), file.getBytes()));
|
||||
} catch (IOException e) {
|
||||
return new ResponseEntity<>("Failure to read file", HttpStatus.NO_CONTENT);
|
||||
}
|
||||
return new ResponseEntity<>("Image uploaded", HttpStatus.CREATED);
|
||||
}
|
||||
|
||||
@GetMapping(value = "/images", produces = "application/json")
|
||||
@ResponseBody
|
||||
public ArrayNode getImageList() {
|
||||
List<Image> images = imageDao.retrieveAll();
|
||||
ArrayNode nodes = mapper.createArrayNode();
|
||||
for (Image image : images) {
|
||||
ObjectNode objectNode = mapper.createObjectNode();
|
||||
objectNode.put("id", image.getId());
|
||||
objectNode.put("name", image.getName());
|
||||
objectNode.put("size", image.getSize());
|
||||
objectNode.put("type", image.getMediaType().toString());
|
||||
nodes.add(objectNode);
|
||||
}
|
||||
return nodes;
|
||||
}
|
||||
@GetMapping(value = "/images", produces = "application/json")
|
||||
@ResponseBody
|
||||
public ArrayNode getImageList() {
|
||||
List<Image> images = imageDao.retrieveAll();
|
||||
ArrayNode nodes = mapper.createArrayNode();
|
||||
for (Image image : images) {
|
||||
ObjectNode objectNode = mapper.createObjectNode();
|
||||
objectNode.put("id", image.getId());
|
||||
objectNode.put("name", image.getName());
|
||||
objectNode.put("size", image.getSize());
|
||||
objectNode.put("type", image.getMediaType().toString());
|
||||
nodes.add(objectNode);
|
||||
}
|
||||
return nodes;
|
||||
}
|
||||
|
||||
@GetMapping(value = "/images/{id}", produces = { MediaType.IMAGE_JPEG_VALUE,
|
||||
MediaType.IMAGE_PNG_VALUE })
|
||||
public ResponseEntity<?> getImage(@PathVariable("id") long id,
|
||||
@RequestParam(required = false) Map<String, String> parameters) {
|
||||
@GetMapping(value = "/images/{id}", produces = { MediaType.IMAGE_JPEG_VALUE,
|
||||
MediaType.IMAGE_PNG_VALUE })
|
||||
public ResponseEntity<?> getImage(@PathVariable("id") long id,
|
||||
@RequestParam(required = false) Map<String, String> parameters) {
|
||||
|
||||
Optional<Image> image = imageDao.retrieve(id);
|
||||
if (image.isPresent()) {
|
||||
if (parameters.isEmpty()) {
|
||||
InputStream inputStream = new ByteArrayInputStream(image.get().getData());
|
||||
return ResponseEntity.ok().contentType(image.get().getMediaType())
|
||||
.body(new InputStreamResource(inputStream));
|
||||
Optional<Image> image = imageDao.retrieve(id);
|
||||
if (image.isPresent()) {
|
||||
if (parameters.isEmpty()) {
|
||||
InputStream inputStream = new ByteArrayInputStream(image.get().getData());
|
||||
return ResponseEntity.ok().contentType(image.get().getMediaType())
|
||||
.body(new InputStreamResource(inputStream));
|
||||
|
||||
}
|
||||
if (parameters.containsKey("algorithm")) {
|
||||
String algo = parameters.get("algorithm");
|
||||
BufferedImage bufImg;
|
||||
try {
|
||||
bufImg = ImageIO.read(new ByteArrayInputStream(image.get().getData()));
|
||||
} catch (IOException e) {
|
||||
return new ResponseEntity<>("Image not readable",
|
||||
HttpStatus.INTERNAL_SERVER_ERROR);
|
||||
}
|
||||
Planar<GrayU8> input = ConvertBufferedImage.convertFromPlanar(bufImg, null,
|
||||
true, GrayU8.class);
|
||||
if (algo.equals("changeLuminosity")) {
|
||||
if (parameters.containsKey("delta")
|
||||
&& parameters.size() == 2) {
|
||||
try {
|
||||
int i = Integer.parseInt(parameters.get("delta"));
|
||||
ImageProcessing.changeLuminosity(input, i);
|
||||
} catch (NumberFormatException e) {
|
||||
return new ResponseEntity<>("Parameter 'delta' should be an integer",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
} else {
|
||||
return new ResponseEntity<>(
|
||||
"Algorithm 'changeLuminosity' requires one parameter 'delta'(integer)",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
} else if (algo.equals("histogram")) {
|
||||
if (parameters.size() == 1) {
|
||||
ImageProcessing.histogram(input);
|
||||
} else {
|
||||
return new ResponseEntity<>(
|
||||
"Algorithm 'histogram' requires no parameters",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
} else if (algo.equals("colorFilter")) {
|
||||
if (parameters.containsKey("hue") && parameters.size() == 2) {
|
||||
try {
|
||||
int i = Integer.parseInt(parameters.get("hue"));
|
||||
ImageProcessing.colorFilter(i, input);
|
||||
// hue entre 0 et 360?
|
||||
} catch (NumberFormatException e) {
|
||||
return new ResponseEntity<>("Parameter 'hue' should be an integer",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
} else {
|
||||
return new ResponseEntity<>(
|
||||
"Algorithm 'colorFilter' requires one parameter 'hue'(integer)",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
} else if (algo.equals("meanFilter")) {
|
||||
if (parameters.containsKey("size") && parameters.size() == 2) {
|
||||
try {
|
||||
int i = Integer.parseInt(parameters.get("size"));
|
||||
if (i % 2 == 0) {
|
||||
return new ResponseEntity<>("Parameter 'size' should be an odd positive integer",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
Planar<GrayU8> clone = input.clone();
|
||||
ImageProcessing.meanFilter(clone, input, i);
|
||||
} catch (NumberFormatException e) {
|
||||
return new ResponseEntity<>("Parameter 'size' should be an odd positive integer",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
} else {
|
||||
return new ResponseEntity<>(
|
||||
"Algorithm 'meanFilter' requires one parameter 'size'(odd positive integer)",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
} else if (algo.equals("gaussienFilter")) {
|
||||
if (parameters.containsKey("size") && parameters.size() == 2) {
|
||||
try {
|
||||
int i = Integer.parseInt(parameters.get("size"));
|
||||
if (i % 2 == 0) {
|
||||
return new ResponseEntity<>("Parameter 'size' should be an odd positive integer",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
Planar<GrayU8> clone = input.clone();
|
||||
ImageProcessing.gaussienFilter(clone, input, i);
|
||||
} catch (NumberFormatException e) {
|
||||
return new ResponseEntity<>("Parameter 'size' should be an odd positive integer",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
} else {
|
||||
return new ResponseEntity<>(
|
||||
"Algorithm 'gaussienFilter' requires one parameter 'size'(odd positive integer)",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
} else if (algo.equals("contours")) {
|
||||
if (parameters.size() == 1) {
|
||||
Planar<GrayU8> clone = input.clone();
|
||||
ImageProcessing.gradientImageSobel(clone, input);
|
||||
} else {
|
||||
return new ResponseEntity<>(
|
||||
"Algorithm 'contours' requires no parameters",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
} else {
|
||||
return new ResponseEntity<>(
|
||||
"The requested algorithm '" + parameters.get("algorithm") + "' doesn't exist",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
bufImg = ConvertBufferedImage.convertTo_U8(input, null, true);
|
||||
ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
||||
try {
|
||||
ImageIO.write(bufImg, image.get().getMediaType().getSubtype(), baos);
|
||||
}
|
||||
if (parameters.containsKey("algorithm")) {
|
||||
String algo = parameters.get("algorithm");
|
||||
BufferedImage bufImg;
|
||||
try {
|
||||
bufImg = ImageIO.read(new ByteArrayInputStream(image.get().getData()));
|
||||
} catch (IOException e) {
|
||||
return new ResponseEntity<>("Image not readable",
|
||||
HttpStatus.INTERNAL_SERVER_ERROR);
|
||||
}
|
||||
Planar<GrayU8> input = ConvertBufferedImage.convertFromPlanar(bufImg, null,
|
||||
true, GrayU8.class);
|
||||
if (algo.equals("changeLuminosity")) {
|
||||
if (parameters.containsKey("delta")
|
||||
&& parameters.size() == 2) {
|
||||
try {
|
||||
int i = Integer.parseInt(parameters.get("delta"));
|
||||
ImageProcessing.changeLuminosity(input, i);
|
||||
} catch (NumberFormatException e) {
|
||||
return new ResponseEntity<>("Parameter 'delta' should be an integer",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
} else {
|
||||
return new ResponseEntity<>(
|
||||
"Algorithm 'changeLuminosity' requires one parameter 'delta'(integer)",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
} else if (algo.equals("histogram")) {
|
||||
if (parameters.size() == 1) {
|
||||
ImageProcessing.histogram(input);
|
||||
} else {
|
||||
return new ResponseEntity<>(
|
||||
"Algorithm 'histogram' requires no parameters",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
} else if (algo.equals("colorFilter")) {
|
||||
if (parameters.containsKey("hue") && parameters.size() == 2) {
|
||||
try {
|
||||
int i = Integer.parseInt(parameters.get("hue"));
|
||||
ImageProcessing.colorFilter(i, input);
|
||||
// hue entre 0 et 360?
|
||||
} catch (NumberFormatException e) {
|
||||
return new ResponseEntity<>("Parameter 'hue' should be an integer",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
} else {
|
||||
return new ResponseEntity<>(
|
||||
"Algorithm 'colorFilter' requires one parameter 'hue'(integer)",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
} else if (algo.equals("meanFilter")) {
|
||||
if (parameters.containsKey("size") && parameters.size() == 2) {
|
||||
try {
|
||||
int i = Integer.parseInt(parameters.get("size"));
|
||||
if (i % 2 == 0) {
|
||||
return new ResponseEntity<>("Parameter 'size' should be an odd positive integer",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
Planar<GrayU8> clone = input.clone();
|
||||
ImageProcessing.meanFilter(clone, input, i);
|
||||
} catch (NumberFormatException e) {
|
||||
return new ResponseEntity<>("Parameter 'size' should be an odd positive integer",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
} else {
|
||||
return new ResponseEntity<>(
|
||||
"Algorithm 'meanFilter' requires one parameter 'size'(odd positive integer)",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
} else if (algo.equals("gaussienFilter")) {
|
||||
if (parameters.containsKey("size") && parameters.size() == 2) {
|
||||
try {
|
||||
int i = Integer.parseInt(parameters.get("size"));
|
||||
if (i % 2 == 0) {
|
||||
return new ResponseEntity<>("Parameter 'size' should be an odd positive integer",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
Planar<GrayU8> clone = input.clone();
|
||||
ImageProcessing.gaussienFilter(clone, input, i);
|
||||
} catch (NumberFormatException e) {
|
||||
return new ResponseEntity<>("Parameter 'size' should be an odd positive integer",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
} else {
|
||||
return new ResponseEntity<>(
|
||||
"Algorithm 'gaussienFilter' requires one parameter 'size'(odd positive integer)",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
} else if (algo.equals("contours")) {
|
||||
if (parameters.size() == 1) {
|
||||
Planar<GrayU8> clone = input.clone();
|
||||
ImageProcessing.gradientImageSobel(clone, input);
|
||||
} else {
|
||||
return new ResponseEntity<>(
|
||||
"Algorithm 'contours' requires no parameters",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
} else {
|
||||
return new ResponseEntity<>(
|
||||
"The requested algorithm '" + parameters.get("algorithm") + "' doesn't exist",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
bufImg = ConvertBufferedImage.convertTo_U8(input, null, true);
|
||||
ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
||||
try {
|
||||
ImageIO.write(bufImg, image.get().getMediaType().getSubtype(), baos);
|
||||
|
||||
} catch (IOException e) {
|
||||
return new ResponseEntity<>("Image couldn't be converted",
|
||||
HttpStatus.INTERNAL_SERVER_ERROR);
|
||||
}
|
||||
byte[] imageData = baos.toByteArray();
|
||||
} catch (IOException e) {
|
||||
return new ResponseEntity<>("Image couldn't be converted",
|
||||
HttpStatus.INTERNAL_SERVER_ERROR);
|
||||
}
|
||||
byte[] imageData = baos.toByteArray();
|
||||
|
||||
InputStream inputStream = new ByteArrayInputStream(imageData);
|
||||
return ResponseEntity.ok().contentType(image.get().getMediaType())
|
||||
.body(new InputStreamResource(inputStream));
|
||||
} else {
|
||||
return new ResponseEntity<>("First parameter should be 'algorithm",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
InputStream inputStream = new ByteArrayInputStream(imageData);
|
||||
return ResponseEntity.ok().contentType(image.get().getMediaType())
|
||||
.body(new InputStreamResource(inputStream));
|
||||
} else {
|
||||
return new ResponseEntity<>("First parameter should be 'algorithm",
|
||||
HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
|
||||
}
|
||||
return new ResponseEntity<>("Image id=" + id + " not found.", HttpStatus.NOT_FOUND);
|
||||
}
|
||||
}
|
||||
return new ResponseEntity<>("Image id=" + id + " not found.", HttpStatus.NOT_FOUND);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user