Skip to content

Commit 21afecd

Browse files
authored
fix: Scan method annotations (#16937)
Fixes #16925
1 parent d2c9916 commit 21afecd

2 files changed

Lines changed: 80 additions & 0 deletions

File tree

‎flow-server/src/main/java/com/vaadin/flow/server/frontend/scanner/FrontendClassVisitor.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,13 @@ public FrontendMethodVisitor() {
6565
super(Opcodes.ASM9);
6666
}
6767

68+
@Override
69+
public AnnotationVisitor visitAnnotation(String descriptor,
70+
boolean visible) {
71+
addSignatureToClasses(classInfo.children, descriptor);
72+
return annotationVisitor;
73+
}
74+
6875
// We are interested in the new instances created inside the method
6976
@Override
7077
public void visitTypeInsn(int opcode, String type) {

‎flow-server/src/test/java/com/vaadin/flow/server/frontend/scanner/ScannerDependenciesTest.java‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
11
package com.vaadin.flow.server.frontend.scanner;
22

3+
import java.io.InputStream;
4+
import java.lang.reflect.AnnotatedElement;
5+
import java.net.URL;
36
import java.util.ArrayList;
47
import java.util.Arrays;
58
import java.util.HashSet;
69
import java.util.List;
710
import java.util.Set;
11+
import java.util.function.Supplier;
812

913
import org.junit.Test;
14+
import org.objectweb.asm.ClassReader;
1015

16+
import com.vaadin.flow.component.Component;
1117
import com.vaadin.flow.component.dependency.JsModule;
1218
import com.vaadin.flow.router.Route;
1319
import com.vaadin.flow.server.frontend.scanner.ClassFinder.DefaultClassFinder;
20+
import com.vaadin.flow.server.frontend.scanner.ScannerDependenciesTest.UISearchField.SearchFieldComponentDefinitionCreator;
21+
import com.vaadin.flow.server.frontend.scanner.ScannerDependenciesTest.UISearchField.UISearchLayout;
22+
import com.vaadin.flow.server.frontend.scanner.ScannerDependenciesTest.UISearchField.UISearchLayout.SearchLayoutComponentDefinitionCreator;
1423
import com.vaadin.flow.server.frontend.scanner.ScannerTestComponents.BridgeClass;
1524
import com.vaadin.flow.server.frontend.scanner.ScannerTestComponents.Component0;
1625
import com.vaadin.flow.server.frontend.scanner.ScannerTestComponents.Component1;
@@ -242,4 +251,68 @@ public void should_visitServices() {
242251
DepsTests.assertImportsExcludingUI(deps.getModules(),
243252
"dynamic-component.js", "dynamic-layout.js");
244253
}
254+
255+
@Test
256+
public void should_visitMethodAnnotations() {
257+
FrontendDependencies deps = getFrontendDependencies(
258+
MethodAnnotationRoute.class);
259+
DepsTests.assertImportsExcludingUI(deps.getModules(),
260+
"./search-layout.js", "./search-field.js");
261+
}
262+
263+
@Route
264+
public static class MethodAnnotationRoute {
265+
private MyPmo myPmo;
266+
}
267+
268+
@UISearchLayout
269+
public static class MyPmo {
270+
271+
@UISearchField()
272+
public String getText() {
273+
return "value to be displayed";
274+
}
275+
}
276+
277+
public interface ComponentDefinitionCreator<T> {
278+
279+
}
280+
281+
public @interface LinkTo {
282+
Class<?> value();
283+
}
284+
285+
@LinkTo(SearchFieldComponentDefinitionCreator.class)
286+
public @interface UISearchField {
287+
class SearchFieldComponentDefinitionCreator
288+
implements ComponentDefinitionCreator<UISearchField> {
289+
public Supplier<Component> create(UISearchField annotation,
290+
AnnotatedElement annotatedElement) {
291+
return () -> new SearchField();
292+
}
293+
}
294+
295+
@LinkTo(SearchLayoutComponentDefinitionCreator.class)
296+
public @interface UISearchLayout {
297+
class SearchLayoutComponentDefinitionCreator
298+
implements ComponentDefinitionCreator<UISearchLayout> {
299+
public Supplier<Component> create(UISearchLayout annotation,
300+
AnnotatedElement annotatedElement) {
301+
return () -> new SearchLayout();
302+
}
303+
}
304+
}
305+
306+
@JsModule("./search-layout.js")
307+
public static class SearchLayout extends Component {
308+
309+
}
310+
311+
@JsModule("./search-field.js")
312+
public static class SearchField extends Component {
313+
314+
}
315+
316+
}
317+
245318
}

0 commit comments

Comments
 (0)