Skip to content

Commit 6151dbd

Browse files
authored
chore: amend JDT-reported errors (#3348)
* Fix what JDT considers errors * Restore test functionality * Restore optionals in JsonValuePlugin
1 parent 08d0630 commit 6151dbd

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

packages/java/engine-core/src/test/java/com/vaadin/hilla/engine/commandrunner/CommandRunnerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public ProcessHandle.Info getCurrentProcessInfo() {
195195
return new MockProcessInfo();
196196
}
197197

198-
private class MockProcessInfo implements ProcessHandle.Info {
198+
class MockProcessInfo implements ProcessHandle.Info {
199199

200200
@Override
201201
public Optional<String> command() {

packages/java/parser-jvm-core/src/test/java/com/vaadin/hilla/parser/models/ClassRefSignatureModelTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ static class Sample {
629629
private @Foo List<String> topLevelParametrizedDependency;
630630

631631
@Retention(RetentionPolicy.RUNTIME)
632-
@Target(ElementType.TYPE_USE)
632+
@Target({ ElementType.TYPE_USE, ElementType.FIELD })
633633
@interface Bar {
634634
}
635635

packages/java/parser-jvm-plugin-backbone/src/main/java/com/vaadin/hilla/parser/plugins/backbone/JsonValuePlugin.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import com.vaadin.hilla.parser.plugins.backbone.nodes.TypedNode;
1111
import org.jspecify.annotations.NonNull;
1212

13-
import java.lang.reflect.Method;
14-
import java.util.Arrays;
1513
import java.util.HashMap;
1614
import java.util.Map;
1715
import java.util.Optional;
@@ -64,8 +62,12 @@ private Optional<Class<?>> getValueType(Class<?> cls) {
6462
}
6563

6664
private Optional<Class<?>> findValueType(Class<?> cls) {
67-
return Arrays.stream(cls.getMethods())
68-
.filter(method -> method.isAnnotationPresent(JsonValue.class))
69-
.map(Method::getReturnType).findAny();
65+
for (var method : cls.getMethods()) {
66+
if (method.isAnnotationPresent(JsonValue.class)) {
67+
return Optional.of(method.getReturnType());
68+
}
69+
}
70+
71+
return Optional.empty();
7072
}
7173
}

packages/java/parser-jvm-utils/src/test/java/com/vaadin/hilla/parser/utils/annotatedowner/AnnotatedOwnerUtilsTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void should_NotGetAnnotationsForGrandOwner(AnnotatedType type,
5656
}
5757

5858
@Retention(RetentionPolicy.RUNTIME)
59-
@Target(ElementType.TYPE_USE)
59+
@Target({ ElementType.TYPE_USE, ElementType.FIELD })
6060
@interface Bar {
6161
}
6262

packages/java/tests/spring/security/src/main/java/com/vaadin/flow/spring/fusionsecurity/data/AccountRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.springframework.data.jpa.repository.JpaRepository;
66
import org.springframework.data.jpa.repository.Query;
77

8-
public interface AccountRepository extends JpaRepository<Account, String> {
8+
public interface AccountRepository extends JpaRepository<Account, Integer> {
99

1010
@Query("Select a from Account a where a.owner.username = ?1")
1111
Optional<Account> findByOwner(String username);

packages/java/tests/spring/security/src/main/java/com/vaadin/flow/spring/fusionsecurity/data/UserInfoRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.springframework.data.jpa.repository.JpaRepository;
44

5-
public interface UserInfoRepository extends JpaRepository<UserInfo, String> {
5+
public interface UserInfoRepository extends JpaRepository<UserInfo, Integer> {
66

77
public UserInfo findByUsername(String username);
88
}

0 commit comments

Comments
 (0)