Spring/spring-data-ldap
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate to Jakarta EE 9.

Browse Source 
Closes #281
This commit is contained in:
Mark Paluch
2021-09-27 11:45:20 +02:00
parent d08058b434
commit 3b785f3ca9
8 changed files with 36 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/springframework/data/ldap/repository/cdi/LdapRepositoryBean.java
View File

@@ -15,14 +15,14 @@
*/
package org.springframework.data.ldap.repository.cdi;
import jakarta.enterprise.context.spi.CreationalContext;
import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.BeanManager;
import java.lang.annotation.Annotation;
import java.util.Optional;
import java.util.Set;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import org.springframework.data.ldap.repository.support.LdapRepositoryFactory;
import org.springframework.data.repository.cdi.CdiRepositoryBean;
import org.springframework.data.repository.config.CustomRepositoryImplementationDetector;
@@ -60,7 +60,7 @@ public class LdapRepositoryBean<T> extends CdiRepositoryBean<T> {
/*
* (non-Javadoc)
* @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(javax.enterprise.context.spi.CreationalContext, java.lang.Class)
* @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(jakarta.enterprise.context.spi.CreationalContext, java.lang.Class)
*/
@Override
protected T create(CreationalContext<T> creationalContext, Class<T> repositoryType) {

15
src/main/java/org/springframework/data/ldap/repository/cdi/LdapRepositoryExtension.java
View File

@@ -15,6 +15,13 @@
*/
package org.springframework.data.ldap.repository.cdi;
import jakarta.enterprise.event.Observes;
import jakarta.enterprise.inject.UnsatisfiedResolutionException;
import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.enterprise.inject.spi.ProcessBean;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.HashMap;
@@ -24,16 +31,8 @@ import java.util.Map.Entry;
import java.util.Optional;
import java.util.Set;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.UnsatisfiedResolutionException;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.ProcessBean;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.data.repository.cdi.CdiRepositoryBean;
import org.springframework.data.repository.cdi.CdiRepositoryExtensionSupport;
import org.springframework.ldap.core.LdapOperations;

0
src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension → src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
View File

6
src/test/java/org/springframework/data/ldap/repository/cdi/CdiExtensionIntegrationTests.java
View File

@@ -18,10 +18,10 @@ package org.springframework.data.ldap.repository.cdi;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import java.util.Collections;
import jakarta.enterprise.inject.se.SeContainer;
import jakarta.enterprise.inject.se.SeContainerInitializer;
import javax.enterprise.inject.se.SeContainer;
import javax.enterprise.inject.se.SeContainerInitializer;
import java.util.Collections;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;

4
src/test/java/org/springframework/data/ldap/repository/cdi/LdapTemplateProducer.java
View File

@@ -17,8 +17,8 @@ package org.springframework.data.ldap.repository.cdi;
import static org.mockito.Mockito.*;
import javax.enterprise.inject.Produces;
import javax.inject.Singleton;
import jakarta.enterprise.inject.Produces;
import jakarta.inject.Singleton;
import org.springframework.ldap.core.LdapTemplate;
import org.springframework.ldap.odm.core.ObjectDirectoryMapper;

3
src/test/java/org/springframework/data/ldap/repository/cdi/RepositoryClient.java
View File

@@ -15,10 +15,9 @@
*/
package org.springframework.data.ldap.repository.cdi;
import jakarta.inject.Inject;
import lombok.Getter;
import javax.inject.Inject;
import org.springframework.ldap.core.LdapTemplate;
/**

3
src/test/java/org/springframework/data/ldap/repository/support/QPerson.java
View File

@@ -17,8 +17,6 @@ package org.springframework.data.ldap.repository.support;
import static com.querydsl.core.types.PathMetadataFactory.*;
import javax.annotation.Generated;
import com.querydsl.core.types.Path;
import com.querydsl.core.types.PathMetadata;
import com.querydsl.core.types.dsl.EntityPathBase;
@@ -29,7 +27,6 @@ import com.querydsl.core.types.dsl.StringPath;
/**
* QPerson is a Querydsl query type for Person
*/
@Generated("com.mysema.query.codegen.EntitySerializer")
public class QPerson extends EntityPathBase<UnitTestPerson> {
private static final long serialVersionUID = -1526737794;