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

Remove unnecessary spring projects wrapper

Browse Source
This commit is contained in:
Nieraj Singh
2022-11-12 03:01:26 -08:00
parent 35f0dd2fd7
commit 1a262f2a3f
2 changed files with 27 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/validation/generations/SpringIoProjectsProvider.java
View File

@@ -14,8 +14,6 @@ import java.util.List;
import java.util.Map;
import org.springframework.ide.vscode.boot.validation.generations.json.Generations;
import org.springframework.ide.vscode.boot.validation.generations.json.Link;
import org.springframework.ide.vscode.boot.validation.generations.json.Links;
import org.springframework.ide.vscode.boot.validation.generations.json.SpringProject;
import org.springframework.ide.vscode.boot.validation.generations.json.SpringProjects;
@@ -32,7 +30,7 @@ import com.google.common.collect.ImmutableMap.Builder;
public class SpringIoProjectsProvider implements SpringProjectsProvider {
private final SpringProjectsClient client;
private Map<String, SpringIoProject> cache;
private Map<String, SpringProject> cache;
public SpringIoProjectsProvider(SpringProjectsClient client) {
this.client = client;
@@ -50,20 +48,20 @@ public class SpringIoProjectsProvider implements SpringProjectsProvider {
*/
@Override
public SpringProject getProject(String projectSlug) throws Exception {
SpringIoProject prj = cache().get(projectSlug);
return prj != null ? prj.getProject() : null;
SpringProject prj = cache().get(projectSlug);
return prj;
}
@Override
public Generations getGenerations(String projectSlug) throws Exception {
SpringIoProject project = cache().get(projectSlug);
SpringProject project = cache().get(projectSlug);
if (project != null) {
return project.getGenerations();
return project.getGenerations(client);
}
return null;
}
private Map<String, SpringIoProject> cache() throws Exception {
private Map<String, SpringProject> cache() throws Exception {
if (cache == null) {
SpringProjects springProjects = client.getSpringProjects();
cache = asMap(springProjects);
@@ -71,14 +69,14 @@ public class SpringIoProjectsProvider implements SpringProjectsProvider {
return cache != null ? cache : ImmutableMap.of();
}
private Map<String, SpringIoProject> asMap(SpringProjects springProjects) {
Builder<String, SpringIoProject> builder = ImmutableMap.builder();
private Map<String, SpringProject> asMap(SpringProjects springProjects) {
Builder<String, SpringProject> builder = ImmutableMap.builder();
if (springProjects != null) {
List<SpringProject> projects = springProjects.getProjects();
if (projects != null) {
for (SpringProject project : projects) {
builder.put(project.getSlug(), new SpringIoProject(project, this.client));
builder.put(project.getSlug(), project);
}
}
}
@@ -90,38 +88,4 @@ public class SpringIoProjectsProvider implements SpringProjectsProvider {
return new SpringProjectsClient(url);
}
/**
* Wrapper around the JSON SpringProject that also contains its generations
*
*/
private final static class SpringIoProject {
private final SpringProject project;
private final SpringProjectsClient client;
private Generations generations;
public SpringIoProject(SpringProject project, SpringProjectsClient client) {
this.project = project;
this.client = client;
}
public SpringProject getProject() {
return this.project;
}
public Generations getGenerations() throws Exception {
// cache the generations to prevent frequent calls to the client
if (this.generations == null) {
Links _links = project.get_links();
if (_links != null) {
Link genLink = _links.getGenerations();
if (genLink != null) {
this.generations = client.getGenerations(genLink.getHref());
}
}
}
return this.generations;
}
}
}

32
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/validation/generations/json/SpringProject.java
View File

@@ -10,7 +10,12 @@
*******************************************************************************/
package org.springframework.ide.vscode.boot.validation.generations.json;
import org.springframework.ide.vscode.boot.validation.generations.SpringProjectsClient;
public class SpringProject extends JsonHalLinks {
private Generations generations;
private String name;
private String slug;
@@ -21,31 +26,30 @@ public class SpringProject extends JsonHalLinks {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getSlug() {
return slug;
}
public void setSlug(String slug) {
this.slug = slug;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getRepositoryUrl() {
return repositoryUrl;
}
public void setRepositoryUrl(String repositoryUrl) {
this.repositoryUrl = repositoryUrl;
public Generations getGenerations(SpringProjectsClient client) throws Exception {
// cache the generations to prevent frequent calls to the client
if (this.generations == null) {
Links _links = get_links();
if (_links != null) {
Link genLink = _links.getGenerations();
if (genLink != null) {
this.generations = client.getGenerations(genLink.getHref());
}
}
}
return this.generations;
}
}