MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Begin of migration of deprecated controllers style.

Browse Source
This commit is contained in:
Rémi Cocula
2016-11-30 00:18:50 +01:00
parent f6541632bb
commit d422fc4086
3 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libresonic-main/src/main/java/org/libresonic/player/controller/AdvancedSettingsController.java
+22 -15
View File
@@ -19,24 +19,33 @@
*/
package org.libresonic.player.controller;
import org.apache.commons.lang.StringUtils;
import org.libresonic.player.command.AdvancedSettingsCommand;
import org.libresonic.player.service.SettingsService;
import org.springframework.web.servlet.mvc.SimpleFormController;
import org.apache.commons.lang.StringUtils;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView;
/**
* Controller for the page used to administrate advanced settings.
*
* @author Sindre Mehus
*/
public class AdvancedSettingsController extends SimpleFormController {
@Controller
@RequestMapping("/advancedSettings")
public class AdvancedSettingsController {
@Autowired
private SettingsService settingsService;
@Override
protected Object formBackingObject(HttpServletRequest request) throws Exception {
// TODO replace with @GetMapping in Spring 4
@RequestMapping(method = RequestMethod.GET)
protected String formBackingObject(Model model) throws Exception {
AdvancedSettingsCommand command = new AdvancedSettingsCommand();
command.setDownloadLimit(String.valueOf(settingsService.getDownloadBitrateLimit()));
command.setUploadLimit(String.valueOf(settingsService.getUploadBitrateLimit()));
@@ -53,12 +62,12 @@ public class AdvancedSettingsController extends SimpleFormController {
command.setSmtpUser(settingsService.getSmtpUser());
command.setSmtpFrom(settingsService.getSmtpFrom());
return command;
model.addAttribute("command", command);
return "advancedSettings";
}
@Override
protected void doSubmitAction(Object comm) throws Exception {
AdvancedSettingsCommand command = (AdvancedSettingsCommand) comm;
@RequestMapping(method = RequestMethod.POST)
protected String doSubmitAction(@ModelAttribute AdvancedSettingsCommand command,Model model) throws Exception {
command.setToast(true);
command.setReloadNeeded(false);
@@ -90,10 +99,8 @@ public class AdvancedSettingsController extends SimpleFormController {
settingsService.setSmtpPassword(command.getSmtpPassword());
}
settingsService.save();
model.addAttribute("command", command);
return "advancedSettings";
}
public void setSettingsService(SettingsService settingsService) {
this.settingsService = settingsService;
}
}
libresonic-main/src/main/java/org/libresonic/player/controller/PodcastSettingsController.java
+20 -12
View File
@@ -19,6 +19,12 @@
*/
package org.libresonic.player.controller;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.mvc.SimpleFormController;
import org.libresonic.player.service.SettingsService;
import org.libresonic.player.service.PodcastService;
@@ -31,23 +37,30 @@ import javax.servlet.http.HttpServletRequest;
*
* @author Sindre Mehus
*/
public class PodcastSettingsController extends SimpleFormController {
@Controller
@RequestMapping("/podcastSettings")
public class PodcastSettingsController {
@Autowired
private SettingsService settingsService;
@Autowired
private PodcastService podcastService;
protected Object formBackingObject(HttpServletRequest request) throws Exception {
@RequestMapping(method = RequestMethod.GET)
protected String formBackingObject(Model model) throws Exception {
PodcastSettingsCommand command = new PodcastSettingsCommand();
command.setInterval(String.valueOf(settingsService.getPodcastUpdateInterval()));
command.setEpisodeRetentionCount(String.valueOf(settingsService.getPodcastEpisodeRetentionCount()));
command.setEpisodeDownloadCount(String.valueOf(settingsService.getPodcastEpisodeDownloadCount()));
command.setFolder(settingsService.getPodcastFolder());
return command;
model.addAttribute("command",command);
return "podcastSettings";
}
protected void doSubmitAction(Object comm) throws Exception {
PodcastSettingsCommand command = (PodcastSettingsCommand) comm;
@RequestMapping(method = RequestMethod.POST)
protected String doSubmitAction(@ModelAttribute PodcastSettingsCommand command, Model model) throws Exception {
command.setToast(true);
settingsService.setPodcastUpdateInterval(Integer.parseInt(command.getInterval()));
@@ -57,13 +70,8 @@ public class PodcastSettingsController extends SimpleFormController {
settingsService.save();
podcastService.schedule();
model.addAttribute("command",command);
return "podcastSettings";
}
public void setSettingsService(SettingsService settingsService) {
this.settingsService = settingsService;
}
public void setPodcastService(PodcastService podcastService) {
this.podcastService = podcastService;
}
}
libresonic-main/src/main/webapp/WEB-INF/libresonic-servlet.xml
-15
View File
@@ -225,25 +225,12 @@
<property name="viewName" value="internetRadioSettings"/>
<property name="settingsService" ref="settingsService"/>
</bean>
<bean id="podcastSettingsController" class="org.libresonic.player.controller.PodcastSettingsController">
<property name="commandClass" value="org.libresonic.player.command.PodcastSettingsCommand"/>
<property name="successView" value="podcastSettings"/>
<property name="formView" value="podcastSettings"/>
<property name="settingsService" ref="settingsService"/>
<property name="podcastService" ref="podcastService"/>
</bean>
<bean id="generalSettingsController" class="org.libresonic.player.controller.GeneralSettingsController">
<property name="commandClass" value="org.libresonic.player.command.GeneralSettingsCommand"/>
<property name="successView" value="generalSettings"/>
<property name="formView" value="generalSettings"/>
<property name="settingsService" ref="settingsService"/>
</bean>
<bean id="advancedSettingsController" class="org.libresonic.player.controller.AdvancedSettingsController">
<property name="commandClass" value="org.libresonic.player.command.AdvancedSettingsCommand"/>
<property name="successView" value="advancedSettings"/>
<property name="formView" value="advancedSettings"/>
<property name="settingsService" ref="settingsService"/>
</bean>
<bean id="personalSettingsController" class="org.libresonic.player.controller.PersonalSettingsController">
<property name="commandClass" value="org.libresonic.player.command.PersonalSettingsCommand"/>
<property name="successView" value="personalSettings"/>
@@ -467,9 +454,7 @@
<prop key="/networkSettings.view">networkSettingsController</prop>
<prop key="/transcodingSettings.view">transcodingSettingsController</prop>
<prop key="/internetRadioSettings.view">internetRadioSettingsController</prop>
<prop key="/podcastSettings.view">podcastSettingsController</prop>
<prop key="/generalSettings.view">generalSettingsController</prop>
<prop key="/advancedSettings.view">advancedSettingsController</prop>
<prop key="/personalSettings.view">personalSettingsController</prop>
<prop key="/avatarUpload.view">avatarUploadController</prop>
<prop key="/userSettings.view">userSettingsController</prop>