Project

General

Profile

« Previous | Next » 

Revision f208f9a2

Added by Andreas Kohlbecker over 2 years ago

fix #9722 serialization of response by jackson

View differences:

cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/MediaController.java
27 27
import org.springframework.web.bind.annotation.RequestMapping;
28 28
import org.springframework.web.bind.annotation.RequestMethod;
29 29
import org.springframework.web.bind.annotation.RequestParam;
30
import org.springframework.web.bind.annotation.ResponseBody;
30 31

  
31 32
import eu.etaxonomy.cdm.api.service.IMediaService;
32 33
import eu.etaxonomy.cdm.api.service.media.MediaInfoFactory;
......
67 68

  
68 69

  
69 70
    @RequestMapping(value = {"metadata"}, method = RequestMethod.GET)
71
    @ResponseBody // = is REST service method with json response
70 72
    public Map<String, String> doGetMediaMetaData(
71 73
            @PathVariable("uuid") UUID uuid,
72 74
            @RequestParam(value = "applyFilterPreset", defaultValue = "true") Boolean applyFilterPreset,
......
85 87
            URI uri = null;
86 88
            try {
87 89
                if(applyFilterPreset) {
88
                        result = service.readResourceMetadataFiltered(mediaRepresentation);
89

  
90
                   result = service.readResourceMetadataFiltered(mediaRepresentation);
90 91
                } else {
91 92
                    uri = mediaRepresentation.getParts().get(0).getUri();
92 93
                    CdmImageInfo cdmImageInfo = mediaInfoFactory.cdmImageInfoWithMetaData(uri);

Also available in: Unified diff