Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FIXED JENKINS-39394] Renamed "postBuild" to "post".
Also moved ast-schema.json to pipeline-model-api, where it should be.
- Loading branch information
Showing
33 changed files
with
220 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79 changes: 79 additions & 0 deletions
79
...ine-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ASTSchema.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * The MIT License | ||
| * | ||
| * Copyright (c) 2016, CloudBees, Inc. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| package org.jenkinsci.plugins.pipeline.modeldefinition; | ||
|
|
||
| import com.github.fge.jsonschema.exceptions.ProcessingException; | ||
| import com.github.fge.jsonschema.main.JsonSchema; | ||
| import com.github.fge.jsonschema.main.JsonSchemaFactory; | ||
| import hudson.Extension; | ||
| import hudson.model.RootAction; | ||
| import hudson.util.TimeUnit2; | ||
| import org.kohsuke.stapler.StaplerRequest; | ||
| import org.kohsuke.stapler.StaplerResponse; | ||
|
|
||
| import javax.servlet.ServletException; | ||
| import java.io.IOException; | ||
|
|
||
| /** | ||
| * Endpoint for exposing the AST JSON schema. | ||
| * | ||
| * @author Andrew Bayer | ||
| */ | ||
| @Extension | ||
| public class ASTSchema implements RootAction { | ||
| public static final String AST_SCHEMA_URL = "pipeline-model-schema"; | ||
|
|
||
| @Override | ||
| public String getUrlName() { | ||
| return AST_SCHEMA_URL; | ||
| } | ||
|
|
||
| @Override | ||
| public String getIconFileName() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public String getDisplayName() { | ||
| return null; | ||
| } | ||
|
|
||
| @SuppressWarnings("unused") | ||
| public void doJson(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException { | ||
| rsp.serveFile(req, getClass().getResource("/ast-schema.json"), TimeUnit2.DAYS.toMillis(1)); | ||
| } | ||
|
|
||
| /** | ||
| * Get the Pipeline Config AST JSON schema. | ||
| * | ||
| * @return the schema in {@link JsonSchema} form. | ||
| * @throws ProcessingException | ||
| */ | ||
| public static JsonSchema getJSONSchema() throws ProcessingException { | ||
| final JsonSchemaFactory factory = JsonSchemaFactory.byDefault(); | ||
| return factory.getJsonSchema("resource:/ast-schema.json"); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
89 changes: 89 additions & 0 deletions
89
...model-api/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/ASTSchemaTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| /* | ||
| * The MIT License | ||
| * | ||
| * Copyright (c) 2016, CloudBees, Inc. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| package org.jenkinsci.plugins.pipeline.modeldefinition; | ||
|
|
||
| import net.sf.json.JSONObject; | ||
| import org.apache.commons.io.IOUtils; | ||
| import org.junit.ClassRule; | ||
| import org.junit.Test; | ||
| import org.jvnet.hudson.test.BuildWatcher; | ||
| import org.jvnet.hudson.test.JenkinsRule; | ||
|
|
||
| import java.io.IOException; | ||
| import java.net.URL; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertFalse; | ||
| import static org.junit.Assert.assertNotNull; | ||
| import static org.junit.Assume.assumeTrue; | ||
|
|
||
| public class ASTSchemaTest { | ||
| @ClassRule | ||
| public static BuildWatcher buildWatcher = new BuildWatcher(); | ||
| @ClassRule | ||
| public static JenkinsRule j = new JenkinsRule(); | ||
|
|
||
| @Test | ||
| public void doSchema() throws Exception { | ||
| JenkinsRule.WebClient wc = j.createWebClient(); | ||
| String rawSchema = wc.goTo(ASTSchema.AST_SCHEMA_URL + "/json", "application/json").getWebResponse().getContentAsString(); | ||
| assertNotNull(rawSchema); | ||
| JSONObject remoteSchema = JSONObject.fromObject(rawSchema); | ||
| assertNotNull(remoteSchema); | ||
| assertFalse(remoteSchema.isEmpty()); | ||
| assertFalse(remoteSchema.isNullObject()); | ||
|
|
||
| String rawInternalSchema = fileContentsFromResources("ast-schema.json"); | ||
| assertNotNull(rawInternalSchema); | ||
| JSONObject internalSchema = JSONObject.fromObject(rawInternalSchema); | ||
|
|
||
| assertNotNull(internalSchema); | ||
| assertFalse(internalSchema.isEmpty()); | ||
| assertFalse(internalSchema.isNullObject()); | ||
|
|
||
| assertEquals(internalSchema, remoteSchema); | ||
| } | ||
|
|
||
| protected String fileContentsFromResources(String fileName) throws IOException { | ||
| return fileContentsFromResources(fileName, false); | ||
| } | ||
|
|
||
| protected String fileContentsFromResources(String fileName, boolean swallowError) throws IOException { | ||
| String fileContents = null; | ||
|
|
||
| URL url = getClass().getResource("/" + fileName); | ||
| if (url != null) { | ||
| fileContents = IOUtils.toString(url); | ||
| } | ||
|
|
||
| if (!swallowError) { | ||
| assertNotNull("No file contents for file " + fileName, fileContents); | ||
| } else { | ||
| assumeTrue(fileContents != null); | ||
| } | ||
| return fileContents; | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.