Guice now supports multibindings with wildcards, so the annotation is
now redundant.

Signed-off-by: Graham <gpe@openrs2.org>
Graham 4 years ago
parent 771e36da02
commit 59f48e3859
  1. 2
      bundler/src/main/kotlin/org/openrs2/bundler/Bundler.kt
  2. 2
      deob-ast/src/main/kotlin/org/openrs2/deob/ast/AstDeobfuscator.kt
  3. 2
      deob/src/main/kotlin/org/openrs2/deob/Deobfuscator.kt
  4. 2
      deob/src/main/kotlin/org/openrs2/deob/transform/BundlerTransformer.kt
  5. 2
      json/src/main/kotlin/org/openrs2/json/ObjectMapperProvider.kt
  6. 2
      yaml/src/main/kotlin/org/openrs2/yaml/ObjectMapperProvider.kt

@ -24,7 +24,7 @@ import javax.inject.Singleton
@Singleton @Singleton
public class Bundler @Inject constructor( public class Bundler @Inject constructor(
@BundlerQualifier private val transformers: Set<@JvmSuppressWildcards Transformer>, @BundlerQualifier private val transformers: Set<Transformer>,
private val config: Config private val config: Config
) { ) {
private val unsignedManifest = Manifest().apply { private val unsignedManifest = Manifest().apply {

@ -8,7 +8,7 @@ import javax.inject.Singleton
@Singleton @Singleton
public class AstDeobfuscator @Inject constructor( public class AstDeobfuscator @Inject constructor(
private val transformers: Set<@JvmSuppressWildcards Transformer> private val transformers: Set<Transformer>
) { ) {
public fun run(modules: Set<Module>) { public fun run(modules: Set<Module>) {
val group = LibraryGroup(modules.map(Library.Companion::parse)) val group = LibraryGroup(modules.map(Library.Companion::parse))

@ -16,7 +16,7 @@ import javax.inject.Singleton
@Singleton @Singleton
public class Deobfuscator @Inject constructor( public class Deobfuscator @Inject constructor(
@DeobfuscatorQualifier private val transformers: Set<@JvmSuppressWildcards Transformer> @DeobfuscatorQualifier private val transformers: Set<Transformer>
) { ) {
public fun run(input: Path, output: Path) { public fun run(input: Path, output: Path) {
// read input jars/packs // read input jars/packs

@ -9,7 +9,7 @@ import javax.inject.Singleton
@Singleton @Singleton
public class BundlerTransformer @Inject constructor( public class BundlerTransformer @Inject constructor(
@BundlerQualifier private val transformers: Set<@JvmSuppressWildcards Transformer> @BundlerQualifier private val transformers: Set<Transformer>
) : Transformer() { ) : Transformer() {
override fun transform(classPath: ClassPath) { override fun transform(classPath: ClassPath) {
for (transformer in transformers) { for (transformer in transformers) {

@ -8,7 +8,7 @@ import javax.inject.Inject
import javax.inject.Provider import javax.inject.Provider
public class ObjectMapperProvider @Inject constructor( public class ObjectMapperProvider @Inject constructor(
private val modules: Set<@JvmSuppressWildcards Module> private val modules: Set<Module>
) : Provider<ObjectMapper> { ) : Provider<ObjectMapper> {
override fun get(): ObjectMapper { override fun get(): ObjectMapper {
return ObjectMapper() return ObjectMapper()

@ -9,7 +9,7 @@ import javax.inject.Inject
import javax.inject.Provider import javax.inject.Provider
public class ObjectMapperProvider @Inject constructor( public class ObjectMapperProvider @Inject constructor(
private val modules: Set<@JvmSuppressWildcards Module> private val modules: Set<Module>
) : Provider<ObjectMapper> { ) : Provider<ObjectMapper> {
override fun get(): ObjectMapper { override fun get(): ObjectMapper {
return ObjectMapper(YAMLFactory()) return ObjectMapper(YAMLFactory())

Loading…
Cancel
Save