diff --git a/hibernate/common/src/main/java/org/n52/sos/ds/hibernate/dao/series/SeriesObservationDAO.java b/hibernate/common/src/main/java/org/n52/sos/ds/hibernate/dao/series/SeriesObservationDAO.java index bed7c65ef5..c857b14ce9 100644 --- a/hibernate/common/src/main/java/org/n52/sos/ds/hibernate/dao/series/SeriesObservationDAO.java +++ b/hibernate/common/src/main/java/org/n52/sos/ds/hibernate/dao/series/SeriesObservationDAO.java @@ -91,9 +91,9 @@ /** * Hibernate data access class for series observations - * + * * @since 4.0.0 - * + * */ public class SeriesObservationDAO extends AbstractObservationDAO { @@ -101,7 +101,7 @@ public class SeriesObservationDAO extends AbstractObservationDAO { /** * Create series observation query criteria for series and offerings - * + * * @param clazz * Class to query * @param series @@ -122,7 +122,7 @@ private Criteria createCriteriaFor(Class clazz, Series series, List o /** * Create series observation query criteria for series - * + * * @param Class * to query * @param series @@ -191,7 +191,7 @@ public boolean checkSweDataArrayObservationsFor(String offeringIdentifier, Sessi /** * Query series observation for series and offerings - * + * * @param series * Series to get values for * @param offerings @@ -209,7 +209,7 @@ public List getSeriesObservationFor(Series series, List getSeriesObservationFor(Series series, List getSeriesObservationForSosIndeterminateTimeFilter /** * Query series observations for GetObservation request and features - * + * * @param request * GetObservation request * @param features @@ -271,7 +271,7 @@ public List getSeriesObservationsFor(GetObservationRequest re /** * Query series observations {@link ScrollableResults} for GetObservation * request and features - * + * * @param request * GetObservation request * @param features @@ -289,7 +289,7 @@ public ScrollableResults getStreamingSeriesObservationsFor(GetObservationRequest /** * Query series observations for GetObservation request, features, and a * filter criterion (typically a temporal filter) - * + * * @param request * GetObservation request * @param features @@ -310,7 +310,7 @@ public List getSeriesObservationsFor(GetObservationRequest re /** * Query series observations {@link ScrollableResults} for GetObservation * request, features, and a filter criterion (typically a temporal filter) - * + * * @param request * GetObservation request * @param features @@ -331,7 +331,7 @@ public ScrollableResults getStreamingSeriesObservationsFor(GetObservationRequest /** * Query series observations for GetObservation request, features, and an * indeterminate time (first/latest) - * + * * @param request * GetObservation request * @param features @@ -355,7 +355,7 @@ public List getSeriesObservationsFor(GetObservationRequest re * (first/latest). This method is private and accepts all possible arguments * for request-based getSeriesObservationFor. Other public methods overload * this method with sensible combinations of arguments. - * + * * @param request * GetObservation request * @param features @@ -383,7 +383,7 @@ private List getSeriesObservationsFor(GetObservationRequest r * (first/latest). This method is private and accepts all possible arguments * for request-based getSeriesObservationFor. Other public methods overload * this method with sensible combinations of arguments. - * + * * @param request * GetObservation request * @param features @@ -411,7 +411,7 @@ private ScrollableResults getStreamingSeriesObservationsFor(GetObservationReques * possible arguments for request-based getSeriesObservationFor. Other * public methods overload this method with sensible combinations of * arguments. - * + * * @param request * GetObservation request * @param features @@ -430,7 +430,7 @@ private Criteria getSeriesObservationCriteriaFor(GetObservationRequest request, throws OwsExceptionReport { final Criteria c = getDefaultObservationCriteria(SeriesObservation.class, session); - + String seriesAlias = createSeriesAliasAndRestrictions(c); checkAndAddSpatialFilteringProfileCriterion(c, request, session); @@ -499,13 +499,13 @@ public List getSeriesObservationsFor(Series series, GetObserv /** * Add an indeterminate time restriction to a criteria for series support. - * - * + * + * * This allows for multiple results if more than one observation has the * extrema time (max for latest, min for first). Note: use this method * *after* adding all other applicable restrictions so that they will apply * to the min/max observation time determination. - * + * * @param c * Criteria to add the restriction to * @param sosIndeterminateTime @@ -529,7 +529,7 @@ protected Criteria addIndeterminateTimeRestriction(Criteria c, SosIndeterminateT /** * Check if {@link Series} contains first or last timestamp for * {@link SosIndeterminateTime}. - * + * * @param indetTime * {@link SosIndeterminateTime} to check * @param series @@ -548,7 +548,7 @@ protected boolean checkIndeterminateTimeAndSeries(SosIndeterminateTime indetTime /** * Get the first or last timestamp from {@link Series} - * + * * @param indetTime * {@link SosIndeterminateTime} to get timestamp for * @param series @@ -566,7 +566,7 @@ protected Date getFirstLastestTimeStamp(SosIndeterminateTime indetTime, Series s /** * Query the min time from series observations for series - * + * * @param series * Series to get values for * @param session @@ -585,7 +585,7 @@ public DateTime getMinSeriesObservationTime(Series series, Session session) { /** * Query the max time from series observations for series - * + * * @param series * Series to get values for * @param session @@ -604,7 +604,7 @@ public DateTime getMaxSeriesObservationTime(Series series, Session session) { /** * Create criteria to query min/max time for series from series observation - * + * * @param series * Series to get values for * @param list @@ -627,7 +627,7 @@ public Criteria getMinMaxTimeCriteriaForSeriesObservation(Series series, Collect /** * Get the result times for this series, offerings and filters - * + * * @param series * Timeseries to get result times for * @param offerings @@ -732,7 +732,7 @@ protected void addObservationIdentifiersToObservation(ObservationIdentifiers obs observationIdentifiers.getObservableProperty(), observationIdentifiers.getProcedure(), session); ((SeriesObservation) hObservation).setSeries(series); - seriesDAO.updateSeriesWithFirstLatestValues(series, hObservation, session); +// seriesDAO.updateSeriesWithFirstLatestValues(series, hObservation, session); } @Override @@ -796,7 +796,7 @@ public Criteria getObservationInfoCriteriaForFeatureOfInterestAndOffering(String /** * Update series observation by setting deleted flag - * + * * @param series * Series for which the observations should be updated * @param deleteFlag @@ -917,7 +917,7 @@ public List getSamplingGeometries(String feature, Session session) { /** * Get the first not deleted observation for the {@link Series} - * + * * @param series * Series to get observation for * @param session @@ -935,7 +935,7 @@ public SeriesObservation getFirstObservationFor(Series series, Session session) /** * Get the last not deleted observation for the {@link Series} - * + * * @param series * Series to get observation for * @param session diff --git a/hibernate/dao/src/main/java/org/n52/sos/ds/hibernate/InsertObservationDAO.java b/hibernate/dao/src/main/java/org/n52/sos/ds/hibernate/InsertObservationDAO.java index 795e0439da..d9eced96c2 100644 --- a/hibernate/dao/src/main/java/org/n52/sos/ds/hibernate/InsertObservationDAO.java +++ b/hibernate/dao/src/main/java/org/n52/sos/ds/hibernate/InsertObservationDAO.java @@ -75,7 +75,7 @@ /** * Implementation of the abstract class AbstractInsertObservationDAO - * + * * @since 4.0.0 * */ @@ -86,7 +86,7 @@ public class InsertObservationDAO extends AbstractInsertObservationDAO { private final FeatureOfInterestDAO featureOfInterestDAO = new FeatureOfInterestDAO(); - private static final int FLUSH_THRESHOLD = 50; + private static final int FLUSH_THRESHOLD = 10; private static final String CONSTRAINT_OBSERVATION_IDENTITY = "observationIdentity"; @@ -255,7 +255,7 @@ public synchronized InsertObservationResponse insertObservation(final InsertObse } private void checkEqualsAndThrow(String constraintName, HibernateException he) throws OwsExceptionReport { - if (StringHelper.isNotEmpty(constraintName)) { + if (StringHelper.isNotEmpty(constraintName)) { String exceptionMsg = null; if (constraintName.equalsIgnoreCase(CONSTRAINT_OBSERVATION_IDENTITY)) { exceptionMsg = "Observation with same values already contained in database"; @@ -270,7 +270,7 @@ private void checkEqualsAndThrow(String constraintName, HibernateException he) t } private void checkContainsAndThrow(String message, HibernateException he) throws OwsExceptionReport { - if (StringHelper.isNotEmpty(message)) { + if (StringHelper.isNotEmpty(message)) { String exceptionMsg = null; if (message.toLowerCase().contains(CONSTRAINT_OBSERVATION_IDENTITY.toLowerCase())) { exceptionMsg = "Observation with same values already contained in database"; @@ -287,7 +287,7 @@ private void checkContainsAndThrow(String message, HibernateException he) throws /** * Get the hibernate FeatureOfInterest object for an AbstractFeature, * returning it from the local cache if already requested - * + * * @param sosObsConst * @param featureCache * @param session @@ -343,4 +343,4 @@ private Set getParentProcedureOfferings(OmObservationConstellation sosOb } return offerings; } -} \ No newline at end of file +}