diff options
6 files changed, 15 insertions, 14 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java index e180016f286..b4e9a760d8e 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/SlobrokClient.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; public class SlobrokClient implements NodeLookup { - public static Logger log = Logger.getLogger(SlobrokClient.class.getName()); + public static final Logger log = Logger.getLogger(SlobrokClient.class.getName()); private final Timer timer; private String[] connectionSpecs; diff --git a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java index 061ad42e028..364dd1742ae 100644 --- a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java +++ b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java @@ -65,8 +65,8 @@ public class ApplicationConfigProducerRoot extends AbstractConfigProducer<Abstra * Creates and initializes a new Vespa from the service config file * in the given application directory. * - * @param parent The parent, usually VespaModel - * @param name The name, used as configId + * @param parent the parent, usually VespaModel + * @param name the name, used as configId * @param documentModel DocumentModel to serve global document config from. */ public ApplicationConfigProducerRoot(AbstractConfigProducer parent, String name, DocumentModel documentModel, Version vespaVersion, ApplicationId applicationId) { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index e9755b7fd8b..6a399c143bb 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -182,7 +182,7 @@ public class InternalStepRunner implements StepRunner { private Optional<RunStatus> deployReal(RunId id, DualLogger logger) { Versions versions = controller.jobController().run(id).get().versions(); logger.log("Deploying platform version " + versions.targetPlatform() + - " and application version " + versions.targetApplication().id() + " ..."); + " and application version " + versions.targetApplication().id() + " ..."); return deployReal(id, false, logger); } @@ -239,7 +239,7 @@ public class InternalStepRunner implements StepRunner { case ACTIVATION_CONFLICT: case APPLICATION_LOCK_FAILURE: logger.log("Deployment failed with possibly transient error " + e.code() + - ", will retry: " + e.getMessage()); + ", will retry: " + e.getMessage()); return result; case LOAD_BALANCER_NOT_READY: case PARENT_HOST_NOT_READY: diff --git a/jrt/src/com/yahoo/jrt/slobrok/api/Mirror.java b/jrt/src/com/yahoo/jrt/slobrok/api/Mirror.java index 996459dc5db..058a1380480 100644 --- a/jrt/src/com/yahoo/jrt/slobrok/api/Mirror.java +++ b/jrt/src/com/yahoo/jrt/slobrok/api/Mirror.java @@ -31,16 +31,16 @@ import java.util.logging.Level; */ public class Mirror implements IMirror { - private static Logger log = Logger.getLogger(Mirror.class.getName()); + private static final Logger log = Logger.getLogger(Mirror.class.getName()); private final Supervisor orb; private final SlobrokList slobroks; - private String currSlobrok; - private final BackOffPolicy backOff; - private volatile int updates = 0; + private String currSlobrok; + private final BackOffPolicy backOff; + private volatile int updates = 0; private boolean requestDone = false; private boolean logOnSuccess = true; - private AtomicReference<Entry[]> specs = new AtomicReference<>(new Entry[0]); + private final AtomicReference<Entry[]> specs = new AtomicReference<>(new Entry[0]); private int specsGeneration = 0; private final TransportThread transportThread; private final Task updateTask; @@ -55,7 +55,7 @@ public class Mirror implements IMirror { * @param orb the Supervisor to use * @param slobroks slobrok connect spec list * @param bop custom backoff policy, mostly useful for testing - **/ + */ public Mirror(Supervisor orb, SlobrokList slobroks, BackOffPolicy bop) { this.orb = orb; this.slobroks = slobroks; diff --git a/jrt/src/com/yahoo/jrt/slobrok/api/SlobrokList.java b/jrt/src/com/yahoo/jrt/slobrok/api/SlobrokList.java index 10d8923d9f5..654ccd7e350 100644 --- a/jrt/src/com/yahoo/jrt/slobrok/api/SlobrokList.java +++ b/jrt/src/com/yahoo/jrt/slobrok/api/SlobrokList.java @@ -27,7 +27,6 @@ public class SlobrokList { } } - public String nextSlobrokSpec() { checkUpdate(); if (idx < slobroks.length) { @@ -90,4 +89,5 @@ public class SlobrokList { return Arrays.toString(slobroks); } } + } diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/SlobrokConfigSubscriber.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/SlobrokConfigSubscriber.java index 7f4c27a45f9..d576ec50af7 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/SlobrokConfigSubscriber.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/SlobrokConfigSubscriber.java @@ -12,13 +12,13 @@ import com.yahoo.cloud.config.SlobroksConfig; */ public class SlobrokConfigSubscriber implements ConfigSubscriber.SingleSubscriber<SlobroksConfig>{ - private SlobrokList slobroks = new SlobrokList(); + private final SlobrokList slobroks = new SlobrokList(); private ConfigSubscriber subscriber; /** * Constructs a new config subscriber for a given config id. * - * @param configId The id of the config to subscribe to. + * @param configId the id of the config to subscribe to */ public SlobrokConfigSubscriber(String configId) { subscriber = new ConfigSubscriber(); @@ -55,4 +55,5 @@ public class SlobrokConfigSubscriber implements ConfigSubscriber.SingleSubscribe subscriber.close(); } } + } |