Sonatype OSS requirements

Author: vpinna80

vtl-bundles/vtl-r/RVTL/src/main/resources/R/R/VTLSession.R

@@ -53,7 +53,7 @@ VTLSession <- R6Class("VTLSession",
       #' This method should not be called by the application.
       finalize = function() { 
                     finalized <- T
-                    private$instance <- NULL
+                    private$clearInstance() 
                     return(invisible()) 
                   },
 
@@ -73,14 +73,14 @@ VTLSession <- R6Class("VTLSession",
       #' The editor code to associate this session
       setText = function(code) { 
         self$text <- code
-        instance <- NULL
+        private$clearInstance()
         return(invisible(self)) 
       },
 
       #' @description
       #' Compiles the VTL statements submitted for this session.
       compile = function () {
-        private$instance = NULL; 
+        private$clearInstance()
         private$checkInstance()$compile()
       },
 
@@ -107,13 +107,16 @@ VTLSession <- R6Class("VTLSession",
       #' @param nodes
       #' a list of names of nodes to compute from this session
       getValues = function (nodes) {
-                    jnodes <- sapply(X = nodes, private$checkInstance()$resolve)
-                    nodesdf <- lapply(names(jnodes), FUN = function(x, jnodes, jstructs) {
-                      jnode <- jnodes[[x]]
+                    nodesdf <- lapply(nodes, function(node) {
+                      df <- get0(node, envir = private$env)
+                      if (!is.null(df)) {
+                        return(df)
+                      } 
+                      
+                      jnode <- private$checkInstance()$resolve(node)
                       if (jnode %instanceof% "it.bancaditalia.oss.vtl.model.data.ScalarValue") {
                         df <- as.data.frame(list(Scalar = jnode$get()))
-                      }
-                      else if (jnode %instanceof% "it.bancaditalia.oss.vtl.model.data.DataSet") {
+                      } else {
                         pager <- .jnew("it.bancaditalia.oss.vtl.util.Paginator", 
                                        .jcast(jnode, "it.bancaditalia.oss.vtl.model.data.DataSet"), 100L)
                         nc <- jnode$getMetadata()$size()
@@ -123,13 +126,15 @@ VTLSession <- R6Class("VTLSession",
                         })
                         attr(df, 'measures') <- sapply(jnode$getMetadata()$getMeasures(), function(x) { x$getVariable()$getName() })
                         attr(df, 'identifiers') <- sapply(jnode$getMetadata()$getIDs(), function(x) { x$getVariable()$getName() })
+                      } else {
+                         stop(paste0("Unsupported result class: ", jnode$getClass()$getName()))
                       }
-                      else
-                        stop(paste0("Unsupported result class: ", jnode$getClass()$getName()))
 
-                      return (df)
-                    }, jnodes, jstructs)
-                    names(nodesdf) <- names(jnodes)
+                      assign(node, df, envir = private$env)
+                      return(df)
+                    })
+                    
+                    names(nodesdf) <- nodes
                     return(nodesdf)
                   },
 
@@ -198,6 +203,7 @@ VTLSession <- R6Class("VTLSession",
     ),
     private = list(
       instance = NULL,
+      env <- new.env(parent = emptyenv())
       finalized = F,
       checkInstance = function() {
         if (private$finalized)
@@ -207,6 +213,11 @@ VTLSession <- R6Class("VTLSession",
         }
         return(invisible(private$instance))
       }
+      clearInstance = function() {
+        self$instance <- NULL
+        self$env <- new.env(parent = emptyenv())
+        .jgc()
+      }
     )
   )
 

vtl-parser/javadoc/README.md

@@ -0,0 +1 @@
+All sources are generated.

vtl-parser/pom.xml

@@ -54,10 +54,6 @@
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>flatten-maven-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-gpg-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.antlr</groupId>
 				<artifactId>antlr4-maven-plugin</artifactId>
@@ -108,6 +104,23 @@
 					<attach>true</attach>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>empty-javadoc</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<classifier>javadoc</classifier>
+							<classesDirectory>${basedir}/javadoc</classesDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
@@ -116,9 +129,13 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<configuration>
-					<excludePackageNames>it.bancaditalia.oss.vtl.grammar</excludePackageNames>
+					<skip>true</skip>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-gpg-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>
 </project>