Revision 52779
Added by Alessia Bardi about 6 years ago
| OpenaireResultSubmitter.java | ||
|---|---|---|
| 109 | 109 |
public @ResponseBody String feedResult(@RequestBody final ResultEntry pub, |
| 110 | 110 |
@RequestParam(value = "commit", required = false, defaultValue = "true") final boolean commit) |
| 111 | 111 |
throws DirecIndexApiException {
|
| 112 |
|
|
| 113 |
return feedObject(pub, commit); |
|
| 112 |
return feed(pub, commit); |
|
| 114 | 113 |
} |
| 115 | 114 |
|
| 115 |
@Deprecated |
|
| 116 | 116 |
@RequestMapping(value = { "/api/publications/feedObject" }, method = RequestMethod.POST)
|
| 117 | 117 |
public @ResponseBody String feedObject(@RequestBody final ResultEntry pub, |
| 118 | 118 |
@RequestParam(value = "commit", required = false, defaultValue = "true") final boolean commit) |
| 119 | 119 |
throws DirecIndexApiException {
|
| 120 |
return feed(pub, commit); |
|
| 121 |
} |
|
| 120 | 122 |
|
| 123 |
|
|
| 124 |
@RequestMapping(value = "/api/result/{openaireId}", method = RequestMethod.DELETE)
|
|
| 125 |
public @ResponseBody boolean deleteResultWithOpenaireId( |
|
| 126 |
@PathVariable(value = "openaireId") final String openaireId, |
|
| 127 |
@RequestParam(value = "commit", required = false, defaultValue = "true") final boolean commit) throws DirecIndexApiException {
|
|
| 128 |
|
|
| 129 |
return deleteResult(openaireId, commit); |
|
| 130 |
} |
|
| 131 |
|
|
| 132 |
@RequestMapping(value = "/api/results", method = RequestMethod.DELETE) |
|
| 133 |
public @ResponseBody boolean deleteResultWithOriginalId( |
|
| 134 |
@RequestParam(value = "originalId", required = true) final String originalId, |
|
| 135 |
@RequestParam(value = "collectedFromId", required = true) final String collectedFromId, |
|
| 136 |
@RequestParam(value = "commit", required = false, defaultValue = "true") final boolean commit) throws Exception {
|
|
| 137 |
|
|
| 138 |
final String openaireId = ResultEntry.calculateOpenaireId(originalId, collectedFromId, serviceLocator.getService(ISLookUpService.class)); |
|
| 139 |
return deleteResult(openaireId, commit); |
|
| 140 |
} |
|
| 141 |
|
|
| 142 |
@Deprecated |
|
| 143 |
@RequestMapping(value = { "/api/publications/deleteObject", "/api/results/delete" }, method = RequestMethod.POST)
|
|
| 144 |
public @ResponseBody boolean deleteResultPost( |
|
| 145 |
@RequestParam(value = "originalId", required = true) final String originalId, |
|
| 146 |
@RequestParam(value = "collectedFromId", required = true) final String collectedFromId, |
|
| 147 |
@RequestParam(value = "commit", required = false, defaultValue = "true") final boolean commit) throws Exception {
|
|
| 148 |
|
|
| 149 |
final String openaireId = ResultEntry.calculateOpenaireId(originalId, collectedFromId, serviceLocator.getService(ISLookUpService.class)); |
|
| 150 |
return deleteResult(openaireId, commit); |
|
| 151 |
} |
|
| 152 |
|
|
| 153 |
private String feed(final ResultEntry pub, final boolean commit) throws DirecIndexApiException {
|
|
| 121 | 154 |
final List<IndexDsInfo> idxList; |
| 122 | 155 |
try {
|
| 123 | 156 |
idxList = calculateCurrentIndexDsInfo(); |
| ... | ... | |
| 150 | 183 |
} |
| 151 | 184 |
} |
| 152 | 185 |
|
| 153 |
@RequestMapping(value = "/api/result/{openaireId}", method = RequestMethod.DELETE)
|
|
| 154 |
public @ResponseBody boolean deleteResultWithOpenaireId( |
|
| 155 |
@PathVariable(value = "openaireId") final String openaireId, |
|
| 156 |
@RequestParam(value = "commit", required = false, defaultValue = "true") final boolean commit) throws DirecIndexApiException {
|
|
| 157 | 186 |
|
| 158 |
return deleteResult(openaireId, commit); |
|
| 159 |
} |
|
| 160 |
|
|
| 161 |
@RequestMapping(value = "/api/results", method = RequestMethod.DELETE) |
|
| 162 |
public @ResponseBody boolean deleteResultWithOriginalId( |
|
| 163 |
@RequestParam(value = "originalId", required = true) final String originalId, |
|
| 164 |
@RequestParam(value = "collectedFromId", required = true) final String collectedFromId, |
|
| 165 |
@RequestParam(value = "commit", required = false, defaultValue = "true") final boolean commit) throws Exception {
|
|
| 166 |
|
|
| 167 |
final String openaireId = ResultEntry.calculateOpenaireId(originalId, collectedFromId, serviceLocator.getService(ISLookUpService.class)); |
|
| 168 |
return deleteResult(openaireId, commit); |
|
| 169 |
} |
|
| 170 |
|
|
| 171 |
@Deprecated |
|
| 172 |
@RequestMapping(value = { "/api/publications/deleteObject", "/api/results/delete" }, method = RequestMethod.POST)
|
|
| 173 |
public @ResponseBody boolean deleteResultPost( |
|
| 174 |
@RequestParam(value = "originalId", required = true) final String originalId, |
|
| 175 |
@RequestParam(value = "collectedFromId", required = true) final String collectedFromId, |
|
| 176 |
@RequestParam(value = "commit", required = false, defaultValue = "true") final boolean commit) throws Exception {
|
|
| 177 |
|
|
| 178 |
final String openaireId = ResultEntry.calculateOpenaireId(originalId, collectedFromId, serviceLocator.getService(ISLookUpService.class)); |
|
| 179 |
return deleteResult(openaireId, commit); |
|
| 180 |
} |
|
| 181 |
|
|
| 182 | 187 |
private boolean deleteResult(final String openaireId, final boolean commit) throws DirecIndexApiException {
|
| 183 | 188 |
|
| 184 | 189 |
final List<IndexDsInfo> idxList; |
Also available in: Unified diff
simple code refactoring