Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JNG-6064 Configuration of Guice added #225

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

JNG-6064 Configuration of Guice added #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0683cd3
JNG-6064 Configuration of Guice added
robertcsakany Dec 14, 2024
7d8f650
Fixing typos
robertcsakany Dec 15, 2024
0f2dc90
Fixing URI and classloader
robertcsakany Dec 15, 2024
b40a8ce
Guice dependencies added
robertcsakany Dec 16, 2024
b4549a9
Dependency fix
robertcsakany Dec 17, 2024
4f609df
Fixing tests
robertcsakany Dec 17, 2024
ed5cf76
Review fixes
robertcsakany Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 97 additions & 18 deletions ...xf/src/main/java/hu/blackbelt/judo/runtime/core/jaxrs/cxf/server/guice/JudoCxfModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,21 @@
import com.google.inject.Singleton;
import com.google.inject.multibindings.Multibinder;
import hu.blackbelt.judo.runtime.core.jaxrs.cxf.server.guice.providers.*;
import hu.blackbelt.judo.runtime.core.utils.RuntimeVariableResolver;
import lombok.*;
import org.apache.cxf.interceptor.Interceptor;

import java.util.Objects;
import java.util.function.Consumer;

public class JudoCxfModule extends AbstractModule {

@Getter
private JudoCxfModuleConfiguration configuration;

public static class JudoCxfModuleBuilder {
JudoCxfModuleConfiguration configuration = null;
RuntimeVariableResolver runtimeVariableResolver = null;
Boolean exchangeIdInterceptors = JudoCxfModuleConfiguration.DEFAULT.getExchangeIdInterceptors();
String cxfJaxRsServerUrl = JudoCxfModuleConfiguration.DEFAULT.getCxfJaxRsServerUrl();
String cxfJaxRsServerPath = JudoCxfModuleConfiguration.DEFAULT.getCxfJaxRsServerPath();
Expand All @@ -61,6 +66,7 @@ public static class JudoCxfModuleBuilder {

@Builder
private JudoCxfModule(JudoCxfModuleConfiguration configuration,
RuntimeVariableResolver runtimeVariableResolver,
String cxfJaxRsServerUrl,
String cxfJaxRsServerPath,
Boolean exchangeIdInterceptors,
Expand All @@ -85,6 +91,8 @@ private JudoCxfModule(JudoCxfModuleConfiguration configuration,
this.configuration = configuration;
} else {
this.configuration = JudoCxfModuleConfiguration.builder()
.runtimeVariableResolver(Objects.requireNonNullElseGet(runtimeVariableResolver,
() -> RuntimeVariableResolver.builder().prefix("judo").build()))
.cxfJaxRsServerUrl(cxfJaxRsServerUrl)
.cxfJaxRsServerPath(cxfJaxRsServerPath)
.exchangeIdInterceptors(exchangeIdInterceptors)
Expand Down Expand Up @@ -139,24 +147,95 @@ protected void configure() {
}

protected void configureOptions() {
bind(String.class).annotatedWith(CxfConfigurations.CxfJaxRsServerUrl.class).toInstance(configuration.getCxfJaxRsServerUrl());
bind(String.class).annotatedWith(CxfConfigurations.CxfJaxRsServerPath.class).toInstance(configuration.getCxfJaxRsServerPath());
bind(Boolean.class).annotatedWith(CxfConfigurations.CxfSkipDefaultJsonProviderRegistration.class).toInstance(configuration.getCxfSkipDefaultJsonProviderRegistration());
bind(Boolean.class).annotatedWith(CxfConfigurations.CxfWadlServiceDescriptionAvailable.class).toInstance(configuration.getCxfWadlServiceDescriptionAvailable());
bind(Boolean.class).annotatedWith(CxfConfigurations.CxfMetricsEnabled.class).toInstance(configuration.getCxfMetricsEnabled());
bind(Boolean.class).annotatedWith(CxfConfigurations.CxfLoggingEnabled.class).toInstance(configuration.getCxfLoggingEnabled());
bind(Boolean.class).annotatedWith(CxfConfigurations.CxfLogException.class).toInstance(configuration.getCxfLogException());
bind(Boolean.class).annotatedWith(CxfConfigurations.CxfReturnRuntimeExceptions.class).toInstance(configuration.getCxfReturnRuntimeExceptions());
bind(Boolean.class).annotatedWith(CxfConfigurations.CxfIncludeBusinessCause.class).toInstance(configuration.getCxfIncludeBusinessCause());
bind(String.class).annotatedWith(CxfConfigurations.CxfDefaultRequestContentType.class).toInstance(configuration.getCxfDefaultRequestContentType());
bind(String.class).annotatedWith(CxfConfigurations.CxfCorsAllowOrigin.class).toInstance(configuration.getCorsAllowOrigin());
bind(Boolean.class).annotatedWith(CxfConfigurations.CxfCorsAllowCredentials.class).toInstance(configuration.getCorsAllowCredentials());
bind(String.class).annotatedWith(CxfConfigurations.CxfCorsAllowHeaders.class).toInstance(configuration.getCorsAllowHeaders());
bind(String.class).annotatedWith(CxfConfigurations.CxfCorsExposeHeaders.class).toInstance(configuration.getCorsExposeHeaders());
bind(Integer.class).annotatedWith(CxfConfigurations.CxfCorsMaxAge.class).toInstance(configuration.getCorsMaxAge());
bind(Integer.class).annotatedWith(CxfConfigurations.CxfCorsPrefligthErrorStatus.class).toInstance(configuration.getCorsPrefligthErrorStatus());
bind(Boolean.class).annotatedWith(CxfConfigurations.CxfCorsBlockIfUnauthorized.class).toInstance(configuration.getCorsBlockIfUnauthorized());
bind(Boolean.class).annotatedWith(CxfConfigurations.CxfCorsDefaultOptionsMethodsHandlePreflight.class).toInstance(configuration.getCorsDefaultOptionsMethodsHandlePreflight());
bind(String.class).annotatedWith(CxfConfigurations.CxfJaxRsServerUrl.class)
.toInstance(configuration.getRuntimeVariableResolver()
.getVariableAsString("CxfJaxRsServerUrl",
configuration.getCxfJaxRsServerUrl()));

bind(String.class).annotatedWith(CxfConfigurations.CxfJaxRsServerPath.class)
.toInstance(configuration.getRuntimeVariableResolver()
.getVariableAsString("CxfJaxRsServerPath",
configuration.getCxfJaxRsServerPath()));

bind(Boolean.class).annotatedWith(CxfConfigurations.CxfSkipDefaultJsonProviderRegistration.class)
.toInstance(configuration.getRuntimeVariableResolver()
.getVariableAsBoolean("CxfSkipDefaultJsonProviderRegistration",
configuration.getCxfSkipDefaultJsonProviderRegistration()));

bind(Boolean.class).annotatedWith(CxfConfigurations.CxfWadlServiceDescriptionAvailable.class)
.toInstance(configuration.getRuntimeVariableResolver()
.getVariableAsBoolean("CxfWadlServiceDescriptionAvailable",
configuration.getCxfWadlServiceDescriptionAvailable()));

bind(Boolean.class).annotatedWith(CxfConfigurations.CxfMetricsEnabled.class)
.toInstance(configuration.getRuntimeVariableResolver()
.getVariableAsBoolean("CxfMetricsEnabled",
configuration.getCxfMetricsEnabled()));

bind(Boolean.class).annotatedWith(CxfConfigurations.CxfLoggingEnabled.class)
.toInstance(configuration.getRuntimeVariableResolver()
.getVariableAsBoolean("CxfLoggingEnabled",
configuration.getCxfLoggingEnabled()));

bind(Boolean.class).annotatedWith(CxfConfigurations.CxfLogException.class)
.toInstance(configuration.getRuntimeVariableResolver()
.getVariableAsBoolean("CxfLogException",
configuration.getCxfLogException()));

bind(Boolean.class).annotatedWith(CxfConfigurations.CxfReturnRuntimeExceptions.class)
.toInstance(configuration.getRuntimeVariableResolver()
.getVariableAsBoolean("CxfReturnRuntimeExceptions",
configuration.getCxfReturnRuntimeExceptions()));

bind(Boolean.class).annotatedWith(CxfConfigurations.CxfIncludeBusinessCause.class)
.toInstance(configuration.getRuntimeVariableResolver()
.getVariableAsBoolean("CxfIncludeBusinessCause",
configuration.getCxfIncludeBusinessCause()));

bind(String.class).annotatedWith(CxfConfigurations.CxfDefaultRequestContentType.class)
.toInstance(configuration.getRuntimeVariableResolver()
.getVariableAsString("CxfDefaultRequestContentType",
configuration.getCxfDefaultRequestContentType()));

bind(String.class).annotatedWith(CxfConfigurations.CxfCorsAllowOrigin.class)
.toInstance(configuration.getRuntimeVariableResolver()
.getVariableAsString("CxfCorsAllowOrigin",
configuration.getCorsAllowOrigin()));

bind(Boolean.class).annotatedWith(CxfConfigurations.CxfCorsAllowCredentials.class)
.toInstance(configuration.getRuntimeVariableResolver()
.getVariableAsBoolean("CxfCorsAllowCredentials",
configuration.getCorsAllowCredentials()));

bind(String.class).annotatedWith(CxfConfigurations.CxfCorsAllowHeaders.class)
.toInstance(configuration.getRuntimeVariableResolver()
.getVariableAsString("CxfCorsAllowHeaders",
configuration.getCorsAllowHeaders()));

bind(String.class).annotatedWith(CxfConfigurations.CxfCorsExposeHeaders.class)
.toInstance(configuration.getRuntimeVariableResolver()
.getVariableAsString("CxfCorsExposeHeaders",
configuration.getCorsExposeHeaders()));

bind(Integer.class).annotatedWith(CxfConfigurations.CxfCorsMaxAge.class)
.toInstance(configuration.getRuntimeVariableResolver()
.getVariableAsInteger("CxfCorsMaxAge",
configuration.getCorsMaxAge()));

bind(Integer.class).annotatedWith(CxfConfigurations.CxfCorsPrefligthErrorStatus.class)
.toInstance(configuration.getRuntimeVariableResolver()
.getVariableAsInteger("CxfCorsPrefligthErrorStatus",
configuration.getCorsPrefligthErrorStatus()));

bind(Boolean.class).annotatedWith(CxfConfigurations.CxfCorsBlockIfUnauthorized.class)
.toInstance(configuration.getRuntimeVariableResolver()
.getVariableAsBoolean("CxfCorsBlockIfUnauthorized",
configuration.getCorsBlockIfUnauthorized()));

bind(Boolean.class).annotatedWith(CxfConfigurations.CxfCorsDefaultOptionsMethodsHandlePreflight.class)
.toInstance(configuration.getRuntimeVariableResolver()
.getVariableAsBoolean("CxfCorsDefaultOptionsMethodsHandlePreflight",
configuration.getCorsDefaultOptionsMethodsHandlePreflight()));
}

protected void configureServer() {
Expand Down
4 changes: 3 additions & 1 deletion ...ava/hu/blackbelt/judo/runtime/core/jaxrs/cxf/server/guice/JudoCxfModuleConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package hu.blackbelt.judo.runtime.core.jaxrs.cxf.server.guice;

import hu.blackbelt.judo.runtime.core.jaxrs.providers.SetDefaultContentTypePreMatchContainerRequestFilter;
import hu.blackbelt.judo.runtime.core.utils.RuntimeVariableResolver;
import lombok.*;

@Builder
Expand All @@ -10,7 +11,8 @@
@AllArgsConstructor
public class JudoCxfModuleConfiguration {
public static final JudoCxfModuleConfiguration DEFAULT = JudoCxfModuleConfiguration.builder().build();

@Builder.Default
RuntimeVariableResolver runtimeVariableResolver = null;
@Builder.Default
Boolean exchangeIdInterceptors = true;
@Builder.Default
Expand Down
2 changes: 1 addition & 1 deletion ...-core-guice-cxf/src/test/java/hu/blackbelt/judo/runtime/core/guice/JudoCxfModuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ void init() throws Exception {
injector.injectMembers(this);

restUri = "http://localhost:" + port + "/api/Calc";
log.info("Init: " + (timer.elapsed().getNano() / 1024 / 1024) + "ms");
log.info("Init: ⏱ " + timer.elapsed().toMillis()+ " ms");
}

@AfterEach
Expand Down
17 changes: 17 additions & 0 deletions judo-runtime-core-guice-dependencies/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>judo-runtime-core-dependencies</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
Loading
Loading