From 2149c3acb099b4a0e76abecb9df9b2a0100346eb Mon Sep 17 00:00:00 2001 From: Jeff Trent Date: Wed, 10 May 2023 08:47:13 -0400 Subject: [PATCH 1/5] resolves renaming --- ...peAndBody.java => TypeAndBodyDefault.java} | 8 +- .../tools/DefaultBuilderCreatorProvider.java | 6 +- ...ltTest.java => PicoConfigDefaultTest.java} | 0 .../api/QualifierAndValueDefaultTest.java | 89 +++++-------------- .../AbstractApplicationCreatorMojo.java | 4 +- .../runtime/DefaultInjectionPlanBinder.java | 2 +- .../pico/runtime/DefaultInjectionPlans.java | 2 +- .../helidon/pico/runtime/DefaultServices.java | 2 +- ...eBinder.java => ServiceBinderDefault.java} | 8 +- .../pico/testing/PicoTestingSupport.java | 4 +- .../helidon/pico/tools/AbstractCreator.java | 4 +- .../pico/tools/ApplicationCreatorDefault.java | 4 +- .../context/injection/CheckInjectionTest.java | 4 + 13 files changed, 46 insertions(+), 91 deletions(-) rename builder/processor-spi/src/main/java/io/helidon/builder/processor/spi/{DefaultTypeAndBody.java => TypeAndBodyDefault.java} (93%) rename pico/api/src/test/java/io/helidon/pico/api/{PicoServicesConfigDefaultTest.java => PicoConfigDefaultTest.java} (100%) rename pico/runtime/src/main/java/io/helidon/pico/runtime/{DefaultServiceBinder.java => ServiceBinderDefault.java} (94%) diff --git a/builder/processor-spi/src/main/java/io/helidon/builder/processor/spi/DefaultTypeAndBody.java b/builder/processor-spi/src/main/java/io/helidon/builder/processor/spi/TypeAndBodyDefault.java similarity index 93% rename from builder/processor-spi/src/main/java/io/helidon/builder/processor/spi/DefaultTypeAndBody.java rename to builder/processor-spi/src/main/java/io/helidon/builder/processor/spi/TypeAndBodyDefault.java index 546b30dfc88..825dad5e6e0 100644 --- a/builder/processor-spi/src/main/java/io/helidon/builder/processor/spi/DefaultTypeAndBody.java +++ b/builder/processor-spi/src/main/java/io/helidon/builder/processor/spi/TypeAndBodyDefault.java @@ -21,7 +21,7 @@ /** * The default implementation of {@link TypeAndBody}. */ -public class DefaultTypeAndBody implements TypeAndBody { +public class TypeAndBodyDefault implements TypeAndBody { private final TypeName typeName; private final String body; @@ -31,7 +31,7 @@ public class DefaultTypeAndBody implements TypeAndBody { * @param b the builder * @see #builder() */ - protected DefaultTypeAndBody(Builder b) { + protected TypeAndBodyDefault(Builder b) { this.typeName = b.typeName; this.body = b.body; } @@ -114,8 +114,8 @@ public Builder body(String val) { * * @return the built instance */ - public DefaultTypeAndBody build() { - return new DefaultTypeAndBody(this); + public TypeAndBodyDefault build() { + return new TypeAndBodyDefault(this); } } diff --git a/builder/processor-tools/src/main/java/io/helidon/builder/processor/tools/DefaultBuilderCreatorProvider.java b/builder/processor-tools/src/main/java/io/helidon/builder/processor/tools/DefaultBuilderCreatorProvider.java index 079ae300a81..cde6403ebeb 100644 --- a/builder/processor-tools/src/main/java/io/helidon/builder/processor/tools/DefaultBuilderCreatorProvider.java +++ b/builder/processor-tools/src/main/java/io/helidon/builder/processor/tools/DefaultBuilderCreatorProvider.java @@ -38,7 +38,7 @@ import io.helidon.builder.RequiredAttributeVisitor; import io.helidon.builder.Singular; import io.helidon.builder.processor.spi.BuilderCreatorProvider; -import io.helidon.builder.processor.spi.DefaultTypeAndBody; +import io.helidon.builder.processor.spi.TypeAndBodyDefault; import io.helidon.builder.processor.spi.TypeAndBody; import io.helidon.common.Weight; import io.helidon.common.Weighted; @@ -95,11 +95,11 @@ public List create(TypeInfo typeInfo, preValidate(implTypeName, typeInfo, builderAnnotation); List builds = new ArrayList<>(); - builds.add(DefaultTypeAndBody.builder() + builds.add(TypeAndBodyDefault.builder() .typeName(abstractImplTypeName) .body(toBody(createBodyContext(false, abstractImplTypeName, typeInfo, builderAnnotation))) .build()); - builds.add(DefaultTypeAndBody.builder() + builds.add(TypeAndBodyDefault.builder() .typeName(implTypeName) .body(toBody(createBodyContext(true, implTypeName, typeInfo, builderAnnotation))) .build()); diff --git a/pico/api/src/test/java/io/helidon/pico/api/PicoServicesConfigDefaultTest.java b/pico/api/src/test/java/io/helidon/pico/api/PicoConfigDefaultTest.java similarity index 100% rename from pico/api/src/test/java/io/helidon/pico/api/PicoServicesConfigDefaultTest.java rename to pico/api/src/test/java/io/helidon/pico/api/PicoConfigDefaultTest.java diff --git a/pico/api/src/test/java/io/helidon/pico/api/QualifierAndValueDefaultTest.java b/pico/api/src/test/java/io/helidon/pico/api/QualifierAndValueDefaultTest.java index 134d000e1fe..783032312a1 100644 --- a/pico/api/src/test/java/io/helidon/pico/api/QualifierAndValueDefaultTest.java +++ b/pico/api/src/test/java/io/helidon/pico/api/QualifierAndValueDefaultTest.java @@ -14,85 +14,36 @@ * limitations under the License. */ -package io.helidon.pico.api; +package io.helidon.tests.functional.context.injection; -import java.lang.annotation.Annotation; - -import io.helidon.common.types.AnnotationAndValueDefault; - -import jakarta.inject.Named; +import io.helidon.microprofile.tests.junit5.HelidonTest; +import jakarta.inject.Inject; +import jakarta.ws.rs.client.WebTarget; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; +<<<<<<<< HEAD:tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java +/** + * Unit test for {@link CheckInjectionResource}. + */ +@HelidonTest +class CheckInjectionTest { +======== class QualifierAndValueDefaultTest { +>>>>>>>> 23e63fe9f2 (resolves renaming):pico/api/src/test/java/io/helidon/pico/api/QualifierAndValueDefaultTest.java - @Test - void buildAndCompare() { - QualifierAndValueDefault qav1 = QualifierAndValueDefault.builder() - .type(Named.class) - .value("x.y") - .build(); - AnnotationAndValueDefault qav2 = QualifierAndValueDefault.builder() - .type(Named.class) - .value("x.y") - .build(); - assertThat(qav1.compareTo(qav2), - is(0)); - } - - @Test - public void buildAndCompareClassNamed() { - QualifierAndValueDefault qav1 = QualifierAndValueDefault.createNamed(new FakeNamed()); - QualifierAndValueDefault qav2 = QualifierAndValueDefault.createNamed(new FakeClassNamed()); + private final WebTarget baseTarget; - assertThat(qav1.compareTo(qav2), - is(0)); - assertThat(qav2.compareTo(qav1), - is(0)); + @Inject + CheckInjectionTest(WebTarget baseTarget) { + this.baseTarget = baseTarget; } - @Named("io.helidon.pico.api.DefaultQualifierAndValueTest") - @ClassNamed(QualifierAndValueDefaultTest.class) @Test - public void createClassNamed() throws Exception { - QualifierAndValueDefault qav1 = QualifierAndValueDefault.createClassNamed(QualifierAndValueDefaultTest.class); - QualifierAndValueDefault qav2 = QualifierAndValueDefault.builder() - .type(Named.class) - .value(QualifierAndValueDefault.class.getName()) - .build(); - assertThat(qav1.compareTo(qav2), - is(0)); - - assertThat("runtime retention expected for " + ClassNamed.class, - getClass().getMethod("createClassNamed").getAnnotation(ClassNamed.class), - notNullValue()); + void testCheckInjection() { + WebTarget target = baseTarget.path("/check"); + assertThat(target.request().get().getStatus(), is(200)); } - - class FakeNamed implements Named { - @Override - public String value() { - return QualifierAndValueDefaultTest.class.getName(); - } - - @Override - public Class annotationType() { - return Named.class; - } - } - - class FakeClassNamed implements ClassNamed { - @Override - public Class value() { - return QualifierAndValueDefaultTest.class; - } - - @Override - public Class annotationType() { - return ClassNamed.class; - } - } - -} +} \ No newline at end of file diff --git a/pico/maven-plugin/src/main/java/io/helidon/pico/maven/plugin/AbstractApplicationCreatorMojo.java b/pico/maven-plugin/src/main/java/io/helidon/pico/maven/plugin/AbstractApplicationCreatorMojo.java index a1dccf9260c..a8066a3248b 100644 --- a/pico/maven-plugin/src/main/java/io/helidon/pico/maven/plugin/AbstractApplicationCreatorMojo.java +++ b/pico/maven-plugin/src/main/java/io/helidon/pico/maven/plugin/AbstractApplicationCreatorMojo.java @@ -43,7 +43,7 @@ import io.helidon.pico.api.ServiceProvider; import io.helidon.pico.api.ServiceProviderProvider; import io.helidon.pico.api.Services; -import io.helidon.pico.runtime.DefaultServiceBinder; +import io.helidon.pico.runtime.ServiceBinderDefault; import io.helidon.pico.tools.AbstractFilerMessager; import io.helidon.pico.tools.ActivatorCreatorCodeGen; import io.helidon.pico.tools.ApplicationCreatorCodeGen; @@ -373,7 +373,7 @@ List toTypeNames(List permittedProviderQualifierTypeNames) { Set toNames(List> services) { Map> result = new LinkedHashMap<>(); services.forEach(sp -> { - sp = DefaultServiceBinder.toRootProvider(sp); + sp = ServiceBinderDefault.toRootProvider(sp); String serviceType = sp.serviceInfo().serviceTypeName(); TypeName name = TypeNameDefault.createFromTypeName(serviceType); ServiceProvider prev = result.put(name, sp); diff --git a/pico/runtime/src/main/java/io/helidon/pico/runtime/DefaultInjectionPlanBinder.java b/pico/runtime/src/main/java/io/helidon/pico/runtime/DefaultInjectionPlanBinder.java index 2611a53e878..2366bd61a9a 100644 --- a/pico/runtime/src/main/java/io/helidon/pico/runtime/DefaultInjectionPlanBinder.java +++ b/pico/runtime/src/main/java/io/helidon/pico/runtime/DefaultInjectionPlanBinder.java @@ -34,7 +34,7 @@ class DefaultInjectionPlanBinder implements ServiceInjectionPlanBinder, ServiceI public Binder bindTo(ServiceProvider untrustedSp) { // don't trust what we get, but instead lookup the service provider that we carry in our services registry ServiceProvider serviceProvider = services.serviceProviderFor(untrustedSp.serviceInfo().serviceTypeName()); - Optional> bindable = DefaultServiceBinder.toBindableProvider(serviceProvider); + Optional> bindable = ServiceBinderDefault.toBindableProvider(serviceProvider); Optional binder = (bindable.isPresent()) ? bindable.get().injectionPlanBinder() : Optional.empty(); if (binder.isEmpty()) { // basically this means this service will not support compile-time injection diff --git a/pico/runtime/src/main/java/io/helidon/pico/runtime/DefaultInjectionPlans.java b/pico/runtime/src/main/java/io/helidon/pico/runtime/DefaultInjectionPlans.java index 18674757dad..32b05cd30b0 100644 --- a/pico/runtime/src/main/java/io/helidon/pico/runtime/DefaultInjectionPlans.java +++ b/pico/runtime/src/main/java/io/helidon/pico/runtime/DefaultInjectionPlans.java @@ -308,7 +308,7 @@ static Object resolve(ServiceProvider self, // "standard" case ServiceProvider serviceProvider = serviceProviders.get(0); Optional> serviceProviderBindable = - DefaultServiceBinder.toBindableProvider(DefaultServiceBinder.toRootProvider(serviceProvider)); + ServiceBinderDefault.toBindableProvider(ServiceBinderDefault.toRootProvider(serviceProvider)); if (serviceProviderBindable.isPresent() && serviceProviderBindable.get() != serviceProvider && serviceProviderBindable.get() instanceof ServiceProviderProvider) { diff --git a/pico/runtime/src/main/java/io/helidon/pico/runtime/DefaultServices.java b/pico/runtime/src/main/java/io/helidon/pico/runtime/DefaultServices.java index b295d5d4b09..95b69f70071 100644 --- a/pico/runtime/src/main/java/io/helidon/pico/runtime/DefaultServices.java +++ b/pico/runtime/src/main/java/io/helidon/pico/runtime/DefaultServices.java @@ -437,7 +437,7 @@ ServiceBinder createServiceBinder(PicoServices picoServices, String moduleName, boolean trusted) { assert (picoServices.services() == services); - return DefaultServiceBinder.create(picoServices, moduleName, trusted); + return ServiceBinderDefault.create(picoServices, moduleName, trusted); } void bind(PicoServices picoServices, diff --git a/pico/runtime/src/main/java/io/helidon/pico/runtime/DefaultServiceBinder.java b/pico/runtime/src/main/java/io/helidon/pico/runtime/ServiceBinderDefault.java similarity index 94% rename from pico/runtime/src/main/java/io/helidon/pico/runtime/DefaultServiceBinder.java rename to pico/runtime/src/main/java/io/helidon/pico/runtime/ServiceBinderDefault.java index e89f6b8d9ca..4c35ff411af 100644 --- a/pico/runtime/src/main/java/io/helidon/pico/runtime/DefaultServiceBinder.java +++ b/pico/runtime/src/main/java/io/helidon/pico/runtime/ServiceBinderDefault.java @@ -29,13 +29,13 @@ /** * The default implementation for {@link ServiceBinder}. */ -public class DefaultServiceBinder implements ServiceBinder { +public class ServiceBinderDefault implements ServiceBinder { private final PicoServices picoServices; private final ServiceBinder serviceRegistry; private final String moduleName; private final boolean trusted; - private DefaultServiceBinder(PicoServices picoServices, + private ServiceBinderDefault(PicoServices picoServices, String moduleName, boolean trusted) { this.picoServices = picoServices; @@ -52,12 +52,12 @@ private DefaultServiceBinder(PicoServices picoServices, * @param trusted are we in trusted mode (typically only set during early initialization sequence) * @return the newly created service binder */ - public static DefaultServiceBinder create(PicoServices picoServices, + public static ServiceBinderDefault create(PicoServices picoServices, String moduleName, boolean trusted) { Objects.requireNonNull(picoServices); Objects.requireNonNull(moduleName); - return new DefaultServiceBinder(picoServices, moduleName, trusted); + return new ServiceBinderDefault(picoServices, moduleName, trusted); } @Override diff --git a/pico/testing/src/main/java/io/helidon/pico/testing/PicoTestingSupport.java b/pico/testing/src/main/java/io/helidon/pico/testing/PicoTestingSupport.java index 2ab796df2ed..b6d0c2be909 100644 --- a/pico/testing/src/main/java/io/helidon/pico/testing/PicoTestingSupport.java +++ b/pico/testing/src/main/java/io/helidon/pico/testing/PicoTestingSupport.java @@ -33,7 +33,7 @@ import io.helidon.pico.api.PicoServicesHolder; import io.helidon.pico.api.Resettable; import io.helidon.pico.api.ServiceProvider; -import io.helidon.pico.runtime.DefaultServiceBinder; +import io.helidon.pico.runtime.ServiceBinderDefault; /** * Supporting helper utilities unit-testing Pico services. @@ -60,7 +60,7 @@ public static void resetAll() { */ public static void bind(PicoServices picoServices, ServiceProvider serviceProvider) { - DefaultServiceBinder binder = DefaultServiceBinder.create(picoServices, PicoTestingSupport.class.getSimpleName(), true); + ServiceBinderDefault binder = ServiceBinderDefault.create(picoServices, PicoTestingSupport.class.getSimpleName(), true); binder.bind(serviceProvider); } diff --git a/pico/tools/src/main/java/io/helidon/pico/tools/AbstractCreator.java b/pico/tools/src/main/java/io/helidon/pico/tools/AbstractCreator.java index 709e4e3096a..d6e78a49491 100644 --- a/pico/tools/src/main/java/io/helidon/pico/tools/AbstractCreator.java +++ b/pico/tools/src/main/java/io/helidon/pico/tools/AbstractCreator.java @@ -29,7 +29,7 @@ import io.helidon.pico.api.PicoServicesConfig; import io.helidon.pico.api.ServiceProvider; import io.helidon.pico.runtime.AbstractServiceProvider; -import io.helidon.pico.runtime.DefaultServiceBinder; +import io.helidon.pico.runtime.ServiceBinderDefault; import static io.helidon.pico.tools.CommonUtils.hasValue; import static io.helidon.pico.tools.TypeTools.needToDeclareModuleUsage; @@ -111,7 +111,7 @@ static String toActivatorCodeGen(ServiceProvider sp) { if (sp instanceof AbstractServiceProvider && ((AbstractServiceProvider) sp).isCustom()) { return null; } - return DefaultServiceBinder.toRootProvider(sp).activator().orElseThrow().getClass().getName() + ".INSTANCE"; + return ServiceBinderDefault.toRootProvider(sp).activator().orElseThrow().getClass().getName() + ".INSTANCE"; } /** diff --git a/pico/tools/src/main/java/io/helidon/pico/tools/ApplicationCreatorDefault.java b/pico/tools/src/main/java/io/helidon/pico/tools/ApplicationCreatorDefault.java index 8ecda2d7bf8..d2a729ec214 100644 --- a/pico/tools/src/main/java/io/helidon/pico/tools/ApplicationCreatorDefault.java +++ b/pico/tools/src/main/java/io/helidon/pico/tools/ApplicationCreatorDefault.java @@ -43,7 +43,7 @@ import io.helidon.pico.api.ServiceProvider; import io.helidon.pico.api.Services; import io.helidon.pico.runtime.AbstractServiceProvider; -import io.helidon.pico.runtime.DefaultServiceBinder; +import io.helidon.pico.runtime.ServiceBinderDefault; import io.helidon.pico.runtime.PicoInjectionPlan; import io.helidon.pico.tools.spi.ApplicationCreator; @@ -322,7 +322,7 @@ String toServiceTypeInjectionPlan(PicoServices picoServices, @SuppressWarnings("unchecked") List toInjectionPlanBindings(ServiceProvider sp) { AbstractServiceProvider asp = AbstractServiceProvider - .toAbstractServiceProvider(DefaultServiceBinder.toRootProvider(sp), true).orElseThrow(); + .toAbstractServiceProvider(ServiceBinderDefault.toRootProvider(sp), true).orElseThrow(); DependenciesInfo deps = asp.dependencies(); if (deps.allDependencies().isEmpty()) { return List.of(); diff --git a/tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java b/tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java index d29e2383545..783032312a1 100644 --- a/tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java +++ b/tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java @@ -24,11 +24,15 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +<<<<<<<< HEAD:tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java /** * Unit test for {@link CheckInjectionResource}. */ @HelidonTest class CheckInjectionTest { +======== +class QualifierAndValueDefaultTest { +>>>>>>>> 23e63fe9f2 (resolves renaming):pico/api/src/test/java/io/helidon/pico/api/QualifierAndValueDefaultTest.java private final WebTarget baseTarget; From c55999996d849ef3dcf9588ab0d7afba6dc2532f Mon Sep 17 00:00:00 2001 From: Jeff Trent Date: Thu, 11 May 2023 10:58:50 -0400 Subject: [PATCH 2/5] resolve merge conflicts --- .../api/QualifierAndValueDefaultTest.java | 90 ++++++++++++++----- .../context/injection/CheckInjectionTest.java | 6 +- 2 files changed, 71 insertions(+), 25 deletions(-) diff --git a/pico/api/src/test/java/io/helidon/pico/api/QualifierAndValueDefaultTest.java b/pico/api/src/test/java/io/helidon/pico/api/QualifierAndValueDefaultTest.java index 783032312a1..ddc1e5c457c 100644 --- a/pico/api/src/test/java/io/helidon/pico/api/QualifierAndValueDefaultTest.java +++ b/pico/api/src/test/java/io/helidon/pico/api/QualifierAndValueDefaultTest.java @@ -14,36 +14,86 @@ * limitations under the License. */ -package io.helidon.tests.functional.context.injection; +package io.helidon.pico.api; -import io.helidon.microprofile.tests.junit5.HelidonTest; -import jakarta.inject.Inject; -import jakarta.ws.rs.client.WebTarget; +import java.lang.annotation.Annotation; + +import io.helidon.common.types.AnnotationAndValueDefault; + +import jakarta.inject.Named; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; -<<<<<<<< HEAD:tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java -/** - * Unit test for {@link CheckInjectionResource}. - */ -@HelidonTest -class CheckInjectionTest { -======== class QualifierAndValueDefaultTest { ->>>>>>>> 23e63fe9f2 (resolves renaming):pico/api/src/test/java/io/helidon/pico/api/QualifierAndValueDefaultTest.java - private final WebTarget baseTarget; + @Test + void buildAndCompare() { + QualifierAndValueDefault qav1 = QualifierAndValueDefault.builder() + .type(Named.class) + .value("x.y") + .build(); + AnnotationAndValueDefault qav2 = QualifierAndValueDefault.builder() + .type(Named.class) + .value("x.y") + .build(); + assertThat(qav1.compareTo(qav2), + is(0)); + } + + @Named("io.helidon.pico.api.DefaultQualifierAndValueTest") + @ClassNamed(QualifierAndValueDefaultTest.class) + @Test + public void createClassNamed() throws Exception { + QualifierAndValueDefault qav1 = QualifierAndValueDefault.createClassNamed(QualifierAndValueDefaultTest.class); + QualifierAndValueDefault qav2 = QualifierAndValueDefault.builder() + .type(Named.class) + .value(QualifierAndValueDefault.class.getName()) + .build(); + assertThat(qav1.compareTo(qav2), + is(0)); + + assertThat("runtime retention expected for " + ClassNamed.class, + getClass().getMethod("createClassNamed").getAnnotation(ClassNamed.class), + notNullValue()); - @Inject - CheckInjectionTest(WebTarget baseTarget) { - this.baseTarget = baseTarget; } @Test - void testCheckInjection() { - WebTarget target = baseTarget.path("/check"); - assertThat(target.request().get().getStatus(), is(200)); + public void buildAndCompareClassNamed() { + QualifierAndValueDefault qav1 = QualifierAndValueDefault.createNamed(new FakeNamed()); + QualifierAndValueDefault qav2 = QualifierAndValueDefault.createNamed(new FakeClassNamed()); + + assertThat(qav1.compareTo(qav2), + is(0)); + assertThat(qav2.compareTo(qav1), + is(0)); + } + + class FakeNamed implements Named { + @Override + public String value() { + return QualifierAndValueDefaultTest.class.getName(); + } + + @Override + public Class annotationType() { + return Named.class; + } } -} \ No newline at end of file + + class FakeClassNamed implements ClassNamed { + @Override + public Class value() { + return QualifierAndValueDefaultTest.class; + } + + @Override + public Class annotationType() { + return ClassNamed.class; + } + } + +} diff --git a/tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java b/tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java index 783032312a1..d29e95766ee 100644 --- a/tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java +++ b/tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java @@ -24,15 +24,11 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -<<<<<<<< HEAD:tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java /** * Unit test for {@link CheckInjectionResource}. */ @HelidonTest class CheckInjectionTest { -======== -class QualifierAndValueDefaultTest { ->>>>>>>> 23e63fe9f2 (resolves renaming):pico/api/src/test/java/io/helidon/pico/api/QualifierAndValueDefaultTest.java private final WebTarget baseTarget; @@ -46,4 +42,4 @@ void testCheckInjection() { WebTarget target = baseTarget.path("/check"); assertThat(target.request().get().getStatus(), is(200)); } -} \ No newline at end of file +} From 62589109f254da59cb44846261488ea7611ec100 Mon Sep 17 00:00:00 2001 From: Jeff Trent Date: Thu, 11 May 2023 11:00:04 -0400 Subject: [PATCH 3/5] another --- .../tests/functional/context/injection/CheckInjectionTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java b/tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java index d29e95766ee..2de1391c278 100644 --- a/tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java +++ b/tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java @@ -42,4 +42,5 @@ void testCheckInjection() { WebTarget target = baseTarget.path("/check"); assertThat(target.request().get().getStatus(), is(200)); } + } From 4e27108aa2c73902deec9c023d7639ef03bee1f7 Mon Sep 17 00:00:00 2001 From: Jeff Trent Date: Thu, 11 May 2023 11:00:51 -0400 Subject: [PATCH 4/5] another --- .../tests/functional/context/injection/CheckInjectionTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java b/tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java index 2de1391c278..d29e95766ee 100644 --- a/tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java +++ b/tests/functional/request-scope-injection/src/test/java/io/helidon/tests/functional/context/injection/CheckInjectionTest.java @@ -42,5 +42,4 @@ void testCheckInjection() { WebTarget target = baseTarget.path("/check"); assertThat(target.request().get().getStatus(), is(200)); } - } From 1ac0917d1c1abbc95f6061f7f3e8c72999f1a312 Mon Sep 17 00:00:00 2001 From: Jeff Trent Date: Thu, 11 May 2023 11:09:42 -0400 Subject: [PATCH 5/5] reorg imports --- .../builder/processor/tools/DefaultBuilderCreatorProvider.java | 2 +- .../java/io/helidon/pico/tools/ApplicationCreatorDefault.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/processor-tools/src/main/java/io/helidon/builder/processor/tools/DefaultBuilderCreatorProvider.java b/builder/processor-tools/src/main/java/io/helidon/builder/processor/tools/DefaultBuilderCreatorProvider.java index cde6403ebeb..d97a4a1cdec 100644 --- a/builder/processor-tools/src/main/java/io/helidon/builder/processor/tools/DefaultBuilderCreatorProvider.java +++ b/builder/processor-tools/src/main/java/io/helidon/builder/processor/tools/DefaultBuilderCreatorProvider.java @@ -38,8 +38,8 @@ import io.helidon.builder.RequiredAttributeVisitor; import io.helidon.builder.Singular; import io.helidon.builder.processor.spi.BuilderCreatorProvider; -import io.helidon.builder.processor.spi.TypeAndBodyDefault; import io.helidon.builder.processor.spi.TypeAndBody; +import io.helidon.builder.processor.spi.TypeAndBodyDefault; import io.helidon.common.Weight; import io.helidon.common.Weighted; import io.helidon.common.types.AnnotationAndValue; diff --git a/pico/tools/src/main/java/io/helidon/pico/tools/ApplicationCreatorDefault.java b/pico/tools/src/main/java/io/helidon/pico/tools/ApplicationCreatorDefault.java index d2a729ec214..06369d46f98 100644 --- a/pico/tools/src/main/java/io/helidon/pico/tools/ApplicationCreatorDefault.java +++ b/pico/tools/src/main/java/io/helidon/pico/tools/ApplicationCreatorDefault.java @@ -43,8 +43,8 @@ import io.helidon.pico.api.ServiceProvider; import io.helidon.pico.api.Services; import io.helidon.pico.runtime.AbstractServiceProvider; -import io.helidon.pico.runtime.ServiceBinderDefault; import io.helidon.pico.runtime.PicoInjectionPlan; +import io.helidon.pico.runtime.ServiceBinderDefault; import io.helidon.pico.tools.spi.ApplicationCreator; import jakarta.inject.Provider;