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.

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

Update test model path #152

Merged
merged 1 commit into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 0 additions & 6 deletions .github/actions/ci-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,3 @@ runs:
- name: Load Maven settings.xml
shell: bash
run: cp settings.xml.example ~/.m2/settings.xml
- name: Install data models
shell: bash
run: |
git clone https://github.com/${{ inputs.data-models-repo-org }}/${{ inputs.data-models-repo-name }}.git ../jpa-models
cd ../jpa-models
mvn clean install
8 changes: 4 additions & 4 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ env:
JDK_DISTRIBUTION: 'adopt'
USER: QubitPi
EMAIL: jack20220723@gmail.com
MODEL_PACKAGE_NAME: 'com.qubitpi.ws.jersey.template.models'
MODEL_PACKAGE_NAME: 'io.github.qubitpi.ws.jersey.template.models'

jobs:
mk-yml-style-check:
uses: QubitPi/hashicorp-aws/.github/workflows/yml-and-md-style-checks.yml@master
yml-md-style-and-link-checks:
uses: QubitPi/hashicorp-aws/.github/workflows/yml-md-style-and-link-checks.yml@master

tests:
name: Unit & Integration Tests
needs: mk-yml-style-check
needs: yml-md-style-and-link-checks
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
3 changes: 3 additions & 0 deletions .lycheeignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
file:///*
https://querydsl.com/*
https://uel.java.net/
8 changes: 4 additions & 4 deletions docs/docs/elide/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ The IT tests will run against an [example model] so make sure the following envi
model:

```bash
export TEST_MODEL_PACKAGE_NAME=com.qubitpi.ws.jersey.template.models
export TEST_MODEL_PACKAGE_NAME=io.github.qubitpi.ws.jersey.template.models
```

<!-- markdown-link-check-disable -->
Expand Down Expand Up @@ -81,11 +81,11 @@ cp settings.xml.example ~/.m2/settings.xml
<profile>
<id>data-models</id>
<properties>
<model.package.jar.group.id>com.qubitpi</model.package.jar.group.id>
<model.package.jar.group.id>io.github.qubitpi</model.package.jar.group.id>
<model.package.jar.artifact.id>
jersey-webservice-template-jpa-data-models
</model.package.jar.artifact.id>
<model.package.jar.version>1.0.0</model.package.jar.version>
<model.package.jar.version>1.0.1</model.package.jar.version>
</properties>
</profile>
</profiles>
Expand Down Expand Up @@ -422,7 +422,7 @@ export class Client {
[Elide instance class]: https://github.com/yahoo/elide/blob/master/elide-core/src/main/java/com/yahoo/elide/Elide.java
[Elide Standalone]: https://github.com/yahoo/elide/tree/master/elide-standalone
[ElideSettings instance class]: https://github.com/yahoo/elide/blob/master/elide-core/src/main/java/com/yahoo/elide/ElideSettings.java
[example model]: https://github.com/QubitPi/jersey-webservice-template-jpa-data-models/blob/master/src/main/java/com/qubitpi/ws/jersey/template/models/Book.java
[example model]: https://github.com/QubitPi/jersey-webservice-template-jpa-data-models/blob/master/src/main/java/io/github/qubitpi/ws/jersey/template/models/Book.java

[jcabi-mysql]: https://mysql.jcabi.com/

Expand Down
8 changes: 4 additions & 4 deletions docs/docs/elide/intro.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ load [data models](#creating-models) via Maven config file, i.e. **~/.m2/setting
<profile>
<id>jwt-data-models</id>
<properties>
<model.package.jar.group.id>com.qubitpi</model.package.jar.group.id>
<model.package.jar.group.id>io.github.qubitpi</model.package.jar.group.id>
<model.package.jar.artifact.id>jersey-webservice-template-jpa-data-models</model.package.jar.artifact.id>
<model.package.jar.version>1.0.0</model.package.jar.version>
<model.package.jar.version>1.0.1</model.package.jar.version>
</properties>
</profile>
</profiles>
Expand All @@ -132,12 +132,12 @@ With data models defined, can run _my-webservice_
```bash
cd my-webservice
mvn clean package
MODEL_PACKAGE_NAME=com.qubitpi.ws.jersey.template.models docker compose up --build --force-recreate
MODEL_PACKAGE_NAME=io.github.qubitpi.ws.jersey.template.models docker compose up --build --force-recreate
```

:::info

`com.qubitpi.ws.jersey.template.models` is the name of the model in the aforementioned
`io.github.qubitpi.ws.jersey.template.models` is the name of the model in the aforementioned
[data model project][jersey-webservice-template-jpa-data-models]

:::
Expand Down
6 changes: 6 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,12 @@
</dependency>

<!-- Testing -->
<dependency>
<groupId>io.github.qubitpi</groupId>
<artifactId>jersey-webservice-template-jpa-data-models</artifactId>
<version>1.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.spockframework</groupId>
<artifactId>spock-core</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions settings.xml.example
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<profile>
<id>elide-data-models-properties</id>
<properties>
<model.package.jar.group.id>com.qubitpi</model.package.jar.group.id>
<model.package.jar.group.id>io.github.qubitpi</model.package.jar.group.id>
<model.package.jar.artifact.id>jersey-webservice-template-jpa-data-models</model.package.jar.artifact.id>
<model.package.jar.version>1.0.0</model.package.jar.version>
<model.package.jar.version>1.0.1</model.package.jar.version>
</properties>
</profile>
</profiles>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,10 @@ import static org.hamcrest.Matchers.equalTo

import com.yahoo.elide.jsonapi.JsonApi

import com.qubitpi.ws.jersey.template.models.Book

import org.apache.http.HttpStatus

import groovy.json.JsonBuilder
import io.github.qubitpi.ws.jersey.template.models.Book
import io.restassured.RestAssured
import io.restassured.response.Response
import jakarta.validation.constraints.NotNull
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
MODEL_PACKAGE_NAME=com.qubitpi.ws.jersey.template.models
MODEL_PACKAGE_NAME=io.github.qubitpi.ws.jersey.template.models
Loading