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

Simplified handling of embedded

Browse Source
This commit is contained in:
Nieraj Singh
2022-11-12 05:10:34 -08:00
parent db472bf04e
commit 422b14a763
11 changed files with 37 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,18 +10,19 @@
*******************************************************************************/
package org.springframework.ide.vscode.boot.validation.generations;
import java.util.Map;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.ide.vscode.boot.validation.generations.json.Generations;
import org.springframework.ide.vscode.boot.validation.generations.json.GenerationsEmbedded;
import org.springframework.ide.vscode.boot.validation.generations.json.JsonHalEmbedded;
import org.springframework.ide.vscode.boot.validation.generations.json.SpringProjects;
import org.springframework.ide.vscode.boot.validation.generations.json.SpringProjectsEmbedded;
import org.springframework.web.client.RestTemplate;
import com.fasterxml.jackson.databind.ObjectMapper;
public class SpringProjectsClient {
private final String url;
@@ -31,23 +32,27 @@ public class SpringProjectsClient {
}
public SpringProjects getSpringProjects() throws Exception {
return getEmbedded(url, SpringProjectsEmbedded.class);
return fromEmbedded(url, SpringProjects.class);
}
public Generations getGenerations(String generationsUrl) throws Exception {
return getEmbedded(generationsUrl, GenerationsEmbedded.class);
return fromEmbedded(generationsUrl, Generations.class);
}
private <T> T getEmbedded(String url, Class<? extends JsonHalEmbedded<T>> clazz) throws Exception {
private <T> T fromEmbedded(String url, Class<T> clazz) throws Exception {
if (url != null) {
JsonHalEmbedded<T> embedded = get(url, clazz);
if (embedded != null) {
return embedded.get_embedded();
Map<?, ?> result = get(url, Map.class);
if (result != null) {
Object obj = result.get("_embedded");
if (obj != null) {
ObjectMapper mapper = new ObjectMapper();
return mapper.convertValue(obj, clazz);
}
}
}
return null;
}
private <T> T get(String url, Class<T> clazz) throws Exception {
HttpHeaders headers = new HttpHeaders();

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

@@ -19,8 +19,4 @@ public class Generations {
public List<Generation> getGenerations() {
return generations;
}
public void setGenerations(List<Generation> generations) {
this.generations = generations;
}
}

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

@@ -1,21 +0,0 @@
/*******************************************************************************
* Copyright (c) 2020 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
* https://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.boot.validation.generations.json;
public class GenerationsEmbedded extends JsonHalLinks implements JsonHalEmbedded<Generations> {
private Generations _embedded;
public Generations get_embedded() {
return _embedded;
}
}

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

@@ -1,16 +0,0 @@
/*******************************************************************************
* Copyright (c) 2020 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
* https://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.boot.validation.generations.json;
public interface JsonHalEmbedded<T> {
T get_embedded();
}

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

@@ -17,8 +17,4 @@ public class JsonHalLinks {
public Links get_links() {
return _links;
}
public void set_links(Links _links) {
this._links = _links;
}
}

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

@@ -1,25 +0,0 @@
/*******************************************************************************
* Copyright (c) 2020 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
* https://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.boot.validation.generations.json;
import com.google.gson.Gson;
public class JsonHalParser {
public <T> T getEmbedded(String json, Class<? extends JsonHalEmbedded<T>> clazz) throws Exception {
if (json != null) {
Gson gson = new Gson();
JsonHalEmbedded<T> embedded = gson.fromJson(json, clazz);
return embedded.get_embedded();
}
return null;
}
}

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

@@ -14,10 +14,6 @@ public class Link {
private String href;
public void setHref(String href) {
this.href = href;
}
public String getHref() {
return this.href;
}

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

@@ -18,8 +18,4 @@ public class SpringProjects {
public List<SpringProject> getProjects() {
return projects;
}
public void setProjects(List<SpringProject> projects) {
this.projects = projects;
}
}

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

@@ -1,20 +0,0 @@
/*******************************************************************************
* Copyright (c) 2020 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
* https://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.boot.validation.generations.json;
public class SpringProjectsEmbedded extends JsonHalLinks implements JsonHalEmbedded<SpringProjects> {
private SpringProjects _embedded;
public SpringProjects get_embedded() {
return _embedded;
}
}

1
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/validation/test/ProjectGenerationsValidationTest.java
View File

@@ -24,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Import;
import org.springframework.ide.vscode.boot.bootiful.BootLanguageServerTest;
import org.springframework.ide.vscode.boot.bootiful.HoverTestConf;
import org.springframework.ide.vscode.boot.validation.generations.SampleProjectsProvider;
import org.springframework.ide.vscode.boot.validation.generations.SpringIoProjectsProvider;
import org.springframework.ide.vscode.boot.validation.generations.SpringProjectsClient;
import org.springframework.ide.vscode.boot.validation.generations.SpringProjectsProvider;

29
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/validation/generations/SampleProjectsProvider.java → headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/validation/test/SampleProjectsProvider.java
View File

@@ -8,16 +8,18 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.boot.validation.generations;
package org.springframework.ide.vscode.boot.validation.test;
import java.util.List;
import java.util.Map;
import org.springframework.ide.vscode.boot.validation.generations.SpringProjectsProvider;
import org.springframework.ide.vscode.boot.validation.generations.json.Generations;
import org.springframework.ide.vscode.boot.validation.generations.json.GenerationsEmbedded;
import org.springframework.ide.vscode.boot.validation.generations.json.JsonHalParser;
import org.springframework.ide.vscode.boot.validation.generations.json.SpringProject;
import org.springframework.ide.vscode.boot.validation.generations.json.SpringProjects;
import org.springframework.ide.vscode.boot.validation.generations.json.SpringProjectsEmbedded;
import com.fasterxml.jackson.databind.ObjectMapper;
/**
@@ -32,8 +34,7 @@ public class SampleProjectsProvider implements SpringProjectsProvider {
@Override
public SpringProject getProject(String projectSlug) throws Exception {
if (this.projects == null) {
JsonHalParser parser = new JsonHalParser();
this.projects = parser.getEmbedded(SPRING_PROJECTS_JSON_SAMPLE, SpringProjectsEmbedded.class);
this.projects = parse(SPRING_PROJECTS_JSON_SAMPLE, SpringProjects.class);
}
List<SpringProject> projectList = this.projects.getProjects();
for (SpringProject springProject : projectList) {
@@ -48,8 +49,20 @@ public class SampleProjectsProvider implements SpringProjectsProvider {
public Generations getGenerations(String projectSlug) throws Exception {
SpringProject project = getProject(projectSlug);
if (project != null && project.getSlug().equals("spring-boot")) {
JsonHalParser parser = new JsonHalParser();
return parser.getEmbedded(SPRING_BOOT_PROJECT_GENERATIONS, GenerationsEmbedded.class);
return parse(SPRING_BOOT_PROJECT_GENERATIONS, Generations.class);
}
return null;
}
private <T> T parse(String json, Class<T> clazz) throws Exception {
ObjectMapper mapper = new ObjectMapper();
Map<?, ?> result = mapper.readValue(json, Map.class);
if (result != null) {
Object obj = result.get("_embedded");
if (obj != null) {
return mapper.convertValue(obj, clazz);
}
}
return null;
}