Skip to content

Commit

Permalink
Fix imports
Browse files Browse the repository at this point in the history
  • Loading branch information
erwinw committed Dec 20, 2023
1 parent 356ef51 commit 00c2745
Show file tree
Hide file tree
Showing 18 changed files with 32 additions and 32 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package io.pleo.prop.objects

import com.google.inject.Inject
import io.pleo.prop.core.Prop
import javax.inject.Inject
import com.google.inject.name.Named as GoogleNamed
import javax.inject.Named as JavaxNamed
import jakarta.inject.Named as JakartaNamed

class BothNamedAnnotations @Inject constructor(
@JavaxNamed("io.pleo.test.prop3") val stringProp1: Prop<String>,
@JakartaNamed("io.pleo.test.prop3") val stringProp1: Prop<String>,
@GoogleNamed("io.pleo.test.prop4") val stringProp2: Prop<String>
)
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.pleo.prop.objects

import com.google.inject.Inject
import com.google.inject.name.Named
import io.pleo.prop.core.Prop
import javax.inject.Inject
import javax.inject.Named

@Suppress("unused")
class ComplexObjects @Inject constructor(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.pleo.prop.objects

import com.google.inject.Inject
import com.google.inject.name.Named
import io.pleo.prop.core.Prop
import javax.inject.Inject
import javax.inject.Named
import javax.money.CurrencyUnit

@Suppress("unused_parameter")
Expand Down
4 changes: 2 additions & 2 deletions prop-all/src/test/kotlin/io/pleo/prop/objects/DefaultValue.kt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package io.pleo.prop.objects

import com.google.inject.Inject
import com.google.inject.name.Named
import io.pleo.prop.core.Default
import io.pleo.prop.core.Prop
import javax.inject.Inject
import javax.inject.Named

class DefaultValue @Inject constructor(
@Default(DEFAULT_VALUE)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.pleo.prop.objects

import io.pleo.prop.core.Prop
import javax.inject.Inject
import javax.inject.Named
import jakarta.inject.Inject
import jakarta.inject.Named

@Suppress("UNUSED_PARAMETER")
class EmptyNamedAnnotation @Inject constructor(@Named myProp: Prop<String>)
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ package io.pleo.prop.objects
import com.google.inject.AbstractModule
import com.google.inject.Provides
import com.google.inject.Singleton
import com.google.inject.name.Named
import io.pleo.prop.core.Prop
import javax.inject.Named

@Suppress("unused", "SpellCheckingInspection", "unused_parameter")
class InlineProviderModule : AbstractModule() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package io.pleo.prop.objects

import com.google.inject.Inject
import com.google.inject.name.Named
import io.pleo.prop.core.Default
import io.pleo.prop.core.Prop
import javax.inject.Inject
import javax.inject.Named

@Suppress("unused")
class InvalidDefaultValue @Inject constructor(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package io.pleo.prop.objects

import com.google.inject.Inject
import com.google.inject.name.Named
import io.pleo.prop.core.Default
import io.pleo.prop.core.Prop
import javax.inject.Inject
import javax.inject.Named

@Suppress("unused")
class InvalidDefaultValueButValidValue @Inject constructor(
Expand Down
4 changes: 2 additions & 2 deletions prop-all/src/test/kotlin/io/pleo/prop/objects/InvalidJSON.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.pleo.prop.objects

import com.google.inject.Inject
import com.google.inject.name.Named
import io.pleo.prop.core.Prop
import javax.inject.Inject
import javax.inject.Named

@Suppress("UNUSED_PARAMETER")
class InvalidJSON @Inject constructor(@Named("io.pleo.prop5") objectProp: Prop<InjectedObject>)
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package io.pleo.prop.objects

import com.google.inject.Inject
import com.google.inject.assistedinject.Assisted
import com.google.inject.name.Named
import io.pleo.prop.core.Prop
import javax.inject.Named

@Suppress("unused")
class MyAssistedInjectFactoryImp @Inject constructor(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package io.pleo.prop.objects

import com.google.inject.Inject
import com.google.inject.assistedinject.Assisted
import com.google.inject.name.Named
import io.pleo.prop.core.Prop
import javax.inject.Named

@Suppress("unused")
class MyAssistedInjectFactoryImp2 @Inject constructor(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package io.pleo.prop.objects

import com.google.inject.Inject
import com.google.inject.Provider
import com.google.inject.name.Named
import io.pleo.prop.core.Prop
import javax.inject.Inject
import javax.inject.Named
import javax.inject.Provider

class MyInterfaceProvider @Inject constructor(
@Named("io.pleo.test.prop3") val prop: Prop<String>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.pleo.prop.objects

import javax.inject.Inject
import com.google.inject.Inject
import javax.sql.DataSource

class NoPropObject @Inject constructor(val dataSource: DataSource)
4 changes: 2 additions & 2 deletions prop-all/src/test/kotlin/io/pleo/prop/objects/NullValue.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.pleo.prop.objects

import com.google.inject.Inject
import com.google.inject.name.Named
import io.pleo.prop.core.Prop
import javax.inject.Inject
import javax.inject.Named

@Suppress("unused_parameter")
class NullValue @Inject constructor(@Named("io.pleo.undefined.property") thisThrows: Prop<String>)
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.pleo.prop.objects

import com.google.inject.Inject
import com.google.inject.name.Named
import io.pleo.prop.core.Prop
import javax.inject.Inject
import javax.inject.Named

class SamePropertyAsComplexObjects @Inject constructor(
@Named("io.pleo.test.prop1") val myComplexObjectProp: Prop<InjectedObject>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.pleo.prop.objects

import com.google.inject.Inject
import io.pleo.prop.core.Prop
import javax.inject.Inject

@Suppress("unused_parameter")
class UnnamedProp @Inject constructor(unnamedProp: Prop<String>)
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.pleo.prop.objects

import com.google.inject.Inject
import com.google.inject.name.Named
import io.pleo.prop.core.Prop
import javax.inject.Inject
import javax.inject.Named

class UsesTwiceSameProp @Inject constructor(
@Named("io.pleo.test.prop3") val stringProp1: Prop<String>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ import io.pleo.prop.core.Parser
import io.pleo.prop.core.Prop
import io.pleo.prop.core.internal.ParserFactory
import io.pleo.prop.core.internal.PropFactory
import jakarta.inject.Named
import java.lang.reflect.Executable
import java.lang.reflect.Parameter
import java.lang.reflect.ParameterizedType
import java.lang.reflect.Type
import java.util.Optional.ofNullable
import java.util.function.Predicate
import javax.inject.Named

typealias PropResult = Result<Prop<*>>

Expand Down

0 comments on commit 00c2745

Please sign in to comment.