Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/support for profile observations #31

Merged
merged 29 commits into from
May 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
c22cb77
delete merge artifact
ridoo Apr 12, 2017
5dcf5a0
add parent/child flags for observation
ridoo Apr 12, 2017
a2d8b2b
apply parent filter
ridoo Apr 12, 2017
0e9ce76
init support types for profile observations
ridoo Apr 12, 2017
c232483
update license headers
ridoo Apr 12, 2017
4205144
Merge branch 'develop' into feature/support-for-profile-observations
ridoo Apr 12, 2017
2e8881b
use latest milestone release of sos
ridoo May 3, 2017
af25f84
Merge branch 'develop' into feature/support-for-profile-observations
ridoo May 9, 2017
3867212
valuetype has to be set from datasource
ridoo May 9, 2017
776bed4
set vertical unit
ridoo May 9, 2017
688724b
rename method
ridoo May 9, 2017
50d95b1
use SNAPSHOT of REST API
ridoo May 9, 2017
c48499a
add profile repository
ridoo May 9, 2017
ee16158
assemble profile data items from observation children
ridoo May 9, 2017
1410ce5
make generic more concrete
ridoo May 9, 2017
09560b1
organize imports
ridoo May 9, 2017
a10946c
configure quantity IO Factory
ridoo May 9, 2017
7debbca
add timestart/timeend
ridoo May 9, 2017
38ddd1f
cleanup a bit, fit to usual workflow
ridoo May 9, 2017
879fd88
whitespace formatting
ridoo May 9, 2017
f31e9c0
some formatting
ridoo May 9, 2017
95bc28f
remove not used complexChild parameter
ridoo May 9, 2017
a2fb306
Merge branch 'develop' of https://github.com/52North/dao-series-api i…
ridoo May 10, 2017
e0a8299
Merge branch 'develop' into feature/support-for-profile-observations
ridoo May 10, 2017
ad8535b
Merge branch 'develop' into feature/support-for-profile-observations
ridoo May 10, 2017
388290f
update license header
ridoo May 10, 2017
fd0c1d3
fix findbugs boxing issue
ridoo May 10, 2017
e42f28f
Merge branch 'feature/support-for-profile-observations' of github.com…
ridoo May 10, 2017
aefc83a
satisfy checkstyle errors
ridoo May 10, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 29 additions & 9 deletions dao/src/main/java/org/n52/series/db/beans/DataEntity.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,13 @@ public abstract class DataEntity<T> {
private Date validTimeEnd;

private Date resultTime;

private String valueType;

private boolean parent;

private boolean child;

private final Set<Parameter< ? >> parameters = new HashSet<>(0);

public Long getPkid() {
Expand Down Expand Up @@ -230,6 +234,30 @@ public void setResultTime(Date resultTime) {
: null;
}

public String getValueType() {
return valueType;
}

public void setValueType(String valueType) {
this.valueType = valueType;
}

public boolean isParent() {
return parent;
}

public void setParent(boolean parent) {
this.parent = parent;
}

public boolean isChild() {
return child;
}

public void setChild(boolean child) {
this.child = child;
}

public Set<Parameter< ? >> getParameters() {
return parameters;
}
Expand All @@ -244,14 +272,6 @@ public boolean hasParameters() {
return getParameters() != null && !getParameters().isEmpty();
}

public String getValueType() {
return valueType;
}

public void setValueType(String valueType) {
this.valueType = valueType;
}

@Override
public String toString() {
StringBuilder sb = new StringBuilder();
Expand Down
226 changes: 0 additions & 226 deletions dao/src/main/java/org/n52/series/db/beans/DataEntity.java.orig

This file was deleted.

43 changes: 43 additions & 0 deletions dao/src/main/java/org/n52/series/db/beans/ProfileDataEntity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
* Copyright (C) 2015-2017 52°North Initiative for Geospatial Open Source
* Software GmbH
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation.
*
* If the program is linked with libraries which are licensed under one of
* the following licenses, the combination of the program with the linked
* library is not considered a "derivative work" of the program:
*
* - Apache License, version 2.0
* - Apache Software License, version 1.0
* - GNU Lesser General Public License, version 3
* - Mozilla Public License, versions 1.0, 1.1 and 2.0
* - Common Development and Distribution License (CDDL), version 1.0
*
* Therefore the distribution of the program linked with libraries licensed
* under the aforementioned licenses, is permitted by the copyright holders
* if the distribution is compliant with both the GNU General Public License
* version 2 and the aforementioned licenses.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/

package org.n52.series.db.beans;

import java.util.Collection;
import java.util.Set;

public class ProfileDataEntity extends DataEntity<Set<DataEntity< ? >>> {

@Override
public boolean isNoDataValue(Collection<String> noDataValues) {
// TODO Auto-generated method stub
return false;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
* Copyright (C) 2015-2017 52°North Initiative for Geospatial Open Source
* Software GmbH
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation.
*
* If the program is linked with libraries which are licensed under one of
* the following licenses, the combination of the program with the linked
* library is not considered a "derivative work" of the program:
*
* - Apache License, version 2.0
* - Apache Software License, version 1.0
* - GNU Lesser General Public License, version 3
* - Mozilla Public License, versions 1.0, 1.1 and 2.0
* - Common Development and Distribution License (CDDL), version 1.0
*
* Therefore the distribution of the program linked with libraries licensed
* under the aforementioned licenses, is permitted by the copyright holders
* if the distribution is compliant with both the GNU General Public License
* version 2 and the aforementioned licenses.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
package org.n52.series.db.beans;

public class ProfileDatasetEntity extends DatasetEntity<ProfileDataEntity> {

private String verticalParameterName;

public String getVerticalParameterName() {
return verticalParameterName;
}

public void setVerticalParameterName(String verticalParameterName) {
this.verticalParameterName = verticalParameterName;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
public class RecordDatasetEntity extends DatasetEntity<RecordDataEntity> {

private Set<RecordDatasetEntity> referenceValues = new HashSet<>();

public RecordDatasetEntity() {
super();
}

public Set<RecordDatasetEntity> getReferenceValues() {
return referenceValues;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public abstract class AbstractDataRepository<D extends Data< ? >,
extends SessionAwareRepository implements DataRepository<S, V> {

@Override
public Data< ? > getData(String datasetId, DbQuery dbQuery) throws DataAccessException {
public Data< ? extends AbstractValue< ? >> getData(String datasetId, DbQuery dbQuery) throws DataAccessException {
Session session = getSession();
try {
DatasetDao<S> seriesDao = getSeriesDao(session);
Expand Down
Loading