Move `SmithyHttpServer` to `ServerCargoDependency.kt` (#1248) (86680c26) · Commits · Public Repositories / Smithy Rust

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/ServerCargoDependency.kt

+3 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@ object ServerCargoDependency {
		val PinProjectLite: CargoDependency = CargoDependency("pin-project-lite", CratesIo("0.2"))
		val SerdeUrlEncoded: CargoDependency = CargoDependency("serde_urlencoded", CratesIo("0.7"))
		val Tower: CargoDependency = CargoDependency("tower", CratesIo("0.4"))

		fun SmithyHttpServer(runtimeConfig: RuntimeConfig) = runtimeConfig.runtimeCrate("http-server")
		}

		/**
		@@ -39,7 +41,7 @@ object ServerInlineDependency {
		fun serverOperationHandler(runtimeConfig: RuntimeConfig): InlineDependency =
		InlineDependency.forRustFile(
		"server_operation_handler_trait",
		CargoDependency.SmithyHttpServer(runtimeConfig),
		ServerCargoDependency.SmithyHttpServer(runtimeConfig),
		CargoDependency.Http,
		ServerCargoDependency.PinProjectLite,
		ServerCargoDependency.Tower,

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/ServerRuntimeType.kt

+5 −6

Original line number	Diff line number	Diff line
		@@ -5,7 +5,6 @@

		package software.amazon.smithy.rust.codegen.server.smithy

		import software.amazon.smithy.rust.codegen.rustlang.CargoDependency
		import software.amazon.smithy.rust.codegen.rustlang.InlineDependency
		import software.amazon.smithy.rust.codegen.smithy.RuntimeConfig
		import software.amazon.smithy.rust.codegen.smithy.RuntimeType
		@@ -23,20 +22,20 @@ object ServerRuntimeType {
		val Cow = RuntimeType("Cow", dependency = null, namespace = "std::borrow")

		fun Router(runtimeConfig: RuntimeConfig) =
		RuntimeType("Router", CargoDependency.SmithyHttpServer(runtimeConfig), "${runtimeConfig.crateSrcPrefix}_http_server::routing")
		RuntimeType("Router", ServerCargoDependency.SmithyHttpServer(runtimeConfig), "${runtimeConfig.crateSrcPrefix}_http_server::routing")

		fun RequestSpecModule(runtimeConfig: RuntimeConfig) =
		RuntimeType("request_spec", CargoDependency.SmithyHttpServer(runtimeConfig), "${runtimeConfig.crateSrcPrefix}_http_server::routing")
		RuntimeType("request_spec", ServerCargoDependency.SmithyHttpServer(runtimeConfig), "${runtimeConfig.crateSrcPrefix}_http_server::routing")

		fun serverOperationHandler(runtimeConfig: RuntimeConfig) =
		forInlineDependency(ServerInlineDependency.serverOperationHandler(runtimeConfig))

		fun RuntimeError(runtimeConfig: RuntimeConfig) =
		RuntimeType("RuntimeError", CargoDependency.SmithyHttpServer(runtimeConfig), "${runtimeConfig.crateSrcPrefix}_http_server::runtime_error")
		RuntimeType("RuntimeError", ServerCargoDependency.SmithyHttpServer(runtimeConfig), "${runtimeConfig.crateSrcPrefix}_http_server::runtime_error")

		fun RequestRejection(runtimeConfig: RuntimeConfig) =
		RuntimeType("RequestRejection", CargoDependency.SmithyHttpServer(runtimeConfig), "${runtimeConfig.crateSrcPrefix}_http_server::rejection")
		RuntimeType("RequestRejection", ServerCargoDependency.SmithyHttpServer(runtimeConfig), "${runtimeConfig.crateSrcPrefix}_http_server::rejection")

		fun ResponseRejection(runtimeConfig: RuntimeConfig) =
		RuntimeType("ResponseRejection", CargoDependency.SmithyHttpServer(runtimeConfig), "${runtimeConfig.crateSrcPrefix}_http_server::rejection")
		RuntimeType("ResponseRejection", ServerCargoDependency.SmithyHttpServer(runtimeConfig), "${runtimeConfig.crateSrcPrefix}_http_server::rejection")
		}

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/generators/ServerOperationHandlerGenerator.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ class ServerOperationHandlerGenerator(
		"Tower" to ServerCargoDependency.Tower.asType(),
		"FuturesUtil" to ServerCargoDependency.FuturesUtil.asType(),
		"SmithyHttp" to CargoDependency.SmithyHttp(runtimeConfig).asType(),
		"SmithyHttpServer" to CargoDependency.SmithyHttpServer(runtimeConfig).asType(),
		"SmithyHttpServer" to ServerCargoDependency.SmithyHttpServer(runtimeConfig).asType(),
		"Phantom" to ServerRuntimeType.Phantom,
		"ServerOperationHandler" to ServerRuntimeType.serverOperationHandler(runtimeConfig),
		"http" to RuntimeType.http,

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/generators/ServerOperationRegistryGenerator.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ class ServerOperationRegistryGenerator(
		private val runtimeConfig = codegenContext.runtimeConfig
		private val codegenScope = arrayOf(
		"Router" to ServerRuntimeType.Router(runtimeConfig),
		"SmithyHttpServer" to CargoDependency.SmithyHttpServer(runtimeConfig).asType(),
		"SmithyHttpServer" to ServerCargoDependency.SmithyHttpServer(runtimeConfig).asType(),
		"ServerOperationHandler" to ServerRuntimeType.serverOperationHandler(runtimeConfig),
		"Tower" to ServerCargoDependency.Tower.asType(),
		"Phantom" to ServerRuntimeType.Phantom,

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/generators/protocol/ServerProtocolTestGenerator.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ class ServerProtocolTestGenerator(
		"Http" to CargoDependency.Http.asType(),
		"Hyper" to CargoDependency.Hyper.asType(),
		"AxumCore" to ServerCargoDependency.AxumCore.asType(),
		"SmithyHttpServer" to CargoDependency.SmithyHttpServer(codegenContext.runtimeConfig).asType(),
		"SmithyHttpServer" to ServerCargoDependency.SmithyHttpServer(codegenContext.runtimeConfig).asType(),
		"AssertEq" to CargoDependency.PrettyAssertions.asType().member("assert_eq!")
		)