Skip to content

Commit

Permalink
Implement Attribute Injection : Apply review
Browse files Browse the repository at this point in the history
  • Loading branch information
@chickenchickenlove
chickenchickenlove committed Apr 1, 2024
1 parent eac6431 commit 2801cdd
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 71 deletions.
18 changes: 3 additions & 15 deletions ...c/main/java/com/linecorp/armeria/internal/server/annotation/AnnotatedElementNameUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,31 +32,19 @@
final class AnnotatedElementNameUtil {

/**
* Returns the value of the {@link Param} annotation which is specified on the {@code element} if
* Returns the value of the {@link Param} or {@link Attribute} annotation which is specified on the {@code element} if
* the value is not blank. If the value is blank, it returns the name of the specified
* {@code nameRetrievalTarget} object which is an instance of {@link Parameter} or {@link Field}.
* {@code nameRetrievalTarget} object which is an instance of Both {@link Parameter} and {@link Attribute} {} or {@link Field}.
*/
static String findName(Param param, Object nameRetrievalTarget) {
static String findName(Object nameRetrievalTarget, String value) {
requireNonNull(nameRetrievalTarget, "nameRetrievalTarget");

final String value = param.value();
if (DefaultValues.isSpecified(value)) {
checkArgument(!value.isEmpty(), "value is empty.");
return value;
}
return getName(nameRetrievalTarget);
}

static String findName(Attribute attribute, Object nameRetrievalTarget) {
requireNonNull(nameRetrievalTarget, "nameRetrievalTarget");

final String value = attribute.value();
if (DefaultValues.isSpecified(value)) {
checkArgument(!value.isEmpty(), "value is empty.");
return value;
}
return getName(nameRetrievalTarget);
}
/**
* Returns the value of the {@link Header} annotation which is specified on the {@code element} if
* the value is not blank. If the value is blank, it returns the name of the specified
Expand Down
89 changes: 34 additions & 55 deletions ...src/main/java/com/linecorp/armeria/internal/server/annotation/AnnotatedValueResolver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
Expand All @@ -65,6 +66,7 @@
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.common.primitives.Primitives;

import com.linecorp.armeria.common.AggregatedHttpRequest;
import com.linecorp.armeria.common.Cookie;
Expand Down Expand Up @@ -450,13 +452,13 @@ private static AnnotatedValueResolver of(AnnotatedElement annotatedElement,

final Attribute attr = annotatedElement.getAnnotation(Attribute.class);
if (attr != null) {
final String name = findName(attr, typeElement);
return ofAttribute(name, annotatedElement, typeElement, type, description);
final String name = findName(typeElement, attr.value());
return ofAttribute(name, attr, annotatedElement, typeElement, type, description);
}

final Param param = annotatedElement.getAnnotation(Param.class);
if (param != null) {
final String name = findName(param, typeElement);
final String name = findName(typeElement, param.value());
if (type == File.class || type == Path.class || type == MultipartFile.class) {
return ofFileParam(name, annotatedElement, typeElement, type, description);
}
Expand Down Expand Up @@ -633,21 +635,42 @@ private static AnnotatedValueResolver ofRequestObject(String name, AnnotatedElem
}

private static AnnotatedValueResolver ofAttribute(String name,
Attribute attr,
AnnotatedElement annotatedElement,
AnnotatedElement typeElement, Class<?> type,
DescriptionInfo description) {

final List<AttributeKey<?>> attrKeys = new ArrayList<>();

final AttributeKey<?> prefixTypeAttrKey = AttributeKey.valueOf(attr.prefix(), name);
attrKeys.add(prefixTypeAttrKey);

final AttributeKey<?> declaredTypeKey = AttributeKey.valueOf(type, name);
attrKeys.add(declaredTypeKey);

if (type.isPrimitive()) {
final Class<?> mustRefType = Primitives.wrap(type);
final AttributeKey<?> mustRefTypeKey = AttributeKey.valueOf(mustRefType, name);
attrKeys.add(mustRefTypeKey);
}

final AttributeKey<Object> objectTypeAttrKey = AttributeKey.valueOf(name);
attrKeys.add(objectTypeAttrKey);

return new Builder(annotatedElement, type, name)
.annotationType(Attribute.class)
.typeElement(typeElement)
.supportDefault(true)
.supportContainer(true)
.description(description)
.resolver(resolverAttribute((ctx, clazz) -> {
return ctx.context.attr(AttributeKey.valueOf(clazz, name)) != null ?
ctx.context.attr(AttributeKey.valueOf(clazz, name)) :
ctx.context.attr(AttributeKey.valueOf(name));
}
))
.resolver(attributeResolver(ctx -> {
for (AttributeKey<?> attrKey : attrKeys) {
final Object value = ctx.context.attr(attrKey);
if (value != null)
return value;
}
return null;
}))
.build();
}

Expand Down Expand Up @@ -806,60 +829,16 @@ private static AnnotatedValueResolver ofInjectableTypes0(String name, AnnotatedE
}

private static BiFunction<AnnotatedValueResolver, ResolverContext, Object>
resolverAttribute(BiFunction<ResolverContext, Class<?>, Object> getter) {
attributeResolver(Function<ResolverContext, Object> getter) {
return (resolver, ctx) -> {
final Class<?> type = resolver.elementType().isPrimitive() ?
PrimitiveToReference.primitiveToReference(resolver.elementType.getName()) :
resolver.elementType();
// Primitive to Reference.
Object value = getter.apply(ctx, type);
Object value = getter.apply(ctx);
if (value != null) {
return value;
}
return resolver.defaultOrException();
};
}

enum PrimitiveToReference {
BOOLEAN("boolean", Boolean.class),
BYTE("byte", Byte.class),
CHAR("char", Character.class),
SHORT("short", Short.class),
INTEGER("int", Integer.class),
LONG("long", Long.class),
FLOAT("float", Float.class),
DOUBLE("double", Double.class);

PrimitiveToReference(String name, Class<?> clazz) {
this.name = name;
this.clazz = clazz;
}

public String getName() {
return this.name;
}

public Class<?> getClazz() {
return this.clazz;
}

static Class<?> primitiveToReference(String name) {
final Class<?> clazz = PrimitiveToReference.map.get(name);
if (clazz != null) {
return clazz;
}
throw new IllegalStateException("There is no Reference type corresponding to " + name);
}

private final String name;
private final Class<?> clazz;
private static final Map<String, Class<?>> map = Arrays.stream(values())
.collect(Collectors.toMap(
e -> e.getName(),
e -> e.getClazz()));
}


/**
* Returns a bean resolver which retrieves a value using request converters. If the target element
* is an annotated bean, a bean factory of the specified {@link BeanFactoryId} will be used for creating an
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/com/linecorp/armeria/server/annotation/Attribute.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
@Target(ElementType.PARAMETER)
public @interface Attribute {

String value() default DefaultValues.UNSPECIFIED;
String value();
Class<?> prefix() default DefaultValues.class;
}

0 comments on commit 2801cdd

Please sign in to comment.