diff options
Diffstat (limited to 'sonar-core')
5 files changed, 14 insertions, 12 deletions
diff --git a/sonar-core/build.gradle b/sonar-core/build.gradle index aad84e6dbfe..5a84d542070 100644 --- a/sonar-core/build.gradle +++ b/sonar-core/build.gradle @@ -17,6 +17,7 @@ dependencies { compile 'org.slf4j:slf4j-api' compile 'org.sonarsource.update-center:sonar-update-center-common' compile project(path: ':sonar-plugin-api', configuration: 'shadow') + compile project(':sonar-plugin-api-impl') compileOnly 'com.google.code.findbugs:jsr305' diff --git a/sonar-core/src/main/java/org/sonar/core/extension/CoreExtensionsInstaller.java b/sonar-core/src/main/java/org/sonar/core/extension/CoreExtensionsInstaller.java index b26a382ebd1..bd93edf4cca 100644 --- a/sonar-core/src/main/java/org/sonar/core/extension/CoreExtensionsInstaller.java +++ b/sonar-core/src/main/java/org/sonar/core/extension/CoreExtensionsInstaller.java @@ -29,7 +29,7 @@ import java.util.function.Predicate; import org.sonar.api.ExtensionProvider; import org.sonar.api.SonarRuntime; import org.sonar.api.config.Configuration; -import org.sonar.api.config.internal.MapSettings; +import org.sonar.api.impl.config.MapSettings; import org.sonar.api.utils.AnnotationUtils; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; @@ -60,9 +60,9 @@ public abstract class CoreExtensionsInstaller { } /** - * @param container the container into which extensions will be installed - * @param extensionFilter filters extensions added to {@link CoreExtension.Context}. When it returns false, the - * extension is ignored as if it had never been added to the context. + * @param container the container into which extensions will be installed + * @param extensionFilter filters extensions added to {@link CoreExtension.Context}. When it returns false, the + * extension is ignored as if it had never been added to the context. * @param additionalSideFilter applied on top of filtering on {@link #supportedAnnotationType} to decide whether * extension should be added to container as an object or only as a PropertyDefinition. */ diff --git a/sonar-core/src/test/java/org/sonar/core/extension/CoreExtensionsInstallerTest.java b/sonar-core/src/test/java/org/sonar/core/extension/CoreExtensionsInstallerTest.java index 1c793f31d9b..c8f5baa5bcc 100644 --- a/sonar-core/src/test/java/org/sonar/core/extension/CoreExtensionsInstallerTest.java +++ b/sonar-core/src/test/java/org/sonar/core/extension/CoreExtensionsInstallerTest.java @@ -46,7 +46,7 @@ import org.sonar.api.SonarRuntime; import org.sonar.api.config.Configuration; import org.sonar.api.config.PropertyDefinition; import org.sonar.api.config.PropertyDefinitions; -import org.sonar.api.config.internal.MapSettings; +import org.sonar.api.impl.config.MapSettings; import org.sonar.core.platform.ComponentContainer; import static org.assertj.core.api.Assertions.assertThat; @@ -227,7 +227,8 @@ public class CoreExtensionsInstallerTest { @Test @UseDataProvider("allMethodsToAddExtension") - public void install_adds_providers_to_container_and_install_extensions_they_provide_when_annotated_with_expected_annotation(BiConsumer<CoreExtension.Context, Collection<Object>> extensionAdder) { + public void install_adds_providers_to_container_and_install_extensions_they_provide_when_annotated_with_expected_annotation( + BiConsumer<CoreExtension.Context, Collection<Object>> extensionAdder) { List<Object> extensions = ImmutableList.of(WestSideProvider.class, PartiallyWestSideProvider.class, EastSideProvider.class); CoreExtension coreExtension = newCoreExtension(context -> extensionAdder.accept(context, extensions)); when(coreExtensionRepository.loadedCoreExtensions()).thenReturn(Stream.of(coreExtension)); diff --git a/sonar-core/src/test/java/org/sonar/core/i18n/DefaultI18nTest.java b/sonar-core/src/test/java/org/sonar/core/i18n/DefaultI18nTest.java index aedf30248af..0c764b62e36 100644 --- a/sonar-core/src/test/java/org/sonar/core/i18n/DefaultI18nTest.java +++ b/sonar-core/src/test/java/org/sonar/core/i18n/DefaultI18nTest.java @@ -26,10 +26,10 @@ import java.util.Locale; import java.util.TimeZone; import org.junit.Before; import org.junit.Test; +import org.sonar.api.impl.utils.TestSystem2; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.Metric; import org.sonar.api.utils.DateUtils; -import org.sonar.api.utils.internal.TestSystem2; import org.sonar.core.platform.PluginInfo; import org.sonar.core.platform.PluginRepository; diff --git a/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java b/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java index 62bc8f33338..8944bfbf181 100644 --- a/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java @@ -52,7 +52,7 @@ import org.simpleframework.http.Response; import org.simpleframework.http.core.Container; import org.simpleframework.transport.connect.SocketConnection; import org.sonar.api.CoreProperties; -import org.sonar.api.config.internal.MapSettings; +import org.sonar.api.impl.config.MapSettings; import org.sonar.api.platform.Server; import org.sonar.api.utils.SonarException; @@ -138,10 +138,10 @@ public class DefaultHttpDownloaderTest { @Override public boolean matches(Object ex) { return - // Java 8 - ex instanceof NoRouteToHostException || ex instanceof SocketException - // Java 7 or before - || ex instanceof SocketTimeoutException; + // Java 8 + ex instanceof NoRouteToHostException || ex instanceof SocketException + // Java 7 or before + || ex instanceof SocketTimeoutException; } @Override |