From ec6db2bde5b40f9e9bbdcbc72ea44b3d668abec4 Mon Sep 17 00:00:00 2001 From: Vladimir Mutafov Date: Fri, 10 Nov 2023 14:50:26 +0200 Subject: [PATCH 1/7] chore: add pre-push hook for code formatting --- hooks/pre-push | 9 + pom.xml | 1320 +++++++++++++++++++++++++----------------------- 2 files changed, 684 insertions(+), 645 deletions(-) create mode 100755 hooks/pre-push diff --git a/hooks/pre-push b/hooks/pre-push new file mode 100755 index 00000000000..012b94d2142 --- /dev/null +++ b/hooks/pre-push @@ -0,0 +1,9 @@ +NC='\033[0m' # No Color +RED='\033[0;31m' +GREEN='\033[0;32m' + +echo "${GREEN} Checking code formatting..." +mvn formatter:validate > /dev/null + +status=$? +([ $status -eq 0 ] && echo "${GREEN} Formatting is OK ${NC}") || (echo "${RED} Formatting error: run mvn formatter:format and commit new changes ${NC}" && exit 1) diff --git a/pom.xml b/pom.xml index 1a9f6cb0abc..30498568147 100644 --- a/pom.xml +++ b/pom.xml @@ -54,650 +54,680 @@ mvn clean install -P spotbugs --> - - 4.0.0 - - - org.sonatype.oss - oss-parent - 9 - - - Dirigible - Parent - Dirigible Parent - org.eclipse.dirigible - dirigible-parent - 9.0.0-SNAPSHOT - pom - - 2010 - - - - Eclipse Public License - v 2.0 - https://www.eclipse.org/legal/epl-v20.html - repo - - - - http://www.dirigible.io - - - Eclipse Foundation - http://www.eclipse.org - - - - - default - - true - - - true - - - - - net.revelc.code.formatter - formatter-maven-plugin - 2.23.0 - - ${formatter.location} - ${formatter.java.version} - ${formatter.java.version} - ${formatter.java.version} - - - - validate-java-code-formatting - validate - - validate - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.plugin.version} - - ${maven.compiler.source} - ${maven.compiler.target} - true - lines,vars,source - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - --add-opens java.base/java.lang=ALL-UNNAMED - --add-opens java.base/java.math=ALL-UNNAMED - --add-opens java.base/java.util=ALL-UNNAMED - --add-opens java.base/java.util.concurrent=ALL-UNNAMED - --add-opens java.base/java.net=ALL-UNNAMED - --add-opens java.base/java.text=ALL-UNNAMED - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.6.2 - - ${java.version} - - - - attach-javadocs - - jar - - - - - - - org.apache.commons - commons-lang3 - ${commons.lang3} - - - - - - - - - license - - true - - - - - com.mycila - license-maven-plugin - ${license-maven-plugin.version} - true - -
${license.header.location}
- true - - ${project.inceptionYear} - ${currentYear} - - - src/**/*.java - src/**/*.xml - src/**/*.js - - - **/logback.xml - **/logback-test.xml - **/src/test/resources/** - **/src/main/resources/META-INF/dirigible/font-awesome-4.7.0/** - **/src/main/resources/META-INF/dirigible/font-dirigible/** - **/src/main/resources/META-INF/dirigible/ide-bpm/** - **/src/main/resources/META-INF/dirigible/ide-monaco/** - **/src/main/resources/META-INF/dirigible/ide-swagger/** - **/src/main/resources/META-INF/dirigible/resources-core/ui/** - **/src/main/resources/META-INF/dirigible/ide-terminal/js/** - **/src/main/resources/META-INF/dirigible/dev-tools/** - **/src/main/resources/META-INF/dirigible/template-mobile-hello-world/node_modules/** - **/src/main/resources/META-INF/dirigible/utils/jsonpath.js - - true - - - - com.mycila - license-maven-plugin-git - ${license-maven-plugin.version} - - - - - format-license - initialize - - format - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.plugin.version} - - ${maven.compiler.source} - ${maven.compiler.target} - true - lines,vars,source - - - - - - - - spotbugs - - false - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.plugin.version} - - ${maven.compiler.source} - ${maven.compiler.target} - true - lines,vars,source - - - - - com.github.spotbugs - spotbugs-maven-plugin - 4.8.1.0 - - - - com.github.spotbugs - spotbugs - 4.8.1 - - - - - - - - - - - coverage - - - - org.jacoco - jacoco-maven-plugin - 0.8.11 - - - - prepare-agent - - - - generate-code-coverage-report - test - - report - - - - - - - - - - release - - false - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.plugin.version} - - ${maven.compiler.source} - ${maven.compiler.target} - true - lines,vars,source - - - - org.apache.maven.plugins - maven-source-plugin - 3.3.0 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.6.2 - - - attach-javadocs - - jar - - - - - - - org.apache.commons - commons-lang3 - ${commons.lang3} - - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.1.0 - - - sign-artifacts - verify - - sign - - - - - --pinentry-mode - loopback - - - - - - - - - - - - - - ossrh - https://repo1.maven.org/maven2 - - false - - - true - - - - - - - sonatype-public-repository - https://oss.sonatype.org/content/groups/public - - false - - - true - - - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2 - - - - - http://bugs.dirigible.io - - - - modules - components - build - - - - - javax.servlet - javax.servlet-api - 4.0.1 - provided - - - - org.slf4j - slf4j-api - ${spring.boot.slf4j.version} - provided - - - ch.qos.logback - logback-core - ${spring.boot.logback.version} - provided - - - ch.qos.logback - logback-classic - ${spring.boot.logback.version} - provided - - - - com.google.code.gson - gson - ${gson.version} - - - commons-io - commons-io - ${commons.io} - - - - javax.annotation - jsr250-api - ${jsr250-api.version} - - - - org.apache.commons - commons-lang3 - ${commons.lang3} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.databind.version} - - - - - javax.xml.bind - jaxb-api - ${jaxb.version} - - - com.sun.xml.bind - jaxb-core - ${jaxb.version} - - - com.sun.xml.bind - jaxb-impl - ${jaxb.version} - - - jakarta.xml.ws - jakarta.xml.ws-api - ${jaxws.version} - - - com.google.guava - guava - ${guava.version} - - - - - com.squareup.okhttp3 - okhttp - ${okhttp3.version} - test - - - com.squareup.okhttp3 - okhttp-urlconnection - ${okhttp3.version} - test - - - org.hamcrest - hamcrest-all - ${hamcrest.all.version} - test - - - org.mockito - mockito-core - ${mockito.version} - test - - - org.mockito - mockito-inline - ${mockito-inline.version} - test - - - - - - Eclipse Dirigible - - UTF-8 - UTF-8 - - 17 - 17 - 17 - - 3.3.1 - 3.11.0 - 3.2.2 - 2.0.0 - branch - 2.15.0 - 1.16.0 - 3.13.0 - 1.3 - 1.10.0 - 2.10.1 - 5.7.0 - 5.2.0 - 4.13.2 - 1.3 - 1.8.0 - 4.12.0 - 2.9.0 - - 2.2.224 - 42.6.0 - 2.18.13 - 3.14.3 - - 5.18.3 - 1.0 - 9.8.0 - 1.1.0 - 6.8.0 - 2.3.0 - 2.3.3 - 2.1.5 - 4.3 - 2.2.3 - 6.7.0.202309050840-r - 1.6.4 - 2.0.13 - 3.6.0 - 4.9.10 - 3.12.14 - 3.1.8 - 4.24.0 - 1.10.0 - 1.13.0 - 11.7.0 - 0.30.2 - 1.8.2 - 1.6.5 - 5.1.0 - 0.40.0 - 2.3.6 - 3.3.12 - 3.6.0 - 1.0.8r1250 - 5.3.2 - 0.48 - 0.55 - 4.6.7 - 2.6.1 - 1.8.2 - 4.7.0 - 4.8.164 - 1.22 - 1.17.6 - 1.19.1 - 1.17.6 - 5.20.0 - 7.7.1 - 0.7.6 - 0.5.4 - 2.9.0 - 3.0.0 - 2.15.3 - 2.2.3 - 2.11.0 - - 5.5.18 - 2.7.5 - 1.7.36 - 1.2.11 - 5.3.24 - 5.8.0 - - 22.0.5 - 5.1.0 - 1.7 - 2.3.2 - 0.9.5.5 - 23.1.1 - 32.1.3-jre - 74.1 - 3.2.2 - 4.4 - 2.3 - 3.0.48.202308291007 - 0.64.8 - 2.3.1 - 1.12.586 - 1.17.6 - 3.11.3 - 5.0.2 - 3.3.2 - 1.1 - 3.21.2 - 3.0.0-M2 - 1.2.0 - - 1.7.0 - 1.6.10 - 4.13.2 - - eclipse - https://sonarcloud.io - - none - - https://github.com/dirigiblelabs/${content.repository.name} - scm:git:https://github.com/dirigiblelabs/${content.repository.name}.git - scm:git:https://github.com/dirigiblelabs/${content.repository.name} - master - - github - target - target/${content.project.name} - ${basedir}/src/main/resources/META-INF/dirigible/${content.project.name} - - licensing-header.txt - - ./ - ${parent.pom.folder}/dirigible-formatter.xml - ${java.version} - + + 4.0.0 + + + org.sonatype.oss + oss-parent + 9 + + + Dirigible - Parent + Dirigible Parent + org.eclipse.dirigible + dirigible-parent + 9.0.0-SNAPSHOT + pom + + 2010 + + + + Eclipse Public License - v 2.0 + https://www.eclipse.org/legal/epl-v20.html + repo + + + + http://www.dirigible.io + + + Eclipse Foundation + http://www.eclipse.org + + + + + + com.rudikershaw.gitbuildhook + git-build-hook-maven-plugin + ${git.build.hook.version} + + + hooks/ + true + + + + + + configure + + + + + + + + + + default + + true + + + true + + + + + net.revelc.code.formatter + formatter-maven-plugin + 2.23.0 + + ${formatter.location} + ${formatter.java.version} + ${formatter.java.version} + ${formatter.java.version} + + + + validate-java-code-formatting + validate + + validate + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.plugin.version} + + ${maven.compiler.source} + ${maven.compiler.target} + true + lines,vars,source + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.base/java.math=ALL-UNNAMED + --add-opens java.base/java.util=ALL-UNNAMED + --add-opens java.base/java.util.concurrent=ALL-UNNAMED + --add-opens java.base/java.net=ALL-UNNAMED + --add-opens java.base/java.text=ALL-UNNAMED + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.6.2 + + ${java.version} + + + + attach-javadocs + + jar + + + + + + + org.apache.commons + commons-lang3 + ${commons.lang3} + + + + + + + + + license + + true + + + + + com.mycila + license-maven-plugin + ${license-maven-plugin.version} + true + +
${license.header.location}
+ true + + ${project.inceptionYear} + ${currentYear} + + + src/**/*.java + src/**/*.xml + src/**/*.js + + + **/logback.xml + **/logback-test.xml + **/src/test/resources/** + **/src/main/resources/META-INF/dirigible/font-awesome-4.7.0/** + **/src/main/resources/META-INF/dirigible/font-dirigible/** + **/src/main/resources/META-INF/dirigible/ide-bpm/** + **/src/main/resources/META-INF/dirigible/ide-monaco/** + **/src/main/resources/META-INF/dirigible/ide-swagger/** + **/src/main/resources/META-INF/dirigible/resources-core/ui/** + **/src/main/resources/META-INF/dirigible/ide-terminal/js/** + **/src/main/resources/META-INF/dirigible/dev-tools/** + + **/src/main/resources/META-INF/dirigible/template-mobile-hello-world/node_modules/** + + **/src/main/resources/META-INF/dirigible/utils/jsonpath.js + + true + + + + com.mycila + license-maven-plugin-git + ${license-maven-plugin.version} + + + + + format-license + initialize + + format + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.plugin.version} + + ${maven.compiler.source} + ${maven.compiler.target} + true + lines,vars,source + + + + + + + + spotbugs + + false + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.plugin.version} + + ${maven.compiler.source} + ${maven.compiler.target} + true + lines,vars,source + + + + + com.github.spotbugs + spotbugs-maven-plugin + 4.8.1.0 + + + + com.github.spotbugs + spotbugs + 4.8.1 + + + + + + + + + + + coverage + + + + org.jacoco + jacoco-maven-plugin + 0.8.11 + + + + prepare-agent + + + + generate-code-coverage-report + test + + report + + + + + + + + + + release + + false + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.plugin.version} + + ${maven.compiler.source} + ${maven.compiler.target} + true + lines,vars,source + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.6.2 + + + attach-javadocs + + jar + + + + + + + org.apache.commons + commons-lang3 + ${commons.lang3} + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.1.0 + + + sign-artifacts + verify + + sign + + + + + --pinentry-mode + loopback + + + + + + + + + + + + + + ossrh + https://repo1.maven.org/maven2 + + false + + + true + + + + + + + sonatype-public-repository + https://oss.sonatype.org/content/groups/public + + false + + + true + + + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2 + + + + + http://bugs.dirigible.io + + + + modules + components + build + + + + + javax.servlet + javax.servlet-api + 4.0.1 + provided + + + + org.slf4j + slf4j-api + ${spring.boot.slf4j.version} + provided + + + ch.qos.logback + logback-core + ${spring.boot.logback.version} + provided + + + ch.qos.logback + logback-classic + ${spring.boot.logback.version} + provided + + + + com.google.code.gson + gson + ${gson.version} + + + commons-io + commons-io + ${commons.io} + + + + javax.annotation + jsr250-api + ${jsr250-api.version} + + + + org.apache.commons + commons-lang3 + ${commons.lang3} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.databind.version} + + + + + javax.xml.bind + jaxb-api + ${jaxb.version} + + + com.sun.xml.bind + jaxb-core + ${jaxb.version} + + + com.sun.xml.bind + jaxb-impl + ${jaxb.version} + + + jakarta.xml.ws + jakarta.xml.ws-api + ${jaxws.version} + + + com.google.guava + guava + ${guava.version} + + + + + com.squareup.okhttp3 + okhttp + ${okhttp3.version} + test + + + com.squareup.okhttp3 + okhttp-urlconnection + ${okhttp3.version} + test + + + org.hamcrest + hamcrest-all + ${hamcrest.all.version} + test + + + org.mockito + mockito-core + ${mockito.version} + test + + + org.mockito + mockito-inline + ${mockito-inline.version} + test + + + + + + Eclipse Dirigible + + UTF-8 + UTF-8 + + 17 + 17 + 17 + + 3.3.1 + 3.11.0 + 3.2.2 + 2.0.0 + branch + 2.15.0 + 1.16.0 + 3.13.0 + 1.3 + 1.10.0 + 2.10.1 + 5.7.0 + 5.2.0 + 4.13.2 + 1.3 + 1.8.0 + 4.12.0 + 2.9.0 + + 2.2.224 + 42.6.0 + 2.18.13 + 3.14.3 + + 5.18.3 + 1.0 + 9.8.0 + 1.1.0 + 6.8.0 + 2.3.0 + 2.3.3 + 2.1.5 + 4.3 + 2.2.3 + 6.7.0.202309050840-r + 1.6.4 + 2.0.13 + 3.6.0 + 4.9.10 + 3.12.14 + 3.1.8 + 4.24.0 + 1.10.0 + 1.13.0 + 11.7.0 + 0.30.2 + 1.8.2 + 1.6.5 + 5.1.0 + 0.40.0 + 2.3.6 + 3.3.12 + 3.6.0 + 1.0.8r1250 + 5.3.2 + 0.48 + 0.55 + 4.6.7 + 2.6.1 + 1.8.2 + 4.7.0 + 4.8.164 + 1.22 + 1.17.6 + 1.19.1 + 1.17.6 + 5.20.0 + 7.7.1 + 0.7.6 + 0.5.4 + 2.9.0 + 3.0.0 + 2.15.3 + 2.2.3 + 2.11.0 + + 5.5.18 + 2.7.5 + 1.7.36 + 1.2.11 + 5.3.24 + 5.8.0 + + 22.0.5 + 5.1.0 + 1.7 + 2.3.2 + 0.9.5.5 + 23.1.1 + 32.1.3-jre + 74.1 + 3.2.2 + 4.4 + 2.3 + 3.0.48.202308291007 + 0.64.8 + 2.3.1 + 1.12.586 + 1.17.6 + 3.11.3 + 5.0.2 + 3.3.2 + 1.1 + 3.21.2 + 3.0.0-M2 + 1.2.0 + + 1.7.0 + 1.6.10 + 4.13.2 + + eclipse + https://sonarcloud.io + + none + + https://github.com/dirigiblelabs/${content.repository.name} + scm:git:https://github.com/dirigiblelabs/${content.repository.name}.git + + scm:git:https://github.com/dirigiblelabs/${content.repository.name} + + master + + github + target + target/${content.project.name} + ${basedir}/src/main/resources/META-INF/dirigible/${content.project.name} + + + licensing-header.txt + + ./ + ${parent.pom.folder}/dirigible-formatter.xml + ${java.version} + 3.4.1 + From 7dbc4e68627262ee054a564ee536f5ccf1d37f81 Mon Sep 17 00:00:00 2001 From: Vladimir Mutafov Date: Tue, 14 Nov 2023 22:24:47 +0200 Subject: [PATCH 2/7] Update hooks/pre-push Co-authored-by: Yordan Pavlov --- hooks/pre-push | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hooks/pre-push b/hooks/pre-push index 012b94d2142..577693490ec 100755 --- a/hooks/pre-push +++ b/hooks/pre-push @@ -6,4 +6,4 @@ echo "${GREEN} Checking code formatting..." mvn formatter:validate > /dev/null status=$? -([ $status -eq 0 ] && echo "${GREEN} Formatting is OK ${NC}") || (echo "${RED} Formatting error: run mvn formatter:format and commit new changes ${NC}" && exit 1) +([ $status -eq 0 ] && echo "${GREEN} Formatting is OK ${NC}") || (echo "${RED} Formatting error, you can format the sources with the following command:\n\n\tmvn formatter:format\n${NC}" && exit 1) From 9d6c812379d63349f59b1bb63f1283efcd816f7e Mon Sep 17 00:00:00 2001 From: Iliyan Velichkov Date: Mon, 13 Jan 2025 14:11:10 +0200 Subject: [PATCH 3/7] formatting Signed-off-by: Iliyan Velichkov --- pom.xml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index 9b5f901a77c..49242a20d61 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 3.3.0 4.9.10 4.6 - 3.4.1 + 3.4.1 3.4.0 @@ -226,24 +226,24 @@ - - com.rudikershaw.gitbuildhook - git-build-hook-maven-plugin - ${git.build.hook.version} - - - hooks/ - true - - - - - - configure - - - - + + com.rudikershaw.gitbuildhook + git-build-hook-maven-plugin + ${git.build.hook.version} + + + hooks/ + true + + + + + + configure + + + + org.apache.maven.plugins maven-compiler-plugin @@ -825,4 +825,4 @@ - \ No newline at end of file + From 37768106d22f9cec0238bf888fe3085e3ab8d14a Mon Sep 17 00:00:00 2001 From: Iliyan Velichkov Date: Mon, 13 Jan 2025 14:51:17 +0200 Subject: [PATCH 4/7] unformatted code Signed-off-by: Iliyan Velichkov --- .../eclipse/dirigible/integration/tests/api/java/CsvimIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java index 38f1647a6d8..8589766731a 100644 --- a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java +++ b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java @@ -120,7 +120,7 @@ private void createUndefinedTable() { } private void verifyDataInTable(String tableName, List expectedReaders) { - await().atMost(30, TimeUnit.SECONDS) + await().atMost(30, TimeUnit.SECONDS) .pollInterval(1, TimeUnit.SECONDS) .until(() -> { try { From cc6e06eed01609ecf15e144644ff01c212b1d340 Mon Sep 17 00:00:00 2001 From: Iliyan Velichkov Date: Mon, 13 Jan 2025 14:52:22 +0200 Subject: [PATCH 5/7] more unformatted code Signed-off-by: Iliyan Velichkov --- .../dirigible/integration/tests/api/java/CsvimIT.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java index 8589766731a..d1ec55b82ba 100644 --- a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java +++ b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java @@ -121,6 +121,12 @@ private void createUndefinedTable() { private void verifyDataInTable(String tableName, List expectedReaders) { await().atMost(30, TimeUnit.SECONDS) + + + + + + .pollInterval(1, TimeUnit.SECONDS) .until(() -> { try { From 30a61d195c35db91617a934a7504752ea47a5a64 Mon Sep 17 00:00:00 2001 From: Iliyan Velichkov Date: Mon, 13 Jan 2025 14:53:24 +0200 Subject: [PATCH 6/7] more unformatted code Signed-off-by: Iliyan Velichkov --- .../eclipse/dirigible/integration/tests/api/java/CsvimIT.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java index d1ec55b82ba..cf231fe8c3b 100644 --- a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java +++ b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java @@ -127,6 +127,8 @@ private void verifyDataInTable(String tableName, List expectedReaders) { + + .pollInterval(1, TimeUnit.SECONDS) .until(() -> { try { From 9c4ab78e7b1fc3d8ebb16221bfcd357727740a53 Mon Sep 17 00:00:00 2001 From: Iliyan Velichkov Date: Mon, 13 Jan 2025 14:53:48 +0200 Subject: [PATCH 7/7] format the code Signed-off-by: Iliyan Velichkov --- .../integration/tests/api/java/CsvimIT.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java index cf231fe8c3b..4329c6ca1bf 100644 --- a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java +++ b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java @@ -79,8 +79,8 @@ public String toString() { } /** - * Initially the table READERS2 is not defined. However, the other two tables must be imported. Once - * the table is created, csvim retry should be able to import data in it as well + * Initially the table READERS2 is not defined. However, the other two tables must be imported. Once the table is created, csvim retry + * should be able to import data in it as well */ @Test void testImportData() throws SQLException { @@ -120,15 +120,7 @@ private void createUndefinedTable() { } private void verifyDataInTable(String tableName, List expectedReaders) { - await().atMost(30, TimeUnit.SECONDS) - - - - - - - - + await().atMost(30, TimeUnit.SECONDS) .pollInterval(1, TimeUnit.SECONDS) .until(() -> { try {