You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/01/08 18:11:18 UTC
[GitHub] markusthoemmes closed pull request #3157: PureConfigKeys => ConfigKeys; shorten field names
markusthoemmes closed pull request #3157: PureConfigKeys => ConfigKeys; shorten field names
URL: https://github.com/apache/incubator-openwhisk/pull/3157
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/common/scala/src/main/scala/whisk/connector/kafka/KafkaMessagingProvider.scala b/common/scala/src/main/scala/whisk/connector/kafka/KafkaMessagingProvider.scala
index e8eab40172..7fd82c507f 100644
--- a/common/scala/src/main/scala/whisk/connector/kafka/KafkaMessagingProvider.scala
+++ b/common/scala/src/main/scala/whisk/connector/kafka/KafkaMessagingProvider.scala
@@ -30,7 +30,7 @@ import org.apache.kafka.clients.admin.NewTopic
import org.apache.kafka.common.errors.TopicExistsException
import whisk.common.Logging
-import whisk.core.PureConfigKeys
+import whisk.core.ConfigKeys
import whisk.core.WhiskConfig
import whisk.core.connector.MessageConsumer
import whisk.core.connector.MessageProducer
@@ -61,8 +61,8 @@ object KafkaMessagingProvider extends MessagingProvider {
new KafkaProducerConnector(config.kafkaHosts, ec)
def ensureTopic(config: WhiskConfig, topic: String, topicConfig: String)(implicit logging: Logging): Boolean = {
- val kc = loadConfigOrThrow[KafkaConfig](PureConfigKeys.whiskKafka)
- val tc = loadConfigOrThrow[TopicConfig](PureConfigKeys.whiskKafkaTopics + s".$topicConfig")
+ val kc = loadConfigOrThrow[KafkaConfig](ConfigKeys.kafka)
+ val tc = loadConfigOrThrow[TopicConfig](ConfigKeys.kafkaTopics + s".$topicConfig")
val props = new Properties
props.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, config.kafkaHosts)
val client = AdminClient.create(props)
diff --git a/common/scala/src/main/scala/whisk/core/WhiskConfig.scala b/common/scala/src/main/scala/whisk/core/WhiskConfig.scala
index c2094d6dde..f0db605e94 100644
--- a/common/scala/src/main/scala/whisk/core/WhiskConfig.scala
+++ b/common/scala/src/main/scala/whisk/core/WhiskConfig.scala
@@ -237,14 +237,16 @@ object WhiskConfig {
val controllerHighAvailability = "controller.ha"
}
-object PureConfigKeys {
- val whiskLoadbalancer = "whisk.loadbalancer"
+object ConfigKeys {
+ val loadbalancer = "whisk.loadbalancer"
- val whiskKafka = "whisk.kafka"
- val whiskKafkaTopics = "whisk.kafka.topics"
+ val kafka = "whisk.kafka"
+ val kafkaTopics = s"$kafka.topics"
- val whiskDB = "whisk.db"
+ val db = "whisk.db"
- val whiskDockerTimeouts = "whisk.docker.timeouts"
- val whiskRuncTimeouts = "whisk.runc.timeouts"
+ val docker = "whisk.docker"
+ val dockerTimeouts = s"$docker.timeouts"
+ val runc = "whisk.runc"
+ val runcTimeouts = s"$runc.timeouts"
}
diff --git a/common/scala/src/main/scala/whisk/core/entity/WhiskActivation.scala b/common/scala/src/main/scala/whisk/core/entity/WhiskActivation.scala
index fedec4cf8d..cde75070a4 100644
--- a/common/scala/src/main/scala/whisk/core/entity/WhiskActivation.scala
+++ b/common/scala/src/main/scala/whisk/core/entity/WhiskActivation.scala
@@ -25,7 +25,7 @@ import scala.util.Try
import spray.json._
import spray.json.DefaultJsonProtocol._
import whisk.common.TransactionId
-import whisk.core.PureConfigKeys
+import whisk.core.ConfigKeys
import whisk.core.database.ArtifactStore
import whisk.core.database.DocumentFactory
import whisk.core.database.StaleParameter
@@ -148,7 +148,7 @@ object WhiskActivation
override val collectionName = "activations"
- private val dbConfig = loadConfigOrThrow[DBConfig](PureConfigKeys.whiskDB)
+ private val dbConfig = loadConfigOrThrow[DBConfig](ConfigKeys.db)
private val mainDdoc = dbConfig.activationsDdoc
private val filtersDdoc = dbConfig.activationsFilterDdoc
diff --git a/common/scala/src/main/scala/whisk/core/entity/WhiskStore.scala b/common/scala/src/main/scala/whisk/core/entity/WhiskStore.scala
index b935efb98e..94be9583a9 100644
--- a/common/scala/src/main/scala/whisk/core/entity/WhiskStore.scala
+++ b/common/scala/src/main/scala/whisk/core/entity/WhiskStore.scala
@@ -29,7 +29,7 @@ import spray.json.JsString
import spray.json.RootJsonFormat
import whisk.common.Logging
import whisk.common.TransactionId
-import whisk.core.PureConfigKeys
+import whisk.core.ConfigKeys
import whisk.core.WhiskConfig
import whisk.core.WhiskConfig.dbActivations
import whisk.core.WhiskConfig.dbAuths
@@ -193,7 +193,7 @@ object WhiskEntityQueries {
val TOP = "\ufff0"
/** The design document to use for queries. */
- val designDoc = loadConfigOrThrow[DBConfig](PureConfigKeys.whiskDB).actionsDdoc
+ val designDoc = loadConfigOrThrow[DBConfig](ConfigKeys.db).actionsDdoc
/** The view name for the collection, within the design document. */
def view(ddoc: String = designDoc, collection: String) = new View(ddoc, collection)
diff --git a/core/controller/src/main/scala/whisk/core/loadBalancer/LoadBalancerService.scala b/core/controller/src/main/scala/whisk/core/loadBalancer/LoadBalancerService.scala
index 2aa7fd862a..89ba90045f 100644
--- a/core/controller/src/main/scala/whisk/core/loadBalancer/LoadBalancerService.scala
+++ b/core/controller/src/main/scala/whisk/core/loadBalancer/LoadBalancerService.scala
@@ -37,7 +37,7 @@ import akka.pattern.ask
import whisk.common.Logging
import whisk.common.LoggingMarkers
import whisk.common.TransactionId
-import whisk.core.PureConfigKeys
+import whisk.core.ConfigKeys
import whisk.core.WhiskConfig
import whisk.core.WhiskConfig._
import whisk.core.connector.{ActivationMessage, CompletionMessage}
@@ -91,7 +91,7 @@ class LoadBalancerService(config: WhiskConfig, instance: InstanceId, entityStore
logging: Logging)
extends LoadBalancer {
- private val lbConfig = loadConfigOrThrow[LoadbalancerConfig](PureConfigKeys.whiskLoadbalancer)
+ private val lbConfig = loadConfigOrThrow[LoadbalancerConfig](ConfigKeys.loadbalancer)
/** The execution context for futures */
implicit val executionContext: ExecutionContext = actorSystem.dispatcher
diff --git a/core/invoker/src/main/scala/whisk/core/containerpool/docker/DockerClient.scala b/core/invoker/src/main/scala/whisk/core/containerpool/docker/DockerClient.scala
index 7cc1d27915..ca527d953b 100644
--- a/core/invoker/src/main/scala/whisk/core/containerpool/docker/DockerClient.scala
+++ b/core/invoker/src/main/scala/whisk/core/containerpool/docker/DockerClient.scala
@@ -36,7 +36,7 @@ import pureconfig.loadConfigOrThrow
import whisk.common.Logging
import whisk.common.LoggingMarkers
import whisk.common.TransactionId
-import whisk.core.PureConfigKeys
+import whisk.core.ConfigKeys
import whisk.core.containerpool.ContainerId
import whisk.core.containerpool.ContainerAddress
@@ -75,7 +75,7 @@ case class DockerClientTimeoutConfig(run: Duration,
*/
class DockerClient(dockerHost: Option[String] = None,
timeouts: DockerClientTimeoutConfig =
- loadConfigOrThrow[DockerClientTimeoutConfig](PureConfigKeys.whiskDockerTimeouts))(
+ loadConfigOrThrow[DockerClientTimeoutConfig](ConfigKeys.dockerTimeouts))(
executionContext: ExecutionContext)(implicit log: Logging, as: ActorSystem)
extends DockerApi
with ProcessRunner {
diff --git a/core/invoker/src/main/scala/whisk/core/containerpool/docker/RuncClient.scala b/core/invoker/src/main/scala/whisk/core/containerpool/docker/RuncClient.scala
index b8970ecb65..9f95ec3a8e 100644
--- a/core/invoker/src/main/scala/whisk/core/containerpool/docker/RuncClient.scala
+++ b/core/invoker/src/main/scala/whisk/core/containerpool/docker/RuncClient.scala
@@ -27,7 +27,7 @@ import whisk.common.TransactionId
import scala.util.Success
import whisk.common.LoggingMarkers
import whisk.common.Logging
-import whisk.core.PureConfigKeys
+import whisk.core.ConfigKeys
import akka.event.Logging.ErrorLevel
import pureconfig.loadConfigOrThrow
import whisk.core.containerpool.ContainerId
@@ -47,7 +47,7 @@ case class RuncClientTimeouts(pause: Duration, resume: Duration)
*
* You only need one instance (and you shouldn't get more).
*/
-class RuncClient(timeouts: RuncClientTimeouts = loadConfigOrThrow[RuncClientTimeouts](PureConfigKeys.whiskRuncTimeouts))(
+class RuncClient(timeouts: RuncClientTimeouts = loadConfigOrThrow[RuncClientTimeouts](ConfigKeys.runcTimeouts))(
executionContext: ExecutionContext)(implicit log: Logging, as: ActorSystem)
extends RuncApi
with ProcessRunner {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services