Merge branch 'release-2.1.0'

jdemetra · Apr 4, 2016 · 8fd1e07 · 8fd1e07
2 parents c5091e7 + 3ff551a
commit 8fd1e07
Show file tree

Hide file tree

Showing 736 changed files with 41,511 additions and 20,033 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,5 @@
+language: java
+jdk:
+  - openjdk7
+  - oraclejdk7
+  - oraclejdk8
diff --git a/README.md b/README.md
@@ -1,4 +1,15 @@
 jdemetra-core
 =============
 
- JDemetra+ core libraries
+ The JDemetra+ core libraries contain all the algorithmic part of the software and numerous peripheral services around time series (access to data providers, formatting...). JDemetra-core doesn't provide any graphical component.
+
+ A large part of the core of JDemetra+ is based on the programs TRAMO-SEATS(+) and X12-ARIMA.
+
+ The program TRAMO-SEATS+ is developed by Gianluca Caporello and Agustin Maravall -with programming support from Domingo Perez and Roberto Lopez- 
+ at the Bank of Spain. It is based on the program TRAMO-SEATS, previously developed by Victor Gomez and Agustin Maravall.
+ The original software can be downloaded from the following address:
+  [http://www.bde.es](http://www.bde.es "Bank of Spain")
+
+ The program X12-ARIMA was produced by the US-Census Bureau. It can be downloaded from the following address: [http://www.census.gov/srd/www/x12a](http://www.census.gov/srd/www/x12a "US-Census Bureau (X12a)")
+
+
diff --git a/commonprovider/pom.xml b/commonprovider/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>demetra-parent</artifactId>
-        <version>2.0.0</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/commonprovider/src/main/java/ec/tss/tsproviders/common/xml/wsTs.java b/commonprovider/src/main/java/ec/tss/tsproviders/common/xml/wsTs.java
@@ -26,7 +26,7 @@
 
 /**
  * 
- * @author PCuser
+ * @author Jean Palate
  */
 @XmlRootElement(name = "ts")
 @XmlType(name = "ts")

diff --git a/commonprovider/src/main/java/ec/tss/tsproviders/common/xml/wsTsData.java b/commonprovider/src/main/java/ec/tss/tsproviders/common/xml/wsTsData.java
@@ -29,7 +29,7 @@
 
 /**
  * 
- * @author PCuser
+ * @author Jean Palate
  */
 @XmlRootElement(name = "tsdata")
 @XmlType(name = "tsdata")

diff --git a/commonprovider/src/main/java/ec/tss/tsproviders/common/xml/wsTsWorkspace.java b/commonprovider/src/main/java/ec/tss/tsproviders/common/xml/wsTsWorkspace.java
@@ -19,7 +19,7 @@
 
 /**
  *
- * @author PCuser
+ * @author Jean Palate
  */
 import ec.tss.TsWorkspace;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/commonprovider/src/test/java/ec/tss/tsproviders/common/random/RandomProviderTest.java b/commonprovider/src/test/java/ec/tss/tsproviders/common/random/RandomProviderTest.java
@@ -27,7 +27,7 @@
 
 /**
  *
- * @author pcuser
+ * @author Jean Palate
  */
 public class RandomProviderTest {
 

diff --git a/jbench/pom.xml b/jbench/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>demetra-parent</artifactId>
-        <version>2.0.0</version>
+        <version>2.1.0</version>
     </parent>
     <artifactId>jbench</artifactId>
     <name>jbench</name>

diff --git a/jdbcprovider/pom.xml b/jdbcprovider/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>demetra-parent</artifactId>
-        <version>2.0.0</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -26,7 +26,7 @@
         <dependency>     
             <groupId>org.hsqldb</groupId>     
             <artifactId>hsqldb</artifactId>     
-            <version>2.3.2</version> 
+            <version>2.3.3</version> 
             <scope>test</scope>
         </dependency> 
     </dependencies>

diff --git a/jdbcprovider/src/main/java/ec/tss/tsproviders/db/DbBean.java b/jdbcprovider/src/main/java/ec/tss/tsproviders/db/DbBean.java
@@ -176,7 +176,7 @@ public DataSource toDataSource(String providerName, String version) {
     public String[] getDimArray() {
         return getDimArray(dimColumns);
     }
-    static final Splitter DIM_ARRAY_SPLITTER = Splitter.onPattern("\\W+").trimResults().omitEmptyStrings();
+    static final Splitter DIM_ARRAY_SPLITTER = Splitter.on(',').trimResults().omitEmptyStrings();
 
     static String[] getDimArray(String dimColumns) {
         return Iterables.toArray(DIM_ARRAY_SPLITTER.split(dimColumns), String.class);

diff --git a/jdbcprovider/src/main/java/ec/util/jdbc/JdbcTable.java b/jdbcprovider/src/main/java/ec/util/jdbc/JdbcTable.java
@@ -99,29 +99,29 @@ private static String[] getNormalizedColumnNames(ResultSetMetaData md) throws SQ
     @Nonnull
     private static JdbcTable fromMap(@Nonnull Map<String, String> map) {
         return new JdbcTable(
-                map.get(TABLE_CAT_COLUMN),
-                map.get(TABLE_SCHEM_COLUMN),
-                map.get(TABLE_NAME_COLUMN),
-                map.get(TABLE_TYPE_COLUMN),
-                map.get(REMARKS_COLUMN),
-                map.get(TYPE_CAT_COLUMN),
-                map.get(TYPE_SCHEM_COLUMN),
-                map.get(TYPE_NAME_COLUMN),
-                map.get(SELF_REFERENCING_COL_NAME_COLUMN),
-                map.get(REF_GENERATION_COLUMN));
+                get(map, "TABLE_CAT", "TABLE_CATALOG"),
+                get(map, "TABLE_SCHEM", "TABLE_SCHEMA"),
+                get(map, "TABLE_NAME"),
+                get(map, "TABLE_TYPE"),
+                get(map, "REMARKS"),
+                get(map, "TYPE_CAT"),
+                get(map, "TYPE_SCHEM"),
+                get(map, "TYPE_NAME"),
+                get(map, "SELF_REFERENCING_COL_NAME"),
+                get(map, "REF_GENERATION"));
     }
-    //
-    private static final String TABLE_CAT_COLUMN = "TABLE_CAT";
-    private static final String TABLE_SCHEM_COLUMN = "TABLE_SCHEM";
-    private static final String TABLE_NAME_COLUMN = "TABLE_NAME";
-    private static final String TABLE_TYPE_COLUMN = "TABLE_TYPE";
-    private static final String REMARKS_COLUMN = "REMARKS";
-    private static final String TYPE_CAT_COLUMN = "TYPE_CAT";
-    private static final String TYPE_SCHEM_COLUMN = "TYPE_SCHEM";
-    private static final String TYPE_NAME_COLUMN = "TYPE_NAME";
-    private static final String SELF_REFERENCING_COL_NAME_COLUMN = "SELF_REFERENCING_COL_NAME";
-    private static final String REF_GENERATION_COLUMN = "REF_GENERATION";
-    //
+
+    @Nullable
+    private static String get(@Nonnull Map<String, String> map, String... keys) {
+        for (String key : keys) {
+            String result = map.get(key);
+            if (result != null) {
+                return result;
+            }
+        }
+        return null;
+    }
+
     private final String catalog;
     private final String schema;
     private final String name;

diff --git a/jtss/pom.xml b/jtss/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>demetra-parent</artifactId>
-        <version>2.0.0</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/jtss/src/main/java/ec/tss/DynamicTsVariable.java b/jtss/src/main/java/ec/tss/DynamicTsVariable.java
@@ -26,18 +26,18 @@
 
 /**
  *
- * @author pcuser
+ * @author Jean Palate
  */
 public class DynamicTsVariable extends TsVariable implements IDynamicObject {
 
     private final TsMoniker moniker_;
 
     private static TsData fromMoniker(TsMoniker moniker) {
         Ts s = TsFactory.instance.createTs(null, moniker, TsInformationType.Data);
-        if (s != null && s.hasData() == TsStatus.Undefined) {
+        if (s.hasData() == TsStatus.Undefined) {
             s.load(TsInformationType.Data);
         }
-        return s != null ? s.getTsData() : null;
+        return s.getTsData();
 
     }
 

diff --git a/jtss/src/main/java/ec/tss/ICustomizable.java b/jtss/src/main/java/ec/tss/ICustomizable.java
@@ -20,7 +20,7 @@
 
 /**
  *
- * @author pcuser
+ * @author Jean Palate
  */
 public interface ICustomizable {
     public Object getProperties();

diff --git a/jtss/src/main/java/ec/tss/ITsIdentified.java b/jtss/src/main/java/ec/tss/ITsIdentified.java
@@ -20,7 +20,7 @@
 
 /**
  * 
- * @author PCuser
+ * @author Jean Palate
  */
 public interface ITsIdentified {
     /**