diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-20 15:09:05 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-20 15:17:38 +0200 |
commit | 77bac623b9959510a7334e048b1c85af93371653 (patch) | |
tree | c646dca35ad594bf02e591fa0f14f01ad1695313 /container-core | |
parent | d4f3f842d2a2e3be7692bd05609a0b3004fa898e (diff) |
fix warnings
Diffstat (limited to 'container-core')
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java | 5 | ||||
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java index 0f56934c5bc..c88b3967e1c 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java @@ -19,7 +19,6 @@ import com.yahoo.container.di.osgi.OsgiUtil; import com.yahoo.container.handler.observability.OverviewHandler; import com.yahoo.container.logging.AccessLog; import com.yahoo.container.logging.AccessLogInterface; -import com.yahoo.container.protect.FreezeDetector; import com.yahoo.jdisc.application.OsgiFramework; import com.yahoo.jdisc.handler.RequestHandler; import com.yahoo.jdisc.service.ClientProvider; @@ -166,7 +165,9 @@ public class HandlersConfigurerDi { bind(com.yahoo.container.Container.class).toInstance(vespaContainer); bind(com.yahoo.statistics.Statistics.class).toInstance(Statistics.nullImplementation); bind(Linguistics.class).toInstance(new SimpleLinguistics()); - bind(FreezeDetector.class).toInstance(new FreezeDetector(new DiagnosticsConfig(new DiagnosticsConfig.Builder().disabled(true)))); + bind(com.yahoo.container.protect.FreezeDetector.class).toInstance( + new com.yahoo.container.protect.FreezeDetector( + new DiagnosticsConfig(new DiagnosticsConfig.Builder().disabled(true)))); bind(AccessLog.class).toInstance(new AccessLog(new ComponentRegistry<>())); bind(Executor.class).toInstance(Executors.newCachedThreadPool(ThreadFactoryFactory.getThreadFactory("HandlersConfigurerDI"))); diff --git a/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java b/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java index cc6ba83711d..11649a06cc6 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java @@ -35,7 +35,7 @@ public class AccessLogRequestHandler extends ThreadedHttpRequestHandler { @Override public void render(OutputStream outputStream) throws IOException { - JsonGenerator generator = jsonFactory.createJsonGenerator(outputStream); + JsonGenerator generator = jsonFactory.createGenerator(outputStream); generator.writeStartObject(); generator.writeArrayFieldStart("entries"); for (String uri : uris) { |