From 071a008cf28e733ca3aaafa57e675fd54a5ea33b Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Fri, 19 Sep 2014 09:29:16 +0000
Subject: [PATCH] #396 fix - Fixed more SonarQube issues, new code style applied
---
securis/src/main/java/net/curisit/securis/RestServicesApplication.java | 2
securis/src/main/java/net/curisit/securis/services/ApiResource.java | 9
securis/src/main/java/net/curisit/securis/db/User.java | 18 +
securis/src/main/java/net/curisit/securis/db/Application.java | 4
securis/src/main/java/net/curisit/securis/services/ApplicationResource.java | 27 ++-
securis/src/main/java/net/curisit/securis/services/LicenseTypeResource.java | 25 ++-
securis/src/main/java/net/curisit/securis/DefaultExceptionHandler.java | 4
securis/src/main/java/net/curisit/securis/utils/TokenHelper.java | 7
securis/src/main/java/net/curisit/securis/security/Securable.java | 2
securis/src/main/java/net/curisit/securis/utils/CacheTTL.java | 2
securis/src/main/java/net/curisit/securis/db/LicenseHistory.java | 4
securis/src/main/java/net/curisit/securis/services/LicenseResource.java | 65 +++++---
securis/src/patch/java/net/curisit/securis/LicenseGenerator.java | 3
securis/src/main/java/net/curisit/securis/db/LicenseType.java | 8
securis/src/main/java/net/curisit/securis/services/OrganizationResource.java | 50 ++++---
securis/src/main/java/net/curisit/securis/AuthFilter.java | 11
securis/src/main/java/net/curisit/securis/MainApp.java | 12 +
securis/src/main/java/net/curisit/securis/services/BasicServices.java | 25 ++-
securis/src/main/java/net/curisit/securis/db/Pack.java | 6
securis/src/main/java/net/curisit/securis/services/PackResource.java | 33 +++-
securis/src/main/java/net/curisit/securis/services/LicenseServices.java | 23 ++-
securis/src/main/java/net/curisit/securis/db/License.java | 4
securis/src/main/java/net/curisit/securis/db/Organization.java | 18 +
securis/src/main/java/net/curisit/securis/services/UserResource.java | 39 ++++-
securis/src/main/java/net/curisit/securis/ioc/SecurisModule.java | 4
securis/src/main/java/net/curisit/securis/dao/UserDao.java | 3
securis/src/main/java/net/curisit/securis/security/SecurityInterceptor.java | 4
27 files changed, 270 insertions(+), 142 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/AuthFilter.java b/securis/src/main/java/net/curisit/securis/AuthFilter.java
index ac5dc93..946f476 100644
--- a/securis/src/main/java/net/curisit/securis/AuthFilter.java
+++ b/securis/src/main/java/net/curisit/securis/AuthFilter.java
@@ -14,9 +14,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
-import org.apache.logging.log4j.Logger;
-
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
@Singleton
@WebFilter(urlPatterns = "/*")
@@ -25,7 +24,8 @@
private static final Logger LOG = LogManager.getLogger(AuthFilter.class);
@Override
- public void init(FilterConfig fc) throws ServletException {}
+ public void init(FilterConfig fc) throws ServletException {
+ }
@Override
public void doFilter(ServletRequest sr, ServletResponse sr1, FilterChain fc) throws IOException, ServletException {
@@ -47,7 +47,8 @@
}
@Override
- public void destroy() {}
+ public void destroy() {
+ }
private class UserRoleRequestWrapper extends HttpServletRequestWrapper {
@@ -83,4 +84,4 @@
};
}
}
-}
\ No newline at end of file
+}
diff --git a/securis/src/main/java/net/curisit/securis/DefaultExceptionHandler.java b/securis/src/main/java/net/curisit/securis/DefaultExceptionHandler.java
index c933878..6d2ed11 100644
--- a/securis/src/main/java/net/curisit/securis/DefaultExceptionHandler.java
+++ b/securis/src/main/java/net/curisit/securis/DefaultExceptionHandler.java
@@ -12,8 +12,8 @@
import net.curisit.securis.services.exception.SeCurisServiceException;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
@Provider
public class DefaultExceptionHandler implements ExceptionMapper<Exception> {
@@ -49,4 +49,4 @@
LOG.error("Request url: " + request.getRequestURL(), e);
return Response.serverError().header(ERROR_MESSAGE_HEADER, "Unexpected error: " + e.toString()).type(MediaType.APPLICATION_JSON).build();
}
-}
\ No newline at end of file
+}
diff --git a/securis/src/main/java/net/curisit/securis/MainApp.java b/securis/src/main/java/net/curisit/securis/MainApp.java
index cb1bf16..affe104 100644
--- a/securis/src/main/java/net/curisit/securis/MainApp.java
+++ b/securis/src/main/java/net/curisit/securis/MainApp.java
@@ -9,6 +9,8 @@
import net.curisit.securis.ioc.RequestsModule;
import net.curisit.securis.ioc.SecurisModule;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
@@ -20,8 +22,6 @@
import org.eclipse.jetty.util.resource.Resource;
import org.jboss.resteasy.plugins.guice.GuiceResteasyBootstrapServletContextListener;
import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
import com.google.inject.Guice;
import com.google.inject.Injector;
@@ -77,7 +77,9 @@
ResourceHandler staticResources = new ResourceHandler();
staticResources.setBaseResource(Resource.newResource(MainApp.class.getResource("/static").toURI()));
- staticResources.setWelcomeFiles(new String[] { "/main.html" });
+ staticResources.setWelcomeFiles(new String[] {
+ "/main.html"
+ });
context.setHandler(staticResources);
ErrorPageErrorHandler errorHandler = new ErrorPageErrorHandler();
@@ -85,7 +87,9 @@
LOG.info("Error Handlers: " + context.getErrorHandler());
ContextHandlerCollection contexts = new ContextHandlerCollection();
- contexts.setHandlers(new Handler[] { staticResources, context });
+ contexts.setHandlers(new Handler[] {
+ staticResources, context
+ });
server.setHandler(context);
server.start();
diff --git a/securis/src/main/java/net/curisit/securis/RestServicesApplication.java b/securis/src/main/java/net/curisit/securis/RestServicesApplication.java
index d3fe65a..906ac3b 100644
--- a/securis/src/main/java/net/curisit/securis/RestServicesApplication.java
+++ b/securis/src/main/java/net/curisit/securis/RestServicesApplication.java
@@ -8,8 +8,8 @@
import net.curisit.securis.services.BasicServices;
import net.curisit.securis.services.LicenseServices;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class RestServicesApplication extends Application {
diff --git a/securis/src/main/java/net/curisit/securis/dao/UserDao.java b/securis/src/main/java/net/curisit/securis/dao/UserDao.java
index 13f153d..45ce5a6 100644
--- a/securis/src/main/java/net/curisit/securis/dao/UserDao.java
+++ b/securis/src/main/java/net/curisit/securis/dao/UserDao.java
@@ -15,7 +15,8 @@
public class UserDao {
@Inject
- public UserDao() {}
+ public UserDao() {
+ }
@Inject
Provider<EntityManager> emProvider;
diff --git a/securis/src/main/java/net/curisit/securis/db/Application.java b/securis/src/main/java/net/curisit/securis/db/Application.java
index 30214aa..e32417f 100644
--- a/securis/src/main/java/net/curisit/securis/db/Application.java
+++ b/securis/src/main/java/net/curisit/securis/db/Application.java
@@ -26,7 +26,9 @@
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
@Entity
@Table(name = "application")
-@NamedQueries({ @NamedQuery(name = "list-applications", query = "SELECT a FROM Application a") })
+@NamedQueries({
+ @NamedQuery(name = "list-applications", query = "SELECT a FROM Application a")
+})
public class Application implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/securis/src/main/java/net/curisit/securis/db/License.java b/securis/src/main/java/net/curisit/securis/db/License.java
index 5e21c88..e6559cb 100644
--- a/securis/src/main/java/net/curisit/securis/db/License.java
+++ b/securis/src/main/java/net/curisit/securis/db/License.java
@@ -35,7 +35,9 @@
@Entity
@Table(name = "license")
@JsonIgnoreProperties(ignoreUnknown = true)
-@NamedQueries({ @NamedQuery(name = "list-licenses-by-pack", query = "SELECT l FROM License l where l.pack.id = :packId") })
+@NamedQueries({
+ @NamedQuery(name = "list-licenses-by-pack", query = "SELECT l FROM License l where l.pack.id = :packId")
+})
public class License implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/securis/src/main/java/net/curisit/securis/db/LicenseHistory.java b/securis/src/main/java/net/curisit/securis/db/LicenseHistory.java
index 970770b..7f0e549 100644
--- a/securis/src/main/java/net/curisit/securis/db/LicenseHistory.java
+++ b/securis/src/main/java/net/curisit/securis/db/LicenseHistory.java
@@ -27,7 +27,9 @@
@Entity
@Table(name = "license_history")
@JsonIgnoreProperties(ignoreUnknown = true)
-@NamedQueries({ @NamedQuery(name = "list-license-history", query = "SELECT lh FROM LicenseHistory lh where lh.license.id = :licId") })
+@NamedQueries({
+ @NamedQuery(name = "list-license-history", query = "SELECT lh FROM LicenseHistory lh where lh.license.id = :licId")
+})
public class LicenseHistory implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/securis/src/main/java/net/curisit/securis/db/LicenseType.java b/securis/src/main/java/net/curisit/securis/db/LicenseType.java
index 5112a5e..c3e378c 100644
--- a/securis/src/main/java/net/curisit/securis/db/LicenseType.java
+++ b/securis/src/main/java/net/curisit/securis/db/LicenseType.java
@@ -13,13 +13,13 @@
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
/**
* Entity implementation class for Entity: license_type
@@ -30,7 +30,9 @@
@JsonIgnoreProperties(ignoreUnknown = true)
@Entity
@Table(name = "license_type")
-@NamedQueries({ @NamedQuery(name = "list-license_types", query = "SELECT lt FROM LicenseType lt") })
+@NamedQueries({
+ @NamedQuery(name = "list-license_types", query = "SELECT lt FROM LicenseType lt")
+})
public class LicenseType implements Serializable {
private static final Logger LOG = LogManager.getLogger(LicenseType.class);
diff --git a/securis/src/main/java/net/curisit/securis/db/Organization.java b/securis/src/main/java/net/curisit/securis/db/Organization.java
index 518cd1a..4221258 100644
--- a/securis/src/main/java/net/curisit/securis/db/Organization.java
+++ b/securis/src/main/java/net/curisit/securis/db/Organization.java
@@ -21,12 +21,12 @@
import javax.persistence.OneToMany;
import javax.persistence.Table;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
/**
* Entity implementation class for Entity: organization
@@ -36,9 +36,11 @@
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
@Entity
@Table(name = "organization")
-@NamedQueries({ @NamedQuery(name = "list-organizations", query = "SELECT o FROM Organization o"),
+@NamedQueries({
+ @NamedQuery(name = "list-organizations", query = "SELECT o FROM Organization o"),
@NamedQuery(name = "list-organizations-by-ids", query = "SELECT o FROM Organization o where id in :list_ids"),
- @NamedQuery(name = "find-children-org", query = "SELECT o FROM Organization o where o.parentOrganization = :parentOrganization") })
+ @NamedQuery(name = "find-children-org", query = "SELECT o FROM Organization o where o.parentOrganization = :parentOrganization")
+})
public class Organization implements Serializable {
@SuppressWarnings("unused")
@@ -61,8 +63,12 @@
// We don't include the users to limit the size of each row a the listing
@ManyToMany(cascade = CascadeType.REMOVE)
@JoinTable(name = "user_organization", //
- joinColumns = { @JoinColumn(name = "organization_id", referencedColumnName = "id") }, //
- inverseJoinColumns = { @JoinColumn(name = "username", referencedColumnName = "username") })
+ joinColumns = {
+ @JoinColumn(name = "organization_id", referencedColumnName = "id")
+ }, //
+ inverseJoinColumns = {
+ @JoinColumn(name = "username", referencedColumnName = "username")
+ })
private List<User> users;
@JsonIgnore
diff --git a/securis/src/main/java/net/curisit/securis/db/Pack.java b/securis/src/main/java/net/curisit/securis/db/Pack.java
index 1e5ab59..b0fa2fe 100644
--- a/securis/src/main/java/net/curisit/securis/db/Pack.java
+++ b/securis/src/main/java/net/curisit/securis/db/Pack.java
@@ -32,8 +32,10 @@
@Entity
@Table(name = "pack")
@JsonIgnoreProperties(ignoreUnknown = true)
-@NamedQueries({ @NamedQuery(name = "list-packs", query = "SELECT pa FROM Pack pa"),//
- @NamedQuery(name = "list-packs-by-orgs", query = "SELECT pa FROM Pack pa where pa.organization.id in :list_ids") })
+@NamedQueries({
+ @NamedQuery(name = "list-packs", query = "SELECT pa FROM Pack pa"),//
+ @NamedQuery(name = "list-packs-by-orgs", query = "SELECT pa FROM Pack pa where pa.organization.id in :list_ids")
+})
public class Pack implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/securis/src/main/java/net/curisit/securis/db/User.java b/securis/src/main/java/net/curisit/securis/db/User.java
index 5858b2c..49e90f4 100644
--- a/securis/src/main/java/net/curisit/securis/db/User.java
+++ b/securis/src/main/java/net/curisit/securis/db/User.java
@@ -30,10 +30,12 @@
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
@Entity
@Table(name = "user")
-@NamedQueries({ @NamedQuery(name = "list-users", query = "SELECT u FROM User u"),
+@NamedQueries({
+ @NamedQuery(name = "list-users", query = "SELECT u FROM User u"),
@NamedQuery(name = "get-user", query = "SELECT u FROM User u where u.username = :username"),
@NamedQuery(name = "auth-user", query = "SELECT u FROM User u where u.username = :username and u.password = :password"),
- @NamedQuery(name = "delete-all-users", query = "delete FROM User u") })
+ @NamedQuery(name = "delete-all-users", query = "delete FROM User u")
+})
public class User implements Serializable {
private static final long serialVersionUID = 1L;
@@ -67,8 +69,12 @@
@JsonIgnore
@ManyToMany
@JoinTable(name = "user_organization", //
- joinColumns = { @JoinColumn(name = "username", referencedColumnName = "username") }, //
- inverseJoinColumns = { @JoinColumn(name = "organization_id", referencedColumnName = "id") } //
+ joinColumns = {
+ @JoinColumn(name = "username", referencedColumnName = "username")
+ }, //
+ inverseJoinColumns = {
+ @JoinColumn(name = "organization_id", referencedColumnName = "id")
+ } //
)
private Set<Organization> organizations;
@@ -214,7 +220,9 @@
public static class Rol {
public static final int ADVANCE = 0x01;
public static final int ADMIN = 0x02;
- public static final int[] ALL = new int[] { ADVANCE, ADMIN };
+ public static final int[] ALL = new int[] {
+ ADVANCE, ADMIN
+ };
}
}
diff --git a/securis/src/main/java/net/curisit/securis/ioc/SecurisModule.java b/securis/src/main/java/net/curisit/securis/ioc/SecurisModule.java
index 827218e..4e2abc6 100644
--- a/securis/src/main/java/net/curisit/securis/ioc/SecurisModule.java
+++ b/securis/src/main/java/net/curisit/securis/ioc/SecurisModule.java
@@ -13,9 +13,9 @@
import javax.ws.rs.core.UriBuilder;
import javax.ws.rs.core.UriBuilderException;
-import org.h2.jdbcx.JdbcDataSource;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.h2.jdbcx.JdbcDataSource;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
diff --git a/securis/src/main/java/net/curisit/securis/security/Securable.java b/securis/src/main/java/net/curisit/securis/security/Securable.java
index 50a9ee9..5580b5f 100644
--- a/securis/src/main/java/net/curisit/securis/security/Securable.java
+++ b/securis/src/main/java/net/curisit/securis/security/Securable.java
@@ -19,4 +19,4 @@
* Bit mask with the rol or roles necessary to access the method
*/
int roles() default 0;
-}
\ No newline at end of file
+}
diff --git a/securis/src/main/java/net/curisit/securis/security/SecurityInterceptor.java b/securis/src/main/java/net/curisit/securis/security/SecurityInterceptor.java
index 3e68f4c..be14791 100644
--- a/securis/src/main/java/net/curisit/securis/security/SecurityInterceptor.java
+++ b/securis/src/main/java/net/curisit/securis/security/SecurityInterceptor.java
@@ -21,14 +21,14 @@
import net.curisit.securis.utils.CacheTTL;
import net.curisit.securis.utils.TokenHelper;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.jboss.resteasy.core.Dispatcher;
import org.jboss.resteasy.core.ResourceMethodInvoker;
import org.jboss.resteasy.core.ServerResponse;
import org.jboss.resteasy.spi.Failure;
import org.jboss.resteasy.spi.HttpRequest;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
@Provider
// @PreMatching
diff --git a/securis/src/main/java/net/curisit/securis/services/ApiResource.java b/securis/src/main/java/net/curisit/securis/services/ApiResource.java
index c41824b..89ecae5 100644
--- a/securis/src/main/java/net/curisit/securis/services/ApiResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/ApiResource.java
@@ -11,8 +11,8 @@
import net.curisit.securis.utils.TokenHelper;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* External API to be accessed by third parties
@@ -31,7 +31,8 @@
@Inject
Provider<EntityManager> emProvider;
- public ApiResource() {}
+ public ApiResource() {
+ }
/**
*
@@ -39,7 +40,9 @@
*/
@GET
@Path("/")
- @Produces({ MediaType.TEXT_PLAIN })
+ @Produces({
+ MediaType.TEXT_PLAIN
+ })
public Response index() {
return Response.ok("SeCuris API").build();
}
diff --git a/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java b/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java
index 1e7230d..d6079e9 100644
--- a/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java
@@ -27,8 +27,8 @@
import net.curisit.securis.db.Application;
import net.curisit.securis.utils.TokenHelper;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import com.google.inject.persist.Transactional;
@@ -49,7 +49,8 @@
private static final Logger LOG = LogManager.getLogger(ApplicationResource.class);
- public ApplicationResource() {}
+ public ApplicationResource() {
+ }
/**
*
@@ -57,7 +58,9 @@
*/
@GET
@Path("/")
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response index() {
LOG.info("Getting applications list ");
@@ -74,7 +77,9 @@
*/
@GET
@Path("/{appid}")
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response get(@PathParam("appid") String appid, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
LOG.info("Getting application data for id: {}: ", appid);
if (appid == null || "".equals(appid)) {
@@ -96,7 +101,9 @@
@POST
@Path("/")
@Consumes(MediaType.APPLICATION_JSON)
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
@Transactional
public Response create(Application app, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
LOG.info("Creating new application");
@@ -112,7 +119,9 @@
@Path("/{appid}")
@Transactional
@Consumes(MediaType.APPLICATION_JSON)
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response modify(Application app, @PathParam("appid") String appid, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
LOG.info("Modifying application with id: {}", appid);
EntityManager em = emProvider.get();
@@ -132,7 +141,9 @@
@DELETE
@Path("/{appid}")
@Transactional
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response delete(@PathParam("appid") String appid, @Context HttpServletRequest request) {
LOG.info("Deleting app with id: {}", appid);
EntityManager em = emProvider.get();
@@ -143,7 +154,7 @@
.build();
}
- if (app.getLicenseTypes() != null && app.getLicenseTypes().size() > 0) {
+ if (app.getLicenseTypes() != null && !app.getLicenseTypes().isEmpty()) {
return Response
.status(Status.FORBIDDEN)
.header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER,
diff --git a/securis/src/main/java/net/curisit/securis/services/BasicServices.java b/securis/src/main/java/net/curisit/securis/services/BasicServices.java
index 6844d2d..2a783de 100644
--- a/securis/src/main/java/net/curisit/securis/services/BasicServices.java
+++ b/securis/src/main/java/net/curisit/securis/services/BasicServices.java
@@ -24,8 +24,8 @@
import net.curisit.securis.security.Securable;
import net.curisit.securis.utils.TokenHelper;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Basic services for login and basic app wrkflow
@@ -42,18 +42,23 @@
TokenHelper tokenHelper;
@Inject
- public BasicServices() {}
+ public BasicServices() {
+ }
@GET
@Path("/info")
- @Produces({ MediaType.TEXT_PLAIN })
+ @Produces({
+ MediaType.TEXT_PLAIN
+ })
public Response info(@Context HttpServletRequest request) {
return Response.ok().entity("License server running OK. Date: " + new Date()).build();
}
@GET
@Path("/{module:(admin)|(login)|(licenses)}")
- @Produces({ MediaType.TEXT_HTML })
+ @Produces({
+ MediaType.TEXT_HTML
+ })
public Response init(@PathParam("module") String module, @Context HttpServletRequest request) {
LOG.info("App index main.html");
String page = "/main.html";
@@ -63,7 +68,9 @@
@POST
@Path("/login")
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response login(@FormParam("username") String user, @FormParam("password") String password, @Context HttpServletRequest request) {
LOG.info("index session: " + request.getSession());
LOG.info("user: {}, pass: {}", user, password);
@@ -88,7 +95,9 @@
@GET
@Securable()
@Path("/check")
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response check(@HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token, @QueryParam("token") String token2) {
if (token == null) {
token = token2;
@@ -110,7 +119,9 @@
@GET
@POST
@Path("/logout")
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response logout(@HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
if (token == null) {
Response.status(Status.BAD_REQUEST).build();
diff --git a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
index 1ef497d..8869c03 100644
--- a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
@@ -33,9 +33,9 @@
import net.curisit.securis.services.exception.SeCurisServiceException;
import net.curisit.securis.utils.TokenHelper;
-import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
import com.google.inject.persist.Transactional;
@@ -56,7 +56,8 @@
@Inject
Provider<EntityManager> emProvider;
- public LicenseResource() {}
+ public LicenseResource() {
+ }
/**
*
@@ -65,7 +66,9 @@
@GET
@Path("/")
@Securable
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response index(@QueryParam("packId") Integer packId, @Context BasicSecurityContext bsc) {
LOG.info("Getting licenses list ");
@@ -97,7 +100,9 @@
@GET
@Path("/{licId}")
@Securable
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response get(@PathParam("licId") Integer licId, @Context BasicSecurityContext bsc) throws SeCurisServiceException {
LOG.info("Getting organization data for id: {}: ", licId);
@@ -114,7 +119,9 @@
@GET
@Path("/{licId}/download")
@Securable
- @Produces({ MediaType.APPLICATION_OCTET_STREAM })
+ @Produces({
+ MediaType.APPLICATION_OCTET_STREAM
+ })
public Response download(@PathParam("licId") Integer licId, @Context BasicSecurityContext bsc) throws SeCurisServiceException {
EntityManager em = emProvider.get();
@@ -137,7 +144,9 @@
@Securable
@Transactional
@Consumes(MediaType.APPLICATION_JSON)
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response activate(@PathParam("licId") Integer licId, @Context BasicSecurityContext bsc) throws SeCurisServiceException {
EntityManager em = emProvider.get();
@@ -163,7 +172,9 @@
@Securable
@Transactional
@Consumes(MediaType.APPLICATION_JSON)
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response send(@PathParam("licId") Integer licId, @Context BasicSecurityContext bsc) throws SeCurisServiceException {
EntityManager em = emProvider.get();
@@ -183,7 +194,9 @@
@Securable
@Transactional
@Consumes(MediaType.APPLICATION_JSON)
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response cancel(@PathParam("licId") Integer licId, @Context BasicSecurityContext bsc) throws SeCurisServiceException {
EntityManager em = emProvider.get();
@@ -208,7 +221,9 @@
@Path("/")
@Consumes(MediaType.APPLICATION_JSON)
@Securable
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
@Transactional
public Response create(License lic, @Context BasicSecurityContext bsc) throws SeCurisServiceException {
LOG.info("Creating new license from create()");
@@ -221,12 +236,10 @@
return Response.status(Status.NOT_FOUND)
.header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "License's pack not found with ID: " + lic.getPackId()).build();
} else {
- if (!bsc.isUserInRole(BasicSecurityContext.ROL_ADMIN)) {
- if (!bsc.getOrganizationsIds().contains(pack.getOrganization().getId())) {
- LOG.error("License for pack with id {} can not be created by user {}", pack.getId(), bsc.getUserPrincipal());
- return Response.status(Status.UNAUTHORIZED)
- .header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "Unathorized action on pack license").build();
- }
+ if (!bsc.isUserInRole(BasicSecurityContext.ROL_ADMIN) && !bsc.getOrganizationsIds().contains(pack.getOrganization().getId())) {
+ LOG.error("License for pack with id {} can not be created by user {}", pack.getId(), bsc.getUserPrincipal());
+ return Response.status(Status.UNAUTHORIZED)
+ .header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "Unathorized action on pack license").build();
}
}
}
@@ -248,7 +261,9 @@
@Path("/")
@Consumes(MediaType.MULTIPART_FORM_DATA)
@Securable
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
@Transactional
public Response createWithFile(MultipartFormDataInput mpfdi, @Context BasicSecurityContext bsc) throws IOException, SeCurisServiceException {
License lic = new License();
@@ -268,7 +283,9 @@
@Securable
@Transactional
@Consumes(MediaType.APPLICATION_JSON)
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response modify(License lic, @PathParam("licId") Integer licId, @Context BasicSecurityContext bsc) throws SeCurisServiceException {
LOG.info("Modifying organization with id: {}", licId);
@@ -290,7 +307,9 @@
@Path("/{licId}")
@Transactional
@Securable
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response delete(@PathParam("licId") Integer licId, @Context BasicSecurityContext bsc) throws SeCurisServiceException {
LOG.info("Deleting license with id: {}", licId);
EntityManager em = emProvider.get();
@@ -317,11 +336,9 @@
LOG.error("License with id {} not found in DB", licId);
throw new SeCurisServiceException(Status.NOT_FOUND.getStatusCode(), "License not found for ID: " + licId);
}
- if (!bsc.isUserInRole(BasicSecurityContext.ROL_ADMIN)) {
- if (!bsc.getOrganizationsIds().contains(lic.getPack().getOrganization().getId())) {
- LOG.error("License with id {} is not accesible by user {}", licId, bsc.getUserPrincipal());
- throw new SeCurisServiceException(Status.UNAUTHORIZED.getStatusCode(), "Unathorized access to license data");
- }
+ if (!bsc.isUserInRole(BasicSecurityContext.ROL_ADMIN) && !bsc.getOrganizationsIds().contains(lic.getPack().getOrganization().getId())) {
+ LOG.error("License with id {} is not accesible by user {}", licId, bsc.getUserPrincipal());
+ throw new SeCurisServiceException(Status.UNAUTHORIZED.getStatusCode(), "Unathorized access to license data");
}
return lic;
}
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 45e5c10..7760033 100644
--- a/securis/src/main/java/net/curisit/securis/services/LicenseServices.java
+++ b/securis/src/main/java/net/curisit/securis/services/LicenseServices.java
@@ -23,10 +23,10 @@
import net.curisit.integrity.beans.ServiceResponse;
import org.apache.commons.io.IOUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.jboss.resteasy.annotations.providers.multipart.MultipartForm;
import org.jboss.resteasy.annotations.providers.multipart.PartType;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
// The Java class will be hosted at the URI path "/myresource"
@Path("/test")
@@ -50,7 +50,9 @@
* @return the server version in format majorVersion.minorVersion
*/
@GET
- @Produces({ MediaType.TEXT_HTML })
+ @Produces({
+ MediaType.TEXT_HTML
+ })
public Response index() {
try {
String index = IOUtils.toString(this.getClass().getResourceAsStream("/static/index.html"));
@@ -63,7 +65,9 @@
@GET
@Path("/dummy")
- @Produces({ MediaType.TEXT_PLAIN })
+ @Produces({
+ MediaType.TEXT_PLAIN
+ })
public Response dummy(@Context HttpServletRequest request) {
LOG.info("Request: " + request.getPathInfo());
return Response.ok().entity((uri == null)).build();
@@ -76,7 +80,9 @@
@POST
@Path("/upload1")
@Consumes(MediaType.MULTIPART_FORM_DATA)
- @Produces({ MediaType.APPLICATION_JSON })
+ @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();
@@ -84,7 +90,9 @@
@GET
@Path("/current/{license}")
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public ServiceResponse<ServerConfigVersions> testFile(@PathParam("license") String license,
@DefaultValue("-1") @QueryParam("minorVersion") int minorVersion, @DefaultValue("-1") @QueryParam("majorVersion") int majorVersion) {
@@ -104,7 +112,8 @@
@PartType("text/plain")
private String texto;
- public FileUploadForm() {}
+ public FileUploadForm() {
+ }
public byte[] getFile() {
return file;
diff --git a/securis/src/main/java/net/curisit/securis/services/LicenseTypeResource.java b/securis/src/main/java/net/curisit/securis/services/LicenseTypeResource.java
index 1906c3b..23eafa8 100644
--- a/securis/src/main/java/net/curisit/securis/services/LicenseTypeResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/LicenseTypeResource.java
@@ -29,8 +29,8 @@
import net.curisit.securis.db.LicenseType;
import net.curisit.securis.utils.TokenHelper;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import com.google.inject.persist.Transactional;
@@ -51,7 +51,8 @@
@Inject
Provider<EntityManager> emProvider;
- public LicenseTypeResource() {}
+ public LicenseTypeResource() {
+ }
/**
*
@@ -59,7 +60,9 @@
*/
@GET
@Path("/")
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response index() {
LOG.info("Getting license types list ");
@@ -76,7 +79,9 @@
*/
@GET
@Path("/{ltid}")
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response get(@PathParam("ltid") String ltid, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
LOG.info("Getting license type data for id: {}: ", ltid);
if (ltid == null || "".equals(ltid)) {
@@ -96,7 +101,9 @@
@POST
@Path("/")
@Consumes(MediaType.APPLICATION_JSON)
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
@Transactional
public Response create(LicenseType lt, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
LOG.info("Creating new license type");
@@ -125,7 +132,9 @@
@Path("/{ltid}")
@Transactional
@Consumes(MediaType.APPLICATION_JSON)
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response modify(LicenseType lt, @PathParam("ltid") String ltid, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
LOG.info("Modifying license type with id: {}", ltid);
EntityManager em = emProvider.get();
@@ -166,7 +175,9 @@
@DELETE
@Path("/{ltid}")
@Transactional
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response delete(@PathParam("ltid") String ltid, @Context HttpServletRequest request) {
LOG.info("Deleting app with id: {}", ltid);
EntityManager em = emProvider.get();
diff --git a/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java b/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java
index 63df387..27e956c 100644
--- a/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java
@@ -33,9 +33,9 @@
import net.curisit.securis.security.Securable;
import net.curisit.securis.utils.TokenHelper;
-import org.jboss.resteasy.spi.ResteasyProviderFactory;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.jboss.resteasy.spi.ResteasyProviderFactory;
import com.google.inject.persist.Transactional;
@@ -53,7 +53,8 @@
@Inject
private Provider<EntityManager> emProvider;
- public OrganizationResource() {}
+ public OrganizationResource() {
+ }
/**
*
@@ -61,7 +62,9 @@
*/
@GET
@Path("/")
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
@Securable
public Response index(@Context BasicSecurityContext bsc) {
LOG.info("Getting organizations list ");
@@ -88,7 +91,9 @@
*/
@GET
@Path("/{orgid}")
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
@Securable
public Response get(@PathParam("orgid") String orgid, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
LOG.info("Getting organization data for id: {}: ", orgid);
@@ -120,7 +125,9 @@
@POST
@Path("/")
@Consumes(MediaType.APPLICATION_JSON)
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
@Transactional
@Securable
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
@@ -136,7 +143,7 @@
List<User> users = null;
List<String> usersIds = org.getUsersIds();
- if (usersIds != null && usersIds.size() > 0) {
+ if (usersIds != null && !usersIds.isEmpty()) {
users = new ArrayList<>();
for (String username : usersIds) {
User user = em.find(User.class, username);
@@ -171,7 +178,7 @@
private void setOrgUsers(Organization org, List<String> usersIds, EntityManager em) throws SeCurisException {
List<User> users = null;
- if (usersIds != null && usersIds.size() > 0) {
+ if (usersIds != null && !usersIds.isEmpty()) {
users = new ArrayList<>();
for (String username : usersIds) {
User user = em.find(User.class, username);
@@ -191,7 +198,9 @@
@Path("/{orgid}")
@Transactional
@Consumes(MediaType.APPLICATION_JSON)
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
@Securable
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
public Response modify(Organization org, @PathParam("orgid") String orgid, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
@@ -208,16 +217,13 @@
} catch (SeCurisException e) {
return Response.status(Status.NOT_FOUND).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, e.getMessage()).build();
}
- if (org.getParentOrganization() != null) {
- if (isCyclicalRelationship(currentOrg.getId(), org.getParentOrganization())) {
- LOG.error("Organization parent generate a cyclical relationship, parent id {}, current id: {}", org.getParentOrgId(),
- currentOrg.getId());
- return Response
- .status(Status.FORBIDDEN)
- .header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER,
- "Cyclical relationships are not allowed, please change the parent organization, current Parent: "
- + org.getParentOrganization().getName()).build();
- }
+ if (org.getParentOrganization() != null && (isCyclicalRelationship(currentOrg.getId(), org.getParentOrganization()))) {
+ LOG.error("Organization parent generate a cyclical relationship, parent id {}, current id: {}", org.getParentOrgId(), currentOrg.getId());
+ return Response
+ .status(Status.FORBIDDEN)
+ .header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER,
+ "Cyclical relationships are not allowed, please change the parent organization, current Parent: "
+ + org.getParentOrganization().getName()).build();
}
try {
@@ -237,7 +243,9 @@
@DELETE
@Path("/{orgid}")
@Transactional
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
@Securable
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
public Response delete(@PathParam("orgid") String orgid, @Context HttpServletRequest request) {
@@ -249,7 +257,7 @@
return Response.status(Status.NOT_FOUND).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "Organization was not found, ID: " + orgid)
.build();
}
- if (org.getChildOrganizations() != null && org.getChildOrganizations().size() > 0) {
+ if (org.getChildOrganizations() != null && !org.getChildOrganizations().isEmpty()) {
LOG.error("Organization has children and can not be deleted, ID: " + orgid);
return Response.status(Status.FORBIDDEN)
.header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "Organization has children and can not be deleted, ID: " + orgid).build();
diff --git a/securis/src/main/java/net/curisit/securis/services/PackResource.java b/securis/src/main/java/net/curisit/securis/services/PackResource.java
index fa4291a..45c5bd9 100644
--- a/securis/src/main/java/net/curisit/securis/services/PackResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/PackResource.java
@@ -5,7 +5,6 @@
import java.util.List;
import javax.annotation.security.RolesAllowed;
-import javax.crypto.SealedObject;
import javax.inject.Inject;
import javax.inject.Provider;
import javax.persistence.EntityManager;
@@ -34,8 +33,8 @@
import net.curisit.securis.security.Securable;
import net.curisit.securis.utils.TokenHelper;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import com.google.inject.persist.Transactional;
@@ -56,7 +55,8 @@
@Inject
Provider<EntityManager> emProvider;
- public PackResource() {}
+ public PackResource() {
+ }
/**
*
@@ -65,7 +65,9 @@
@GET
@Path("/")
@Securable
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response index(@Context BasicSecurityContext bsc) {
LOG.info("Getting packs list ");
@@ -100,7 +102,9 @@
@GET
@Path("/{packId}")
@Securable
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response get(@PathParam("packId") Integer packId, @Context BasicSecurityContext bsc) {
LOG.info("Getting pack data for id: {}: ", packId);
if (packId == null || "".equals(packId)) {
@@ -114,10 +118,9 @@
LOG.error("Pack with id {} not found in DB", packId);
return Response.status(Status.NOT_FOUND).build();
}
- if (bsc.isUserInRole(BasicSecurityContext.ROL_ADVANCE)) {
- if (bsc.getOrganizationsIds() == null || !bsc.getOrganizationsIds().contains(pack.getOrgId())) {
- return generateErrorUnathorizedAccess(pack, bsc.getUserPrincipal());
- }
+ if (bsc.isUserInRole(BasicSecurityContext.ROL_ADVANCE)
+ && (bsc.getOrganizationsIds() == null || !bsc.getOrganizationsIds().contains(pack.getOrgId()))) {
+ return generateErrorUnathorizedAccess(pack, bsc.getUserPrincipal());
}
return Response.ok(pack).build();
}
@@ -127,7 +130,9 @@
@Securable
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
@Consumes(MediaType.APPLICATION_JSON)
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
@Transactional
public Response create(Pack pack, @Context BasicSecurityContext bsc) {
LOG.info("Creating new pack");
@@ -173,7 +178,9 @@
@Securable
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
@Consumes(MediaType.APPLICATION_JSON)
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response modify(Pack pack, @PathParam("packId") Integer packId) {
LOG.info("Modifying pack with id: {}", packId);
EntityManager em = emProvider.get();
@@ -218,7 +225,9 @@
@Securable
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
@Transactional
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response delete(@PathParam("packId") String packId) {
LOG.info("Deleting pack with id: {}", packId);
EntityManager em = emProvider.get();
diff --git a/securis/src/main/java/net/curisit/securis/services/UserResource.java b/securis/src/main/java/net/curisit/securis/services/UserResource.java
index 4b0c8ac..a832493 100644
--- a/securis/src/main/java/net/curisit/securis/services/UserResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/UserResource.java
@@ -33,8 +33,8 @@
import net.curisit.securis.db.User;
import net.curisit.securis.utils.TokenHelper;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import com.google.inject.persist.Transactional;
@@ -54,7 +54,8 @@
private static final Logger LOG = LogManager.getLogger(UserResource.class);
- public UserResource() {}
+ public UserResource() {
+ }
/**
*
@@ -62,7 +63,9 @@
*/
@GET
@Path("/")
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response index() {
LOG.info("Getting users list ");
@@ -80,7 +83,9 @@
*/
@GET
@Path("/{uid}")
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response get(@PathParam("uid") String uid, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
LOG.info("Getting user data for id: {}: ", uid);
if (uid == null || "".equals(uid)) {
@@ -100,7 +105,9 @@
@POST
@Path("/")
@Consumes(MediaType.APPLICATION_JSON)
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
@Transactional
public Response create(User user, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
LOG.info("Creating new user");
@@ -126,7 +133,7 @@
private void setUserOrg(User user, Set<Integer> orgsIds, EntityManager em) throws SeCurisException {
Set<Organization> orgs = null;
- if (orgsIds != null && orgsIds.size() > 0) {
+ if (orgsIds != null && !orgsIds.isEmpty()) {
orgs = new HashSet<>();
for (Integer orgId : orgsIds) {
Organization o = em.find(Organization.class, orgId);
@@ -147,7 +154,9 @@
@Path("/{uid}")
@Transactional
@Consumes(MediaType.APPLICATION_JSON)
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response modify(User user, @PathParam("uid") String uid, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
LOG.info("Modifying user with id: {}", uid);
EntityManager em = emProvider.get();
@@ -178,7 +187,9 @@
@DELETE
@Path("/{uid}")
@Transactional
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response delete(@PathParam("uid") String uid, @Context HttpServletRequest request) {
LOG.info("Deleting app with id: {}", uid);
EntityManager em = emProvider.get();
@@ -194,7 +205,9 @@
@POST
@Path("/login")
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response login(@FormParam("username") String user, @FormParam("password") String password, @Context HttpServletRequest request) {
LOG.info("index session: " + request.getSession());
LOG.info("user: {}, pass: {}", user, password);
@@ -218,7 +231,9 @@
*/
@POST
@Path("/check")
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response check(@HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token, @QueryParam("token") String token2) {
if (token == null) {
token = token2;
@@ -241,7 +256,9 @@
@GET
@Path("/logout")
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
public Response logout(@Context HttpServletRequest request) {
request.getSession().invalidate();
return Response.ok().build();
diff --git a/securis/src/main/java/net/curisit/securis/utils/CacheTTL.java b/securis/src/main/java/net/curisit/securis/utils/CacheTTL.java
index f69cf25..9a2ebf1 100644
--- a/securis/src/main/java/net/curisit/securis/utils/CacheTTL.java
+++ b/securis/src/main/java/net/curisit/securis/utils/CacheTTL.java
@@ -9,8 +9,8 @@
import javax.inject.Inject;
import javax.inject.Singleton;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Cache implementation with TTL (time To Live) The objects are removed from
diff --git a/securis/src/main/java/net/curisit/securis/utils/TokenHelper.java b/securis/src/main/java/net/curisit/securis/utils/TokenHelper.java
index dac3692..b3949c5 100644
--- a/securis/src/main/java/net/curisit/securis/utils/TokenHelper.java
+++ b/securis/src/main/java/net/curisit/securis/utils/TokenHelper.java
@@ -13,9 +13,9 @@
import net.curisit.integrity.commons.Utils;
import org.apache.commons.lang3.StringUtils;
-import org.jboss.resteasy.util.Base64;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.jboss.resteasy.util.Base64;
@Singleton
public class TokenHelper {
@@ -29,7 +29,8 @@
public static final String TOKEN_HEADER_PÀRAM = "X-SECURIS-TOKEN";
@Inject
- public TokenHelper() {}
+ public TokenHelper() {
+ }
private static byte[] seed = "S3Cur15S33dForT0k3nG3n3r@tion".getBytes();
diff --git a/securis/src/patch/java/net/curisit/securis/LicenseGenerator.java b/securis/src/patch/java/net/curisit/securis/LicenseGenerator.java
index 7137146..272a652 100644
--- a/securis/src/patch/java/net/curisit/securis/LicenseGenerator.java
+++ b/securis/src/patch/java/net/curisit/securis/LicenseGenerator.java
@@ -37,7 +37,8 @@
private static LicenseGenerator singleton = new LicenseGenerator();
- private LicenseGenerator() {}
+ private LicenseGenerator() {
+ }
public static LicenseGenerator getInstance() {
return singleton;
--
Gitblit v1.3.2