Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenko Ortgies2019-03-25 09:00:07 -0400
committerRenko Ortgies2019-03-25 09:00:07 -0400
commite204ba2bddfa2e14bcfc7f311f9f5e49fd6c75f0 (patch)
treec41b49f1dc0a8a1a372e6c9e74381192a1d72b2e
parent2bcb06af2ccdeaf646a09dacaa6901bf8dad2520 (diff)
downloadorg.eclipse.openk-platform.openk-repo-e204ba2bddfa2e14bcfc7f311f9f5e49fd6c75f0.tar.gz
org.eclipse.openk-platform.openk-repo-e204ba2bddfa2e14bcfc7f311f9f5e49fd6c75f0.tar.xz
org.eclipse.openk-platform.openk-repo-e204ba2bddfa2e14bcfc7f311f9f5e49fd6c75f0.zip
Eisman 1.0 - MS 2
Task references: CICA-396 Reason: EISMAN can use the CIM Cache 2 Rationale: none Side effects: None
-rw-r--r--dev/org.eclipse.openk.app.eisman-ui/WebContent/netzzustand/libs/html5-boilerplate/dist/browserconfig.xml10
-rw-r--r--dev/org.eclipse.openk.app.eisman-ui/WebContent/netzzustand/libs/html5-boilerplate/dist/crossdomain.xml9
-rw-r--r--dev/org.eclipse.openk.app.eisman-ui/WebContent/netzzustand/libs/html5-boilerplate/src/browserconfig.xml10
-rw-r--r--dev/org.eclipse.openk.app.eisman-ui/WebContent/netzzustand/libs/html5-boilerplate/src/crossdomain.xml9
-rw-r--r--dev/org.eclipse.openk.app.eisman-ui/WebContent/www/app/NetworkSubStateController.js2
-rw-r--r--dev/org.eclipse.openk.app.eisman-ui/WebContent/www/app/NetworkSubStateInfoController.js2
-rw-r--r--dev/org.eclipse.openk.app.eisman-ui/WebContent/www/libs/html5-boilerplate/dist/browserconfig.xml10
-rw-r--r--dev/org.eclipse.openk.app.eisman-ui/WebContent/www/libs/html5-boilerplate/dist/crossdomain.xml9
-rw-r--r--dev/org.eclipse.openk.app.eisman-ui/WebContent/www/libs/html5-boilerplate/src/browserconfig.xml10
-rw-r--r--dev/org.eclipse.openk.app.eisman-ui/WebContent/www/libs/html5-boilerplate/src/crossdomain.xml9
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/pom.xml4
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/EismanCimProfile.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/ActivityRecord.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/ElectronicAddress.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/Location.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/PositionPoint.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/StreetAddress.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/StreetDetail.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/TownDetail.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/AcDcTerminal.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConductingEquipment.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConnectivityNode.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConnectivityNodeContainer.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Equipment.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/EquipmentContainer.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/GeographicalRegion.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/IdentifiedObject.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/OperatingParticipant.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/OperatingShare.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/PowerSystemResource.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/SubGeographicalRegion.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Substation.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Terminal.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/VoltageLevel.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/AbsoluteDateTime.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/ActivePower.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/CommunicationType.java42
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/PerCent.java6
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/ReductionSetting.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/UnitMultiplier.java24
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/UnitSymbol.java67
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/Voltage.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/informative/infoperations/PsrEvent.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/informative/infoperations/PsrEventKind.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketcommon/RegisteredResource.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketoperations/mktdomain/UnitType.java73
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketoperations/referencedata/RegisteredGenerator.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/Analog.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/AnalogValue.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/Measurement.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/MeasurementValue.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/MeasurementValueQuality.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/production/GeneratingUnit.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/production/GeneratorControlSource.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/util/BigDecimalDeserializer.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/AcLineSegment.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/BusbarSection.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Conductor.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Connector.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/PowerTransformer.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/RegulatingCondEq.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/RotatingMachine.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Switch.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/SynchronousMachine.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/SynchronousMachineKind.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/cim-cache-service.config12
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/pom.xml320
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/CimCacheDataAccess.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/ActivityRecordJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/ElectronicAddressJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/LocationJpa.java197
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/PositionPointJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/StreetAddressJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/StreetDetailJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/TownDetailJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/AcDcTerminalJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConductingEquipmentJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConnectivityNodeContainerJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConnectivityNodeJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/EquipmentContainerJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/EquipmentJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/GeographicalRegionJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/IdentifiedObjectJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/OperatingParticipantJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/OperatingShareJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/PowerSystemResourceJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/SubGeographicalRegionJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/SubstationJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/TerminalJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/VoltageLevelJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/AbsoluteDateTimeJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/ActivePowerJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/CommunicationTypeJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/PerCentJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/ReductionSettingJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/UnitMultiplierJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/UnitSymbolJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/VoltageJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/informative/infoperations/PsrEventJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/informative/infoperations/PsrEventKindJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketcommon/RegisteredResourceJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketoperations/mktdomain/UnitTypeJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketoperations/referencedata/RegisteredGeneratorJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/AnalogJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/AnalogValueJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementValueJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementValueQualityJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/production/GeneratingUnitJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/production/GeneratorControlSourceJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Boolean2StringConverter.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/RegisteredGenerator2StringConverter.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Sequence.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Temporal.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/AcLineSegmentJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/BusbarSectionJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/ConductorJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/ConnectorJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/PowerTransformerJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/RegulatingCondEqJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/RotatingMachineJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SwitchJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SynchronousMachineJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SynchronousMachineKindJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/core/CimCacheDefaults.java6
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/CimCache.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/CimCache.properties42
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/DataExchangeDefaults.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/SecureRequestHandlerInterceptor.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/AbstractRestClient.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/GeographicalRegionProvider.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/JsonFileProvider.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/SynchronousMachineProvider.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SubGeographicalRegionRestController.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SubstationRestController.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SynchronousMachineRestController.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/JobController.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/JsonFileJob.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/NetstateJob.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/SynchronousMachineJob.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/TopologyJob.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/util/JobUtils.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/Abstract4Tree.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/SubGeographicalRegion4Tree.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/Substation4Tree.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/SumContainer.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/GeneratingUnitJpaRepository.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/GeographicalRegionJpaRepository.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SequenceJpaRepository.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SubGeographicalRegionJpaRepository.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SubstationJpaRepository.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SynchronousMachineJpaRepository.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/VoltageLevelJpaRepository.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AbstractJpaService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/ActivePowerJpaService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AnalogJpaService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AnalogValueJpaService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/BaseMapperService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/EquipmentService.java14
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionJpaService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionMapperService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionRestConsumerService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionValidatorService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/JsonFileRestConsumerService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/NetworkTraceService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SequenceJpaService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SignumService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegion4TreeService.java246
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionJpaService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionMapperService.java52
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationJpaService.java367
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationMapperService.java28
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineJpaDiffCheckerService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineJpaService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineMapperService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineRestConsumerService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineValidatorService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/TimePeriodPassedService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/util/TimestampUtil.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/AbstractPersistenceContext.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/AbstractSpringPersistenceContext.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/CimCachePersistenceContext.java15
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/CimCacheService.java176
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/CimCacheServiceConfiguration.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/IPersistenceContext.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/MapperConfiguration.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/PersistenceContextConfiguration.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/PersistenceContextInformation.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/resources/application.properties18
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/resources/database-flyway.xml10
-rw-r--r--dev/org.eclipse.openk.app.eisman/cimcache/src/main/resources/dozer-mapping.xml608
-rw-r--r--dev/org.eclipse.openk.app.eisman/common/pom.xml2
-rw-r--r--dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/dataexchange/adapter/rest/RestDefaults.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/dataexchange/adapter/rest/controller/AbstractRestController.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/date/DateDefaults.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/date/DateToolkit.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/module/AbstractModule.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/module/IModule.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/string/StringDefaults.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/string/StringToolkit.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/eisman-service.config63
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/pom.xml286
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/EismanDataAccess.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/ElectronicAddressJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/LocationJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/StreetAddressJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/StreetDetailJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/TownDetailJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/EquipmentContainerJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/EquipmentJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/IdentifiedObjectJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/SubGeographicalRegionJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/SubstationJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/VoltageLevelJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/AbsoluteDateTimeJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/ActivePowerJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/CommunicationTypeJpa.java7
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/PerCentJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/ReductionSettingJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/UnitMultiplierJpa.java8
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/UnitSymbolJpa.java8
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/VoltageJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/informative/infoperations/PsrEventJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/informative/infoperations/PsrEventKindJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/marketoperations/mktdomain/UnitTypeJpa.java15
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/marketoperations/referencedata/RegisteredGeneratorJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/AnalogJpa.java3
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/AnalogValueJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementValueJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementValueQualityJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/AbstractBaseEntityJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/ActivityJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/CharacteristicForActivityStatus.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/CharacteristicForMissingMeasurementJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/PreselectionConfigurationJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/PreselectionJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/UserSettingsJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/production/GeneratingUnitJpa.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/util/Boolean2StringConverter.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/wires/SynchronousMachineJpa.java4
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/EismanDataTransfer.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/AbstractNetworkStateNode.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/SubGeographicalRegion4Tree.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/Substation4Tree.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/deserializer/Eisman_1_ApplicationXml_Cim17v07_Deserializer.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/ConnectedConnectingEquipments_1_ApplicationXml_Importer.java82
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/EquipmentContainerContent_1_ApplicationXml_Importer.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/SubGeographicalRegions_1_ApplicationXml_Importer.java6
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/TopologicalResources_1_ApplicationXml_Importer.java82
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/AbstractRestImporter.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SubGeographicalRegionsImporter.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SubstationsImporter.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SynchronousMachinesImporter.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/EnergySources_1_Cim17v07_EismanDataTransfer_Mapper.java49
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/GeneratedEntityProvider.java481
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/OidToMridMapper.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/SubGeographicalRegions_1_Cim17v07_EismanDataTransfer_Mapper.java110
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/Substations_1_Cim17v07_EismanDataTransfer_Mapper.java21
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/core/EismanDefaults.java31
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/EISMAN.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/AbstractRestController.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ActivityRestController.java5
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/DisplayDtoRestController.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/HysteresisController.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/PreselectionRestController.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ReasonOfReductionRestController.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ReductionSettingListRestController.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/SubGeographicalRegionRestController.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/SubstationRestController.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/TimerRestContoller.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/exceptionhandler/RestResponseEntityExceptionHandler.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/util/IncludeAttribute4Json.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/util/SubstationToolkit.java28
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/controller/BaseController.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ActionOverviewDto.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ActionSettingsDto.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/OverviewDto.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/PointOfInjectionType.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/PreselectionConfigurationDto.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ProcessOverviewDto.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/SynchronousMachineOverviewDto.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/util/mapper/BigDecimalDeserializer.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/ActivityJpaRepository.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/PreselectionJpaRepository.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SubGeographicalRegionJpaRepository.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SubstationJpaRepository.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SynchronousMachineJpaRepository.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractReductionAdviceCalculatorService.java4
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractReductionAdviceService.java4
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivePowerJpaService.java6
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaFindService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaMappingService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AnalogJpaService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AnalogValueJpaService.java24
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/BaseMapperService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/DiscriminationCoefficientService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/DisplayDtoService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/HysteresisService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/IReductionAdvice.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/PreselectionJpaService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReasonOfReductionService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceAdjustmentService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceCalculatorService.java11
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceInitialService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionAdviceUpdateService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ReductionSettingService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubGeographicalRegionJpaService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubGeographicalRegionMapperService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubGeographicalRegionRestConsumerService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubstationJpaService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubstationMapperService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SubstationRestConsumerService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineJpaService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineMapperService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineMeasurementService.java16
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineOrderService.java22
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/SynchronousMachineRestConsumerService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/TimerService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/util/JpaUtils.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/servlet/interceptor/SecureRequestHandlerInterceptor.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/infrastructure/readerprovider/ConnectedConnectingEquipments_1_ApplicationXml_Utf8_Rest_ReaderProvider.java90
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/infrastructure/readerprovider/EquipmentContainerContent_1_ApplicationXml_Utf8_Rest_ReaderProvider.java88
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/infrastructure/readerprovider/SubGeographicalRegions_1_ApplicationXml_Utf8_Rest_ReaderProvider.java97
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/infrastructure/readerprovider/TopologicalResources_1_ApplicationXml_Utf8_Rest_ReaderProvider.java79
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/ImportSubGeographicalRegionsForNetworkState_1_Task.java121
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/ImportSubstationForNetworkState_1_Task.java275
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/parameters/ConnectedConnectingEquipmentsImportParameters.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/parameters/EquipmentContainerContentImportParameters.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/logic/task/parameters/TopologicalResourcesImportParameters.java21
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/ISubGeographicalRegionsProvider.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/ISubstationsProvider.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/ISynchronousMachinesProvider.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/ModelUtilities.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/SubGeographicalRegionsProvider.java100
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/SubstationsProvider.java54
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/model/SynchronousMachinesProvider.java28
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/service/AbstractPersistenceContext.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/service/AbstractSpringPersistenceContext.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/service/EismanPersistenceContext.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/service/EismanService.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/service/EismanServiceConfiguration.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/service/IPersistenceContext.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/service/MapperConfiguration.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/service/PersistenceContextConfiguration.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/service/PersistenceContextInformation.java2
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/service/factories/DeserializerFactory.java10
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/service/factories/ImporterFactory.java65
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/service/factories/MapperFactory.java13
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/service/factories/ReaderProviderFactory.java36
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/service/factories/TaskFactory.java25
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/resources/application.properties35
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/resources/database-flyway.xml10
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/resources/dozer-mapping.xml740
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/resources/flyway-migration/V01/_00/OPENK_EISMAN_V01_00_001__init.sql616
-rw-r--r--dev/org.eclipse.openk.app.eisman/eisman/src/main/resources/restful-servlet.xml60
361 files changed, 3215 insertions, 3701 deletions
diff --git a/dev/org.eclipse.openk.app.eisman-ui/WebContent/netzzustand/libs/html5-boilerplate/dist/browserconfig.xml b/dev/org.eclipse.openk.app.eisman-ui/WebContent/netzzustand/libs/html5-boilerplate/dist/browserconfig.xml
index 219b759b..2371e837 100644
--- a/dev/org.eclipse.openk.app.eisman-ui/WebContent/netzzustand/libs/html5-boilerplate/dist/browserconfig.xml
+++ b/dev/org.eclipse.openk.app.eisman-ui/WebContent/netzzustand/libs/html5-boilerplate/dist/browserconfig.xml
@@ -1,5 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Please read: https://msdn.microsoft.com/en-us/library/ie/dn455106.aspx -->
+<!--
+ Copyright © 2015-2019 PSI AG - http://www.psi.de
+
+ This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+
+ http://www.eclipse.org/legal/epl-v10.html
+-->
<browserconfig>
<msapplication>
<tile>
diff --git a/dev/org.eclipse.openk.app.eisman-ui/WebContent/netzzustand/libs/html5-boilerplate/dist/crossdomain.xml b/dev/org.eclipse.openk.app.eisman-ui/WebContent/netzzustand/libs/html5-boilerplate/dist/crossdomain.xml
index 818b8225..54a8abeb 100644
--- a/dev/org.eclipse.openk.app.eisman-ui/WebContent/netzzustand/libs/html5-boilerplate/dist/crossdomain.xml
+++ b/dev/org.eclipse.openk.app.eisman-ui/WebContent/netzzustand/libs/html5-boilerplate/dist/crossdomain.xml
@@ -1,4 +1,13 @@
<?xml version="1.0"?>
+<!--
+ Copyright © 2015-2019 PSI AG - http://www.psi.de
+
+ This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+
+ http://www.eclipse.org/legal/epl-v10.html
+-->
<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
<cross-domain-policy>
<!-- Read this: https://www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
diff --git a/dev/org.eclipse.openk.app.eisman-ui/WebContent/netzzustand/libs/html5-boilerplate/src/browserconfig.xml b/dev/org.eclipse.openk.app.eisman-ui/WebContent/netzzustand/libs/html5-boilerplate/src/browserconfig.xml
index 219b759b..2371e837 100644
--- a/dev/org.eclipse.openk.app.eisman-ui/WebContent/netzzustand/libs/html5-boilerplate/src/browserconfig.xml
+++ b/dev/org.eclipse.openk.app.eisman-ui/WebContent/netzzustand/libs/html5-boilerplate/src/browserconfig.xml
@@ -1,5 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Please read: https://msdn.microsoft.com/en-us/library/ie/dn455106.aspx -->
+<!--
+ Copyright © 2015-2019 PSI AG - http://www.psi.de
+
+ This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+
+ http://www.eclipse.org/legal/epl-v10.html
+-->
<browserconfig>
<msapplication>
<tile>
diff --git a/dev/org.eclipse.openk.app.eisman-ui/WebContent/netzzustand/libs/html5-boilerplate/src/crossdomain.xml b/dev/org.eclipse.openk.app.eisman-ui/WebContent/netzzustand/libs/html5-boilerplate/src/crossdomain.xml
index 818b8225..54a8abeb 100644
--- a/dev/org.eclipse.openk.app.eisman-ui/WebContent/netzzustand/libs/html5-boilerplate/src/crossdomain.xml
+++ b/dev/org.eclipse.openk.app.eisman-ui/WebContent/netzzustand/libs/html5-boilerplate/src/crossdomain.xml
@@ -1,4 +1,13 @@
<?xml version="1.0"?>
+<!--
+ Copyright © 2015-2019 PSI AG - http://www.psi.de
+
+ This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+
+ http://www.eclipse.org/legal/epl-v10.html
+-->
<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
<cross-domain-policy>
<!-- Read this: https://www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
diff --git a/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/app/NetworkSubStateController.js b/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/app/NetworkSubStateController.js
index e3870918..1de5b587 100644
--- a/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/app/NetworkSubStateController.js
+++ b/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/app/NetworkSubStateController.js
@@ -103,7 +103,7 @@ app.controller('NetworkSubStateController', ['$scope', '$http', '$timeout', '$tr
},
{
name: 'maxU.value',
- cellTemplate: '<div class="ui-grid-cell-contents ng-binding ng-scope">{{row.entity.maxU.value | kv}} {{row.entity.maxU.multiplier}}{{row.entity.maxU.unit}}</div>',
+ cellTemplate: '<div class="ui-grid-cell-contents ng-binding ng-scope">{{row.entity.maxU.value}} {{row.entity.maxU.multiplier}}{{row.entity.maxU.unit}}</div>',
headerCellFilter: 'translate',
displayName: 'SUBSTATIONSGRID.NETAREA',
headerTooltip: 'SUBSTATIONSGRID.NETAREA',
diff --git a/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/app/NetworkSubStateInfoController.js b/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/app/NetworkSubStateInfoController.js
index 7e041193..11913f73 100644
--- a/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/app/NetworkSubStateInfoController.js
+++ b/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/app/NetworkSubStateInfoController.js
@@ -99,7 +99,7 @@ app.controller('NetworkSubStateInfoController', ['$scope', '$http', '$state', '$
},
{
name: 'maxU.value',
- cellTemplate: '<div class="ui-grid-cell-contents ng-binding ng-scope">{{row.entity.maxU.value | kv}} {{row.entity.maxU.multiplier}}{{row.entity.maxU.unit}}</div>',
+ cellTemplate: '<div class="ui-grid-cell-contents ng-binding ng-scope">{{row.entity.maxU.value}} {{row.entity.maxU.multiplier}}{{row.entity.maxU.unit}}</div>',
headerCellFilter: 'translate',
displayName: 'SUBSTATIONSGRID.NETAREA',
headerTooltip: 'SUBSTATIONSGRID.NETAREA',
diff --git a/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/libs/html5-boilerplate/dist/browserconfig.xml b/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/libs/html5-boilerplate/dist/browserconfig.xml
index 219b759b..2371e837 100644
--- a/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/libs/html5-boilerplate/dist/browserconfig.xml
+++ b/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/libs/html5-boilerplate/dist/browserconfig.xml
@@ -1,5 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Please read: https://msdn.microsoft.com/en-us/library/ie/dn455106.aspx -->
+<!--
+ Copyright © 2015-2019 PSI AG - http://www.psi.de
+
+ This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+
+ http://www.eclipse.org/legal/epl-v10.html
+-->
<browserconfig>
<msapplication>
<tile>
diff --git a/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/libs/html5-boilerplate/dist/crossdomain.xml b/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/libs/html5-boilerplate/dist/crossdomain.xml
index 818b8225..54a8abeb 100644
--- a/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/libs/html5-boilerplate/dist/crossdomain.xml
+++ b/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/libs/html5-boilerplate/dist/crossdomain.xml
@@ -1,4 +1,13 @@
<?xml version="1.0"?>
+<!--
+ Copyright © 2015-2019 PSI AG - http://www.psi.de
+
+ This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+
+ http://www.eclipse.org/legal/epl-v10.html
+-->
<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
<cross-domain-policy>
<!-- Read this: https://www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
diff --git a/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/libs/html5-boilerplate/src/browserconfig.xml b/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/libs/html5-boilerplate/src/browserconfig.xml
index 219b759b..2371e837 100644
--- a/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/libs/html5-boilerplate/src/browserconfig.xml
+++ b/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/libs/html5-boilerplate/src/browserconfig.xml
@@ -1,5 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Please read: https://msdn.microsoft.com/en-us/library/ie/dn455106.aspx -->
+<!--
+ Copyright © 2015-2019 PSI AG - http://www.psi.de
+
+ This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+
+ http://www.eclipse.org/legal/epl-v10.html
+-->
<browserconfig>
<msapplication>
<tile>
diff --git a/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/libs/html5-boilerplate/src/crossdomain.xml b/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/libs/html5-boilerplate/src/crossdomain.xml
index 818b8225..54a8abeb 100644
--- a/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/libs/html5-boilerplate/src/crossdomain.xml
+++ b/dev/org.eclipse.openk.app.eisman-ui/WebContent/www/libs/html5-boilerplate/src/crossdomain.xml
@@ -1,4 +1,13 @@
<?xml version="1.0"?>
+<!--
+ Copyright © 2015-2019 PSI AG - http://www.psi.de
+
+ This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+
+ http://www.eclipse.org/legal/epl-v10.html
+-->
<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
<cross-domain-policy>
<!-- Read this: https://www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
diff --git a/dev/org.eclipse.openk.app.eisman/cim/pom.xml b/dev/org.eclipse.openk.app.eisman/cim/pom.xml
index b962f1dd..6eba8665 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/pom.xml
+++ b/dev/org.eclipse.openk.app.eisman/cim/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.openk.app.eisman</groupId>
@@ -45,11 +46,12 @@
<artifactId>jackson-databind</artifactId>
<version>2.8.0</version>
</dependency>
+
<!-- openKONSEQUENZ -->
<dependency>
<groupId>org.eclipse.openk</groupId>
<artifactId>common</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>2.21.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/EismanCimProfile.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/EismanCimProfile.java
index 162ef5dc..2ac94950 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/EismanCimProfile.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/EismanCimProfile.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/ActivityRecord.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/ActivityRecord.java
index 9754ffbe..f12c8309 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/ActivityRecord.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/ActivityRecord.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/ElectronicAddress.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/ElectronicAddress.java
index b88d177e..d714858e 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/ElectronicAddress.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/ElectronicAddress.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/Location.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/Location.java
index 34cdc0e2..64e98e7f 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/Location.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/Location.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/PositionPoint.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/PositionPoint.java
index 2230bb13..f06d9829 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/PositionPoint.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/PositionPoint.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/StreetAddress.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/StreetAddress.java
index 041c4a33..bd20f0df 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/StreetAddress.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/StreetAddress.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/StreetDetail.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/StreetDetail.java
index 0375c12e..f0120af7 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/StreetDetail.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/StreetDetail.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/TownDetail.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/TownDetail.java
index 3cf2d2ac..429b37cf 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/TownDetail.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/common/TownDetail.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/AcDcTerminal.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/AcDcTerminal.java
index a1f8ac9e..32f5b812 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/AcDcTerminal.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/AcDcTerminal.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConductingEquipment.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConductingEquipment.java
index 652c2b95..43d3d598 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConductingEquipment.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConductingEquipment.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConnectivityNode.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConnectivityNode.java
index bd7dc1e2..fee3c16c 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConnectivityNode.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConnectivityNode.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConnectivityNodeContainer.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConnectivityNodeContainer.java
index 690f70b6..f154a021 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConnectivityNodeContainer.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/ConnectivityNodeContainer.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Equipment.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Equipment.java
index 21a9a7f4..c5bffd9a 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Equipment.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Equipment.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/EquipmentContainer.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/EquipmentContainer.java
index 002c56a6..9f30f2eb 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/EquipmentContainer.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/EquipmentContainer.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/GeographicalRegion.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/GeographicalRegion.java
index 90ada5b0..c569d751 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/GeographicalRegion.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/GeographicalRegion.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/IdentifiedObject.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/IdentifiedObject.java
index 27d7b3d8..5b9b971f 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/IdentifiedObject.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/IdentifiedObject.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/OperatingParticipant.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/OperatingParticipant.java
index 70ea1ee3..666cc9fc 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/OperatingParticipant.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/OperatingParticipant.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/OperatingShare.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/OperatingShare.java
index a0068c96..f90bbbc7 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/OperatingShare.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/OperatingShare.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/PowerSystemResource.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/PowerSystemResource.java
index 225828c6..161dcb9a 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/PowerSystemResource.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/PowerSystemResource.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/SubGeographicalRegion.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/SubGeographicalRegion.java
index 5e443ed7..cbe4e469 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/SubGeographicalRegion.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/SubGeographicalRegion.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Substation.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Substation.java
index 7632a936..9ef5951d 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Substation.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Substation.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Terminal.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Terminal.java
index 98ced0b1..79e9e948 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Terminal.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/Terminal.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/VoltageLevel.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/VoltageLevel.java
index d6c142da..c40a6bdb 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/VoltageLevel.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/core/VoltageLevel.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/AbsoluteDateTime.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/AbsoluteDateTime.java
index 37d78d24..01d89f6b 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/AbsoluteDateTime.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/AbsoluteDateTime.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/ActivePower.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/ActivePower.java
index a9cf283f..17114d9d 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/ActivePower.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/ActivePower.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/CommunicationType.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/CommunicationType.java
index 1b75863a..aac690a9 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/CommunicationType.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/CommunicationType.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -16,26 +16,26 @@ package org.eclipse.openk.app.eisman.cim.domain;
import com.fasterxml.jackson.annotation.JsonValue;
/**
- * Communication Type EFR, FWT, TRA
- * CIM extension by Jan Krueger, April 2015
+ * Communication Type RadioTeleswitch, RemoteTerminalUnit
+ *
+ * @author 2019-03-05 Christian Brunzendorf
*/
-public enum CommunicationType
-{
- EFR("EFR"),
- FWT("FWT"),
- TRA("TRA");
-
- private final String value;
-
- private CommunicationType(final String value)
- {
- this.value = value;
- }
-
- @JsonValue
- public String value()
- {
- return this.value;
- }
+public enum CommunicationType {
+ // Constants
+ RadioTeleswitch("Radio Teleswitch"),
+ RemoteTerminalUnit("Remote Terminal Unit");
+
+ private final String value;
+
+ private CommunicationType(final String value) {
+
+ this.value = value;
+ }
+
+ @JsonValue
+ public String value() {
+
+ return this.value;
+ }
}
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/PerCent.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/PerCent.java
index 8a53a447..da315867 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/PerCent.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/PerCent.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -19,9 +19,9 @@ package org.eclipse.openk.app.eisman.cim.domain;
public class PerCent
{
- private static final UnitMultiplier MULTIPLIER = UnitMultiplier.NONE;
+ private static final UnitMultiplier MULTIPLIER = UnitMultiplier.none;
- private static final UnitSymbol UNIT = UnitSymbol.NONE;
+ private static final UnitSymbol UNIT = UnitSymbol.none;
/**
* Normally 0 - 100 on a defined base
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/ReductionSetting.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/ReductionSetting.java
index db280fd6..5a5dfc3b 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/ReductionSetting.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/ReductionSetting.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/UnitMultiplier.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/UnitMultiplier.java
index 04dc3220..ab40d56a 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/UnitMultiplier.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/UnitMultiplier.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -23,44 +23,44 @@ public enum UnitMultiplier
/**
* Pico 10**-12
*/
- PICO("p"),
+ p("p"),
/**
* Nano 10**-9
*/
- NANO("n"),
+ n("n"),
/**
* Micro 10**-6
*/
- MICRO("micro"),
+ micro("micro"),
/**
* Milli 10**-3
*/
- MILLI("m"),
+ m("m"),
/**
* Centi 10**-2
*/
- CENTI("c"),
+ c("c"),
/**
* Deci 10**-1
*/
- DECI("d"),
+ d("d"),
/**
* Kilo 10**3
*/
- KILO("k"),
+ k("k"),
/**
* Mega 10**6
*/
- MEGA("M"),
+ M("M"),
/**
* Giga 10**9
*/
- GIGA("G"),
+ G("G"),
/**
* Tera 10**12
*/
- TERA("T"),
- NONE("none");
+ T("T"),
+ none("none");
private final String value;
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/UnitSymbol.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/UnitSymbol.java
index b2546799..10608ff6 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/UnitSymbol.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/UnitSymbol.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -18,36 +18,39 @@ import com.fasterxml.jackson.annotation.JsonValue;
/**
* The units defiend for usage in the CIM
*/
-public enum UnitSymbol
-{
- /**
- * Apparent power in volt ampere
- */
- VA("VA"),
- /**
- * Voltage in volt
- */
- V("V"),
- /**
- * Dimension less quantity, e.g. count, per unit, etc.
- */
- NONE("none"),
- /**
- * Active power in watt
- */
- W("W");
-
- private final String value;
-
- private UnitSymbol(final String value)
- {
- this.value = value;
- }
-
- @JsonValue
- public String value()
- {
- return this.value;
- }
+public enum UnitSymbol {
+ /**
+ * Current in Ampere.
+ */
+ A("A"),
+ /**
+ * Apparent power in volt ampere
+ */
+ VA("VA"),
+ /**
+ * Voltage in volt
+ */
+ V("V"),
+ /**
+ * Dimension less quantity, e.g. count, per unit, etc.
+ */
+ none("none"),
+ /**
+ * Active power in watt
+ */
+ W("W");
+
+ private final String value;
+
+ private UnitSymbol(final String value) {
+
+ this.value = value;
+ }
+
+ @JsonValue
+ public String value() {
+
+ return this.value;
+ }
} \ No newline at end of file
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/Voltage.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/Voltage.java
index f07b206d..5687aed3 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/Voltage.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/domain/Voltage.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/informative/infoperations/PsrEvent.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/informative/infoperations/PsrEvent.java
index 9a18f073..3cec96ce 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/informative/infoperations/PsrEvent.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/informative/infoperations/PsrEvent.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/informative/infoperations/PsrEventKind.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/informative/infoperations/PsrEventKind.java
index 618f9465..32f54894 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/informative/infoperations/PsrEventKind.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/informative/infoperations/PsrEventKind.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketcommon/RegisteredResource.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketcommon/RegisteredResource.java
index f1bf7a97..e280b63f 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketcommon/RegisteredResource.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketcommon/RegisteredResource.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketoperations/mktdomain/UnitType.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketoperations/mktdomain/UnitType.java
index f83c29ae..8ba6baba 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketoperations/mktdomain/UnitType.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketoperations/mktdomain/UnitType.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -28,42 +28,45 @@ import com.fasterxml.jackson.annotation.JsonValue;
* Wind Turbine
*/
public enum UnitType {
- /**
- * Photovoltaic
- */
- PHOT("PHOT"),
- /**
- * Hydro Pump-Turbine
- */
- PTUR("PTUR"),
- /**
- * Wind Turbine
- */
- WIND("WIND"),
- /**
- * Hydro Turbine
- */
- HYDR("HYDR"),
- /*
- * Thermal Generating Unit (Blockheizkraftwert)
- * CIM extension by Jan Krueger, April 2015
- */
- THER("THER"),
- /**
- * Biogas Thermal Generating Unit (Blockheizkraftwerk Biogas)
- * CIM extension by Jan Krueger, April 2015
- */
- BIOG("BIOG");
+ /**
+ * Photovoltaic
+ */
+ Photovoltaic("PHOT"),
+ /**
+ * Hydro Pump-Turbine
+ */
+ HydroPumpTurbine("PTUR"),
+ /**
+ * Wind Turbine
+ */
+ Wind("WIND"),
+ MicroCogeneration("MCOG"),
+ /**
+ * Hydro Turbine
+ */
+ HydroTurbine("HYDR"),
+ /*
+ * Thermal Generating Unit (Blockheizkraftwert)
+ * CIM extension by Jan Krueger, April 2015
+ */
+ ThermalGeneratingUnit("THER"),
+ /**
+ * Biogas Thermal Generating Unit (Blockheizkraftwerk Biogas)
+ * CIM extension by Jan Krueger, April 2015
+ */
+ Biogas("BIOG");
- private final String value;
+ private final String value;
- private UnitType(final String value) {
- this.value = value;
- }
+ private UnitType(final String value) {
- @JsonValue
- public String value() {
- return this.value;
- }
+ this.value = value;
+ }
+
+ @JsonValue
+ public String value() {
+
+ return this.value;
+ }
} \ No newline at end of file
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketoperations/referencedata/RegisteredGenerator.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketoperations/referencedata/RegisteredGenerator.java
index 94231607..e3877516 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketoperations/referencedata/RegisteredGenerator.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/marketoperations/referencedata/RegisteredGenerator.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/Analog.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/Analog.java
index 814b33ca..e0b99d17 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/Analog.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/Analog.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/AnalogValue.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/AnalogValue.java
index 31bdffc1..6e5efecd 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/AnalogValue.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/AnalogValue.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/Measurement.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/Measurement.java
index 659c6e4d..9ecf6135 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/Measurement.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/Measurement.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/MeasurementValue.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/MeasurementValue.java
index 289e6c8d..480caaaf 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/MeasurementValue.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/MeasurementValue.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/MeasurementValueQuality.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/MeasurementValueQuality.java
index fcc27e9b..f9b1b090 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/MeasurementValueQuality.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/meas/MeasurementValueQuality.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/production/GeneratingUnit.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/production/GeneratingUnit.java
index 61cf1ba3..79f04ae2 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/production/GeneratingUnit.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/production/GeneratingUnit.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/production/GeneratorControlSource.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/production/GeneratorControlSource.java
index 6c997aba..767498af 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/production/GeneratorControlSource.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/production/GeneratorControlSource.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/util/BigDecimalDeserializer.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/util/BigDecimalDeserializer.java
index 4a27751c..4bebbed5 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/util/BigDecimalDeserializer.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/util/BigDecimalDeserializer.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/AcLineSegment.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/AcLineSegment.java
index 2a656e56..506106ab 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/AcLineSegment.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/AcLineSegment.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/BusbarSection.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/BusbarSection.java
index f97a1d76..c4a98da5 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/BusbarSection.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/BusbarSection.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Conductor.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Conductor.java
index 9886fca5..a8e62d06 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Conductor.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Conductor.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Connector.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Connector.java
index c2118f2a..c799fe00 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Connector.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Connector.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/PowerTransformer.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/PowerTransformer.java
index ec240794..f99059d5 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/PowerTransformer.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/PowerTransformer.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/RegulatingCondEq.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/RegulatingCondEq.java
index 6d53389d..c1268e61 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/RegulatingCondEq.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/RegulatingCondEq.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/RotatingMachine.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/RotatingMachine.java
index 2b11352d..18ce5c21 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/RotatingMachine.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/RotatingMachine.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Switch.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Switch.java
index dc0bf8bb..2c847f1b 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Switch.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/Switch.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/SynchronousMachine.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/SynchronousMachine.java
index c50d4182..cbe7cc51 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/SynchronousMachine.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/SynchronousMachine.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/SynchronousMachineKind.java b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/SynchronousMachineKind.java
index 5c4f944f..666ddb6e 100644
--- a/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/SynchronousMachineKind.java
+++ b/dev/org.eclipse.openk.app.eisman/cim/src/main/java/org/eclipse/openk/app/eisman/cim/wires/SynchronousMachineKind.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/cim-cache-service.config b/dev/org.eclipse.openk.app.eisman/cimcache/cim-cache-service.config
index 6bda86ef..ea2289f9 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/cim-cache-service.config
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/cim-cache-service.config
@@ -1,7 +1,7 @@
-# database settings
-PC|cimcache|1.database-driver=org.postgresql.Driver
-PC|cimcache|1.database-host=localhost
-PC|cimcache|1.database-name=cimcache
-PC|cimcache|1.database-password=openk
-PC|cimcache|1.database-port=5432
+# database settings
+PC|cimcache|1.database-driver=org.postgresql.Driver
+PC|cimcache|1.database-host=localhost
+PC|cimcache|1.database-name=cimcache
+PC|cimcache|1.database-password=openk
+PC|cimcache|1.database-port=5432
PC|cimcache|1.database-username=openk \ No newline at end of file
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/pom.xml b/dev/org.eclipse.openk.app.eisman/cimcache/pom.xml
index 237be132..654e1f7d 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/pom.xml
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/pom.xml
@@ -1,152 +1,182 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.openk.app.eisman</groupId>
- <artifactId>cimcache</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.openk.app.eisman</groupId>
+ <artifactId>cimcache</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
- <name>${project.groupId}.${project.artifactId}</name>
+ <name>${project.groupId}.${project.artifactId}</name>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <start-class>org.eclipse.openk.app.cimcache.service.CimCacheService</start-class>
- </properties>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <start-class>org.eclipse.openk.app.cimcache.service.CimCacheService</start-class>
+ </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
- <!-- Project Info -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.9</version>
- </plugin>
- </plugins>
- </build>
+ <!-- Project Info -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.9</version>
+ </plugin>
+ </plugins>
+ </build>
- <repositories>
- <repository>
- <id>Java.Net</id>
- <url>http://download.java.net/maven/2/</url>
- </repository>
- </repositories>
+ <repositories>
+ <repository>
+ <id>Java.Net</id>
+ <url>http://download.java.net/maven/2/</url>
+ </repository>
+ </repositories>
- <dependencies>
- <!-- Apache -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.3.2</version>
- <scope>compile</scope>
- </dependency>
- <!-- Dozer Mapper -->
- <dependency>
- <groupId>net.sf.dozer</groupId>
- <artifactId>dozer</artifactId>
- <version>5.5.1</version>
- </dependency>
- <!-- EclipseLink -->
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>eclipselink</artifactId>
- <version>2.5.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.jpa</artifactId>
- <version>2.7.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-jpa</artifactId>
- <version>1.5.6.RELEASE</version>
- <exclusions>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- Flyway -->
- <!-- <dependency> -->
- <!-- <groupId>org.flywaydb</groupId> -->
- <!-- <artifactId>flyway-core</artifactId> -->
- <!-- <version>3.2.1</version> -->
- <!-- </dependency> -->
- <!-- Guava -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>18.0</version>
- </dependency>
- <!-- JSON -->
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>2.8.0</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.8.0</version>
- </dependency>
- <!-- Log4j -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- </dependency>
- <!-- openKONSEQUENZ -->
- <dependency>
- <groupId>org.eclipse.openk.app.eisman</groupId>
- <artifactId>cim</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.openk.app.eisman</groupId>
- <artifactId>common</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.openk.cim</groupId>
- <artifactId>cim17v07</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.openk.service</groupId>
- <artifactId>service-service</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
- <!-- PostgreSQL -->
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>42.2.5</version>
- </dependency>
- <!-- Quartz Job -->
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz-jobs</artifactId>
- <version>2.2.1</version>
- </dependency>
- </dependencies>
+ <dependencies>
+
+ <!-- Apache -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.3.2</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Dozer Mapper -->
+ <dependency>
+ <groupId>net.sf.dozer</groupId>
+ <artifactId>dozer</artifactId>
+ <version>5.5.1</version>
+ </dependency>
+
+ <!-- EclipseLink -->
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>eclipselink</artifactId>
+ <version>2.5.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.jpa</artifactId>
+ <version>2.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-jpa</artifactId>
+ <version>1.5.6.RELEASE</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Flyway -->
+ <!-- <dependency> -->
+ <!-- <groupId>org.flywaydb</groupId> -->
+ <!-- <artifactId>flyway-core</artifactId> -->
+ <!-- <version>3.2.1</version> -->
+ <!-- </dependency> -->
+ <!-- Guava -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>18.0</version>
+ </dependency>
+
+ <!-- JSON -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.8.0</version>
+ </dependency>
+
+ <!-- Log4j -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ </dependency>
+
+ <!-- openKONSEQUENZ -->
+ <dependency>
+ <groupId>org.eclipse.openk.app.eisman</groupId>
+ <artifactId>cim</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.openk.app.eisman</groupId>
+ <artifactId>common</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.openk.cim</groupId>
+ <artifactId>cim17v07</artifactId>
+ <version>2.21.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.openk.service</groupId>
+ <artifactId>service-service</artifactId>
+ <version>2.21.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.openk.domain.static-topology</groupId>
+ <artifactId>static-topology-model</artifactId>
+ <version>2.21.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.openk.domain.topology-state</groupId>
+ <artifactId>topology-state-model</artifactId>
+ <version>2.21.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.openk.domain.measurement</groupId>
+ <artifactId>measurement-model</artifactId>
+ <version>2.21.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.openk.domain.asset-data</groupId>
+ <artifactId>asset-data-model</artifactId>
+ <version>2.21.1-SNAPSHOT</version>
+ </dependency>
+ <!-- PostgreSQL -->
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>42.2.5</version>
+ </dependency>
+
+ <!-- Quartz Job -->
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz-jobs</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ </dependencies>
</project> \ No newline at end of file
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/CimCacheDataAccess.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/CimCacheDataAccess.java
index a2440561..4c5fe0af 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/CimCacheDataAccess.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/CimCacheDataAccess.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/ActivityRecordJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/ActivityRecordJpa.java
index 1a7cce86..38ec4498 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/ActivityRecordJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/ActivityRecordJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/ElectronicAddressJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/ElectronicAddressJpa.java
index 27795bf0..be021e03 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/ElectronicAddressJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/ElectronicAddressJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/LocationJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/LocationJpa.java
index 30794896..ccb12d46 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/LocationJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/LocationJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -13,7 +13,6 @@
*/
package org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.common;
-
import java.util.List;
import javax.persistence.AttributeOverride;
@@ -46,122 +45,122 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
@Table(name = "LOCATION")
public class LocationJpa extends IdentifiedObjectJpa {
- @JsonIgnore
- @Id
- @TableGenerator(name = "LocationTableGen",
- allocationSize = DEFAULT_ALLOCATION_SIZE,
- table = "OPENK_STATICTOPOLOGY_SEQ_TABLE",
- pkColumnName = "SEQ_NAME",
- valueColumnName = "SEQ_COUNT",
- pkColumnValue = "LOCATION_SEQ")
- @GeneratedValue(strategy = GenerationType.TABLE, generator = "LocationTableGen")
- @Column(name = "ID")
- private Long id;
-
- /**
- * Electronic address.
- */
- @Embedded
- @AttributeOverrides({
- @AttributeOverride(name = "email", column = @Column(name = "EMAIL"))
- })
- private ElectronicAddressJpa electronicAddressJpa;
-
- /**
- * Main address of the location.
- */
- @Embedded
- @AttributeOverrides({
- @AttributeOverride(name = "postalCode", column = @Column(name = "POSTAL_CODE")),
- @AttributeOverride(name = "streetDetailJpa.name", column = @Column(name = "STREET_NAME")),
- @AttributeOverride(name = "streetDetailJpa.number", column = @Column(name = "STREET_NUMBER")),
- @AttributeOverride(name = "townDetailJpa.name", column = @Column(name = "CITY")),
- @AttributeOverride(name = "townDetailJpa.country", column = @Column(name = "COUNTRY"))
- })
- private StreetAddressJpa mainAddress;
-
- /**
- * Sequence of position points describing this location, expressed in coordinate
- * system 'Location.CoordinateSystem'.
- */
- @OneToMany(targetEntity = PositionPointJpa.class, cascade = CascadeType.PERSIST)
- @JoinColumn(name = "LOCATION_ID")
- private List<PositionPointJpa> positionPointJpaList;
-
- public StreetAddressJpa getMainAddress() {
- return mainAddress;
- }
+ @JsonIgnore
+ @Id
+ @TableGenerator(name = "LocationTableGen", allocationSize = DEFAULT_ALLOCATION_SIZE, table = "OPENK_STATICTOPOLOGY_SEQ_TABLE", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "LOCATION_SEQ")
+ @GeneratedValue(strategy = GenerationType.TABLE, generator = "LocationTableGen")
+ @Column(name = "ID")
+ private Long id;
- public ElectronicAddressJpa getElectronicAddressJpa() {
- return electronicAddressJpa;
- }
+ /**
+ * Electronic address.
+ */
+ @Embedded
+ @AttributeOverrides({ @AttributeOverride(name = "email", column = @Column(name = "EMAIL")) })
+ private ElectronicAddressJpa electronicAddressJpa;
- public List<PositionPointJpa> getPositionPointJpaList() {
- return positionPointJpaList;
- }
+ /**
+ * Main address of the location.
+ */
+ @Embedded
+ @AttributeOverrides({ @AttributeOverride(name = "postalCode", column = @Column(name = "POSTAL_CODE")), @AttributeOverride(name = "streetDetailJpa.name", column = @Column(name = "STREET_NAME")), @AttributeOverride(name = "streetDetailJpa.number", column = @Column(name = "STREET_NUMBER")), @AttributeOverride(name = "townDetailJpa.name", column = @Column(name = "CITY")), @AttributeOverride(name = "townDetailJpa.country", column = @Column(name = "COUNTRY")) })
+ private StreetAddressJpa mainAddress;
- public void setElectronicAddressJpa(final ElectronicAddressJpa electronicAddressJpa) {
- this.electronicAddressJpa = electronicAddressJpa;
- }
+ /**
+ * Sequence of position points describing this location, expressed in coordinate
+ * system 'Location.CoordinateSystem'.
+ */
+ @OneToMany(targetEntity = PositionPointJpa.class, cascade = CascadeType.PERSIST)
+ @JoinColumn(name = "LOCATION_ID")
+ private List<PositionPointJpa> positionPointJpaList;
- public void setMainAddress(final StreetAddressJpa mainAddress) {
- this.mainAddress = mainAddress;
- }
+ public Long getId() {
- public void setPositionPointJpaList(final List<PositionPointJpa> positionPointJpaList) {
- this.positionPointJpaList = positionPointJpaList;
- }
+ return id;
+ }
- @Override
- public boolean equals(final Object o) {
+ public void setId(Long id) {
- if (this == o) {
- return true;
- }
+ this.id = id;
+ }
- if (!(o instanceof LocationJpa)) {
- return false;
- }
+ public StreetAddressJpa getMainAddress() {
- if (!super.equals(o)) {
- return false;
- }
+ return mainAddress;
+ }
- final LocationJpa that = (LocationJpa) o;
+ public ElectronicAddressJpa getElectronicAddressJpa() {
- if (getElectronicAddressJpa() == null
- ? that.getElectronicAddressJpa() != null
- : !getElectronicAddressJpa().equals(that.getElectronicAddressJpa())) {
- return false;
- }
+ return electronicAddressJpa;
+ }
- if (getMainAddress() == null
- ? that.getMainAddress() != null
- : !getMainAddress().equals(that.getMainAddress())) {
- return false;
- }
+ public List<PositionPointJpa> getPositionPointJpaList() {
- boolean result = false;
+ return positionPointJpaList;
+ }
- if ((getPositionPointJpaList() == null || getPositionPointJpaList().isEmpty())
- && (that.getPositionPointJpaList() == null || that.getPositionPointJpaList().isEmpty())) {
+ public void setElectronicAddressJpa(final ElectronicAddressJpa electronicAddressJpa) {
- result = true;
+ this.electronicAddressJpa = electronicAddressJpa;
+ }
- } else if (getPositionPointJpaList() != null && that.getPositionPointJpaList() != null) {
+ public void setMainAddress(final StreetAddressJpa mainAddress) {
- result = getPositionPointJpaList().equals(that.getPositionPointJpaList());
- }
+ this.mainAddress = mainAddress;
+ }
- return result;
+ public void setPositionPointJpaList(final List<PositionPointJpa> positionPointJpaList) {
+
+ this.positionPointJpaList = positionPointJpaList;
+ }
+
+ @Override
+ public boolean equals(final Object o) {
+
+ if(this == o) {
+ return true;
}
- @Override
- public int hashCode() {
- int result = super.hashCode();
- result = 31 * result + (getElectronicAddressJpa() == null ? 0 : getElectronicAddressJpa().hashCode());
- result = 31 * result + (getMainAddress() == null ? 0 : getMainAddress().hashCode());
- result = 31 * result + (getPositionPointJpaList() == null ? 0 : getPositionPointJpaList().hashCode());
- return result;
+ if(!(o instanceof LocationJpa)) {
+ return false;
}
+
+ if(!super.equals(o)) {
+ return false;
+ }
+
+ final LocationJpa that = (LocationJpa) o;
+
+ if(getElectronicAddressJpa() == null ? that.getElectronicAddressJpa() != null : !getElectronicAddressJpa().equals(that.getElectronicAddressJpa())) {
+ return false;
+ }
+
+ if(getMainAddress() == null ? that.getMainAddress() != null : !getMainAddress().equals(that.getMainAddress())) {
+ return false;
+ }
+
+ boolean result = false;
+
+ if((getPositionPointJpaList() == null || getPositionPointJpaList().isEmpty()) && (that.getPositionPointJpaList() == null || that.getPositionPointJpaList().isEmpty())) {
+
+ result = true;
+
+ }
+ else if(getPositionPointJpaList() != null && that.getPositionPointJpaList() != null) {
+
+ result = getPositionPointJpaList().equals(that.getPositionPointJpaList());
+ }
+
+ return result;
+ }
+
+ @Override
+ public int hashCode() {
+
+ int result = super.hashCode();
+ result = 31 * result + (getElectronicAddressJpa() == null ? 0 : getElectronicAddressJpa().hashCode());
+ result = 31 * result + (getMainAddress() == null ? 0 : getMainAddress().hashCode());
+ result = 31 * result + (getPositionPointJpaList() == null ? 0 : getPositionPointJpaList().hashCode());
+ return result;
+ }
} \ No newline at end of file
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/PositionPointJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/PositionPointJpa.java
index 12dc4fe3..e679fd38 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/PositionPointJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/PositionPointJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/StreetAddressJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/StreetAddressJpa.java
index ceff4394..80aa3ea4 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/StreetAddressJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/StreetAddressJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/StreetDetailJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/StreetDetailJpa.java
index 821b2501..5717e3f7 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/StreetDetailJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/StreetDetailJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/TownDetailJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/TownDetailJpa.java
index e71602d4..4167d757 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/TownDetailJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/common/TownDetailJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/AcDcTerminalJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/AcDcTerminalJpa.java
index 1c2c6c86..67e85b15 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/AcDcTerminalJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/AcDcTerminalJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConductingEquipmentJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConductingEquipmentJpa.java
index 51c10c97..02b444fc 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConductingEquipmentJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConductingEquipmentJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConnectivityNodeContainerJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConnectivityNodeContainerJpa.java
index 9159c1bf..e8d9b960 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConnectivityNodeContainerJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConnectivityNodeContainerJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConnectivityNodeJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConnectivityNodeJpa.java
index 9e0037bd..ca590268 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConnectivityNodeJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/ConnectivityNodeJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/EquipmentContainerJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/EquipmentContainerJpa.java
index 93c88969..1b020d09 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/EquipmentContainerJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/EquipmentContainerJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/EquipmentJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/EquipmentJpa.java
index 5bd81662..dc447d67 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/EquipmentJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/EquipmentJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/GeographicalRegionJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/GeographicalRegionJpa.java
index e4b1ff1f..8a367d04 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/GeographicalRegionJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/GeographicalRegionJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/IdentifiedObjectJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/IdentifiedObjectJpa.java
index a9ab6364..bf8c1233 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/IdentifiedObjectJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/IdentifiedObjectJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/OperatingParticipantJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/OperatingParticipantJpa.java
index 388f37b6..44c30e72 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/OperatingParticipantJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/OperatingParticipantJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/OperatingShareJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/OperatingShareJpa.java
index e5aa86c4..d01e6f9d 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/OperatingShareJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/OperatingShareJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/PowerSystemResourceJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/PowerSystemResourceJpa.java
index 0f729efb..bc511198 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/PowerSystemResourceJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/PowerSystemResourceJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/SubGeographicalRegionJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/SubGeographicalRegionJpa.java
index 8965f431..19e04eca 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/SubGeographicalRegionJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/SubGeographicalRegionJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/SubstationJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/SubstationJpa.java
index d5e36e9d..8a20173f 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/SubstationJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/SubstationJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/TerminalJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/TerminalJpa.java
index 06ac485a..8a180f04 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/TerminalJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/TerminalJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/VoltageLevelJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/VoltageLevelJpa.java
index 89305b4e..6a3bd105 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/VoltageLevelJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/core/VoltageLevelJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/AbsoluteDateTimeJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/AbsoluteDateTimeJpa.java
index a7edeae8..4cb99267 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/AbsoluteDateTimeJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/AbsoluteDateTimeJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/ActivePowerJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/ActivePowerJpa.java
index 76477f86..2c35f20b 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/ActivePowerJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/ActivePowerJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/CommunicationTypeJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/CommunicationTypeJpa.java
index 9b0c047b..9d72a87f 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/CommunicationTypeJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/CommunicationTypeJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/PerCentJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/PerCentJpa.java
index f2c8fcd2..e8c15244 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/PerCentJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/PerCentJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/ReductionSettingJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/ReductionSettingJpa.java
index 68296184..1c3eec25 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/ReductionSettingJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/ReductionSettingJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/UnitMultiplierJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/UnitMultiplierJpa.java
index b8c4094f..983604c5 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/UnitMultiplierJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/UnitMultiplierJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/UnitSymbolJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/UnitSymbolJpa.java
index b7e86de6..733c7aed 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/UnitSymbolJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/UnitSymbolJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/VoltageJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/VoltageJpa.java
index e9996091..67eaa753 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/VoltageJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/domain/VoltageJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/informative/infoperations/PsrEventJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/informative/infoperations/PsrEventJpa.java
index 56d7abf3..2352195b 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/informative/infoperations/PsrEventJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/informative/infoperations/PsrEventJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/informative/infoperations/PsrEventKindJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/informative/infoperations/PsrEventKindJpa.java
index 9a74436c..5ebf8721 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/informative/infoperations/PsrEventKindJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/informative/infoperations/PsrEventKindJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketcommon/RegisteredResourceJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketcommon/RegisteredResourceJpa.java
index d85ec3ad..0d141d9b 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketcommon/RegisteredResourceJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketcommon/RegisteredResourceJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketoperations/mktdomain/UnitTypeJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketoperations/mktdomain/UnitTypeJpa.java
index 33d7f2cf..0f7761b6 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketoperations/mktdomain/UnitTypeJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketoperations/mktdomain/UnitTypeJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketoperations/referencedata/RegisteredGeneratorJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketoperations/referencedata/RegisteredGeneratorJpa.java
index 1b722e39..a2054c1c 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketoperations/referencedata/RegisteredGeneratorJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/marketoperations/referencedata/RegisteredGeneratorJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/AnalogJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/AnalogJpa.java
index b91b5435..abb1fb80 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/AnalogJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/AnalogJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/AnalogValueJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/AnalogValueJpa.java
index 16c1a042..678752bd 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/AnalogValueJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/AnalogValueJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementJpa.java
index 15f6268e..7b0046f4 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementValueJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementValueJpa.java
index 455a86e1..ba48743f 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementValueJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementValueJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementValueQualityJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementValueQualityJpa.java
index 45e0cfd7..e1a7ae52 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementValueQualityJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/meas/MeasurementValueQualityJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/production/GeneratingUnitJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/production/GeneratingUnitJpa.java
index 17896799..48936140 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/production/GeneratingUnitJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/production/GeneratingUnitJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/production/GeneratorControlSourceJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/production/GeneratorControlSourceJpa.java
index 265ceaac..31e6dbfb 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/production/GeneratorControlSourceJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/production/GeneratorControlSourceJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Boolean2StringConverter.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Boolean2StringConverter.java
index 05cf4a71..1cf4b16a 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Boolean2StringConverter.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Boolean2StringConverter.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/RegisteredGenerator2StringConverter.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/RegisteredGenerator2StringConverter.java
index 72ca8eb3..3bf9865e 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/RegisteredGenerator2StringConverter.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/RegisteredGenerator2StringConverter.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Sequence.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Sequence.java
index cbac1175..b0e13ff5 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Sequence.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Sequence.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Temporal.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Temporal.java
index c364082b..6ed043db 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Temporal.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/util/Temporal.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/AcLineSegmentJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/AcLineSegmentJpa.java
index 10b5800a..8562705d 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/AcLineSegmentJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/AcLineSegmentJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/BusbarSectionJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/BusbarSectionJpa.java
index 086a73c9..cd60f25e 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/BusbarSectionJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/BusbarSectionJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/ConductorJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/ConductorJpa.java
index 6fe8eaac..dd9bb948 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/ConductorJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/ConductorJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/ConnectorJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/ConnectorJpa.java
index d477be8b..6dc9b66b 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/ConnectorJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/ConnectorJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/PowerTransformerJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/PowerTransformerJpa.java
index 55858e61..8466cfad 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/PowerTransformerJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/PowerTransformerJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/RegulatingCondEqJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/RegulatingCondEqJpa.java
index 525f7173..c850d5f8 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/RegulatingCondEqJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/RegulatingCondEqJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/RotatingMachineJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/RotatingMachineJpa.java
index 4477e3e9..d7f008b9 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/RotatingMachineJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/RotatingMachineJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SwitchJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SwitchJpa.java
index f3610931..52d669d3 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SwitchJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SwitchJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SynchronousMachineJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SynchronousMachineJpa.java
index 1ac93e47..d30f75a1 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SynchronousMachineJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SynchronousMachineJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SynchronousMachineKindJpa.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SynchronousMachineKindJpa.java
index 9f130017..0e017659 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SynchronousMachineKindJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/adapter/dataaccess/cimcache/wires/SynchronousMachineKindJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/core/CimCacheDefaults.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/core/CimCacheDefaults.java
index bd30cc2c..bff2dcd9 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/core/CimCacheDefaults.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/core/CimCacheDefaults.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -27,6 +27,10 @@ public final class CimCacheDefaults {
// Constants
/* domains */
public static final String DOMAIN = "cimcache";
+ public static final String SCOPE_STATIC_TOPOLOGY = "static-topology";
+ public static final String SCOPE_ASSET_DATA = "asset-data";
+ public static final String SCOPE_TOPOLOGY_STATE = "topology-state";
+ public static final String SCOPE_MEASUREMENT = "measurement";
// Constructors
@SuppressWarnings("checkstyle:javadocmethod")
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/CimCache.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/CimCache.java
index 36929bad..0170882d 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/CimCache.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/CimCache.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/CimCache.properties b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/CimCache.properties
index f5fb3174..eb80213c 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/CimCache.properties
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/CimCache.properties
@@ -1,22 +1,22 @@
-# Jobs
-# alle 4 Stunden
-openk.scheduler.job.synchronousmachine.cron=0 4 * * * ?
-openk.scheduler.job.netstate.cron=0 3 * * * ?
-openk.scheduler.job.topology.cron=0 4 * * * ?
-openk.scheduler.job.json.file.cron=0 4 * * * ?
-# alle paar Minuten
-#openk.scheduler.job.synchronousmachine.cron=0 0/4 * * * ?
-#openk.scheduler.job.netstate.cron=0 0/5 * * * ?
-#openk.scheduler.job.topology.cron=0 0/4 * * * ?
-#openk.scheduler.job.json.file.cron=0 0/2 * * * ?
-
-# ESB and REST URIs running on ESB
-esb.url.base=http://localhost:8080
-
-esb.rest.uri.synchronousmachine.list=/services/einspeiser
-esb.rest.uri.topology.geographicalregion=/minitopo
-esb.rest.uri.netstate.geographicalregion=/services/netz
-esb.rest.uri.json.file=/to-be-defined
-
-# Time period in hours already passed within a measurement value is a valid value
+# Jobs
+# alle 4 Stunden
+openk.scheduler.job.synchronousmachine.cron=0 4 * * * ?
+openk.scheduler.job.netstate.cron=0 3 * * * ?
+openk.scheduler.job.topology.cron=0 4 * * * ?
+openk.scheduler.job.json.file.cron=0 4 * * * ?
+# alle paar Minuten
+#openk.scheduler.job.synchronousmachine.cron=0 0/4 * * * ?
+#openk.scheduler.job.netstate.cron=0 0/5 * * * ?
+#openk.scheduler.job.topology.cron=0 0/4 * * * ?
+#openk.scheduler.job.json.file.cron=0 0/2 * * * ?
+
+# ESB and REST URIs running on ESB
+esb.url.base=http://localhost:8080
+
+esb.rest.uri.synchronousmachine.list=/services/einspeiser
+esb.rest.uri.topology.geographicalregion=/minitopo
+esb.rest.uri.netstate.geographicalregion=/services/netz
+esb.rest.uri.json.file=/to-be-defined
+
+# Time period in hours already passed within a measurement value is a valid value
eisman.measurement.time.period.passed.valid=12 \ No newline at end of file
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/DataExchangeDefaults.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/DataExchangeDefaults.java
index 589e99a6..a36d7ddf 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/DataExchangeDefaults.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/DataExchangeDefaults.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/SecureRequestHandlerInterceptor.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/SecureRequestHandlerInterceptor.java
index 328aeec0..e1008750 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/SecureRequestHandlerInterceptor.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/SecureRequestHandlerInterceptor.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/AbstractRestClient.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/AbstractRestClient.java
index d2049a53..a9c743f6 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/AbstractRestClient.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/AbstractRestClient.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/GeographicalRegionProvider.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/GeographicalRegionProvider.java
index c62085e3..e0c57f08 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/GeographicalRegionProvider.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/GeographicalRegionProvider.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/JsonFileProvider.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/JsonFileProvider.java
index fc33cab5..7e16781f 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/JsonFileProvider.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/JsonFileProvider.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/SynchronousMachineProvider.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/SynchronousMachineProvider.java
index e68698db..389fd17b 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/SynchronousMachineProvider.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/client/SynchronousMachineProvider.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SubGeographicalRegionRestController.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SubGeographicalRegionRestController.java
index c113d5c3..355a453c 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SubGeographicalRegionRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SubGeographicalRegionRestController.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SubstationRestController.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SubstationRestController.java
index 6c44e1a0..287b84b3 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SubstationRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SubstationRestController.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SynchronousMachineRestController.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SynchronousMachineRestController.java
index 94c1c427..d7d1f3d7 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SynchronousMachineRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/datainterchange/adapter/rest/controller/SynchronousMachineRestController.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/JobController.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/JobController.java
index 6c9d4a6d..24c98b9f 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/JobController.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/JobController.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/JsonFileJob.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/JsonFileJob.java
index 26ed2c3b..964962a2 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/JsonFileJob.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/JsonFileJob.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/NetstateJob.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/NetstateJob.java
index 10bcc31f..a480ceb2 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/NetstateJob.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/NetstateJob.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/SynchronousMachineJob.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/SynchronousMachineJob.java
index eb908814..602c0f83 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/SynchronousMachineJob.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/SynchronousMachineJob.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/TopologyJob.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/TopologyJob.java
index 5afd4748..d88b9951 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/TopologyJob.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/TopologyJob.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/util/JobUtils.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/util/JobUtils.java
index 08ca691b..a468e3c4 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/util/JobUtils.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/job/util/JobUtils.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/Abstract4Tree.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/Abstract4Tree.java
index 9c7ced0e..2ae20ced 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/Abstract4Tree.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/Abstract4Tree.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/SubGeographicalRegion4Tree.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/SubGeographicalRegion4Tree.java
index 199adefc..8a06e1b7 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/SubGeographicalRegion4Tree.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/SubGeographicalRegion4Tree.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/Substation4Tree.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/Substation4Tree.java
index 27e86397..30b1594e 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/Substation4Tree.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/Substation4Tree.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/SumContainer.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/SumContainer.java
index 5bf30a39..902ec4ba 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/SumContainer.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/model/util/SumContainer.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/GeneratingUnitJpaRepository.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/GeneratingUnitJpaRepository.java
index b809fe50..6d325b17 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/GeneratingUnitJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/GeneratingUnitJpaRepository.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/GeographicalRegionJpaRepository.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/GeographicalRegionJpaRepository.java
index e50fa15f..8ff4cf56 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/GeographicalRegionJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/GeographicalRegionJpaRepository.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SequenceJpaRepository.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SequenceJpaRepository.java
index af41bac6..fef8090f 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SequenceJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SequenceJpaRepository.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SubGeographicalRegionJpaRepository.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SubGeographicalRegionJpaRepository.java
index f03b3167..7af78b9e 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SubGeographicalRegionJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SubGeographicalRegionJpaRepository.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SubstationJpaRepository.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SubstationJpaRepository.java
index 3fe73087..1af0b373 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SubstationJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SubstationJpaRepository.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SynchronousMachineJpaRepository.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SynchronousMachineJpaRepository.java
index dd44c0bc..07992a10 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SynchronousMachineJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/SynchronousMachineJpaRepository.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/VoltageLevelJpaRepository.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/VoltageLevelJpaRepository.java
index 18fd24e8..cb358161 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/VoltageLevelJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/repository/VoltageLevelJpaRepository.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AbstractJpaService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AbstractJpaService.java
index 7da0937d..75a568fd 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AbstractJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AbstractJpaService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/ActivePowerJpaService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/ActivePowerJpaService.java
index 73a66229..748cc1c2 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/ActivePowerJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/ActivePowerJpaService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AnalogJpaService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AnalogJpaService.java
index 338c3016..8187a11a 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AnalogJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AnalogJpaService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AnalogValueJpaService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AnalogValueJpaService.java
index 4bc71ae2..e2d44e96 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AnalogValueJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/AnalogValueJpaService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/BaseMapperService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/BaseMapperService.java
index caba777e..08a8d795 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/BaseMapperService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/BaseMapperService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/EquipmentService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/EquipmentService.java
index c1ab232b..27d7cde8 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/EquipmentService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/EquipmentService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -40,9 +40,9 @@ public abstract class EquipmentService {
((SynchronousMachine) equipment).getGeneratingUnit().getHighControlLimit();
if (activePowerHighControlLimit != null
- && activePowerHighControlLimit.getMultiplier().equals(UnitMultiplier.KILO)) {
+ && activePowerHighControlLimit.getMultiplier().equals(UnitMultiplier.k)) {
- activePowerHighControlLimit.setMultiplier(UnitMultiplier.MEGA);
+ activePowerHighControlLimit.setMultiplier(UnitMultiplier.M);
activePowerHighControlLimit.setValue(
new BigDecimal(
activePowerHighControlLimit.getValue())
@@ -55,9 +55,9 @@ public abstract class EquipmentService {
((SynchronousMachine) equipment).getGeneratingUnit().getMaxOperatingP();
if (activePowerMaxOperatingP != null
- && activePowerMaxOperatingP.getMultiplier().equals(UnitMultiplier.KILO)) {
+ && activePowerMaxOperatingP.getMultiplier().equals(UnitMultiplier.k)) {
- activePowerMaxOperatingP.setMultiplier(UnitMultiplier.MEGA);
+ activePowerMaxOperatingP.setMultiplier(UnitMultiplier.M);
activePowerMaxOperatingP.setValue(
new BigDecimal(
activePowerMaxOperatingP.getValue())
@@ -75,9 +75,9 @@ public abstract class EquipmentService {
for (final Measurement measurement : equipment.getMeasurementList()) {
- if (measurement.getUnitMultiplier() != null && measurement.getUnitMultiplier().equals(UnitMultiplier.KILO)) {
+ if (measurement.getUnitMultiplier() != null && measurement.getUnitMultiplier().equals(UnitMultiplier.k)) {
- measurement.setUnitMultiplier(UnitMultiplier.MEGA);
+ measurement.setUnitMultiplier(UnitMultiplier.M);
for (final AnalogValue analogValue : ((Analog) measurement).getAnalogValueList()) {
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionJpaService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionJpaService.java
index d4b5f8bc..a38992ed 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionJpaService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionMapperService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionMapperService.java
index 364af51b..bc39601f 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionMapperService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionMapperService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionRestConsumerService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionRestConsumerService.java
index 6b151847..15a80814 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionRestConsumerService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionRestConsumerService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionValidatorService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionValidatorService.java
index a8eeff96..6706e9c2 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionValidatorService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/GeographicalRegionValidatorService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/JsonFileRestConsumerService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/JsonFileRestConsumerService.java
index 4cb5fe76..6e4f98d1 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/JsonFileRestConsumerService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/JsonFileRestConsumerService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/NetworkTraceService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/NetworkTraceService.java
index fc596b34..e4cd16c5 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/NetworkTraceService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/NetworkTraceService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SequenceJpaService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SequenceJpaService.java
index 35113b0f..990a90bd 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SequenceJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SequenceJpaService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SignumService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SignumService.java
index eae2b418..9991b40b 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SignumService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SignumService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegion4TreeService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegion4TreeService.java
index aa5b2778..05b4ea1f 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegion4TreeService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegion4TreeService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -32,181 +32,155 @@ import org.springframework.stereotype.Service;
@Service
public class SubGeographicalRegion4TreeService {
- @Autowired
- private SubGeographicalRegionJpaService subGeographicalRegionJpaService;
+ @Autowired
+ private SubGeographicalRegionJpaService subGeographicalRegionJpaService;
- @Autowired
- private NetworkTraceService networkTraceService;
+ @Autowired
+ private NetworkTraceService networkTraceService;
- @Autowired
- private SubstationJpaService substationJpaService;
+ @Autowired
+ private SubstationJpaService substationJpaService;
- private static final CommunicationTypeJpa CT_EFR = CommunicationTypeJpa.EFR;
- private static final CommunicationTypeJpa CT_FWT = CommunicationTypeJpa.FWT;
- private static final String VIRT_TS = "VirtualTransformerStationEFR";
+ private static final CommunicationTypeJpa CT_EFR = CommunicationTypeJpa.EFR;
+ private static final CommunicationTypeJpa CT_FWT = CommunicationTypeJpa.FWT;
+ private static final String VIRT_TS = "VirtualTransformerStationEFR";
- /**
- * Creates the tree, the hierarchy and data, for the Web-User-Interface.
- *
- * @return List<SubGeographicalRegion4Tree>
- */
- public List<SubGeographicalRegion4Tree> getTree() {
+ /**
+ * Creates the tree, the hierarchy and data, for the Web-User-Interface.
+ *
+ * @return List<SubGeographicalRegion4Tree>
+ */
+ public List<SubGeographicalRegion4Tree> getTree() {
- final List<SubGeographicalRegion4Tree> subGeographicalRegion4TreeList = new ArrayList<>();
+ final List<SubGeographicalRegion4Tree> subGeographicalRegion4TreeList = new ArrayList<>();
- for (final SubGeographicalRegionJpa subGeographicalRegionJpa : subGeographicalRegionJpaService.findAll()) {
+ for(final SubGeographicalRegionJpa subGeographicalRegionJpa : subGeographicalRegionJpaService.findAll()) {
- final SumContainer sumContainerSubGeographicalRegion = new SumContainer();
+ final SumContainer sumContainerSubGeographicalRegion = new SumContainer();
- final List<Substation4Tree> transformerStation4TreeList = new ArrayList<>();
+ final List<Substation4Tree> transformerStation4TreeList = new ArrayList<>();
- for (final SubstationJpa transformerStation : subGeographicalRegionJpa.getTransformerStationList()) {
+ for(final SubstationJpa transformerStation : subGeographicalRegionJpa.getTransformerStationList()) {
- final SumContainer sumContainerTransformerStationEfr = createSumContainer(transformerStation, CT_EFR);
- final SumContainer sumContainerTransformerStationFwt = createSumContainer(transformerStation, CT_FWT);
+ // REMIND 2019-02-28 Renko => Test: SubGeographicalRegionJpa auf NULL setzen; performance im mapper
+ transformerStation.setSubGeographicalRegionJpa(null);
- final List<Substation4Tree> localNetworkStation4TreeList = new ArrayList<>();
+// final SumContainer sumContainerTransformerStationEfr = createSumContainer(transformerStation, CT_EFR);
+// final SumContainer sumContainerTransformerStationFwt = createSumContainer(transformerStation, CT_FWT);
- for (final SubstationJpa localNetworkStation :
- networkTraceService.getLocalNetworStationListOfTransformerStation(transformerStation)) {
+ final List<Substation4Tree> localNetworkStation4TreeList = new ArrayList<>();
- final SumContainer sumContainerLocalNetworkStationEfr = createSumContainer(localNetworkStation, CT_EFR);
- sumContainerTransformerStationEfr.add(sumContainerLocalNetworkStationEfr);
+ for(final SubstationJpa localNetworkStation : networkTraceService.getLocalNetworStationListOfTransformerStation(transformerStation)) {
- final SumContainer sumContainerLocalNetworkStationFwt = createSumContainer(localNetworkStation, CT_FWT);
- sumContainerTransformerStationFwt.add(sumContainerLocalNetworkStationFwt);
+// final SumContainer sumContainerLocalNetworkStationEfr = createSumContainer(localNetworkStation, CT_EFR);
+// sumContainerTransformerStationEfr.add(sumContainerLocalNetworkStationEfr);
- localNetworkStation4TreeList.add(
- createSubstation4Tree(
- localNetworkStation,
- sumContainerLocalNetworkStationFwt));
- }
+// final SumContainer sumContainerLocalNetworkStationFwt = createSumContainer(localNetworkStation, CT_FWT);
+// sumContainerTransformerStationFwt.add(sumContainerLocalNetworkStationFwt);
- if (sumContainerTransformerStationEfr.getSum().compareTo(BigDecimal.ZERO) == 1) {
-
- Substation4Tree virtualTransformerStationEfr
- = findInList(transformerStation4TreeList, VIRT_TS);
-
- if (virtualTransformerStationEfr == null) {
-
- virtualTransformerStationEfr
- = createVirtualTransformerstation(sumContainerTransformerStationEfr,
- subGeographicalRegionJpa.getOid());
- transformerStation4TreeList.add(virtualTransformerStationEfr);
- }
-
- sumContainerSubGeographicalRegion.add(sumContainerTransformerStationEfr);
- }
-
- final Substation4Tree transformerStation4Tree = createSubstation4Tree(
- transformerStation,
- sumContainerTransformerStationFwt);
- transformerStation4Tree.setSubstation4TreeList(localNetworkStation4TreeList);
-
- transformerStation4TreeList.add(transformerStation4Tree);
-
- sumContainerSubGeographicalRegion.add(sumContainerTransformerStationFwt);
- }
-
- final SubGeographicalRegion4Tree subGeographicalRegion4Tree =
- createSubGeographicalRegion4Tree(
- subGeographicalRegionJpa,
- sumContainerSubGeographicalRegion);
-
- subGeographicalRegion4Tree.setSubstation4TreeList(transformerStation4TreeList);
- subGeographicalRegion4TreeList.add(subGeographicalRegion4Tree);
+// localNetworkStation4TreeList.add(createSubstation4Tree(localNetworkStation, sumContainerLocalNetworkStationFwt));
}
- return subGeographicalRegion4TreeList;
+// if(sumContainerTransformerStationEfr.getSum().compareTo(BigDecimal.ZERO) == 1) {
+//
+// Substation4Tree virtualTransformerStationEfr = findInList(transformerStation4TreeList, VIRT_TS);
+//
+// if(virtualTransformerStationEfr == null) {
+//
+// virtualTransformerStationEfr = createVirtualTransformerstation(sumContainerTransformerStationEfr, subGeographicalRegionJpa.getOid());
+// transformerStation4TreeList.add(virtualTransformerStationEfr);
+// }
+//
+// sumContainerSubGeographicalRegion.add(sumContainerTransformerStationEfr);
+// }
+
+ // final Substation4Tree transformerStation4Tree = createSubstation4Tree(transformerStation, sumContainerTransformerStationFwt);
+ // transformerStation4Tree.setSubstation4TreeList(localNetworkStation4TreeList);
+ //
+ // transformerStation4TreeList.add(transformerStation4Tree);
+
+// sumContainerSubGeographicalRegion.add(sumContainerTransformerStationFwt);
+ }
+
+ final SubGeographicalRegion4Tree subGeographicalRegion4Tree = createSubGeographicalRegion4Tree(subGeographicalRegionJpa, sumContainerSubGeographicalRegion);
+
+ subGeographicalRegion4Tree.setSubstation4TreeList(transformerStation4TreeList);
+ subGeographicalRegion4TreeList.add(subGeographicalRegion4Tree);
}
- private SumContainer createSumContainer(final SubstationJpa substationJpa,
- final CommunicationTypeJpa communicationTypeJpa) {
+ return subGeographicalRegion4TreeList;
+ }
- return new SumContainer(
- getSum(substationJpa, UnitTypeJpa.PHOT, communicationTypeJpa),
- getSum(substationJpa, UnitTypeJpa.BIOG, communicationTypeJpa),
- getSum(substationJpa, UnitTypeJpa.WIND, communicationTypeJpa),
- getSum(substationJpa, null, communicationTypeJpa)
- );
- }
+ private SumContainer createSumContainer(final SubstationJpa substationJpa, final CommunicationTypeJpa communicationTypeJpa) {
- private SubGeographicalRegion4Tree createSubGeographicalRegion4Tree(
- final SubGeographicalRegionJpa subGeographicalRegionJpa,
- final SumContainer sumContainer) {
+ return new SumContainer(getSum(substationJpa, UnitTypeJpa.PHOT, communicationTypeJpa), getSum(substationJpa, UnitTypeJpa.BIOG, communicationTypeJpa), getSum(substationJpa, UnitTypeJpa.WIND, communicationTypeJpa), getSum(substationJpa, null, communicationTypeJpa));
+ }
- final SubGeographicalRegion4Tree subGeographicalRegion4Tree = new SubGeographicalRegion4Tree();
+ private SubGeographicalRegion4Tree createSubGeographicalRegion4Tree(final SubGeographicalRegionJpa subGeographicalRegionJpa, final SumContainer sumContainer) {
- subGeographicalRegion4Tree.setName(subGeographicalRegionJpa.getName());
- subGeographicalRegion4Tree.setOid(subGeographicalRegionJpa.getOid().toString());
- subGeographicalRegion4Tree.setPv(roundAndFormat(sumContainer.getPv()));
- subGeographicalRegion4Tree.setBio(roundAndFormat(sumContainer.getBio()));
- subGeographicalRegion4Tree.setWind(roundAndFormat(sumContainer.getWind()));
- subGeographicalRegion4Tree.setNoBioPvWind(roundAndFormat(sumContainer.getNoBioWindPv()));
- subGeographicalRegion4Tree.setSum(roundAndFormat(sumContainer.getSum()));
+ final SubGeographicalRegion4Tree subGeographicalRegion4Tree = new SubGeographicalRegion4Tree();
- return subGeographicalRegion4Tree;
- }
+ subGeographicalRegion4Tree.setName(subGeographicalRegionJpa.getName());
+ subGeographicalRegion4Tree.setOid(subGeographicalRegionJpa.getOid().toString());
+ subGeographicalRegion4Tree.setPv(roundAndFormat(sumContainer.getPv()));
+ subGeographicalRegion4Tree.setBio(roundAndFormat(sumContainer.getBio()));
+ subGeographicalRegion4Tree.setWind(roundAndFormat(sumContainer.getWind()));
+ subGeographicalRegion4Tree.setNoBioPvWind(roundAndFormat(sumContainer.getNoBioWindPv()));
+ subGeographicalRegion4Tree.setSum(roundAndFormat(sumContainer.getSum()));
- private Substation4Tree createSubstation4Tree(
- final SubstationJpa substationJpa,
- final SumContainer sumContainer) {
+ return subGeographicalRegion4Tree;
+ }
- final Substation4Tree localNetworkStation4Tree = new Substation4Tree();
+ private Substation4Tree createSubstation4Tree(final SubstationJpa substationJpa, final SumContainer sumContainer) {
- localNetworkStation4Tree.setOid(substationJpa.getOid().toString());
- localNetworkStation4Tree.setName(substationJpa.getName());
- localNetworkStation4Tree.setPv(roundAndFormat(sumContainer.getPv()));
- localNetworkStation4Tree.setBio(roundAndFormat(sumContainer.getBio()));
- localNetworkStation4Tree.setWind(roundAndFormat(sumContainer.getWind()));
- localNetworkStation4Tree.setNoBioPvWind(roundAndFormat(sumContainer.getNoBioWindPv()));
- localNetworkStation4Tree.setSum(roundAndFormat(sumContainer.getSum()));
+ final Substation4Tree localNetworkStation4Tree = new Substation4Tree();
- return localNetworkStation4Tree;
- }
+ localNetworkStation4Tree.setOid(substationJpa.getOid().toString());
+ localNetworkStation4Tree.setName(substationJpa.getName());
+ localNetworkStation4Tree.setPv(roundAndFormat(sumContainer.getPv()));
+ localNetworkStation4Tree.setBio(roundAndFormat(sumContainer.getBio()));
+ localNetworkStation4Tree.setWind(roundAndFormat(sumContainer.getWind()));
+ localNetworkStation4Tree.setNoBioPvWind(roundAndFormat(sumContainer.getNoBioWindPv()));
+ localNetworkStation4Tree.setSum(roundAndFormat(sumContainer.getSum()));
- private BigDecimal getSum(
- final SubstationJpa transformerStation,
- final UnitTypeJpa unitTypeJpa,
- final CommunicationTypeJpa communicationTypeJpa) {
+ return localNetworkStation4Tree;
+ }
- return substationJpaService.getSumOfSynchronousMachineJpaListByUnitTypeJpa(
- transformerStation, unitTypeJpa, communicationTypeJpa);
- }
+ private BigDecimal getSum(final SubstationJpa transformerStation, final UnitTypeJpa unitTypeJpa, final CommunicationTypeJpa communicationTypeJpa) {
- private String roundAndFormat(final BigDecimal bigDecimal) {
+ return substationJpaService.getSumOfSynchronousMachineJpaListByUnitTypeJpa(transformerStation, unitTypeJpa, communicationTypeJpa);
+ }
- return bigDecimal.setScale(2, BigDecimal.ROUND_HALF_UP).toString();
- }
+ private String roundAndFormat(final BigDecimal bigDecimal) {
- private Substation4Tree createVirtualTransformerstation(
- final SumContainer sumContainer,
- final long subGeographicalRegionOid) {
+ return bigDecimal.setScale(2, BigDecimal.ROUND_HALF_UP).toString();
+ }
- final Substation4Tree virtualTransformerStation = new Substation4Tree();
+ private Substation4Tree createVirtualTransformerstation(final SumContainer sumContainer, final long subGeographicalRegionOid) {
- virtualTransformerStation.setName(VIRT_TS);
- virtualTransformerStation.setOid(Long.toString(subGeographicalRegionOid * -1L));
- virtualTransformerStation.setPv(roundAndFormat(sumContainer.getPv()));
- virtualTransformerStation.setBio(roundAndFormat(sumContainer.getBio()));
- virtualTransformerStation.setWind(roundAndFormat(sumContainer.getWind()));
- virtualTransformerStation.setNoBioPvWind(roundAndFormat(sumContainer.getNoBioWindPv()));
- virtualTransformerStation.setSum(roundAndFormat(sumContainer.getSum()));
+ final Substation4Tree virtualTransformerStation = new Substation4Tree();
- return virtualTransformerStation;
- }
+ virtualTransformerStation.setName(VIRT_TS);
+ virtualTransformerStation.setOid(Long.toString(subGeographicalRegionOid * -1L));
+ virtualTransformerStation.setPv(roundAndFormat(sumContainer.getPv()));
+ virtualTransformerStation.setBio(roundAndFormat(sumContainer.getBio()));
+ virtualTransformerStation.setWind(roundAndFormat(sumContainer.getWind()));
+ virtualTransformerStation.setNoBioPvWind(roundAndFormat(sumContainer.getNoBioWindPv()));
+ virtualTransformerStation.setSum(roundAndFormat(sumContainer.getSum()));
- private Substation4Tree findInList(final List<Substation4Tree> substation4TreeList,
- final String virtualTransformerStationName) {
+ return virtualTransformerStation;
+ }
- return (Substation4Tree) CollectionUtils.find(substation4TreeList, new Predicate() {
+ private Substation4Tree findInList(final List<Substation4Tree> substation4TreeList, final String virtualTransformerStationName) {
- @Override
- public boolean evaluate(final Object o) {
+ return (Substation4Tree) CollectionUtils.find(substation4TreeList, new Predicate() {
- return ((Substation4Tree) o).getName().equals(virtualTransformerStationName);
- }
- });
- }
+ @Override
+ public boolean evaluate(final Object o) {
+
+ return ((Substation4Tree) o).getName().equals(virtualTransformerStationName);
+ }
+ });
+ }
}
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionJpaService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionJpaService.java
index 75e86575..785765da 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionJpaService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionMapperService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionMapperService.java
index 74a06f4d..78a6e6a5 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionMapperService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionMapperService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -20,28 +20,32 @@ import org.springframework.stereotype.Service;
@Service
public class SubGeographicalRegionMapperService extends BaseMapperService {
- public SubGeographicalRegion mapSubGeographicalRegionJpa(final SubGeographicalRegionJpa subGeographicalRegionJpa) {
-
- final SubGeographicalRegion subGeographicalRegion = new SubGeographicalRegion();
- mapper.map(subGeographicalRegionJpa, subGeographicalRegion);
- return subGeographicalRegion;
-
- }
-
-// public List<SubGeographicalRegion> mapSubGeographicalRegionList(
-// final List<SubGeographicalRegionJpa> subGeographicalRegionJpaList) {
-// final List<SubGeographicalRegion> subGeographicalRegionList = new ArrayList<>();
-// mapper.map(subGeographicalRegionList, subGeographicalRegionJpaList);
-//// mapper.map(subGeographicalRegionJpaList, subGeographicalRegionList);
-// return subGeographicalRegionList;
-// }
-//
-// public SubGeographicalRegionJpa mapSubGeographicalRegion(final SubGeographicalRegion subGeographicalRegion) {
-//
-// final SubGeographicalRegionJpa subGeographicalRegionJpa = new SubGeographicalRegionJpa();
-// mapper.map(subGeographicalRegion, subGeographicalRegionJpa);
-// return subGeographicalRegionJpa;
-//
-// }
+ public SubGeographicalRegion mapSubGeographicalRegionJpa(final SubGeographicalRegionJpa subGeographicalRegionJpa) {
+
+ final SubGeographicalRegion subGeographicalRegion = new SubGeographicalRegion();
+
+ // REMIND 2019-02-28 Renko => SubstationJpaList auf NULL setzen; performance im mapper
+ subGeographicalRegionJpa.setSubstationJpaList(null);
+
+ mapper.map(subGeographicalRegionJpa, subGeographicalRegion);
+ return subGeographicalRegion;
+
+ }
+
+ // public List<SubGeographicalRegion> mapSubGeographicalRegionList(
+ // final List<SubGeographicalRegionJpa> subGeographicalRegionJpaList) {
+ // final List<SubGeographicalRegion> subGeographicalRegionList = new ArrayList<>();
+ // mapper.map(subGeographicalRegionList, subGeographicalRegionJpaList);
+ //// mapper.map(subGeographicalRegionJpaList, subGeographicalRegionList);
+ // return subGeographicalRegionList;
+ // }
+ //
+ // public SubGeographicalRegionJpa mapSubGeographicalRegion(final SubGeographicalRegion subGeographicalRegion) {
+ //
+ // final SubGeographicalRegionJpa subGeographicalRegionJpa = new SubGeographicalRegionJpa();
+ // mapper.map(subGeographicalRegion, subGeographicalRegionJpa);
+ // return subGeographicalRegionJpa;
+ //
+ // }
}
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionService.java
index 14a60636..29c2ffa1 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubGeographicalRegionService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationJpaService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationJpaService.java
index 4d33a234..a951212e 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationJpaService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -40,296 +40,269 @@ import org.springframework.stereotype.Service;
@Service
public class SubstationJpaService extends AbstractJpaService {
- @Autowired
- private SubstationJpaRepository substationJpaRepository;
+ @Autowired
+ private SubstationJpaRepository substationJpaRepository;
- @Autowired
- private SubGeographicalRegionJpaService subGeographicalRegionJpaService;
+ @Autowired
+ private SubGeographicalRegionJpaService subGeographicalRegionJpaService;
- @Autowired
- private AnalogValueJpaService analogValueJpaService;
+ @Autowired
+ private AnalogValueJpaService analogValueJpaService;
- /**
- * Creates the sum over all SynchronousMachines of a Substation specified by
- * an UnitType (Photovoltaic, Wind, Biogas). If no UnitType is defined it creates
- * the sum of SynchronousMachines which are none of Photovoltaic, Biogas or Wind.
- *
- * @param substationJpa
- * @param unitTypeJpa
- * @return
- */
- public BigDecimal getSumOfSynchronousMachineJpaListByUnitTypeJpa(
- final SubstationJpa substationJpa,
- final UnitTypeJpa unitTypeJpa,
- final CommunicationTypeJpa communicationTypeJpa) {
+ /**
+ * Creates the sum over all SynchronousMachines of a Substation specified by
+ * an UnitType (Photovoltaic, Wind, Biogas). If no UnitType is defined it creates
+ * the sum of SynchronousMachines which are none of Photovoltaic, Biogas or Wind.
+ *
+ * @param substationJpa
+ * @param unitTypeJpa
+ * @return
+ */
+ public BigDecimal getSumOfSynchronousMachineJpaListByUnitTypeJpa(final SubstationJpa substationJpa, final UnitTypeJpa unitTypeJpa, final CommunicationTypeJpa communicationTypeJpa) {
- BigDecimal sum = BigDecimal.ZERO;
+ BigDecimal sum = BigDecimal.ZERO;
- for (final SynchronousMachineJpa synchronousMachineJpa : substationJpa.getSynchronousMachineJpaList()) {
+ for(final SynchronousMachineJpa synchronousMachineJpa : substationJpa.getSynchronousMachineJpaList()) {
- UnitTypeJpa unitTypeJpaSynchMach = null;
+ UnitTypeJpa unitTypeJpaSynchMach = null;
- if (synchronousMachineJpa.getGeneratingUnitJpa() != null) {
+ if(synchronousMachineJpa.getGeneratingUnitJpa() != null) {
- unitTypeJpaSynchMach =
- synchronousMachineJpa.getGeneratingUnitJpa().getRegisteredGeneratorJpa().getUnitTypeJpa();
- }
+ unitTypeJpaSynchMach = synchronousMachineJpa.getGeneratingUnitJpa().getRegisteredGeneratorJpa().getUnitTypeJpa();
+ }
- if (unitTypeJpaSynchMach != null
- && unitTypeJpaSynchMach.equals(unitTypeJpa)
- && synchronousMachineJpa.getCommunicationTypeJpa().equals(communicationTypeJpa)) {
+ if(unitTypeJpaSynchMach != null && unitTypeJpaSynchMach.equals(unitTypeJpa) && synchronousMachineJpa.getCommunicationTypeJpa().equals(communicationTypeJpa)) {
- sum = getSumOfMeas(sum, synchronousMachineJpa);
+ // sum = getSumOfMeas(sum, synchronousMachineJpa);
- } else if (unitTypeJpa == null
- && unitTypeJpaSynchMach != UnitTypeJpa.BIOG
- && unitTypeJpaSynchMach != UnitTypeJpa.PHOT
- && unitTypeJpaSynchMach != UnitTypeJpa.WIND
- && synchronousMachineJpa.getCommunicationTypeJpa() != null
- && synchronousMachineJpa.getCommunicationTypeJpa().equals(communicationTypeJpa)) {
+ }
+ else if(unitTypeJpa == null && unitTypeJpaSynchMach != UnitTypeJpa.BIOG && unitTypeJpaSynchMach != UnitTypeJpa.PHOT && unitTypeJpaSynchMach != UnitTypeJpa.WIND && synchronousMachineJpa.getCommunicationTypeJpa() != null && synchronousMachineJpa.getCommunicationTypeJpa().equals(communicationTypeJpa)) {
- sum = getSumOfMeas(sum, synchronousMachineJpa);
- }
- }
-
- return sum;
+ // sum = getSumOfMeas(sum, synchronousMachineJpa);
+ }
}
- /**
- * Gets all Substations, which are valid for this moment.
- *
- * @param oid
- * @return
- */
- public SubstationJpa findSubstationJpaByOidAndValidToNull(final String oid) {
+ return sum;
+ }
- return substationJpaRepository.findSubstationJpaByOidAndValidToNull(oid);
- }
+ /**
+ * Gets all Substations, which are valid for this moment.
+ *
+ * @param oid
+ * @return
+ */
+ public SubstationJpa findSubstationJpaByOidAndValidToNull(final String oid) {
- /**
- * Gets all Substations, which are valid for a specific timestamp.
- *
- * @param oid
- * @param timestamp
- * @return
- */
- public SubstationJpa getSubstationByOidAndTimestampWithSynchronousMachineList(final String oid, final Timestamp timestamp) {
+ return substationJpaRepository.findSubstationJpaByOidAndValidToNull(oid);
+ }
- final Timestamp timestampSearch = timestamp == null ? now() : timestamp;
+ /**
+ * Gets all Substations, which are valid for a specific timestamp.
+ *
+ * @param oid
+ * @param timestamp
+ * @return
+ */
+ public SubstationJpa getSubstationByOidAndTimestampWithSynchronousMachineList(final String oid, final Timestamp timestamp) {
- if (Long.parseLong(oid) < 0) {
+ final Timestamp timestampSearch = timestamp == null ? now() : timestamp;
- return createVirtualTransformerStation(oid);
+ if(Long.parseLong(oid) < 0) {
- } else {
+ return createVirtualTransformerStation(oid);
- final SubstationJpa substationJpa =
- substationJpaRepository.findSubstationByOidAndTimestamp(Integer.parseInt(oid), timestampSearch);
+ }
+ else {
- substationJpa.setEquipmentJpaList(
- substationJpa.getEquipmentJpaListWithTimestampOnlySynchronousMachineJpa(
- timestampSearch, CommunicationTypeJpa.FWT));
+ final SubstationJpa substationJpa = substationJpaRepository.findSubstationByOidAndTimestamp(Integer.parseInt(oid), timestampSearch);
- for (final VoltageLevelJpa voltageLevelJpa : substationJpa.getVoltageLevelJpaList()) {
+ substationJpa.setEquipmentJpaList(substationJpa.getEquipmentJpaListWithTimestampOnlySynchronousMachineJpa(timestampSearch, CommunicationTypeJpa.FWT));
- voltageLevelJpa.setEquipmentJpaList(
- voltageLevelJpa.getEquipmentJpaListWithTimestampOnlySynchronousMachineJpa(
- timestampSearch, CommunicationTypeJpa.FWT));
- }
+ for(final VoltageLevelJpa voltageLevelJpa : substationJpa.getVoltageLevelJpaList()) {
- return substationJpa;
- }
+ voltageLevelJpa.setEquipmentJpaList(voltageLevelJpa.getEquipmentJpaListWithTimestampOnlySynchronousMachineJpa(timestampSearch, CommunicationTypeJpa.FWT));
+ }
+
+ return substationJpa;
}
+ }
- public SubstationJpa createVirtualTransformerStation(final String oid) {
+ public SubstationJpa createVirtualTransformerStation(final String oid) {
- // create virtual TransformerStation
- final SubstationJpa virtualTransformerStation = new SubstationJpa();
- virtualTransformerStation.setOid(0L);
- virtualTransformerStation.setmRid("VirtualTS");
+ // create virtual TransformerStation
+ final SubstationJpa virtualTransformerStation = new SubstationJpa();
+ virtualTransformerStation.setOid(0L);
+ virtualTransformerStation.setmRid("VirtualTS");
- final long subGeographicalRegionJpaOid = Long.parseLong(oid) * -1L;
+ final long subGeographicalRegionJpaOid = Long.parseLong(oid) * -1L;
- final SubGeographicalRegionJpa subGeographicalRegionJpa
- = subGeographicalRegionJpaService.getSubGeographicalRegionJpa(
- subGeographicalRegionJpaOid, CommunicationTypeJpa.EFR);
+ final SubGeographicalRegionJpa subGeographicalRegionJpa = subGeographicalRegionJpaService.getSubGeographicalRegionJpa(subGeographicalRegionJpaOid, CommunicationTypeJpa.EFR);
- if (subGeographicalRegionJpa == null) {
+ if(subGeographicalRegionJpa == null) {
- return null;
- }
+ return null;
+ }
- final List<EquipmentJpa> synchronousMachineJpaList = new ArrayList<>();
+ final List<EquipmentJpa> synchronousMachineJpaList = new ArrayList<>();
- for (final SubstationJpa substationJpa : subGeographicalRegionJpa.getSubstationJpaList()) {
+ for(final SubstationJpa substationJpa : subGeographicalRegionJpa.getSubstationJpaList()) {
- for (final SynchronousMachineJpa synchronousMachineJpa
- : substationJpa.getSynchronousMachineJpaList()) {
+ for(final SynchronousMachineJpa synchronousMachineJpa : substationJpa.getSynchronousMachineJpaList()) {
- if (synchronousMachineJpa.getCommunicationTypeJpa() != null
- && synchronousMachineJpa.getCommunicationGroup() == null) {
+ if(synchronousMachineJpa.getCommunicationTypeJpa() != null && synchronousMachineJpa.getCommunicationGroup() == null) {
- synchronousMachineJpaList.add(synchronousMachineJpa);
+ synchronousMachineJpaList.add(synchronousMachineJpa);
- } else if (synchronousMachineJpa.getCommunicationGroup() != null) {
+ }
+ else if(synchronousMachineJpa.getCommunicationGroup() != null) {
- SynchronousMachineJpa virtualSynchronousMachineJpa = null;
+ SynchronousMachineJpa virtualSynchronousMachineJpa = null;
- virtualSynchronousMachineJpa
- = findInList(synchronousMachineJpaList, synchronousMachineJpa);
+ virtualSynchronousMachineJpa = findInList(synchronousMachineJpaList, synchronousMachineJpa);
- if (virtualSynchronousMachineJpa == null) {
+ if(virtualSynchronousMachineJpa == null) {
- virtualSynchronousMachineJpa = createVirtualSynchronousMachine(synchronousMachineJpa);
- synchronousMachineJpaList.add(virtualSynchronousMachineJpa);
+ virtualSynchronousMachineJpa = createVirtualSynchronousMachine(synchronousMachineJpa);
+ synchronousMachineJpaList.add(virtualSynchronousMachineJpa);
- } else {
+ }
+ else {
- addValues(virtualSynchronousMachineJpa, synchronousMachineJpa);
- }
- }
- }
+ addValues(virtualSynchronousMachineJpa, synchronousMachineJpa);
+ }
}
+ }
+ }
- virtualTransformerStation.setEquipmentJpaList(synchronousMachineJpaList);
+ virtualTransformerStation.setEquipmentJpaList(synchronousMachineJpaList);
- return virtualTransformerStation;
- }
+ return virtualTransformerStation;
+ }
- private SynchronousMachineJpa createVirtualSynchronousMachine(final SynchronousMachineJpa synchronousMachineJpa) {
+ private SynchronousMachineJpa createVirtualSynchronousMachine(final SynchronousMachineJpa synchronousMachineJpa) {
- final SynchronousMachineJpa virtualSynchronousMachineJpa = new SynchronousMachineJpa();
+ final SynchronousMachineJpa virtualSynchronousMachineJpa = new SynchronousMachineJpa();
- virtualSynchronousMachineJpa.setName("VirtualSynchronousMachine" + synchronousMachineJpa.getCommunicationGroup());
- virtualSynchronousMachineJpa.setCommunicationTypeJpa(synchronousMachineJpa.getCommunicationTypeJpa());
- virtualSynchronousMachineJpa.setCommunicationGroup(synchronousMachineJpa.getCommunicationGroup());
- virtualSynchronousMachineJpa.setGeneratingUnitJpa(synchronousMachineJpa.getGeneratingUnitJpa());
- virtualSynchronousMachineJpa.getGeneratingUnitJpa().setRegisteredGeneratorJpa(null);
- virtualSynchronousMachineJpa.setReductionSettingJpaList(synchronousMachineJpa.getReductionSettingJpaList());
- virtualSynchronousMachineJpa.setFeedInRanking(synchronousMachineJpa.getFeedInRanking());
- virtualSynchronousMachineJpa.setFeedInPriority(synchronousMachineJpa.getFeedInPriority());
- virtualSynchronousMachineJpa.setNormallyInService(synchronousMachineJpa.getNormallyInService());
- virtualSynchronousMachineJpa.setControlEnabled(synchronousMachineJpa.getControlEnabled());
- virtualSynchronousMachineJpa.setSynchronousMachineKindJpa(SynchronousMachineKindJpa.GENERATOR);
- virtualSynchronousMachineJpa.setmRid(synchronousMachineJpa.getmRid());
- virtualSynchronousMachineJpa.setOid(0L);
+ virtualSynchronousMachineJpa.setName("VirtualSynchronousMachine" + synchronousMachineJpa.getCommunicationGroup());
+ virtualSynchronousMachineJpa.setCommunicationTypeJpa(synchronousMachineJpa.getCommunicationTypeJpa());
+ virtualSynchronousMachineJpa.setCommunicationGroup(synchronousMachineJpa.getCommunicationGroup());
+ virtualSynchronousMachineJpa.setGeneratingUnitJpa(synchronousMachineJpa.getGeneratingUnitJpa());
+ virtualSynchronousMachineJpa.getGeneratingUnitJpa().setRegisteredGeneratorJpa(null);
+ virtualSynchronousMachineJpa.setReductionSettingJpaList(synchronousMachineJpa.getReductionSettingJpaList());
+ virtualSynchronousMachineJpa.setFeedInRanking(synchronousMachineJpa.getFeedInRanking());
+ virtualSynchronousMachineJpa.setFeedInPriority(synchronousMachineJpa.getFeedInPriority());
+ virtualSynchronousMachineJpa.setNormallyInService(synchronousMachineJpa.getNormallyInService());
+ virtualSynchronousMachineJpa.setControlEnabled(synchronousMachineJpa.getControlEnabled());
+ virtualSynchronousMachineJpa.setSynchronousMachineKindJpa(SynchronousMachineKindJpa.GENERATOR);
+ virtualSynchronousMachineJpa.setmRid(synchronousMachineJpa.getmRid());
+ virtualSynchronousMachineJpa.setOid(0L);
- AnalogJpaService.setOnlyLatestValue(synchronousMachineJpa.getAnalogJpaList());
- virtualSynchronousMachineJpa.setAnalogJpaList(synchronousMachineJpa.getAnalogJpaList());
+ AnalogJpaService.setOnlyLatestValue(synchronousMachineJpa.getAnalogJpaList());
+ virtualSynchronousMachineJpa.setAnalogJpaList(synchronousMachineJpa.getAnalogJpaList());
- return virtualSynchronousMachineJpa;
- }
+ return virtualSynchronousMachineJpa;
+ }
- /**
- * Add maxOperatingP (installierte Leistung) and GeneratorPower (Wirkleisutng)
- *
- * @param virtualSynchronousMachineJpa
- * @param synchronousMachineJpa
- */
- private void addValues(final SynchronousMachineJpa virtualSynchronousMachineJpa,
- final SynchronousMachineJpa synchronousMachineJpa) {
+ /**
+ * Add maxOperatingP (installierte Leistung) and GeneratorPower (Wirkleisutng)
+ *
+ * @param virtualSynchronousMachineJpa
+ * @param synchronousMachineJpa
+ */
+ private void addValues(final SynchronousMachineJpa virtualSynchronousMachineJpa, final SynchronousMachineJpa synchronousMachineJpa) {
- ActivePowerJpaService.addActivePowerReturnMw(
- virtualSynchronousMachineJpa.getGeneratingUnitJpa().getMaxOperatingP(),
- synchronousMachineJpa.getGeneratingUnitJpa().getMaxOperatingP());
+ ActivePowerJpaService.addActivePowerReturnMw(virtualSynchronousMachineJpa.getGeneratingUnitJpa().getMaxOperatingP(), synchronousMachineJpa.getGeneratingUnitJpa().getMaxOperatingP());
- addAnalogJpa(virtualSynchronousMachineJpa, synchronousMachineJpa);
+ addAnalogJpa(virtualSynchronousMachineJpa, synchronousMachineJpa);
- }
+ }
- private void addAnalogJpa(final SynchronousMachineJpa virtualSynchronousMachineJpa,
- final SynchronousMachineJpa synchronousMachineJpa) {
+ private void addAnalogJpa(final SynchronousMachineJpa virtualSynchronousMachineJpa, final SynchronousMachineJpa synchronousMachineJpa) {
- if (virtualSynchronousMachineJpa.getAnalogJpaList() == null
- || virtualSynchronousMachineJpa.getAnalogJpaList().isEmpty()) {
+ if(virtualSynchronousMachineJpa.getAnalogJpaList() == null || virtualSynchronousMachineJpa.getAnalogJpaList().isEmpty()) {
- virtualSynchronousMachineJpa.setAnalogJpaList(synchronousMachineJpa.getAnalogJpaList());
+ virtualSynchronousMachineJpa.setAnalogJpaList(synchronousMachineJpa.getAnalogJpaList());
- } else {
+ }
+ else {
- final ActivePowerJpa activePowerJpaMw =
- ActivePowerJpaService.toMw(synchronousMachineJpa.getGeneratorPowerMeasured());
+ final ActivePowerJpa activePowerJpaMw = ActivePowerJpaService.toMw(synchronousMachineJpa.getGeneratorPowerMeasured());
- for (final AnalogJpa analogJpa : virtualSynchronousMachineJpa.getAnalogJpaList()) {
+ for(final AnalogJpa analogJpa : virtualSynchronousMachineJpa.getAnalogJpaList()) {
- if ("GeneratorPower".equals(analogJpa.getMeasurementType())) {
+ if("GeneratorPower".equals(analogJpa.getMeasurementType())) {
- AnalogJpaService.toMw(analogJpa);
+ AnalogJpaService.toMw(analogJpa);
- final AnalogValueJpa analogValueJpaLatestValue
- = analogValueJpaService.getAnalogValueJpaLatestValue(analogJpa.getAnalogValueJpaList());
+ final AnalogValueJpa analogValueJpaLatestValue = analogValueJpaService.getAnalogValueJpaLatestValue(analogJpa.getAnalogValueJpaList());
- analogValueJpaLatestValue.setValue(analogValueJpaLatestValue.getValue().add(activePowerJpaMw.getValue()));
- }
- }
+ analogValueJpaLatestValue.setValue(analogValueJpaLatestValue.getValue().add(activePowerJpaMw.getValue()));
}
+ }
}
+ }
- private SynchronousMachineJpa findInList(final List<EquipmentJpa> synchronousMachineJpaList,
- final SynchronousMachineJpa synchronousMachineJpaToBeFind) {
-
- final List<EquipmentJpa> synchronousMachineJpaListCorrect = new ArrayList<>();
+ private SynchronousMachineJpa findInList(final List<EquipmentJpa> synchronousMachineJpaList, final SynchronousMachineJpa synchronousMachineJpaToBeFind) {
- for (final EquipmentJpa equipmentJpaCorrect : synchronousMachineJpaList) {
+ final List<EquipmentJpa> synchronousMachineJpaListCorrect = new ArrayList<>();
- if (((SynchronousMachineJpa) equipmentJpaCorrect).getCommunicationTypeJpa() != null
- && ((SynchronousMachineJpa) equipmentJpaCorrect).getCommunicationGroup() != null) {
+ for(final EquipmentJpa equipmentJpaCorrect : synchronousMachineJpaList) {
- synchronousMachineJpaListCorrect.add(equipmentJpaCorrect);
+ if(((SynchronousMachineJpa) equipmentJpaCorrect).getCommunicationTypeJpa() != null && ((SynchronousMachineJpa) equipmentJpaCorrect).getCommunicationGroup() != null) {
- }
- }
-
- return (SynchronousMachineJpa) CollectionUtils.find(synchronousMachineJpaListCorrect, new Predicate() {
- @Override
- public boolean evaluate(final Object o) {
+ synchronousMachineJpaListCorrect.add(equipmentJpaCorrect);
- return ((SynchronousMachineJpa) o).getCommunicationTypeJpa().equals(CommunicationTypeJpa.EFR)
- && ((SynchronousMachineJpa) o).getCommunicationGroup().compareTo(
- synchronousMachineJpaToBeFind.getCommunicationGroup()) == 0;
- }
- });
+ }
}
+ return (SynchronousMachineJpa) CollectionUtils.find(synchronousMachineJpaListCorrect, new Predicate() {
- public List<SubstationJpa> getSubstationJpa4Lov() {
+ @Override
+ public boolean evaluate(final Object o) {
- final List<SubstationJpa> substationJpaList = new ArrayList<>();
+ return ((SynchronousMachineJpa) o).getCommunicationTypeJpa().equals(CommunicationTypeJpa.EFR) && ((SynchronousMachineJpa) o).getCommunicationGroup().compareTo(synchronousMachineJpaToBeFind.getCommunicationGroup()) == 0;
+ }
+ });
+ }
- for (final Object[] object : substationJpaRepository.findSubstatioJpa4Lov()) {
+ public List<SubstationJpa> getSubstationJpa4Lov() {
- final SubstationJpa substationJpa = new SubstationJpa();
+ final List<SubstationJpa> substationJpaList = new ArrayList<>();
- substationJpa.setOid(Long.parseLong(object[1].toString()));
- substationJpa.setmRid((String) object[2]);
- substationJpa.setName((String) object[3]);
+ for(final Object[] object : substationJpaRepository.findSubstatioJpa4Lov()) {
- substationJpaList.add(substationJpa);
- }
+ final SubstationJpa substationJpa = new SubstationJpa();
- return substationJpaList;
+ substationJpa.setOid(Long.parseLong(object[1].toString()));
+ substationJpa.setmRid((String) object[2]);
+ substationJpa.setName((String) object[3]);
+
+ substationJpaList.add(substationJpa);
}
- private BigDecimal getSumOfMeas(final BigDecimal value, final SynchronousMachineJpa synchronousMachineJpa) {
+ return substationJpaList;
+ }
- BigDecimal sum = value;
+ private BigDecimal getSumOfMeas(final BigDecimal value, final SynchronousMachineJpa synchronousMachineJpa) {
- for (final AnalogJpa analogJpa : synchronousMachineJpa.getAnalogJpaList()) {
+ BigDecimal sum = value;
- if ("GeneratorPower".equals(analogJpa.getMeasurementType())) {
+ for(final AnalogJpa analogJpa : synchronousMachineJpa.getAnalogJpaList()) {
- BigDecimal valueToAdd = analogValueJpaService.getLatestValue(analogJpa.getAnalogValueJpaList());
+ if("GeneratorPower".equals(analogJpa.getMeasurementType())) {
- if (analogJpa.getUnitMultiplierJpa().equals(UnitMultiplierJpa.KILO)) {
+ BigDecimal valueToAdd = analogValueJpaService.getLatestValue(analogJpa.getAnalogValueJpaList());
- valueToAdd = valueToAdd.divide(BigDecimal.valueOf(1000L), 2, RoundingMode.HALF_UP);
- }
+ if(analogJpa.getUnitMultiplierJpa().equals(UnitMultiplierJpa.KILO)) {
- sum = sum.add(valueToAdd);
- }
+ valueToAdd = valueToAdd.divide(BigDecimal.valueOf(1000L), 2, RoundingMode.HALF_UP);
}
- return sum;
+ sum = sum.add(valueToAdd);
+ }
}
+ return sum;
+ }
+
}
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationMapperService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationMapperService.java
index f2ef3dc3..34bcb097 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationMapperService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationMapperService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -23,24 +23,28 @@ import org.springframework.stereotype.Service;
@Service
public class SubstationMapperService extends BaseMapperService {
- public Substation mapSubstationJpa(final SubstationJpa substationJpa) {
+ public Substation mapSubstationJpa(final SubstationJpa substationJpa) {
- final Substation substation = new Substation();
- mapper.map(substationJpa, substation);
+ final Substation substation = new Substation();
- return substation;
- }
+ // REMIND 2019-02-28 Renko => SubGeographicalRegionJpa auf NULL setzen; performance im mapper
+ substationJpa.setSubGeographicalRegionJpa(null);
+
+ mapper.map(substationJpa, substation);
- public List<Substation> mapSubstationList(final List<SubstationJpa> substationJpaList) {
+ return substation;
+ }
- final List<Substation> substationList = new ArrayList<>();
+ public List<Substation> mapSubstationList(final List<SubstationJpa> substationJpaList) {
- for (final SubstationJpa substationJpa : substationJpaList) {
+ final List<Substation> substationList = new ArrayList<>();
- substationList.add(mapSubstationJpa(substationJpa));
- }
+ for(final SubstationJpa substationJpa : substationJpaList) {
- return substationList;
+ substationList.add(mapSubstationJpa(substationJpa));
}
+ return substationList;
+ }
+
}
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationService.java
index aa7d4c18..1c46e222 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SubstationService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineJpaDiffCheckerService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineJpaDiffCheckerService.java
index c2f8ad86..81a5d339 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineJpaDiffCheckerService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineJpaDiffCheckerService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineJpaService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineJpaService.java
index 5ada9f35..8d51edd0 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineJpaService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineMapperService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineMapperService.java
index af0f0af8..57d4bcda 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineMapperService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineMapperService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineRestConsumerService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineRestConsumerService.java
index 17ff64e8..2e779552 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineRestConsumerService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineRestConsumerService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineValidatorService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineValidatorService.java
index 1497c41d..ee7ac785 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineValidatorService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/SynchronousMachineValidatorService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/TimePeriodPassedService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/TimePeriodPassedService.java
index 85081a54..3745ffd7 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/TimePeriodPassedService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/service/TimePeriodPassedService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/util/TimestampUtil.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/util/TimestampUtil.java
index f8c63928..01a048aa 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/util/TimestampUtil.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/deprecated/util/TimestampUtil.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/AbstractPersistenceContext.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/AbstractPersistenceContext.java
index 41ba332b..68e128be 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/AbstractPersistenceContext.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/AbstractPersistenceContext.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/AbstractSpringPersistenceContext.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/AbstractSpringPersistenceContext.java
index b2ababa4..549d18df 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/AbstractSpringPersistenceContext.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/AbstractSpringPersistenceContext.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/CimCachePersistenceContext.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/CimCachePersistenceContext.java
index 641d6680..d3523faf 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/CimCachePersistenceContext.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/CimCachePersistenceContext.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -25,6 +25,9 @@ import org.eclipse.openk.common.messaging.ILogger;
import org.eclipse.openk.common.messaging.LoggerFactory;
import org.eclipse.openk.common.net.UrlDefaults;
import org.eclipse.openk.service.core.IServiceContext;
+import org.eclipse.persistence.config.BatchWriting;
+import org.eclipse.persistence.config.PersistenceUnitProperties;
+import org.eclipse.persistence.logging.SessionLog;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.Bean;
@@ -154,8 +157,12 @@ public class CimCachePersistenceContext extends AbstractSpringPersistenceContext
{
Map<String, Object> properties = new HashMap<>();
- properties.put("eclipselink.weaving", "false");
-
+ properties.put(PersistenceUnitProperties.WEAVING, "false");
+ properties.put(PersistenceUnitProperties.BATCH_WRITING, BatchWriting.JDBC);
+ properties.put(PersistenceUnitProperties.LOGGING_LEVEL, SessionLog.INFO_LABEL);
+ properties.put(PersistenceUnitProperties.CONNECTION_POOL_INITIAL, "1");
+ properties.put(PersistenceUnitProperties.CONNECTION_POOL_MIN, "30");
+ properties.put(PersistenceUnitProperties.CONNECTION_POOL_MAX, "30");
factory.setJpaPropertyMap(properties);
}
@@ -181,7 +188,7 @@ public class CimCachePersistenceContext extends AbstractSpringPersistenceContext
return result;
}
-
+
// Properties
@Override
public ILogger getLogger() {
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/CimCacheService.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/CimCacheService.java
index 2551f5e9..fbffb1f8 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/CimCacheService.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/CimCacheService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -13,15 +13,43 @@
*/
package org.eclipse.openk.app.cimcache.service;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
import javax.annotation.PostConstruct;
+import org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.CimCacheDataAccess;
+import org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.SubGeographicalRegionJpa;
+import org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.mapper.OidToMridMapper;
import org.eclipse.openk.app.cimcache.core.CimCacheDefaults;
+import org.eclipse.openk.app.cimcache.deprecated.repository.SynchronousMachineJpaRepository;
+import org.eclipse.openk.app.cimcache.deprecated.service.SubGeographicalRegionJpaService;
+import org.eclipse.openk.common.collection.AlreadyExistingItemException;
+import org.eclipse.openk.common.command.Command;
+import org.eclipse.openk.common.command.StartCommandExecutionMessage;
+import org.eclipse.openk.common.command.UnknownCommandException;
import org.eclipse.openk.common.messaging.ILogger;
import org.eclipse.openk.common.messaging.LoggerFactory;
import org.eclipse.openk.common.system.codestyle.Reason;
import org.eclipse.openk.common.system.codestyle.SuppressWarningsReason;
+import org.eclipse.openk.common.value.parameter.NoParameters;
+import org.eclipse.openk.domain.assetdata.model.AssetData;
+import org.eclipse.openk.domain.measurement.model.MeasurementModel;
+import org.eclipse.openk.domain.statictopology.model.StaticTopology;
+import org.eclipse.openk.domain.topologystate.model.TopologyState;
import org.eclipse.openk.service.core.ServiceInformation;
+import org.eclipse.openk.service.core.adapter.mapper.IMapper;
+import org.eclipse.openk.service.core.adapter.mapper.IMapperFactory;
+import org.eclipse.openk.service.core.adapter.mapper.MapperConfiguration;
+import org.eclipse.openk.service.core.adapter.receiver.IReceiverFactory;
+import org.eclipse.openk.service.core.adapter.responder.IResponderFactory;
+import org.eclipse.openk.service.core.adapter.serializer.ISerializerFactory;
import org.eclipse.openk.service.infrastructure.AbstractServiceInfrastructureController;
+import org.eclipse.openk.service.model.repository.IRepository;
+import org.eclipse.openk.service.model.repository.InMemoryRepository;
+import org.eclipse.openk.service.model.repository.model.IEntity;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.stereotype.Service;
@@ -34,9 +62,38 @@ import org.springframework.stereotype.Service;
*/
@Service
@ServiceInformation(domain = CimCacheDefaults.DOMAIN)
-@SpringBootApplication(scanBasePackages = "org.eclipse.openk.app.cimcache")
+@SpringBootApplication(scanBasePackages = { "org.eclipse.openk.app.cimcache", "org.eclipse.openk.service" })
public class CimCacheService extends AbstractServiceInfrastructureController<CimCacheServiceConfiguration> {
+ public static final String COMMAND_REFRESH = "refresh";
+ public static final String COMMAND_RESET = "reset";
+ @Autowired
+ private SubGeographicalRegionJpaService subGeographicalRegionJpaService;
+
+ // Attributes
+ private OidToMridMapper oidToMridMapper;
+
+ private IMapper<MapperConfiguration, List<SubGeographicalRegionJpa>, List<IEntity>, NoParameters> staticTopologyMapper;
+ private IMapper<MapperConfiguration, List<SubGeographicalRegionJpa>, List<IEntity>, NoParameters> assetDataMapper;
+ private IMapper<MapperConfiguration, List<SubGeographicalRegionJpa>, List<IEntity>, NoParameters> measurementMapper;
+ private IMapper<MapperConfiguration, List<SubGeographicalRegionJpa>, List<IEntity>, NoParameters> topologyStateMapper;
+
+ private IRepository<IEntity> staticTopologyRepository;
+ private IRepository<IEntity> assetDataRepository;
+ private IRepository<IEntity> measurementRepository;
+ private IRepository<IEntity> topologyStateRepository;
+
+ @Autowired
+ private SynchronousMachineJpaRepository synchronousMachineJpaRepository;
+ @Autowired
+ private IMapperFactory mapperFactory;
+ @Autowired
+ private ISerializerFactory serializerFactory;
+ @Autowired
+ private IReceiverFactory receiverFactory;
+ @Autowired
+ private IResponderFactory responderFactory;
+
// Constants
private static final ILogger LOGGER = LoggerFactory.createLogger(CimCacheService.class);
@@ -50,10 +107,84 @@ public class CimCacheService extends AbstractServiceInfrastructureController<Cim
// Methods
@Override
+ public void executeCommand(Command command) throws IOException {
+
+ if(command != null)
+ switch(command.getType().getName().toLowerCase()) {
+ case COMMAND_RESET:
+
+ getLogger().info(new StartCommandExecutionMessage(command, "Reset the reference model!"));
+
+ setup();
+
+ break;
+ default:
+ getLogger().warn(new UnknownCommandException(command));
+ }
+ }
+
+ @Override
@PostConstruct
public void initializeService() {
super.initializeService();
+
+ oidToMridMapper = new OidToMridMapper();
+
+ // REMIND 2019-03-08 Christian Brunzendorf: hier den gemappten datenbank dump in das jewilige repository speichern
+ staticTopologyMapper = getMapperFactory().create(CimCacheDefaults.SCOPE_STATIC_TOPOLOGY, CimCacheDataAccess.INSTANCE, StaticTopology.INSTANCE);
+ assetDataMapper = getMapperFactory().create(CimCacheDefaults.SCOPE_ASSET_DATA, CimCacheDataAccess.INSTANCE, AssetData.INSTANCE);
+ measurementMapper = getMapperFactory().create(CimCacheDefaults.SCOPE_MEASUREMENT, CimCacheDataAccess.INSTANCE, MeasurementModel.INSTANCE);
+ topologyStateMapper = getMapperFactory().create(CimCacheDefaults.SCOPE_TOPOLOGY_STATE, CimCacheDataAccess.INSTANCE, TopologyState.INSTANCE);
+
+ staticTopologyRepository = (IRepository<IEntity>) getRepository(CimCacheDefaults.SCOPE_STATIC_TOPOLOGY);
+ assetDataRepository = (IRepository<IEntity>) getRepository(CimCacheDefaults.SCOPE_ASSET_DATA);
+ measurementRepository = (IRepository<IEntity>) getRepository(CimCacheDefaults.SCOPE_MEASUREMENT);
+ topologyStateRepository = (IRepository<IEntity>) getRepository(CimCacheDefaults.SCOPE_TOPOLOGY_STATE);
+
+ // setup();
+ }
+
+ public void setup() {
+
+ List<SubGeographicalRegionJpa> subregion = subGeographicalRegionJpaService.findAll();
+ try {
+ staticTopologyRepository.clear();
+ assetDataRepository.clear();
+ measurementRepository.clear();
+ topologyStateRepository.clear();
+ staticTopologyRepository.insert(staticTopologyMapper.map(subregion, null));
+ assetDataRepository.insert(assetDataMapper.map(subregion, null));
+ measurementRepository.insert(measurementMapper.map(subregion, null));
+ topologyStateRepository.insert(topologyStateMapper.map(subregion, null));
+ }
+ catch(AlreadyExistingItemException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ catch(IllegalArgumentException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ catch(IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ catch(Throwable e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ protected void initializeRepositories(Map<String, IRepository<? extends IEntity>> repositories) {
+
+ repositories.put(CimCacheDefaults.SCOPE_ASSET_DATA, new InMemoryRepository<>());
+ repositories.put(CimCacheDefaults.SCOPE_MEASUREMENT, new InMemoryRepository<>());
+ repositories.put(CimCacheDefaults.SCOPE_STATIC_TOPOLOGY, new InMemoryRepository<>());
+ repositories.put(CimCacheDefaults.SCOPE_TOPOLOGY_STATE, new InMemoryRepository<>());
+
+ super.initializeRepositories(repositories);
}
/**
@@ -68,6 +199,23 @@ public class CimCacheService extends AbstractServiceInfrastructureController<Cim
}
// Properties
+
+ /**
+ * @return the {@link OidToMridMapper}; not <code>null</code>
+ */
+ public OidToMridMapper getOidMridMapper() {
+
+ return oidToMridMapper;
+ }
+
+ /**
+ * @return the synchronousMachineJpaRepository
+ */
+ public SynchronousMachineJpaRepository getSynchronousMachineJpaRepository() {
+
+ return synchronousMachineJpaRepository;
+ }
+
@Override
protected Class<CimCacheServiceConfiguration> getConfigurationType() {
@@ -75,8 +223,32 @@ public class CimCacheService extends AbstractServiceInfrastructureController<Cim
}
@Override
+ public IReceiverFactory getReceiverFactory() {
+
+ return receiverFactory;
+ }
+
+ @Override
public ILogger getLogger() {
return LOGGER;
}
+
+ @Override
+ public IMapperFactory getMapperFactory() {
+
+ return mapperFactory;
+ }
+
+ @Override
+ public ISerializerFactory getSerializerFactory() {
+
+ return serializerFactory;
+ }
+
+ @Override
+ public IResponderFactory getResponderFactory() {
+
+ return responderFactory;
+ }
} \ No newline at end of file
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/CimCacheServiceConfiguration.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/CimCacheServiceConfiguration.java
index fdffc04e..97cc48e2 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/CimCacheServiceConfiguration.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/CimCacheServiceConfiguration.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/IPersistenceContext.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/IPersistenceContext.java
index 8bc8b4e4..18575802 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/IPersistenceContext.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/IPersistenceContext.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/MapperConfiguration.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/MapperConfiguration.java
index 9f894b65..1fe888c9 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/MapperConfiguration.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/MapperConfiguration.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/PersistenceContextConfiguration.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/PersistenceContextConfiguration.java
index e4911ce5..82c7770a 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/PersistenceContextConfiguration.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/PersistenceContextConfiguration.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/PersistenceContextInformation.java b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/PersistenceContextInformation.java
index 3f25336e..8f212c4c 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/PersistenceContextInformation.java
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/java/org/eclipse/openk/app/cimcache/service/PersistenceContextInformation.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/resources/application.properties b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/resources/application.properties
index 2a310349..1881217a 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/resources/application.properties
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/resources/application.properties
@@ -1,10 +1,10 @@
-# server properties
-server.port=9089
-
-## custom log-levels (base path is root, other paths override root settings)
-logging.level.com.btc=DEBUG
-logging.level.org.eclipse.openk=DEBUG
-logging.level.org.hibernate=WARN
-logging.level.org.springframework=WARN
-logging.level.org.apache=WARN
+# server properties
+server.port=9089
+
+## custom log-levels (base path is root, other paths override root settings)
+logging.level.com.btc=DEBUG
+logging.level.org.eclipse.openk=DEBUG
+logging.level.org.hibernate=WARN
+logging.level.org.springframework=WARN
+logging.level.org.apache=WARN
logging.level.org.eclipse.persistence=WARN \ No newline at end of file
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/resources/database-flyway.xml b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/resources/database-flyway.xml
index 5c31ea61..e41b8e9d 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/resources/database-flyway.xml
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/resources/database-flyway.xml
@@ -1,4 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2015-2019 PSI AG - http://www.psi.de
+
+ This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+
+ http://www.eclipse.org/legal/epl-v10.html
+-->
+
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/resources/dozer-mapping.xml b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/resources/dozer-mapping.xml
index 52474b64..6e1e3f02 100644
--- a/dev/org.eclipse.openk.app.eisman/cimcache/src/main/resources/dozer-mapping.xml
+++ b/dev/org.eclipse.openk.app.eisman/cimcache/src/main/resources/dozer-mapping.xml
@@ -1,302 +1,312 @@
<?xml version="1.0" encoding="UTF-8"?>
-<mappings xmlns="http://dozer.sourceforge.net"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://dozer.sourceforge.net
- http://dozer.sourceforge.net/schema/beanmapping.xsd">
-
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.core.GeographicalRegion</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.GeographicalRegionJpa</class-b>
- <field>
- <a>subGeographicalRegionList</a>
- <b>subGeographicalRegionJpaList</b>
- </field>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.core.SubGeographicalRegion</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.SubGeographicalRegionJpa</class-b>
- <field>
- <a>substationList</a>
- <b>substationJpaList</b>
- </field>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.core.EquipmentContainer</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.EquipmentContainerJpa</class-b>
- <field>
- <a>equipmentList</a>
- <b>equipmentJpaList</b>
- </field>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.core.Substation</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.SubstationJpa</class-b>
- <field>
- <a>voltageLevelList</a>
- <b>voltageLevelJpaList</b>
- </field>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.core.VoltageLevel</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.VoltageLevelJpa</class-b>
- <field>
- <a>highVoltageLimit</a>
- <b>highVoltageJpaLimit</b>
- </field>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.core.PowerSystemResource</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.PowerSystemResourceJpa</class-b>
- <field>
- <a>location</a>
- <b>locationJpa</b>
- </field>
- <field>
- <a>psrEventList</a>
- <b>psrEventJpaList</b>
- </field>
- <field>
- <a>operatingShareList</a>
- <b>operatingShareJpaList</b>
- </field>
- <field>
- <a>measurementList</a>
- <b>analogJpaList</b>
- <a-hint>org.eclipse.openk.app.eisman.cim.meas.Analog</a-hint>
- <b-hint>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.meas.AnalogJpa</b-hint>
- </field>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.core.Equipment</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.EquipmentJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.core.ConductingEquipment</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.ConductingEquipmentJpa</class-b>
- <field>
- <a>terminalList</a>
- <b>terminalJpaList</b>
- </field>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.wires.SynchronousMachine</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires.SynchronousMachineJpa</class-b>
- <field>
- <a>generatingUnit</a>
- <b>generatingUnitJpa</b>
- </field>
- <field>
- <a>synchronousMachineKind</a>
- <b>synchronousMachineKindJpa</b>
- </field>
- <field>
- <a>communicationType</a>
- <b>communicationTypeJpa</b>
- </field>
- <field>
- <a>reductionSettingList</a>
- <b>reductionSettingJpaList</b>
- </field>
- <field>
- <a>referencedSynchronousMachine</a>
- <b>referencedSynchronousMachineJpa</b>
- </field>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.wires.SynchronousMachineKind</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires.SynchronousMachineKindJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.wires.Switch</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires.SwitchJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.wires.PowerTransformer</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires.PowerTransformerJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.wires.AcLineSegment</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires.AcLineSegmentJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.wires.BusbarSection</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires.BusbarSectionJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.production.GeneratingUnit</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.production.GeneratingUnitJpa</class-b>
- <field>
- <a>generatorControlSource</a>
- <b>generatorControlSourceJpa</b>
- </field>
- <field>
- <a>registeredGenerator</a>
- <b>registeredGeneratorJpa</b>
- </field>
- <field>
- <a>highControlLimit</a>
- <b>highControlLimit</b>
- </field>
- <field>
- <a>maxOperatingP</a>
- <b>maxOperatingP</b>
- </field>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.domain.Voltage</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.domain.VoltageJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.domain.PerCent</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.domain.PerCentJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.domain.ActivePower</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.domain.ActivePowerJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.domain.CommunicationType</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.domain.CommunicationTypeJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.domain.ReductionSetting</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.domain.ReductionSettingJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.domain.AbsoluteDateTime</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.domain.AbsoluteDateTimeJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.core.OperatingShare</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.OperatingShareJpa</class-b>
- <field>
- <a>operatingParticipant</a>
- <b>operatingParticipantJpa</b>
- </field>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.core.OperatingParticipant</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.OperatingParticipantJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.informative.infoperations.PsrEvent</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.informative.infoperations.PsrEventJpa</class-b>
- <field>
- <a>psrEventKind</a>
- <b>psrEventKindJpa</b>
- </field>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.informative.infoperations.PsrEventKind</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.informative.infoperations.PsrEventKindJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.production.GeneratorControlSource</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.production.GeneratorControlSourceJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.marketoperations.referencedata.RegisteredGenerator</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.marketoperations.referencedata.RegisteredGeneratorJpa</class-b>
- <field>
- <a>unitType</a>
- <b>unitTypeJpa</b>
- </field>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.marketoperations.mktdomain.UnitType</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.marketoperations.mktdomain.UnitTypeJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.common.Location</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.common.LocationJpa</class-b>
- <field>
- <a>electronicAddress</a>
- <b>electronicAddressJpa</b>
- </field>
- <field>
- <a>positionPointList</a>
- <b>positionPointJpaList</b>
- </field>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.common.StreetDetail</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.common.StreetDetailJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.common.StreetAddress</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.common.StreetAddressJpa</class-b>
- <field>
- <a>streetDetail</a>
- <b>streetDetailJpa</b>
- </field>
- <field>
- <a>townDetail</a>
- <b>townDetailJpa</b>
- </field>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.common.TownDetail</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.common.TownDetailJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.common.ElectronicAddress</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.common.ElectronicAddressJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.common.PositionPoint</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.common.PositionPointJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.meas.Measurement</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.meas.MeasurementJpa</class-b>
- <field>
- <a>unitMultiplier</a>
- <b>unitMultiplierJpa</b>
- </field>
- <field>
- <a>unitSymbol</a>
- <b>unitSymbolJpa</b>
- </field>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.meas.MeasurementValue</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.meas.MeasurementValueJpa</class-b>
- <field>
- <a>measurementValueQuality</a>
- <b>measurementValueQualityJpa</b>
- </field>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.meas.Analog</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.meas.AnalogJpa</class-b>
- <field>
- <a>analogValueList</a>
- <b>analogValueJpaList</b>
- </field>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.meas.AnalogValue</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.meas.AnalogValueJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.core.Terminal</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.TerminalJpa</class-b>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.core.ConnectivityNode</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.ConnectivityNodeJpa</class-b>
- <field>
- <a>terminalList</a>
- <b>terminalJpaList</b>
- </field>
- </mapping>
- <mapping>
- <class-a>org.eclipse.openk.app.eisman.cim.core.ConnectivityNodeContainer</class-a>
- <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.ConnectivityNodeContainerJpa</class-b>
- <field>
- <a>connectivityNodeList</a>
- <b>connectivityNodeJpaList</b>
- </field>
- </mapping>
+<!--
+ Copyright © 2015-2019 PSI AG - http://www.psi.de
+
+ This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+
+ http://www.eclipse.org/legal/epl-v10.html
+-->
+<mappings xmlns="http://dozer.sourceforge.net"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://dozer.sourceforge.net
+ http://dozer.sourceforge.net/schema/beanmapping.xsd">
+
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.core.GeographicalRegion</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.GeographicalRegionJpa</class-b>
+ <field>
+ <a>subGeographicalRegionList</a>
+ <b>subGeographicalRegionJpaList</b>
+ </field>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.core.SubGeographicalRegion</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.SubGeographicalRegionJpa</class-b>
+ <field>
+ <a>substationList</a>
+ <b>substationJpaList</b>
+ </field>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.core.EquipmentContainer</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.EquipmentContainerJpa</class-b>
+ <field>
+ <a>equipmentList</a>
+ <b>equipmentJpaList</b>
+ </field>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.core.Substation</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.SubstationJpa</class-b>
+ <field>
+ <a>voltageLevelList</a>
+ <b>voltageLevelJpaList</b>
+ </field>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.core.VoltageLevel</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.VoltageLevelJpa</class-b>
+ <field>
+ <a>highVoltageLimit</a>
+ <b>highVoltageJpaLimit</b>
+ </field>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.core.PowerSystemResource</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.PowerSystemResourceJpa</class-b>
+ <field>
+ <a>location</a>
+ <b>locationJpa</b>
+ </field>
+ <field>
+ <a>psrEventList</a>
+ <b>psrEventJpaList</b>
+ </field>
+ <field>
+ <a>operatingShareList</a>
+ <b>operatingShareJpaList</b>
+ </field>
+ <field>
+ <a>measurementList</a>
+ <b>analogJpaList</b>
+ <a-hint>org.eclipse.openk.app.eisman.cim.meas.Analog</a-hint>
+ <b-hint>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.meas.AnalogJpa</b-hint>
+ </field>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.core.Equipment</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.EquipmentJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.core.ConductingEquipment</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.ConductingEquipmentJpa</class-b>
+ <field>
+ <a>terminalList</a>
+ <b>terminalJpaList</b>
+ </field>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.wires.SynchronousMachine</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires.SynchronousMachineJpa</class-b>
+ <field>
+ <a>generatingUnit</a>
+ <b>generatingUnitJpa</b>
+ </field>
+ <field>
+ <a>synchronousMachineKind</a>
+ <b>synchronousMachineKindJpa</b>
+ </field>
+ <field>
+ <a>communicationType</a>
+ <b>communicationTypeJpa</b>
+ </field>
+ <field>
+ <a>reductionSettingList</a>
+ <b>reductionSettingJpaList</b>
+ </field>
+ <field>
+ <a>referencedSynchronousMachine</a>
+ <b>referencedSynchronousMachineJpa</b>
+ </field>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.wires.SynchronousMachineKind</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires.SynchronousMachineKindJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.wires.Switch</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires.SwitchJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.wires.PowerTransformer</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires.PowerTransformerJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.wires.AcLineSegment</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires.AcLineSegmentJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.wires.BusbarSection</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.wires.BusbarSectionJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.production.GeneratingUnit</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.production.GeneratingUnitJpa</class-b>
+ <field>
+ <a>generatorControlSource</a>
+ <b>generatorControlSourceJpa</b>
+ </field>
+ <field>
+ <a>registeredGenerator</a>
+ <b>registeredGeneratorJpa</b>
+ </field>
+ <field>
+ <a>highControlLimit</a>
+ <b>highControlLimit</b>
+ </field>
+ <field>
+ <a>maxOperatingP</a>
+ <b>maxOperatingP</b>
+ </field>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.domain.Voltage</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.domain.VoltageJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.domain.PerCent</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.domain.PerCentJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.domain.ActivePower</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.domain.ActivePowerJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.domain.CommunicationType</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.domain.CommunicationTypeJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.domain.ReductionSetting</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.domain.ReductionSettingJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.domain.AbsoluteDateTime</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.domain.AbsoluteDateTimeJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.core.OperatingShare</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.OperatingShareJpa</class-b>
+ <field>
+ <a>operatingParticipant</a>
+ <b>operatingParticipantJpa</b>
+ </field>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.core.OperatingParticipant</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.OperatingParticipantJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.informative.infoperations.PsrEvent</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.informative.infoperations.PsrEventJpa</class-b>
+ <field>
+ <a>psrEventKind</a>
+ <b>psrEventKindJpa</b>
+ </field>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.informative.infoperations.PsrEventKind</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.informative.infoperations.PsrEventKindJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.production.GeneratorControlSource</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.production.GeneratorControlSourceJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.marketoperations.referencedata.RegisteredGenerator</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.marketoperations.referencedata.RegisteredGeneratorJpa</class-b>
+ <field>
+ <a>unitType</a>
+ <b>unitTypeJpa</b>
+ </field>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.marketoperations.mktdomain.UnitType</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.marketoperations.mktdomain.UnitTypeJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.common.Location</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.common.LocationJpa</class-b>
+ <field>
+ <a>electronicAddress</a>
+ <b>electronicAddressJpa</b>
+ </field>
+ <field>
+ <a>positionPointList</a>
+ <b>positionPointJpaList</b>
+ </field>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.common.StreetDetail</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.common.StreetDetailJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.common.StreetAddress</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.common.StreetAddressJpa</class-b>
+ <field>
+ <a>streetDetail</a>
+ <b>streetDetailJpa</b>
+ </field>
+ <field>
+ <a>townDetail</a>
+ <b>townDetailJpa</b>
+ </field>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.common.TownDetail</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.common.TownDetailJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.common.ElectronicAddress</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.common.ElectronicAddressJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.common.PositionPoint</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.common.PositionPointJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.meas.Measurement</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.meas.MeasurementJpa</class-b>
+ <field>
+ <a>unitMultiplier</a>
+ <b>unitMultiplierJpa</b>
+ </field>
+ <field>
+ <a>unitSymbol</a>
+ <b>unitSymbolJpa</b>
+ </field>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.meas.MeasurementValue</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.meas.MeasurementValueJpa</class-b>
+ <field>
+ <a>measurementValueQuality</a>
+ <b>measurementValueQualityJpa</b>
+ </field>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.meas.Analog</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.meas.AnalogJpa</class-b>
+ <field>
+ <a>analogValueList</a>
+ <b>analogValueJpaList</b>
+ </field>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.meas.AnalogValue</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.meas.AnalogValueJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.core.Terminal</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.TerminalJpa</class-b>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.core.ConnectivityNode</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.ConnectivityNodeJpa</class-b>
+ <field>
+ <a>terminalList</a>
+ <b>terminalJpaList</b>
+ </field>
+ </mapping>
+ <mapping>
+ <class-a>org.eclipse.openk.app.eisman.cim.core.ConnectivityNodeContainer</class-a>
+ <class-b>org.eclipse.openk.app.cimcache.adapter.dataaccess.cimcache.core.ConnectivityNodeContainerJpa</class-b>
+ <field>
+ <a>connectivityNodeList</a>
+ <b>connectivityNodeJpaList</b>
+ </field>
+ </mapping>
+
</mappings> \ No newline at end of file
diff --git a/dev/org.eclipse.openk.app.eisman/common/pom.xml b/dev/org.eclipse.openk.app.eisman/common/pom.xml
index dc89430f..02da4639 100644
--- a/dev/org.eclipse.openk.app.eisman/common/pom.xml
+++ b/dev/org.eclipse.openk.app.eisman/common/pom.xml
@@ -1,9 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.openk.app.eisman</groupId>
<artifactId>common</artifactId>
<version>0.0.1-SNAPSHOT</version>
+ <!--name>common</name-->
<name>${project.groupId}.${project.artifactId}</name>
<properties>
diff --git a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/dataexchange/adapter/rest/RestDefaults.java b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/dataexchange/adapter/rest/RestDefaults.java
index b8eee15f..914999d9 100644
--- a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/dataexchange/adapter/rest/RestDefaults.java
+++ b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/dataexchange/adapter/rest/RestDefaults.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/dataexchange/adapter/rest/controller/AbstractRestController.java b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/dataexchange/adapter/rest/controller/AbstractRestController.java
index d29355ec..d6089df7 100644
--- a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/dataexchange/adapter/rest/controller/AbstractRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/dataexchange/adapter/rest/controller/AbstractRestController.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/date/DateDefaults.java b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/date/DateDefaults.java
index 7ad73642..49600581 100644
--- a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/date/DateDefaults.java
+++ b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/date/DateDefaults.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/date/DateToolkit.java b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/date/DateToolkit.java
index 46ff30f4..71773d01 100644
--- a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/date/DateToolkit.java
+++ b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/date/DateToolkit.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/module/AbstractModule.java b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/module/AbstractModule.java
index b90bf4f2..26ab7eea 100644
--- a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/module/AbstractModule.java
+++ b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/module/AbstractModule.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/module/IModule.java b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/module/IModule.java
index 71ace046..f4b1e5e7 100644
--- a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/module/IModule.java
+++ b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/module/IModule.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/string/StringDefaults.java b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/string/StringDefaults.java
index 124c65fc..5a3575be 100644
--- a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/string/StringDefaults.java
+++ b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/string/StringDefaults.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/string/StringToolkit.java b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/string/StringToolkit.java
index 34c2252b..75593b2b 100644
--- a/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/string/StringToolkit.java
+++ b/dev/org.eclipse.openk.app.eisman/common/src/main/java/org/eclipse/openk/app/eisman/string/StringToolkit.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/eisman-service.config b/dev/org.eclipse.openk.app.eisman/eisman/eisman-service.config
index d5ba9e02..4a36c6c6 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/eisman-service.config
+++ b/dev/org.eclipse.openk.app.eisman/eisman/eisman-service.config
@@ -38,6 +38,8 @@ PC|eisman|1.database-username=openk
# configuration-parameters to import the connected connecting-equipments from the CIM Cache v2.2
#openk-dev00.westeurope.cloudapp.azure.com
+
+############################### static topology reader provider configuration ##########################################
RP|connected-connecting-equipments|1|application-xml.scheme=http
RP|connected-connecting-equipments|1|application-xml.host=localhost
RP|connected-connecting-equipments|1|application-xml.port=9520
@@ -56,7 +58,60 @@ RP|sub-geographical-regions|1|application-xml.port=9520
RP|sub-geographical-regions|1|application-xml.base-path=domain/electricity/dynamic-topology
# configuration-parameters to import any topological-resource from the CIM Cache v2.2
-RP|topological-resources|1|application-xml.scheme=http
-RP|topological-resources|1|application-xml.host=localhost
-RP|topological-resources|1|application-xml.port=9520
-RP|topological-resources|1|application-xml.base-path=domain/electricity/static-topology \ No newline at end of file
+RP|topological-resources|2|application-xml.scheme=http
+RP|topological-resources|2|application-xml.host=localhost
+RP|topological-resources|2|application-xml.port=9520
+RP|topological-resources|2|application-xml.base-path=domain/electricity/static-topology
+
+############################### asset data reader provider configuration ##############################################
+# Organisations, V1
+RP|organisations|1|application-xml.scheme=http
+RP|organisations|1|application-xml.host=localhost
+RP|organisations|1|application-xml.port=9701
+RP|organisations|1|application-xml.base-path=domain/common/contact-data
+
+# Ownerships, V3
+RP|asset-ownerships|3|application-xml.scheme=http
+RP|asset-ownerships|3|application-xml.host=localhost
+RP|asset-ownerships|3|application-xml.port=9701
+RP|asset-ownerships|3|application-xml.base-path=domain/electricity/asset-data
+
+# EnergySourceLocations, V1
+RP|energy-source-locations|1|application-xml.scheme=http
+RP|energy-source-locations|1|application-xml.host=localhost
+RP|energy-source-locations|1|application-xml.port=9701
+RP|energy-source-locations|1|application-xml.base-path=domain/electricity/asset-data
+
+# EnergySources, V1
+RP|energy-source-asset-data|1|application-xml.scheme=http
+RP|energy-source-asset-data|1|application-xml.host=localhost
+RP|energy-source-asset-data|1|application-xml.port=9701
+RP|energy-source-asset-data|1|application-xml.base-path=domain/electricity/asset-data
+
+############################### measurement reader provider configuration ##############################################
+
+# measurement-values, V4
+RP|measurement-values|1|application-xml.scheme=http
+RP|measurement-values|1|application-xml.host=localhost
+RP|measurement-values|1|application-xml.port=9704
+RP|measurement-values|1|application-xml.base-path=domain/electricity/measurement
+
+############################### topology state reader provider configuration ############################################
+
+# communication-states
+RP|communication-states|1|application-xml.scheme=http
+RP|communication-states|1|application-xml.host=localhost
+RP|communication-states|1|application-xml.port=9703
+RP|communication-states|1|application-xml.base-path=domain/electricity/topology-state
+
+# control-stages
+RP|control-stages|1|application-xml.scheme=http
+RP|control-stages|1|application-xml.host=localhost
+RP|control-stages|1|application-xml.port=9703
+RP|control-stages|1|application-xml.base-path=domain/electricity/topology-state
+
+# operating-states
+RP|operating-states|2|application-xml.scheme=http
+RP|operating-states|2|application-xml.host=localhost
+RP|operating-states|2|application-xml.port=9703
+RP|operating-states|2|application-xml.base-path=domain/electricity/topology-state \ No newline at end of file
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/pom.xml b/dev/org.eclipse.openk.app.eisman/eisman/pom.xml
index 372b83ba..7110c5d4 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/pom.xml
+++ b/dev/org.eclipse.openk.app.eisman/eisman/pom.xml
@@ -1,142 +1,158 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.openk.app.eisman.deprecated</groupId>
- <artifactId>eisman</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.openk.app.eisman.deprecated</groupId>
+ <artifactId>eisman</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
- <name>${project.groupId}.${project.artifactId}</name>
+ <name>${project.groupId}.${project.artifactId}</name>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <start-class>org.eclipse.openk.app.eisman.service.EismanService</start-class>
- </properties>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <start-class>org.eclipse.openk.app.eisman.service.EismanService</start-class>
+ </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
- <!-- Project Info -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.9</version>
- </plugin>
- </plugins>
- </build>
+ <!-- Project Info -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.9</version>
+ </plugin>
+ </plugins>
+ </build>
- <repositories>
- <repository>
- <id>Java.Net</id>
- <url>http://download.java.net/maven/2/</url>
- </repository>
- </repositories>
+ <repositories>
+ <repository>
+ <id>Java.Net</id>
+ <url>http://download.java.net/maven/2/</url>
+ </repository>
+ </repositories>
- <dependencies>
- <!-- Apache -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.3.2</version>
- <scope>compile</scope>
- </dependency>
- <!-- Dozer Mapper -->
- <dependency>
- <groupId>net.sf.dozer</groupId>
- <artifactId>dozer</artifactId>
- <version>5.5.1</version>
- </dependency>
- <!-- EclipseLink -->
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>eclipselink</artifactId>
- <version>2.5.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.jpa</artifactId>
- <version>2.7.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-jpa</artifactId>
- <version>1.5.6.RELEASE</version>
- <exclusions>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- Flyway -->
- <!-- <dependency> -->
- <!-- <groupId>org.flywaydb</groupId> -->
- <!-- <artifactId>flyway-core</artifactId> -->
- <!-- <version>3.2.1</version> -->
- <!-- </dependency> -->
- <!-- Guava -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>18.0</version>
- </dependency>
- <!-- Joda Time -->
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>2.3</version>
- </dependency>
- <!-- JSON -->
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>2.8.0</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.8.0</version>
- </dependency>
- <!-- openKONSEQUENZ -->
- <dependency>
- <groupId>org.eclipse.openk.app.eisman</groupId>
- <artifactId>cim</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.openk.cim</groupId>
- <artifactId>cim17v07</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.openk.service</groupId>
- <artifactId>service-service</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.openk.domain.dynamic-topology</groupId>
- <artifactId>dynamic-topology-logic</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
- <!-- PostgreSQL -->
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>42.2.5</version>
- </dependency>
- </dependencies>
+ <dependencies>
+
+ <!-- Apache -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.3.2</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Dozer Mapper -->
+ <dependency>
+ <groupId>net.sf.dozer</groupId>
+ <artifactId>dozer</artifactId>
+ <version>5.5.1</version>
+ </dependency>
+
+ <!-- EclipseLink -->
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>eclipselink</artifactId>
+ <version>2.5.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.jpa</artifactId>
+ <version>2.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-jpa</artifactId>
+ <version>1.5.6.RELEASE</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Flyway -->
+ <!-- <dependency> -->
+ <!-- <groupId>org.flywaydb</groupId> -->
+ <!-- <artifactId>flyway-core</artifactId> -->
+ <!-- <version>3.2.1</version> -->
+ <!-- </dependency> -->
+ <!-- Guava -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>18.0</version>
+ </dependency>
+
+ <!-- Joda Time -->
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>2.3</version>
+ </dependency>
+
+ <!-- JSON -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.8.0</version>
+ </dependency>
+
+ <!-- openKONSEQUENZ -->
+ <dependency>
+ <groupId>org.eclipse.openk.app.eisman</groupId>
+ <artifactId>cim</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.openk.cim</groupId>
+ <artifactId>cim17v07</artifactId>
+ <version>2.20.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.openk.cim.profile</groupId>
+ <artifactId>openkonsequenz</artifactId>
+ <version>2.20.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.openk.service</groupId>
+ <artifactId>service-service</artifactId>
+ <version>2.21.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.openk.domain.dynamic-topology</groupId>
+ <artifactId>dynamic-topology-logic</artifactId>
+ <version>2.21.1-SNAPSHOT</version>
+ </dependency>
+
+ <!-- PostgreSQL -->
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>42.2.5</version>
+ </dependency>
+
+ </dependencies>
</project> \ No newline at end of file
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/EismanDataAccess.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/EismanDataAccess.java
index e84bbbc8..61bcb787 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/EismanDataAccess.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/EismanDataAccess.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/ElectronicAddressJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/ElectronicAddressJpa.java
index 95e07d9d..9866586a 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/ElectronicAddressJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/ElectronicAddressJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/LocationJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/LocationJpa.java
index 155b6e1c..25cc158d 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/LocationJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/LocationJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/StreetAddressJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/StreetAddressJpa.java
index fef3fa4c..5372967d 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/StreetAddressJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/StreetAddressJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/StreetDetailJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/StreetDetailJpa.java
index fa312e68..89141cbb 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/StreetDetailJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/StreetDetailJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/TownDetailJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/TownDetailJpa.java
index 89d7229e..35299cd6 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/TownDetailJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/common/TownDetailJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/EquipmentContainerJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/EquipmentContainerJpa.java
index 9f3631c7..4cbb5612 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/EquipmentContainerJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/EquipmentContainerJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/EquipmentJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/EquipmentJpa.java
index 81d19bc1..3859e2b3 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/EquipmentJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/EquipmentJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/IdentifiedObjectJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/IdentifiedObjectJpa.java
index da555879..68ab1f98 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/IdentifiedObjectJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/IdentifiedObjectJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/SubGeographicalRegionJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/SubGeographicalRegionJpa.java
index 04d5b07b..cd939582 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/SubGeographicalRegionJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/SubGeographicalRegionJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/SubstationJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/SubstationJpa.java
index 72a15809..bb6d009d 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/SubstationJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/SubstationJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/VoltageLevelJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/VoltageLevelJpa.java
index ef2d2537..5253141b 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/VoltageLevelJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/core/VoltageLevelJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/AbsoluteDateTimeJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/AbsoluteDateTimeJpa.java
index 0d3afc5a..cf761247 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/AbsoluteDateTimeJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/AbsoluteDateTimeJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/ActivePowerJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/ActivePowerJpa.java
index 8f729023..5009a45a 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/ActivePowerJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/ActivePowerJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/CommunicationTypeJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/CommunicationTypeJpa.java
index 0417b994..7860488f 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/CommunicationTypeJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/CommunicationTypeJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -20,9 +20,8 @@ import com.fasterxml.jackson.annotation.JsonValue;
* CIM extension by Jan Krueger, April 2015
*/
public enum CommunicationTypeJpa {
- EFR("EFR"),
- FWT("FWT"),
- TRA("TRA");
+ RadioTeleswitch("Radio Teleswitch"),
+ RemoteTerminalUnit("Remote Terminal Unit");
private final String value;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/PerCentJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/PerCentJpa.java
index 0c037f76..b7326cb2 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/PerCentJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/PerCentJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/ReductionSettingJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/ReductionSettingJpa.java
index dda29466..21772cb2 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/ReductionSettingJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/ReductionSettingJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/UnitMultiplierJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/UnitMultiplierJpa.java
index b7baa289..736c4340 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/UnitMultiplierJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/UnitMultiplierJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -23,12 +23,12 @@ public enum UnitMultiplierJpa {
/**
* Kilo 10**3
*/
- KILO("k"),
+ k("k"),
/**
* Mega 10**6
*/
- MEGA("M"),
- NONE("none");
+ M("M"),
+ none("");
private final String value;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/UnitSymbolJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/UnitSymbolJpa.java
index 3359e7d4..b2d04dba 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/UnitSymbolJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/UnitSymbolJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -22,6 +22,10 @@ public enum UnitSymbolJpa {
/**
* Voltage in volt
*/
+ A("A"),
+ /**
+ * Voltage in volt
+ */
V("V"),
/**
* Active power in watt
@@ -30,7 +34,7 @@ public enum UnitSymbolJpa {
/**
* Dimension less quantity, e.g. count, per unit, etc.
*/
- NONE("none");
+ none("none");
private final String value;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/VoltageJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/VoltageJpa.java
index bb5678c5..a734a690 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/VoltageJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/domain/VoltageJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/informative/infoperations/PsrEventJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/informative/infoperations/PsrEventJpa.java
index 1d8bb5ef..70515913 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/informative/infoperations/PsrEventJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/informative/infoperations/PsrEventJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/informative/infoperations/PsrEventKindJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/informative/infoperations/PsrEventKindJpa.java
index a877eac4..e4ab3f28 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/informative/infoperations/PsrEventKindJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/informative/infoperations/PsrEventKindJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/marketoperations/mktdomain/UnitTypeJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/marketoperations/mktdomain/UnitTypeJpa.java
index eb5dba36..229e2aa9 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/marketoperations/mktdomain/UnitTypeJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/marketoperations/mktdomain/UnitTypeJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -31,29 +31,30 @@ public enum UnitTypeJpa {
/**
* Photovoltaic
*/
- PHOT("PV"),
+ Photovoltaic("PV"),
/**
* Hydro Pump-Turbine
*/
- PTUR("Wasser"),
+ HydroPumpTurbine("Wasser"),
+ MicroCogeneration("MCOG"),
/**
* Wind Turbine
*/
- WIND("Wind"),
+ Wind("Wind"),
/**
* Hydro Turbine
*/
- HYDR("HYDR"),
+ HydroTurbine("HYDR"),
/*
* Thermal Generating Unit (Blockheizkraftwert)
* CIM extension by Jan Krueger, April 2015
*/
- THER("BHKW"),
+ ThermalGeneratingUnit("BHKW"),
/**
* Biogas Thermal Generating Unit (Blockheizkraftwerk Biogas)
* CIM extension by Jan Krueger, April 2015
*/
- BIOG("Bio");
+ Biogas("Bio");
private final String value;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/marketoperations/referencedata/RegisteredGeneratorJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/marketoperations/referencedata/RegisteredGeneratorJpa.java
index c7ed8146..14fc1be8 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/marketoperations/referencedata/RegisteredGeneratorJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/marketoperations/referencedata/RegisteredGeneratorJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/AnalogJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/AnalogJpa.java
index 71ae2060..393e9372 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/AnalogJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/AnalogJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -35,6 +35,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
@Table(name = "MEASUREMENT_ANALOG")
public class AnalogJpa extends MeasurementJpa {
+
@JsonIgnore
@Id
@TableGenerator(name = "EismanAnalogTableGen", allocationSize = DEFAULT_ALLOCATION_SIZE, table = "OPENK_EISMAN_SEQ_TABLE", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "MEASUREMENT_ANALOG_SEQ")
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/AnalogValueJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/AnalogValueJpa.java
index 4b45739f..8908260e 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/AnalogValueJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/AnalogValueJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementJpa.java
index ad67ac20..a78e9278 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementValueJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementValueJpa.java
index f5861104..b8175bde 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementValueJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementValueJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementValueQualityJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementValueQualityJpa.java
index b9440b06..851b92a6 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementValueQualityJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/meas/MeasurementValueQualityJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/AbstractBaseEntityJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/AbstractBaseEntityJpa.java
index 0659f7fe..bc985485 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/AbstractBaseEntityJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/AbstractBaseEntityJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/ActivityJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/ActivityJpa.java
index 39e8050e..d9dd5f79 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/ActivityJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/ActivityJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/CharacteristicForActivityStatus.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/CharacteristicForActivityStatus.java
index 020391a6..f23b3df7 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/CharacteristicForActivityStatus.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/CharacteristicForActivityStatus.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/CharacteristicForMissingMeasurementJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/CharacteristicForMissingMeasurementJpa.java
index 68ff9039..c29de4c0 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/CharacteristicForMissingMeasurementJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/CharacteristicForMissingMeasurementJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/PreselectionConfigurationJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/PreselectionConfigurationJpa.java
index 17149217..58406ee9 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/PreselectionConfigurationJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/PreselectionConfigurationJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/PreselectionJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/PreselectionJpa.java
index 4a0f12f3..7e45801c 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/PreselectionJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/PreselectionJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/UserSettingsJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/UserSettingsJpa.java
index a70794b1..dbd43339 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/UserSettingsJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/process/UserSettingsJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/production/GeneratingUnitJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/production/GeneratingUnitJpa.java
index 03a0c1c3..95a31ff6 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/production/GeneratingUnitJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/production/GeneratingUnitJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/util/Boolean2StringConverter.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/util/Boolean2StringConverter.java
index 2737d337..37340917 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/util/Boolean2StringConverter.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/util/Boolean2StringConverter.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/wires/SynchronousMachineJpa.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/wires/SynchronousMachineJpa.java
index fa50954f..d27d69c7 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/wires/SynchronousMachineJpa.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/dataaccess/eisman/wires/SynchronousMachineJpa.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -191,7 +191,7 @@ public class SynchronousMachineJpa extends EquipmentJpa {
for(final AnalogJpa analogJpa : getAnalogJpaList()) {
- if("GeneratorPower".equals(analogJpa.getMeasurementType())) {
+ if("ThreePhaseActivePower".equals(analogJpa.getMeasurementType())) {
newGeneratorPowerMeasured.setValue(new BigDecimal(analogJpa.getAnalogValueJpaList().get(0).getValue()));
newGeneratorPowerMeasured.setMultiplier(analogJpa.getUnitMultiplierJpa());
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/EismanDataTransfer.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/EismanDataTransfer.java
index 6a426aff..ecc6686e 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/EismanDataTransfer.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/EismanDataTransfer.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/AbstractNetworkStateNode.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/AbstractNetworkStateNode.java
index d864a2bf..5a300930 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/AbstractNetworkStateNode.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/AbstractNetworkStateNode.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/SubGeographicalRegion4Tree.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/SubGeographicalRegion4Tree.java
index e344b035..0cd5d1c1 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/SubGeographicalRegion4Tree.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/SubGeographicalRegion4Tree.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/Substation4Tree.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/Substation4Tree.java
index 4281f53d..3682bc90 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/Substation4Tree.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/datatransfer/eisman/networkstate/Substation4Tree.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/deserializer/Eisman_1_ApplicationXml_Cim17v07_Deserializer.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/deserializer/Eisman_1_ApplicationXml_Cim17v07_Deserializer.java
index 1a3ebe21..158feda6 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/deserializer/Eisman_1_ApplicationXml_Cim17v07_Deserializer.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/deserializer/Eisman_1_ApplicationXml_Cim17v07_Deserializer.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/ConnectedConnectingEquipments_1_ApplicationXml_Importer.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/ConnectedConnectingEquipments_1_ApplicationXml_Importer.java
deleted file mode 100644
index 3510249b..00000000
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/ConnectedConnectingEquipments_1_ApplicationXml_Importer.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * -----------------------------------------------------------------------------
- *
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- *
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * -----------------------------------------------------------------------------
- */
-package org.eclipse.openk.app.eisman.adapter.importer;
-
-import java.io.IOException;
-import java.util.Collection;
-
-import org.eclipse.openk.app.eisman.core.EismanDefaults;
-import org.eclipse.openk.app.eisman.logic.task.parameters.ConnectedConnectingEquipmentsImportParameters;
-import org.eclipse.openk.cim.cim17v07.Cim17v07;
-import org.eclipse.openk.common.dataexchange.CommunicationTechnology;
-import org.eclipse.openk.common.dataexchange.MediaType;
-import org.eclipse.openk.common.dataexchange.cim.ICimEntity;
-import org.eclipse.openk.common.messaging.ILogger;
-import org.eclipse.openk.common.messaging.LoggerFactory;
-import org.eclipse.openk.service.adapter.importer.AbstractImporter;
-import org.eclipse.openk.service.core.IServiceContext;
-import org.eclipse.openk.service.core.adapter.deserializer.DeserializerInformation;
-import org.eclipse.openk.service.core.adapter.importer.ImporterConfiguration;
-import org.eclipse.openk.service.core.adapter.importer.ImporterInformation;
-import org.eclipse.openk.service.core.infrastructure.readerprovider.ReaderProviderInformation;
-import org.eclipse.openk.service.infrastructure.readerprovider.UrlReaderProviderConfiguration;
-
-/**
- * Imports connected connecting-equipments.
- *
- * @author 2018-11-27 Felix Korb
- */
-@DeserializerInformation(scope = EismanDefaults.DOMAIN, inputFormat = MediaType.ApplicationXml, outputModelDefinitionType = Cim17v07.class)
-@ImporterInformation(scope = EismanDefaults.SCOPE_CONNECTED_CONNECTING_EQUIPMENTS, importFormat = MediaType.ApplicationXml, importModelDefinitionType = Cim17v07.class, parametersType = ConnectedConnectingEquipmentsImportParameters.class)
-@ReaderProviderInformation(scope = EismanDefaults.SCOPE_CONNECTED_CONNECTING_EQUIPMENTS, importFormat = MediaType.ApplicationXml, communicationTechnology = CommunicationTechnology.REST, configurationType = UrlReaderProviderConfiguration.class, parametersType = ConnectedConnectingEquipmentsImportParameters.class)
-public final class ConnectedConnectingEquipments_1_ApplicationXml_Importer extends AbstractImporter<ImporterConfiguration, Collection<ICimEntity>, Collection<ICimEntity>, ConnectedConnectingEquipmentsImportParameters> {
-
- // Constants
- private static final ILogger LOGGER = LoggerFactory.createLogger(ConnectedConnectingEquipments_1_ApplicationXml_Importer.class);
-
- // Constructors
- /**
- * @param context
- * the context
- * @throws IllegalArgumentException
- * Is thrown in the following cases:
- * <ul>
- * <li><code>context</code> is <code>null</code></li>
- * </ul>
- */
- public ConnectedConnectingEquipments_1_ApplicationXml_Importer(IServiceContext context) throws IllegalArgumentException {
-
- super(context);
- }
-
- // Methods
- @Override
- protected Object createReadParameters(ConnectedConnectingEquipmentsImportParameters importParameters) throws IllegalArgumentException {
-
- return importParameters;
- }
-
- @Override
- protected Collection<ICimEntity> mapToImportData(Collection<ICimEntity> transferData, ConnectedConnectingEquipmentsImportParameters importParameters) throws IllegalArgumentException, IOException {
-
- return transferData;
- }
-
- // Properties
- @Override
- public ILogger getLogger() {
-
- return LOGGER;
- }
-} \ No newline at end of file
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/EquipmentContainerContent_1_ApplicationXml_Importer.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/EquipmentContainerContent_1_ApplicationXml_Importer.java
index 58db05d1..3770a837 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/EquipmentContainerContent_1_ApplicationXml_Importer.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/EquipmentContainerContent_1_ApplicationXml_Importer.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/SubGeographicalRegions_1_ApplicationXml_Importer.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/SubGeographicalRegions_1_ApplicationXml_Importer.java
index 28abdf0f..e6ea6f01 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/SubGeographicalRegions_1_ApplicationXml_Importer.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/SubGeographicalRegions_1_ApplicationXml_Importer.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -40,11 +40,12 @@ import org.eclipse.openk.service.infrastructure.readerprovider.UrlReaderProvider
*/
@DeserializerInformation(scope = EismanDefaults.DOMAIN, inputFormat = MediaType.ApplicationXml, outputModelDefinitionType = Cim17v07.class)
@ImporterInformation(scope = EismanDefaults.SCOPE_SUB_GEOGRAPHICAL_REGIONS, importFormat = MediaType.ApplicationXml, importModelDefinitionType = Cim17v07.class)
+// @MapperInformation(scope = EismanDefaults.SCOPE_SUB_GEOGRAPHICAL_REGIONS, sourceModelDefinitionType = Cim17v07.class, destinationModelDefinitionType = EismanDataTransfer.class, parametersType = Map.class)
@ReaderProviderInformation(scope = EismanDefaults.SCOPE_SUB_GEOGRAPHICAL_REGIONS, importFormat = MediaType.ApplicationXml, communicationTechnology = CommunicationTechnology.REST, configurationType = UrlReaderProviderConfiguration.class)
public final class SubGeographicalRegions_1_ApplicationXml_Importer extends AbstractImporter<ImporterConfiguration, Collection<SubGeographicalRegion>, Collection<SubGeographicalRegion>, NoParameters> {
// Constants
- private static final ILogger LOGGER = LoggerFactory.createLogger(SubGeographicalRegions_1_ApplicationXml_Importer.class);
+ private static final ILogger LOGGER = LoggerFactory.createLogger(SubGeographicalRegionsForNetworkState_1_ApplicationXml_Importer.class);
// Constructors
/**
@@ -62,6 +63,7 @@ public final class SubGeographicalRegions_1_ApplicationXml_Importer extends Abst
}
// Methods
+ // REMIND 2019-03-08 Renko => @MapperInformation oder direkt ohne mapping zurückgeben?
@Override
protected Collection<SubGeographicalRegion> mapToImportData(Collection<SubGeographicalRegion> transferData, NoParameters importParameters) throws IllegalArgumentException, IOException {
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/TopologicalResources_1_ApplicationXml_Importer.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/TopologicalResources_1_ApplicationXml_Importer.java
deleted file mode 100644
index d7415fc1..00000000
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/TopologicalResources_1_ApplicationXml_Importer.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * -----------------------------------------------------------------------------
- *
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- *
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * -----------------------------------------------------------------------------
- */
-package org.eclipse.openk.app.eisman.adapter.importer;
-
-import java.io.IOException;
-import java.util.Collection;
-
-import org.eclipse.openk.app.eisman.core.EismanDefaults;
-import org.eclipse.openk.app.eisman.logic.task.parameters.TopologicalResourcesImportParameters;
-import org.eclipse.openk.cim.cim17v07.Cim17v07;
-import org.eclipse.openk.common.dataexchange.CommunicationTechnology;
-import org.eclipse.openk.common.dataexchange.MediaType;
-import org.eclipse.openk.common.dataexchange.cim.ICimEntity;
-import org.eclipse.openk.common.messaging.ILogger;
-import org.eclipse.openk.common.messaging.LoggerFactory;
-import org.eclipse.openk.service.adapter.importer.AbstractImporter;
-import org.eclipse.openk.service.core.IServiceContext;
-import org.eclipse.openk.service.core.adapter.deserializer.DeserializerInformation;
-import org.eclipse.openk.service.core.adapter.importer.ImporterConfiguration;
-import org.eclipse.openk.service.core.adapter.importer.ImporterInformation;
-import org.eclipse.openk.service.core.infrastructure.readerprovider.ReaderProviderInformation;
-import org.eclipse.openk.service.infrastructure.readerprovider.UrlReaderProviderConfiguration;
-
-/**
- * Imports topological-resources.
- *
- * @author 2018-11-23 Felix Korb
- */
-@DeserializerInformation(scope = EismanDefaults.DOMAIN, inputFormat = MediaType.ApplicationXml, outputModelDefinitionType = Cim17v07.class)
-@ImporterInformation(scope = EismanDefaults.SCOPE_TOPOLOGICAL_RESOURCES, importFormat = MediaType.ApplicationXml, importModelDefinitionType = Cim17v07.class, parametersType = TopologicalResourcesImportParameters.class)
-@ReaderProviderInformation(scope = EismanDefaults.SCOPE_TOPOLOGICAL_RESOURCES, importFormat = MediaType.ApplicationXml, communicationTechnology = CommunicationTechnology.REST, configurationType = UrlReaderProviderConfiguration.class, parametersType = TopologicalResourcesImportParameters.class)
-public final class TopologicalResources_1_ApplicationXml_Importer extends AbstractImporter<ImporterConfiguration, Collection<ICimEntity>, Collection<ICimEntity>, TopologicalResourcesImportParameters> {
-
- // Constants
- private static final ILogger LOGGER = LoggerFactory.createLogger(TopologicalResources_1_ApplicationXml_Importer.class);
-
- // Constructors
- /**
- * @param context
- * the context
- * @throws IllegalArgumentException
- * Is thrown in the following cases:
- * <ul>
- * <li><code>context</code> is <code>null</code></li>
- * </ul>
- */
- public TopologicalResources_1_ApplicationXml_Importer(IServiceContext context) throws IllegalArgumentException {
-
- super(context);
- }
-
- // Methods
- @Override
- protected Object createReadParameters(TopologicalResourcesImportParameters importParameters) throws IllegalArgumentException {
-
- return importParameters;
- }
-
- @Override
- protected Collection<ICimEntity> mapToImportData(Collection<ICimEntity> transferData, TopologicalResourcesImportParameters importParameters) throws IllegalArgumentException, IOException {
-
- return transferData;
- }
-
- // Properties
- @Override
- public ILogger getLogger() {
-
- return LOGGER;
- }
-} \ No newline at end of file
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/AbstractRestImporter.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/AbstractRestImporter.java
index aa91036d..4d35d936 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/AbstractRestImporter.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/AbstractRestImporter.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SubGeographicalRegionsImporter.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SubGeographicalRegionsImporter.java
index a4ac12da..cb4b40aa 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SubGeographicalRegionsImporter.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SubGeographicalRegionsImporter.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SubstationsImporter.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SubstationsImporter.java
index 59d7130a..ff44fcab 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SubstationsImporter.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SubstationsImporter.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SynchronousMachinesImporter.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SynchronousMachinesImporter.java
index 4a179ecd..fd485b6e 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SynchronousMachinesImporter.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/importer/eisman/SynchronousMachinesImporter.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/EnergySources_1_Cim17v07_EismanDataTransfer_Mapper.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/EnergySources_1_Cim17v07_EismanDataTransfer_Mapper.java
index 69c6810b..8fd92bf4 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/EnergySources_1_Cim17v07_EismanDataTransfer_Mapper.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/EnergySources_1_Cim17v07_EismanDataTransfer_Mapper.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -16,10 +16,16 @@ package org.eclipse.openk.app.eisman.adapter.mapper.eisman;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
import org.eclipse.openk.app.eisman.adapter.datatransfer.eisman.EismanDataTransfer;
+import org.eclipse.openk.app.eisman.cim.core.Terminal;
import org.eclipse.openk.app.eisman.cim.wires.SynchronousMachine;
import org.eclipse.openk.app.eisman.core.EismanDefaults;
+import org.eclipse.openk.app.eisman.service.EismanService;
import org.eclipse.openk.cim.cim17v07.Cim17v07;
import org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.Base.Wires.EnergySource;
import org.eclipse.openk.common.collection.CollectionUtilities;
@@ -34,10 +40,10 @@ import org.eclipse.openk.service.core.adapter.mapper.MapperInformation;
/**
* Maps {@link EnergySource}s to {@link SynchronousMachine}s.
*
- * @author 2018-11-23 Felix Korb
+ * @author 2019-03-04 Christian Brunzendorf
*/
@MapperInformation(scope = EismanDefaults.SCOPE_ENERGY_SOURCES, sourceModelDefinitionType = Cim17v07.class, destinationModelDefinitionType = EismanDataTransfer.class)
-public final class EnergySources_1_Cim17v07_EismanDataTransfer_Mapper extends AbstractMapper<MapperConfiguration, Collection<EnergySource>, Collection<SynchronousMachine>, NoParameters> {
+public final class EnergySources_1_Cim17v07_EismanDataTransfer_Mapper extends AbstractMapper<MapperConfiguration, Collection<EnergySource>, Map<String, SynchronousMachine>, NoParameters> {
// Constants
private static final ILogger LOGGER = LoggerFactory.createLogger(EnergySources_1_Cim17v07_EismanDataTransfer_Mapper.class);
@@ -59,17 +65,17 @@ public final class EnergySources_1_Cim17v07_EismanDataTransfer_Mapper extends Ab
// Methods
@Override
- public Collection<SynchronousMachine> map(Collection<EnergySource> sourceModel, NoParameters mappingParameters) throws IllegalArgumentException, IOException {
+ public Map<String, SynchronousMachine> map(Collection<EnergySource> sourceModel, NoParameters mappingParameters) throws IllegalArgumentException, IOException {
- Collection<SynchronousMachine> result;
+ Map<String, SynchronousMachine> result;
if(!CollectionUtilities.hasContent(sourceModel))
result = null;
else {
- result = new ArrayList<>(sourceModel.size());
+ result = new HashMap<>(sourceModel.size());
for(EnergySource energySource : sourceModel)
- result.add(map(energySource, mappingParameters));
+ result.put(energySource.getMRID(), map(energySource, mappingParameters));
}
return result;
@@ -98,9 +104,34 @@ public final class EnergySources_1_Cim17v07_EismanDataTransfer_Mapper extends Ab
if(source == null)
result = null;
else {
- /* create result */
- result = GeneratedEntityProvider.INSTANCE.toEnergySource(getContext(), source);
+ result = new SynchronousMachine();
+
+ result.setName(source.getName());
+ result.setmRid(source.getMRID());
+ result.setTerminalList(toTerminals(source.getTerminals()));
+ result.setOid(((EismanService) getContext()).getOidMridMapper().toOid(UUID.fromString(source.getMRID())).toString());
+ }
+
+ return result;
+ }
+
+ private List<Terminal> toTerminals(List<org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.Base.Core.Terminal> source) {
+
+ List<Terminal> result;
+
+ if(CollectionUtilities.hasContent(source)) {
+ result = new ArrayList<>(source.size());
+ Terminal terminal;
+
+ for(org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.Base.Core.Terminal sourceTerminal : source) {
+ terminal = new Terminal();
+ terminal.setmRid(sourceTerminal.getMRID());
+ terminal.setName(sourceTerminal.getName());
+ result.add(terminal);
+ }
}
+ else
+ result = null;
return result;
}
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/GeneratedEntityProvider.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/GeneratedEntityProvider.java
deleted file mode 100644
index c5d0b77a..00000000
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/GeneratedEntityProvider.java
+++ /dev/null
@@ -1,481 +0,0 @@
-/*
- * -----------------------------------------------------------------------------
- *
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- *
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * -----------------------------------------------------------------------------
- */
-package org.eclipse.openk.app.eisman.adapter.mapper.eisman;
-
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.TreeMap;
-import java.util.UUID;
-
-import org.eclipse.openk.app.eisman.cim.common.Location;
-import org.eclipse.openk.app.eisman.cim.core.OperatingParticipant;
-import org.eclipse.openk.app.eisman.cim.core.OperatingShare;
-import org.eclipse.openk.app.eisman.cim.domain.AbsoluteDateTime;
-import org.eclipse.openk.app.eisman.cim.domain.ActivePower;
-import org.eclipse.openk.app.eisman.cim.domain.CommunicationType;
-import org.eclipse.openk.app.eisman.cim.domain.PerCent;
-import org.eclipse.openk.app.eisman.cim.domain.ReductionSetting;
-import org.eclipse.openk.app.eisman.cim.domain.UnitMultiplier;
-import org.eclipse.openk.app.eisman.cim.domain.UnitSymbol;
-import org.eclipse.openk.app.eisman.cim.domain.Voltage;
-import org.eclipse.openk.app.eisman.cim.informative.infoperations.PsrEvent;
-import org.eclipse.openk.app.eisman.cim.informative.infoperations.PsrEventKind;
-import org.eclipse.openk.app.eisman.cim.marketoperations.mktdomain.UnitType;
-import org.eclipse.openk.app.eisman.cim.marketoperations.referencedata.RegisteredGenerator;
-import org.eclipse.openk.app.eisman.cim.meas.Analog;
-import org.eclipse.openk.app.eisman.cim.meas.AnalogValue;
-import org.eclipse.openk.app.eisman.cim.meas.Measurement;
-import org.eclipse.openk.app.eisman.cim.meas.MeasurementValueQuality;
-import org.eclipse.openk.app.eisman.cim.production.GeneratingUnit;
-import org.eclipse.openk.app.eisman.cim.production.GeneratorControlSource;
-import org.eclipse.openk.app.eisman.cim.wires.SynchronousMachine;
-import org.eclipse.openk.app.eisman.cim.wires.SynchronousMachineKind;
-import org.eclipse.openk.app.eisman.service.EismanService;
-import org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.Base.Wires.EnergySource;
-import org.eclipse.openk.common.array.ArrayUtilities;
-import org.eclipse.openk.common.collection.CollectionUtilities;
-import org.eclipse.openk.common.system.codestyle.Reason;
-import org.eclipse.openk.common.system.codestyle.SuppressWarningsReason;
-import org.eclipse.openk.common.value.ValueUtilities;
-import org.eclipse.openk.service.core.IServiceContext;
-
-/**
- * Generates and maps <i>CIM Cache v2.2</i> entities to <i>EISMAN</i> entities and vice versa.
- *
- * @author 2018-11-27 Felix Korb
- */
-public final class GeneratedEntityProvider {
-
- // Constants
- public static final GeneratedEntityProvider INSTANCE = new GeneratedEntityProvider();
-
- // Attributes
- private Map<UUID, SynchronousMachine> energySourcesByMrid;
- private Map<Long, SynchronousMachine> energySourcesByOid;
-
- // Constructors
- @SuppressWarnings("checkstyle:javadocmethod")
- @SuppressWarningsReason(reasons = Reason.Checkstyle_ConstructorWithoutParameter)
- private GeneratedEntityProvider() {
-
- /* suppresses the instantiation! */
- }
-
- // Methods
- private List<ReductionSetting> createControlStages(byte[] controlStages) {
-
- List<ReductionSetting> result;
-
- if(!ArrayUtilities.hasContent(controlStages))
- result = Collections.emptyList();
- else {
- ReductionSetting reductionSetting;
-
- result = new ArrayList<>(controlStages.length);
-
- for(byte controlStage : controlStages) {
- reductionSetting = new ReductionSetting();
-
- reductionSetting.setSetting(createPerCent(controlStage));
-
- result.add(reductionSetting);
- }
- }
-
- return result;
- }
-
- private Analog createCurrentActivePower(double minimum, double maximum, Timestamp activePowerTimestamp) {
-
- Analog result = new Analog();
-
- /* set attributes */
- result.setmRid(UUID.randomUUID().toString());
- result.setMeasurementType("GeneratorPower");
- result.setName("Measurement - Aktuelle Wirkleistung");
- result.setUnitMultiplier(UnitMultiplier.MEGA);
- result.setUnitSymbol(UnitSymbol.W);
-
- /* create & add value */
- {
- AnalogValue value = new AnalogValue();
-
- /* set value-attributes */
- value.setmRid(UUID.randomUUID().toString());
- value.setValue(Double.toString(createRandomDouble(minimum, maximum)));
-
- /* create & add quality */
- {
- MeasurementValueQuality quality = new MeasurementValueQuality();
-
- /* set quality-attributes */
- quality.setFailure(Boolean.FALSE.toString());
-
- value.setMeasurementValueQuality(quality);
- }
-
- /* create & add timestamp */
- {
- AbsoluteDateTime timestamp = new AbsoluteDateTime();
-
- /* set timestamp-attributes */
- timestamp.setValue(activePowerTimestamp);
-
- value.setTimeStamp(timestamp);
- }
-
- result.setAnalogValueList(CollectionUtilities.toList(value));
- }
-
- return result;
- }
-
- private Analog createCurrentControlStage(byte[] controlStages, Timestamp controlStageTimestamp) {
-
- Analog result = new Analog();
-
- /* set attributes */
- result.setmRid(UUID.randomUUID().toString());
- result.setMeasurementType("ReductionSetting");
- result.setName("Measurement - Aktuelle Absenkstufe");
-
- /* create & add value */
- {
- AnalogValue value = new AnalogValue();
-
- /* set value-attributes */
- value.setmRid(UUID.randomUUID().toString());
-
- if(ArrayUtilities.hasContent(controlStages))
- value.setValue(Byte.toString(controlStages[ValueUtilities.createRandomInt(0, controlStages.length - 1)]));
-
- /* create & add quality */
- {
- MeasurementValueQuality quality = new MeasurementValueQuality();
-
- /* set quality-attributes */
- quality.setFailure(Boolean.FALSE.toString());
-
- value.setMeasurementValueQuality(quality);
- }
-
- /* create & add timestamp */
- {
- AbsoluteDateTime timestamp = new AbsoluteDateTime();
-
- /* set timestamp-attributes */
- timestamp.setValue(controlStageTimestamp);
-
- value.setTimeStamp(timestamp);
- }
-
- result.setAnalogValueList(CollectionUtilities.toList(value));
- }
-
- return result;
- }
-
- private GeneratingUnit createGeneratingUnit(UUID mrid, long oid) {
-
- GeneratingUnit result = new GeneratingUnit();
-
- /* set attributes */
- result.setGeneratorControlSource(createRandomEnumValue(GeneratorControlSource.class));
- result.setHighControlLimit(createHighControlLimit(0D, 10D));
- result.setMaxOperatingP(createMaxOperatingP(0D, 10D));
- result.setmRid(mrid.toString());
- result.setName(GeneratingUnit.class.getSimpleName());
- result.setNormallyInService(Boolean.TRUE.toString());
- result.setOid(Long.toString(oid));
- result.setRegisteredGenerator(createRegisteredGenerator());
-
- return result;
- }
-
- private ActivePower createHighControlLimit(double minimum, double maximum) {
-
- ActivePower result = new ActivePower();
-
- /* set attributes */
- result.setMultiplier(UnitMultiplier.MEGA);
- result.setUnit(UnitSymbol.W);
- result.setValue(Double.toString(createRandomDouble(minimum, maximum)));
-
- return result;
- }
-
- private PsrEvent createCreatedTimestamp(Timestamp createdTimestamp) {
-
- PsrEvent result = new PsrEvent();
-
- /* set attributes */
- result.setmRid(UUID.randomUUID().toString());
- result.setPsrEventKind(PsrEventKind.IN_SERVICE);
-
- /* create & add created */
- {
- AbsoluteDateTime created = new AbsoluteDateTime();
-
- /* set created-attributes */
- created.setValue(createdTimestamp);
-
- result.setCreatedDateTime(created);
- }
-
- return result;
- }
-
- private ActivePower createMaxOperatingP(double minimum, double maximum) {
-
- ActivePower result = new ActivePower();
-
- /* set attributes */
- result.setMultiplier(UnitMultiplier.MEGA);
- result.setUnit(UnitSymbol.W);
- result.setValue(Double.toString(createRandomDouble(minimum, maximum)));
-
- return result;
- }
-
- private Voltage createMaxU(double minimum, double maximum) {
-
- Voltage result = new Voltage();
-
- /* set attributes */
- result.setMultiplier(UnitMultiplier.KILO);
- result.setValue(Double.toString(createRandomDouble(minimum, maximum)));
-
- return result;
- }
-
- private OperatingShare createOperatingShare(byte value, String operatingParticipant) {
-
- OperatingShare result = new OperatingShare();
-
- /* set attributes */
- result.setPercentage(createPerCent(value));
-
- /* create & add participant */
- {
- OperatingParticipant participant = new OperatingParticipant();
-
- /* set participant-attributes */
- participant.setmRid(UUID.randomUUID().toString());
- participant.setName(operatingParticipant);
-
- result.setOperatingParticipant(participant);
- }
-
- return result;
- }
-
- private PerCent createPerCent(byte value) {
-
- PerCent result = new PerCent();
-
- /* set attributes */
- result.setValue(Byte.toString(value));
-
- return result;
- }
-
- /**
- * Returns a double-value between the specified minimum and maximum, inclusive.
- * <p>
- * <b><i>NOTE:</i></b><br/>
- * It is assumed that
- * <ul>
- * <li><code>maximum</code> is greater or equal than <code>minimum</code></li>
- * </ul>
- * </p>
- *
- * @param minimum
- * the minimum
- * @param maximum
- * the maximum
- * @return double between <code>minimum</code> and <code>maximum</code>, inclusive.
- */
- @Deprecated // FIXME 2018-11-28 Felix Korb: Methode ist bereits in ValueUtilities enthalten <= nach rebuild des common-Projekts bitte austauschen
- @SuppressWarnings("checkstyle:regexpsingleline")
- @SuppressWarningsReason(reasons = Reason.Checkstyle_SystemTimeUsedForRandomizerInitialization)
- private static double createRandomDouble(double minimum, double maximum) {
-
- Random random = new Random(System.nanoTime());
- double result;
-
- result = (Math.max(0D, (maximum - minimum)) * random.nextDouble()) + minimum;
-
- return result;
- }
-
- /**
- * Returns an {@link Enum}-value using the specified {@link Enum}-type.
- *
- * @param <E>
- * the {@link Enum}-type
- * @param enumType
- * the {@link Enum}-type; can be <code>null</code>
- * @return the {@link Enum}-value; <code>null</code> if <code>enumType</code> is <code>null</code>.
- */
- @Deprecated // FIXME 2018-11-28 Felix Korb: Methode ist bereits in ValueUtilities enthalten <= nach rebuild des common-Projekts bitte austauschen
- @SuppressWarnings("checkstyle:regexpsingleline")
- @SuppressWarningsReason(reasons = Reason.Checkstyle_SystemTimeUsedForRandomizerInitialization)
- public static <E extends Enum<E>> E createRandomEnumValue(Class<E> enumType) {
-
- E result;
-
- if(enumType == null)
- result = null;
- else {
- int enumIndex = ValueUtilities.createRandomInt(0, enumType.getEnumConstants().length - 1);
-
- result = enumType.getEnumConstants()[enumIndex];
- }
-
- return result;
- }
-
- private RegisteredGenerator createRegisteredGenerator() {
-
- RegisteredGenerator result = new RegisteredGenerator();
-
- /* set attributes */
- result.setUnitType(createRandomEnumValue(UnitType.class));
-
- return result;
- }
-
- private SynchronousMachine createSynchronousMachine(EnergySource energySource, long oid) {
-
- byte[] controlStages = { 0, 30, 60, 90, 100 };
- Timestamp now = new Timestamp(System.currentTimeMillis());
- SynchronousMachine result = new SynchronousMachine();
-
- /* set attributes */
- result.setName(energySource.getName());
- result.setmRid(energySource.getMRID());
- result.setPsrEventList(CollectionUtilities.toList(createCreatedTimestamp(now)));
- result.setOperatingShareList(CollectionUtilities.toList(createOperatingShare((byte) 100, "Max Mustermann")));
- result.setLocation(new Location());
- result.setOid(Long.toString(oid));
- result.setNormallyInService(Boolean.TRUE.toString());
- result.setControlEnabled(Boolean.TRUE.toString());
- result.setGeneratingUnit(createGeneratingUnit(UUID.randomUUID(), 1L));
- result.setMaxU(createMaxU(0.4D, 20D));
- result.setSynchronousMachineKind(SynchronousMachineKind.GENERATOR);
- result.setFeedInRanking(Integer.toString(ValueUtilities.createRandomInt(1, 16)));
- result.setFeedInPriority(Integer.toString(ValueUtilities.createRandomInt(1, 16)));
- result.setCommunicationType(CommunicationType.FWT);
- result.setReductionSettingList(createControlStages(controlStages));
-
- /* create & add measurements */
- {
- List<Measurement> measurements = new ArrayList<>(2);
-
- measurements.add(createCurrentActivePower(0D, 10D, now));
- measurements.add(createCurrentControlStage(controlStages, now));
-
- result.setMeasurementList(measurements);
- }
-
- return result;
- }
-
- /**
- * Converts the specified <i>CIM Cache v2.2</i> {@link EnergySource} into an <i>EISMAN</i> {@link SynchronousMachine}.
- *
- * @param energySource
- * the {@link EnergySource}; can be <code>null</code>
- * @return the {@link SynchronousMachine}; <code>null</code> if <code>energySource</code> is <code>null</code>
- */
- public synchronized SynchronousMachine toEnergySource(IServiceContext context, EnergySource energySource) {
-
- SynchronousMachine result;
-
- if(energySource == null)
- result = null;
- else {
- UUID mrid = UUID.fromString(energySource.getMRID());
-
- result = getEnergySource(mrid);
-
- if(result == null) {
- Long oid = ((EismanService) context).getOidMridMapper().toOid(mrid);
-
- result = createSynchronousMachine(energySource, oid.longValue());
-
- if(energySourcesByMrid == null) {
- energySourcesByMrid = new TreeMap<>();
- energySourcesByOid = new TreeMap<>();
- }
-
- energySourcesByMrid.put(mrid, result);
- energySourcesByOid.put(oid, result);
- }
- }
-
- return result;
- }
-
- // Properties
- /**
- * Returns the {@link SynchronousMachine} for the specified <i>EISMAN</i> oid.
- *
- * @param oid
- * the oid; can be <code>null</code>
- * @return the {@link SynchronousMachine}; <code>null</code> if there is no {@link SynchronousMachine} for the specified oid or <code>oid</code> is <code>null</code>
- */
- public synchronized SynchronousMachine getEnergySource(Long oid) {
-
- SynchronousMachine result;
-
- if(oid == null)
- result = null;
- else {
- if(energySourcesByOid == null)
- result = null;
- else
- result = energySourcesByOid.get(oid);
- }
-
- return result;
- }
-
- /**
- * Returns the {@link SynchronousMachine} for the specified <i>CIM Cache v2.2</i> MRID.
- *
- * @param mrid
- * the MRID; can be <code>null</code>
- * @return the {@link SynchronousMachine}; <code>null</code> if there is no {@link SynchronousMachine} for the specified MRID or <code>mrid</code> is <code>null</code>
- */
- public synchronized SynchronousMachine getEnergySource(UUID mrid) {
-
- SynchronousMachine result;
-
- if(mrid == null)
- result = null;
- else {
- if(energySourcesByMrid == null)
- result = null;
- else
- result = energySourcesByMrid.get(mrid);
- }
-
- return result;
- }
-}
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/OidToMridMapper.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/OidToMridMapper.java
index 9947dbfd..ce9950b7 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/OidToMridMapper.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/OidToMridMapper.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/SubGeographicalRegions_1_Cim17v07_EismanDataTransfer_Mapper.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/SubGeographicalRegions_1_Cim17v07_EismanDataTransfer_Mapper.java
index 3b6fbdcc..fd3a15e3 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/SubGeographicalRegions_1_Cim17v07_EismanDataTransfer_Mapper.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/SubGeographicalRegions_1_Cim17v07_EismanDataTransfer_Mapper.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -16,34 +16,31 @@ package org.eclipse.openk.app.eisman.adapter.mapper.eisman;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Map;
import java.util.UUID;
import org.eclipse.openk.app.eisman.adapter.datatransfer.eisman.EismanDataTransfer;
import org.eclipse.openk.app.eisman.adapter.datatransfer.eisman.networkstate.SubGeographicalRegion4Tree;
-import org.eclipse.openk.app.eisman.adapter.datatransfer.eisman.networkstate.Substation4Tree;
-import org.eclipse.openk.app.eisman.cim.marketoperations.mktdomain.UnitType;
+import org.eclipse.openk.app.eisman.cim.core.SubGeographicalRegion;
import org.eclipse.openk.app.eisman.core.EismanDefaults;
-import org.eclipse.openk.app.eisman.model.ModelUtilities;
import org.eclipse.openk.app.eisman.service.EismanService;
import org.eclipse.openk.cim.cim17v07.Cim17v07;
-import org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.Base.Core.SubGeographicalRegion;
import org.eclipse.openk.common.collection.CollectionUtilities;
import org.eclipse.openk.common.messaging.ILogger;
import org.eclipse.openk.common.messaging.LoggerFactory;
+import org.eclipse.openk.common.value.parameter.NoParameters;
import org.eclipse.openk.service.adapter.mapper.AbstractMapper;
import org.eclipse.openk.service.core.IServiceContext;
import org.eclipse.openk.service.core.adapter.mapper.MapperConfiguration;
import org.eclipse.openk.service.core.adapter.mapper.MapperInformation;
/**
- * Maps {@link SubGeographicalRegion}s to {@link SubGeographicalRegion4Tree}s.
+ * Maps {@link org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.Base.Core.SubGeographicalRegion}s to {@link SubGeographicalRegion}s.
*
- * @author 2018-11-23 Felix Korb
+ * @author 2019-03-07 Renko Ortgies
*/
@MapperInformation(scope = EismanDefaults.SCOPE_SUB_GEOGRAPHICAL_REGIONS, sourceModelDefinitionType = Cim17v07.class, destinationModelDefinitionType = EismanDataTransfer.class, parametersType = Map.class)
-public final class SubGeographicalRegions_1_Cim17v07_EismanDataTransfer_Mapper extends AbstractMapper<MapperConfiguration, Collection<SubGeographicalRegion>, Collection<SubGeographicalRegion4Tree>, Map<UUID, Collection<Substation4Tree>>> {
+public final class SubGeographicalRegions_1_Cim17v07_EismanDataTransfer_Mapper extends AbstractMapper<MapperConfiguration, Collection<org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.Base.Core.SubGeographicalRegion>, Collection<SubGeographicalRegion>, NoParameters> {
// Constants
private static final ILogger LOGGER = LoggerFactory.createLogger(SubGeographicalRegions_1_Cim17v07_EismanDataTransfer_Mapper.class);
@@ -64,74 +61,18 @@ public final class SubGeographicalRegions_1_Cim17v07_EismanDataTransfer_Mapper e
}
// Methods
- /**
- * Accumulates the measurement-values of the specified substations.
- *
- * @param substations
- * the substations; can be <code>null</code> or empty
- * @param unitTypeToAccumulate
- * the {@link UnitType}, of the substations, which measurement-values should be accumulated; can be <code>null</code>
- * @return the accumulated measurement-values
- */
- private double accumulateMeasurementValues(Collection<Substation4Tree> substations, UnitType unitTypeToAccumulate) {
-
- double result = 0D;
-
- if(CollectionUtilities.hasContent(substations))
- for(Substation4Tree substation : substations)
- result += getMeasurementValue(substation, unitTypeToAccumulate);
-
- return result;
- }
-
- /**
- * Determines the measurement-value of the specified substation.
- *
- * @param substation
- * the substation; can be <code>null</code>
- * @param unitTypeToConsider
- * the {@link UnitType} of the substation, that should be considered; can be <code>null</code>
- * @return the measurement-value
- */
- private double getMeasurementValue(Substation4Tree substation, UnitType unitTypeToConsider) {
-
- double result;
-
- if(substation == null)
- result = 0D;
- else {
- if(unitTypeToConsider == null)
- result = substation.getNoBioPvWind();
- else
- switch(unitTypeToConsider) {
- case BIOG:
- result = substation.getBio();
- break;
- case PHOT:
- result = substation.getPv();
- break;
- case WIND:
- result = substation.getWind();
- break;
- default:
- result = substation.getNoBioPvWind();
- }
- }
-
- return result;
- }
@Override
- public Collection<SubGeographicalRegion4Tree> map(Collection<SubGeographicalRegion> sourceModel, Map<UUID, Collection<Substation4Tree>> mappingParameters) throws IllegalArgumentException, IOException {
+ public Collection<SubGeographicalRegion> map(Collection<org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.Base.Core.SubGeographicalRegion> sourceModel, NoParameters mappingParameters) throws IllegalArgumentException, IOException {
- Collection<SubGeographicalRegion4Tree> result;
+ Collection<SubGeographicalRegion> result;
if(!CollectionUtilities.hasContent(sourceModel))
result = null;
else {
result = new ArrayList<>(sourceModel.size());
- for(SubGeographicalRegion subGeographicalRegion : sourceModel)
+ for(org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.Base.Core.SubGeographicalRegion subGeographicalRegion : sourceModel)
result.add(map(subGeographicalRegion, mappingParameters));
}
@@ -154,15 +95,15 @@ public final class SubGeographicalRegions_1_Cim17v07_EismanDataTransfer_Mapper e
* @throws IOException
* {@link IOException}
*/
- private SubGeographicalRegion4Tree map(SubGeographicalRegion source, Map<UUID, Collection<Substation4Tree>> mappingParameters) throws IllegalArgumentException, IOException {
+ private SubGeographicalRegion map(org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.Base.Core.SubGeographicalRegion source, NoParameters mappingParameters) throws IllegalArgumentException, IOException {
- SubGeographicalRegion4Tree result;
+ SubGeographicalRegion result;
if(source == null)
result = null;
else {
/* create result */
- result = new SubGeographicalRegion4Tree();
+ result = new SubGeographicalRegion();
/* set attributes */
setAttributes(source, result, mappingParameters);
@@ -197,35 +138,16 @@ public final class SubGeographicalRegions_1_Cim17v07_EismanDataTransfer_Mapper e
* @throws IOException
* {@link IOException}
*/
- protected void setAttributes(SubGeographicalRegion source, SubGeographicalRegion4Tree destination, Map<UUID, Collection<Substation4Tree>> mappingParameters) throws IllegalArgumentException, IOException {
+ protected void setAttributes(org.eclipse.openk.cim.cim17v07.TC57CIM.IEC61970.Base.Core.SubGeographicalRegion source, SubGeographicalRegion destination, NoParameters mappingParameters) throws IllegalArgumentException, IOException {
- Collection<Substation4Tree> substations;
+ // Collection<Substation4Tree> substations;
/* set entity attributes */
- destination.setOid(((EismanService) getContext()).getOidMridMapper().toOid(UUID.fromString(source.getMRID())));
+ destination.setOid(((EismanService) getContext()).getOidMridMapper().toOid(UUID.fromString(source.getMRID())).toString());
destination.setName(source.getName());
- /* determine substations */
- {
- UUID sourceId = ModelUtilities.extractIdentifier(source);
-
- if(sourceId == null)
- substations = null;
- else
- substations = mappingParameters.get(sourceId);
- }
+ // destination.setSubstationList(source.getSubstations());
- /* set substations */
- if(substations == null)
- destination.setSubstation4TreeList(Collections.emptyList());
- else
- destination.setSubstation4TreeList(substations);
-
- /* set measurement-values */
- destination.setBio(accumulateMeasurementValues(substations, UnitType.BIOG));
- destination.setNoBioPvWind(accumulateMeasurementValues(substations, null));
- destination.setPv(accumulateMeasurementValues(substations, UnitType.PHOT));
- destination.setWind(accumulateMeasurementValues(substations, UnitType.WIND));
}
// Properties
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/Substations_1_Cim17v07_EismanDataTransfer_Mapper.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/Substations_1_Cim17v07_EismanDataTransfer_Mapper.java
index 0e38e26b..77dcb500 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/Substations_1_Cim17v07_EismanDataTransfer_Mapper.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/adapter/mapper/eisman/Substations_1_Cim17v07_EismanDataTransfer_Mapper.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -129,9 +129,9 @@ public final class Substations_1_Cim17v07_EismanDataTransfer_Mapper extends Abst
result = measurementValue.doubleValue();
else
switch(unitType) {
- case BIOG:
- case PHOT:
- case WIND:
+ case Biogas:
+ case Photovoltaic:
+ case Wind:
result = 0D;
break;
default:
@@ -140,9 +140,9 @@ public final class Substations_1_Cim17v07_EismanDataTransfer_Mapper extends Abst
else {
if(unitType == null)
switch(unitTypeToConsider) {
- case BIOG:
- case PHOT:
- case WIND:
+ case Biogas:
+ case Photovoltaic:
+ case Wind:
result = 0D;
break;
default:
@@ -320,10 +320,11 @@ public final class Substations_1_Cim17v07_EismanDataTransfer_Mapper extends Abst
energySources = mappingParameters.get(sourceId);
}
- destination.setBio(accumulateMeasurementValues(energySources, UnitType.BIOG));
+
+ destination.setBio(accumulateMeasurementValues(energySources, UnitType.Biogas));
destination.setNoBioPvWind(accumulateMeasurementValues(energySources, null));
- destination.setPv(accumulateMeasurementValues(energySources, UnitType.PHOT));
- destination.setWind(accumulateMeasurementValues(energySources, UnitType.WIND));
+ destination.setPv(accumulateMeasurementValues(energySources, UnitType.Photovoltaic));
+ destination.setWind(accumulateMeasurementValues(energySources, UnitType.Wind));
}
}
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/core/EismanDefaults.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/core/EismanDefaults.java
index 23b8d901..7a179cee 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/core/EismanDefaults.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/core/EismanDefaults.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -20,7 +20,8 @@ import org.eclipse.openk.common.system.codestyle.SuppressWarningsReason;
* The <i>EISMAN</i> defaults.
*
* @author 2018-11-27 Felix Korb
- * @author 2018-11-22 Renko Ortgies
+ * @author 2019-02-28 Renko Ortgies
+ * @author 2019-02-28 Christian Brunzendorf
*/
public final class EismanDefaults {
@@ -29,14 +30,38 @@ public final class EismanDefaults {
public static final String DOMAIN = "eisman";
/* scopes */
+ public static final String SCOPE_AC_LINE_SEGMENTS = "ac-line-segments";
+ public static final String SCOPE_ASSET_OWNERSHIPS = "asset-ownerships";
+ public static final String SCOPE_BASE_VOLTAGES = "base-voltages";
+ public static final String SCOPE_BUSBAR_SECTION = "busbar-sections";
+ public static final String SCOPE_COMMUNICATION_STATES = "communication-states";
public static final String SCOPE_CONNECTED_CONNECTING_EQUIPMENTS = "connected-connecting-equipments";
- public static final String SCOPE_ENERGY_SOURCES = "energy-sources";
+ public static final String SCOPE_CONTROL_STAGES = "control-stages";
+ public static final String SCOPE_ENERGY_SOURCES = "energy-sources"; // REMIND 2019-03-05 Renko => SCOPE_ENERGY_SOURCES_STATIC_TOPOLOGY ???
+ public static final String SCOPE_ENERGY_SOURCES_ASSET_DATA = "energy-source-asset-data";
+ public static final String SCOPE_ENERGY_SOURCE_LOCATIONS = "energy-source-locations";
+ public static final String SCOPE_ENERGY_SOURCES_TOPOLOGY_STATE = "energy-sources-topology-state";
public static final String SCOPE_EQUIPMENT_CONTAINER_CONTENT = "equipment-container-content";
+ public static final String SCOPE_IMPORT_SUB_GEOGRAPHICAL_REGIONS = "import-sub-geographical-regions";
+ public static final String SCOPE_IMPORT_SUB_GEOGRAPHICAL_REGIONS_LOV = "import-sub-geographical-regions-lov";
public static final String SCOPE_IMPORT_SUB_GEOGRAPHICAL_REGIONS_FOR_NETWORK_STATE = "import-sub-geographical-regions-for-network-state";
public static final String SCOPE_IMPORT_SUBSTATION_FOR_NETWORK_STATE = "import-substation-for-network-state";
+ public static final String SCOPE_IMPORT_SYNCHRONOUS_MACHINES = "import-synchronous-machines";
+ public static final String SCOPE_MEASUREMENT_VALUES = "measurement-values";
+ public static final String SCOPE_OPERATING_STATES = "operating-states";
+ public static final String SCOPE_ORGANISATIONS = "organisations";
+ public static final String SCOPE_POWER_TRANSFORMERS = "power-transformers";
public static final String SCOPE_SUB_GEOGRAPHICAL_REGIONS = "sub-geographical-regions";
+ public static final String SCOPE_SUB_GEOGRAPHICAL_REGIONS_FOR_NETWORK_STATE = "sub-geographical-regions-for-network-state";
+ public static final String SCOPE_SUBSTATION = "substation";
public static final String SCOPE_SUBSTATIONS = "substations";
+ public static final String SCOPE_SWITCHES = "switches";
+ public static final String SCOPE_SYNCHRONOUS_MACHINES_ASSET_DATA = "synchronous-machines-asset-data";
+ public static final String SCOPE_SYNCHRONOUS_MACHINES_STATIC_TOPOLOGY = "synchronous-machines-static-topology";
+ public static final String SCOPE_SYNCHRONOUS_MACHINES_TOPOLOGY_STATE = "synchronous-machines-topology-state";
+ public static final String SCOPE_SYNCHRONOUS_MACHINES_MEASUREMENT = "synchronous-machines-measurement";
public static final String SCOPE_TOPOLOGICAL_RESOURCES = "topological-resources";
+ public static final String SCOPE_VOLTAGE_LEVELS = "ac-line-segments";
// Constructors
@SuppressWarnings("checkstyle:javadocmethod")
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/EISMAN.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/EISMAN.java
index 87be9f10..cc77c61a 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/EISMAN.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/EISMAN.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/AbstractRestController.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/AbstractRestController.java
index 3ddcf609..a6dab756 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/AbstractRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/AbstractRestController.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ActivityRestController.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ActivityRestController.java
index 4e3031c6..6e08154f 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ActivityRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ActivityRestController.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -349,6 +349,7 @@ public class ActivityRestController extends AbstractRestController {
activityJpa.getPreselectionConfigurationJpa();
final ActionSettingsDto actionSettingsDto = activityJpaMappingService.actionSettingsDtoFromActivityJpa(activityJpa);
+ actionSettingsDto.setParentActivityJpaId(Long.valueOf(id));
// actionSettingsDto.setId((Long) null);
return actionSettingsDto;
@@ -399,7 +400,7 @@ public class ActivityRestController extends AbstractRestController {
newActivityJpa.setCreatedBy(this.getUserScreenName());
newActivityJpa.setDateCreated(this.now());
- newActivityJpa.getActivePowerJpaToBeReduced().setMultiplier(UnitMultiplierJpa.MEGA);
+ newActivityJpa.getActivePowerJpaToBeReduced().setMultiplier(UnitMultiplierJpa.M);
newActivityJpa.getActivePowerJpaToBeReduced().setUnit(UnitSymbolJpa.W);
newActivityJpa.getActivePowerJpaToBeReduced().setValue(actionSettingsDto.getReductionValue());
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/DisplayDtoRestController.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/DisplayDtoRestController.java
index 8f25a3e1..c9dd5cb8 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/DisplayDtoRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/DisplayDtoRestController.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/HysteresisController.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/HysteresisController.java
index 686c6937..92bb2194 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/HysteresisController.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/HysteresisController.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/PreselectionRestController.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/PreselectionRestController.java
index b49da470..e265b907 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/PreselectionRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/PreselectionRestController.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ReasonOfReductionRestController.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ReasonOfReductionRestController.java
index 448eacb8..38367f90 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ReasonOfReductionRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ReasonOfReductionRestController.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ReductionSettingListRestController.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ReductionSettingListRestController.java
index ef5f4498..7e43c1bf 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ReductionSettingListRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/ReductionSettingListRestController.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/SubGeographicalRegionRestController.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/SubGeographicalRegionRestController.java
index 363dcd9e..93e5b3ed 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/SubGeographicalRegionRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/SubGeographicalRegionRestController.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/SubstationRestController.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/SubstationRestController.java
index 1369b71d..7129f93a 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/SubstationRestController.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/SubstationRestController.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/TimerRestContoller.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/TimerRestContoller.java
index d9756488..9e24c28d 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/TimerRestContoller.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/TimerRestContoller.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/exceptionhandler/RestResponseEntityExceptionHandler.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/exceptionhandler/RestResponseEntityExceptionHandler.java
index 52d287fa..8f55aadc 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/exceptionhandler/RestResponseEntityExceptionHandler.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/exceptionhandler/RestResponseEntityExceptionHandler.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/util/IncludeAttribute4Json.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/util/IncludeAttribute4Json.java
index 596ecdae..7109411a 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/util/IncludeAttribute4Json.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/util/IncludeAttribute4Json.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/util/SubstationToolkit.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/util/SubstationToolkit.java
index 1c4b90ed..70d0c7ff 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/util/SubstationToolkit.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/adapter/rest/controller/util/SubstationToolkit.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -83,13 +83,13 @@ public final class SubstationToolkit {
final Float tempMaxOperatingPower = getMaxOperatingPower(synchronousMachine);
switch(synchronousMachine.getGeneratingUnitJpa().getRegisteredGeneratorJpa().getUnitTypeJpa()) {
- case BIOG:
+ case Biogas:
tempResult = Float.valueOf((preselectionConfiguration.getSubstituteValueBiogasEfr().floatValue() / 100) * tempMaxOperatingPower.floatValue());
break;
- case PHOT:
+ case Photovoltaic:
tempResult = Float.valueOf((preselectionConfiguration.getSubstituteValuePhotovoltaicEfr().floatValue() / 100) * tempMaxOperatingPower.floatValue());
break;
- case WIND:
+ case Wind:
tempResult = Float.valueOf((preselectionConfiguration.getSubstituteValueWindEfr().floatValue() / 100) * tempMaxOperatingPower.floatValue());
break;
default:
@@ -143,13 +143,13 @@ public final class SubstationToolkit {
final Float tempMaxOperatingPower = getMaxOperatingPower(synchronousMachine);
switch(synchronousMachine.getGeneratingUnitJpa().getRegisteredGeneratorJpa().getUnitTypeJpa()) {
- case BIOG:
+ case Biogas:
tempResult = Float.valueOf((preselectionConfiguration.getSubstituteValueBiogasFwt().floatValue() / 100) * tempMaxOperatingPower.floatValue());
break;
- case PHOT:
+ case Photovoltaic:
tempResult = Float.valueOf((preselectionConfiguration.getSubstituteValuePhotovoltaicFwt().floatValue() / 100) * tempMaxOperatingPower.floatValue());
break;
- case WIND:
+ case Wind:
tempResult = Float.valueOf((preselectionConfiguration.getSubstituteValueWindFwt().floatValue() / 100) * tempMaxOperatingPower.floatValue());
break;
default:
@@ -191,12 +191,12 @@ public final class SubstationToolkit {
LOG.info("SynchronousMachine to be corrected: '" + synchronousMachine.getName() + "'");
Float tempCorrectedGeneratorPower;
-
+ // REMIND 2019-03-06 Christian Brunzendorf: mit ezra klären, was Efr bzw Fwt bedeutet
switch(synchronousMachine.getCommunicationTypeJpa()) {
- case EFR:
+ case RadioTeleswitch:
tempCorrectedGeneratorPower = calculateCorrectedEfrGeneratorPower(synchronousMachine, preselectionConfiguration);
break;
- case FWT:
+ case RemoteTerminalUnit:
tempCorrectedGeneratorPower = calculateCorrectedFwtGeneratorPower(synchronousMachine, preselectionConfiguration);
break;
default:
@@ -434,10 +434,10 @@ public final class SubstationToolkit {
}
else {
switch(unitMultiplier) {
- case KILO:
+ case k:
tempResult = Float.valueOf(value.floatValue() / UNIT_MULTIPLIER_KILO);
break;
- case MEGA:
+ case M:
tempResult = Float.valueOf(value.floatValue() / UNIT_MULTIPLIER_MEGA);
break;
default:
@@ -482,10 +482,10 @@ public final class SubstationToolkit {
}
else {
switch(unitMultiplier) {
- case KILO:
+ case k:
tempResult = Float.valueOf(value.floatValue() * UNIT_MULTIPLIER_KILO);
break;
- case MEGA:
+ case M:
tempResult = Float.valueOf(value.floatValue() * UNIT_MULTIPLIER_MEGA);
break;
default:
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/controller/BaseController.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/controller/BaseController.java
index 17bea33e..29f35d4e 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/controller/BaseController.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/controller/BaseController.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ActionOverviewDto.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ActionOverviewDto.java
index 5fa8a9f7..34b083c9 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ActionOverviewDto.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ActionOverviewDto.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ActionSettingsDto.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ActionSettingsDto.java
index 5a12c79f..4058e0aa 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ActionSettingsDto.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ActionSettingsDto.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/OverviewDto.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/OverviewDto.java
index 350954a8..830e6801 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/OverviewDto.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/OverviewDto.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/PointOfInjectionType.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/PointOfInjectionType.java
index 20df4067..8d0498a1 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/PointOfInjectionType.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/PointOfInjectionType.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/PreselectionConfigurationDto.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/PreselectionConfigurationDto.java
index 0d367956..b95c57a0 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/PreselectionConfigurationDto.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/PreselectionConfigurationDto.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ProcessOverviewDto.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ProcessOverviewDto.java
index 2e70e0af..229b334a 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ProcessOverviewDto.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/ProcessOverviewDto.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/SynchronousMachineOverviewDto.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/SynchronousMachineOverviewDto.java
index 549d5d36..256424fd 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/SynchronousMachineOverviewDto.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/dto/core/SynchronousMachineOverviewDto.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/util/mapper/BigDecimalDeserializer.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/util/mapper/BigDecimalDeserializer.java
index a258b2c8..416bc9d5 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/util/mapper/BigDecimalDeserializer.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/model/util/mapper/BigDecimalDeserializer.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/ActivityJpaRepository.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/ActivityJpaRepository.java
index 14b70643..d7009182 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/ActivityJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/ActivityJpaRepository.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/PreselectionJpaRepository.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/PreselectionJpaRepository.java
index 76c41845..00e92eb2 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/PreselectionJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/PreselectionJpaRepository.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SubGeographicalRegionJpaRepository.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SubGeographicalRegionJpaRepository.java
index fc5d8676..31ef3e2b 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SubGeographicalRegionJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SubGeographicalRegionJpaRepository.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SubstationJpaRepository.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SubstationJpaRepository.java
index be4977be..51836bd1 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SubstationJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SubstationJpaRepository.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SynchronousMachineJpaRepository.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SynchronousMachineJpaRepository.java
index 917d9213..2b1d06e3 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SynchronousMachineJpaRepository.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/repository/SynchronousMachineJpaRepository.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractReductionAdviceCalculatorService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractReductionAdviceCalculatorService.java
index 0b87f7ad..d52e2a60 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractReductionAdviceCalculatorService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractReductionAdviceCalculatorService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -177,7 +177,7 @@ public abstract class AbstractReductionAdviceCalculatorService {
final ActivePowerJpa activePowerJpa = new ActivePowerJpa();
activePowerJpa.setValue(value.divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP));
- activePowerJpa.setMultiplier(UnitMultiplierJpa.MEGA);
+ activePowerJpa.setMultiplier(UnitMultiplierJpa.M);
activePowerJpa.setUnit(UnitSymbolJpa.W);
return activePowerJpa;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractReductionAdviceService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractReductionAdviceService.java
index ed63f7cf..a8db33d2 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractReductionAdviceService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractReductionAdviceService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -104,7 +104,7 @@ public abstract class AbstractReductionAdviceService extends AbstractService {
*/
protected void getSynchronousMachineListForActivity(final ActivityJpa activityJpa) {
- if(activityJpa.getUserSettingsJpa().getGeographicalRegion() != null && activityJpa.getUserSettingsJpa().getGeographicalRegion()) {
+ if(activityJpa.getUserSettingsJpa().getGeographicalRegion() != null && activityJpa.getUserSettingsJpa().getGeographicalRegion().booleanValue()) {
// todo: service mit Zeitstempel/timestamp aufrufen, wenn ich keinen habe dann null als timestamp
activityJpa.setSubGeographicalRegionJpaList(subGeographicalRegionRestConsumerService.getSubGeographicalRegionJpaList());
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractService.java
index 7bc43fb1..75127ecf 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AbstractService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivePowerJpaService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivePowerJpaService.java
index 357ae691..423b1abe 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivePowerJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivePowerJpaService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -34,11 +34,11 @@ public abstract class ActivePowerJpaService {
switch(unitMultiplierJpa) {
- case MEGA:
+ case M:
multiplier = BigDecimal.valueOf(1000000);
break;
- case KILO:
+ case k:
multiplier = BigDecimal.valueOf(1000);
break;
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaFindService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaFindService.java
index 42f7ce7f..b78e50bd 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaFindService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaFindService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaMappingService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaMappingService.java
index 420441bb..d31e2168 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaMappingService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaMappingService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaService.java
index 08a505f8..177d4b90 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/ActivityJpaService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AnalogJpaService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AnalogJpaService.java
index d4f2a86d..eb7df9df 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AnalogJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AnalogJpaService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AnalogValueJpaService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AnalogValueJpaService.java
index 9244f2d5..68ff73ea 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AnalogValueJpaService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/AnalogValueJpaService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -41,19 +41,19 @@ public class AnalogValueJpaService extends AbstractService {
final UnitTypeJpa unitType = synchronousMachineJpa.getGeneratingUnitJpa().getRegisteredGeneratorJpa().getUnitTypeJpa();
- final boolean efr = synchronousMachineJpa.getCommunicationTypeJpa().equals(CommunicationTypeJpa.EFR);
+ final boolean efr = synchronousMachineJpa.getCommunicationTypeJpa().equals(CommunicationTypeJpa.RadioTeleswitch);
float multiplierSubstituteValue;
switch(unitType) {
- case PHOT:
+ case Photovoltaic:
multiplierSubstituteValue = efr ? (float) activityJpa.getPreselectionConfigurationJpa().getSubstituteValuePhotovoltaicEfr() : (float) activityJpa.getPreselectionConfigurationJpa().getSubstituteValuePhotovoltaicFwt();
break;
- case WIND:
+ case Wind:
multiplierSubstituteValue = efr ? (float) activityJpa.getPreselectionConfigurationJpa().getSubstituteValueWindEfr() : (float) activityJpa.getPreselectionConfigurationJpa().getSubstituteValueWindFwt();
break;
- case BIOG:
+ case Biogas:
multiplierSubstituteValue = efr ? (float) activityJpa.getPreselectionConfigurationJpa().getSubstituteValueBiogasEfr() : (float) activityJpa.getPreselectionConfigurationJpa().getSubstituteValueBiogasFwt();
break;
@@ -75,7 +75,7 @@ public class AnalogValueJpaService extends AbstractService {
for(final AnalogJpa analogJpa : synchronousMachineJpa.getAnalogJpaList()) {
- if("GeneratorPower".equals(analogJpa.getMeasurementType())) {
+ if("ThreePhaseActivePower".equals(analogJpa.getMeasurementType())) {
generatorPowerAnalogJpa = analogJpa;
}
@@ -83,14 +83,16 @@ public class AnalogValueJpaService extends AbstractService {
BigDecimal multiplier = BigDecimal.ONE;
- if(generatorPowerAnalogJpa.getUnitMultiplierJpa().equals(UnitMultiplierJpa.KILO)) {
+ if(generatorPowerAnalogJpa.getUnitMultiplierJpa() != null) {
- multiplier = new BigDecimal("1000");
+ if(generatorPowerAnalogJpa.getUnitMultiplierJpa().equals(UnitMultiplierJpa.k)) {
- }
- else if(generatorPowerAnalogJpa.getUnitMultiplierJpa().equals(UnitMultiplierJpa.MEGA)) {
+ multiplier = new BigDecimal("1000");
+ }
+ else if(generatorPowerAnalogJpa.getUnitMultiplierJpa().equals(UnitMultiplierJpa.M)) {
- multiplier = new BigDecimal("1000000");
+ multiplier = new BigDecimal("1000000");
+ }
}
final BigDecimal generatorPowerAnalogJpaValue = new BigDecimal(generatorPowerAnalogJpa.getAnalogValueJpaList().get(0).getValue(), new MathContext(6, RoundingMode.HALF_EVEN));
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/BaseMapperService.java b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/BaseMapperService.java
index 7f3205f1..32378ce9 100644
--- a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/BaseMapperService.java
+++ b/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/deprecated/service/BaseMapperService.java
@@ -1,7 +1,7 @@
/*
* -----------------------------------------------------------------------------
*
- * Copyright © 2015-2018 BTC AG - http://www.btc-ag.com
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git a/dev/org.eclipse.openk.app.eisman/eisman/src/main/java/org/eclipse/openk/app/eisman/