summaryrefslogtreecommitdiff
path: root/same/src/main/java/com/orbekk/same/http
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-02-27 16:08:54 +0100
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-02-27 16:08:54 +0100
commitc58c649531e4884a92f07d9b12f0ad77fbcf5d6a (patch)
tree38d2997ec6cdaed9120dba012b61afbb8b2e53ea /same/src/main/java/com/orbekk/same/http
parentee51a98e9b61336610d667de57a8cff70d0ac1d9 (diff)
Clean up source code.
Clean up source code with Eclipse. In particular remove tabs.
Diffstat (limited to 'same/src/main/java/com/orbekk/same/http')
-rw-r--r--same/src/main/java/com/orbekk/same/http/RpcServlet.java4
-rw-r--r--same/src/main/java/com/orbekk/same/http/ServerBuilder.java8
-rw-r--r--same/src/main/java/com/orbekk/same/http/ServerContainer.java16
-rw-r--r--same/src/main/java/com/orbekk/same/http/StateServlet.java16
4 files changed, 22 insertions, 22 deletions
diff --git a/same/src/main/java/com/orbekk/same/http/RpcServlet.java b/same/src/main/java/com/orbekk/same/http/RpcServlet.java
index 9b4f82e..9450d67 100644
--- a/same/src/main/java/com/orbekk/same/http/RpcServlet.java
+++ b/same/src/main/java/com/orbekk/same/http/RpcServlet.java
@@ -10,12 +10,12 @@ import com.googlecode.jsonrpc4j.JsonRpcServer;
public class RpcServlet extends HttpServlet {
JsonRpcServer rpcServer;
-
+
public RpcServlet(JsonRpcServer rpcServer) {
super();
this.rpcServer = rpcServer;
}
-
+
@Override
protected void doPost(HttpServletRequest request,
HttpServletResponse response) throws IOException {
diff --git a/same/src/main/java/com/orbekk/same/http/ServerBuilder.java b/same/src/main/java/com/orbekk/same/http/ServerBuilder.java
index 65ee670..543366e 100644
--- a/same/src/main/java/com/orbekk/same/http/ServerBuilder.java
+++ b/same/src/main/java/com/orbekk/same/http/ServerBuilder.java
@@ -13,24 +13,24 @@ public class ServerBuilder {
Logger logger = LoggerFactory.getLogger(getClass());
int port;
ServletContextHandler context = null;
-
+
public ServerBuilder(int port) {
this.port = port;
}
-
+
public ServerBuilder withServlet(HttpServlet servlet, String pathSpec) {
logger.info("Servlet binding: {} → {}", pathSpec, servlet);
getServletContextHandler().addServlet(new ServletHolder(servlet),
pathSpec);
return this;
}
-
+
public <T> ServerBuilder withService(T service, Class<T> clazz) {
JsonRpcServer server = new JsonRpcServer(service, clazz);
String pathSpec = "/" + clazz.getSimpleName() + ".json";
return withServlet(new RpcServlet(server), pathSpec);
}
-
+
public ServerContainer build() {
ServerContainer server = ServerContainer.create(port);
server.setReuseAddress(true);
diff --git a/same/src/main/java/com/orbekk/same/http/ServerContainer.java b/same/src/main/java/com/orbekk/same/http/ServerContainer.java
index f91cce1..af577a0 100644
--- a/same/src/main/java/com/orbekk/same/http/ServerContainer.java
+++ b/same/src/main/java/com/orbekk/same/http/ServerContainer.java
@@ -12,23 +12,23 @@ public class ServerContainer {
Server server;
int port;
ServletContextHandler context = null;
-
+
public ServerContainer(Server server, int port, ServletContextHandler context) {
this.server = server;
this.port = port;
this.context = context;
}
-
+
public static ServerContainer create(int port) {
Server server = new Server(port);
return new ServerContainer(server, port, null);
}
-
+
public void setContext(ServletContextHandler context) {
server.setHandler(context);
this.context = context;
}
-
+
public void setReuseAddress(boolean on) {
Connector connector = server.getConnectors()[0];
if (connector instanceof AbstractConnector) {
@@ -36,7 +36,7 @@ public class ServerContainer {
connector_.setReuseAddress(on);
}
}
-
+
public int getPort() {
if (port == 0) {
return server.getConnectors()[0].getLocalPort();
@@ -44,17 +44,17 @@ public class ServerContainer {
return port;
}
}
-
+
public void start() throws Exception {
server.start();
logger.info("Started server on port {}", getPort());
}
-
+
public void stop() throws Exception {
server.stop();
logger.info("Server stopped.");
}
-
+
public void join() throws InterruptedException {
server.join();
}
diff --git a/same/src/main/java/com/orbekk/same/http/StateServlet.java b/same/src/main/java/com/orbekk/same/http/StateServlet.java
index 8b4d8c5..578bdfc 100644
--- a/same/src/main/java/com/orbekk/same/http/StateServlet.java
+++ b/same/src/main/java/com/orbekk/same/http/StateServlet.java
@@ -22,13 +22,13 @@ public class StateServlet extends HttpServlet {
private ClientInterface client;
private VariableFactory variableFactory;
private final static String TITLE = "State viewer";
-
+
public StateServlet(ClientInterface client,
VariableFactory variableFactory) {
this.client = client;
this.variableFactory = variableFactory;
}
-
+
private void handleSetState(HttpServletRequest request,
HttpServletResponse response) throws IOException {
if (request.getParameter("key") == null ||
@@ -36,13 +36,13 @@ public class StateServlet extends HttpServlet {
response.getWriter().println(
"Usage: action=set&key=DesiredKey&value=DesiredValue");
}
-
+
try {
String key = request.getParameter("key");
String value = request.getParameter("value");
Variable<String> variable = variableFactory.createString(key);
variable.set(value);
-
+
response.getWriter().println("Updated component: " +
key + "=" + value);
} catch (UpdateConflict e) {
@@ -50,7 +50,7 @@ public class StateServlet extends HttpServlet {
throwableToString(e));
}
}
-
+
@Override
protected void doGet(HttpServletRequest request,
HttpServletResponse response) throws IOException {
@@ -78,7 +78,7 @@ public class StateServlet extends HttpServlet {
w.println(client.getState());
w.println("</pre>");
}
-
+
private void writeSetStateForm(HttpServletResponse response)
throws IOException {
PrintWriter w = response.getWriter();
@@ -90,7 +90,7 @@ public class StateServlet extends HttpServlet {
w.println("<p><input type=\"submit\" value=\"Sumbit\" />");
w.println("</form>");
}
-
+
private void writeHeader(HttpServletResponse response) throws IOException {
PrintWriter w = response.getWriter();
w.println("<html>");
@@ -99,7 +99,7 @@ public class StateServlet extends HttpServlet {
w.println("</head>");
w.println("<body>");
}
-
+
private void writeFooter(HttpServletResponse response) throws IOException {
PrintWriter w = response.getWriter();
w.println("</body>");