Revision 67c1061b
Added by Andreas Müller over 7 years ago
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/IdentifiableListController.java | ||
---|---|---|
158 | 158 |
* @see IdentifiableListController#doFindByIdentifier(Class, String, String, Integer, Integer, MatchMode, Boolean, HttpServletRequest, HttpServletResponse) |
159 | 159 |
* @throws IOException |
160 | 160 |
*/ |
161 |
@RequestMapping(method = RequestMethod.GET, value={"findByMarker"}, params={"subtree"})
|
|
161 |
@RequestMapping(method = RequestMethod.GET, value={"findByMarker"}) |
|
162 | 162 |
public Pager<FindByMarkerDTO<T>> doFindByMarker( |
163 | 163 |
@RequestParam(value = "class", required = false) Class<T> type, |
164 |
@RequestParam(value = "markerType", required = true) String markerTypeUuidStr,
|
|
164 |
@RequestParam(value = "markerType", required = true) UUID markerTypeUuid,
|
|
165 | 165 |
@RequestParam(value = "value", required = false) Boolean value, |
166 | 166 |
@RequestParam(value = "pageNumber", required = false) Integer pageNumber, |
167 | 167 |
@RequestParam(value = "pageSize", required = false) Integer pageSize, |
... | ... | |
172 | 172 |
throws IOException { |
173 | 173 |
|
174 | 174 |
MarkerType markerType = null; |
175 |
if(StringUtils.isNotBlank(markerTypeUuidStr)){ |
|
176 |
markerTypeUuidStr = StringUtils.trim(markerTypeUuidStr); |
|
177 |
UUID markerTypeUUID = UUID.fromString(markerTypeUuidStr); |
|
178 |
DefinedTermBase<?> term = CdmBase.deproxy(termService.find(markerTypeUUID), MarkerType.class); |
|
175 |
if(markerTypeUuid != null){ |
|
176 |
DefinedTermBase<?> term = CdmBase.deproxy(termService.find(markerTypeUuid), MarkerType.class); |
|
179 | 177 |
if (term != null && term.isInstanceOf(MarkerType.class)){ |
180 | 178 |
markerType = CdmBase.deproxy(term, MarkerType.class); |
181 | 179 |
} |
Also available in: Unified diff
ref #6072 fix signature issue in remote (2nd try)