Skip to content

Commit

Permalink
#1092 Fix minor checkstyle violations
Browse files Browse the repository at this point in the history
  • Loading branch information
GuusLieben committed Aug 2, 2024
1 parent a1981da commit ffccdf8
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,9 @@
import org.dockbox.hartshorn.inject.binding.DefaultBindingConfigurerContext;
import org.dockbox.hartshorn.inject.InjectionCapableApplication;
import org.dockbox.hartshorn.inject.binding.HierarchicalBinder;
import org.dockbox.hartshorn.inject.binding.ScopeAwareHierarchicalBinder;
import org.dockbox.hartshorn.inject.processing.ComponentProcessorRegistry;
import org.dockbox.hartshorn.inject.processing.MultiMapComponentProcessorRegistry;
import org.dockbox.hartshorn.inject.provider.singleton.ConcurrentHashSingletonCache;
import org.dockbox.hartshorn.inject.provider.singleton.SingletonCache;
import org.dockbox.hartshorn.inject.scope.ScopeAdapter;
import org.dockbox.hartshorn.inject.scope.ScopeModuleContext;
import org.dockbox.hartshorn.inject.ComponentKey;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,18 @@
import org.dockbox.hartshorn.inject.binding.BindingHierarchy;
import org.dockbox.hartshorn.inject.processing.construction.ComponentPostConstructor;
import org.dockbox.hartshorn.inject.provider.singleton.SingletonCache;
import org.dockbox.hartshorn.inject.provider.strategy.*;
import org.dockbox.hartshorn.inject.provider.strategy.ComponentProcessorComponentProviderStrategy;
import org.dockbox.hartshorn.inject.provider.strategy.ComponentProviderStrategy;
import org.dockbox.hartshorn.inject.provider.strategy.InstantiationStrategyComponentProviderStrategy;
import org.dockbox.hartshorn.inject.provider.strategy.SingletonCacheComponentProviderStrategy;
import org.dockbox.hartshorn.inject.provider.strategy.StrategyChainComponentProvider;
import org.dockbox.hartshorn.inject.provider.strategy.UnboundPrototypeComponentProviderStrategy;
import org.dockbox.hartshorn.inject.scope.Scope;
import org.dockbox.hartshorn.util.*;
import org.dockbox.hartshorn.util.ApplicationException;
import org.dockbox.hartshorn.util.Customizer;
import org.dockbox.hartshorn.util.LazyStreamableConfigurer;
import org.dockbox.hartshorn.util.SimpleSingleElementContext;
import org.dockbox.hartshorn.util.StreamableConfigurer;
import org.dockbox.hartshorn.util.collections.MultiMap;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ private <T> BindingHierarchy<T> hierarchy(ComponentProvider componentProvider, C
case HierarchyLookup hierarchyLookup -> {
return this.hierarchy(hierarchyLookup, key, useGlobalIfAbsent);
}
case BinderAwareComponentProvider binderAwareProvider when binderAwareProvider.binder() instanceof HierarchicalBinder hierarchicalBinder -> {
case BinderAwareComponentProvider binderAwareProvider
when binderAwareProvider.binder() instanceof HierarchicalBinder hierarchicalBinder -> {
return this.hierarchy(hierarchicalBinder, key, useGlobalIfAbsent);
}
default -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package test.org.dockbox.hartshorn.inject.binding;

import org.dockbox.hartshorn.inject.QualifierKey;
import org.dockbox.hartshorn.inject.annotations.Inject;
import org.dockbox.hartshorn.inject.ComponentKey;
import org.dockbox.hartshorn.inject.binding.HierarchicalBinder;
import org.dockbox.hartshorn.inject.binding.ScopeAwareHierarchicalBinder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package test.org.dockbox.hartshorn.inject.populate;

import org.dockbox.hartshorn.inject.annotations.Inject;
import org.dockbox.hartshorn.launchpad.ApplicationContext;
import org.dockbox.hartshorn.inject.ContextKey;
import org.dockbox.hartshorn.proxy.Proxy;
import org.dockbox.hartshorn.proxy.ProxyOrchestrator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package test.org.dockbox.hartshorn.inject.processing;

import org.dockbox.hartshorn.inject.annotations.Inject;
import org.dockbox.hartshorn.launchpad.ApplicationContext;
import org.dockbox.hartshorn.test.annotations.TestComponents;
import org.dockbox.hartshorn.test.junit.HartshornIntegrationTest;
import org.junit.jupiter.api.Assertions;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import org.dockbox.hartshorn.inject.annotations.Inject;
import org.dockbox.hartshorn.inject.binding.Binder;
import org.dockbox.hartshorn.launchpad.ApplicationContext;
import org.dockbox.hartshorn.proxy.Proxy;
import org.dockbox.hartshorn.test.annotations.TestComponents;
import org.dockbox.hartshorn.test.junit.HartshornIntegrationTest;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package test.org.dockbox.hartshorn.launchpad.launch.scanning;

import org.dockbox.hartshorn.inject.annotations.Inject;
import org.dockbox.hartshorn.launchpad.ApplicationContext;
import org.dockbox.hartshorn.test.junit.HartshornIntegrationTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@
/**
* TODO: #1060 Add documentation
*
* @author Guus Lieben
* @since 0.6.0
*
* @author Guus Lieben
*/
public class TypeReferenceLookupComponentRegistry implements ComponentRegistry {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.util.Arrays;
import java.util.List;

import org.checkerframework.checker.nullness.qual.NonNull;
import org.dockbox.hartshorn.inject.populate.ComponentPopulator;
import org.dockbox.hartshorn.inject.populate.StrategyComponentPopulator;
import org.dockbox.hartshorn.launchpad.ApplicationContext;
Expand All @@ -36,11 +37,10 @@
import org.dockbox.hartshorn.util.Customizer;
import org.dockbox.hartshorn.util.SimpleSingleElementContext;
import org.dockbox.hartshorn.util.option.Option;
import org.jetbrains.annotations.NotNull;

public class HartshornIntegrationTestInitializer {

@NotNull
@NonNull
public ApplicationContext createTestApplicationContext(Class<?> testClass, Object testInstance,
AnnotatedElement[] testComponentSources) throws ApplicationException {
if (testClass == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.Optional;
import java.util.stream.Stream;

import org.dockbox.hartshorn.inject.InjectionCapableApplication;
import org.dockbox.hartshorn.inject.annotations.Inject;
Expand All @@ -34,8 +33,6 @@
import org.junit.jupiter.api.extension.ParameterContext;
import org.junit.jupiter.api.extension.ParameterResolutionException;
import org.junit.jupiter.api.extension.ParameterResolver;
import org.junit.jupiter.api.extension.TestTemplateInvocationContext;
import org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider;

public class HartshornInjectParameterResolver implements ParameterResolver {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@
*
* @see StandardApplicationContextFactory.Configurer#componentPreProcessors(Customizer)
* @see StandardApplicationContextFactory.Configurer#componentPostProcessors(Customizer)
*
* @return the additional {@link ComponentProcessor}s to use
*/
Class<? extends ComponentProcessor>[] processors() default {};

Expand All @@ -74,6 +76,8 @@
* test suite, even if they are not known to the chosen {@link #mainClass()}.
*
* @see StandardApplicationContextFactory.Configurer#scanPackages(Customizer)
*
* @return the additional packages to scan
*/
String[] scanPackages() default {};

Expand All @@ -82,6 +86,8 @@
* {@link #scanPackages()}. Defaults to {@code true}.
*
* @see StandardApplicationContextFactory.Configurer#includeBasePackages(boolean)
*
* @return whether to include the base package of the main class
*/
boolean includeBasePackages() default true;

Expand All @@ -91,6 +97,8 @@
* used, depending on the application environment.
*
* @see StandardApplicationBuilder.Configurer#mainClass(Class)
*
* @return the main class to use, or {@link Void} if not set
*/
Class<?> mainClass() default Void.class;
}

0 comments on commit ffccdf8

Please sign in to comment.