Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cache looked up libs. Simplify SpringProjectUtil.

Browse Source
This commit is contained in:
aboyko
2023-10-04 15:31:01 -04:00
parent 63cf7c51f8
commit 9a109852c0
6 changed files with 71 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/ClasspathData.java
View File

@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018, 2019 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
@@ -12,12 +12,16 @@ package org.springframework.ide.vscode.commons.java;
import java.util.Collection;
import java.util.Collections;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ide.vscode.commons.protocol.java.Classpath.CPE;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.google.common.collect.ImmutableSet;
public class ClasspathData implements IClasspath {
@@ -31,12 +35,15 @@ public class ClasspathData implements IClasspath {
private String name;
private Set<CPE> classpathEntries;
private Cache<String, Optional<CPE>> binaryLibLookupCache;
public ClasspathData() {}
public ClasspathData(String name, Collection<CPE> classpathEntries) {
this.name = name;
this.classpathEntries = ImmutableSet.copyOf(classpathEntries);
this.binaryLibLookupCache = CacheBuilder.newBuilder().build();
}
@@ -71,6 +78,16 @@ public class ClasspathData implements IClasspath {
this.classpathEntries = classpathEntries;
}
@Override
public Optional<CPE> findBinaryLibrary(String prefix) {
try {
return binaryLibLookupCache.get(prefix, () -> IClasspath.super.findBinaryLibrary(prefix));
} catch (ExecutionException e) {
log.error("", e);
return Optional.empty();
}
}
public static ClasspathData getEmptyClasspathData() {
return EMPTY_CLASSPATH_DATA;
}

24
headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IClasspath.java
View File

@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2016, 2019 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
@@ -10,10 +10,13 @@
*******************************************************************************/
package org.springframework.ide.vscode.commons.java;
import java.io.File;
import java.util.Collection;
import java.util.Optional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ide.vscode.commons.protocol.java.Classpath;
import org.springframework.ide.vscode.commons.protocol.java.Classpath.CPE;
/**
@@ -36,4 +39,23 @@ public interface IClasspath {
* @throws Exception
*/
Collection<CPE> getClasspathEntries() throws Exception;
/**
* Finds a classpath entry among JAR libraries that start with a prefix. Prefix must typically contain the full lib name such that the match is only one.
* @param prefix the library prefix
* @return the classpath entry
*/
default Optional<CPE> findBinaryLibrary(String prefix) {
try {
for (CPE cpe : getClasspathEntries()) {
if (Classpath.isBinary(cpe) && !cpe.isSystem() && !cpe.isTest() && new File(cpe.getPath()).getName().startsWith(prefix)) {
return Optional.of(cpe);
}
}
} catch (Exception e) {
log.error("", e);
}
return Optional.empty();
}
}

105
headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/SpringProjectUtil.java
View File

@@ -11,11 +11,10 @@
package org.springframework.ide.vscode.commons.java;
import java.io.File;
import java.util.List;
import java.util.Optional;
import java.util.function.Predicate;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,15 +33,15 @@ public class SpringProjectUtil {
private static final Pattern GENERATION_VERSION = Pattern.compile(GENERATION_VERSION_STR);
public static boolean isSpringProject(IJavaProject jp) {
return hasSpecificLibraryOnClasspath(jp, "spring-core", true);
return jp.getClasspath().findBinaryLibrary("spring-core").isPresent();
}
public static boolean isBootProject(IJavaProject jp) {
return hasSpecificLibraryOnClasspath(jp, SPRING_BOOT, true);
return jp.getClasspath().findBinaryLibrary(SPRING_BOOT).isPresent();
}
public static boolean hasBootActuators(IJavaProject jp) {
return hasSpecificLibraryOnClasspath(jp, "spring-boot-actuator-", true);
return jp.getClasspath().findBinaryLibrary("spring-boot-actuator-").isPresent();
}
/**
@@ -80,94 +79,44 @@ public class SpringProjectUtil {
throw new IllegalArgumentException("Invalid semver. Unable to parse major and minor version from: " + name);
}
public static List<File> getLibrariesOnClasspath(IJavaProject jp, String libraryNamePrefix) {
try {
IClasspath cp = jp.getClasspath();
if (cp!=null) {
boolean onlyLibs = true;
List<File> libs = IClasspathUtil.getBinaryRoots(cp, (cpe) -> !cpe.isSystem()).stream().filter(cpe -> isEntry(cpe, libraryNamePrefix, onlyLibs)).collect(Collectors.toList());
return libs;
}
} catch (Exception e) {
log.error("Failed to get list of libraries for project '" + jp.getElementName() + "' that start with prefix: " + libraryNamePrefix, e);
}
return null;
}
public static boolean hasSpecificLibraryOnClasspath(IJavaProject jp, String libraryNamePrefix, boolean onlyLibs) {
try {
IClasspath cp = jp.getClasspath();
if (cp!=null) {
return IClasspathUtil.getBinaryRoots(cp, (cpe) -> !cpe.isSystem()).stream().anyMatch(cpe -> isEntry(cpe, libraryNamePrefix, onlyLibs));
}
} catch (Exception e) {
log.error("Failed to determine whether '" + jp.getElementName() + "' is Spring Boot project", e);
}
return false;
}
private static boolean isEntry(File cpe, String libNamePrefix, boolean onlyLibs) {
String name = cpe.getName();
return name.startsWith(libNamePrefix) && (!onlyLibs || name.endsWith(".jar"));
}
public static Version getDependencyVersion(IJavaProject jp, String dependency) {
try {
for (CPE cpe : jp.getClasspath().getClasspathEntries()) {
if (Classpath.isBinary(cpe) && !cpe.isSystem() && new File(cpe.getPath()).getName().startsWith(dependency)) {
return cpe.getVersion();
}
}
} catch (Exception e) {
log.error("", e);
}
return null;
return jp.getClasspath().findBinaryLibrary(dependency).map(cpe -> cpe.getVersion()).orElse(null);
}
public static boolean hasDependencyStartingWith(IJavaProject jp, String dependency, Predicate<CPE> filter) {
try {
for (CPE cpe : jp.getClasspath().getClasspathEntries()) {
if (filter == null || filter.test(cpe)) {
if (Classpath.ENTRY_KIND_BINARY.equals(cpe.getKind())) {
String name = new File(cpe.getPath()).getName();
if (name.endsWith(".jar") && name.startsWith(dependency)) {
return true;
}
} else if (Classpath.ENTRY_KIND_SOURCE.equals(cpe.getKind()) && !cpe.isOwn()) {
if (cpe.getExtra() != null && cpe.getExtra().containsKey("project")) {
if (new File(cpe.getExtra().get("project")).getName().startsWith(dependency)) {
return true;
}
} else {
if (new File(cpe.getPath()).getName().startsWith(dependency)) {
return true;
IClasspath classpath = jp.getClasspath();
return classpath.findBinaryLibrary(dependency).or(() -> {
try {
for (CPE cpe : classpath.getClasspathEntries()) {
if (filter == null || filter.test(cpe)) {
if (Classpath.ENTRY_KIND_SOURCE.equals(cpe.getKind()) && !cpe.isOwn()) {
if (cpe.getExtra() != null && cpe.getExtra().containsKey("project")) {
if (new File(cpe.getExtra().get("project")).getName().startsWith(dependency)) {
return Optional.of(cpe);
}
} else {
if (new File(cpe.getPath()).getName().startsWith(dependency)) {
return Optional.of(cpe);
}
}
}
}
}
} catch (Exception e) {
log.error("", e);
}
} catch (Exception e) {
log.error("", e);
}
return false;
return Optional.empty();
}).isEmpty();
}
public static Version getSpringBootVersion(IJavaProject jp) {
try {
for (CPE cpe : jp.getClasspath().getClasspathEntries()) {
if (Classpath.isBinary(cpe) && !cpe.isSystem() && new File(cpe.getPath()).getName().startsWith(SPRING_BOOT)) {
return cpe.getVersion();
}
}
} catch (Exception e) {
log.error("", e);
}
return null;
public static Version getSpringBootVersion(IJavaProject jp) {
return getDependencyVersion(jp, SPRING_BOOT);
}
public static Predicate<IJavaProject> springBootVersionGreaterOrEqual(int major, int minor, int patch) {
return project -> {
Version version = getDependencyVersion(project, SPRING_BOOT);
Version version = project.getClasspath().findBinaryLibrary(SPRING_BOOT).map(cpe -> cpe.getVersion()).orElse(null);
if (version == null) {
return false;
}