Skip to content

Commit

Permalink
Alternative overload is required to not introduce a new binary incomp…
Browse files Browse the repository at this point in the history
…atibility issue whilst keeping the functionality introduced with #2523
  • Loading branch information
jwgmeligmeyling authored and idosal committed Mar 25, 2020
1 parent f095bf0 commit 99af1df
Showing 1 changed file with 34 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,46 @@ public DefaultConfiguration(
@Nullable Class<? extends Annotation> embeddedAnn,
@Nullable Class<? extends Annotation> skipAnn
) {
this(processingEnvironment, roundEnv, keywords, entitiesAnn, entityAnn, superTypeAnn, embeddableAnn,
this(processingEnvironment, roundEnv, processingEnvironment.getOptions(), keywords, entitiesAnn, entityAnn, superTypeAnn, embeddableAnn,
embeddedAnn, skipAnn, new CodegenModule());
}

@Deprecated
public DefaultConfiguration(
RoundEnvironment roundEnv,
Map<String, String> options,
Collection<String> keywords,
@Nullable Class<? extends Annotation> entitiesAnn,
Class<? extends Annotation> entityAnn,
@Nullable Class<? extends Annotation> superTypeAnn,
@Nullable Class<? extends Annotation> embeddableAnn,
@Nullable Class<? extends Annotation> embeddedAnn,
@Nullable Class<? extends Annotation> skipAnn
) {
this(null, roundEnv, options, keywords, entitiesAnn, entityAnn, superTypeAnn, embeddableAnn,
embeddedAnn, skipAnn, new CodegenModule());
}

@Deprecated
public DefaultConfiguration(
ProcessingEnvironment processingEnvironment,
RoundEnvironment roundEnv,
Collection<String> keywords,
@Nullable Class<? extends Annotation> entitiesAnn,
Class<? extends Annotation> entityAnn,
@Nullable Class<? extends Annotation> superTypeAnn,
@Nullable Class<? extends Annotation> embeddableAnn,
@Nullable Class<? extends Annotation> embeddedAnn,
@Nullable Class<? extends Annotation> skipAnn,
CodegenModule codegenModule) {
this(processingEnvironment, roundEnv, processingEnvironment.getOptions(), keywords, entitiesAnn, entityAnn, superTypeAnn, embeddableAnn,
embeddedAnn, skipAnn, codegenModule);
}

public DefaultConfiguration(
ProcessingEnvironment processingEnvironment,
RoundEnvironment roundEnv,
Map<String, String> options,
Collection<String> keywords,
@Nullable Class<? extends Annotation> entitiesAnn,
Class<? extends Annotation> entityAnn,
Expand Down Expand Up @@ -141,7 +174,6 @@ public DefaultConfiguration(
boolean listAccessors = false;
boolean mapAccessors = false;
boolean createDefaultVariable = true;
Map<String, String> options = processingEnvironment.getOptions();

if (options.containsKey(QUERYDSL_ENTITY_ACCESSORS)) {
entityAccessors = Boolean.valueOf(options.get(QUERYDSL_ENTITY_ACCESSORS));
Expand Down

0 comments on commit 99af1df

Please sign in to comment.