Skip to content

Commit 4e18efc

Browse files
constewart9constewart9
authored
Merge pull request #15 from constewart9/conorstw/types-NEW
Conorstw/types new
2 parents 26e276e + 876588b commit 4e18efc

File tree

3 files changed

+318
-3
lines changed

3 files changed

+318
-3
lines changed

‎types/codegen/custom-templates/java/pom.mustache‎

Lines changed: 314 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,314 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>{{groupId}}</groupId>
5+
<artifactId>{{artifactId}}</artifactId>
6+
<packaging>jar</packaging>
7+
<name>{{artifactId}}</name>
8+
<version>{{artifactVersion}}</version>
9+
<url>{{artifactUrl}}</url>
10+
<description>{{artifactDescription}}</description>
11+
<scm>
12+
<connection>{{scmConnection}}</connection>
13+
<developerConnection>{{scmDeveloperConnection}}</developerConnection>
14+
<url>{{scmUrl}}</url>
15+
</scm>
16+
{{#parentOverridden}}
17+
<parent>
18+
<groupId>{{{parentGroupId}}}</groupId>
19+
<artifactId>{{{parentArtifactId}}}</artifactId>
20+
<version>{{{parentVersion}}}</version>
21+
</parent>
22+
{{/parentOverridden}}
23+
24+
<licenses>
25+
<license>
26+
<name>{{licenseName}}</name>
27+
<url>{{licenseUrl}}</url>
28+
<distribution>repo</distribution>
29+
</license>
30+
</licenses>
31+
32+
<developers>
33+
<developer>
34+
<name>{{developerName}}</name>
35+
<email>{{developerEmail}}</email>
36+
<organization>{{developerOrganization}}</organization>
37+
<organizationUrl>{{developerOrganizationUrl}}</organizationUrl>
38+
</developer>
39+
</developers>
40+
41+
<build>
42+
<plugins>
43+
<plugin>
44+
<groupId>org.apache.maven.plugins</groupId>
45+
<artifactId>maven-compiler-plugin</artifactId>
46+
<version>3.8.1</version>
47+
<configuration>
48+
<source>21</source>
49+
<target>21</target>
50+
<fork>true</fork>
51+
<meminitial>128m</meminitial>
52+
<maxmem>512m</maxmem>
53+
<compilerArgs>
54+
<arg>-Xlint:all</arg>
55+
<arg>-J-Xss4m</arg><!-- Compiling the generated JSON.java file may require larger stack size. -->
56+
</compilerArgs>
57+
</configuration>
58+
</plugin>
59+
60+
61+
<!-- Skip test compilation since generated tests don't work with records -->
62+
<plugin>
63+
<groupId>org.apache.maven.plugins</groupId>
64+
<artifactId>maven-compiler-plugin</artifactId>
65+
<version>3.8.1</version>
66+
<executions>
67+
<execution>
68+
<id>default-testCompile</id>
69+
<phase>test-compile</phase>
70+
<goals>
71+
<goal>testCompile</goal>
72+
</goals>
73+
<configuration>
74+
<skip>true</skip>
75+
</configuration>
76+
</execution>
77+
</executions>
78+
</plugin>
79+
80+
<plugin>
81+
<groupId>org.apache.maven.plugins</groupId>
82+
<artifactId>maven-surefire-plugin</artifactId>
83+
<version>2.12</version>
84+
<configuration>
85+
<skipTests>true</skipTests>
86+
</configuration>
87+
</plugin>
88+
89+
<!-- Maven JAR plugin for creating JAR files -->
90+
<plugin>
91+
<groupId>org.apache.maven.plugins</groupId>
92+
<artifactId>maven-jar-plugin</artifactId>
93+
<version>3.3.0</version>
94+
<executions>
95+
<execution>
96+
<goals>
97+
<goal>jar</goal>
98+
</goals>
99+
</execution>
100+
</executions>
101+
</plugin>
102+
103+
<!-- Maven Source plugin for creating source JAR -->
104+
<plugin>
105+
<groupId>org.apache.maven.plugins</groupId>
106+
<artifactId>maven-source-plugin</artifactId>
107+
<version>3.3.0</version>
108+
<executions>
109+
<execution>
110+
<id>attach-sources</id>
111+
<goals>
112+
<goal>jar-no-fork</goal>
113+
</goals>
114+
</execution>
115+
</executions>
116+
</plugin>
117+
118+
<!-- Maven Javadoc plugin for creating Javadoc JAR -->
119+
<plugin>
120+
<groupId>org.apache.maven.plugins</groupId>
121+
<artifactId>maven-javadoc-plugin</artifactId>
122+
<version>3.6.3</version>
123+
<configuration>
124+
<doclint>none</doclint>
125+
<source>21</source>
126+
</configuration>
127+
<executions>
128+
<execution>
129+
<id>attach-javadocs</id>
130+
<goals>
131+
<goal>jar</goal>
132+
</goals>
133+
</execution>
134+
</executions>
135+
</plugin>
136+
137+
<!-- Maven Install plugin for installing to local repository -->
138+
<plugin>
139+
<groupId>org.apache.maven.plugins</groupId>
140+
<artifactId>maven-install-plugin</artifactId>
141+
<version>3.1.1</version>
142+
</plugin>
143+
144+
</plugins>
145+
</build>
146+
147+
<profiles>
148+
<profile>
149+
<id>sign-artifacts</id>
150+
<build>
151+
<plugins>
152+
<plugin>
153+
<groupId>org.apache.maven.plugins</groupId>
154+
<artifactId>maven-gpg-plugin</artifactId>
155+
<version>1.5</version>
156+
<executions>
157+
<execution>
158+
<id>sign-artifacts</id>
159+
<phase>verify</phase>
160+
<goals>
161+
<goal>sign</goal>
162+
</goals>
163+
</execution>
164+
</executions>
165+
</plugin>
166+
</plugins>
167+
</build>
168+
</profile>
169+
</profiles>
170+
171+
<dependencies>
172+
{{#swagger1AnnotationLibrary}}
173+
<dependency>
174+
<groupId>io.swagger</groupId>
175+
<artifactId>swagger-annotations</artifactId>
176+
<version>${swagger-annotations-version}</version>
177+
</dependency>
178+
{{/swagger1AnnotationLibrary}}
179+
{{#swagger2AnnotationLibrary}}
180+
<dependency>
181+
<groupId>io.swagger.core.v3</groupId>
182+
<artifactId>swagger-annotations</artifactId>
183+
<version>${swagger-annotations-version}</version>
184+
</dependency>
185+
{{/swagger2AnnotationLibrary}}
186+
187+
<!-- @Nullable annotation -->
188+
<dependency>
189+
<groupId>com.google.code.findbugs</groupId>
190+
<artifactId>jsr305</artifactId>
191+
<version>3.0.2</version>
192+
</dependency>
193+
194+
<!-- LSP4J for Language Server Protocol types -->
195+
<dependency>
196+
<groupId>org.eclipse.lsp4j</groupId>
197+
<artifactId>org.eclipse.lsp4j</artifactId>
198+
<version>0.22.0</version>
199+
</dependency>
200+
201+
202+
203+
204+
<!-- JSON processing: jackson -->
205+
<dependency>
206+
<groupId>com.fasterxml.jackson.core</groupId>
207+
<artifactId>jackson-core</artifactId>
208+
<version>${jackson-version}</version>
209+
</dependency>
210+
<dependency>
211+
<groupId>com.fasterxml.jackson.core</groupId>
212+
<artifactId>jackson-annotations</artifactId>
213+
<version>${jackson-version}</version>
214+
</dependency>
215+
<dependency>
216+
<groupId>com.fasterxml.jackson.core</groupId>
217+
<artifactId>jackson-databind</artifactId>
218+
<version>${jackson-databind-version}</version>
219+
</dependency>
220+
<dependency>
221+
<groupId>com.fasterxml.jackson.datatype</groupId>
222+
<artifactId>jackson-datatype-jsr310</artifactId>
223+
<version>${jackson-version}</version>
224+
</dependency>
225+
226+
<!-- JSON processing: gson -->
227+
<dependency>
228+
<groupId>com.google.code.gson</groupId>
229+
<artifactId>gson</artifactId>
230+
<version>${gson-version}</version>
231+
</dependency>
232+
{{#useBeanValidation}}
233+
<!-- Bean Validation API support -->
234+
<dependency>
235+
<groupId>jakarta.validation</groupId>
236+
<artifactId>jakarta.validation-api</artifactId>
237+
<version>${beanvalidation-version}</version>
238+
<scope>provided</scope>
239+
</dependency>
240+
{{/useBeanValidation}}
241+
{{#performBeanValidation}}
242+
<!-- Bean Validation Impl. used to perform BeanValidation -->
243+
<dependency>
244+
<groupId>org.hibernate</groupId>
245+
<artifactId>hibernate-validator</artifactId>
246+
<version>5.4.1.Final</version>
247+
</dependency>
248+
{{/performBeanValidation}}
249+
{{#parcelableModel}}
250+
<!-- Needed for Parcelable support-->
251+
<dependency>
252+
<groupId>com.google.android</groupId>
253+
<artifactId>android</artifactId>
254+
<version>4.1.1.4</version>
255+
<scope>provided</scope>
256+
</dependency>
257+
{{/parcelableModel}}
258+
<dependency>
259+
<groupId>jakarta.annotation</groupId>
260+
<artifactId>jakarta.annotation-api</artifactId>
261+
<version>${jakarta-annotation-version}</version>
262+
<scope>provided</scope>
263+
</dependency>
264+
{{#useReflectionEqualsHashCode}}
265+
<!-- For equals and hashCode using reflection -->
266+
<dependency>
267+
<groupId>org.apache.commons</groupId>
268+
<artifactId>commons-lang3</artifactId>
269+
<version>${commons-lang3-version}</version>
270+
</dependency>
271+
{{/useReflectionEqualsHashCode}}
272+
273+
<!-- test dependencies -->
274+
<dependency>
275+
<groupId>org.junit.jupiter</groupId>
276+
<artifactId>junit-jupiter-engine</artifactId>
277+
<version>${junit-version}</version>
278+
<scope>test</scope>
279+
</dependency>
280+
<dependency>
281+
<groupId>org.junit.platform</groupId>
282+
<artifactId>junit-platform-runner</artifactId>
283+
<version>${junit-platform-runner.version}</version>
284+
<scope>test</scope>
285+
</dependency>
286+
</dependencies>
287+
<properties>
288+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
289+
{{#swagger1AnnotationLibrary}}
290+
<swagger-annotations-version>1.6.6</swagger-annotations-version>
291+
{{/swagger1AnnotationLibrary}}
292+
{{#swagger2AnnotationLibrary}}
293+
<swagger-annotations-version>2.2.15</swagger-annotations-version>
294+
{{/swagger2AnnotationLibrary}}
295+
<jersey-version>1.19.4</jersey-version>
296+
<jackson-version>2.17.1</jackson-version>
297+
<jackson-databind-version>2.17.1</jackson-databind-version>
298+
{{#useJakartaEe}}
299+
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>
300+
<beanvalidation-version>3.0.2</beanvalidation-version>
301+
{{/useJakartaEe}}
302+
{{^useJakartaEe}}
303+
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
304+
<beanvalidation-version>2.0.2</beanvalidation-version>
305+
{{/useJakartaEe}}
306+
{{#useReflectionEqualsHashCode}}
307+
<commons-lang3-version>3.17.0</commons-lang3-version>
308+
{{/useReflectionEqualsHashCode}}
309+
<gson-version>2.10.1</gson-version>
310+
<maven-plugin-version>1.0.0</maven-plugin-version>
311+
<junit-version>5.10.2</junit-version>
312+
<junit-platform-runner.version>1.10.0</junit-platform-runner.version>
313+
</properties>
314+
</project>

‎types/codegen/openapitools.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@
5555
"targetCompatibility": "21"
5656
},
5757
"global-property": {
58-
"models": "IconType:ContextCommandGroup:QuickActionCommand:ContextCommand:CursorPosition:FileParams:CopyFileParams:OpenFileDiffParams:ShowOpenDialogParams:ShowSaveFileDialogParams:ShowSaveFileDialogResult"
58+
"models": "ContextCommandIconType:IconType:ContextCommandGroup:QuickActionCommand:ContextCommand:CursorPosition:FileParams:CopyFileParams:OpenFileDiffParams:ShowOpenDialogParams:ShowSaveFileDialogParams:ShowSaveFileDialogResult",
59+
"supportingFiles": "pom.xml"
5960
},
6061
"importMappings": {
6162
"Position": "org.eclipse.lsp4j.Position",

‎types/codegen/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"main": "generated/typescript/src/index.ts",
66
"scripts": {
77
"generate-full-schema": "node scripts/generate-complete-schema.js",
8-
"generate": "npm run generate-schema && openapi-generator-cli generate && node scripts/post-typescript.js && npm run test",
8+
"generate": "npm run generate-full-schema && openapi-generator-cli generate && node scripts/post-typescript.js && npm run test",
99
"generate:only": "openapi-generator-cli generate",
10-
"generate:no-post": "npm run generate-schema && openapi-generator-cli generate",
10+
"generate:no-post": "npm run generate-full-schema && openapi-generator-cli generate && node scripts/post-typescript.js",
1111
"post-process": "node scripts/post-typescript.js",
1212
"test": "node scripts/post-test.js",
1313
"test:verbose": "node scripts/post-test.js --verbose",

0 commit comments

Comments
 (0)