diff --git a/src/main/java/com/coreoz/WebApplication.java b/src/main/java/com/coreoz/WebApplication.java index df7f6ad..a79574b 100644 --- a/src/main/java/com/coreoz/WebApplication.java +++ b/src/main/java/com/coreoz/WebApplication.java @@ -1,30 +1,27 @@ package com.coreoz; -import java.time.Duration; -import java.util.concurrent.TimeUnit; - -import com.coreoz.plume.admin.services.scheduler.LogApiScheduledJobs; -import org.glassfish.grizzly.GrizzlyFuture; -import org.glassfish.grizzly.http.server.HttpServer; -import org.glassfish.jersey.server.ResourceConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.coreoz.db.DatabaseInitializer; import com.coreoz.guice.ApplicationModule; import com.coreoz.jersey.GrizzlySetup; +import com.coreoz.plume.admin.services.scheduler.LogApiScheduledJobs; import com.coreoz.plume.jersey.guice.JerseyGuiceFeature; import com.coreoz.wisp.Scheduler; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Stage; +import lombok.extern.slf4j.Slf4j; +import org.glassfish.grizzly.GrizzlyFuture; +import org.glassfish.grizzly.http.server.HttpServer; +import org.glassfish.jersey.server.ResourceConfig; + +import java.time.Duration; +import java.util.concurrent.TimeUnit; /** * The application entry point, where it all begins. */ +@Slf4j public class WebApplication { - private static final Logger logger = LoggerFactory.getLogger(WebApplication.class); - // maximal waiting time for the last process to execute after the JVM received a kill signal public static final Duration GRACEFUL_SHUTDOWN_TIMEOUT = Duration.ofSeconds(60); @@ -76,7 +73,7 @@ private static void addShutDownListener(HttpServer httpServer, Scheduler schedul logger.info("Waiting for server to shut down... Shutdown timeout is {} seconds", GRACEFUL_SHUTDOWN_TIMEOUT.toSeconds()); scheduler.gracefullyShutdown(GRACEFUL_SHUTDOWN_TIMEOUT); grizzlyServerShutdownFuture.get(); - } catch(Exception e) { + } catch(Throwable e) { logger.error("Error while shutting down server.", e); } logger.info("Server and scheduler stopped."); diff --git a/src/main/java/com/coreoz/db/QuerydslGenerator.java b/src/main/java/com/coreoz/db/QuerydslGenerator.java index 4f62e8d..b974c82 100644 --- a/src/main/java/com/coreoz/db/QuerydslGenerator.java +++ b/src/main/java/com/coreoz/db/QuerydslGenerator.java @@ -19,14 +19,16 @@ import com.querydsl.sql.types.JSR310LocalTimeType; import com.querydsl.sql.types.JSR310ZonedDateTimeType; import com.querydsl.sql.types.Type; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; /** * Generate Querydsl classes for the database layer. * * Run the {@link #main()} method from your IDE to regenerate Querydsl classes. */ +@Slf4j public class QuerydslGenerator { - private static final String TABLES_PREFIX = "plm_"; public static void main(String... args) { @@ -68,17 +70,13 @@ public String getDefaultVariableName(EntityType entityType) { try { exporter.export(connection.getMetaData()); } catch (SQLException e) { - e.printStackTrace(); + logger.error("Querydsl database objects generation failed", e); } }); } + @SneakyThrows private static Type classType(Class classType) { - try { - return (Type) classType.getConstructor().newInstance(); - } catch (Exception e) { - throw new RuntimeException(e); - } + return (Type) classType.getConstructor().newInstance(); } - } diff --git a/src/main/java/com/coreoz/webservices/admin/permissions/ProjectAdminPermissionService.java b/src/main/java/com/coreoz/webservices/admin/permissions/ProjectAdminPermissionService.java index 27496b0..ed1742a 100644 --- a/src/main/java/com/coreoz/webservices/admin/permissions/ProjectAdminPermissionService.java +++ b/src/main/java/com/coreoz/webservices/admin/permissions/ProjectAdminPermissionService.java @@ -1,15 +1,13 @@ package com.coreoz.webservices.admin.permissions; -import java.util.Set; - -import javax.inject.Inject; -import javax.inject.Singleton; - import com.coreoz.plume.admin.services.permission.LogApiAdminPermissions; import com.coreoz.plume.admin.services.permission.SystemAdminPermissions; import com.coreoz.plume.admin.services.permissions.AdminPermissionService; import com.coreoz.plume.admin.services.permissions.AdminPermissions; -import com.google.common.collect.ImmutableSet; + +import javax.inject.Inject; +import javax.inject.Singleton; +import java.util.Set; @Singleton public class ProjectAdminPermissionService implements AdminPermissionService { @@ -18,7 +16,7 @@ public class ProjectAdminPermissionService implements AdminPermissionService { @Inject public ProjectAdminPermissionService() { - this.permissionsAvailable = ImmutableSet.of( + this.permissionsAvailable = Set.of( AdminPermissions.MANAGE_USERS, AdminPermissions.MANAGE_ROLES, LogApiAdminPermissions.MANAGE_API_LOGS, diff --git a/src/main/java/com/coreoz/webservices/internal/SwaggerWs.java b/src/main/java/com/coreoz/webservices/internal/SwaggerWs.java index 2d6ee5c..e0b70dc 100644 --- a/src/main/java/com/coreoz/webservices/internal/SwaggerWs.java +++ b/src/main/java/com/coreoz/webservices/internal/SwaggerWs.java @@ -14,7 +14,6 @@ import com.coreoz.plume.jersey.security.basic.BasicAuthenticator; import com.coreoz.plume.jersey.security.permission.PublicApi; -import com.fasterxml.jackson.core.JsonProcessingException; import io.swagger.v3.core.util.Yaml; import io.swagger.v3.jaxrs2.integration.JaxrsOpenApiContextBuilder; @@ -22,6 +21,7 @@ import io.swagger.v3.oas.integration.api.OpenApiContext; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.servers.Server; +import lombok.SneakyThrows; @Path("/swagger") @Singleton @@ -30,8 +30,9 @@ public class SwaggerWs { private final String swaggerDefinition; private final BasicAuthenticator basicAuthenticator; + @SneakyThrows @Inject - public SwaggerWs(InternalApiAuthenticator apiAuthenticator) throws Exception { + public SwaggerWs(InternalApiAuthenticator apiAuthenticator) { // Basic configuration SwaggerConfiguration openApiConfig = new SwaggerConfiguration() .resourcePackages(Set.of("com.coreoz.webservices.api")) @@ -59,7 +60,7 @@ public SwaggerWs(InternalApiAuthenticator apiAuthenticator) throws Exception { @Produces(MediaType.APPLICATION_JSON) @GET - public String get(@Context ContainerRequestContext requestContext) throws JsonProcessingException { + public String get(@Context ContainerRequestContext requestContext) { basicAuthenticator.requireAuthentication(requestContext); return swaggerDefinition; diff --git a/src/test/java/com/coreoz/SampleTest.java b/src/test/java/com/coreoz/SampleTest.java index 89acabb..a3717d5 100644 --- a/src/test/java/com/coreoz/SampleTest.java +++ b/src/test/java/com/coreoz/SampleTest.java @@ -18,6 +18,6 @@ public class SampleTest { @Test public void methodToTest__test_scenario_description() { - Assertions.assertThat(1).isEqualTo(1); + Assertions.assertThat(1 + 1).isEqualTo(2); } }