Cleanup: get rid of effective visibility warnings

This commit is contained in:
Mikhail Glukhikh
2015-10-23 16:54:40 +03:00
committed by Mikhail Glukhikh
parent 932542891b
commit f8a70302ac
34 changed files with 60 additions and 56 deletions
@@ -91,7 +91,7 @@ public class StorageComponentContainer(id: String) : ComponentContainer, Compone
return componentStorage.resolveMultiple(request, context)
}
public fun registerDescriptors(descriptors: List<ComponentDescriptor>): StorageComponentContainer {
internal fun registerDescriptors(descriptors: List<ComponentDescriptor>): StorageComponentContainer {
componentStorage.registerDescriptors(unknownContext, descriptors)
return this
}
@@ -30,7 +30,7 @@ public interface ValueResolveContext {
fun resolve(registration: Type): ValueDescriptor?
}
internal class ComponentResolveContext(val container: StorageComponentContainer, val requestingDescriptor: ValueDescriptor) : ValueResolveContext {
public class ComponentResolveContext(val container: StorageComponentContainer, val requestingDescriptor: ValueDescriptor) : ValueResolveContext {
override fun resolve(registration: Type): ValueDescriptor? = container.resolve(registration, this)
override fun toString(): String = "for $requestingDescriptor in $container"
@@ -33,13 +33,13 @@ public enum class ComponentStorageState {
Disposed
}
class InvalidCardinalityException(message: String, val descriptors: Collection<ComponentDescriptor>) : Exception(message)
internal class InvalidCardinalityException(message: String, val descriptors: Collection<ComponentDescriptor>) : Exception(message)
public class ComponentStorage(val myId: String) : ValueResolver {
var state = ComponentStorageState.Initial
val registry = ComponentRegistry()
val descriptors = LinkedHashSet<ComponentDescriptor>()
val dependencies = MultiMap.createLinkedSet<ComponentDescriptor, Type>()
private val registry = ComponentRegistry()
private val descriptors = LinkedHashSet<ComponentDescriptor>()
private val dependencies = MultiMap.createLinkedSet<ComponentDescriptor, Type>()
override fun resolve(request: Type, context: ValueResolveContext): ValueDescriptor? {
if (state == ComponentStorageState.Initial)
@@ -93,7 +93,7 @@ public class ComponentStorage(val myId: String) : ValueResolver {
return registry.tryGetEntry(request)
}
public fun registerDescriptors(context: ComponentResolveContext, items: List<ComponentDescriptor>) {
internal fun registerDescriptors(context: ComponentResolveContext, items: List<ComponentDescriptor>) {
if (state == ComponentStorageState.Disposed) {
throw ContainerConsistencyException("Cannot register descriptors in $state state")
}
@@ -192,7 +192,7 @@ public class ComponentStorage(val myId: String) : ValueResolver {
state = ComponentStorageState.Disposed
}
fun getDescriptorsInDisposeOrder(): List<ComponentDescriptor> {
private fun getDescriptorsInDisposeOrder(): List<ComponentDescriptor> {
return topologicalSort(descriptors) {
val dependent = ArrayList<ComponentDescriptor>()
for (interfaceType in dependencies[it]) {
@@ -204,7 +204,7 @@ public class ComponentStorage(val myId: String) : ValueResolver {
}
}
fun disposeDescriptor(descriptor: ComponentDescriptor) {
private fun disposeDescriptor(descriptor: ComponentDescriptor) {
if (descriptor is Closeable)
descriptor.close()
}