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.

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

Update all cached data to 23009 version #224

Merged
merged 1 commit into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ public class LibertyXSDURIResolver implements URIResolverExtension, IExternalGra

// Changing this to contain the version in the file name since the file is copied to the local .lemminx cache.
// This is how we ensure the latest default server schema gets used in each developer environment.
private static final String XSD_RESOURCE_URL = "https://github.com/OpenLiberty/liberty-language-server/blob/master/lemminx-liberty/src/main/resources/schema/xsd/liberty/server-cached-23006.xsd";
private static final String XSD_CLASSPATH_LOCATION = "/schema/xsd/liberty/server-cached-23006.xsd";
private static final String XSD_RESOURCE_URL = "https://github.com/OpenLiberty/liberty-language-server/blob/master/lemminx-liberty/src/main/resources/schema/xsd/liberty/server-cached-23.0.0.9.xsd";
private static final String XSD_CLASSPATH_LOCATION = "/schema/xsd/liberty/server-cached-23.0.0.9.xsd";

/**
* SERVER_XSD_RESOURCE is the server schema that is located at XSD_CLASSPATH_LOCATION
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ private List<Feature> getDefaultFeatureList() {
if (defaultFeatureList == null) {
// Changing this to contain the version in the file name since the file is copied to the local .lemminx cache.
// This is how we ensure the latest default features json gets used in each developer environment.
InputStream is = getClass().getClassLoader().getResourceAsStream("features-cached-23006.json");
InputStream is = getClass().getClassLoader().getResourceAsStream("features-cached-23.0.0.9.json");
InputStreamReader reader = new InputStreamReader(is, StandardCharsets.UTF_8);

// Only need the public features
Expand Down
14,525 changes: 14,525 additions & 0 deletions lemminx-liberty/src/main/resources/featurelist-cached-23.0.0.9.xml

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void updateCachedSchema() throws Exception {
// When uploading a new server schema, put a copy of the schema file in src/test/resources and uncomment this
// test to get the updated schema without the extaneous anyAttribute elements. Then copy the updated schema
// from target/test-classes to src/main/resources/schema/xsd/liberty and remove it from src/test/resources.
File sampleXsd = new File(resourcesDir, "server-cached-23006.xsd");
File sampleXsd = new File(resourcesDir, "server-cached-23.0.0.9.xsd");
DocumentUtil.removeExtraneousAnyAttributeElements(sampleXsd);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ public void testFeatureCompletionItem() throws BadLocationException {
CompletionItem websocket = c("websocket-1.1", "websocket-1.1");
CompletionItem microProfileCompletion = c("microProfile-2.2", "microProfile-2.2");

// would be 261 if mpConfig-1.4 was not already specified
final int TOTAL_ITEMS = 260; // total number of available completion items
// would be 262 if mpConfig-1.4 was not already specified
final int TOTAL_ITEMS = 261; // total number of available completion items

XMLAssert.testCompletionFor(serverXML, null, serverXMLURI, TOTAL_ITEMS, jaxrsCompletion, websocket,
microProfileCompletion);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public void testXSDSchemaHover() throws BadLocationException, IOException {

XMLAssert.assertHover(serverXML, serverXMLURI, "Defines how the server loads features." + //
System.lineSeparator() + System.lineSeparator() + //
"Source: [server-cached-23006.xsd](" + serverXSDURI + ")", //
"Source: [server-cached-23.0.0.9.xsd](" + serverXSDURI + ")", //
r(1, 8, 1, 22));
}

Expand Down