Minor, take ProtoContainer in AnnotationAndConstantLoader#loadClassAnnotations

This commit is contained in:
Alexander Udalov
2016-04-06 15:26:40 +03:00
parent 2ab68d53fa
commit ac92be12c6
7 changed files with 16 additions and 24 deletions
@@ -31,10 +31,8 @@ class AnnotationLoaderForStubBuilderImpl(
private val protocol: SerializerExtensionProtocol
) : AnnotationAndConstantLoader<ClassId, Unit, ClassIdWithTarget> {
override fun loadClassAnnotations(
classProto: ProtoBuf.Class, nameResolver: NameResolver
): List<ClassId> =
classProto.getExtension(protocol.classAnnotation).orEmpty().map { nameResolver.getClassId(it.id) }
override fun loadClassAnnotations(container: ProtoContainer.Class): List<ClassId> =
container.classProto.getExtension(protocol.classAnnotation).orEmpty().map { container.nameResolver.getClassId(it.id) }
override fun loadCallableAnnotations(
container: ProtoContainer,
@@ -90,7 +90,7 @@ private class ClassClsStubBuilder(
val classOrObjectStub = doCreateClassOrObjectStub()
val modifierList = createModifierListForClass(classOrObjectStub)
if (Flags.HAS_ANNOTATIONS.get(classProto.flags)) {
createAnnotationStubs(c.components.annotationLoader.loadClassAnnotations(classProto, c.nameResolver), modifierList)
createAnnotationStubs(c.components.annotationLoader.loadClassAnnotations(thisAsProtoContainer), modifierList)
}
return classOrObjectStub
}