Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

configure registry with configurer from objectFactory #1518

Closed
wants to merge 1 commit into from
Closed

configure registry with configurer from objectFactory #1518

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 33 additions & 11 deletions java/src/main/java/io/cucumber/java/JavaBackend.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
package io.cucumber.java;

import static io.cucumber.core.io.MultiLoader.packageName;
import static java.lang.Thread.currentThread;

import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;

import gherkin.pickles.PickleStep;
import io.cucumber.core.api.TypeRegistryConfigurer;
import io.cucumber.core.api.options.SnippetType;
import io.cucumber.core.backend.Backend;
import io.cucumber.core.backend.Glue;
Expand All @@ -19,19 +30,10 @@
import io.cucumber.java.api.Before;
import io.cucumber.java.api.BeforeStep;

import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;

import static io.cucumber.core.io.MultiLoader.packageName;
import static java.lang.Thread.currentThread;

public class JavaBackend implements Backend, LambdaGlueRegistry {

private final TypeRegistry typeRegistry;
private TypeRegistry typeRegistry;
private boolean registryConfigured;
private final SnippetGenerator annotationSnippetGenerator;
private final SnippetGenerator lambdaSnippetGenerator;

Expand Down Expand Up @@ -118,9 +120,28 @@ public List<String> getSnippet(PickleStep step, String keyword, SnippetType.Func
return snippets;
}

private void configureRegistryOnce(){
if(!registryConfigured){
objectFactory.start();
try {
TypeRegistryConfigurer typeRegistryConfigurer = objectFactory.getInstance(TypeRegistryConfigurer.class);
if (typeRegistryConfigurer != null) {
this.typeRegistry = new TypeRegistry(typeRegistryConfigurer.locale());
typeRegistryConfigurer.configureTypeRegistry(this.typeRegistry);
}
}
catch (Exception e){
//Singleton factory TypeRegistryConfigurer.class.cast(singleton); problems?
}
registryConfigured = true;
}
}

void addStepDefinition(Annotation annotation, Method method) {
try {
objectFactory.addClass(method.getDeclaringClass());
configureRegistryOnce();

glue.addStepDefinition(
new JavaStepDefinition(
method,
Expand All @@ -142,6 +163,7 @@ public void addStepDefinition(Function<TypeRegistry, StepDefinition> stepDefinit

void addHook(Annotation annotation, Method method) {
if (objectFactory.addClass(method.getDeclaringClass())) {
configureRegistryOnce();
if (annotation.annotationType().equals(Before.class)) {
String tagExpression = ((Before) annotation).value();
long timeout = ((Before) annotation).timeout();
Expand Down