Skip to content

Commit

Permalink
Fix NPE when checking insertion cache if a dataset exists for Observa…
Browse files Browse the repository at this point in the history 
…tionConstellation and offerung
  • Loading branch information
CarstenHollmann committed Jun 9, 2022
1 parent e7137c2 commit dcf8760
Showing 1 changed file with 21 additions and 29 deletions.
50 changes: 21 additions & 29 deletions hibernate/handler/src/main/java/org/n52/sos/ds/hibernate/InsertObservationHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,7 @@ public synchronized InsertObservationResponse insertObservation(final InsertObse
request.setOfferings(Lists.newArrayList(cache.getAllOfferings()));

// if no observationConstellation is valid, throw exception
if (exceptions.size() == request.getObservations()
.size()) {
if (exceptions.size() == request.getObservations().size()) {
throw exceptions;
}

Expand All @@ -196,8 +195,7 @@ public synchronized InsertObservationResponse insertObservation(final InsertObse
getHibernateSessionHolder().returnSession(session);
}
/*
* TODO: ... all the DS insertion stuff Requirement 68
* proc/obsProp/Offering same obsType;
* TODO: ... all the DS insertion stuff Requirement 68 proc/obsProp/Offering same obsType;
*/

return response;
Expand All @@ -217,16 +215,13 @@ private void insertObservation(OmObservation sosObservation, InsertObservationCa
//
// }

String offeringID = sosObsConst.getOfferings()
.iterator()
.next();
String offeringID = sosObsConst.getOfferings().iterator().next();
DatasetEntity hDataset = cache.get(sosObsConst, offeringID);
if (hDataset == null) {
if (!cache.isChecked(sosObsConst, offeringID)) {
try {
hDataset = getDaoFactory().getSeriesDAO()
.checkSeries(sosObsConst, offeringID, session,
Sos2Constants.InsertObservationParams.observationType.name());
hDataset = getDaoFactory().getSeriesDAO().checkSeries(sosObsConst, offeringID, session,
Sos2Constants.InsertObservationParams.observationType.name());
// add to cache table
cache.putConstellation(sosObsConst, offeringID, hDataset);
} catch (OwsExceptionReport owse) {
Expand All @@ -243,8 +238,8 @@ private void insertObservation(OmObservation sosObservation, InsertObservationCa
// only do feature checking once for each
// AbstractFeature/offering combo
if (!cache.isChecked(sosObsConst.getFeatureOfInterest(), offeringID)) {
getDaoFactory().getFeatureOfInterestDAO()
.checkOrInsertRelatedFeatureRelation(hFeature, hDataset.getOffering(), session);
getDaoFactory().getFeatureOfInterestDAO().checkOrInsertRelatedFeatureRelation(hFeature,
hDataset.getOffering(), session);
cache.checkFeature(sosObsConst.getFeatureOfInterest(), offeringID);
}
AbstractObservationDAO observationDAO = getDaoFactory().getObservationDAO();
Expand All @@ -256,8 +251,8 @@ private void insertObservation(OmObservation sosObservation, InsertObservationCa
dataset = observationDAO.insertObservationMultiValue(hDataset, hFeature, sosObservation,
cache.getCodespaceCache(), cache.getUnitCache(), cache.getFormatCache(), session);
}
if (dataset != null && !cache.get(sosObsConst, offeringID)
.equals(dataset)) {
if (dataset != null && cache.containsConstellation(sosObsConst, offeringID)
&& !cache.get(sosObsConst, offeringID).equals(dataset)) {
cache.putConstellation(sosObsConst, offeringID, dataset);
}
}
Expand All @@ -280,9 +275,7 @@ protected void handleHibernateException(PersistenceException pe) throws OwsExcep
} else if (pe.getCause() instanceof ConstraintViolationException) {
handleConstraintViolationException((ConstraintViolationException) pe.getCause(), pe, status);
} else {
throw new NoApplicableCodeException().causedBy(pe)
.withMessage(exceptionMsg)
.setStatus(status);
throw new NoApplicableCodeException().causedBy(pe).withMessage(exceptionMsg).setStatus(status);
}
}

Expand Down Expand Up @@ -313,8 +306,7 @@ private void checkEqualsAndThrow(String constraintName, PersistenceException e)
exceptionMsg = LOG_OBSERVATION_SAME_IDENTIFIER;
}
if (!Strings.isNullOrEmpty(exceptionMsg)) {
throw new NoApplicableCodeException().causedBy(e)
.withMessage(exceptionMsg)
throw new NoApplicableCodeException().causedBy(e).withMessage(exceptionMsg)
.setStatus(HTTPStatus.BAD_REQUEST);
}
}
Expand All @@ -323,24 +315,21 @@ private void checkEqualsAndThrow(String constraintName, PersistenceException e)
private void checkContainsAndThrow(String message, PersistenceException e) throws OwsExceptionReport {
if (!Strings.isNullOrEmpty(message)) {
String exceptionMsg = "";
if (message.toLowerCase()
.contains(CONSTRAINT_OBSERVATION_IDENTITY.toLowerCase())) {
if (message.toLowerCase().contains(CONSTRAINT_OBSERVATION_IDENTITY.toLowerCase())) {
exceptionMsg = LOG_OBSERVATION_SAME_VALUES;
} else if (message.toLowerCase()
.contains(CONSTRAINT_OBSERVATION_IDENTIFIER_IDENTITY.toLowerCase())) {
} else if (message.toLowerCase().contains(CONSTRAINT_OBSERVATION_IDENTIFIER_IDENTITY.toLowerCase())) {
exceptionMsg = LOG_OBSERVATION_SAME_IDENTIFIER;
}
if (!Strings.isNullOrEmpty(exceptionMsg)) {
throw new NoApplicableCodeException().causedBy(e)
.withMessage(exceptionMsg)
throw new NoApplicableCodeException().causedBy(e).withMessage(exceptionMsg)
.setStatus(HTTPStatus.BAD_REQUEST);
}
}
}

/**
* Get the hibernate AbstractFeatureOfInterest object for an
* AbstractFeature, returning it from the local cache if already requested
* Get the hibernate AbstractFeatureOfInterest object for an AbstractFeature, returning it from the local
* cache if already requested
*
* @param abstractFeature
* the abstract features
Expand All @@ -356,8 +345,7 @@ private AbstractFeatureEntity getFeature(AbstractFeature abstractFeature, Insert
Session session) throws OwsExceptionReport {
AbstractFeatureEntity hFeature = cache.getFeature(abstractFeature);
if (hFeature == null) {
hFeature = getDaoFactory().getFeatureOfInterestDAO()
.checkOrInsert(abstractFeature, session);
hFeature = getDaoFactory().getFeatureOfInterestDAO().checkOrInsert(abstractFeature, session);
cache.putFeature(abstractFeature, hFeature);
}
return hFeature;
Expand Down Expand Up @@ -400,6 +388,10 @@ public DatasetEntity get(OmObservationConstellation oc, String offering) {
return this.obsConstOfferingDatasetTable.get(oc, offering);
}

public boolean containsConstellation(OmObservationConstellation oc, String offering) {
return this.obsConstOfferingDatasetTable.contains(oc, offering);
}

public void putConstellation(OmObservationConstellation soc, String offering, DatasetEntity hoc) {
this.obsConstOfferingDatasetTable.put(soc, offering, hoc);
}
Expand Down

0 comments on commit dcf8760

Please sign in to comment.