Feature - Helidon 4.0 integration #5393
Nikita Koksharov
1 year ago
parent
dfbdd05533
commit
5a36a974fc
@ -0,0 +1,137 @@
|
|||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<parent>
|
||||||
|
<groupId>org.redisson</groupId>
|
||||||
|
<artifactId>redisson-helidon</artifactId>
|
||||||
|
<version>3.24.3-SNAPSHOT</version>
|
||||||
|
<relativePath>../</relativePath>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
<artifactId>redisson-helidon-40</artifactId>
|
||||||
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
|
<name>Redisson/Helidon integration</name>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.mycila</groupId>
|
||||||
|
<artifactId>license-maven-plugin</artifactId>
|
||||||
|
<version>3.0</version>
|
||||||
|
<configuration>
|
||||||
|
<basedir>${basedir}</basedir>
|
||||||
|
<header>${basedir}/../../header.txt</header>
|
||||||
|
<quiet>false</quiet>
|
||||||
|
<failIfMissing>true</failIfMissing>
|
||||||
|
<aggregate>false</aggregate>
|
||||||
|
<includes>
|
||||||
|
<include>src/main/java/org/redisson/</include>
|
||||||
|
</includes>
|
||||||
|
<excludes>
|
||||||
|
<exclude>target/**</exclude>
|
||||||
|
</excludes>
|
||||||
|
<useDefaultExcludes>true</useDefaultExcludes>
|
||||||
|
<mapping>
|
||||||
|
<java>JAVADOC_STYLE</java>
|
||||||
|
</mapping>
|
||||||
|
<strictCheck>true</strictCheck>
|
||||||
|
<useDefaultMapping>true</useDefaultMapping>
|
||||||
|
<encoding>UTF-8</encoding>
|
||||||
|
</configuration>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<goals>
|
||||||
|
<goal>check</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<source>21</source>
|
||||||
|
<target>21</target>
|
||||||
|
<showDeprecation>true</showDeprecation>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.redisson</groupId>
|
||||||
|
<artifactId>redisson</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>jakarta.enterprise</groupId>
|
||||||
|
<artifactId>jakarta.enterprise.cdi-api</artifactId>
|
||||||
|
<version>4.0.1</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>jakarta.inject</groupId>
|
||||||
|
<artifactId>jakarta.inject-api</artifactId>
|
||||||
|
<version>2.0.1</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.jboss</groupId>
|
||||||
|
<artifactId>jandex</artifactId>
|
||||||
|
<version>3.1.5</version>
|
||||||
|
<scope>runtime</scope>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.helidon.microprofile.config</groupId>
|
||||||
|
<artifactId>helidon-microprofile-config</artifactId>
|
||||||
|
<version>4.0.0</version>
|
||||||
|
<scope>runtime</scope>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.eclipse.microprofile.config</groupId>
|
||||||
|
<artifactId>microprofile-config-api</artifactId>
|
||||||
|
<version>3.1</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.helidon.microprofile.cdi</groupId>
|
||||||
|
<artifactId>helidon-microprofile-cdi</artifactId>
|
||||||
|
<version>4.0.0</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.junit.jupiter</groupId>
|
||||||
|
<artifactId>junit-jupiter-engine</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.junit.jupiter</groupId>
|
||||||
|
<artifactId>junit-jupiter-params</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>ch.qos.logback</groupId>
|
||||||
|
<artifactId>logback-classic</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.assertj</groupId>
|
||||||
|
<artifactId>assertj-core</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
|
</project>
|
||||||
@ -0,0 +1,90 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2013-2022 Nikita Koksharov
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package org.redisson.helidon;
|
||||||
|
|
||||||
|
import jakarta.enterprise.context.ApplicationScoped;
|
||||||
|
import jakarta.enterprise.event.Observes;
|
||||||
|
import jakarta.enterprise.inject.spi.*;
|
||||||
|
import jakarta.inject.Named;
|
||||||
|
import org.eclipse.microprofile.config.Config;
|
||||||
|
import org.redisson.Redisson;
|
||||||
|
import org.redisson.api.RedissonClient;
|
||||||
|
import org.redisson.config.PropertiesConvertor;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.lang.annotation.Annotation;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @author Nikita Koksharov
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public class RedissonExtension implements Extension {
|
||||||
|
|
||||||
|
private final Set<Annotation> qualifiers = new HashSet<>();
|
||||||
|
|
||||||
|
private <T extends RedissonClient> void processRedissonInjectionPoint(@Observes ProcessInjectionPoint<?, T> point) {
|
||||||
|
if (point == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
InjectionPoint injectionPoint = point.getInjectionPoint();
|
||||||
|
if (injectionPoint == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
qualifiers.addAll(injectionPoint.getQualifiers());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void addBeans(@Observes AfterBeanDiscovery discovery, BeanManager beanManager) {
|
||||||
|
if (discovery == null || beanManager == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (Annotation qualifier : qualifiers) {
|
||||||
|
Set<Annotation> qualifiers = Collections.singleton(qualifier);
|
||||||
|
|
||||||
|
discovery.addBean()
|
||||||
|
.scope(ApplicationScoped.class)
|
||||||
|
.addQualifiers(qualifiers)
|
||||||
|
.addTransitiveTypeClosure(RedissonClient.class)
|
||||||
|
.produceWith((instance) -> {
|
||||||
|
|
||||||
|
String instanceName = "default";
|
||||||
|
if (qualifier instanceof Named) {
|
||||||
|
instanceName = ((Named) qualifier).value();
|
||||||
|
}
|
||||||
|
|
||||||
|
Config cfg = instance.select(Config.class).get();
|
||||||
|
String yamlConfig = PropertiesConvertor.toYaml(Redisson.class.getName() + "." + instanceName + ".",
|
||||||
|
cfg.getPropertyNames(), prop -> {
|
||||||
|
return cfg.getValue(prop, String.class);
|
||||||
|
}, true);
|
||||||
|
|
||||||
|
try {
|
||||||
|
org.redisson.config.Config config = org.redisson.config.Config.fromYAML(yamlConfig);
|
||||||
|
return Redisson.create(config);
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new IllegalStateException(e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
|
||||||
|
https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"
|
||||||
|
version="3.0" bean-discovery-mode="annotated">
|
||||||
|
</beans>
|
||||||
@ -0,0 +1 @@
|
|||||||
|
org.redisson.helidon.RedissonExtension
|
||||||
@ -0,0 +1,50 @@
|
|||||||
|
package org.redisson;
|
||||||
|
|
||||||
|
import jakarta.enterprise.context.ApplicationScoped;
|
||||||
|
import jakarta.enterprise.context.Initialized;
|
||||||
|
import jakarta.enterprise.event.Observes;
|
||||||
|
import jakarta.enterprise.inject.Instance;
|
||||||
|
import jakarta.enterprise.inject.literal.NamedLiteral;
|
||||||
|
import jakarta.enterprise.inject.se.SeContainerInitializer;
|
||||||
|
import jakarta.enterprise.inject.spi.CDI;
|
||||||
|
import jakarta.inject.Named;
|
||||||
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.redisson.api.RBucket;
|
||||||
|
import org.redisson.api.RedissonClient;
|
||||||
|
|
||||||
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @author Nikita Koksharov
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
@ApplicationScoped
|
||||||
|
public class RedissonExtensionTest {
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
void startCdiContainer() {
|
||||||
|
System.setProperty("org.redisson.Redisson.simple.singleServerConfig.address", "redis://127.0.0.1:6379");
|
||||||
|
SeContainerInitializer initializer = SeContainerInitializer.newInstance();
|
||||||
|
initializer.initialize();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void onInit(@Observes @Initialized(ApplicationScoped.class) Object event,
|
||||||
|
@Named("simple") RedissonClient client) {
|
||||||
|
assertThat(client).isNotNull();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void test() {
|
||||||
|
Instance<RedissonClient> instance = CDI.current().select(RedissonClient.class, NamedLiteral.of("simple"));
|
||||||
|
RedissonClient redissonClient = instance.get();
|
||||||
|
|
||||||
|
RBucket<String> b = redissonClient.getBucket("test");
|
||||||
|
b.set("1");
|
||||||
|
assertThat(b.get()).isEqualTo("1");
|
||||||
|
assertThat(b.delete()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
|
||||||
|
https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"
|
||||||
|
version="3.0" bean-discovery-mode="annotated">
|
||||||
|
</beans>
|
||||||
@ -0,0 +1,2 @@
|
|||||||
|
mp.initializer.allow=true
|
||||||
|
mp.initializer.no-warn=true
|
||||||
Loading…
Reference in New Issue