naming improvements and tidying

Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/MvcController.java

@@ -1,20 +0,0 @@
-package dev.activitypub.activitypubbot;
- 
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
- 
-@Controller
-public class MvcController {
-     
-    @RequestMapping("/@springbot")
-    public String home() {
-        System.out.println("Bottty McBotface...");
-        return "index";
-    }
-
-    @RequestMapping("/")
-    public String root() {
-        System.out.println("Going home...");
-        return "index";
-    }
-}

Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/RestHandler.java

@@ -6,12 +6,11 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
- * Started out with a generic "Hello World" REST API controller,
+ * Here we handle any JSON/REST requests.
- * extending this to handle the basic ActivityPub implementation.
  */
 @RestController
 @RequestMapping( headers = "accept=application/json" )
-public class HomeController {
+public class RestHandler {
 
     @Autowired
     public APProperties apProps;

Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/WebHandler.java

@@ -0,0 +1,35 @@
+package dev.activitypub.activitypubbot;
+ 
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * Here we handle all non-JSON/REST requests - i.e. the normal "web" view
+ */
+@Controller
+public class WebHandler {
+    
+     /**
+      * handle requests for our "actor" - this presents the web/html view of
+      * the bot
+      */	
+    @RequestMapping("/@springbot")
+    public String atactor() {
+        System.out.println("WebHandler::atactor");
+        return this.actor();
+    }
+    @RequestMapping("/users/springbot")
+    public String actor() {
+        System.out.println("WebHandler::actor");
+        return "index"; // just flinging out the index page for now
+    }
+
+    /**
+     * our index page
+     */
+    @RequestMapping("/")
+    public String root() {
+        System.out.println("WebHandler::root");
+        return "index";
+    }
+}

Java/Spring/activitypubbot/src/test/java/dev/activitypub/activitypubbot/RestHandlerTests.java

@@ -15,7 +15,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
 @SpringBootTest
 @AutoConfigureMockMvc
-public class HomeControllerTest {
+public class RestHandlerTests {
 
 	@Autowired
 	private MockMvc mvc;