Use explicit imports and remove unused argument

3 files changed, 7 insertions, 10 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributorService.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributorService.java
index bfa32c003e0..0dca3ec5ccf 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributorService.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributorService.java
@@ -1,14 +1,16 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.filedistribution;
 
+import com.yahoo.cloud.config.filedistribution.FiledistributorConfig;
+import com.yahoo.cloud.config.filedistribution.FiledistributorrpcConfig;
+import com.yahoo.cloud.config.filedistribution.FilereferencesConfig;
 import com.yahoo.config.FileReference;
-import com.yahoo.cloud.config.filedistribution.*;
+
 import com.yahoo.config.model.api.FileDistribution;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.model.AbstractService;
 import com.yahoo.vespa.model.admin.FileDistributionOptions;
 
-import java.io.File;
 import java.util.Collection;
 
 /**
diff --git a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusClientProvider.java b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusClientProvider.java
index 99a4960d25d..7b5b152d65a 100644
--- a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusClientProvider.java
+++ b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusClientProvider.java
@@ -11,10 +11,6 @@ import com.yahoo.messagebus.SourceSessionParams;
 import com.yahoo.messagebus.jdisc.MbusClient;
 import com.yahoo.messagebus.shared.SharedIntermediateSession;
 import com.yahoo.messagebus.shared.SharedSourceSession;
-import com.yahoo.messagebus.ThrottlePolicy;
-import com.yahoo.messagebus.Message;
-
-import com.yahoo.messagebus.Reply;
 
 /**
  * @author tonytv
@@ -26,7 +22,6 @@ public class MbusClientProvider implements Provider<MbusClient> {
 
     private static MbusClient createSourceClient(
             SessionCache sessionCache,
-            SessionConfig sessionConfig,
             boolean setAllPassThrottlePolicy) {
         final SourceSessionParams sourceSessionParams = new SourceSessionParams();
         if (setAllPassThrottlePolicy) {
@@ -49,10 +44,10 @@ public class MbusClientProvider implements Provider<MbusClient> {
                 }
                 break;
             case SOURCE:
-                client = createSourceClient(sessionCache, sessionConfig, false);
+                client = createSourceClient(sessionCache, false);
                 break;
             case INTERNAL:
-                client = createSourceClient(sessionCache, sessionConfig, true);
+                client = createSourceClient(sessionCache, true);
                 break;
             default:
                 throw new IllegalArgumentException("Unknown session type: " + sessionConfig.type());
diff --git a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java
index e396f5d8647..2a938497565 100644
--- a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java
+++ b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java
@@ -1,8 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.filedistribution.fileacquirer;
 
+import com.yahoo.cloud.config.filedistribution.FiledistributorrpcConfig;
 import com.yahoo.config.subscription.ConfigSubscriber;
-import com.yahoo.cloud.config.filedistribution.*;
 import com.yahoo.config.FileReference;
 import com.yahoo.jrt.*;
 import com.yahoo.log.LogLevel;