diff --git a/.github/workflows/compute-covarage.yml b/.github/workflows/compute-covarage.yml new file mode 100644 index 0000000..9ba8422 --- /dev/null +++ b/.github/workflows/compute-covarage.yml @@ -0,0 +1,22 @@ +name: Compute coverage + +on: + push: + branches: [ main , develop ] + + +jobs: + compute-coverage: + name: Compute coverage + runs-on: ubuntu-latest + environment: + name: coveralls + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v2.5.0 + with: + java-version: 8 + distribution: 'zulu' + architecture: x64 + - name: Build and test + run: cd sqlschema2java-core && mvn clean test run-coveralls jacoco:report coveralls:report -DrepoToken=${{ secrets.coveralls_repo_token }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3158248..6b04c8b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest needs: publish-core steps: - - name: Sleep for 30 seconds + - name: Sleep for 5 minutes uses: jakejarvis/wait-action@master with: time: '5m' @@ -44,7 +44,7 @@ jobs: with: java-version: '11' distribution: 'adopt' - - name: Publish package SQLSchema2Java Core + - name: Publish package SQLSchema2Java MavenPLugin run: | cd sqlschema2java-maven-plugin mvn --batch-mode deploy diff --git a/README.md b/README.md index f283b2d..56851cc 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![CodeQL main](https://github.com/Sassine/sqlschema2java/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/Sassine/sqlschema2java/actions/workflows/codeql-analysis.yml) [![GitHub release](https://img.shields.io/github/release/Sassine/sqlschema2java.svg)](https://GitHub.com/Sassine/sqlschema2java/releases/) -[![Coverage Status](https://coveralls.io/repos/github/Sassine/sqlschema2java/badge.svg?branch=develop)](https://coveralls.io/github/Sassine/sqlschema2java?branch=develop) +[![Coverage Status](https://coveralls.io/repos/github/Sassine/sqlschema2java/badge.svg)](https://coveralls.io/github/Sassine/sqlschema2java) ![Logo SQL2JAVA and website adress sassine.dev/sqlschema2java](https://sassine.dev/assets/images/SQLSchema2Java_Logo2.png) diff --git a/sqlschema2java-core/pom.xml b/sqlschema2java-core/pom.xml index 161b870..a71558a 100644 --- a/sqlschema2java-core/pom.xml +++ b/sqlschema2java-core/pom.xml @@ -157,8 +157,9 @@ **/*SqlBaseListener* **/*SqlLexer* **/*SqlParser* - **/*Main - **/*Sqlschema2Java + **/*Main* + **/*Sqlschema2Java* + **/builder/** @@ -190,7 +191,6 @@ org.projectlombok lombok 1.18.22 - provided diff --git a/sqlschema2java-core/src/main/java/dev/sassine/api/structure/model/java/FieldModel.java b/sqlschema2java-core/src/main/java/dev/sassine/api/structure/model/java/FieldModel.java index d95a158..10fba1e 100644 --- a/sqlschema2java-core/src/main/java/dev/sassine/api/structure/model/java/FieldModel.java +++ b/sqlschema2java-core/src/main/java/dev/sassine/api/structure/model/java/FieldModel.java @@ -20,7 +20,6 @@ public class FieldModel { private String defaultValue; private Integer minOccurs; private String maxOccurs; - private boolean isEmbedded; public FieldModel(String name) { this.name = name; diff --git a/sqlschema2java-core/src/test/java/dev/sassine/api/structure/model/java/EntityModelTest.java b/sqlschema2java-core/src/test/java/dev/sassine/api/structure/model/java/EntityModelTest.java new file mode 100644 index 0000000..d339b8b --- /dev/null +++ b/sqlschema2java-core/src/test/java/dev/sassine/api/structure/model/java/EntityModelTest.java @@ -0,0 +1,25 @@ +package dev.sassine.api.structure.model.java; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import org.junit.Test; + +public class EntityModelTest { + + + @Test + public void getFieldForNameTest() { + var entity = new EntityModel("table", "auto"); + var field = new FieldModel(); + field.setName("teste_1"); + field.setType("Integer"); + entity.getFields().add(field); + var value = entity.getFieldForName("teste_1"); + assertEquals("teste1",value.getCamelName()); + assertEquals("Teste1",value.getCamelNameUpper()); + assertEquals("Integer",value.getType()); + assertNull(entity.getFieldForName("teste_2")); + } + +} diff --git a/sqlschema2java-example/pom.xml b/sqlschema2java-example/pom.xml index de957c9..d50d9f4 100644 --- a/sqlschema2java-example/pom.xml +++ b/sqlschema2java-example/pom.xml @@ -1,12 +1,12 @@ - 4.0.0 - dev.sasine.api - sqlschema2java-example - 1.0.0-beta1 - pom + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + dev.sasine.api + sqlschema2java-example + 1.0.0-beta1 + pom @@ -20,35 +20,43 @@ - + - false - false - ./input.sql - + false + false + ./input.sql + + + + + + dev.sassine.api + sqlschema2java-maven-plugin + 1.0.0-beta1 + + + + generate + + + + + ${is.postgres} + ${path.arquivo} + ${auto.increment.enabled} + false + + + + - - - - dev.sassine.api - sqlschema2java-maven-plugin - 1.0.0-beta1 - - - - generate - - - - - ${is.postgres} - ${path.arquivo} - ${auto.increment.enabled} - false - - - - + + + github + GitHub Packages SQLSchema2Java + https://maven.pkg.github.com/Sassine/sqlschema2java + + \ No newline at end of file diff --git a/sqlschema2java-example/runSqlSchema2Java.sh b/sqlschema2java-example/runSqlSchema2Java.sh index 496b901..f24de46 100644 --- a/sqlschema2java-example/runSqlSchema2Java.sh +++ b/sqlschema2java-example/runSqlSchema2Java.sh @@ -1,3 +1,3 @@ #!/bin/sh -mvn dev.sassine.api:sqlschema2java-maven-plugin:sqlschema2java \ No newline at end of file +mvn dev.sassine.api:sqlschema2java-maven-plugin:generate \ No newline at end of file