Merge branch 'develop' into 5.x/proxy_cache_hibernate_5

.travis.yml

@@ -1,9 +1,10 @@
 language: java
 jdk:
-  - oraclejdk8
-before_install:
-  - sudo hostname "$(hostname | cut -c1-63)"
-  - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts | sudo tee /etc/hosts
+    - oraclejdk8
+addons:
+  hosts:
+    - myshorthost
+  hostname: myshorthost
 install: true
 script: mvn -U -B clean install
 cache:

NOTICE

@@ -288,6 +288,7 @@ This project includes:
   OGC WaterML schema (spec. v2.0) under The Apache Software License, Version 2.0
   ojdbc6 under Oracle Technology Network Development and Distribution License, http://www.oracle.com/technetwork/licenses/distribution-license-152002.html
   Open GIS Interfaces under GNU Lesser General Public License (LGPL) version 2.1
+  org.locationtech.jts:jts-core under Eclipse Publish License, Version 1.0 or Eclipse Distribution License - v 1.0
   Portele Schape Change schema (spec. v3.0) under The Apache Software License, Version 2.0
   Postgis JDBC Driver under GNU Lesser General Public License
   PostgreSQL JDBC Driver - JDBC 4.1 under The PostgreSQL License

RELEASE-NOTES

@@ -6,25 +6,36 @@ RELEASE NOTES
  SensorML instance document), and information about the sensor mounting platform
  (SensorML as well).
 
-   Release 52n-sensorweb-sos-4.4.x
+   Release 52n-sensorweb-sos-4.4.2
 ====================================
 
   --- New features ---
 
       * Result filtering for GetObservation and GetDataAvailability
       * Spatial filtering for GetDataAvailability
+      * Insertion of static reference values (stored as own procedure and series)
 
   --- Changes ---
 
-      * 
+      * Move REST-API and Helgoland Client to webapp module (included by default)
 
   --- Fixed issues ---
 
       * Issue #212: Allow sort by status in 52n-sos-webapp/admin/operations
+      * Issue #555:Wrong error code when sending plain SensorML and not a request
       * Issue #572: Fix NPE in InsertSensor when procedure description has invalid namespace declaration
       * Issue #574: Capabilities shows metadata and test client provides examples for not supported operations
       * Issue #575: HibernateMetadataCache not updated after resetting the SOS
       * Issue #581: Cache: loosing spatial information after manually triggered update
+      * Issue #584: responseFormat-Parameter "uvf" results in Java Exception
+      * Issue #590: Creating a permlink is not working for +2000 chars
+      * Issue #592: SQL Server datasource does not add null constraint to series.identifier
+      * Issue #596: InsertSensor does not check if offering is already related to another procedure
+      * Set vertical datum name from datasource entity (#585)
+      * Encode description element (#585)
+      * Fix issue when the cache thread cound is equal or greater than the max connection count
+      * Fix CRS and EPSG code settings (#579)
+      * Creation of LineString WKT in GmlDecoderv321
 
    Release 52n-sensorweb-sos-4.4.1
 ====================================

hibernate/common/src/main/java/org/n52/sos/ds/hibernate/dao/OfferingDAO.java

@@ -473,6 +473,34 @@ public Map<String, TimePeriod> getTemporalBoundingBoxesForOfferings(final Sessio
         return new HashMap<>(0);
     }
 
+    /**
+     * Insert or update and get offering
+     *
+     * @param offeringIdentifier
+     *            Offering identifier
+     * @param offeringName
+     *            Offering name
+     * @param relatedFeatures
+     *            Related feature objects
+     * @param observationTypes
+     *            Allowed observation type objects
+     * @param featureOfInterestTypes
+     *            Allowed featureOfInterest type objects
+     * @param session
+     *            Hibernate session
+     * @return Offering object
+     *
+     * @deprecated
+     *          use {@link #getAndUpdateOrInsertNewOffering(SosOffering, List, List, List, Session)}
+     */
+    @Deprecated
+    public Offering getAndUpdateOrInsertNewOffering(final String offeringIdentifier, final String offeringName,
+            final List<RelatedFeature> relatedFeatures, final List<ObservationType> observationTypes,
+            final List<FeatureOfInterestType> featureOfInterestTypes, final Session session) {
+        return getAndUpdateOrInsertNewOffering(new SosOffering(offeringIdentifier, offeringName), relatedFeatures,
+                observationTypes, featureOfInterestTypes, session);
+    }
+
     /**
      * Insert or update and get offering
      *

hibernate/common/src/main/java/org/n52/sos/ds/hibernate/dao/ProcedureDAO.java

@@ -353,7 +353,7 @@ public List<String> getProceduresForAbstractFeatureEntity(final Session session,
                         getDetachedCriteriaProceduresForAbstractFeatureEntityFromSeries(feature, session)));
                 c.setProjection(Projections.distinct(Projections.property(ProcedureEntity.IDENTIFIER)));
             LOGGER.debug("QUERY getProceduresForAbstractFeatureEntity(feature): {}", HibernateHelper.getSqlString(c));
-            return (List<String>) c.list();
+            return c.list();
         }
     }
 
@@ -745,6 +745,31 @@ public DateTime getMaxDate4Procedure(final String procedure, final Session sessi
      *            ProcedureEntity identifier
      * @param procedureDescriptionFormat
      *            ProcedureEntity description format object
+     * @param parentProcedures
+     *            Parent procedure identifiers
+     * @param session
+     *            Hibernate session
+     * @return Procedure object
+     *
+     * @deprecated use
+     *      {@link #getOrInsertProcedure(String, ProcedureDescriptionFormat, SosProcedureDescription, boolean, Session)}
+     */
+    @Deprecated
+    public Procedure getOrInsertProcedure(final String identifier,
+            final ProcedureDescriptionFormat procedureDescriptionFormat, final Collection<String> parentProcedures,
+            final Session session) {
+        SosProcedureDescription procedure = new SosProcedureDescriptionUnknowType(identifier,
+                procedureDescriptionFormat.getProcedureDescriptionFormat(), "").setParentProcedures(parentProcedures);
+        return getOrInsertProcedure(identifier, procedureDescriptionFormat, procedure, false, session);
+    }
+
+    /**
+     * Insert and get procedure object
+     *
+     * @param identifier
+     *            Procedure identifier
+     * @param procedureDescriptionFormat
+     *            Procedure description format object
      * @param procedureDescription
      *            {@link SosProcedureDescription} to insert
      * @param isType
@@ -791,6 +816,11 @@ public ProcedureEntity getOrInsertProcedure(String identifier, FormatEntity proc
                     procedure.setInsitu(sml.getInsitu());
                 }
             }
+            if (procedureDescription.isSetInsitu()) {
+                tProcedure.setInsitu(procedureDescription.getInsitu());
+            }
+            tProcedure.setReference(procedureDescription.isReference());
+            procedure = tProcedure;
         }
         procedure.setDeleted(false);
         session.saveOrUpdate(procedure);