Skip to content

Commit

Permalink
Fix sonar
Browse files Browse the repository at this point in the history
  • Loading branch information
amanteaux committed Oct 20, 2023
1 parent 56df58d commit dbd0b25
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 32 deletions.
23 changes: 10 additions & 13 deletions src/main/java/com/coreoz/WebApplication.java
Original file line number Diff line number Diff line change
@@ -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);

Expand Down Expand Up @@ -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.");
Expand Down
14 changes: 6 additions & 8 deletions src/main/java/com/coreoz/db/QuerydslGenerator.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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();
}

}
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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,
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/coreoz/webservices/internal/SwaggerWs.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@

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;
import io.swagger.v3.oas.integration.SwaggerConfiguration;
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
Expand All @@ -30,8 +30,9 @@ public class SwaggerWs {
private final String swaggerDefinition;
private final BasicAuthenticator<String> 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"))
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/coreoz/SampleTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

0 comments on commit dbd0b25

Please sign in to comment.