DATALDAP-149 - Upgrade to Querydsl 4.3.

This commit is contained in:
Mark Paluch
2020-03-30 10:00:19 +02:00
parent db80d878ab
commit e6efc73d7e
2 changed files with 10 additions and 9 deletions

View File

@@ -17,8 +17,8 @@ package org.springframework.data.ldap.repository.support;
import java.lang.annotation.Annotation;
import java.util.Collection;
import java.util.Map;
import javax.annotation.processing.ProcessingEnvironment;
import javax.annotation.processing.RoundEnvironment;
import javax.lang.model.element.VariableElement;
@@ -36,12 +36,14 @@ import com.querydsl.apt.DefaultConfiguration;
*/
class DefaultLdapAnnotationProcessorConfiguration extends DefaultConfiguration {
public DefaultLdapAnnotationProcessorConfiguration(RoundEnvironment roundEnv, Map<String, String> options,
Collection<String> keywords, Class<? extends Annotation> entitiesAnn, Class<? extends Annotation> entityAnn,
@Nullable Class<? extends Annotation> superTypeAnn, @Nullable Class<? extends Annotation> embeddableAnn,
@Nullable Class<? extends Annotation> embeddedAnn, Class<? extends Annotation> skipAnn) {
public DefaultLdapAnnotationProcessorConfiguration(ProcessingEnvironment processingEnvironment,
RoundEnvironment roundEnv, Collection<String> keywords, Class<? extends Annotation> entitiesAnn,
Class<? extends Annotation> entityAnn, @Nullable Class<? extends Annotation> superTypeAnn,
@Nullable Class<? extends Annotation> embeddableAnn, @Nullable Class<? extends Annotation> embeddedAnn,
Class<? extends Annotation> skipAnn) {
super(roundEnv, options, keywords, entitiesAnn, entityAnn, superTypeAnn, embeddableAnn, embeddedAnn, skipAnn);
super(processingEnvironment, roundEnv, keywords, entitiesAnn, entityAnn, superTypeAnn, embeddableAnn, embeddedAnn,
skipAnn);
}
/* (non-Javadoc)

View File

@@ -49,9 +49,8 @@ public class LdapAnnotationProcessor extends AbstractQuerydslProcessor {
protected Configuration createConfiguration(RoundEnvironment roundEnv) {
processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "Running " + getClass().getSimpleName());
DefaultConfiguration configuration = new DefaultLdapAnnotationProcessorConfiguration(roundEnv,
processingEnv.getOptions(), Collections.emptySet(), QueryEntities.class, Entry.class, null, null, null,
Transient.class);
DefaultConfiguration configuration = new DefaultLdapAnnotationProcessorConfiguration(processingEnv, roundEnv,
Collections.emptySet(), QueryEntities.class, Entry.class, null, null, null, Transient.class);
configuration.setUseFields(true);
configuration.setUseGetters(false);