From 6c3d04075bf2ec2c1521c35f0d2e4d500c0ff8f1 Mon Sep 17 00:00:00 2001 From: Hilbrand Bouwkamp Date: Tue, 16 Jun 2026 11:31:27 +0200 Subject: [PATCH 1/2] AER-3937 Refactored Offroad mobile to reduce duplications --- .../source/mobile/AbstractGML2OffRoad.java | 93 +++++++++++++++++++ ...onsumptionOffRoadVehicleSpecification.java | 2 +- .../IsGmlCustomOffRoadMobileSource.java | 2 +- .../IsGmlOffRoadMobileEmissionSource.java | 2 +- .../{v40 => }/IsGmlOffRoadMobileSource.java | 2 +- .../IsGmlOffRoadVehicleSpecification.java | 2 +- ...atingHoursOffRoadVehicleSpecification.java | 2 +- ...IsGmlStandardOffRoadMobileBaseSource.java} | 8 +- .../base/source/mobile/v31/GML2OffRoad.java | 72 ++------------ .../v31/IsGmlCustomOffRoadMobileSource.java | 33 ------- .../v31/IsGmlOffRoadMobileEmissionSource.java | 28 ------ .../mobile/v31/IsGmlOffRoadMobileSource.java | 23 ----- ...atingHoursOffRoadVehicleSpecification.java | 34 ------- .../v31/IsGmlStandardOffRoadMobileSource.java | 6 +- .../base/source/mobile/v40/GML2OffRoad.java | 68 ++------------ ...onsumptionOffRoadVehicleSpecification.java | 32 ------- .../v40/IsGmlStandardOffRoadMobileSource.java | 6 +- .../mobile/AbstractOffRoadMobileSource.java | 2 +- .../mobile/CustomOffRoadMobileSource.java | 4 +- .../mobile/OffRoadMobileEmissionSource.java | 2 +- .../source/mobile/OffRoadMobileSource.java | 6 +- .../mobile/OffRoadMobileSourceProperty.java | 2 +- .../mobile/AbstractOffRoadMobileSource.java | 2 +- .../mobile/CustomOffRoadMobileSource.java | 4 +- .../mobile/OffRoadMobileEmissionSource.java | 2 +- .../source/mobile/OffRoadMobileSource.java | 6 +- .../mobile/OffRoadMobileSourceProperty.java | 2 +- .../mobile/AbstractOffRoadMobileSource.java | 2 +- .../AbstractOffRoadVehicleSpecification.java | 2 +- ...onsumptionOffRoadVehicleSpecification.java | 2 +- .../mobile/CustomOffRoadMobileSource.java | 2 +- .../mobile/OffRoadMobileEmissionSource.java | 2 +- .../source/mobile/OffRoadMobileSource.java | 6 +- .../mobile/OffRoadMobileSourceProperty.java | 2 +- .../OffRoadVehicleSpecificationProperty.java | 2 +- ...atingHoursOffRoadVehicleSpecification.java | 2 +- .../mobile/AbstractOffRoadMobileSource.java | 2 +- .../AbstractOffRoadVehicleSpecification.java | 2 +- ...onsumptionOffRoadVehicleSpecification.java | 2 +- .../mobile/CustomOffRoadMobileSource.java | 2 +- .../mobile/OffRoadMobileEmissionSource.java | 2 +- .../source/mobile/OffRoadMobileSource.java | 6 +- .../mobile/OffRoadMobileSourceProperty.java | 2 +- .../OffRoadVehicleSpecificationProperty.java | 2 +- ...atingHoursOffRoadVehicleSpecification.java | 2 +- .../mobile/AbstractOffRoadMobileSource.java | 2 +- .../AbstractOffRoadVehicleSpecification.java | 2 +- ...onsumptionOffRoadVehicleSpecification.java | 2 +- .../mobile/CustomOffRoadMobileSource.java | 2 +- .../mobile/OffRoadMobileEmissionSource.java | 2 +- .../source/mobile/OffRoadMobileSource.java | 6 +- .../mobile/OffRoadMobileSourceProperty.java | 2 +- .../OffRoadVehicleSpecificationProperty.java | 2 +- ...atingHoursOffRoadVehicleSpecification.java | 2 +- .../mobile/AbstractOffRoadMobileSource.java | 2 +- .../AbstractOffRoadVehicleSpecification.java | 2 +- ...onsumptionOffRoadVehicleSpecification.java | 2 +- .../mobile/CustomOffRoadMobileSource.java | 2 +- .../mobile/OffRoadMobileEmissionSource.java | 2 +- .../source/mobile/OffRoadMobileSource.java | 6 +- .../mobile/OffRoadMobileSourceProperty.java | 2 +- .../OffRoadVehicleSpecificationProperty.java | 2 +- ...atingHoursOffRoadVehicleSpecification.java | 2 +- .../mobile/AbstractOffRoadMobileSource.java | 2 +- .../AbstractOffRoadVehicleSpecification.java | 2 +- ...onsumptionOffRoadVehicleSpecification.java | 2 +- .../mobile/CustomOffRoadMobileSource.java | 2 +- .../mobile/OffRoadMobileEmissionSource.java | 2 +- .../source/mobile/OffRoadMobileSource.java | 6 +- .../mobile/OffRoadMobileSourceProperty.java | 2 +- .../OffRoadVehicleSpecificationProperty.java | 2 +- ...atingHoursOffRoadVehicleSpecification.java | 2 +- .../mobile/AbstractOffRoadMobileSource.java | 2 +- .../AbstractOffRoadVehicleSpecification.java | 2 +- ...onsumptionOffRoadVehicleSpecification.java | 2 +- .../mobile/CustomOffRoadMobileSource.java | 2 +- .../mobile/OffRoadMobileEmissionSource.java | 2 +- .../source/mobile/OffRoadMobileSource.java | 6 +- .../mobile/OffRoadMobileSourceProperty.java | 2 +- ...atingHoursOffRoadVehicleSpecification.java | 2 +- .../mobile/AbstractOffRoadMobileSource.java | 2 +- .../AbstractOffRoadVehicleSpecification.java | 2 +- ...onsumptionOffRoadVehicleSpecification.java | 2 +- .../mobile/CustomOffRoadMobileSource.java | 2 +- .../mobile/OffRoadMobileEmissionSource.java | 2 +- .../mobile/OffRoadMobileSourceProperty.java | 2 +- ...atingHoursOffRoadVehicleSpecification.java | 2 +- .../mobile/AbstractOffRoadMobileSource.java | 2 +- .../AbstractOffRoadVehicleSpecification.java | 2 +- ...onsumptionOffRoadVehicleSpecification.java | 2 +- .../mobile/CustomOffRoadMobileSource.java | 2 +- .../mobile/OffRoadMobileEmissionSource.java | 2 +- .../mobile/OffRoadMobileSourceProperty.java | 2 +- ...atingHoursOffRoadVehicleSpecification.java | 2 +- .../mobile/AbstractOffRoadMobileSource.java | 2 +- .../AbstractOffRoadVehicleSpecification.java | 2 +- ...onsumptionOffRoadVehicleSpecification.java | 2 +- .../mobile/CustomOffRoadMobileSource.java | 2 +- .../mobile/OffRoadMobileEmissionSource.java | 2 +- .../mobile/OffRoadMobileSourceProperty.java | 2 +- ...atingHoursOffRoadVehicleSpecification.java | 2 +- .../mobile/AbstractOffRoadMobileSource.java | 2 +- .../AbstractOffRoadVehicleSpecification.java | 2 +- ...onsumptionOffRoadVehicleSpecification.java | 2 +- .../mobile/CustomOffRoadMobileSource.java | 2 +- .../mobile/OffRoadMobileEmissionSource.java | 2 +- .../mobile/OffRoadMobileSourceProperty.java | 2 +- ...atingHoursOffRoadVehicleSpecification.java | 2 +- 108 files changed, 231 insertions(+), 402 deletions(-) create mode 100644 source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/AbstractGML2OffRoad.java rename source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/{v31 => }/IsGmlConsumptionOffRoadVehicleSpecification.java (95%) rename source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/{v40 => }/IsGmlCustomOffRoadMobileSource.java (95%) rename source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/{v40 => }/IsGmlOffRoadMobileEmissionSource.java (94%) rename source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/{v40 => }/IsGmlOffRoadMobileSource.java (93%) rename source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/{v31 => }/IsGmlOffRoadVehicleSpecification.java (93%) rename source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/{v40 => }/IsGmlOperatingHoursOffRoadVehicleSpecification.java (95%) rename source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/{v40/IsGmlOffRoadVehicleSpecification.java => IsGmlStandardOffRoadMobileBaseSource.java} (78%) delete mode 100644 source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlCustomOffRoadMobileSource.java delete mode 100644 source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlOffRoadMobileEmissionSource.java delete mode 100644 source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlOffRoadMobileSource.java delete mode 100644 source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlOperatingHoursOffRoadVehicleSpecification.java delete mode 100644 source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlConsumptionOffRoadVehicleSpecification.java diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/AbstractGML2OffRoad.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/AbstractGML2OffRoad.java new file mode 100644 index 000000000..8af05f801 --- /dev/null +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/AbstractGML2OffRoad.java @@ -0,0 +1,93 @@ +/* + * Copyright the State of the Netherlands + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ +package nl.overheid.aerius.gml.base.source.mobile; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import nl.overheid.aerius.gml.base.AbstractGML2Specific; +import nl.overheid.aerius.gml.base.GMLConversionData; +import nl.overheid.aerius.gml.base.IsGmlProperty; +import nl.overheid.aerius.gml.base.characteristics.GML2SourceCharacteristics; +import nl.overheid.aerius.gml.base.source.IsGmlEmission; +import nl.overheid.aerius.shared.domain.ops.DiurnalVariation; +import nl.overheid.aerius.shared.domain.v2.characteristics.OPSSourceCharacteristics; +import nl.overheid.aerius.shared.domain.v2.characteristics.SourceCharacteristics; +import nl.overheid.aerius.shared.domain.v2.source.OffRoadMobileEmissionSource; +import nl.overheid.aerius.shared.domain.v2.source.offroad.CustomOffRoadMobileSource; +import nl.overheid.aerius.shared.domain.v2.source.offroad.OffRoadMobileSource; +import nl.overheid.aerius.shared.exception.AeriusException; +import nl.overheid.aerius.shared.exception.ImaerExceptionReason; + +/** + * Base class for converting OffRoad mobile from GML to internal data object. + * + * @param sub class of the standard offroad mobile sources + * @param sub class of the off road mobile source + */ +public abstract class AbstractGML2OffRoad +extends AbstractGML2Specific { + + private static final Logger LOG = LoggerFactory.getLogger(AbstractGML2OffRoad.class); + + private final GML2SourceCharacteristics gml2SourceCharacteristics; + + protected AbstractGML2OffRoad(final GMLConversionData conversionData, final GML2SourceCharacteristics gml2SourceCharacteristics) { + super(conversionData); + this.gml2SourceCharacteristics = gml2SourceCharacteristics; + } + + @Override + public final OffRoadMobileEmissionSource convert(final T source) throws AeriusException { + final OffRoadMobileEmissionSource emissionSource = new OffRoadMobileEmissionSource(); + + for (final IsGmlProperty offRoadMobileSourceProperty : source.getOffRoadMobileSources()) { + final IsGmlOffRoadMobileSource offRoadMobileSource = offRoadMobileSourceProperty.getProperty(); + if (offRoadMobileSource instanceof final IsGmlStandardOffRoadMobileBaseSource standardOffRoad) { + emissionSource.getSubSources().add(convertStandard((S) standardOffRoad)); + } else if (offRoadMobileSource instanceof IsGmlCustomOffRoadMobileSource) { + emissionSource.getSubSources().add(convert((IsGmlCustomOffRoadMobileSource) offRoadMobileSource)); + } else { + LOG.error("Don't know how to treat offroad mobile source type: {}", offRoadMobileSource.getClass()); + throw new AeriusException(ImaerExceptionReason.INTERNAL_ERROR); + } + } + + return emissionSource.getSubSources().isEmpty() ? null : emissionSource; + } + + protected abstract OffRoadMobileSource convertStandard(S offRoadMobileSource); + + @SuppressWarnings("unchecked") + private OffRoadMobileSource convert(final IsGmlCustomOffRoadMobileSource customMobileSource) throws AeriusException { + final CustomOffRoadMobileSource customVehicleEmissionValues = new CustomOffRoadMobileSource(); + customVehicleEmissionValues.setDescription(customMobileSource.getDescription()); + + final SourceCharacteristics characteristics = gml2SourceCharacteristics.fromGML(customMobileSource.getCharacteristics(), null, null); + if (characteristics instanceof final OPSSourceCharacteristics opsCharacteristics) { + opsCharacteristics.setDiurnalVariation(DiurnalVariation.INDUSTRIAL_ACTIVITY); + } + customVehicleEmissionValues.setCharacteristics(characteristics); + + for (final IsGmlProperty emissionProperty : customMobileSource.getEmissions()) { + final IsGmlEmission emission = emissionProperty.getProperty(); + customVehicleEmissionValues.getEmissions().put(emission.getSubstance(), emission.getValue()); + } + + return customVehicleEmissionValues; + } +} diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlConsumptionOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/IsGmlConsumptionOffRoadVehicleSpecification.java similarity index 95% rename from source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlConsumptionOffRoadVehicleSpecification.java rename to source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/IsGmlConsumptionOffRoadVehicleSpecification.java index 0d993a7a0..bc51acbe6 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlConsumptionOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/IsGmlConsumptionOffRoadVehicleSpecification.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see http://www.gnu.org/licenses/. */ -package nl.overheid.aerius.gml.base.source.mobile.v31; +package nl.overheid.aerius.gml.base.source.mobile; import java.util.List; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlCustomOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/IsGmlCustomOffRoadMobileSource.java similarity index 95% rename from source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlCustomOffRoadMobileSource.java rename to source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/IsGmlCustomOffRoadMobileSource.java index 45a1246aa..d113357ea 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlCustomOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/IsGmlCustomOffRoadMobileSource.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see http://www.gnu.org/licenses/. */ -package nl.overheid.aerius.gml.base.source.mobile.v40; +package nl.overheid.aerius.gml.base.source.mobile; import java.util.List; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlOffRoadMobileEmissionSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/IsGmlOffRoadMobileEmissionSource.java similarity index 94% rename from source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlOffRoadMobileEmissionSource.java rename to source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/IsGmlOffRoadMobileEmissionSource.java index 4baac0e13..8c1812b8e 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlOffRoadMobileEmissionSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/IsGmlOffRoadMobileEmissionSource.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see http://www.gnu.org/licenses/. */ -package nl.overheid.aerius.gml.base.source.mobile.v40; +package nl.overheid.aerius.gml.base.source.mobile; import java.util.List; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/IsGmlOffRoadMobileSource.java similarity index 93% rename from source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlOffRoadMobileSource.java rename to source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/IsGmlOffRoadMobileSource.java index ab2615cde..fec6c1716 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/IsGmlOffRoadMobileSource.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see http://www.gnu.org/licenses/. */ -package nl.overheid.aerius.gml.base.source.mobile.v40; +package nl.overheid.aerius.gml.base.source.mobile; public interface IsGmlOffRoadMobileSource { diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/IsGmlOffRoadVehicleSpecification.java similarity index 93% rename from source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlOffRoadVehicleSpecification.java rename to source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/IsGmlOffRoadVehicleSpecification.java index a7ef433a3..68de21797 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/IsGmlOffRoadVehicleSpecification.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see http://www.gnu.org/licenses/. */ -package nl.overheid.aerius.gml.base.source.mobile.v31; +package nl.overheid.aerius.gml.base.source.mobile; public interface IsGmlOffRoadVehicleSpecification { diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlOperatingHoursOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/IsGmlOperatingHoursOffRoadVehicleSpecification.java similarity index 95% rename from source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlOperatingHoursOffRoadVehicleSpecification.java rename to source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/IsGmlOperatingHoursOffRoadVehicleSpecification.java index fb4d8a93b..c05096eb3 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlOperatingHoursOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/IsGmlOperatingHoursOffRoadVehicleSpecification.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see http://www.gnu.org/licenses/. */ -package nl.overheid.aerius.gml.base.source.mobile.v40; +package nl.overheid.aerius.gml.base.source.mobile; import java.util.List; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/IsGmlStandardOffRoadMobileBaseSource.java similarity index 78% rename from source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlOffRoadVehicleSpecification.java rename to source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/IsGmlStandardOffRoadMobileBaseSource.java index 80f17e494..529e1dbba 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/IsGmlStandardOffRoadMobileBaseSource.java @@ -14,10 +14,12 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see http://www.gnu.org/licenses/. */ -package nl.overheid.aerius.gml.base.source.mobile.v40; +package nl.overheid.aerius.gml.base.source.mobile; -public interface IsGmlOffRoadVehicleSpecification { +public interface IsGmlStandardOffRoadMobileBaseSource extends IsGmlOffRoadMobileSource { - String getFuelCode(); + String getCode(); + + Integer getLiterFuelPerYear(); } diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/GML2OffRoad.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/GML2OffRoad.java index 97b37bcba..f0b9a789b 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/GML2OffRoad.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/GML2OffRoad.java @@ -16,65 +16,30 @@ */ package nl.overheid.aerius.gml.base.source.mobile.v31; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import nl.overheid.aerius.gml.base.AbstractGML2Specific; import nl.overheid.aerius.gml.base.GMLConversionData; import nl.overheid.aerius.gml.base.GMLLegacyCodeConverter.GMLLegacyCodeType; -import nl.overheid.aerius.gml.base.IsGmlProperty; import nl.overheid.aerius.gml.base.characteristics.GML2SourceCharacteristics; -import nl.overheid.aerius.gml.base.geo.GML2Geometry; -import nl.overheid.aerius.gml.base.source.IsGmlEmission; -import nl.overheid.aerius.shared.domain.ops.DiurnalVariation; -import nl.overheid.aerius.shared.domain.v2.characteristics.OPSSourceCharacteristics; -import nl.overheid.aerius.shared.domain.v2.characteristics.SourceCharacteristics; -import nl.overheid.aerius.shared.domain.v2.source.OffRoadMobileEmissionSource; -import nl.overheid.aerius.shared.domain.v2.source.offroad.CustomOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.AbstractGML2OffRoad; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileEmissionSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlStandardOffRoadMobileBaseSource; import nl.overheid.aerius.shared.domain.v2.source.offroad.OffRoadMobileSource; import nl.overheid.aerius.shared.domain.v2.source.offroad.StandardOffRoadMobileSource; -import nl.overheid.aerius.shared.exception.AeriusException; -import nl.overheid.aerius.shared.exception.ImaerExceptionReason; /** - * + * Convert GML Off road to internal OffRoad data structure. */ -public class GML2OffRoad extends AbstractGML2Specific { - - private static final Logger LOG = LoggerFactory.getLogger(GML2OffRoad.class); - - private final GML2SourceCharacteristics gml2SourceCharacteristics; - private final GML2Geometry gml2Geometry; +public class GML2OffRoad extends AbstractGML2OffRoad { /** * @param conversionData The conversionData to use. + * @param gml2SourceCharacteristics util class */ public GML2OffRoad(final GMLConversionData conversionData, final GML2SourceCharacteristics gml2SourceCharacteristics) { - super(conversionData); - this.gml2SourceCharacteristics = gml2SourceCharacteristics; - this.gml2Geometry = new GML2Geometry(conversionData.getSrid()); + super(conversionData, gml2SourceCharacteristics); } @Override - public OffRoadMobileEmissionSource convert(final T source) throws AeriusException { - final OffRoadMobileEmissionSource emissionSource = new OffRoadMobileEmissionSource(); - - for (final IsGmlProperty offRoadMobileSourceProperty : source.getOffRoadMobileSources()) { - final IsGmlOffRoadMobileSource offRoadMobileSource = offRoadMobileSourceProperty.getProperty(); - if (offRoadMobileSource instanceof IsGmlStandardOffRoadMobileSource) { - emissionSource.getSubSources().add(convert((IsGmlStandardOffRoadMobileSource) offRoadMobileSource)); - } else if (offRoadMobileSource instanceof IsGmlCustomOffRoadMobileSource) { - emissionSource.getSubSources().add(convert((IsGmlCustomOffRoadMobileSource) offRoadMobileSource)); - } else { - LOG.error("Don't know how to treat offroad mobile source type: {}", offRoadMobileSource.getClass()); - throw new AeriusException(ImaerExceptionReason.INTERNAL_ERROR); - } - } - - return emissionSource.getSubSources().isEmpty() ? null : emissionSource; - } - - private OffRoadMobileSource convert(final IsGmlStandardOffRoadMobileSource mobileSource) { + protected OffRoadMobileSource convertStandard(final IsGmlStandardOffRoadMobileBaseSource mobileSource) { final StandardOffRoadMobileSource vehicleEmissionValues = new StandardOffRoadMobileSource(); vehicleEmissionValues.setDescription(mobileSource.getDescription()); vehicleEmissionValues.setLiterFuelPerYear(mobileSource.getLiterFuelPerYear()); @@ -91,25 +56,4 @@ private OffRoadMobileSource convert(final IsGmlStandardOffRoadMobileSource mobil return vehicleEmissionValues; } - - @SuppressWarnings("unchecked") - private OffRoadMobileSource convert(final IsGmlCustomOffRoadMobileSource customMobileSource) throws AeriusException { - final CustomOffRoadMobileSource customVehicleEmissionValues = new CustomOffRoadMobileSource(); - customVehicleEmissionValues.setDescription(customMobileSource.getDescription()); - - final SourceCharacteristics characteristics = gml2SourceCharacteristics.fromGML( - customMobileSource.getCharacteristics(), null, null); - if (characteristics instanceof final OPSSourceCharacteristics opsCharacteristics) { - opsCharacteristics.setDiurnalVariation(DiurnalVariation.INDUSTRIAL_ACTIVITY); - } - customVehicleEmissionValues.setCharacteristics(characteristics); - - for (final IsGmlProperty emissionProperty : customMobileSource.getEmissions()) { - final IsGmlEmission emission = emissionProperty.getProperty(); - customVehicleEmissionValues.getEmissions().put(emission.getSubstance(), emission.getValue()); - } - - return customVehicleEmissionValues; - } - } diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlCustomOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlCustomOffRoadMobileSource.java deleted file mode 100644 index bdb25e067..000000000 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlCustomOffRoadMobileSource.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright the State of the Netherlands - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - */ -package nl.overheid.aerius.gml.base.source.mobile.v31; - -import java.util.List; - -import nl.overheid.aerius.gml.base.IsGmlProperty; -import nl.overheid.aerius.gml.base.characteristics.IsGmlBaseOPSSourceCharacteristics; -import nl.overheid.aerius.gml.base.source.IsGmlEmission; - -public interface IsGmlCustomOffRoadMobileSource extends IsGmlOffRoadMobileSource { - - List> getEmissions(); - - IsGmlBaseOPSSourceCharacteristics getCharacteristics(); - - IsGmlOffRoadVehicleSpecification getOffRoadVehicleSpecification(); - -} diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlOffRoadMobileEmissionSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlOffRoadMobileEmissionSource.java deleted file mode 100644 index 8788b51fc..000000000 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlOffRoadMobileEmissionSource.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright the State of the Netherlands - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - */ -package nl.overheid.aerius.gml.base.source.mobile.v31; - -import java.util.List; - -import nl.overheid.aerius.gml.base.IsGmlProperty; -import nl.overheid.aerius.gml.base.source.IsGmlEmissionSource; - -public interface IsGmlOffRoadMobileEmissionSource extends IsGmlEmissionSource { - - List> getOffRoadMobileSources(); - -} diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlOffRoadMobileSource.java deleted file mode 100644 index 03426ca4b..000000000 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlOffRoadMobileSource.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright the State of the Netherlands - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - */ -package nl.overheid.aerius.gml.base.source.mobile.v31; - -public interface IsGmlOffRoadMobileSource { - - String getDescription(); - -} diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlOperatingHoursOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlOperatingHoursOffRoadVehicleSpecification.java deleted file mode 100644 index cf84f7da6..000000000 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlOperatingHoursOffRoadVehicleSpecification.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright the State of the Netherlands - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - */ -package nl.overheid.aerius.gml.base.source.mobile.v31; - -import java.util.List; - -import nl.overheid.aerius.gml.base.IsGmlProperty; -import nl.overheid.aerius.gml.base.source.IsGmlEmission; - -public interface IsGmlOperatingHoursOffRoadVehicleSpecification extends IsGmlOffRoadVehicleSpecification { - - List> getEmissionFactors(); - - int getLoad(); - - int getPower(); - - int getOperatingHours(); - -} diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlStandardOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlStandardOffRoadMobileSource.java index e96981e36..78cae8704 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlStandardOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/IsGmlStandardOffRoadMobileSource.java @@ -16,11 +16,9 @@ */ package nl.overheid.aerius.gml.base.source.mobile.v31; -public interface IsGmlStandardOffRoadMobileSource extends IsGmlOffRoadMobileSource { +import nl.overheid.aerius.gml.base.source.mobile.IsGmlStandardOffRoadMobileBaseSource; - int getLiterFuelPerYear(); - - String getCode(); +public interface IsGmlStandardOffRoadMobileSource extends IsGmlStandardOffRoadMobileBaseSource { Integer getHoursIdlePerYear(); diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/GML2OffRoad.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/GML2OffRoad.java index 7719e1da6..a15217335 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/GML2OffRoad.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/GML2OffRoad.java @@ -16,64 +16,27 @@ */ package nl.overheid.aerius.gml.base.source.mobile.v40; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import nl.overheid.aerius.gml.base.AbstractGML2Specific; import nl.overheid.aerius.gml.base.GMLConversionData; -import nl.overheid.aerius.gml.base.IsGmlProperty; import nl.overheid.aerius.gml.base.characteristics.GML2SourceCharacteristics; -import nl.overheid.aerius.gml.base.geo.GML2Geometry; -import nl.overheid.aerius.gml.base.source.IsGmlEmission; -import nl.overheid.aerius.shared.domain.ops.DiurnalVariation; -import nl.overheid.aerius.shared.domain.v2.characteristics.OPSSourceCharacteristics; -import nl.overheid.aerius.shared.domain.v2.characteristics.SourceCharacteristics; -import nl.overheid.aerius.shared.domain.v2.source.OffRoadMobileEmissionSource; -import nl.overheid.aerius.shared.domain.v2.source.offroad.CustomOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.AbstractGML2OffRoad; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileEmissionSource; import nl.overheid.aerius.shared.domain.v2.source.offroad.OffRoadMobileSource; import nl.overheid.aerius.shared.domain.v2.source.offroad.StandardOffRoadMobileSource; -import nl.overheid.aerius.shared.exception.AeriusException; -import nl.overheid.aerius.shared.exception.ImaerExceptionReason; /** - * + * Convert GML Off road to internal OffRoad data structure. */ -public class GML2OffRoad extends AbstractGML2Specific { - - private static final Logger LOG = LoggerFactory.getLogger(GML2OffRoad.class); - - private final GML2SourceCharacteristics gml2SourceCharacteristics; - private final GML2Geometry gml2Geometry; +public class GML2OffRoad extends AbstractGML2OffRoad { /** * @param conversionData The conversionData to use. */ public GML2OffRoad(final GMLConversionData conversionData, final GML2SourceCharacteristics gml2SourceCharacteristics) { - super(conversionData); - this.gml2SourceCharacteristics = gml2SourceCharacteristics; - this.gml2Geometry = new GML2Geometry(conversionData.getSrid()); + super(conversionData, gml2SourceCharacteristics); } @Override - public OffRoadMobileEmissionSource convert(final T source) throws AeriusException { - final OffRoadMobileEmissionSource emissionSource = new OffRoadMobileEmissionSource(); - - for (final IsGmlProperty offRoadMobileSourceProperty : source.getOffRoadMobileSources()) { - final IsGmlOffRoadMobileSource offRoadMobileSource = offRoadMobileSourceProperty.getProperty(); - if (offRoadMobileSource instanceof IsGmlStandardOffRoadMobileSource) { - emissionSource.getSubSources().add(convert((IsGmlStandardOffRoadMobileSource) offRoadMobileSource)); - } else if (offRoadMobileSource instanceof IsGmlCustomOffRoadMobileSource) { - emissionSource.getSubSources().add(convert((IsGmlCustomOffRoadMobileSource) offRoadMobileSource)); - } else { - LOG.error("Don't know how to treat offroad mobile source type: {}", offRoadMobileSource.getClass()); - throw new AeriusException(ImaerExceptionReason.INTERNAL_ERROR); - } - } - - return emissionSource.getSubSources().isEmpty() ? null : emissionSource; - } - - private OffRoadMobileSource convert(final IsGmlStandardOffRoadMobileSource mobileSource) { + public OffRoadMobileSource convertStandard(final IsGmlStandardOffRoadMobileSource mobileSource) { final StandardOffRoadMobileSource vehicleEmissionValues = new StandardOffRoadMobileSource(); vehicleEmissionValues.setDescription(mobileSource.getDescription()); vehicleEmissionValues.setLiterFuelPerYear(mobileSource.getLiterFuelPerYear()); @@ -84,24 +47,5 @@ private OffRoadMobileSource convert(final IsGmlStandardOffRoadMobileSource mobil return vehicleEmissionValues; } - @SuppressWarnings("unchecked") - private OffRoadMobileSource convert(final IsGmlCustomOffRoadMobileSource customMobileSource) throws AeriusException { - final CustomOffRoadMobileSource customVehicleEmissionValues = new CustomOffRoadMobileSource(); - customVehicleEmissionValues.setDescription(customMobileSource.getDescription()); - - final SourceCharacteristics characteristics = gml2SourceCharacteristics.fromGML( - customMobileSource.getCharacteristics(), null, null); - if (characteristics instanceof final OPSSourceCharacteristics opsCharacteristics) { - opsCharacteristics.setDiurnalVariation(DiurnalVariation.INDUSTRIAL_ACTIVITY); - } - customVehicleEmissionValues.setCharacteristics(characteristics); - - for (final IsGmlProperty emissionProperty : customMobileSource.getEmissions()) { - final IsGmlEmission emission = emissionProperty.getProperty(); - customVehicleEmissionValues.getEmissions().put(emission.getSubstance(), emission.getValue()); - } - - return customVehicleEmissionValues; - } } diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlConsumptionOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlConsumptionOffRoadVehicleSpecification.java deleted file mode 100644 index 2814a33f3..000000000 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlConsumptionOffRoadVehicleSpecification.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright the State of the Netherlands - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - */ -package nl.overheid.aerius.gml.base.source.mobile.v40; - -import java.util.List; - -import nl.overheid.aerius.gml.base.IsGmlProperty; -import nl.overheid.aerius.gml.base.source.IsGmlEmission; - -public interface IsGmlConsumptionOffRoadVehicleSpecification extends IsGmlOffRoadVehicleSpecification { - - List> getEmissionFactors(); - - int getEnergyEfficiency(); - - int getConsumption(); - -} diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlStandardOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlStandardOffRoadMobileSource.java index 2ede1f574..ff79d6c46 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlStandardOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/IsGmlStandardOffRoadMobileSource.java @@ -16,11 +16,9 @@ */ package nl.overheid.aerius.gml.base.source.mobile.v40; -public interface IsGmlStandardOffRoadMobileSource extends IsGmlOffRoadMobileSource { +import nl.overheid.aerius.gml.base.source.mobile.IsGmlStandardOffRoadMobileBaseSource; - String getCode(); - - Integer getLiterFuelPerYear(); +public interface IsGmlStandardOffRoadMobileSource extends IsGmlStandardOffRoadMobileBaseSource { Integer getOperatingHoursPerYear(); diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v0_5/source/mobile/AbstractOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v0_5/source/mobile/AbstractOffRoadMobileSource.java index 18cb7f479..cc65c01ce 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v0_5/source/mobile/AbstractOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v0_5/source/mobile/AbstractOffRoadMobileSource.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v0_5.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v0_5/source/mobile/CustomOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v0_5/source/mobile/CustomOffRoadMobileSource.java index b79ff5e9c..8b230bf59 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v0_5/source/mobile/CustomOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v0_5/source/mobile/CustomOffRoadMobileSource.java @@ -24,8 +24,8 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlCustomOffRoadMobileSource; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlCustomOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v0_5.base.CalculatorSchema; import nl.overheid.aerius.gml.v0_5.source.EmissionProperty; import nl.overheid.aerius.gml.v0_5.source.EmissionSourceCharacteristics; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v0_5/source/mobile/OffRoadMobileEmissionSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v0_5/source/mobile/OffRoadMobileEmissionSource.java index f970f1239..ba25cc516 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v0_5/source/mobile/OffRoadMobileEmissionSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v0_5/source/mobile/OffRoadMobileEmissionSource.java @@ -22,7 +22,7 @@ import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileEmissionSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileEmissionSource; import nl.overheid.aerius.gml.v0_5.base.CalculatorSchema; import nl.overheid.aerius.gml.v0_5.source.EmissionSource; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v0_5/source/mobile/OffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v0_5/source/mobile/OffRoadMobileSource.java index f69e85f26..a369f4a5b 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v0_5/source/mobile/OffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v0_5/source/mobile/OffRoadMobileSource.java @@ -32,16 +32,16 @@ @XmlType(name = "StandardOffRoadMobileSourceType", namespace = CalculatorSchema.NAMESPACE) public class OffRoadMobileSource extends AbstractOffRoadMobileSource implements IsGmlStandardOffRoadMobileSource { - private int literFuelPerYear; + private Integer literFuelPerYear; private String code; @Override @XmlElement(name = "literFuelPerYear", namespace = CalculatorSchema.NAMESPACE) - public int getLiterFuelPerYear() { + public Integer getLiterFuelPerYear() { return literFuelPerYear; } - public void setLiterFuelPerYear(final int literFuelPerYear) { + public void setLiterFuelPerYear(final Integer literFuelPerYear) { this.literFuelPerYear = literFuelPerYear; } diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v0_5/source/mobile/OffRoadMobileSourceProperty.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v0_5/source/mobile/OffRoadMobileSourceProperty.java index 0b2e50eab..b6a396995 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v0_5/source/mobile/OffRoadMobileSourceProperty.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v0_5/source/mobile/OffRoadMobileSourceProperty.java @@ -21,7 +21,7 @@ import nl.overheid.aerius.gml.base.AbstractProperty; import nl.overheid.aerius.gml.base.IsGmlProperty; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v0_5.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_0/source/mobile/AbstractOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_0/source/mobile/AbstractOffRoadMobileSource.java index af0594153..1129cb208 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_0/source/mobile/AbstractOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_0/source/mobile/AbstractOffRoadMobileSource.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v1_0.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_0/source/mobile/CustomOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_0/source/mobile/CustomOffRoadMobileSource.java index 16b8a964b..9ba76131f 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_0/source/mobile/CustomOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_0/source/mobile/CustomOffRoadMobileSource.java @@ -24,8 +24,8 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlCustomOffRoadMobileSource; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlCustomOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v1_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v1_0.source.EmissionProperty; import nl.overheid.aerius.gml.v1_0.source.EmissionSourceCharacteristics; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_0/source/mobile/OffRoadMobileEmissionSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_0/source/mobile/OffRoadMobileEmissionSource.java index 579cb230d..77f5c32fc 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_0/source/mobile/OffRoadMobileEmissionSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_0/source/mobile/OffRoadMobileEmissionSource.java @@ -22,7 +22,7 @@ import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileEmissionSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileEmissionSource; import nl.overheid.aerius.gml.v1_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v1_0.source.EmissionSource; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_0/source/mobile/OffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_0/source/mobile/OffRoadMobileSource.java index f1c9d2a5a..8c9368cc8 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_0/source/mobile/OffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_0/source/mobile/OffRoadMobileSource.java @@ -32,16 +32,16 @@ @XmlType(name = "StandardOffRoadMobileSourceType", namespace = CalculatorSchema.NAMESPACE) public class OffRoadMobileSource extends AbstractOffRoadMobileSource implements IsGmlStandardOffRoadMobileSource { - private int literFuelPerYear; + private Integer literFuelPerYear; private String code; @Override @XmlElement(name = "literFuelPerYear", namespace = CalculatorSchema.NAMESPACE) - public int getLiterFuelPerYear() { + public Integer getLiterFuelPerYear() { return literFuelPerYear; } - public void setLiterFuelPerYear(final int literFuelPerYear) { + public void setLiterFuelPerYear(final Integer literFuelPerYear) { this.literFuelPerYear = literFuelPerYear; } diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_0/source/mobile/OffRoadMobileSourceProperty.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_0/source/mobile/OffRoadMobileSourceProperty.java index 007deffe2..4fd692835 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_0/source/mobile/OffRoadMobileSourceProperty.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_0/source/mobile/OffRoadMobileSourceProperty.java @@ -21,7 +21,7 @@ import nl.overheid.aerius.gml.base.AbstractProperty; import nl.overheid.aerius.gml.base.IsGmlProperty; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v1_0.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/AbstractOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/AbstractOffRoadMobileSource.java index ab3d52fe7..5b6b9049d 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/AbstractOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/AbstractOffRoadMobileSource.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v1_1.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/AbstractOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/AbstractOffRoadVehicleSpecification.java index 33f95aef6..2ebe78a5a 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/AbstractOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/AbstractOffRoadVehicleSpecification.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v1_1.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/ConsumptionOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/ConsumptionOffRoadVehicleSpecification.java index 8c274284a..f10f75f6e 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/ConsumptionOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/ConsumptionOffRoadVehicleSpecification.java @@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlConsumptionOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlConsumptionOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v1_1.base.CalculatorSchema; import nl.overheid.aerius.gml.v1_1.source.Emission; import nl.overheid.aerius.gml.v1_1.source.EmissionProperty; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/CustomOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/CustomOffRoadMobileSource.java index 7cc8e89a2..8474e2fdf 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/CustomOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/CustomOffRoadMobileSource.java @@ -24,7 +24,7 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlCustomOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlCustomOffRoadMobileSource; import nl.overheid.aerius.gml.v1_1.base.CalculatorSchema; import nl.overheid.aerius.gml.v1_1.source.EmissionProperty; import nl.overheid.aerius.gml.v1_1.source.characteristics.EmissionSourceCharacteristics; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/OffRoadMobileEmissionSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/OffRoadMobileEmissionSource.java index 5e6d6b0f6..123901742 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/OffRoadMobileEmissionSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/OffRoadMobileEmissionSource.java @@ -22,7 +22,7 @@ import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileEmissionSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileEmissionSource; import nl.overheid.aerius.gml.v1_1.base.CalculatorSchema; import nl.overheid.aerius.gml.v1_1.source.EmissionSource; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/OffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/OffRoadMobileSource.java index d787d3932..204d31ad3 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/OffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/OffRoadMobileSource.java @@ -31,16 +31,16 @@ @XmlType(name = "StandardOffRoadMobileSourceType", namespace = CalculatorSchema.NAMESPACE) public class OffRoadMobileSource extends AbstractOffRoadMobileSource implements IsGmlStandardOffRoadMobileSource { - private int literFuelPerYear; + private Integer literFuelPerYear; private String code; @Override @XmlElement(name = "literFuelPerYear", namespace = CalculatorSchema.NAMESPACE) - public int getLiterFuelPerYear() { + public Integer getLiterFuelPerYear() { return literFuelPerYear; } - public void setLiterFuelPerYear(final int literFuelPerYear) { + public void setLiterFuelPerYear(final Integer literFuelPerYear) { this.literFuelPerYear = literFuelPerYear; } diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/OffRoadMobileSourceProperty.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/OffRoadMobileSourceProperty.java index 0e8721d58..96eb54db7 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/OffRoadMobileSourceProperty.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/OffRoadMobileSourceProperty.java @@ -21,7 +21,7 @@ import nl.overheid.aerius.gml.base.AbstractProperty; import nl.overheid.aerius.gml.base.IsGmlProperty; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v1_1.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/OffRoadVehicleSpecificationProperty.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/OffRoadVehicleSpecificationProperty.java index 1608e690d..94d80c6a3 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/OffRoadVehicleSpecificationProperty.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/OffRoadVehicleSpecificationProperty.java @@ -21,7 +21,7 @@ import nl.overheid.aerius.gml.base.AbstractProperty; import nl.overheid.aerius.gml.base.IsGmlProperty; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v1_1.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/OperatingHoursOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/OperatingHoursOffRoadVehicleSpecification.java index 443ed22f0..ee9abbee3 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/OperatingHoursOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v1_1/source/mobile/OperatingHoursOffRoadVehicleSpecification.java @@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOperatingHoursOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOperatingHoursOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v1_1.base.CalculatorSchema; import nl.overheid.aerius.gml.v1_1.source.Emission; import nl.overheid.aerius.gml.v1_1.source.EmissionProperty; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/AbstractOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/AbstractOffRoadMobileSource.java index 03752c91c..6f8b4cac0 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/AbstractOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/AbstractOffRoadMobileSource.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v2_0.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/AbstractOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/AbstractOffRoadVehicleSpecification.java index 2cdf0f7f2..8cd5c4702 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/AbstractOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/AbstractOffRoadVehicleSpecification.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v2_0.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/ConsumptionOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/ConsumptionOffRoadVehicleSpecification.java index 573fad86b..afe6e59de 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/ConsumptionOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/ConsumptionOffRoadVehicleSpecification.java @@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlConsumptionOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlConsumptionOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v2_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v2_0.source.Emission; import nl.overheid.aerius.gml.v2_0.source.EmissionProperty; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/CustomOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/CustomOffRoadMobileSource.java index b35da3753..502e953a9 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/CustomOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/CustomOffRoadMobileSource.java @@ -24,7 +24,7 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlCustomOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlCustomOffRoadMobileSource; import nl.overheid.aerius.gml.v2_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v2_0.source.EmissionProperty; import nl.overheid.aerius.gml.v2_0.source.characteristics.EmissionSourceCharacteristics; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/OffRoadMobileEmissionSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/OffRoadMobileEmissionSource.java index 0cdd6b6bd..c350dc719 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/OffRoadMobileEmissionSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/OffRoadMobileEmissionSource.java @@ -22,7 +22,7 @@ import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileEmissionSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileEmissionSource; import nl.overheid.aerius.gml.v2_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v2_0.source.EmissionSource; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/OffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/OffRoadMobileSource.java index 8e7c095a4..d9625a6bc 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/OffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/OffRoadMobileSource.java @@ -32,16 +32,16 @@ @XmlType(name = "StandardOffRoadMobileSourceType", namespace = CalculatorSchema.NAMESPACE) public class OffRoadMobileSource extends AbstractOffRoadMobileSource implements IsGmlStandardOffRoadMobileSource { - private int literFuelPerYear; + private Integer literFuelPerYear; private String code; @Override @XmlElement(name = "literFuelPerYear", namespace = CalculatorSchema.NAMESPACE) - public int getLiterFuelPerYear() { + public Integer getLiterFuelPerYear() { return literFuelPerYear; } - public void setLiterFuelPerYear(final int literFuelPerYear) { + public void setLiterFuelPerYear(final Integer literFuelPerYear) { this.literFuelPerYear = literFuelPerYear; } diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/OffRoadMobileSourceProperty.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/OffRoadMobileSourceProperty.java index 4f7ffd09f..c76309bd4 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/OffRoadMobileSourceProperty.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/OffRoadMobileSourceProperty.java @@ -21,7 +21,7 @@ import nl.overheid.aerius.gml.base.AbstractProperty; import nl.overheid.aerius.gml.base.IsGmlProperty; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v2_0.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/OffRoadVehicleSpecificationProperty.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/OffRoadVehicleSpecificationProperty.java index 51bd3b5fd..a46e6c4de 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/OffRoadVehicleSpecificationProperty.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/OffRoadVehicleSpecificationProperty.java @@ -21,7 +21,7 @@ import nl.overheid.aerius.gml.base.AbstractProperty; import nl.overheid.aerius.gml.base.IsGmlProperty; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v2_0.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/OperatingHoursOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/OperatingHoursOffRoadVehicleSpecification.java index a817d2cd9..2795f9cf4 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/OperatingHoursOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_0/source/mobile/OperatingHoursOffRoadVehicleSpecification.java @@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOperatingHoursOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOperatingHoursOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v2_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v2_0.source.Emission; import nl.overheid.aerius.gml.v2_0.source.EmissionProperty; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/AbstractOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/AbstractOffRoadMobileSource.java index bcf10df12..313aab17e 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/AbstractOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/AbstractOffRoadMobileSource.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v2_1.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/AbstractOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/AbstractOffRoadVehicleSpecification.java index f9769e548..8f461ab9c 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/AbstractOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/AbstractOffRoadVehicleSpecification.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v2_1.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/ConsumptionOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/ConsumptionOffRoadVehicleSpecification.java index 175f6c41a..422d28f20 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/ConsumptionOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/ConsumptionOffRoadVehicleSpecification.java @@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlConsumptionOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlConsumptionOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v2_1.base.CalculatorSchema; import nl.overheid.aerius.gml.v2_1.source.Emission; import nl.overheid.aerius.gml.v2_1.source.EmissionProperty; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/CustomOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/CustomOffRoadMobileSource.java index 26ba1ce10..956ffd3b7 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/CustomOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/CustomOffRoadMobileSource.java @@ -24,7 +24,7 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlCustomOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlCustomOffRoadMobileSource; import nl.overheid.aerius.gml.v2_1.base.CalculatorSchema; import nl.overheid.aerius.gml.v2_1.source.EmissionProperty; import nl.overheid.aerius.gml.v2_1.source.characteristics.EmissionSourceCharacteristics; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/OffRoadMobileEmissionSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/OffRoadMobileEmissionSource.java index 228edbe13..e615d3f90 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/OffRoadMobileEmissionSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/OffRoadMobileEmissionSource.java @@ -22,7 +22,7 @@ import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileEmissionSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileEmissionSource; import nl.overheid.aerius.gml.v2_1.base.CalculatorSchema; import nl.overheid.aerius.gml.v2_1.source.EmissionSource; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/OffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/OffRoadMobileSource.java index d25e4516e..01920e540 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/OffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/OffRoadMobileSource.java @@ -31,16 +31,16 @@ @XmlType(name = "StandardOffRoadMobileSourceType", namespace = CalculatorSchema.NAMESPACE) public class OffRoadMobileSource extends AbstractOffRoadMobileSource implements IsGmlStandardOffRoadMobileSource { - private int literFuelPerYear; + private Integer literFuelPerYear; private String code; @Override @XmlElement(name = "literFuelPerYear", namespace = CalculatorSchema.NAMESPACE) - public int getLiterFuelPerYear() { + public Integer getLiterFuelPerYear() { return literFuelPerYear; } - public void setLiterFuelPerYear(final int literFuelPerYear) { + public void setLiterFuelPerYear(final Integer literFuelPerYear) { this.literFuelPerYear = literFuelPerYear; } diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/OffRoadMobileSourceProperty.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/OffRoadMobileSourceProperty.java index ad887d46d..493aa030d 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/OffRoadMobileSourceProperty.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/OffRoadMobileSourceProperty.java @@ -21,7 +21,7 @@ import nl.overheid.aerius.gml.base.AbstractProperty; import nl.overheid.aerius.gml.base.IsGmlProperty; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v2_1.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/OffRoadVehicleSpecificationProperty.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/OffRoadVehicleSpecificationProperty.java index f1a12ba26..7b4551f89 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/OffRoadVehicleSpecificationProperty.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/OffRoadVehicleSpecificationProperty.java @@ -21,7 +21,7 @@ import nl.overheid.aerius.gml.base.AbstractProperty; import nl.overheid.aerius.gml.base.IsGmlProperty; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v2_1.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/OperatingHoursOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/OperatingHoursOffRoadVehicleSpecification.java index f73186c4e..0427d2926 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/OperatingHoursOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_1/source/mobile/OperatingHoursOffRoadVehicleSpecification.java @@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOperatingHoursOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOperatingHoursOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v2_1.base.CalculatorSchema; import nl.overheid.aerius.gml.v2_1.source.Emission; import nl.overheid.aerius.gml.v2_1.source.EmissionProperty; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/AbstractOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/AbstractOffRoadMobileSource.java index 96a7a95dd..86327cc11 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/AbstractOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/AbstractOffRoadMobileSource.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v2_2.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/AbstractOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/AbstractOffRoadVehicleSpecification.java index a6c46eeab..2393cc82e 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/AbstractOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/AbstractOffRoadVehicleSpecification.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v2_2.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/ConsumptionOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/ConsumptionOffRoadVehicleSpecification.java index 191e2853e..dec033dcf 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/ConsumptionOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/ConsumptionOffRoadVehicleSpecification.java @@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlConsumptionOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlConsumptionOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v2_2.base.CalculatorSchema; import nl.overheid.aerius.gml.v2_2.source.Emission; import nl.overheid.aerius.gml.v2_2.source.EmissionProperty; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/CustomOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/CustomOffRoadMobileSource.java index 1fb3b246f..3a5de1016 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/CustomOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/CustomOffRoadMobileSource.java @@ -24,7 +24,7 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlCustomOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlCustomOffRoadMobileSource; import nl.overheid.aerius.gml.v2_2.base.CalculatorSchema; import nl.overheid.aerius.gml.v2_2.source.EmissionProperty; import nl.overheid.aerius.gml.v2_2.source.characteristics.EmissionSourceCharacteristics; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/OffRoadMobileEmissionSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/OffRoadMobileEmissionSource.java index 276254449..83ada8ce0 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/OffRoadMobileEmissionSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/OffRoadMobileEmissionSource.java @@ -22,7 +22,7 @@ import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileEmissionSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileEmissionSource; import nl.overheid.aerius.gml.v2_2.base.CalculatorSchema; import nl.overheid.aerius.gml.v2_2.source.EmissionSource; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/OffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/OffRoadMobileSource.java index 6fe91df22..c2706b0da 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/OffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/OffRoadMobileSource.java @@ -32,16 +32,16 @@ @XmlType(name = "StandardOffRoadMobileSourceType", namespace = CalculatorSchema.NAMESPACE) public class OffRoadMobileSource extends AbstractOffRoadMobileSource implements IsGmlStandardOffRoadMobileSource { - private int literFuelPerYear; + private Integer literFuelPerYear; private String code; @Override @XmlElement(name = "literFuelPerYear", namespace = CalculatorSchema.NAMESPACE) - public int getLiterFuelPerYear() { + public Integer getLiterFuelPerYear() { return literFuelPerYear; } - public void setLiterFuelPerYear(final int literFuelPerYear) { + public void setLiterFuelPerYear(final Integer literFuelPerYear) { this.literFuelPerYear = literFuelPerYear; } diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/OffRoadMobileSourceProperty.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/OffRoadMobileSourceProperty.java index 52e7a546e..49aa8229d 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/OffRoadMobileSourceProperty.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/OffRoadMobileSourceProperty.java @@ -21,7 +21,7 @@ import nl.overheid.aerius.gml.base.AbstractProperty; import nl.overheid.aerius.gml.base.IsGmlProperty; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v2_2.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/OffRoadVehicleSpecificationProperty.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/OffRoadVehicleSpecificationProperty.java index e198adbf4..da202884d 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/OffRoadVehicleSpecificationProperty.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/OffRoadVehicleSpecificationProperty.java @@ -21,7 +21,7 @@ import nl.overheid.aerius.gml.base.AbstractProperty; import nl.overheid.aerius.gml.base.IsGmlProperty; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v2_2.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/OperatingHoursOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/OperatingHoursOffRoadVehicleSpecification.java index a37643eb5..2dea4fbac 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/OperatingHoursOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v2_2/source/mobile/OperatingHoursOffRoadVehicleSpecification.java @@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOperatingHoursOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOperatingHoursOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v2_2.base.CalculatorSchema; import nl.overheid.aerius.gml.v2_2.source.Emission; import nl.overheid.aerius.gml.v2_2.source.EmissionProperty; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/AbstractOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/AbstractOffRoadMobileSource.java index 51bfc8c2a..9a06df166 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/AbstractOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/AbstractOffRoadMobileSource.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v3_0.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/AbstractOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/AbstractOffRoadVehicleSpecification.java index 7b34dc7ba..a7843ca03 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/AbstractOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/AbstractOffRoadVehicleSpecification.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v3_0.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/ConsumptionOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/ConsumptionOffRoadVehicleSpecification.java index cc032961d..85538fd2f 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/ConsumptionOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/ConsumptionOffRoadVehicleSpecification.java @@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlConsumptionOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlConsumptionOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v3_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v3_0.source.Emission; import nl.overheid.aerius.gml.v3_0.source.EmissionProperty; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/CustomOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/CustomOffRoadMobileSource.java index 4efc4ca33..75b6c5079 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/CustomOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/CustomOffRoadMobileSource.java @@ -24,7 +24,7 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlCustomOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlCustomOffRoadMobileSource; import nl.overheid.aerius.gml.v3_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v3_0.source.EmissionProperty; import nl.overheid.aerius.gml.v3_0.source.characteristics.EmissionSourceCharacteristics; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/OffRoadMobileEmissionSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/OffRoadMobileEmissionSource.java index a67e1f552..22446aff2 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/OffRoadMobileEmissionSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/OffRoadMobileEmissionSource.java @@ -22,7 +22,7 @@ import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileEmissionSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileEmissionSource; import nl.overheid.aerius.gml.v3_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v3_0.source.EmissionSource; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/OffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/OffRoadMobileSource.java index 836a09d83..9652382fd 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/OffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/OffRoadMobileSource.java @@ -32,16 +32,16 @@ @XmlType(name = "StandardOffRoadMobileSourceType", namespace = CalculatorSchema.NAMESPACE) public class OffRoadMobileSource extends AbstractOffRoadMobileSource implements IsGmlStandardOffRoadMobileSource { - private int literFuelPerYear; + private Integer literFuelPerYear; private String code; @Override @XmlElement(name = "literFuelPerYear", namespace = CalculatorSchema.NAMESPACE) - public int getLiterFuelPerYear() { + public Integer getLiterFuelPerYear() { return literFuelPerYear; } - public void setLiterFuelPerYear(final int literFuelPerYear) { + public void setLiterFuelPerYear(final Integer literFuelPerYear) { this.literFuelPerYear = literFuelPerYear; } diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/OffRoadMobileSourceProperty.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/OffRoadMobileSourceProperty.java index 3821ba6af..da6b5000f 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/OffRoadMobileSourceProperty.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/OffRoadMobileSourceProperty.java @@ -21,7 +21,7 @@ import nl.overheid.aerius.gml.base.AbstractProperty; import nl.overheid.aerius.gml.base.IsGmlProperty; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v3_0.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/OffRoadVehicleSpecificationProperty.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/OffRoadVehicleSpecificationProperty.java index dbd5e7e89..96442f5a6 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/OffRoadVehicleSpecificationProperty.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/OffRoadVehicleSpecificationProperty.java @@ -21,7 +21,7 @@ import nl.overheid.aerius.gml.base.AbstractProperty; import nl.overheid.aerius.gml.base.IsGmlProperty; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v3_0.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/OperatingHoursOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/OperatingHoursOffRoadVehicleSpecification.java index 70565906d..512170368 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/OperatingHoursOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_0/source/mobile/OperatingHoursOffRoadVehicleSpecification.java @@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOperatingHoursOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOperatingHoursOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v3_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v3_0.source.Emission; import nl.overheid.aerius.gml.v3_0.source.EmissionProperty; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/AbstractOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/AbstractOffRoadMobileSource.java index c3a587191..fea9e1644 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/AbstractOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/AbstractOffRoadMobileSource.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v3_1.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/AbstractOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/AbstractOffRoadVehicleSpecification.java index 80deffab3..c63cf56f1 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/AbstractOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/AbstractOffRoadVehicleSpecification.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v3_1.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/ConsumptionOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/ConsumptionOffRoadVehicleSpecification.java index d5234ca1c..526a568fa 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/ConsumptionOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/ConsumptionOffRoadVehicleSpecification.java @@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlConsumptionOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlConsumptionOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v3_1.base.CalculatorSchema; import nl.overheid.aerius.gml.v3_1.source.EmissionProperty; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/CustomOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/CustomOffRoadMobileSource.java index 46226078a..d306a9959 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/CustomOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/CustomOffRoadMobileSource.java @@ -24,7 +24,7 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlCustomOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlCustomOffRoadMobileSource; import nl.overheid.aerius.gml.v3_1.base.CalculatorSchema; import nl.overheid.aerius.gml.v3_1.source.EmissionProperty; import nl.overheid.aerius.gml.v3_1.source.characteristics.EmissionSourceCharacteristics; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/OffRoadMobileEmissionSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/OffRoadMobileEmissionSource.java index b3ff6808b..c988e3f68 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/OffRoadMobileEmissionSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/OffRoadMobileEmissionSource.java @@ -22,7 +22,7 @@ import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileEmissionSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileEmissionSource; import nl.overheid.aerius.gml.v3_1.base.CalculatorSchema; import nl.overheid.aerius.gml.v3_1.source.EmissionSource; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/OffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/OffRoadMobileSource.java index 3ed5a911c..69f56a9a9 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/OffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/OffRoadMobileSource.java @@ -32,18 +32,18 @@ "engineDisplacement"}) public class OffRoadMobileSource extends AbstractOffRoadMobileSource implements IsGmlStandardOffRoadMobileSource { - private int literFuelPerYear; + private Integer literFuelPerYear; private String code; private Integer hoursIdlePerYear; private Double engineDisplacement; @Override @XmlElement(namespace = CalculatorSchema.NAMESPACE) - public int getLiterFuelPerYear() { + public Integer getLiterFuelPerYear() { return literFuelPerYear; } - public void setLiterFuelPerYear(final int literFuelPerYear) { + public void setLiterFuelPerYear(final Integer literFuelPerYear) { this.literFuelPerYear = literFuelPerYear; } diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/OffRoadMobileSourceProperty.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/OffRoadMobileSourceProperty.java index b21741520..828f0184b 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/OffRoadMobileSourceProperty.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/OffRoadMobileSourceProperty.java @@ -21,7 +21,7 @@ import nl.overheid.aerius.gml.base.AbstractProperty; import nl.overheid.aerius.gml.base.IsGmlProperty; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v3_1.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/OperatingHoursOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/OperatingHoursOffRoadVehicleSpecification.java index bbf867f86..9a806f034 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/OperatingHoursOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v3_1/source/mobile/OperatingHoursOffRoadVehicleSpecification.java @@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v31.IsGmlOperatingHoursOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOperatingHoursOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v3_1.base.CalculatorSchema; import nl.overheid.aerius.gml.v3_1.source.EmissionProperty; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/AbstractOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/AbstractOffRoadMobileSource.java index fff0bf4a5..baff3ceee 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/AbstractOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/AbstractOffRoadMobileSource.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v4_0.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/AbstractOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/AbstractOffRoadVehicleSpecification.java index 01df30f5e..9b3770d0e 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/AbstractOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/AbstractOffRoadVehicleSpecification.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v4_0.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/ConsumptionOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/ConsumptionOffRoadVehicleSpecification.java index ba76ea67d..eeeeafe54 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/ConsumptionOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/ConsumptionOffRoadVehicleSpecification.java @@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlConsumptionOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlConsumptionOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v4_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v4_0.source.EmissionProperty; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/CustomOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/CustomOffRoadMobileSource.java index 352ead4a9..4a2af0b7a 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/CustomOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/CustomOffRoadMobileSource.java @@ -24,7 +24,7 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlCustomOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlCustomOffRoadMobileSource; import nl.overheid.aerius.gml.v4_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v4_0.source.EmissionProperty; import nl.overheid.aerius.gml.v4_0.source.characteristics.EmissionSourceCharacteristics; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/OffRoadMobileEmissionSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/OffRoadMobileEmissionSource.java index b07578fe8..02cbc472f 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/OffRoadMobileEmissionSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/OffRoadMobileEmissionSource.java @@ -22,7 +22,7 @@ import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlOffRoadMobileEmissionSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileEmissionSource; import nl.overheid.aerius.gml.v4_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v4_0.source.EmissionSource; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/OffRoadMobileSourceProperty.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/OffRoadMobileSourceProperty.java index 015277665..4c05fbbc5 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/OffRoadMobileSourceProperty.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/OffRoadMobileSourceProperty.java @@ -21,7 +21,7 @@ import nl.overheid.aerius.gml.base.AbstractProperty; import nl.overheid.aerius.gml.base.IsGmlProperty; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v4_0.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/OperatingHoursOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/OperatingHoursOffRoadVehicleSpecification.java index a1f662fa3..53619c7b5 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/OperatingHoursOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v4_0/source/mobile/OperatingHoursOffRoadVehicleSpecification.java @@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlOperatingHoursOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOperatingHoursOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v4_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v4_0.source.EmissionProperty; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/AbstractOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/AbstractOffRoadMobileSource.java index dcd9d67a8..2a7fe5e3f 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/AbstractOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/AbstractOffRoadMobileSource.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v5_0.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/AbstractOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/AbstractOffRoadVehicleSpecification.java index 4fea0b1e9..0b0f91aba 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/AbstractOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/AbstractOffRoadVehicleSpecification.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v5_0.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/ConsumptionOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/ConsumptionOffRoadVehicleSpecification.java index 6dc32eaff..832b69490 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/ConsumptionOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/ConsumptionOffRoadVehicleSpecification.java @@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlConsumptionOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlConsumptionOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v5_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v5_0.source.EmissionProperty; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/CustomOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/CustomOffRoadMobileSource.java index 5d3c65d2d..574a71649 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/CustomOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/CustomOffRoadMobileSource.java @@ -24,7 +24,7 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlCustomOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlCustomOffRoadMobileSource; import nl.overheid.aerius.gml.v5_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v5_0.source.EmissionProperty; import nl.overheid.aerius.gml.v5_0.source.characteristics.AbstractSourceCharacteristics; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/OffRoadMobileEmissionSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/OffRoadMobileEmissionSource.java index 73f5c0d8f..37c3aa685 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/OffRoadMobileEmissionSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/OffRoadMobileEmissionSource.java @@ -22,7 +22,7 @@ import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlOffRoadMobileEmissionSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileEmissionSource; import nl.overheid.aerius.gml.v5_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v5_0.source.EmissionSource; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/OffRoadMobileSourceProperty.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/OffRoadMobileSourceProperty.java index de0a3912b..6e5acb2d5 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/OffRoadMobileSourceProperty.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/OffRoadMobileSourceProperty.java @@ -21,7 +21,7 @@ import nl.overheid.aerius.gml.base.AbstractProperty; import nl.overheid.aerius.gml.base.IsGmlProperty; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v5_0.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/OperatingHoursOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/OperatingHoursOffRoadVehicleSpecification.java index d7d43a13c..b26c97275 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/OperatingHoursOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_0/source/mobile/OperatingHoursOffRoadVehicleSpecification.java @@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlOperatingHoursOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOperatingHoursOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v5_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v5_0.source.EmissionProperty; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/AbstractOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/AbstractOffRoadMobileSource.java index 52c44065f..756f6d0d3 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/AbstractOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/AbstractOffRoadMobileSource.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v5_1.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/AbstractOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/AbstractOffRoadVehicleSpecification.java index 0ae96063d..21ab5299b 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/AbstractOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/AbstractOffRoadVehicleSpecification.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v5_1.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/ConsumptionOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/ConsumptionOffRoadVehicleSpecification.java index 31d2da8d7..07270e460 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/ConsumptionOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/ConsumptionOffRoadVehicleSpecification.java @@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlConsumptionOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlConsumptionOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v5_1.base.CalculatorSchema; import nl.overheid.aerius.gml.v5_1.source.EmissionProperty; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/CustomOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/CustomOffRoadMobileSource.java index 614f2feff..c1cb8c598 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/CustomOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/CustomOffRoadMobileSource.java @@ -24,7 +24,7 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlCustomOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlCustomOffRoadMobileSource; import nl.overheid.aerius.gml.v5_1.base.CalculatorSchema; import nl.overheid.aerius.gml.v5_1.source.EmissionProperty; import nl.overheid.aerius.gml.v5_1.source.characteristics.AbstractSourceCharacteristics; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/OffRoadMobileEmissionSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/OffRoadMobileEmissionSource.java index b07099d02..bbe066000 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/OffRoadMobileEmissionSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/OffRoadMobileEmissionSource.java @@ -22,7 +22,7 @@ import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlOffRoadMobileEmissionSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileEmissionSource; import nl.overheid.aerius.gml.v5_1.base.CalculatorSchema; import nl.overheid.aerius.gml.v5_1.source.EmissionSource; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/OffRoadMobileSourceProperty.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/OffRoadMobileSourceProperty.java index 8fff1f2d2..d6b66d366 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/OffRoadMobileSourceProperty.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/OffRoadMobileSourceProperty.java @@ -21,7 +21,7 @@ import nl.overheid.aerius.gml.base.AbstractProperty; import nl.overheid.aerius.gml.base.IsGmlProperty; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v5_1.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/OperatingHoursOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/OperatingHoursOffRoadVehicleSpecification.java index 57fd6c59f..f67843e59 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/OperatingHoursOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v5_1/source/mobile/OperatingHoursOffRoadVehicleSpecification.java @@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlOperatingHoursOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOperatingHoursOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v5_1.base.CalculatorSchema; import nl.overheid.aerius.gml.v5_1.source.EmissionProperty; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/AbstractOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/AbstractOffRoadMobileSource.java index 5249925c3..240544e79 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/AbstractOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/AbstractOffRoadMobileSource.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v6_0.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/AbstractOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/AbstractOffRoadVehicleSpecification.java index c49e5a078..3750de0b4 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/AbstractOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/AbstractOffRoadVehicleSpecification.java @@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v6_0.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/ConsumptionOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/ConsumptionOffRoadVehicleSpecification.java index a47bfa2d8..32a6611ab 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/ConsumptionOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/ConsumptionOffRoadVehicleSpecification.java @@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlConsumptionOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlConsumptionOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v6_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v6_0.source.EmissionProperty; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/CustomOffRoadMobileSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/CustomOffRoadMobileSource.java index 61842db90..ad3256910 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/CustomOffRoadMobileSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/CustomOffRoadMobileSource.java @@ -24,7 +24,7 @@ import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlCustomOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlCustomOffRoadMobileSource; import nl.overheid.aerius.gml.v6_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v6_0.source.EmissionProperty; import nl.overheid.aerius.gml.v6_0.source.characteristics.AbstractSourceCharacteristics; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/OffRoadMobileEmissionSource.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/OffRoadMobileEmissionSource.java index 77221aa3f..444dc35a5 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/OffRoadMobileEmissionSource.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/OffRoadMobileEmissionSource.java @@ -22,7 +22,7 @@ import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlOffRoadMobileEmissionSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileEmissionSource; import nl.overheid.aerius.gml.v6_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v6_0.source.EmissionSource; diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/OffRoadMobileSourceProperty.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/OffRoadMobileSourceProperty.java index 17873e103..b96e54499 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/OffRoadMobileSourceProperty.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/OffRoadMobileSourceProperty.java @@ -21,7 +21,7 @@ import nl.overheid.aerius.gml.base.AbstractProperty; import nl.overheid.aerius.gml.base.IsGmlProperty; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlOffRoadMobileSource; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOffRoadMobileSource; import nl.overheid.aerius.gml.v6_0.base.CalculatorSchema; /** diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/OperatingHoursOffRoadVehicleSpecification.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/OperatingHoursOffRoadVehicleSpecification.java index 69cfa9897..550c6dbbf 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/OperatingHoursOffRoadVehicleSpecification.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/v6_0/source/mobile/OperatingHoursOffRoadVehicleSpecification.java @@ -23,7 +23,7 @@ import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlType; -import nl.overheid.aerius.gml.base.source.mobile.v40.IsGmlOperatingHoursOffRoadVehicleSpecification; +import nl.overheid.aerius.gml.base.source.mobile.IsGmlOperatingHoursOffRoadVehicleSpecification; import nl.overheid.aerius.gml.v6_0.base.CalculatorSchema; import nl.overheid.aerius.gml.v6_0.source.EmissionProperty; From c7239ff80159c14172b256c65b572e30081d6f40 Mon Sep 17 00:00:00 2001 From: Hilbrand Bouwkamp Date: Tue, 16 Jun 2026 13:11:42 +0200 Subject: [PATCH 2/2] Review comment, added java doc to the abstract method as well. --- .../base/source/mobile/AbstractGML2OffRoad.java | 14 ++++++++++---- .../gml/base/source/mobile/v31/GML2OffRoad.java | 2 +- .../gml/base/source/mobile/v40/GML2OffRoad.java | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/AbstractGML2OffRoad.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/AbstractGML2OffRoad.java index 8af05f801..12e3a37bf 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/AbstractGML2OffRoad.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/AbstractGML2OffRoad.java @@ -36,11 +36,11 @@ /** * Base class for converting OffRoad mobile from GML to internal data object. * - * @param sub class of the standard offroad mobile sources * @param sub class of the off road mobile source + * @param sub class of the standard off road mobile sub source */ -public abstract class AbstractGML2OffRoad -extends AbstractGML2Specific { +public abstract class AbstractGML2OffRoad + extends AbstractGML2Specific { private static final Logger LOG = LoggerFactory.getLogger(AbstractGML2OffRoad.class); @@ -70,7 +70,13 @@ public final OffRoadMobileEmissionSource convert(final T source) throws AeriusEx return emissionSource.getSubSources().isEmpty() ? null : emissionSource; } - protected abstract OffRoadMobileSource convertStandard(S offRoadMobileSource); + /** + * Convert Standard OffRoad source to an {@link OffRoadMobileSource}. + * + * @param standardOffRoad Standard Offroad to convert + * @return Convert object + */ + protected abstract OffRoadMobileSource convertStandard(S standardOffRoad); @SuppressWarnings("unchecked") private OffRoadMobileSource convert(final IsGmlCustomOffRoadMobileSource customMobileSource) throws AeriusException { diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/GML2OffRoad.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/GML2OffRoad.java index f0b9a789b..823380681 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/GML2OffRoad.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v31/GML2OffRoad.java @@ -28,7 +28,7 @@ /** * Convert GML Off road to internal OffRoad data structure. */ -public class GML2OffRoad extends AbstractGML2OffRoad { +public class GML2OffRoad extends AbstractGML2OffRoad { /** * @param conversionData The conversionData to use. diff --git a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/GML2OffRoad.java b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/GML2OffRoad.java index a15217335..4a75064f4 100644 --- a/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/GML2OffRoad.java +++ b/source/imaer-gml/src/main/java/nl/overheid/aerius/gml/base/source/mobile/v40/GML2OffRoad.java @@ -26,7 +26,7 @@ /** * Convert GML Off road to internal OffRoad data structure. */ -public class GML2OffRoad extends AbstractGML2OffRoad { +public class GML2OffRoad extends AbstractGML2OffRoad { /** * @param conversionData The conversionData to use.