Skip to content

Commit fe42442

Browse files
alexvbrdnalexvbrdn
committed
Update library
1 parent 5e48f47 commit fe42442

95 files changed

Lines changed: 13133 additions & 1666 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/maven.yml‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,30 @@
1+
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
3+
#
4+
# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech)
5+
16
name: Java CI with Maven
27

38
on:
49
push:
5-
branches: [ "main" ]
10+
branches: [ main, master ]
611
pull_request:
7-
branches: [ "main" ]
12+
branches: [ main, master ]
813

914
jobs:
1015
build:
16+
name: Build RegexSolver
1117
runs-on: ubuntu-latest
18+
strategy:
19+
matrix:
20+
java: [ 17, 21 ]
1221
steps:
1322
- uses: actions/checkout@v4
14-
- name: Set up JDK 11
15-
uses: actions/setup-java@v3
23+
- name: Set up JDK
24+
uses: actions/setup-java@v4
1625
with:
17-
java-version: '11'
26+
java-version: ${{ matrix.java }}
1827
distribution: 'temurin'
1928
cache: maven
20-
- name: Test
21-
env:
22-
REGEXSOLVER_API_TOKEN: ${{ secrets.REGEXSOLVER_API_TOKEN }}
23-
run: mvn test
29+
- name: Build with Maven
30+
run: mvn -B package --no-transfer-progress --file pom.xml

‎.openapi-generator-ignore‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
src/main/java/com/regexsolver/api/exceptions/**
2+
test/
3+
pom.xml
4+
.gitignore
5+
git_push.sh
6+
.travis.yml
7+
.gitlab-ci.yml
8+
pyproject.toml
9+
.github/
10+
docs/
11+
test/
12+
README.md
13+
build.gradle
14+
settings.gradle
15+
gradlew
16+
gradlew.bat
17+
gradle/
18+
gradle.properties
19+
build.sbt
20+
*.xml

‎.openapi-generator/FILES‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
api/openapi.yaml
2+
gradle.properties
3+
src/main/AndroidManifest.xml
4+
src/main/java/com/regexsolver/api/generated/ApiClient.java
5+
src/main/java/com/regexsolver/api/generated/ApiException.java
6+
src/main/java/com/regexsolver/api/generated/ApiResponse.java
7+
src/main/java/com/regexsolver/api/generated/Configuration.java
8+
src/main/java/com/regexsolver/api/generated/JSON.java
9+
src/main/java/com/regexsolver/api/generated/Pair.java
10+
src/main/java/com/regexsolver/api/generated/RFC3339DateFormat.java
11+
src/main/java/com/regexsolver/api/generated/RFC3339InstantDeserializer.java
12+
src/main/java/com/regexsolver/api/generated/RFC3339JavaTimeModule.java
13+
src/main/java/com/regexsolver/api/generated/ServerConfiguration.java
14+
src/main/java/com/regexsolver/api/generated/ServerVariable.java
15+
src/main/java/com/regexsolver/api/generated/api/AnalyzeApi.java
16+
src/main/java/com/regexsolver/api/generated/api/ComputeApi.java
17+
src/main/java/com/regexsolver/api/generated/api/GenerateApi.java
18+
src/main/java/com/regexsolver/api/generated/model/AbstractOpenApiSchema.java
19+
src/main/java/com/regexsolver/api/generated/model/BooleanDto.java
20+
src/main/java/com/regexsolver/api/generated/model/Cardinality200ResponseDto.java
21+
src/main/java/com/regexsolver/api/generated/model/CardinalityBigIntegerDto.java
22+
src/main/java/com/regexsolver/api/generated/model/CardinalityDto.java
23+
src/main/java/com/regexsolver/api/generated/model/CardinalityInfiniteDto.java
24+
src/main/java/com/regexsolver/api/generated/model/CardinalityIntegerDto.java
25+
src/main/java/com/regexsolver/api/generated/model/Concat200ResponseDto.java
26+
src/main/java/com/regexsolver/api/generated/model/Dot200ResponseDto.java
27+
src/main/java/com/regexsolver/api/generated/model/Empty200ResponseDto.java
28+
src/main/java/com/regexsolver/api/generated/model/ErrorResponseDto.java
29+
src/main/java/com/regexsolver/api/generated/model/ExecutionOptionsDto.java
30+
src/main/java/com/regexsolver/api/generated/model/GenerateStringsRequestDto.java
31+
src/main/java/com/regexsolver/api/generated/model/GenerateStringsResponseDto.java
32+
src/main/java/com/regexsolver/api/generated/model/Length200ResponseDto.java
33+
src/main/java/com/regexsolver/api/generated/model/LengthDto.java
34+
src/main/java/com/regexsolver/api/generated/model/MultiTermsRequestDto.java
35+
src/main/java/com/regexsolver/api/generated/model/RepeatRequestDto.java
36+
src/main/java/com/regexsolver/api/generated/model/RequestOptionsDto.java
37+
src/main/java/com/regexsolver/api/generated/model/ResponseOptionsDto.java
38+
src/main/java/com/regexsolver/api/generated/model/StringDto.java
39+
src/main/java/com/regexsolver/api/generated/model/Strings200ResponseDto.java
40+
src/main/java/com/regexsolver/api/generated/model/StringsDto.java
41+
src/main/java/com/regexsolver/api/generated/model/TermDto.java
42+
src/main/java/com/regexsolver/api/generated/model/TermFairDto.java
43+
src/main/java/com/regexsolver/api/generated/model/TermRegexDto.java
44+
src/main/java/com/regexsolver/api/generated/model/TermRequestDto.java
45+
src/main/java/com/regexsolver/api/generated/model/TwoTermsRequestDto.java

‎.openapi-generator/VERSION‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7.21.0

‎generate-api.sh‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/bin/bash
2+
3+
SPEC_FILE="../m-lab/shared/openapi.yaml"
4+
OUT_DIR="./"
5+
6+
echo "Running openapi-generator-cli..."
7+
openapi-generator-cli generate \
8+
-i "$SPEC_FILE" \
9+
-g java \
10+
-o "$OUT_DIR" \
11+
--model-name-suffix Dto \
12+
--additional-properties=library=native \
13+
--additional-properties=invokerPackage=com.regexsolver.api.generated \
14+
--additional-properties=apiPackage=com.regexsolver.api.generated.api \
15+
--additional-properties=modelPackage=com.regexsolver.api.generated.model \
16+
--additional-properties=asyncNative=true \
17+
--additional-properties=useRuntimeException=true \
18+
--additional-properties=openApiNullable=false
19+
20+
echo "API Generation Complete."

‎openapitools.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
3+
"spaces": 2,
4+
"generator-cli": {
5+
"version": "7.21.0"
6+
}
7+
}

‎pom.xml‎

Lines changed: 80 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<project
3+
xmlns="http://maven.apache.org/POM/4.0.0"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
6+
>
57
<modelVersion>4.0.0</modelVersion>
68

79
<groupId>com.regexsolver.api</groupId>
@@ -37,32 +39,93 @@
3739
<maven.compiler.source>11</maven.compiler.source>
3840
<maven.compiler.target>11</maven.compiler.target>
3941
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
42+
43+
<jackson.version>2.21.1</jackson.version>
44+
<jackson.annotations.version>2.21</jackson.annotations.version>
45+
<jakarta.annotation.version>1.3.5</jakarta.annotation.version>
46+
<junit.version>5.10.2</junit.version>
47+
<mockito.version>5.11.0</mockito.version>
48+
<assertj.version>3.25.3</assertj.version>
4049
</properties>
4150

4251
<dependencies>
4352
<dependency>
44-
<groupId>com.squareup.retrofit2</groupId>
45-
<artifactId>retrofit</artifactId>
46-
<version>2.12.0</version>
53+
<groupId>com.google.code.findbugs</groupId>
54+
<artifactId>jsr305</artifactId>
55+
<version>3.0.2</version>
4756
</dependency>
57+
58+
<dependency>
59+
<groupId>com.fasterxml.jackson.core</groupId>
60+
<artifactId>jackson-core</artifactId>
61+
<version>${jackson.version}</version>
62+
</dependency>
63+
4864
<dependency>
49-
<groupId>com.squareup.retrofit2</groupId>
50-
<artifactId>converter-jackson</artifactId>
51-
<version>2.12.0</version>
65+
<groupId>com.fasterxml.jackson.core</groupId>
66+
<artifactId>jackson-annotations</artifactId>
67+
<version>${jackson.annotations.version}</version>
5268
</dependency>
69+
70+
<dependency>
71+
<groupId>com.fasterxml.jackson.core</groupId>
72+
<artifactId>jackson-databind</artifactId>
73+
<version>${jackson.version}</version>
74+
</dependency>
75+
5376
<dependency>
54-
<groupId>junit</groupId>
55-
<artifactId>junit</artifactId>
56-
<version>4.13.2</version>
77+
<groupId>com.fasterxml.jackson.datatype</groupId>
78+
<artifactId>jackson-datatype-jsr310</artifactId>
79+
<version>${jackson.version}</version>
80+
</dependency>
81+
82+
<dependency>
83+
<groupId>org.openapitools</groupId>
84+
<artifactId>jackson-databind-nullable</artifactId>
85+
<version>0.2.9</version>
86+
</dependency>
87+
88+
<dependency>
89+
<groupId>jakarta.annotation</groupId>
90+
<artifactId>jakarta.annotation-api</artifactId>
91+
<version>${jakarta.annotation.version}</version>
92+
</dependency>
93+
94+
<dependency>
95+
<groupId>org.junit.jupiter</groupId>
96+
<artifactId>junit-jupiter-api</artifactId>
97+
<version>${junit.version}</version>
98+
<scope>test</scope>
99+
</dependency>
100+
101+
<dependency>
102+
<groupId>org.junit.jupiter</groupId>
103+
<artifactId>junit-jupiter-engine</artifactId>
104+
<version>${junit.version}</version>
105+
<scope>test</scope>
106+
</dependency>
107+
108+
<dependency>
109+
<groupId>org.mockito</groupId>
110+
<artifactId>mockito-core</artifactId>
111+
<version>${mockito.version}</version>
112+
<scope>test</scope>
113+
</dependency>
114+
<dependency>
115+
<groupId>org.mockito</groupId>
116+
<artifactId>mockito-junit-jupiter</artifactId>
117+
<version>${mockito.version}</version>
57118
<scope>test</scope>
58119
</dependency>
120+
59121
<dependency>
60-
<groupId>com.squareup.okhttp3</groupId>
61-
<artifactId>mockwebserver</artifactId>
62-
<version>3.14.9</version>
122+
<groupId>org.assertj</groupId>
123+
<artifactId>assertj-core</artifactId>
124+
<version>${assertj.version}</version>
63125
<scope>test</scope>
64126
</dependency>
65127
</dependencies>
128+
66129
<build>
67130
<plugins>
68131
<plugin>
@@ -82,11 +145,6 @@
82145
<groupId>org.apache.maven.plugins</groupId>
83146
<artifactId>maven-javadoc-plugin</artifactId>
84147
<version>3.7.0</version>
85-
<configuration>
86-
<sourceFileExcludes>
87-
<sourceFileExclude>**/ResponseContent.java</sourceFileExclude>
88-
</sourceFileExcludes>
89-
</configuration>
90148
<executions>
91149
<execution>
92150
<id>attach-javadocs</id>
@@ -127,4 +185,4 @@
127185
</plugin>
128186
</plugins>
129187
</build>
130-
</project>
188+
</project>

0 commit comments

Comments
 (0)