Skip to content

Commit 8fd1e07

Browse files
charphicharphi
committed
Merge branch 'release-2.1.0'
2 parents c5091e7 + 3ff551a commit 8fd1e07

File tree

736 files changed

+41511
-20033
lines changed

Some content is hidden

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

736 files changed

+41511
-20033
lines changed

‎.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
language: java
2+
jdk:
3+
- openjdk7
4+
- oraclejdk7
5+
- oraclejdk8

‎README.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11
jdemetra-core
22
=============
33

4-
JDemetra+ core libraries
4+
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.
5+
6+
A large part of the core of JDemetra+ is based on the programs TRAMO-SEATS(+) and X12-ARIMA.
7+
8+
The program TRAMO-SEATS+ is developed by Gianluca Caporello and Agustin Maravall -with programming support from Domingo Perez and Roberto Lopez-
9+
at the Bank of Spain. It is based on the program TRAMO-SEATS, previously developed by Victor Gomez and Agustin Maravall.
10+
The original software can be downloaded from the following address:
11+
[http://www.bde.es](http://www.bde.es "Bank of Spain")
12+
13+
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)")
14+
15+

‎commonprovider/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>eu.europa.ec.joinup.sat</groupId>
88
<artifactId>demetra-parent</artifactId>
9-
<version>2.0.0</version>
9+
<version>2.1.0</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎commonprovider/src/main/java/ec/tss/tsproviders/common/xml/wsTs.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
/**
2828
*
29-
* @author PCuser
29+
* @author Jean Palate
3030
*/
3131
@XmlRootElement(name = "ts")
3232
@XmlType(name = "ts")

‎commonprovider/src/main/java/ec/tss/tsproviders/common/xml/wsTsData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
/**
3131
*
32-
* @author PCuser
32+
* @author Jean Palate
3333
*/
3434
@XmlRootElement(name = "tsdata")
3535
@XmlType(name = "tsdata")

‎commonprovider/src/main/java/ec/tss/tsproviders/common/xml/wsTsWorkspace.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
/**
2121
*
22-
* @author PCuser
22+
* @author Jean Palate
2323
*/
2424
import ec.tss.TsWorkspace;
2525
import javax.xml.bind.annotation.XmlElement;

‎commonprovider/src/test/java/ec/tss/tsproviders/common/random/RandomProviderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
/**
2929
*
30-
* @author pcuser
30+
* @author Jean Palate
3131
*/
3232
public class RandomProviderTest {
3333

‎jbench/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>eu.europa.ec.joinup.sat</groupId>
77
<artifactId>demetra-parent</artifactId>
8-
<version>2.0.0</version>
8+
<version>2.1.0</version>
99
</parent>
1010
<artifactId>jbench</artifactId>
1111
<name>jbench</name>

‎jdbcprovider/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>eu.europa.ec.joinup.sat</groupId>
88
<artifactId>demetra-parent</artifactId>
9-
<version>2.0.0</version>
9+
<version>2.1.0</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

@@ -26,7 +26,7 @@
2626
<dependency>
2727
<groupId>org.hsqldb</groupId>
2828
<artifactId>hsqldb</artifactId>
29-
<version>2.3.2</version>
29+
<version>2.3.3</version>
3030
<scope>test</scope>
3131
</dependency>
3232
</dependencies>

‎jdbcprovider/src/main/java/ec/tss/tsproviders/db/DbBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public DataSource toDataSource(String providerName, String version) {
176176
public String[] getDimArray() {
177177
return getDimArray(dimColumns);
178178
}
179-
static final Splitter DIM_ARRAY_SPLITTER = Splitter.onPattern("\\W+").trimResults().omitEmptyStrings();
179+
static final Splitter DIM_ARRAY_SPLITTER = Splitter.on(',').trimResults().omitEmptyStrings();
180180

181181
static String[] getDimArray(String dimColumns) {
182182
return Iterables.toArray(DIM_ARRAY_SPLITTER.split(dimColumns), String.class);

‎jdbcprovider/src/main/java/ec/util/jdbc/JdbcTable.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -99,29 +99,29 @@ private static String[] getNormalizedColumnNames(ResultSetMetaData md) throws SQ
9999
@Nonnull
100100
private static JdbcTable fromMap(@Nonnull Map<String, String> map) {
101101
return new JdbcTable(
102-
map.get(TABLE_CAT_COLUMN),
103-
map.get(TABLE_SCHEM_COLUMN),
104-
map.get(TABLE_NAME_COLUMN),
105-
map.get(TABLE_TYPE_COLUMN),
106-
map.get(REMARKS_COLUMN),
107-
map.get(TYPE_CAT_COLUMN),
108-
map.get(TYPE_SCHEM_COLUMN),
109-
map.get(TYPE_NAME_COLUMN),
110-
map.get(SELF_REFERENCING_COL_NAME_COLUMN),
111-
map.get(REF_GENERATION_COLUMN));
102+
get(map, "TABLE_CAT", "TABLE_CATALOG"),
103+
get(map, "TABLE_SCHEM", "TABLE_SCHEMA"),
104+
get(map, "TABLE_NAME"),
105+
get(map, "TABLE_TYPE"),
106+
get(map, "REMARKS"),
107+
get(map, "TYPE_CAT"),
108+
get(map, "TYPE_SCHEM"),
109+
get(map, "TYPE_NAME"),
110+
get(map, "SELF_REFERENCING_COL_NAME"),
111+
get(map, "REF_GENERATION"));
112112
}
113-
//
114-
private static final String TABLE_CAT_COLUMN = "TABLE_CAT";
115-
private static final String TABLE_SCHEM_COLUMN = "TABLE_SCHEM";
116-
private static final String TABLE_NAME_COLUMN = "TABLE_NAME";
117-
private static final String TABLE_TYPE_COLUMN = "TABLE_TYPE";
118-
private static final String REMARKS_COLUMN = "REMARKS";
119-
private static final String TYPE_CAT_COLUMN = "TYPE_CAT";
120-
private static final String TYPE_SCHEM_COLUMN = "TYPE_SCHEM";
121-
private static final String TYPE_NAME_COLUMN = "TYPE_NAME";
122-
private static final String SELF_REFERENCING_COL_NAME_COLUMN = "SELF_REFERENCING_COL_NAME";
123-
private static final String REF_GENERATION_COLUMN = "REF_GENERATION";
124-
//
113+
114+
@Nullable
115+
private static String get(@Nonnull Map<String, String> map, String... keys) {
116+
for (String key : keys) {
117+
String result = map.get(key);
118+
if (result != null) {
119+
return result;
120+
}
121+
}
122+
return null;
123+
}
124+
125125
private final String catalog;
126126
private final String schema;
127127
private final String name;

‎jtss/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>eu.europa.ec.joinup.sat</groupId>
88
<artifactId>demetra-parent</artifactId>
9-
<version>2.0.0</version>
9+
<version>2.1.0</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎jtss/src/main/java/ec/tss/DynamicTsVariable.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@
2626

2727
/**
2828
*
29-
* @author pcuser
29+
* @author Jean Palate
3030
*/
3131
public class DynamicTsVariable extends TsVariable implements IDynamicObject {
3232

3333
private final TsMoniker moniker_;
3434

3535
private static TsData fromMoniker(TsMoniker moniker) {
3636
Ts s = TsFactory.instance.createTs(null, moniker, TsInformationType.Data);
37-
if (s != null && s.hasData() == TsStatus.Undefined) {
37+
if (s.hasData() == TsStatus.Undefined) {
3838
s.load(TsInformationType.Data);
3939
}
40-
return s != null ? s.getTsData() : null;
40+
return s.getTsData();
4141

4242
}
4343

‎jtss/src/main/java/ec/tss/ICustomizable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
/**
2222
*
23-
* @author pcuser
23+
* @author Jean Palate
2424
*/
2525
public interface ICustomizable {
2626
public Object getProperties();

‎jtss/src/main/java/ec/tss/ITsIdentified.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
/**
2222
*
23-
* @author PCuser
23+
* @author Jean Palate
2424
*/
2525
public interface ITsIdentified {
2626
/**

0 commit comments

Comments
 (0)