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.

Sign up for GitHub

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

[Java][jaxrs-spec] Make contextPath template parameter available as a string constant for use in @ApplicationPath #13377

Merged
merged 6 commits into from
Oct 3, 2022
Merged

[Java][jaxrs-spec] Make contextPath template parameter available as a string constant for use in @ApplicationPath #13377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
131a2e5
generate a RestResourceRoot with a string constant holding the jax-rs…
shamus13 Sep 5, 2022
fe2da77
Merge branch 'OpenAPITools:master' into master
shamus13 Sep 7, 2022
df6611c
build and update samples as per PR guide
shamus13 Sep 7, 2022
f100ae9
renamed introduced constant from ROOT to APPLICATION_PATH to make its…
shamus13 Sep 25, 2022
ba619bb
Merge branch 'OpenAPITools:master' into master
shamus13 Sep 27, 2022
6ae4d54
Merge branch 'OpenAPITools:master' into master
shamus13 Oct 2, 2022
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
4 changes: 4 additions & 0 deletions ...enerator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,10 @@ public void processOpts() {
supportingFiles.clear(); // Don't need extra files provided by AbstractJAX-RS & Java Codegen
supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")
.doNotOverwrite());
supportingFiles.add(new SupportingFile("RestResourceRoot.mustache",
(sourceFolder + '/' + invokerPackage).replace(".", "/"), "RestResourceRoot.java")
.doNotOverwrite());

if (generatePom) {
supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")
.doNotOverwrite());
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/JavaJaxRS/spec/RestApplication.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package {{invokerPackage}};
import javax.ws.rs.ApplicationPath;
import javax.ws.rs.core.Application;

@ApplicationPath("{{{contextPath}}}")
@ApplicationPath(RestResourceRoot.APPLICATION_PATH)
public class RestApplication extends Application {

}
5 changes: 5 additions & 0 deletions modules/openapi-generator/src/main/resources/JavaJaxRS/spec/RestResourceRoot.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package {{invokerPackage}};

public class RestResourceRoot {
public static final String APPLICATION_PATH = "{{{contextPath}}}";
}
1 change: 1 addition & 0 deletions samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/FILES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ src/gen/java/org/openapitools/api/AnotherFakeApi.java
src/gen/java/org/openapitools/api/FakeApi.java
src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
src/gen/java/org/openapitools/api/PetApi.java
src/gen/java/org/openapitools/api/RestResourceRoot.java
src/gen/java/org/openapitools/api/StoreApi.java
src/gen/java/org/openapitools/api/UserApi.java
src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.0.0-SNAPSHOT
6.1.0-SNAPSHOT
1 change: 1 addition & 0 deletions samples/server/petstore/jaxrs-spec-interface-response/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jackson-version>2.9.9</jackson-version>
<junit-version>4.13.2</junit-version>
<joda-version>2.10.13</joda-version>
Expand Down
3 changes: 2 additions & 1 deletion ...store/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/AnotherFakeApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@

@Path("/another-fake/dummy")
@Api(description = "the another-fake API")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface AnotherFakeApi {
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
public interface AnotherFakeApi {

@PATCH
@Consumes({ "application/json" })
Expand Down
3 changes: 2 additions & 1 deletion ...ver/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@

@Path("/fake")
@Api(description = "the fake API")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface FakeApi {
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
public interface FakeApi {

@POST
@Path("/create_xml_item")
Expand Down
29 changes: 0 additions & 29 deletions ...rs-spec-interface-response/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion ...jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@

@Path("/fake_classname_test")
@Api(description = "the fake_classname_test API")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface FakeClassnameTestApi {
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
public interface FakeClassnameTestApi {

@PATCH
@Consumes({ "application/json" })
Expand Down
3 changes: 2 additions & 1 deletion ...rver/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@

@Path("/pet")
@Api(description = "the pet API")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface PetApi {
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
public interface PetApi {

@POST
@Consumes({ "application/json", "application/xml" })
Expand Down
5 changes: 5 additions & 0 deletions ...ore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/RestResourceRoot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package org.openapitools.api;

public class RestResourceRoot {
public static final String APPLICATION_PATH = "/v2";
}
3 changes: 2 additions & 1 deletion ...er/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/StoreApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@

@Path("/store")
@Api(description = "the store API")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface StoreApi {
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
public interface StoreApi {

@DELETE
@Path("/order/{order_id}")
Expand Down
3 changes: 2 additions & 1 deletion ...ver/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/UserApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@

@Path("/user")
@Api(description = "the user API")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface UserApi {
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
public interface UserApi {

@POST
@ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", tags={ "user" })
Expand Down
6 changes: 2 additions & 4 deletions ...c-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@


@JsonTypeName("AdditionalPropertiesAnyType")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesAnyType extends HashMap<String, Object> implements Serializable {
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
public class AdditionalPropertiesAnyType extends HashMap<String, Object> implements Serializable {
private @Valid String name;

/**
Expand All @@ -30,8 +30,6 @@ public AdditionalPropertiesAnyType name(String name) {
}




@ApiModelProperty(value = "")
@JsonProperty("name")
public String getName() {
Expand Down
6 changes: 2 additions & 4 deletions ...pec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@


@JsonTypeName("AdditionalPropertiesArray")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesArray extends HashMap<String, List> implements Serializable {
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
public class AdditionalPropertiesArray extends HashMap<String, List> implements Serializable {
private @Valid String name;

/**
Expand All @@ -31,8 +31,6 @@ public AdditionalPropertiesArray name(String name) {
}




@ApiModelProperty(value = "")
@JsonProperty("name")
public String getName() {
Expand Down
6 changes: 2 additions & 4 deletions ...c-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@


@JsonTypeName("AdditionalPropertiesBoolean")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> implements Serializable {
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")
public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> implements Serializable {
private @Valid String name;

/**
Expand All @@ -30,8 +30,6 @@ public AdditionalPropertiesBoolean name(String name) {
}




@ApiModelProperty(value = "")
@JsonProperty("name")
public String getName() {
Expand Down
Loading