From e6efc73d7e8cee65faa00277b3192e17072c7b6f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 30 Mar 2020 10:00:19 +0200 Subject: [PATCH] DATALDAP-149 - Upgrade to Querydsl 4.3. --- ...efaultLdapAnnotationProcessorConfiguration.java | 14 ++++++++------ .../support/LdapAnnotationProcessor.java | 5 ++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/springframework/data/ldap/repository/support/DefaultLdapAnnotationProcessorConfiguration.java b/src/main/java/org/springframework/data/ldap/repository/support/DefaultLdapAnnotationProcessorConfiguration.java index 82052da..69a7f98 100644 --- a/src/main/java/org/springframework/data/ldap/repository/support/DefaultLdapAnnotationProcessorConfiguration.java +++ b/src/main/java/org/springframework/data/ldap/repository/support/DefaultLdapAnnotationProcessorConfiguration.java @@ -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 options, - Collection keywords, Class entitiesAnn, Class entityAnn, - @Nullable Class superTypeAnn, @Nullable Class embeddableAnn, - @Nullable Class embeddedAnn, Class skipAnn) { + public DefaultLdapAnnotationProcessorConfiguration(ProcessingEnvironment processingEnvironment, + RoundEnvironment roundEnv, Collection keywords, Class entitiesAnn, + Class entityAnn, @Nullable Class superTypeAnn, + @Nullable Class embeddableAnn, @Nullable Class embeddedAnn, + Class skipAnn) { - super(roundEnv, options, keywords, entitiesAnn, entityAnn, superTypeAnn, embeddableAnn, embeddedAnn, skipAnn); + super(processingEnvironment, roundEnv, keywords, entitiesAnn, entityAnn, superTypeAnn, embeddableAnn, embeddedAnn, + skipAnn); } /* (non-Javadoc) diff --git a/src/main/java/org/springframework/data/ldap/repository/support/LdapAnnotationProcessor.java b/src/main/java/org/springframework/data/ldap/repository/support/LdapAnnotationProcessor.java index 8adbb9e..097f987 100644 --- a/src/main/java/org/springframework/data/ldap/repository/support/LdapAnnotationProcessor.java +++ b/src/main/java/org/springframework/data/ldap/repository/support/LdapAnnotationProcessor.java @@ -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);