Controllers migration.

master
Rémi Cocula 8 years ago
parent caac456171
commit 97be70531e
  1. 20
      libresonic-main/src/main/java/org/libresonic/player/controller/PodcastReceiverAdminController.java
  2. 4
      libresonic-main/src/main/resources/libresonic-servlet.xml

@ -19,32 +19,35 @@
*/ */
package org.libresonic.player.controller; package org.libresonic.player.controller;
import org.apache.commons.lang.StringUtils;
import org.libresonic.player.domain.PodcastEpisode; import org.libresonic.player.domain.PodcastEpisode;
import org.libresonic.player.domain.PodcastStatus; import org.libresonic.player.domain.PodcastStatus;
import org.libresonic.player.service.PodcastService; import org.libresonic.player.service.PodcastService;
import org.libresonic.player.util.StringUtil; import org.libresonic.player.util.StringUtil;
import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.ServletRequestUtils; import org.springframework.web.bind.ServletRequestUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.AbstractController;
import org.springframework.web.servlet.view.RedirectView; import org.springframework.web.servlet.view.RedirectView;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
/** /**
* Controller for the "Podcast receiver" page. * Controller for the "Podcast receiver" page.
* *
* @author Sindre Mehus * @author Sindre Mehus
*/ */
public class PodcastReceiverAdminController extends AbstractController { @Controller
@RequestMapping("/podcastReceiverAdmin")
public class PodcastReceiverAdminController {
@Autowired
private PodcastService podcastService; private PodcastService podcastService;
@Override @RequestMapping(method = RequestMethod.GET)
protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception { protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
Integer channelId = ServletRequestUtils.getIntParameter(request, "channelId"); Integer channelId = ServletRequestUtils.getIntParameter(request, "channelId");
@ -93,7 +96,4 @@ public class PodcastReceiverAdminController extends AbstractController {
} }
} }
public void setPodcastService(PodcastService podcastService) {
this.podcastService = podcastService;
}
} }

@ -15,9 +15,6 @@
<mvc:annotation-driven /> <mvc:annotation-driven />
<context:component-scan base-package="org.libresonic.player.controller, org.libresonic.player.validator"/> <context:component-scan base-package="org.libresonic.player.controller, org.libresonic.player.validator"/>
<bean id="podcastReceiverAdminController" class="org.libresonic.player.controller.PodcastReceiverAdminController">
<property name="podcastService" ref="podcastService"/>
</bean>
<bean id="setMusicFileInfoController" class="org.libresonic.player.controller.SetMusicFileInfoController"> <bean id="setMusicFileInfoController" class="org.libresonic.player.controller.SetMusicFileInfoController">
<property name="mediaFileService" ref="mediaFileService"/> <property name="mediaFileService" ref="mediaFileService"/>
</bean> </bean>
@ -216,7 +213,6 @@
<prop key="/download.view">downloadController</prop> <prop key="/download.view">downloadController</prop>
<prop key="/db.view">dbController</prop> <prop key="/db.view">dbController</prop>
<prop key="/test.view">multiController</prop> <prop key="/test.view">multiController</prop>
<prop key="/podcastReceiverAdmin.view">podcastReceiverAdminController</prop>
<prop key="/podcast/**">podcastController</prop> <prop key="/podcast/**">podcastController</prop>
<prop key="/wap/download.view">downloadController</prop> <prop key="/wap/download.view">downloadController</prop>
<prop key="/wap/**">wapController</prop> <prop key="/wap/**">wapController</prop>

Loading…
Cancel
Save