Permalink
Browse files

rename SearchResource "RoutingResource"

  • Loading branch information...
abyrd committed May 3, 2012
1 parent d303cf0 commit cdab075ff82385c46def8b7447de39bb6881c8f9
@@ -21,9 +21,9 @@
*
* @author abyrd
*/
-public abstract class SearchResource { // RoutingResource
+public abstract class RoutingResource {
- private static final Logger LOG = LoggerFactory.getLogger(SearchResource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RoutingResource.class);
/* TODO do not specify @DefaultValues here, so all defaults are handled in one place */
@@ -16,7 +16,6 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
-import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.TimeZone;
@@ -21,7 +21,7 @@
import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jettison.json.JSONException;
-import org.opentripplanner.api.common.SearchResource;
+import org.opentripplanner.api.common.RoutingResource;
import org.opentripplanner.api.model.TripPlan;
import org.opentripplanner.api.model.error.PlannerError;
import org.opentripplanner.routing.core.RoutingRequest;
@@ -48,7 +48,7 @@
@Path("/plan") // NOTE - /ws/plan is the full path -- see web.xml
@XmlRootElement
@Autowire
-public class Planner extends SearchResource {
+public class Planner extends RoutingResource {
private static final Logger LOG = LoggerFactory.getLogger(Planner.class);
@Autowired public PlanGenerator planGenerator;
@@ -13,7 +13,7 @@
import org.opentripplanner.analyst.request.RenderRequest;
import org.opentripplanner.analyst.request.Renderer;
import org.opentripplanner.analyst.request.TileRequest;
-import org.opentripplanner.api.common.SearchResource;
+import org.opentripplanner.api.common.RoutingResource;
import org.opentripplanner.analyst.parameter.Layer;
import org.opentripplanner.analyst.parameter.LayerList;
import org.opentripplanner.analyst.parameter.MIMEImageFormat;
@@ -26,7 +26,7 @@
// removed component, mixing spring and jersey annotations is bad?
@Path("/tile/{z}/{x}/{y}.png")
-public class TileService extends SearchResource {
+public class TileService extends RoutingResource {
private static final Logger LOG = LoggerFactory.getLogger(TileService.class);
@@ -15,7 +15,7 @@
import org.opentripplanner.analyst.request.RenderRequest;
import org.opentripplanner.analyst.request.Renderer;
import org.opentripplanner.analyst.request.TileRequest;
-import org.opentripplanner.api.common.SearchResource;
+import org.opentripplanner.api.common.RoutingResource;
import org.opentripplanner.analyst.parameter.Layer;
import org.opentripplanner.analyst.parameter.LayerList;
import org.opentripplanner.analyst.parameter.MIMEImageFormat;
@@ -28,7 +28,7 @@
import com.sun.jersey.api.core.InjectParam;
@Path("wms")
-public class WebMapService extends SearchResource {
+public class WebMapService extends RoutingResource {
private static final Logger LOG = LoggerFactory.getLogger(WebMapService.class);

0 comments on commit cdab075

Please sign in to comment.