Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce code duplication in JDTUtils.getFieldAccessors() #1076

Merged
merged 2 commits into from
Nov 7, 2024
Merged

Reduce code duplication in JDTUtils.getFieldAccessors() #1076

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abeca4e
Use a collector to build the list of accessor names. Move string lite…
mrglavas Nov 5, 2024
efc840f
Updating the copyright.
mrglavas Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/main/java/io/openliberty/tools/intellij/lsp4jakarta/lsp4ij/JDTUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Red Hat, Inc.
* Copyright (c) 2016, 2024 Red Hat, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
Expand Down Expand Up @@ -28,11 +28,15 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

public class JDTUtils {
// Percent encoding obtained from: https://en.wikipedia.org/wiki/Percent-encoding#Reserved_characters
private static final String LEVEL1_URI_REGEX = "(?:\\/(?:(?:\\{(\\w|-|%20|%21|%23|%24|%25|%26|%27|%28|%29|%2A|%2B|%2C|%2F|%3A|%3B|%3D|%3F|%40|%5B|%5D)+\\})|(?:(\\w|%20|%21|%23|%24|%25|%26|%27|%28|%29|%2A|%2B|%2C|%2F|%3A|%3B|%3D|%3F|%40|%5B|%5D)+)))*\\/?";

// Unmodifiable list of accessor prefixes
private static final List<String> ACCESSOR_PREFIXES = List.of("get", "set", "is");

/**
* Check if a URI starts with a leading slash.
*
Expand Down Expand Up @@ -66,11 +70,8 @@ public static boolean isValidLevel1URI(String uriString) {
public static List<PsiMethod> getFieldAccessors(PsiJavaFile unit, PsiField field) {
List<PsiMethod> accessors = new ArrayList<PsiMethod>();
String fieldName = field.getName();
fieldName = fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1);
List<String> accessorNames = new ArrayList<String>();
accessorNames.add("get" + fieldName);
accessorNames.add("set" + fieldName);
accessorNames.add("is" + fieldName);
String accessorSuffix = fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1);
List<String> accessorNames = ACCESSOR_PREFIXES.stream().map(s -> s + accessorSuffix).collect(Collectors.toList());

for (PsiClass type : unit.getClasses()) {
for (PsiMethod method : type.getMethods()) {
Expand Down
Loading