#333 feature - Refactoring to use JEtty and RestEasy with Guice

Roberto Sánchez

2013-12-19 cc3f9054f478d9698e240bfb644d0d9de9a37c85

 securis/src/main/java/net/curisit/securis/services/LicenseServices.java
..
..
@@ -1,22 +1,25 @@
1
1
 package net.curisit.securis.services;
2
2
 
3
+import java.io.IOException;
3
4
 import java.net.URI;
4
5
 import java.text.MessageFormat;
5
6
 
6
-import javax.inject.Inject;
7
7
 import javax.inject.Named;
8
+import javax.servlet.http.HttpServletRequest;
8
9
 import javax.ws.rs.DefaultValue;
9
10
 import javax.ws.rs.GET;
10
11
 import javax.ws.rs.Path;
11
12
 import javax.ws.rs.PathParam;
12
13
 import javax.ws.rs.Produces;
13
14
 import javax.ws.rs.QueryParam;
15
+import javax.ws.rs.core.Context;
14
16
 import javax.ws.rs.core.MediaType;
15
17
 import javax.ws.rs.core.Response;
16
18
 
17
19
 import net.curisit.integrity.beans.ServerConfigVersions;
18
20
 import net.curisit.integrity.beans.ServiceResponse;
19
21
 
22
+import org.apache.commons.io.IOUtils;
20
23
 import org.slf4j.Logger;
21
24
 import org.slf4j.LoggerFactory;
22
25
 
..
..
@@ -27,14 +30,13 @@
27
30
 	// private LicenseHelper licenseHelper = InjectorFactory.getInjector().getInstance(LicenseHelper.class);
28
31
 	private static final Logger log = LoggerFactory.getLogger(LicenseServices.class);
29
32
 
30
-	private static final int DEFAULT_LICENSE_EXPIRATION = 3650; // 10 years;
33
+	private static final int DEFAULT_LICENSE_EXPIRATION = 365;
31
34
 	private static final String LICENSE_STRING = "CurisIntegrity Config Server v{0}.{1}";
32
35
 
33
-	@Inject
36
+	@com.google.inject.Inject
34
37
 	@Named("base-uri")
35
38
 	private URI uri;
36
39
 
37
-	@Inject
38
40
 	public LicenseServices() {
39
41
 	}
40
42
 
..
..
@@ -43,10 +45,16 @@
43
45
 	 * @return the server version in format majorVersion.minorVersion
44
46
 	 */
45
47
 	@GET
46
-	@Path("/")
47
48
 	@Produces(
48
-		{ MediaType.TEXT_PLAIN })
49
-	public Response currentVersion() {
49
+		{ MediaType.TEXT_HTML })
50
+	public Response index() {
51
+		try {
52
+			String index = IOUtils.toString(this.getClass().getResourceAsStream("/static/index.html"));
53
+			return Response.ok().entity(index).build();
54
+		} catch (IOException e) {
55
+			// TODO Auto-generated catch block
56
+			e.printStackTrace();
57
+		}
50
58
 		return Response.ok().entity(MessageFormat.format(LICENSE_STRING, 0, 1)).build();
51
59
 	}
52
60
 
..
..
@@ -54,8 +62,9 @@
54
62
 	@Path("/dummy")
55
63
 	@Produces(
56
64
 		{ MediaType.TEXT_PLAIN })
57
-	public Response dummy() {
58
-		return Response.ok().entity(uri.toString()).build();
65
+	public Response dummy(@Context HttpServletRequest request) {
66
+		log.info("Request: " + request.getPathInfo());
67
+		return Response.ok().entity((uri == null)).build();
59
68
 	}
60
69
 
61
70
 	/**