Revision ed6b517f
Added by Markus Döring about 16 years ago
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/service/RestController.java | ||
---|---|---|
14 | 14 |
import org.springframework.web.servlet.mvc.AbstractController; |
15 | 15 |
|
16 | 16 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
17 |
import eu.etaxonomy.cdm.persistence.dao.taxon.ITaxonDao; |
|
18 | 17 |
import eu.etaxonomy.cdm.remote.dto.NameTO; |
19 | 18 |
import eu.etaxonomy.cdm.remote.dto.ResultSetPageSTO; |
20 | 19 |
import eu.etaxonomy.cdm.remote.dto.TreeNode; |
... | ... | |
29 | 28 |
*/ |
30 | 29 |
public class RestController extends AbstractController |
31 | 30 |
{ |
32 |
Log log = LogFactory.getLog(XmlView.class);
|
|
31 |
Log log = LogFactory.getLog(RestController.class);
|
|
33 | 32 |
|
34 | 33 |
@Autowired |
35 | 34 |
private ICdmService service; |
36 |
@Autowired |
|
37 |
private ITaxonDao taxonDAO; |
|
38 | 35 |
|
39 | 36 |
/* |
40 | 37 |
* return page not found http error (400?) for unknown or incorrect UUIDs |
... | ... | |
50 | 47 |
String dto = getNonNullPara("dto",req); |
51 | 48 |
String uuid = getNonNullPara("uuid",req); |
52 | 49 |
String sec = getStringPara("sec",req); |
53 |
|
|
50 |
|
|
51 |
log.info(String.format("Request received: act=%s op=%s dto=%s uuid=%s sec=%s", action, op, dto, uuid, sec)); |
|
52 |
|
|
54 | 53 |
if(action==null){ |
55 | 54 |
// get Object by UUID |
56 | 55 |
if(dto.equalsIgnoreCase("name")){ |
... | ... | |
108 | 107 |
// TODO: THIS OPERATION IS FOR TESTING ONLY AND SHOULD BE REMOVED !!! |
109 | 108 |
// |
110 | 109 |
Taxon t = TestDataGenerator.getTestTaxon(); |
111 |
taxonDAO.save(t);
|
|
110 |
service.saveTaxon(t);
|
|
112 | 111 |
mv.addObject("status", "Test data inserted"); |
113 | 112 |
} |
114 | 113 |
// set xml or json view |
... | ... | |
120 | 119 |
} |
121 | 120 |
} |
122 | 121 |
|
122 |
/** |
|
123 |
* return a proper UUID for a string resembling a UUID |
|
124 |
* If the uuid string is not a valid UUID, a CdmObjectNonExisting exception is thrown |
|
125 |
* @param uuid |
|
126 |
* @return |
|
127 |
* @throws CdmObjectNonExisting |
|
128 |
*/ |
|
123 | 129 |
private UUID getUuid(String uuid) throws CdmObjectNonExisting{ |
124 | 130 |
UUID u=null; |
125 | 131 |
try{ |
Also available in: Unified diff