From 8d5386be38db25a2a41c3bf6c876adee21ca26cc Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Fri, 19 Sep 2014 08:26:02 +0000
Subject: [PATCH] #396 fix - Fixed more SonarQube issues
---
securis/src/main/java/net/curisit/securis/services/LicenseServices.java | 148 ++++++++++++++++++++++++-------------------------
1 files changed, 72 insertions(+), 76 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/services/LicenseServices.java b/securis/src/main/java/net/curisit/securis/services/LicenseServices.java
index 1eab294..45e5c10 100644
--- a/securis/src/main/java/net/curisit/securis/services/LicenseServices.java
+++ b/securis/src/main/java/net/curisit/securis/services/LicenseServices.java
@@ -32,99 +32,95 @@
@Path("/test")
public class LicenseServices {
- // private LicenseHelper licenseHelper = InjectorFactory.getInjector().getInstance(LicenseHelper.class);
- private static final Logger LOG = LogManager.getLogger(LicenseServices.class);
+ private static final Logger LOG = LogManager.getLogger(LicenseServices.class);
- private static final int DEFAULT_LICENSE_EXPIRATION = 365;
- private static final String LICENSE_STRING = "CurisIntegrity Config Server v{0}.{1}";
+ private static final int DEFAULT_LICENSE_EXPIRATION = 365;
+ private static final String LICENSE_STRING = "CurisIntegrity Config Server v{0}.{1}";
- @com.google.inject.Inject
- @Named("base-uri")
- private URI uri;
+ @com.google.inject.Inject
+ @Named("base-uri")
+ private URI uri;
- public LicenseServices() {
+ public LicenseServices() {
- }
+ }
- /**
- *
- * @return the server version in format majorVersion.minorVersion
- */
- @GET
- @Produces(
- { MediaType.TEXT_HTML })
- public Response index() {
- try {
- String index = IOUtils.toString(this.getClass().getResourceAsStream("/static/index.html"));
- return Response.ok().entity(index).build();
- } catch (IOException e) {
- LOG.error("Error getting index.html", e);
- }
- return Response.ok().entity(MessageFormat.format(LICENSE_STRING, 0, 1)).build();
- }
+ /**
+ *
+ * @return the server version in format majorVersion.minorVersion
+ */
+ @GET
+ @Produces({ MediaType.TEXT_HTML })
+ public Response index() {
+ try {
+ String index = IOUtils.toString(this.getClass().getResourceAsStream("/static/index.html"));
+ return Response.ok().entity(index).build();
+ } catch (IOException e) {
+ LOG.error("Error getting index.html", e);
+ }
+ return Response.ok().entity(MessageFormat.format(LICENSE_STRING, 0, 1)).build();
+ }
- @GET
- @Path("/dummy")
- @Produces(
- { MediaType.TEXT_PLAIN })
- public Response dummy(@Context HttpServletRequest request) {
- LOG.info("Request: " + request.getPathInfo());
- return Response.ok().entity((uri == null)).build();
- }
+ @GET
+ @Path("/dummy")
+ @Produces({ MediaType.TEXT_PLAIN })
+ public Response dummy(@Context HttpServletRequest request) {
+ LOG.info("Request: " + request.getPathInfo());
+ return Response.ok().entity((uri == null)).build();
+ }
- /**
- * @return the version of the three entities that can be synchronized (Users, DataSet and Settings)
- */
- @POST
- @Path("/upload1")
- @Consumes(MediaType.MULTIPART_FORM_DATA)
- @Produces(
- { MediaType.APPLICATION_JSON })
- public Response testFile1(@MultipartForm FileUploadForm mfdi) {
- LOG.info("FORM: texto: {}, file: {}", mfdi.getTexto(), new String(mfdi.getFile()));
- return Response.ok("OK").build();
- }
+ /**
+ * @return the version of the three entities that can be synchronized
+ * (Users, DataSet and Settings)
+ */
+ @POST
+ @Path("/upload1")
+ @Consumes(MediaType.MULTIPART_FORM_DATA)
+ @Produces({ MediaType.APPLICATION_JSON })
+ public Response testFile1(@MultipartForm FileUploadForm mfdi) {
+ LOG.info("FORM: texto: {}, file: {}", mfdi.getTexto(), new String(mfdi.getFile()));
+ return Response.ok("OK").build();
+ }
- @GET
- @Path("/current/{license}")
- @Produces(
- { MediaType.APPLICATION_JSON })
- public ServiceResponse<ServerConfigVersions> testFile(@PathParam("license") String license, @DefaultValue("-1") @QueryParam("minorVersion") int minorVersion, @DefaultValue("-1") @QueryParam("majorVersion") int majorVersion) {
+ @GET
+ @Path("/current/{license}")
+ @Produces({ MediaType.APPLICATION_JSON })
+ public ServiceResponse<ServerConfigVersions> testFile(@PathParam("license") String license,
+ @DefaultValue("-1") @QueryParam("minorVersion") int minorVersion, @DefaultValue("-1") @QueryParam("majorVersion") int majorVersion) {
- LOG.info("Called 'current' service with license: {}", license);
- ServiceResponse<ServerConfigVersions> response = new ServiceResponse<ServerConfigVersions>();
+ LOG.info("Called 'current' service with license: {}", license);
+ ServiceResponse<ServerConfigVersions> response = new ServiceResponse<ServerConfigVersions>();
- return response;
- }
+ return response;
+ }
- public static class FileUploadForm {
+ public static class FileUploadForm {
- @FormParam("file1")
- @PartType("application/octet-stream")
- private byte[] file;
+ @FormParam("file1")
+ @PartType("application/octet-stream")
+ private byte[] file;
- @FormParam("texto1")
- @PartType("text/plain")
- private String texto;
+ @FormParam("texto1")
+ @PartType("text/plain")
+ private String texto;
- public FileUploadForm() {
- }
+ public FileUploadForm() {}
- public byte[] getFile() {
- return file;
- }
+ public byte[] getFile() {
+ return file;
+ }
- public void setFile(byte[] file) {
- this.file = file;
- }
+ public void setFile(byte[] file) {
+ this.file = file;
+ }
- public void setTexto(final String texto) {
- this.texto = texto;
- }
+ public void setTexto(final String texto) {
+ this.texto = texto;
+ }
- public String getTexto() {
- return texto;
- }
+ public String getTexto() {
+ return texto;
+ }
- }
+ }
}
--
Gitblit v1.3.2