Project

General

Profile

« Previous | Next » 

Revision 21c87d73

Added by Patrick Plitzner over 6 years ago

#5890 Use ModelAndView for portal controller

View differences:

cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationPortalController.java
27 27
import org.springframework.web.bind.annotation.PathVariable;
28 28
import org.springframework.web.bind.annotation.RequestMapping;
29 29
import org.springframework.web.bind.annotation.RequestMethod;
30
import org.springframework.web.servlet.ModelAndView;
30 31

  
31 32
import eu.etaxonomy.cdm.api.service.IClassificationService;
32 33
import eu.etaxonomy.cdm.database.UpdatableRoutingDataSource;
33 34
import eu.etaxonomy.cdm.model.name.Rank;
34 35
import eu.etaxonomy.cdm.model.taxon.Classification;
35
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
36 36
import eu.etaxonomy.cdm.remote.editor.RankPropertyEditor;
37 37

  
38 38
/**
......
86 86
    }
87 87

  
88 88
    @RequestMapping(value = { "classificationRootNode" }, method = RequestMethod.GET)
89
    public TaxonNode getClassificationRootNode(@PathVariable("uuid") UUID uuid, HttpServletRequest request,
89
    public ModelAndView getClassificationRootNode(@PathVariable("uuid") UUID uuid, HttpServletRequest request,
90 90
            HttpServletResponse response) throws IOException {
91 91

  
92
        Classification classification = doGet(uuid, request, response);
93
        if(classification!=null){
94
            return classification.getRootNode();
95
        }
96
        return null;
92
        ModelAndView mv = new ModelAndView();
93
        mv.addObject(service.getRootNode(uuid));
94
        return mv;
97 95
    }
98 96

  
99 97

  

Also available in: Unified diff