diff --git a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/PropertiesManager.java b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/PropertiesManager.java
index 096562861..d22952ef4 100644
--- a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/PropertiesManager.java
+++ b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/PropertiesManager.java
@@ -109,7 +109,9 @@ public MicroProfileProjectInfo getMicroProfileProjectInfo(Module module,
             if (query != null) {
                 try {
                     beginSearch(context, monitor);
-                    query.forEach((Consumer<? super PsiModifierListOwner>) psiMember -> collectProperties(psiMember, context, monitor));
+                    for (PsiModifierListOwner psiMember : query.findAll()) {
+                        collectProperties(psiMember, context, monitor);
+                    }
                 }
                 finally {
                     endSearch(context, monitor);
diff --git a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/jaxrs/JaxRsContext.java b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/jaxrs/JaxRsContext.java
index 672e375b6..9c83906c7 100644
--- a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/jaxrs/JaxRsContext.java
+++ b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/jaxrs/JaxRsContext.java
@@ -157,7 +157,9 @@ private static String findApplicationPath(PsiClass annotationType, Module javaPr
 
 		Query<PsiClass> pattern = AnnotatedElementsSearch.searchElements(annotationType, javaProject.getModuleWithDependenciesScope(),
 				PsiClass.class);
-		pattern.forEach((Consumer<? super PsiClass>) match -> collectApplicationPath(match, applicationPathRef));
+		for (PsiClass match : pattern.findAll()) {
+			collectApplicationPath(match, applicationPathRef);
+		}
 		return applicationPathRef.get();
 	}
 
diff --git a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/DefaultJaxRsInfoProvider.java b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/DefaultJaxRsInfoProvider.java
index 981fcfb5b..10555e226 100644
--- a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/DefaultJaxRsInfoProvider.java
+++ b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/DefaultJaxRsInfoProvider.java
@@ -81,14 +81,14 @@ public Set<PsiClass> getAllJaxRsClasses(Module javaProject, IPsiUtils utils, Pro
 			}
 
 			Set<PsiClass> jaxRsClasses = new HashSet<>();
-			query.forEach((Consumer<? super PsiModifierListOwner>) item -> {
+			for (PsiModifierListOwner item : query.findAll()) {
 				if (item instanceof PsiMember) {
 					PsiClass cl = ((PsiMember) item).getContainingClass();
 					if (cl != null) {
 						jaxRsClasses.add(cl);
 					}
 				}
-			});
+			}
 			if (monitor.isCanceled()) {
 				return Collections.emptySet();
 			}
diff --git a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/restclient/java/MicroProfileRestClientDiagnosticsParticipant.java b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/restclient/java/MicroProfileRestClientDiagnosticsParticipant.java
index 018487e81..5939aa347 100644
--- a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/restclient/java/MicroProfileRestClientDiagnosticsParticipant.java
+++ b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/restclient/java/MicroProfileRestClientDiagnosticsParticipant.java
@@ -204,7 +204,7 @@ private static void validateInterfaceType(PsiClass interfaceType, List<Diagnosti
 
 		final AtomicInteger nbReferences = new AtomicInteger(0);
 		Query<PsiReference> query = ReferencesSearch.search(interfaceType, createSearchScope(context.getJavaProject()));
-		query.forEach(match -> {
+		for (PsiReference match : query.findAll()) {
 			PsiField field = PsiTreeUtil.getParentOfType(match.getElement(), PsiField.class);
 			if (field != null) {
 				boolean hasInjectAnnotation = AnnotationUtils.hasAnyAnnotation(field, INJECT_JAVAX_ANNOTATION, INJECT_JAKARTA_ANNOTATION);
@@ -213,7 +213,7 @@ private static void validateInterfaceType(PsiClass interfaceType, List<Diagnosti
 					nbReferences.incrementAndGet();
 				}
 			}
-		});
+		}
 
 		if (nbReferences.get() > 0) {
 			String uri = context.getUri();