Skip to content

Commit cc0cd5f

Browse files
committed
Added coverage tests for Spark compute engine
1 parent 655c8a4 commit cc0cd5f

File tree

257 files changed

+17514
-1265
lines changed

Some content is hidden

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

257 files changed

+17514
-1265
lines changed

pom.xml

+5-20
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<module>vtl-engine</module>
9292
<module>vtl-envs</module>
9393
<module>vtl-meta</module>
94-
<module>vtl-parser</module>
94+
<module>vtl-parsers</module>
9595
<module>vtl-samples</module>
9696
<module>vtl-session</module>
9797
<module>vtl-transform</module>
@@ -141,7 +141,6 @@
141141

142142
<site.version>3.12.1</site.version>
143143
<reflow.version>2.3.4</reflow.version>
144-
<asciidoctor.version>2.2.4</asciidoctor.version>
145144
<doxia.markdown.version>1.12.0</doxia.markdown.version>
146145

147146
<slf4j.version>2.0.12</slf4j.version>
@@ -163,7 +162,7 @@
163162
<jaxb.runtime.version>4.0.5</jaxb.runtime.version>
164163
<thymeleaf.version>3.1.2.RELEASE</thymeleaf.version>
165164
<node.version>v20.12.2</node.version>
166-
<antlr4.version>4.13.1</antlr4.version>
165+
<antlr4.version>4.9.3</antlr4.version>
167166
<io.sdmx.version>1.0.57</io.sdmx.version>
168167
<spring.version>5.3.31</spring.version>
169168
<guava.version>30.1.1-jre</guava.version>
@@ -303,10 +302,10 @@
303302
</dependency>
304303
<dependency>
305304
<groupId>it.bancaditalia.oss.vtl</groupId>
306-
<artifactId>vtl-parser</artifactId>
307-
<classifier>parser-js</classifier>
305+
<artifactId>vtl-jsparser</artifactId>
308306
<version>${project.version}</version>
309307
<type>zip</type>
308+
<classifier>grammar</classifier>
310309
</dependency>
311310
<dependency>
312311
<groupId>it.bancaditalia.oss.vtl</groupId>
@@ -540,7 +539,7 @@
540539
<dependency>
541540
<groupId>com.esotericsoftware</groupId>
542541
<artifactId>kryo</artifactId>
543-
<version>4.0.2</version>
542+
<version>4.0.3</version>
544543
<scope>test</scope>
545544
<exclusions>
546545
<exclusion>
@@ -587,11 +586,6 @@
587586
<artifactId>reflow-velocity-tools</artifactId>
588587
<version>${reflow.version}</version>
589588
</dependency>
590-
<dependency>
591-
<groupId>org.asciidoctor</groupId>
592-
<artifactId>asciidoctor-maven-plugin</artifactId>
593-
<version>${asciidoctor.version}</version>
594-
</dependency>
595589
<dependency>
596590
<groupId>org.apache.maven.doxia</groupId>
597591
<artifactId>doxia-module-markdown</artifactId>
@@ -834,14 +828,10 @@
834828
</licenseSets>
835829
<mapping>
836830
<R>SCRIPT_STYLE</R>
837-
<adoc>ASCIIDOC_STYLE</adoc>
838831
<vtl>JAVADOC_STYLE</vtl>
839832
<xjb>XML_STYLE</xjb>
840833
</mapping>
841834
<failIfUnknown>true</failIfUnknown>
842-
<headerDefinitions>
843-
<headerDefinition>license-files/asciidoc-format.xml</headerDefinition>
844-
</headerDefinitions>
845835
<properties>
846836
<owner>${project.organization.name}</owner>
847837
</properties>
@@ -920,11 +910,6 @@
920910
<configuration>
921911
<port>18881</port>
922912
<tempWebappDirectory>${project.build.directory}/site</tempWebappDirectory>
923-
<asciidoc>
924-
<attributes>
925-
<snippets>${project.basedir}/vtl-bundles/vtl-rest/target/generated-snippets</snippets>
926-
</attributes>
927-
</asciidoc>
928913
</configuration>
929914
</plugin>
930915
<plugin>

src/site/asciidoc/compile.adoc

-61
This file was deleted.

src/site/asciidoc/metadata.adoc

-59
This file was deleted.

src/site/asciidoc/resolve.adoc

-59
This file was deleted.

src/site/markdown/rest-setup.md.vm

-109
This file was deleted.

vtl-api/src/main/java/it/bancaditalia/oss/vtl/config/ConfigurationManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* Interface for the service used by the application to load and provide implementations
3838
* for the various VTL Engine components.
3939
*
40-
* Instances of this interface are provided by {@link ConfigurationManagerFactory#getInstance()}.
40+
* Instances of this interface are provided by {@link ConfigurationManagerFactory#newManager()}.
4141
*
4242
* @author Valentino Pinna
4343
*/

vtl-api/src/main/java/it/bancaditalia/oss/vtl/config/ConfigurationManagerFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static void loadConfiguration(Reader input) throws IOException
6868
/**
6969
* @return an application-wide {@link ConfigurationManager} instance.
7070
*/
71-
public static ConfigurationManager getInstance()
71+
public static ConfigurationManager newManager()
7272
{
7373
if (INSTANCE != null)
7474
return INSTANCE;

0 commit comments

Comments
 (0)