Boot Properties defined in Java Records

Author: BoykoAlex

Diff for: headless-services/commons/commons-java/pom.xml

@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>org.jboss</groupId>
 			<artifactId>jandex</artifactId>
-			<version>2.0.5.Final</version>
+			<version>3.0.5</version>
 		</dependency>
 		<!-- HTML <-> Markdown conversion -->
 		<dependency>

Diff for: headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/BindingKeyUtils.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 Pivotal, Inc.
+ * Copyright (c) 2018, 2023 Pivotal, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,13 +18,15 @@
 import org.jboss.jandex.ClassType;
 import org.jboss.jandex.FieldInfo;
 import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.MethodParameterInfo;
 import org.jboss.jandex.ParameterizedType;
 import org.jboss.jandex.PrimitiveType;
 import org.jboss.jandex.Type;
 import org.jboss.jandex.TypeVariable;
 import org.jboss.jandex.UnresolvedTypeVariable;
 import org.jboss.jandex.VoidType;
 import org.jboss.jandex.WildcardType;
+import org.springframework.ide.vscode.commons.java.Flags;
 
 class BindingKeyUtils {
 
@@ -43,10 +45,15 @@ public static String getBindingKey(AnnotationInstance annotation) {
 	public static String getBindingKey(FieldInfo field) {
 		StringBuilder sb = new StringBuilder();
 		sb.append(getBindingKey(field.declaringClass()));
-		sb.append('.');
-		sb.append(field.name());
-		sb.append(')');
-		sb.append(getGeneralTypeBindingKey(field.type()));
+		if (field.declaringClass().isRecord() && !Flags.isStatic(field.flags())) {
+			sb.append('#');
+			sb.append(field.name());
+		} else {
+			sb.append('.');
+			sb.append(field.name());
+			sb.append(')');
+			sb.append(getGeneralTypeBindingKey(field.type()));
+		}
 		return sb.toString();
 	}
 
@@ -56,8 +63,8 @@ public static String getBindingKey(MethodInfo method) {
 		sb.append('.');
 		sb.append(method.name());
 		sb.append('(');
-		for (Type parameter : method.parameters()) {
-			sb.append(getGeneralTypeBindingKey(parameter));
+		for (MethodParameterInfo parameter : method.parameters()) {
+			sb.append(getGeneralTypeBindingKey(parameter.type()));
 		}
 		sb.append(')');
 		sb.append(getGeneralTypeBindingKey(method.returnType()));

Diff for: headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/MethodImpl.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016-2018 Pivotal, Inc.
+ * Copyright (c) 2016, 2023 Pivotal, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -89,7 +89,7 @@ public String toString() {
 
 	@Override
 	public Stream<IJavaType> parameters() {
-		return method.parameters().stream().map(Wrappers::wrap);
+		return method.parameters().stream().map(p -> Wrappers.wrap(p.type()));
 	}
 
 	@Override

Diff for: headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/TypeImpl.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016, 2018 Pivotal, Inc.
+ * Copyright (c) 2016, 2023 Pivotal, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -73,8 +73,7 @@ public boolean exists() {
 
 	@Override
 	public Stream<IAnnotation> getAnnotations() {
-		// TODO: check correctness!
-		List<AnnotationInstance> annotations = info.annotations().get(info.name());
+		List<AnnotationInstance> annotations = info.annotations();
 		return annotations == null ? Stream.empty() : annotations.stream().map(a -> Wrappers.wrap(a, javadocProvider));
 	}
 
@@ -97,6 +96,10 @@ public boolean isInterface() {
 	public boolean isAnnotation() {
 		return Flags.isAnnotation(info.flags());
 	}
+	
+	public boolean isRecord() {
+		return info.isRecord();
+	}
 
 	@Override
 	public String getFullyQualifiedName() {
@@ -111,9 +114,15 @@ public IField getField(String name) {
 
 	@Override
 	public Stream<IField> getFields() {
-		return info.fields().stream().map(f -> {
-			return Wrappers.wrap(this, f, javadocProvider);
-		});
+		if (info.isRecord()) {
+			return info.recordComponents().stream().map(rc -> {
+				return Wrappers.wrap(this, rc.field(), javadocProvider);
+			});
+		} else {
+			return info.fields().stream().map(f -> {
+				return Wrappers.wrap(this, f, javadocProvider);
+			});
+		}
 	}
 
 	@Override

Diff for: headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IType.java

@@ -24,6 +24,7 @@ public interface IType extends IMember {
 	boolean isEnum();
 	boolean isInterface();
 	boolean isAnnotation();
+	boolean isRecord();
 
 	/**
 	 * Returns the fully qualified name of this type,

Diff for: headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jdtls/Wrappers.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019, 2021 Pivotal, Inc.
+ * Copyright (c) 2019, 2023 Pivotal, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -524,6 +524,11 @@ public String[] getSuperInterfaceNames() {
 				return data.getSuperInterfaceNames();
 			}
 
+			@Override
+			public boolean isRecord() {
+				return data.isRecord();
+			}
+
 		};
 	}
 
@@ -630,6 +635,11 @@ public String[] getSuperInterfaceNames() {
 				return descriptor.getSuperInterfaceNames();
 			}
 
+			@Override
+			public boolean isRecord() {
+				return descriptor.isRecord();
+			}
+
 		};
 	}
 

Diff for: headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/java/TypeDescriptorData.java

@@ -11,6 +11,7 @@
 package org.springframework.ide.vscode.commons.protocol.java;
 
 import java.util.Arrays;
+import java.util.Objects;
 
 public class TypeDescriptorData extends MemberData {
 
@@ -19,6 +20,7 @@ public class TypeDescriptorData extends MemberData {
 	private boolean annotation;
 	private boolean interfaze;
 	private boolean enam;
+	private boolean record;
 	private String superClassName;
 	private String[] superInterfaceNames;
 
@@ -78,17 +80,20 @@ public void setSuperInterfaceNames(String[] superInterfaceNames) {
 		this.superInterfaceNames = superInterfaceNames;
 	}
 
+	public boolean isRecord() {
+		return record;
+	}
+
+	public void setRecord(boolean record) {
+		this.record = record;
+	}
+
 	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = super.hashCode();
-		result = prime * result + (annotation ? 1231 : 1237);
-		result = prime * result + (clazz ? 1231 : 1237);
-		result = prime * result + (enam ? 1231 : 1237);
-		result = prime * result + ((fqName == null) ? 0 : fqName.hashCode());
-		result = prime * result + (interfaze ? 1231 : 1237);
-		result = prime * result + ((superClassName == null) ? 0 : superClassName.hashCode());
 		result = prime * result + Arrays.hashCode(superInterfaceNames);
+		result = prime * result + Objects.hash(annotation, clazz, enam, fqName, interfaze, record, superClassName);
 		return result;
 	}
 
@@ -101,27 +106,10 @@ public boolean equals(Object obj) {
 		if (getClass() != obj.getClass())
 			return false;
 		TypeDescriptorData other = (TypeDescriptorData) obj;
-		if (annotation != other.annotation)
-			return false;
-		if (clazz != other.clazz)
-			return false;
-		if (enam != other.enam)
-			return false;
-		if (fqName == null) {
-			if (other.fqName != null)
-				return false;
-		} else if (!fqName.equals(other.fqName))
-			return false;
-		if (interfaze != other.interfaze)
-			return false;
-		if (superClassName == null) {
-			if (other.superClassName != null)
-				return false;
-		} else if (!superClassName.equals(other.superClassName))
-			return false;
-		if (!Arrays.equals(superInterfaceNames, other.superInterfaceNames))
-			return false;
-		return true;
+		return annotation == other.annotation && clazz == other.clazz && enam == other.enam
+				&& Objects.equals(fqName, other.fqName) && interfaze == other.interfaze && record == other.record
+				&& Objects.equals(superClassName, other.superClassName)
+				&& Arrays.equals(superInterfaceNames, other.superInterfaceNames);
 	}
 
 }

Diff for: headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/META-INF/MANIFEST.MF

@@ -12,5 +12,6 @@ Require-Bundle: org.springframework.tooling.jdt.ls.commons,
  org.apache.commons.lang3,
  org.junit,
  org.apache.commons.io,
- com.google.guava;bundle-version="21.0.0"
+ com.google.guava;bundle-version="21.0.0",
+ org.eclipse.jdt.ui