Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ repositories {
mavenLocal()
jcenter()
mavenCentral()
maven {
url "https://nexus.somnomedics.eu/nexus/repository/3thparty"
}
}

dependencies {
Expand All @@ -57,7 +60,7 @@ dependencies {
}
compile 'org.ow2.asm:asm:7.3.1'
compile 'cglib:cglib:3.3.0'
compile 'com.google.inject:guice:4.2.2:classes'
compile 'com.google.inject:guice:4.2.2'

// for class-path scanning (auto-register JAX-RS resources)
compile 'org.reflections:reflections:0.9.12'
Expand All @@ -77,7 +80,7 @@ dependencies {

compile 'io.jsonwebtoken:jjwt:0.9.1'

compile 'io.undertow:undertow-websockets-jsr:2.0.30.Final'
compile 'io.undertow:undertow-websockets-jsr:2.2.3.Final'

compile 'com.fasterxml.jackson.core:jackson-core:2.9.6'
compile 'com.fasterxml.jackson.core:jackson-annotations:2.9.6'
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Fri Mar 27 16:38:54 CET 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/net/talpidae/base/Base.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import com.google.inject.name.Names;

import net.talpidae.base.database.DataBaseModule;
import net.talpidae.base.insect.InsectModule;
import net.talpidae.base.mapper.MapperModule;
import net.talpidae.base.server.ServerModule;
import net.talpidae.base.util.Application;
Expand Down Expand Up @@ -144,7 +143,6 @@ protected void configure()
install(new DataBaseModule());
install(new MapperModule());
install(new ServerModule());
install(new InsectModule());

OptionalBinder.newOptionalBinder(binder(), ShutdownHook.class).setDefault().to(DefaultShutdownHook.class);
}
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/net/talpidae/base/client/ClientModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ protected void configure()
bind(ObjectMapperProvider.class);
bind(AuthenticationInheritanceRequestFilter.class);
bind(AuthScopeTokenForwardRequestFilter.class);
bind(InsectNameUserAgentRequestFilter.class);
bind(LoadBalancingRequestFilter.class);
bind(LoadBalancingWebTargetFactory.class);

OptionalBinder.newOptionalBinder(binder(), ClientConfiguration.class).setDefault().to(DefaultClientConfig.class);
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public T getProxyWebTarget()
if (resource == null)
{
// by convention we always use the fully qualified interface name as route
val newResource = webTargetFactoryProvider.get().newWebTarget(serviceInterface.getName()).proxy(serviceInterface);
val newResource = webTargetFactoryProvider.get().newWebTarget(serviceInterface.getSimpleName()).proxy(serviceInterface);
if (resourceRef.compareAndSet(null, newResource))
{
return newResource;
Expand Down
120 changes: 0 additions & 120 deletions src/main/java/net/talpidae/base/client/LoadBalancingRequestFilter.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
import lombok.NonNull;
import lombok.val;

import java.util.Locale;


@Singleton
public class LoadBalancingWebTargetFactory
Expand All @@ -48,8 +50,7 @@ public LoadBalancingWebTargetFactory(@NonNull ClientConfiguration clientConfig)
public ResteasyWebTarget newWebTarget(@NonNull String route)
{
// host/port are replaced later by LoadBalancingRequestFilter
val webTarget = client.target("http://127.0.0.1:0");
webTarget.property(LoadBalancingRequestFilter.ROUTE_PROPERTY_NAME, route);
val webTarget = client.target("http://" + route.toLowerCase(Locale.ROOT));

return (ResteasyWebTarget) webTarget;
}
Expand Down
90 changes: 0 additions & 90 deletions src/main/java/net/talpidae/base/insect/AsyncInsectWrapper.java

This file was deleted.

Loading