diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2016-11-08 15:34:18 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2016-11-09 20:48:20 +0100 |
| commit | f050424587272bb89868aded19c5b6225d235348 (patch) | |
| tree | 97f4a5f5ab6dcf0ec68d558c7e2be4f44b68da77 /server/sonar-ce | |
| parent | 64bbc7c5078cd0b2ac4251d4a8a407247065ccea (diff) | |
| download | sonarqube-f050424587272bb89868aded19c5b6225d235348.tar.gz sonarqube-f050424587272bb89868aded19c5b6225d235348.zip | |
SONAR-8351 share OkHttpClient utilities
sonar-ws correctly configures OkHttpClient for the
support of HTTPS, proxy (incl. authentication), timeouts and user agent.
This code should be reused by web server and compute engine, for
example when sending webhook payloads.
The new class OkHttpClientProvider allows web server/CE
to instantiate and configure a single instance of OkHttpClient.
Diffstat (limited to 'server/sonar-ce')
| -rw-r--r-- | server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java | 3 | ||||
| -rw-r--r-- | server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java index 6b2d0fdf938..4bcdb4b567f 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java @@ -137,6 +137,7 @@ import org.sonar.server.user.DefaultUserFinder; import org.sonar.server.user.DeprecatedUserFinder; import org.sonar.server.user.index.UserIndex; import org.sonar.server.user.index.UserIndexer; +import org.sonar.server.util.OkHttpClientProvider; import org.sonar.server.view.index.ViewIndex; import org.sonar.server.view.index.ViewIndexer; import org.sonarqube.ws.Rules; @@ -241,6 +242,8 @@ public class ComputeEngineContainerImpl implements ComputeEngineContainer { // issues IssueIndex.class, + + new OkHttpClientProvider() }; } diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java index 4f323c24de0..b9b59c7dc48 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java @@ -105,7 +105,7 @@ public class ComputeEngineContainerImplTest { ); assertThat(picoContainer.getParent().getParent().getParent().getComponentAdapters()).hasSize( COMPONENTS_IN_LEVEL_1_AT_CONSTRUCTION - + 24 // level 1 + + 25 // level 1 + 46 // content of DaoModule + 2 // content of EsSearchModule + 62 // content of CorePropertyDefinitions |