forked from loafle/openapi-generator-original
Fix Spring CI sample folder (#16005)
* fix spring CI sample folder * fix path * trigger build * test push * add spring jdk17 workflow * trigger build
This commit is contained in:
parent
a2d0b0c5b8
commit
9170306ffa
36
.github/workflows/samples-spring-jdk17.yaml
vendored
Normal file
36
.github/workflows/samples-spring-jdk17.yaml
vendored
Normal file
@ -0,0 +1,36 @@
|
||||
name: Samples Java Spring (JDK17)
|
||||
|
||||
on:
|
||||
push:
|
||||
paths:
|
||||
- samples/openapi3/client/petstore/spring-cloud-3-with-optional
|
||||
pull_request:
|
||||
paths:
|
||||
- samples/openapi3/client/petstore/spring-cloud-3-with-optional
|
||||
jobs:
|
||||
build:
|
||||
name: Build Java Spring (JDK17)
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
sample:
|
||||
# clients
|
||||
- samples/openapi3/client/petstore/spring-cloud-3-with-optional
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/setup-java@v3
|
||||
with:
|
||||
distribution: 'temurin'
|
||||
java-version: 17
|
||||
- name: Cache maven dependencies
|
||||
uses: actions/cache@v3
|
||||
env:
|
||||
cache-name: maven-repository
|
||||
with:
|
||||
path: |
|
||||
~/.m2
|
||||
key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
|
||||
- name: Build
|
||||
working-directory: ${{ matrix.sample }}
|
||||
run: mvn clean package
|
3
.github/workflows/samples-spring.yaml
vendored
3
.github/workflows/samples-spring.yaml
vendored
@ -26,7 +26,7 @@ jobs:
|
||||
- samples/openapi3/client/petstore/spring-stubs-skip-default-interface
|
||||
- samples/openapi3/client/petstore/spring-cloud-async
|
||||
- samples/openapi3/client/petstore/spring-cloud-spring-pageable
|
||||
- samples/openapi3/client/petstore/spring-cloud-3-with-optional.yaml
|
||||
- samples/client/petstore/spring-cloud-tags
|
||||
# servers
|
||||
- samples/server/petstore/springboot
|
||||
- samples/openapi3/server/petstore/springboot
|
||||
@ -47,7 +47,6 @@ jobs:
|
||||
- samples/server/petstore/springboot-spring-pageable-delegatePattern
|
||||
- samples/server/petstore/springboot-spring-pageable-without-j8
|
||||
- samples/server/petstore/springboot-spring-pageable
|
||||
- samples/openapi3/client/petstore/spring-cloud-tags.yaml
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/setup-java@v3
|
||||
|
@ -93,7 +93,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
|
||||
FrameworkStrategy.NET_6_0,
|
||||
FrameworkStrategy.NET_7_0
|
||||
);
|
||||
private static FrameworkStrategy latestFramework = frameworkStrategies.get(frameworkStrategies.size() -1);
|
||||
private static FrameworkStrategy latestFramework = frameworkStrategies.get(frameworkStrategies.size() - 1);
|
||||
protected final Map<String, String> frameworks;
|
||||
protected String packageGuid = "{" + java.util.UUID.randomUUID().toString().toUpperCase(Locale.ROOT) + "}";
|
||||
protected String clientPackage = "Client";
|
||||
@ -344,15 +344,15 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
|
||||
@Override
|
||||
protected Set<String> getNullableTypes() {
|
||||
return GENERICHOST.equals(getLibrary())
|
||||
? super.getNullableTypes()
|
||||
: new HashSet<>(Arrays.asList("decimal", "bool", "int", "uint", "long", "ulong", "float", "double", "DateTime", "DateTimeOffset", "Guid"));
|
||||
? super.getNullableTypes()
|
||||
: new HashSet<>(Arrays.asList("decimal", "bool", "int", "uint", "long", "ulong", "float", "double", "DateTime", "DateTimeOffset", "Guid"));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Set<String> getValueTypes() {
|
||||
return GENERICHOST.equals(getLibrary())
|
||||
? super.getValueTypes()
|
||||
: new HashSet<>(Arrays.asList("decimal", "bool", "int", "uint", "long", "ulong", "float", "double"));
|
||||
? super.getValueTypes()
|
||||
: new HashSet<>(Arrays.asList("decimal", "bool", "int", "uint", "long", "ulong", "float", "double"));
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -1589,7 +1589,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
|
||||
? null
|
||||
: model.discriminator.getPropertyName();
|
||||
|
||||
for(CodegenProperty oneOfProperty : composedProperties) {
|
||||
for (CodegenProperty oneOfProperty : composedProperties) {
|
||||
String ref = oneOfProperty.getRef();
|
||||
if (ref != null) {
|
||||
for (Map.Entry<String, ModelsMap> composedEntry : objs.entrySet()) {
|
||||
@ -1624,8 +1624,8 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
|
||||
protected boolean isValueType(CodegenProperty var) {
|
||||
// this is temporary until x-csharp-value-type is removed
|
||||
return this.getLibrary().equals("generichost")
|
||||
? super.isValueType(var)
|
||||
: this.getValueTypes().contains(var.dataType) || var.isEnum;
|
||||
? super.isValueType(var)
|
||||
: this.getValueTypes().contains(var.dataType) || var.isEnum;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -21,3 +21,4 @@
|
||||
#docs/*.md
|
||||
# Then explicitly reverse the ignore rule for a single file:
|
||||
#!docs/README.md
|
||||
#
|
||||
|
@ -23,3 +23,4 @@
|
||||
#!docs/README.md
|
||||
|
||||
src/test/java/org/openapitools/JacksonTest.java
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user