forked from afimb/chouette
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Speed up data space transfer by introducing separate ObjectReference …
…objects to create cleaner separation between entities in referential schemas and public schema. This allows skipping loading of stop areas when only reference is needed
- Loading branch information
erlendnils1
committed
Oct 2, 2017
1 parent
e00aaa2
commit 45b9434
Showing
55 changed files
with
500 additions
and
366 deletions.
There are no files selected for viewing
233 changes: 137 additions & 96 deletions
233
...uette.dao/src/main/java/mobi/chouette/dao/interceptor/RelationsToStopAreaInterceptor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,114 +1,155 @@ | ||
| package mobi.chouette.dao.interceptor; | ||
|
|
||
| import java.io.Serializable; | ||
|
|
||
| import javax.enterprise.inject.spi.CDI; | ||
|
|
||
| import lombok.extern.log4j.Log4j; | ||
| import mobi.chouette.dao.StopAreaDAO; | ||
| import mobi.chouette.model.ObjectReference; | ||
| import mobi.chouette.model.RouteSection; | ||
| import mobi.chouette.model.ScheduledStopPoint; | ||
| import mobi.chouette.model.StopArea; | ||
| import mobi.chouette.model.StopPoint; | ||
|
|
||
| import org.hibernate.EmptyInterceptor; | ||
| import org.hibernate.type.Type; | ||
|
|
||
| import javax.enterprise.inject.spi.CDI; | ||
|
|
||
| import java.io.Serializable; | ||
|
|
||
| /** | ||
| * StopPoint and RouteSections reside in separate schemas from StopArea. This Interceptor enriches these entities with relations between them upon load. | ||
| */ | ||
| @Log4j | ||
| public class RelationsToStopAreaInterceptor extends EmptyInterceptor { | ||
|
|
||
| private StopAreaDAO stopAreaDAO; | ||
|
|
||
| private static final String STOP_POINT_CONTAINED_IN_STOP_AREA_ID_PROPERTY = "containedInStopAreaObjectId"; | ||
| private static final String DEPARTURE_STOP_AREA_ID_PROPERTY = "departureStopAreaObjectId"; | ||
|
|
||
| private static final String ARRIVAL_STOP_AREA_ID_PROPERTY = "arrivalStopAreaObjectId"; | ||
|
|
||
| @Override | ||
| public boolean onLoad(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) { | ||
| init(); | ||
|
|
||
| if (entity instanceof ScheduledStopPoint) { | ||
|
|
||
| loadStopAreasForScheduledStopPoint((ScheduledStopPoint) entity, state, propertyNames); | ||
|
|
||
| } else if (entity instanceof RouteSection) { | ||
|
|
||
| loadStopAreasForRouteSections((RouteSection) entity, state, propertyNames); | ||
| } | ||
| return super.onLoad(entity, id, state, propertyNames, types); | ||
| } | ||
|
|
||
| private void loadStopAreasForScheduledStopPoint(ScheduledStopPoint entity, Object[] state, String[] propertyNames) { | ||
| ScheduledStopPoint scheduledStopPoint = entity; | ||
| log.trace("On load StopPoint id: " + scheduledStopPoint.getId()); | ||
| String containedInStopAreaId = getProperty(STOP_POINT_CONTAINED_IN_STOP_AREA_ID_PROPERTY, propertyNames, state); | ||
|
|
||
| if (scheduledStopPoint.getContainedInStopArea() == null && containedInStopAreaId != null) { | ||
| scheduledStopPoint.setContainedInStopAreaORMOnly(stopAreaDAO.findByObjectId(containedInStopAreaId)); | ||
| } | ||
| } | ||
|
|
||
| private void loadStopAreasForRouteSections(RouteSection entity, Object[] state, String[] propertyNames) { | ||
| RouteSection routeSection = entity; | ||
| log.trace("On load RouteSection id: " + routeSection.getId()); | ||
|
|
||
| String arrivalStopAreaId = getProperty(ARRIVAL_STOP_AREA_ID_PROPERTY, propertyNames, state); | ||
| if (entity.getArrival() == null && arrivalStopAreaId != null) { | ||
| routeSection.setArrival(stopAreaDAO.findByObjectId(arrivalStopAreaId)); | ||
| } | ||
|
|
||
| String departureStopAreaId = getProperty(DEPARTURE_STOP_AREA_ID_PROPERTY, propertyNames, state); | ||
| if (entity.getDeparture() == null && departureStopAreaId != null) { | ||
| routeSection.setDeparture(stopAreaDAO.findByObjectId(departureStopAreaId)); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) { | ||
| onCreateOrUpdate(entity); | ||
| return super.onSave(entity, id, state, propertyNames, types); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean onFlushDirty(Object entity, Serializable id, Object[] currentState, Object[] previousState, String[] propertyNames, Type[] types) { | ||
| onCreateOrUpdate(entity); | ||
| return super.onFlushDirty(entity, id, currentState, previousState, propertyNames, types); | ||
| } | ||
|
|
||
| private void onCreateOrUpdate(Object entity) { | ||
| init(); | ||
|
|
||
| if (entity instanceof ScheduledStopPoint) { | ||
| ScheduledStopPoint scheduledStopPoint = ((ScheduledStopPoint) entity); | ||
| StopArea stopArea = scheduledStopPoint.getContainedInStopArea(); | ||
| if (stopArea != null) { | ||
| if (stopArea.getId() == null && !stopArea.isDetached() && stopArea.getImportMode().shouldCreateMissingStopAreas()) { | ||
| log.debug("Cascading persist of new stop area +" + stopArea.getObjectId() + "+ for created/updated stop point: " + scheduledStopPoint.getObjectId()); | ||
| stopAreaDAO.create(stopArea); | ||
| } | ||
| } | ||
|
|
||
| } | ||
| } | ||
|
|
||
|
|
||
| private <T> T getProperty(String propertyName, String[] propertyNames, Object[] state) { | ||
| for (int i = 0; i < propertyNames.length; i++) { | ||
| if (propertyName.equals(propertyNames[i])) { | ||
| return (T) state[i]; | ||
| } | ||
| } | ||
| throw new RuntimeException("Property not found: " + propertyName); | ||
| } | ||
|
|
||
|
|
||
| private void init() { | ||
| if (stopAreaDAO == null) { | ||
| stopAreaDAO = CDI.current().select(StopAreaDAO.class).get(); | ||
| } | ||
| } | ||
| private StopAreaDAO stopAreaDAO; | ||
|
|
||
| private static final String STOP_POINT_CONTAINED_IN_STOP_AREA_ID_PROPERTY = "containedInStopAreaObjectId"; | ||
| private static final String DEPARTURE_STOP_AREA_ID_PROPERTY = "departureStopAreaObjectId"; | ||
|
|
||
| private static final String ARRIVAL_STOP_AREA_ID_PROPERTY = "arrivalStopAreaObjectId"; | ||
|
|
||
| @Override | ||
| public boolean onLoad(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) { | ||
| init(); | ||
|
|
||
| if (entity instanceof ScheduledStopPoint) { | ||
|
|
||
| loadStopAreasForScheduledStopPoint((ScheduledStopPoint) entity, state, propertyNames); | ||
|
|
||
| } else if (entity instanceof RouteSection) { | ||
|
|
||
| loadStopAreasForRouteSections((RouteSection) entity, state, propertyNames); | ||
| } | ||
| return super.onLoad(entity, id, state, propertyNames, types); | ||
| } | ||
|
|
||
| private void loadStopAreasForScheduledStopPoint(ScheduledStopPoint entity, Object[] state, String[] propertyNames) { | ||
| ScheduledStopPoint scheduledStopPoint = entity; | ||
| log.trace("On load StopPoint id: " + scheduledStopPoint.getId()); | ||
| String containedInStopAreaId = getProperty(STOP_POINT_CONTAINED_IN_STOP_AREA_ID_PROPERTY, propertyNames, state); | ||
|
|
||
| if (!(scheduledStopPoint.getContainedInStopAreaRef() instanceof LazyLoadingStopAreaReference)) { | ||
| scheduledStopPoint.setContainedInStopAreaRef(new LazyLoadingStopAreaReference(containedInStopAreaId)); | ||
| } | ||
| } | ||
|
|
||
| private void loadStopAreasForRouteSections(RouteSection entity, Object[] state, String[] propertyNames) { | ||
| RouteSection routeSection = entity; | ||
| log.trace("On load RouteSection id: " + routeSection.getId()); | ||
|
|
||
| String arrivalStopAreaId = getProperty(ARRIVAL_STOP_AREA_ID_PROPERTY, propertyNames, state); | ||
| if (!(entity.getArrivalRef() instanceof LazyLoadingStopAreaReference)) { | ||
| routeSection.setArrivalRef(new LazyLoadingStopAreaReference(arrivalStopAreaId)); | ||
| } | ||
|
|
||
| String departureStopAreaId = getProperty(DEPARTURE_STOP_AREA_ID_PROPERTY, propertyNames, state); | ||
| if (!(entity.getDepartureRef() instanceof LazyLoadingStopAreaReference)) { | ||
| routeSection.setDepartureRef(new LazyLoadingStopAreaReference(departureStopAreaId)); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
| public boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) { | ||
| onCreateOrUpdate(entity); | ||
| return super.onSave(entity, id, state, propertyNames, types); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean onFlushDirty(Object entity, Serializable id, Object[] currentState, Object[] previousState, String[] propertyNames, Type[] types) { | ||
| onCreateOrUpdate(entity); | ||
| return super.onFlushDirty(entity, id, currentState, previousState, propertyNames, types); | ||
| } | ||
|
|
||
| private void onCreateOrUpdate(Object entity) { | ||
| init(); | ||
|
|
||
| if (entity instanceof ScheduledStopPoint) { | ||
| ScheduledStopPoint scheduledStopPoint = ((ScheduledStopPoint) entity); | ||
| if (scheduledStopPoint.getContainedInStopAreaRef().isLoaded()) { | ||
| StopArea stopArea = scheduledStopPoint.getContainedInStopAreaRef().getObject(); | ||
| if (stopArea != null && stopArea.getId() == null && !stopArea.isDetached() && stopArea.getImportMode().shouldCreateMissingStopAreas()) { | ||
| log.debug("Cascading persist of new stop area " + stopArea.getObjectId() + " for created/updated stop point: " + scheduledStopPoint.getObjectId()); | ||
| stopAreaDAO.create(stopArea); | ||
| } | ||
| } | ||
|
|
||
| } | ||
| } | ||
|
|
||
|
|
||
| private <T> T getProperty(String propertyName, String[] propertyNames, Object[] state) { | ||
| for (int i = 0; i < propertyNames.length; i++) { | ||
| if (propertyName.equals(propertyNames[i])) { | ||
| return (T) state[i]; | ||
| } | ||
| } | ||
| throw new RuntimeException("Property not found: " + propertyName); | ||
| } | ||
|
|
||
|
|
||
| private void init() { | ||
| if (stopAreaDAO == null) { | ||
| stopAreaDAO = CDI.current().select(StopAreaDAO.class).get(); | ||
| } | ||
| } | ||
|
|
||
| private class LazyLoadingStopAreaReference implements ObjectReference<StopArea> { | ||
|
|
||
| private String stopAreaObjectId; | ||
|
|
||
| private StopArea target; | ||
|
|
||
| private boolean loaded; | ||
|
|
||
| public LazyLoadingStopAreaReference(String stopAreaObjectId) { | ||
| this.stopAreaObjectId = stopAreaObjectId; | ||
| } | ||
|
|
||
| @Override | ||
| public String getObjectId() { | ||
| return stopAreaObjectId; | ||
| } | ||
|
|
||
| @Override | ||
| public StopArea getObject() { | ||
| if (!loaded){ | ||
| setTarget(); | ||
| } | ||
| return target; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isLoaded() { | ||
| return loaded; | ||
| } | ||
|
|
||
| private synchronized void setTarget() { | ||
| if (!loaded) { | ||
| if (stopAreaObjectId != null) { | ||
| target = stopAreaDAO.findByObjectId(stopAreaObjectId); | ||
| } | ||
| loaded = true; | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.