Keep fixing tests

vaadin · Aug 6, 2024 · d7e3b47 · d7e3b47
1 parent 0fc673c
commit d7e3b47
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/...lugin-backbone/src/main/java/com/vaadin/hilla/parser/plugins/backbone/EndpointPlugin.java b/...lugin-backbone/src/main/java/com/vaadin/hilla/parser/plugins/backbone/EndpointPlugin.java
@@ -80,8 +80,8 @@ private String getEndpointName(ClassInfoModel endpointCls) {
         var endpointAnnotations = getStorage().getParserConfig()
                 .getEndpointAnnotations();
         var endpointAnnotation = endpointCls.getAnnotations().stream()
-                .filter(annotation -> endpointAnnotations
-                        .contains(((Annotation) annotation.get()).getClass()))
+                .filter(annotation -> endpointAnnotations.contains(
+                        ((Annotation) annotation.get()).annotationType()))
                 .findFirst();
         return endpointAnnotation.flatMap(this::getEndpointAnnotationValue)
                 .filter(name -> !name.isEmpty())

diff --git a/...one/src/test/java/com/vaadin/hilla/parser/plugins/backbone/customname/CustomNameTest.java b/...one/src/test/java/com/vaadin/hilla/parser/plugins/backbone/customname/CustomNameTest.java
@@ -23,8 +23,8 @@ public void should_UseCustomEndpointNames_WhenGivenInAnnotation()
                 .endpointAnnotations(List.of(Endpoint.class))
                 .endpointExposedAnnotations(List.of(EndpointExposed.class))
                 .addPlugin(new BackbonePlugin())
-                .execute(List.of(CustomNameEndpoint.class,
-                        CustomExplicitValueEndpoint.class));
+                .execute(List.of(CustomExplicitValueEndpoint.class,
+                        CustomNameEndpoint.class));
 
         helper.executeParserWithConfig(openAPI);
     }

diff --git a/...es/src/test/java/com/vaadin/hilla/parser/plugins/transfertypes/jsonnode/JsonNodeTest.java b/...es/src/test/java/com/vaadin/hilla/parser/plugins/transfertypes/jsonnode/JsonNodeTest.java
@@ -1,5 +1,6 @@
 package com.vaadin.hilla.parser.plugins.transfertypes.jsonnode;
 
+import com.vaadin.hilla.EndpointExposed;
 import com.vaadin.hilla.parser.core.Parser;
 import com.vaadin.hilla.parser.plugins.backbone.BackbonePlugin;
 import com.vaadin.hilla.parser.plugins.transfertypes.TransferTypesPlugin;
@@ -20,6 +21,7 @@ public void should_ReplaceJsonNodeClassWithObject()
         var openAPI = new Parser().classLoader(getClass().getClassLoader())
                 .classPath(Set.of(helper.getTargetDir().toString()))
                 .endpointAnnotations(List.of(Endpoint.class))
+                .endpointExposedAnnotations(List.of(EndpointExposed.class))
                 .addPlugin(new BackbonePlugin())
                 .addPlugin(new TransferTypesPlugin())
                 .execute(List.of(JsonNodeEndpoint.class));

diff --git a/...rtypes/src/test/java/com/vaadin/hilla/parser/plugins/transfertypes/push/PushTypeTest.java b/...rtypes/src/test/java/com/vaadin/hilla/parser/plugins/transfertypes/push/PushTypeTest.java
@@ -29,7 +29,7 @@ public void should_ReplacePushTypes()
                 .endpointExposedAnnotations(List.of(EndpointExposed.class))
                 .addPlugin(new BackbonePlugin())
                 .addPlugin(new TransferTypesPlugin())
-                .execute(List.of(PushTypeEndpoint.class));
+                .execute(List.of(OtherEndpoint.class, PushTypeEndpoint.class));
 
         helper.executeParserWithConfig(openAPI);
     }