From f886572455778e244be524bbc75d22eb645e7aa2 Mon Sep 17 00:00:00 2001 From: Jose Date: Thu, 17 Oct 2024 10:10:47 +0200 Subject: [PATCH] HEAD:(zeroc-ice/ice@8e3d0b07ec) Bring DataStorm into Ice 3.8 (zeroc-ice/ice#2902) --- slice2cpp/cpp/src/DataStorm/Contract.cpp | 1528 +++++++ slice2cpp/cpp/src/DataStorm/Contract.h | 1391 ++++++ slice2cpp/cpp/test/DataStorm/api/Test.cpp | 77 + slice2cpp/cpp/test/DataStorm/api/Test.h | 138 + slice2cpp/cpp/test/DataStorm/events/Test.cpp | 114 + slice2cpp/cpp/test/DataStorm/events/Test.h | 194 + slice2cpp/cpp/test/DataStorm/partial/Test.cpp | 37 + slice2cpp/cpp/test/DataStorm/partial/Test.h | 87 + slice2cpp/cpp/test/DataStorm/types/Test.cpp | 114 + slice2cpp/cpp/test/DataStorm/types/Test.h | 194 + slice2cpp/slice/DataStorm/Sample.cpp | 37 + slice2cpp/slice/DataStorm/Sample.h | 83 + slice2cs/cpp/src/DataStorm/Contract.cs | 3719 +++++++++++++++++ slice2cs/cpp/test/DataStorm/api/Test.cs | 94 + slice2cs/cpp/test/DataStorm/events/Test.cs | 150 + slice2cs/cpp/test/DataStorm/partial/Test.cs | 68 + slice2cs/cpp/test/DataStorm/types/Test.cs | 150 + slice2cs/cpp/test/Ice/operations/TestAMD.cs | 48 +- .../csharp/test/Ice/exceptions/TestAMD.cs | 4 +- slice2cs/csharp/test/Ice/facets/Test.cs | 4 +- slice2cs/csharp/test/Ice/operations/Test.cs | 124 +- slice2cs/csharp/test/Ice/proxy/Test.cs | 4 +- .../src/main/java/test/Ice/location/Test.cs | 4 +- .../src/main/java/test/Ice/operations/Test.cs | 88 +- .../main/java/test/Ice/operations/TestAMD.cs | 96 +- slice2cs/js/test/Ice/operations/Test.cs | 240 +- slice2cs/matlab/test/Ice/operations/Test.cs | 136 +- slice2cs/php/test/Ice/exceptions/Test.cs | 4 +- slice2cs/php/test/Ice/operations/Test.cs | 192 +- slice2cs/python/test/Ice/operations/Test.cs | 176 +- slice2cs/ruby/test/Ice/operations/Test.cs | 112 +- slice2cs/slice/DataStorm/Sample.cs | 110 + slice2cs/swift/test/Ice/operations/Test.cs | 204 +- .../DataStormContract/ClearHistoryPolicy.java | 116 + .../DataStormContract/DataSample.java | 228 + .../DataSampleSeqHelper.java | 83 + .../DataStormContract/DataSamples.java | 159 + .../DataSamplesSeqHelper.java | 83 + .../DataStormContract/ElementConfig.java | 501 +++ .../DataStormContract/ElementData.java | 178 + .../DataStormContract/ElementDataAck.java | 204 + .../ElementDataAckSeqHelper.java | 83 + .../ElementDataSeqHelper.java | 83 + .../DataStormContract/ElementInfo.java | 176 + .../ElementInfoSeqHelper.java | 83 + .../DataStormContract/ElementSpec.java | 219 + .../DataStormContract/ElementSpecAck.java | 219 + .../ElementSpecAckSeqHelper.java | 83 + .../ElementSpecSeqHelper.java | 83 + .../DataStormContract/FilterInfo.java | 157 + .../DataStormContract/LongLongDictHelper.java | 88 + .../DataStorm/DataStormContract/Lookup.java | 133 + .../DataStormContract/LookupPrx.java | 332 ++ .../src/DataStorm/DataStormContract/Node.java | 111 + .../DataStorm/DataStormContract/NodePrx.java | 290 ++ .../DataStormContract/PublisherSession.java | 69 + .../PublisherSessionPrx.java | 176 + .../DataStorm/DataStormContract/Session.java | 251 ++ .../DataStormContract/SessionPrx.java | 591 +++ .../DataStormContract/SubscriberSession.java | 89 + .../SubscriberSessionPrx.java | 216 + .../DataStormContract/TopicInfo.java | 163 + .../DataStormContract/TopicInfoSeqHelper.java | 83 + .../DataStormContract/TopicSpec.java | 189 + .../DataStormContract/_LookupPrxI.java | 32 + .../DataStormContract/_NodePrxI.java | 32 + .../_PublisherSessionPrxI.java | 32 + .../DataStormContract/_SessionPrxI.java | 32 + .../_SubscriberSessionPrxI.java | 32 + .../com/zeroc/IceCompactId/TypeId_1.java | 22 + .../IceGrid/AdapterExistsException.java | 2 +- .../IceGrid/AdapterNotActiveException.java | 2 +- .../IceGrid/InternalAdapterDescriptor.java | 2 +- .../IceGrid/InternalDbEnvDescriptor.java | 2 +- .../src/IceGrid/IceGrid/InternalNodeInfo.java | 2 +- .../IceGrid/IceGrid/InternalReplicaInfo.java | 2 +- .../IceGrid/InternalServerDescriptor.java | 2 +- .../cpp/src/IceStorm/IceStorm/AllData.java | 2 +- .../cpp/src/IceStorm/IceStorm/EventData.java | 2 +- .../cpp/src/IceStorm/IceStorm/LinkRecord.java | 2 +- .../IceStorm/IceStorm/SubscriberRecord.java | 2 +- .../IceStorm/SubscriberRecordKey.java | 2 +- .../IceStorm/IceStormElection/GroupInfo.java | 2 +- .../IceStorm/IceStormElection/LogUpdate.java | 2 +- .../IceStorm/IceStormElection/NodeInfo.java | 2 +- .../ObserverInconsistencyException.java | 2 +- .../IceStorm/IceStormElection/QueryInfo.java | 2 +- .../IceStormElection/TopicContent.java | 2 +- .../cpp/src/icegriddb/IceGrid/AllData.java | 2 +- .../cpp/test/DataStorm/api/Test/ClassKey.java | 67 + .../test/DataStorm/api/Test/StructKey.java | 142 + .../cpp/test/DataStorm/events/Test/Base.java | 68 + .../test/DataStorm/events/Test/Extended.java | 71 + .../DataStorm/events/Test/StructValue.java | 171 + .../test/DataStorm/partial/Test/Stock.java | 162 + .../cpp/test/DataStorm/types/Test/Base.java | 68 + .../test/DataStorm/types/Test/Extended.java | 71 + .../DataStorm/types/Test/StructValue.java | 171 + .../dynamicFiltering/Test/TestToken.java | 2 +- .../router/Test/CallbackException.java | 2 +- .../test/Ice/custom/Test/BufferStruct.java | 2 +- .../cpp/test/Ice/custom/Test/DictClass.java | 2 +- .../cpp/test/Ice/custom/Test/Fixed.java | 2 +- .../cpp/test/Ice/custom/Test/Variable.java | 2 +- .../Ice/custom/Test1/WstringException.java | 2 +- .../test/Ice/custom/Test1/WstringStruct.java | 2 +- .../Ice/custom/Test2/WstringException.java | 2 +- .../test/Ice/custom/Test2/WstringStruct.java | 2 +- .../cpp/test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct3.java | 2 +- .../cpp/test/Ice/exceptions/Test/A.java | 2 +- .../cpp/test/Ice/exceptions/Test/B.java | 2 +- .../cpp/test/Ice/exceptions/Test/C.java | 2 +- .../cpp/test/Ice/exceptions/Test/D.java | 2 +- .../cpp/test/Ice/exceptions/Test/E.java | 2 +- .../cpp/test/Ice/exceptions/Test/F.java | 2 +- .../cpp/test/Ice/exceptions/Test/Mod/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MC/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MC/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/MC/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/MC/D.java | 2 +- .../cpp/test/Ice/inheritance/Test/MD/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MD/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/MD/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/MD/D.java | 2 +- .../cpp/test/Ice/inheritance/Test/ME/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/ME/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/ME/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/ME/D.java | 2 +- .../cpp/test/Ice/inheritance/Test/MF/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MF/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/MF/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/MF/D.java | 2 +- .../cpp/test/Ice/inheritance/Test/MG/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MG/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/MG/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/MG/D.java | 2 +- .../cpp/test/Ice/inheritance/Test/MH/A.java | 2 +- .../cpp/test/Ice/inheritance/Test/MH/B.java | 2 +- .../cpp/test/Ice/inheritance/Test/MH/C.java | 2 +- .../cpp/test/Ice/inheritance/Test/MH/D.java | 2 +- .../cpp/test/Ice/library/Test/UserError.java | 2 +- slice2java/cpp/test/Ice/objects/Test/A.java | 2 +- slice2java/cpp/test/Ice/objects/Test/A1.java | 2 +- slice2java/cpp/test/Ice/objects/Test/B.java | 2 +- slice2java/cpp/test/Ice/objects/Test/B1.java | 2 +- .../cpp/test/Ice/objects/Test/Base.java | 2 +- .../cpp/test/Ice/objects/Test/BaseEx.java | 2 +- slice2java/cpp/test/Ice/objects/Test/C.java | 2 +- .../cpp/test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/cpp/test/Ice/objects/Test/D.java | 2 +- slice2java/cpp/test/Ice/objects/Test/D1.java | 2 +- .../cpp/test/Ice/objects/Test/Derived.java | 2 +- slice2java/cpp/test/Ice/objects/Test/E.java | 2 +- .../cpp/test/Ice/objects/Test/EBase.java | 2 +- .../cpp/test/Ice/objects/Test/EDerived.java | 2 +- .../cpp/test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/cpp/test/Ice/objects/Test/F.java | 2 +- slice2java/cpp/test/Ice/objects/Test/F1.java | 2 +- slice2java/cpp/test/Ice/objects/Test/F3.java | 2 +- .../cpp/test/Ice/objects/Test/Inner/A.java | 2 +- .../cpp/test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- slice2java/cpp/test/Ice/objects/Test/K.java | 2 +- slice2java/cpp/test/Ice/objects/Test/L.java | 2 +- slice2java/cpp/test/Ice/objects/Test/M.java | 2 +- .../cpp/test/Ice/objects/Test/Recursive.java | 2 +- slice2java/cpp/test/Ice/objects/Test/S.java | 2 +- .../cpp/test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../cpp/test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- slice2java/cpp/test/Ice/optional/Test/A.java | 2 +- slice2java/cpp/test/Ice/optional/Test/B.java | 2 +- slice2java/cpp/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- slice2java/cpp/test/Ice/optional/Test/E.java | 2 +- slice2java/cpp/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- slice2java/cpp/test/Ice/optional/Test/G.java | 2 +- slice2java/cpp/test/Ice/optional/Test/G1.java | 2 +- slice2java/cpp/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../cpp/test/Ice/optional/Test/VarStruct.java | 2 +- slice2java/cpp/test/Ice/optional/Test/WD.java | 2 +- slice2java/cpp/test/Ice/scope/Test/C.java | 2 +- slice2java/cpp/test/Ice/scope/Test/C1.java | 2 +- slice2java/cpp/test/Ice/scope/Test/C2.java | 2 +- .../cpp/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../cpp/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/cpp/test/Ice/scope/Test/S.java | 2 +- slice2java/cpp/test/Ice/scope/Test/S1.java | 2 +- slice2java/cpp/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/UnknownDerived.java | 2 +- .../exceptions/Test/UnknownIntermediate.java | 2 +- .../exceptions/Test/UnknownMostDerived1.java | 2 +- .../exceptions/Test/UnknownMostDerived2.java | 2 +- .../cpp/test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../cpp/test/Ice/slicing/objects/Test/D1.java | 2 +- .../cpp/test/Ice/slicing/objects/Test/D2.java | 2 +- .../cpp/test/Ice/slicing/objects/Test/D3.java | 2 +- .../cpp/test/Ice/slicing/objects/Test/D4.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../Ice/slicing/objects/Test/MyClass.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown2.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../objects/Test/SBSUnknownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../Ice/slicing/objects/Test/SUnknown.java | 2 +- .../objects/Test/UnknownDerivedException.java | 2 +- .../cpp/test/Ice/stream/Test/ClassStruct.java | 2 +- .../cpp/test/Ice/stream/Test/LargeStruct.java | 2 +- .../cpp/test/Ice/stream/Test/MyClass.java | 2 +- .../cpp/test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../Ice/stream/Test/Sub/NestedException.java | 2 +- .../Ice/stream/Test/Sub/NestedStruct.java | 2 +- .../stream/Test2/Sub2/NestedException2.java | 2 +- .../Ice/stream/Test2/Sub2/NestedStruct2.java | 2 +- .../router/Test/CallbackException.java | 2 +- .../test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/ClassProperty.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../defaultValue/Test/ExceptionProperty.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../Ice/defaultValue/Test/InnerStruct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct3.java | 2 +- .../test/Ice/defaultValue/Test/Struct4.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../Ice/defaultValue/Test/StructProperty.java | 2 +- .../test/Ice/dictMapping/Test/TEstNv.java | 2 +- .../csharp/test/Ice/exceptions/Test/A.java | 2 +- .../csharp/test/Ice/exceptions/Test/B.java | 2 +- .../csharp/test/Ice/exceptions/Test/C.java | 2 +- .../csharp/test/Ice/exceptions/Test/D.java | 2 +- .../csharp/test/Ice/hash/Test/Color.java | 2 +- .../test/Ice/hash/Test/ColorPalette.java | 2 +- .../csharp/test/Ice/hash/Test/Draw.java | 2 +- .../Ice/hash/Test/InvalidLengthException.java | 2 +- .../Ice/hash/Test/InvalidPointException.java | 2 +- .../test/Ice/hash/Test/OtherException.java | 2 +- slice2java/csharp/test/Ice/hash/Test/Pen.java | 2 +- .../csharp/test/Ice/hash/Test/Point.java | 2 +- .../csharp/test/Ice/hash/Test/PointD.java | 2 +- .../csharp/test/Ice/hash/Test/PointF.java | 2 +- .../csharp/test/Ice/hash/Test/Polyline.java | 2 +- .../test/Ice/namespacemd/NoNamespace/C1.java | 2 +- .../test/Ice/namespacemd/NoNamespace/C2.java | 2 +- .../test/Ice/namespacemd/NoNamespace/E1.java | 2 +- .../test/Ice/namespacemd/NoNamespace/E2.java | 2 +- .../Ice/namespacemd/NoNamespace/_notify.java | 2 +- .../Ice/namespacemd/WithNamespace/C1.java | 2 +- .../Ice/namespacemd/WithNamespace/C2.java | 2 +- .../Ice/namespacemd/WithNamespace/E1.java | 2 +- .../Ice/namespacemd/WithNamespace/E2.java | 2 +- .../csharp/test/Ice/objects/Test/A.java | 2 +- .../csharp/test/Ice/objects/Test/A1.java | 2 +- .../csharp/test/Ice/objects/Test/B.java | 2 +- .../csharp/test/Ice/objects/Test/B1.java | 2 +- .../csharp/test/Ice/objects/Test/Base.java | 2 +- .../csharp/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- .../csharp/test/Ice/objects/Test/D.java | 2 +- .../csharp/test/Ice/objects/Test/D1.java | 2 +- .../csharp/test/Ice/objects/Test/E.java | 2 +- .../csharp/test/Ice/objects/Test/EBase.java | 2 +- .../test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- .../csharp/test/Ice/objects/Test/F.java | 2 +- .../csharp/test/Ice/objects/Test/F1.java | 2 +- .../csharp/test/Ice/objects/Test/F3.java | 2 +- .../csharp/test/Ice/objects/Test/IBase.java | 2 +- .../test/Ice/objects/Test/IDerived.java | 2 +- .../csharp/test/Ice/objects/Test/Inner/A.java | 2 +- .../test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- .../csharp/test/Ice/objects/Test/K.java | 2 +- .../csharp/test/Ice/objects/Test/L.java | 2 +- .../csharp/test/Ice/objects/Test/M.java | 2 +- .../test/Ice/objects/Test/Recursive.java | 2 +- .../csharp/test/Ice/objects/Test/S.java | 2 +- .../csharp/test/Ice/objects/Test/S1.java | 2 +- .../csharp/test/Ice/objects/Test/SC1.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- .../csharp/test/Ice/optional/Test/A.java | 2 +- .../csharp/test/Ice/optional/Test/B.java | 2 +- .../csharp/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../csharp/test/Ice/optional/Test/E.java | 2 +- .../csharp/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- .../csharp/test/Ice/optional/Test/G.java | 2 +- .../csharp/test/Ice/optional/Test/G1.java | 2 +- .../csharp/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../csharp/test/Ice/optional/Test/WD.java | 2 +- slice2java/csharp/test/Ice/scope/Test/C.java | 2 +- slice2java/csharp/test/Ice/scope/Test/C1.java | 2 +- slice2java/csharp/test/Ice/scope/Test/C2.java | 2 +- .../csharp/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../csharp/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/csharp/test/Ice/scope/Test/S.java | 2 +- slice2java/csharp/test/Ice/scope/Test/S1.java | 2 +- slice2java/csharp/test/Ice/scope/Test/S2.java | 2 +- .../csharp/test/Ice/seqMapping/Test/CR.java | 2 +- .../csharp/test/Ice/seqMapping/Test/CV.java | 2 +- .../csharp/test/Ice/seqMapping/Test/S.java | 2 +- .../csharp/test/Ice/seqMapping/Test/SD.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/UnknownDerived.java | 2 +- .../exceptions/Test/UnknownIntermediate.java | 2 +- .../exceptions/Test/UnknownMostDerived1.java | 2 +- .../exceptions/Test/UnknownMostDerived2.java | 2 +- .../test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../test/Ice/slicing/objects/Test/D1.java | 2 +- .../test/Ice/slicing/objects/Test/D2.java | 2 +- .../test/Ice/slicing/objects/Test/D3.java | 2 +- .../test/Ice/slicing/objects/Test/D4.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../Ice/slicing/objects/Test/MyClass.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown2.java | 2 +- .../objects/Test/PSUnknownException.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../objects/Test/SBSUnknownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../Ice/slicing/objects/Test/SUnknown.java | 2 +- .../objects/Test/UnknownDerivedException.java | 2 +- .../test/Ice/stream/Test/LargeStruct.java | 2 +- .../csharp/test/Ice/stream/Test/MyClass.java | 2 +- .../test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../csharp/test/Slice/escape/Clash/Cls.java | 2 +- .../csharp/test/Slice/escape/Clash/Ex.java | 2 +- .../csharp/test/Slice/escape/Clash/St.java | 2 +- .../Slice/escape/_abstract/BaseMethods.java | 2 +- .../test/Slice/escape/_abstract/_break.java | 2 +- .../test/Slice/escape/_abstract/delegate.java | 2 +- .../test/Slice/escape/_abstract/fixed.java | 2 +- .../test/Slice/escape/_abstract/foreach.java | 2 +- .../escape/_abstract/optionalMembers.java | 2 +- .../test/Slice/macros/Test/Default.java | 2 +- .../test/Slice/macros/Test/NoDefault.java | 2 +- .../csharp/test/Slice/structure/Test/C.java | 2 +- .../csharp/test/Slice/structure/Test/S1.java | 2 +- .../csharp/test/Slice/structure/Test/S2.java | 2 +- .../router/Test/CallbackException.java | 2 +- .../Ice/classLoader/Test/ConcreteClass.java | 2 +- .../Ice/custom/test/Ice/custom/Test/A.java | 2 +- .../Ice/custom/test/Ice/custom/Test/S.java | 2 +- .../test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../test/Ice/exceptions/AMD/Test/A.java | 2 +- .../test/Ice/exceptions/AMD/Test/B.java | 2 +- .../test/Ice/exceptions/AMD/Test/C.java | 2 +- .../test/Ice/exceptions/AMD/Test/D.java | 2 +- .../test/Ice/exceptions/Test/A.java | 2 +- .../test/Ice/exceptions/Test/B.java | 2 +- .../test/Ice/exceptions/Test/C.java | 2 +- .../test/Ice/exceptions/Test/D.java | 2 +- .../Ice/hash/test/Ice/hash/Test/Color.java | 2 +- .../hash/test/Ice/hash/Test/ColorPalette.java | 2 +- .../Ice/hash/test/Ice/hash/Test/Draw.java | 2 +- .../test/Ice/hash/test/Ice/hash/Test/Pen.java | 2 +- .../Ice/hash/test/Ice/hash/Test/Point.java | 2 +- .../Ice/hash/test/Ice/hash/Test/PointD.java | 2 +- .../Ice/hash/test/Ice/hash/Test/PointF.java | 2 +- .../Ice/hash/test/Ice/hash/Test/Polyline.java | 2 +- .../Ice/objects/test/Ice/objects/Test/A.java | 2 +- .../Ice/objects/test/Ice/objects/Test/A1.java | 2 +- .../Ice/objects/test/Ice/objects/Test/B.java | 2 +- .../Ice/objects/test/Ice/objects/Test/B1.java | 2 +- .../objects/test/Ice/objects/Test/Base.java | 2 +- .../Ice/objects/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- .../Ice/objects/test/Ice/objects/Test/D.java | 2 +- .../Ice/objects/test/Ice/objects/Test/D1.java | 2 +- .../Ice/objects/test/Ice/objects/Test/E.java | 2 +- .../objects/test/Ice/objects/Test/EBase.java | 2 +- .../test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- .../Ice/objects/test/Ice/objects/Test/F.java | 2 +- .../Ice/objects/test/Ice/objects/Test/F1.java | 2 +- .../Ice/objects/test/Ice/objects/Test/F3.java | 2 +- .../test/Ice/objects/Test/Inner/A.java | 2 +- .../test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- .../Ice/objects/test/Ice/objects/Test/K.java | 2 +- .../Ice/objects/test/Ice/objects/Test/L.java | 2 +- .../Ice/objects/test/Ice/objects/Test/M.java | 2 +- .../test/Ice/objects/Test/Recursive.java | 2 +- .../Ice/objects/test/Ice/objects/Test/S.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../test/Ice/objects/Test/StructKey.java | 2 +- .../operations/AMD/Test/AnotherStruct.java | 2 +- .../Ice/operations/AMD/Test/MyClass1.java | 2 +- .../Ice/operations/AMD/Test/MyStruct.java | 2 +- .../Ice/operations/AMD/Test/MyStruct1.java | 2 +- .../Ice/operations/AMD/Test/Structure.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- .../test/Ice/optional/AMD/Test/A.java | 2 +- .../test/Ice/optional/AMD/Test/B.java | 2 +- .../test/Ice/optional/AMD/Test/C.java | 2 +- .../optional/AMD/Test/DerivedException.java | 2 +- .../test/Ice/optional/AMD/Test/E.java | 2 +- .../test/Ice/optional/AMD/Test/F.java | 2 +- .../Ice/optional/AMD/Test/FixedStruct.java | 2 +- .../test/Ice/optional/AMD/Test/G.java | 2 +- .../test/Ice/optional/AMD/Test/G1.java | 2 +- .../test/Ice/optional/AMD/Test/G2.java | 2 +- .../Ice/optional/AMD/Test/MultiOptional.java | 2 +- .../Ice/optional/AMD/Test/OneOptional.java | 2 +- .../optional/AMD/Test/OptionalException.java | 2 +- .../optional/AMD/Test/OptionalWithCustom.java | 2 +- .../optional/AMD/Test/RequiredException.java | 2 +- .../Ice/optional/AMD/Test/SmallStruct.java | 2 +- .../test/Ice/optional/AMD/Test/VarStruct.java | 2 +- .../test/Ice/optional/AMD/Test/WD.java | 2 +- .../optional/test/Ice/optional/Test/A.java | 2 +- .../optional/test/Ice/optional/Test/B.java | 2 +- .../optional/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../optional/test/Ice/optional/Test/E.java | 2 +- .../optional/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- .../optional/test/Ice/optional/Test/G.java | 2 +- .../optional/test/Ice/optional/Test/G1.java | 2 +- .../optional/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../optional/test/Ice/optional/Test/WD.java | 2 +- .../test/Ice/packagemd/Test1/C1.java | 2 +- .../test/Ice/packagemd/Test1/C2.java | 2 +- .../test/Ice/packagemd/Test1/E1.java | 2 +- .../test/Ice/packagemd/Test1/E2.java | 2 +- .../test/Ice/packagemd/Test1/_notify.java | 2 +- .../test/Ice/packagemd/modpkg/Test3/C1.java | 2 +- .../test/Ice/packagemd/modpkg/Test3/C2.java | 2 +- .../test/Ice/packagemd/modpkg/Test3/E1.java | 2 +- .../test/Ice/packagemd/modpkg/Test3/E2.java | 2 +- .../test/Ice/packagemd/testpkg/Test2/C1.java | 2 +- .../test/Ice/packagemd/testpkg/Test2/C2.java | 2 +- .../test/Ice/packagemd/testpkg/Test2/E1.java | 2 +- .../test/Ice/packagemd/testpkg/Test2/E2.java | 2 +- .../test/Ice/scope/test/Ice/scope/Test/C.java | 2 +- .../Ice/scope/test/Ice/scope/Test/C1.java | 2 +- .../Ice/scope/test/Ice/scope/Test/C2.java | 2 +- .../scope/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../scope/test/Ice/scope/Test/Inner/S.java | 2 +- .../test/Ice/scope/test/Ice/scope/Test/S.java | 2 +- .../Ice/scope/test/Ice/scope/Test/S1.java | 2 +- .../Ice/scope/test/Ice/scope/Test/S2.java | 2 +- .../test/Ice/seqMapping/AMD/Test/Bar.java | 2 +- .../test/Ice/seqMapping/AMD/Test/Baz.java | 2 +- .../test/Ice/seqMapping/AMD/Test/Foo.java | 2 +- .../test/Ice/seqMapping/Test/Bar.java | 2 +- .../test/Ice/seqMapping/Test/Baz.java | 2 +- .../test/Ice/seqMapping/Test/Foo.java | 2 +- .../slicing/exceptions/client/Test/Base.java | 2 +- .../exceptions/client/Test/KnownDerived.java | 2 +- .../client/Test/KnownIntermediate.java | 2 +- .../client/Test/KnownMostDerived.java | 2 +- .../client/Test/KnownPreserved.java | 2 +- .../client/Test/KnownPreservedDerived.java | 2 +- .../slicing/exceptions/server/Test/Base.java | 2 +- .../exceptions/server/Test/KnownDerived.java | 2 +- .../server/Test/KnownIntermediate.java | 2 +- .../server/Test/KnownMostDerived.java | 2 +- .../server/Test/UnknownDerived.java | 2 +- .../server/Test/UnknownIntermediate.java | 2 +- .../server/Test/UnknownMostDerived1.java | 2 +- .../server/Test/UnknownMostDerived2.java | 2 +- .../exceptions/serverAMD/Test/Base.java | 2 +- .../serverAMD/Test/KnownDerived.java | 2 +- .../serverAMD/Test/KnownIntermediate.java | 2 +- .../serverAMD/Test/KnownMostDerived.java | 2 +- .../serverAMD/Test/UnknownDerived.java | 2 +- .../serverAMD/Test/UnknownIntermediate.java | 2 +- .../serverAMD/Test/UnknownMostDerived1.java | 2 +- .../serverAMD/Test/UnknownMostDerived2.java | 2 +- .../Ice/slicing/objects/client/Test/B.java | 2 +- .../objects/client/Test/BaseException.java | 2 +- .../objects/client/Test/CompactPCDerived.java | 2 +- .../objects/client/Test/CompactPDerived.java | 2 +- .../Ice/slicing/objects/client/Test/D1.java | 2 +- .../Ice/slicing/objects/client/Test/D3.java | 2 +- .../objects/client/Test/DerivedException.java | 2 +- .../slicing/objects/client/Test/Forward.java | 2 +- .../slicing/objects/client/Test/Hidden.java | 2 +- .../slicing/objects/client/Test/PBase.java | 2 +- .../objects/client/Test/PCDerived.java | 2 +- .../objects/client/Test/PCDerived2.java | 2 +- .../objects/client/Test/PCDerived3.java | 2 +- .../objects/client/Test/PCUnknown.java | 2 +- .../slicing/objects/client/Test/PDerived.java | 2 +- .../slicing/objects/client/Test/PNode.java | 2 +- .../objects/client/Test/Preserved.java | 2 +- .../objects/client/Test/SBSKnownDerived.java | 2 +- .../slicing/objects/client/Test/SBase.java | 2 +- .../Ice/slicing/objects/client/Test/SS1.java | 2 +- .../Ice/slicing/objects/client/Test/SS2.java | 2 +- .../Ice/slicing/objects/client/Test/SS3.java | 2 +- .../Ice/slicing/objects/server/Test/B.java | 2 +- .../objects/server/Test/BaseException.java | 2 +- .../objects/server/Test/CompactPDerived.java | 2 +- .../Ice/slicing/objects/server/Test/D1.java | 2 +- .../Ice/slicing/objects/server/Test/D2.java | 2 +- .../Ice/slicing/objects/server/Test/D4.java | 2 +- .../objects/server/Test/DerivedException.java | 2 +- .../slicing/objects/server/Test/Forward.java | 2 +- .../slicing/objects/server/Test/Hidden.java | 2 +- .../slicing/objects/server/Test/MyClass.java | 2 +- .../slicing/objects/server/Test/PBase.java | 2 +- .../slicing/objects/server/Test/PDerived.java | 2 +- .../slicing/objects/server/Test/PNode.java | 2 +- .../objects/server/Test/PSUnknown.java | 2 +- .../objects/server/Test/PSUnknown2.java | 2 +- .../server/Test/PSUnknownException.java | 2 +- .../objects/server/Test/Preserved.java | 2 +- .../objects/server/Test/SBSKnownDerived.java | 2 +- .../server/Test/SBSUnknownDerived.java | 2 +- .../slicing/objects/server/Test/SBase.java | 2 +- .../Ice/slicing/objects/server/Test/SS1.java | 2 +- .../Ice/slicing/objects/server/Test/SS2.java | 2 +- .../Ice/slicing/objects/server/Test/SS3.java | 2 +- .../slicing/objects/server/Test/SUnknown.java | 2 +- .../server/Test/UnknownDerivedException.java | 2 +- .../Ice/slicing/objects/serverAMD/Test/B.java | 2 +- .../objects/serverAMD/Test/BaseException.java | 2 +- .../slicing/objects/serverAMD/Test/D1.java | 2 +- .../slicing/objects/serverAMD/Test/D2.java | 2 +- .../slicing/objects/serverAMD/Test/D4.java | 2 +- .../serverAMD/Test/DerivedException.java | 2 +- .../objects/serverAMD/Test/Forward.java | 2 +- .../objects/serverAMD/Test/Hidden.java | 2 +- .../objects/serverAMD/Test/MyClass.java | 2 +- .../slicing/objects/serverAMD/Test/PBase.java | 2 +- .../objects/serverAMD/Test/PDerived.java | 2 +- .../slicing/objects/serverAMD/Test/PNode.java | 2 +- .../objects/serverAMD/Test/PSUnknown.java | 2 +- .../objects/serverAMD/Test/PSUnknown2.java | 2 +- .../serverAMD/Test/PSUnknownException.java | 2 +- .../objects/serverAMD/Test/Preserved.java | 2 +- .../serverAMD/Test/SBSKnownDerived.java | 2 +- .../serverAMD/Test/SBSUnknownDerived.java | 2 +- .../slicing/objects/serverAMD/Test/SBase.java | 2 +- .../slicing/objects/serverAMD/Test/SS1.java | 2 +- .../slicing/objects/serverAMD/Test/SS2.java | 2 +- .../slicing/objects/serverAMD/Test/SS3.java | 2 +- .../objects/serverAMD/Test/SUnknown.java | 2 +- .../Test/UnknownDerivedException.java | 2 +- .../test/Ice/stream/Test/LargeStruct.java | 2 +- .../stream/test/Ice/stream/Test/MyClass.java | 2 +- .../test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../stream/test/Ice/stream/Test/Point.java | 2 +- .../escape/test/Slice/escape/Clash/Cls.java | 2 +- .../escape/test/Slice/escape/Clash/Ex.java | 2 +- .../escape/test/Slice/escape/Clash/St.java | 2 +- .../test/Slice/escape/_abstract/_break.java | 2 +- .../test/Slice/escape/_abstract/_else.java | 2 +- .../Slice/escape/_abstract/_hashCode.java | 2 +- .../test/Slice/escape/_abstract/_import.java | 2 +- .../test/Slice/macros/Test/Default.java | 2 +- .../test/Slice/macros/Test/JavaOnly.java | 2 +- .../test/Slice/macros/Test/NoDefault.java | 2 +- .../test/Slice/structure/Test/C.java | 2 +- .../test/Slice/structure/Test/S1.java | 2 +- .../test/Slice/structure/Test/S2.java | 2 +- .../router/Test/CallbackException.java | 2 +- .../js/test/Ice/defaultValue/Test/Base.java | 2 +- .../js/test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct3.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- slice2java/js/test/Ice/exceptions/Test/A.java | 2 +- slice2java/js/test/Ice/exceptions/Test/B.java | 2 +- slice2java/js/test/Ice/exceptions/Test/C.java | 2 +- slice2java/js/test/Ice/exceptions/Test/D.java | 2 +- .../js/test/Ice/inheritance/Test/MC/A.java | 2 +- .../js/test/Ice/inheritance/Test/MC/B.java | 2 +- .../js/test/Ice/inheritance/Test/MC/C.java | 2 +- .../js/test/Ice/inheritance/Test/MC/D.java | 2 +- .../js/test/Ice/inheritance/Test/MD/A.java | 2 +- .../js/test/Ice/inheritance/Test/MD/B.java | 2 +- .../js/test/Ice/inheritance/Test/MD/C.java | 2 +- .../js/test/Ice/inheritance/Test/MD/D.java | 2 +- .../js/test/Ice/inheritance/Test/ME/A.java | 2 +- .../js/test/Ice/inheritance/Test/ME/B.java | 2 +- .../js/test/Ice/inheritance/Test/ME/C.java | 2 +- .../js/test/Ice/inheritance/Test/ME/D.java | 2 +- .../js/test/Ice/inheritance/Test/MF/A.java | 2 +- .../js/test/Ice/inheritance/Test/MF/B.java | 2 +- .../js/test/Ice/inheritance/Test/MF/C.java | 2 +- .../js/test/Ice/inheritance/Test/MF/D.java | 2 +- .../js/test/Ice/inheritance/Test/MG/A.java | 2 +- .../js/test/Ice/inheritance/Test/MG/B.java | 2 +- .../js/test/Ice/inheritance/Test/MG/C.java | 2 +- .../js/test/Ice/inheritance/Test/MG/D.java | 2 +- .../js/test/Ice/inheritance/Test/MH/A.java | 2 +- .../js/test/Ice/inheritance/Test/MH/B.java | 2 +- .../js/test/Ice/inheritance/Test/MH/C.java | 2 +- .../js/test/Ice/inheritance/Test/MH/D.java | 2 +- slice2java/js/test/Ice/objects/Test/A.java | 2 +- slice2java/js/test/Ice/objects/Test/A1.java | 2 +- slice2java/js/test/Ice/objects/Test/B.java | 2 +- slice2java/js/test/Ice/objects/Test/B1.java | 2 +- slice2java/js/test/Ice/objects/Test/Base.java | 2 +- slice2java/js/test/Ice/objects/Test/C.java | 2 +- .../js/test/Ice/objects/Test/COneMember.java | 2 +- .../js/test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/js/test/Ice/objects/Test/D.java | 2 +- slice2java/js/test/Ice/objects/Test/D1.java | 2 +- slice2java/js/test/Ice/objects/Test/E.java | 2 +- .../js/test/Ice/objects/Test/EBase.java | 2 +- .../js/test/Ice/objects/Test/EDerived.java | 2 +- .../js/test/Ice/objects/Test/EOneMember.java | 2 +- .../js/test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/js/test/Ice/objects/Test/F.java | 2 +- slice2java/js/test/Ice/objects/Test/F1.java | 2 +- slice2java/js/test/Ice/objects/Test/F3.java | 2 +- .../js/test/Ice/objects/Test/Inner/A.java | 2 +- .../js/test/Ice/objects/Test/Inner/Ex.java | 2 +- .../js/test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- slice2java/js/test/Ice/objects/Test/K.java | 2 +- slice2java/js/test/Ice/objects/Test/L.java | 2 +- slice2java/js/test/Ice/objects/Test/M.java | 2 +- .../js/test/Ice/objects/Test/Recursive.java | 2 +- slice2java/js/test/Ice/objects/Test/S.java | 2 +- .../js/test/Ice/objects/Test/SOneMember.java | 2 +- .../js/test/Ice/objects/Test/STwoMembers.java | 2 +- .../js/test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../js/test/Ice/operations/Test/MyClass1.java | 2 +- .../js/test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- slice2java/js/test/Ice/optional/Test/A.java | 2 +- slice2java/js/test/Ice/optional/Test/B.java | 2 +- slice2java/js/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- slice2java/js/test/Ice/optional/Test/E.java | 2 +- slice2java/js/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- slice2java/js/test/Ice/optional/Test/G.java | 2 +- slice2java/js/test/Ice/optional/Test/G1.java | 2 +- slice2java/js/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../js/test/Ice/optional/Test/VarStruct.java | 2 +- slice2java/js/test/Ice/optional/Test/WD.java | 2 +- slice2java/js/test/Ice/scope/Test/C.java | 2 +- slice2java/js/test/Ice/scope/Test/C1.java | 2 +- slice2java/js/test/Ice/scope/Test/C2.java | 2 +- .../js/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../js/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/js/test/Ice/scope/Test/S.java | 2 +- slice2java/js/test/Ice/scope/Test/S1.java | 2 +- slice2java/js/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/KnownPreserved.java | 2 +- .../Test/KnownPreservedDerived.java | 2 +- .../js/test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../js/test/Ice/slicing/objects/Test/D1.java | 2 +- .../js/test/Ice/slicing/objects/Test/D3.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../js/test/Ice/slicing/objects/Test/SS1.java | 2 +- .../js/test/Ice/slicing/objects/Test/SS2.java | 2 +- .../js/test/Ice/slicing/objects/Test/SS3.java | 2 +- .../js/test/Ice/stream/Test/LargeStruct.java | 2 +- .../js/test/Ice/stream/Test/MyClass.java | 2 +- .../js/test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../js/test/Slice/escape/Clash/Cls.java | 2 +- slice2java/js/test/Slice/escape/Clash/Ex.java | 2 +- slice2java/js/test/Slice/escape/Clash/St.java | 2 +- .../test/Slice/escape/await/BaseMethods.java | 2 +- .../js/test/Slice/escape/await/_break.java | 2 +- .../js/test/Slice/escape/await/_package.java | 2 +- .../js/test/Slice/escape/await/delete.java | 2 +- .../js/test/Slice/escape/await/fixed.java | 2 +- .../js/test/Slice/escape/await/foreach.java | 2 +- .../js/test/Slice/macros/Test/Default.java | 2 +- .../js/test/Slice/macros/Test/NoDefault.java | 2 +- .../test/Ice/defaultValue/Test/Base.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../matlab/test/Ice/exceptions/Test/A.java | 2 +- .../matlab/test/Ice/exceptions/Test/B.java | 2 +- .../matlab/test/Ice/exceptions/Test/C.java | 2 +- .../matlab/test/Ice/exceptions/Test/D.java | 2 +- .../matlab/test/Ice/exceptions/Test/E.java | 2 +- .../matlab/test/Ice/exceptions/Test/F.java | 2 +- .../test/Ice/exceptions/Test/Mod/A.java | 2 +- .../matlab/test/Ice/objects/LocalTest/C1.java | 2 +- .../test/Ice/objects/LocalTest/CB1.java | 2 +- .../test/Ice/objects/LocalTest/CB2.java | 2 +- .../test/Ice/objects/LocalTest/CB3.java | 2 +- .../test/Ice/objects/LocalTest/CB4.java | 2 +- .../test/Ice/objects/LocalTest/CB5.java | 2 +- .../test/Ice/objects/LocalTest/CB6.java | 2 +- .../test/Ice/objects/LocalTest/CB7.java | 2 +- .../test/Ice/objects/LocalTest/CB8.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S1.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S2.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S3.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S4.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S5.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S6.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S7.java | 2 +- .../matlab/test/Ice/objects/LocalTest/S8.java | 2 +- .../test/Ice/objects/LocalTest/StructKey.java | 2 +- .../matlab/test/Ice/objects/Test/A.java | 2 +- .../matlab/test/Ice/objects/Test/A1.java | 2 +- .../matlab/test/Ice/objects/Test/B.java | 2 +- .../matlab/test/Ice/objects/Test/B1.java | 2 +- .../matlab/test/Ice/objects/Test/Base.java | 2 +- .../matlab/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- .../matlab/test/Ice/objects/Test/D.java | 2 +- .../matlab/test/Ice/objects/Test/D1.java | 2 +- .../matlab/test/Ice/objects/Test/E.java | 2 +- .../matlab/test/Ice/objects/Test/EBase.java | 2 +- .../test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- .../matlab/test/Ice/objects/Test/F.java | 2 +- .../matlab/test/Ice/objects/Test/F1.java | 2 +- .../matlab/test/Ice/objects/Test/F3.java | 2 +- .../matlab/test/Ice/objects/Test/Inner/A.java | 2 +- .../test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- .../matlab/test/Ice/objects/Test/K.java | 2 +- .../matlab/test/Ice/objects/Test/L.java | 2 +- .../matlab/test/Ice/objects/Test/M.java | 2 +- .../test/Ice/objects/Test/Recursive.java | 2 +- .../matlab/test/Ice/objects/Test/S.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- .../matlab/test/Ice/optional/Test/A.java | 2 +- .../matlab/test/Ice/optional/Test/B.java | 2 +- .../matlab/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../matlab/test/Ice/optional/Test/E.java | 2 +- .../matlab/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- .../matlab/test/Ice/optional/Test/G.java | 2 +- .../matlab/test/Ice/optional/Test/G1.java | 2 +- .../matlab/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../matlab/test/Ice/optional/Test/WD.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/BaseClass.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/KnownPreserved.java | 2 +- .../Test/KnownPreservedDerived.java | 2 +- .../slicing/exceptions/Test/Preserved1.java | 2 +- .../slicing/exceptions/Test/Preserved2.java | 2 +- .../exceptions/Test/PreservedClass.java | 2 +- .../test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../test/Ice/slicing/objects/Test/D1.java | 2 +- .../test/Ice/slicing/objects/Test/D3.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../Slice/escape/classdef/_break/_try.java | 2 +- .../Slice/escape/classdef/_break/bitor.java | 2 +- .../Slice/escape/classdef/_break/global.java | 2 +- .../Slice/escape/classdef/_break/logical.java | 2 +- .../escape/classdef/_break/persistent.java | 2 +- .../escape/classdef/_break/properties.java | 2 +- .../Slice/escape/classdef/_break/xor.java | 2 +- .../php/test/Ice/defaultValue/Test/Base.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../php/test/Ice/exceptions/Test/A.java | 2 +- .../php/test/Ice/exceptions/Test/B.java | 2 +- .../php/test/Ice/exceptions/Test/C.java | 2 +- .../php/test/Ice/exceptions/Test/D.java | 2 +- slice2java/php/test/Ice/objects/Test/A.java | 2 +- slice2java/php/test/Ice/objects/Test/A1.java | 2 +- slice2java/php/test/Ice/objects/Test/B.java | 2 +- slice2java/php/test/Ice/objects/Test/B1.java | 2 +- .../php/test/Ice/objects/Test/Base.java | 2 +- slice2java/php/test/Ice/objects/Test/C.java | 2 +- .../php/test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/php/test/Ice/objects/Test/D.java | 2 +- slice2java/php/test/Ice/objects/Test/D1.java | 2 +- slice2java/php/test/Ice/objects/Test/E.java | 2 +- .../php/test/Ice/objects/Test/EBase.java | 2 +- .../php/test/Ice/objects/Test/EDerived.java | 2 +- .../php/test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/php/test/Ice/objects/Test/F.java | 2 +- slice2java/php/test/Ice/objects/Test/F1.java | 2 +- slice2java/php/test/Ice/objects/Test/F3.java | 2 +- slice2java/php/test/Ice/objects/Test/K.java | 2 +- slice2java/php/test/Ice/objects/Test/L.java | 2 +- .../php/test/Ice/objects/Test/Recursive.java | 2 +- slice2java/php/test/Ice/objects/Test/S.java | 2 +- .../php/test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- slice2java/php/test/Ice/optional/Test/A.java | 2 +- slice2java/php/test/Ice/optional/Test/B.java | 2 +- slice2java/php/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- slice2java/php/test/Ice/optional/Test/E.java | 2 +- slice2java/php/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- slice2java/php/test/Ice/optional/Test/G.java | 2 +- slice2java/php/test/Ice/optional/Test/G1.java | 2 +- slice2java/php/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../php/test/Ice/optional/Test/VarStruct.java | 2 +- slice2java/php/test/Ice/optional/Test/WD.java | 2 +- slice2java/php/test/Ice/scope/Test/C.java | 2 +- slice2java/php/test/Ice/scope/Test/C1.java | 2 +- slice2java/php/test/Ice/scope/Test/C2.java | 2 +- .../php/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../php/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/php/test/Ice/scope/Test/S.java | 2 +- slice2java/php/test/Ice/scope/Test/S1.java | 2 +- slice2java/php/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../php/test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../php/test/Ice/slicing/objects/Test/D1.java | 2 +- .../php/test/Ice/slicing/objects/Test/D3.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../php/test/Slice/escape/Clash/Cls.java | 2 +- .../php/test/Slice/escape/Clash/Ex.java | 2 +- .../php/test/Slice/escape/Clash/St.java | 2 +- .../php/test/Slice/escape/and/echo.java | 2 +- .../php/test/Slice/escape/and/endif.java | 2 +- .../php/test/Slice/escape/and/endwhile.java | 2 +- slice2java/php/test/Slice/escape/and/xor.java | 2 +- .../php/test/Slice/macros/Test/Default.java | 2 +- .../php/test/Slice/macros/Test/NoDefault.java | 2 +- .../php/test/Slice/structure/Test/C.java | 2 +- .../php/test/Slice/structure/Test/S1.java | 2 +- .../php/test/Slice/structure/Test/S2.java | 2 +- slice2java/python/test/Ice/custom/Test/C.java | 2 +- slice2java/python/test/Ice/custom/Test/D.java | 2 +- .../python/test/Ice/custom/Test/NumPy/D.java | 2 +- slice2java/python/test/Ice/custom/Test/S.java | 2 +- .../test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../Test/ExceptionNoDefaults.java | 2 +- .../Test/ExceptionNoDefaultsBase.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../python/test/Ice/exceptions/Test/A.java | 2 +- .../python/test/Ice/exceptions/Test/B.java | 2 +- .../python/test/Ice/exceptions/Test/C.java | 2 +- .../python/test/Ice/exceptions/Test/D.java | 2 +- .../test/Ice/exceptions/Test/Mod/A.java | 2 +- .../python/test/Ice/objects/Test/A.java | 2 +- .../python/test/Ice/objects/Test/A1.java | 2 +- .../python/test/Ice/objects/Test/B.java | 2 +- .../python/test/Ice/objects/Test/B1.java | 2 +- .../python/test/Ice/objects/Test/Base.java | 2 +- .../python/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- .../python/test/Ice/objects/Test/D.java | 2 +- .../python/test/Ice/objects/Test/D1.java | 2 +- .../python/test/Ice/objects/Test/E.java | 2 +- .../python/test/Ice/objects/Test/EBase.java | 2 +- .../test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- .../python/test/Ice/objects/Test/F.java | 2 +- .../python/test/Ice/objects/Test/F1.java | 2 +- .../python/test/Ice/objects/Test/F3.java | 2 +- .../python/test/Ice/objects/Test/Inner/A.java | 2 +- .../test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- .../python/test/Ice/objects/Test/K.java | 2 +- .../python/test/Ice/objects/Test/L.java | 2 +- .../python/test/Ice/objects/Test/M.java | 2 +- .../test/Ice/objects/Test/Recursive.java | 2 +- .../python/test/Ice/objects/Test/S.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- .../python/test/Ice/optional/Test/A.java | 2 +- .../python/test/Ice/optional/Test/B.java | 2 +- .../python/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../python/test/Ice/optional/Test/E.java | 2 +- .../python/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- .../python/test/Ice/optional/Test/G.java | 2 +- .../python/test/Ice/optional/Test/G1.java | 2 +- .../python/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../python/test/Ice/optional/Test/WD.java | 2 +- .../python/test/Ice/packagemd/Test1/C1.java | 2 +- .../python/test/Ice/packagemd/Test1/C2.java | 2 +- .../python/test/Ice/packagemd/Test1/E1.java | 2 +- .../python/test/Ice/packagemd/Test1/E2.java | 2 +- .../python/test/Ice/packagemd/Test1/def.java | 2 +- .../python/test/Ice/packagemd/Test2/C1.java | 2 +- .../python/test/Ice/packagemd/Test2/C2.java | 2 +- .../python/test/Ice/packagemd/Test2/E1.java | 2 +- .../python/test/Ice/packagemd/Test2/E2.java | 2 +- .../python/test/Ice/packagemd/Test3/C1.java | 2 +- .../python/test/Ice/packagemd/Test3/C2.java | 2 +- .../python/test/Ice/packagemd/Test3/E1.java | 2 +- .../python/test/Ice/packagemd/Test3/E2.java | 2 +- slice2java/python/test/Ice/scope/Test/C.java | 2 +- slice2java/python/test/Ice/scope/Test/C1.java | 2 +- slice2java/python/test/Ice/scope/Test/C2.java | 2 +- .../python/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../python/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/python/test/Ice/scope/Test/S.java | 2 +- slice2java/python/test/Ice/scope/Test/S1.java | 2 +- slice2java/python/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/UnknownDerived.java | 2 +- .../exceptions/Test/UnknownIntermediate.java | 2 +- .../exceptions/Test/UnknownMostDerived1.java | 2 +- .../exceptions/Test/UnknownMostDerived2.java | 2 +- .../test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../test/Ice/slicing/objects/Test/D1.java | 2 +- .../test/Ice/slicing/objects/Test/D2.java | 2 +- .../test/Ice/slicing/objects/Test/D3.java | 2 +- .../test/Ice/slicing/objects/Test/D4.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../Ice/slicing/objects/Test/MyClass.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown2.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../objects/Test/SBSUnknownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../Ice/slicing/objects/Test/SUnknown.java | 2 +- .../objects/Test/UnknownDerivedException.java | 2 +- .../python/test/Slice/escape/Clash/Cls.java | 2 +- .../python/test/Slice/escape/Clash/Ex.java | 2 +- .../python/test/Slice/escape/Clash/St.java | 2 +- .../test/Slice/escape/and/_continue.java | 2 +- .../python/test/Slice/escape/and/_for.java | 2 +- .../python/test/Slice/escape/and/is.java | 2 +- .../python/test/Slice/escape/and/not.java | 2 +- .../test/Slice/macros/Test/Default.java | 2 +- .../test/Slice/macros/Test/NoDefault.java | 2 +- .../python/test/Slice/structure/Test/C.java | 2 +- .../python/test/Slice/structure/Test/S1.java | 2 +- .../python/test/Slice/structure/Test/S2.java | 2 +- .../python/test/Slice/structure/Test/S3.java | 2 +- .../ruby/test/Ice/defaultValue/Test/Base.java | 2 +- .../defaultValue/Test/ClassNoDefaults.java | 2 +- .../Test/ClassNoDefaultsBase.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../Ice/defaultValue/Test/InnerStruct.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../defaultValue/Test/StructNoDefaults.java | 2 +- .../ruby/test/Ice/exceptions/Test/A.java | 2 +- .../ruby/test/Ice/exceptions/Test/B.java | 2 +- .../ruby/test/Ice/exceptions/Test/C.java | 2 +- .../ruby/test/Ice/exceptions/Test/D.java | 2 +- .../ruby/test/Ice/exceptions/Test/Mod/A.java | 2 +- slice2java/ruby/test/Ice/objects/Test/A.java | 2 +- slice2java/ruby/test/Ice/objects/Test/A1.java | 2 +- slice2java/ruby/test/Ice/objects/Test/B.java | 2 +- slice2java/ruby/test/Ice/objects/Test/B1.java | 2 +- .../ruby/test/Ice/objects/Test/Base.java | 2 +- slice2java/ruby/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/ruby/test/Ice/objects/Test/D.java | 2 +- slice2java/ruby/test/Ice/objects/Test/D1.java | 2 +- slice2java/ruby/test/Ice/objects/Test/E.java | 2 +- .../ruby/test/Ice/objects/Test/EBase.java | 2 +- .../ruby/test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/ruby/test/Ice/objects/Test/F.java | 2 +- slice2java/ruby/test/Ice/objects/Test/F1.java | 2 +- slice2java/ruby/test/Ice/objects/Test/F3.java | 2 +- slice2java/ruby/test/Ice/objects/Test/K.java | 2 +- slice2java/ruby/test/Ice/objects/Test/L.java | 2 +- slice2java/ruby/test/Ice/objects/Test/M.java | 2 +- .../ruby/test/Ice/objects/Test/Recursive.java | 2 +- slice2java/ruby/test/Ice/objects/Test/S.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../ruby/test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- slice2java/ruby/test/Ice/optional/Test/A.java | 2 +- slice2java/ruby/test/Ice/optional/Test/B.java | 2 +- slice2java/ruby/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- slice2java/ruby/test/Ice/optional/Test/E.java | 2 +- slice2java/ruby/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- slice2java/ruby/test/Ice/optional/Test/G.java | 2 +- .../ruby/test/Ice/optional/Test/G1.java | 2 +- .../ruby/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../ruby/test/Ice/optional/Test/WD.java | 2 +- slice2java/ruby/test/Ice/scope/Test/C.java | 2 +- slice2java/ruby/test/Ice/scope/Test/C1.java | 2 +- slice2java/ruby/test/Ice/scope/Test/C2.java | 2 +- .../ruby/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../ruby/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/ruby/test/Ice/scope/Test/S.java | 2 +- slice2java/ruby/test/Ice/scope/Test/S1.java | 2 +- slice2java/ruby/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../ruby/test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../test/Ice/slicing/objects/Test/D1.java | 2 +- .../test/Ice/slicing/objects/Test/D3.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../ruby/test/Slice/escape/BEGIN/and.java | 2 +- .../ruby/test/Slice/escape/BEGIN/display.java | 2 +- .../ruby/test/Slice/escape/BEGIN/next.java | 2 +- .../ruby/test/Slice/escape/BEGIN/nil.java | 2 +- .../ruby/test/Slice/escape/Clash/Cls.java | 2 +- .../ruby/test/Slice/escape/Clash/Ex.java | 2 +- .../ruby/test/Slice/escape/Clash/St.java | 2 +- .../ruby/test/Slice/macros/Test/Default.java | 2 +- .../test/Slice/macros/Test/NoDefault.java | 2 +- .../ruby/test/Slice/structure/Test/C.java | 2 +- .../ruby/test/Slice/structure/Test/S1.java | 2 +- .../ruby/test/Slice/structure/Test/S2.java | 2 +- slice2java/scripts/Test/Common/Config.java | 2 +- .../scripts/Test/Common/OptionOverrides.java | 2 +- .../Test/Common/ProcessFailedException.java | 2 +- .../Test/Common/TestCaseFailedException.java | 2 +- .../Common/TestCaseNotExistException.java | 2 +- .../DataStorm/DataStorm/SampleEvent.java | 133 + .../DataStorm/SampleEventSeqHelper.java | 83 + .../CannotCreateSessionException.java | 2 +- .../zeroc/Glacier2/IceMX/SessionMetrics.java | 2 +- .../Glacier2/PermissionDeniedException.java | 2 +- .../Glacier2/com/zeroc/Glacier2/SSLInfo.java | 2 +- .../Ice/com/zeroc/Ice/EncodingVersion.java | 2 +- .../Ice/IceMX/ChildInvocationMetrics.java | 2 +- .../zeroc/Ice/IceMX/ConnectionMetrics.java | 2 +- .../com/zeroc/Ice/IceMX/DispatchMetrics.java | 2 +- .../zeroc/Ice/IceMX/InvocationMetrics.java | 2 +- .../Ice/com/zeroc/Ice/IceMX/Metrics.java | 2 +- .../com/zeroc/Ice/IceMX/MetricsFailures.java | 2 +- .../com/zeroc/Ice/IceMX/ThreadMetrics.java | 2 +- .../slice/Ice/com/zeroc/Ice/Identity.java | 2 +- .../slice/Ice/com/zeroc/Ice/LogMessage.java | 2 +- .../Ice/com/zeroc/Ice/ProtocolVersion.java | 2 +- .../zeroc/IceGrid/AccessDeniedException.java | 2 +- .../com/zeroc/IceGrid/AdapterDescriptor.java | 2 +- .../com/zeroc/IceGrid/AdapterDynamicInfo.java | 2 +- .../com/zeroc/IceGrid/AdapterInfo.java | 2 +- .../IceGrid/AdapterNotExistException.java | 2 +- .../IceGrid/AdaptiveLoadBalancingPolicy.java | 2 +- .../zeroc/IceGrid/AllocationException.java | 2 +- .../zeroc/IceGrid/ApplicationDescriptor.java | 2 +- .../com/zeroc/IceGrid/ApplicationInfo.java | 2 +- .../IceGrid/ApplicationNotExistException.java | 2 +- .../IceGrid/ApplicationUpdateDescriptor.java | 2 +- .../zeroc/IceGrid/ApplicationUpdateInfo.java | 2 +- .../com/zeroc/IceGrid/BadSignalException.java | 2 +- .../IceGrid/BoxedDistributionDescriptor.java | 2 +- .../com/zeroc/IceGrid/BoxedString.java | 2 +- .../zeroc/IceGrid/CommunicatorDescriptor.java | 2 +- .../zeroc/IceGrid/DeploymentException.java | 2 +- .../zeroc/IceGrid/DistributionDescriptor.java | 2 +- .../IceGrid/FileNotAvailableException.java | 2 +- .../com/zeroc/IceGrid/IceBoxDescriptor.java | 2 +- .../zeroc/IceGrid/LoadBalancingPolicy.java | 2 +- .../IceGrid/com/zeroc/IceGrid/LoadInfo.java | 2 +- .../com/zeroc/IceGrid/NodeDescriptor.java | 2 +- .../com/zeroc/IceGrid/NodeDynamicInfo.java | 2 +- .../IceGrid/com/zeroc/IceGrid/NodeInfo.java | 2 +- .../zeroc/IceGrid/NodeNotExistException.java | 2 +- .../IceGrid/NodeUnreachableException.java | 2 +- .../zeroc/IceGrid/NodeUpdateDescriptor.java | 2 +- .../com/zeroc/IceGrid/ObjectDescriptor.java | 2 +- .../zeroc/IceGrid/ObjectExistsException.java | 2 +- .../IceGrid/com/zeroc/IceGrid/ObjectInfo.java | 2 +- .../IceGrid/ObjectNotRegisteredException.java | 2 +- .../ObserverAlreadyRegisteredException.java | 2 +- .../com/zeroc/IceGrid/ParseException.java | 2 +- .../IceGrid/PermissionDeniedException.java | 2 +- .../com/zeroc/IceGrid/PropertyDescriptor.java | 2 +- .../zeroc/IceGrid/PropertySetDescriptor.java | 2 +- .../com/zeroc/IceGrid/RegistryInfo.java | 2 +- .../IceGrid/RegistryNotExistException.java | 2 +- .../IceGrid/RegistryUnreachableException.java | 2 +- .../zeroc/IceGrid/ReplicaGroupDescriptor.java | 2 +- .../com/zeroc/IceGrid/ServerDescriptor.java | 2 +- .../com/zeroc/IceGrid/ServerDynamicInfo.java | 2 +- .../IceGrid/com/zeroc/IceGrid/ServerInfo.java | 2 +- .../IceGrid/ServerInstanceDescriptor.java | 2 +- .../IceGrid/ServerNotExistException.java | 2 +- .../zeroc/IceGrid/ServerStartException.java | 2 +- .../zeroc/IceGrid/ServerStopException.java | 2 +- .../IceGrid/ServerUnreachableException.java | 2 +- .../com/zeroc/IceGrid/ServiceDescriptor.java | 2 +- .../IceGrid/ServiceInstanceDescriptor.java | 2 +- .../com/zeroc/IceGrid/TemplateDescriptor.java | 2 +- .../IceStorm/com/zeroc/IceStorm/BadQoS.java | 2 +- .../IceStorm/IceMX/SubscriberMetrics.java | 2 +- .../zeroc/IceStorm/IceMX/TopicMetrics.java | 2 +- .../com/zeroc/IceStorm/InvalidSubscriber.java | 2 +- .../com/zeroc/IceStorm/LinkExists.java | 2 +- .../IceStorm/com/zeroc/IceStorm/LinkInfo.java | 2 +- .../com/zeroc/IceStorm/NoSuchLink.java | 2 +- .../com/zeroc/IceStorm/NoSuchTopic.java | 2 +- .../com/zeroc/IceStorm/TopicExists.java | 2 +- .../test/Ice/defaultValue/Test/Base.java | 2 +- .../test/Ice/defaultValue/Test/BaseEx.java | 2 +- .../test/Ice/defaultValue/Test/Derived.java | 2 +- .../test/Ice/defaultValue/Test/DerivedEx.java | 2 +- .../test/Ice/defaultValue/Test/Struct1.java | 2 +- .../test/Ice/defaultValue/Test/Struct2.java | 2 +- .../test/Ice/defaultValue/Test/Struct3.java | 2 +- .../swift/test/Ice/exceptions/Test/A.java | 2 +- .../swift/test/Ice/exceptions/Test/B.java | 2 +- .../swift/test/Ice/exceptions/Test/C.java | 2 +- .../swift/test/Ice/exceptions/Test/D.java | 2 +- .../swift/test/Ice/exceptions/Test/E.java | 2 +- .../swift/test/Ice/exceptions/Test/F.java | 2 +- .../swift/test/Ice/exceptions/Test/Mod/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MC/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MC/B.java | 2 +- .../swift/test/Ice/inheritance/Test/MC/C.java | 2 +- .../swift/test/Ice/inheritance/Test/MC/D.java | 2 +- .../swift/test/Ice/inheritance/Test/MD/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MD/B.java | 2 +- .../swift/test/Ice/inheritance/Test/MD/C.java | 2 +- .../swift/test/Ice/inheritance/Test/MD/D.java | 2 +- .../swift/test/Ice/inheritance/Test/ME/A.java | 2 +- .../swift/test/Ice/inheritance/Test/ME/B.java | 2 +- .../swift/test/Ice/inheritance/Test/ME/C.java | 2 +- .../swift/test/Ice/inheritance/Test/ME/D.java | 2 +- .../swift/test/Ice/inheritance/Test/MF/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MF/B.java | 2 +- .../swift/test/Ice/inheritance/Test/MF/C.java | 2 +- .../swift/test/Ice/inheritance/Test/MF/D.java | 2 +- .../swift/test/Ice/inheritance/Test/MG/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MG/B.java | 2 +- .../swift/test/Ice/inheritance/Test/MG/C.java | 2 +- .../swift/test/Ice/inheritance/Test/MG/D.java | 2 +- .../swift/test/Ice/inheritance/Test/MH/A.java | 2 +- .../swift/test/Ice/inheritance/Test/MH/B.java | 2 +- .../swift/test/Ice/inheritance/Test/MH/C.java | 2 +- .../swift/test/Ice/inheritance/Test/MH/D.java | 2 +- slice2java/swift/test/Ice/objects/Test/A.java | 2 +- .../swift/test/Ice/objects/Test/A1.java | 2 +- slice2java/swift/test/Ice/objects/Test/B.java | 2 +- .../swift/test/Ice/objects/Test/B1.java | 2 +- .../swift/test/Ice/objects/Test/Base.java | 2 +- .../swift/test/Ice/objects/Test/BaseEx.java | 2 +- slice2java/swift/test/Ice/objects/Test/C.java | 2 +- .../test/Ice/objects/Test/COneMember.java | 2 +- .../test/Ice/objects/Test/CTwoMembers.java | 2 +- slice2java/swift/test/Ice/objects/Test/D.java | 2 +- .../swift/test/Ice/objects/Test/D1.java | 2 +- .../swift/test/Ice/objects/Test/Derived.java | 2 +- slice2java/swift/test/Ice/objects/Test/E.java | 2 +- .../swift/test/Ice/objects/Test/EBase.java | 2 +- .../swift/test/Ice/objects/Test/EDerived.java | 2 +- .../test/Ice/objects/Test/EOneMember.java | 2 +- .../test/Ice/objects/Test/ETwoMembers.java | 2 +- slice2java/swift/test/Ice/objects/Test/F.java | 2 +- .../swift/test/Ice/objects/Test/F1.java | 2 +- .../swift/test/Ice/objects/Test/F3.java | 2 +- .../swift/test/Ice/objects/Test/Inner/A.java | 2 +- .../swift/test/Ice/objects/Test/Inner/Ex.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/A.java | 2 +- .../test/Ice/objects/Test/Inner/Sub/Ex.java | 2 +- slice2java/swift/test/Ice/objects/Test/K.java | 2 +- slice2java/swift/test/Ice/objects/Test/L.java | 2 +- slice2java/swift/test/Ice/objects/Test/M.java | 2 +- .../test/Ice/objects/Test/Recursive.java | 2 +- slice2java/swift/test/Ice/objects/Test/S.java | 2 +- .../test/Ice/objects/Test/SOneMember.java | 2 +- .../test/Ice/objects/Test/STwoMembers.java | 2 +- .../test/Ice/objects/Test/StructKey.java | 2 +- .../Ice/operations/Test/AnotherStruct.java | 2 +- .../test/Ice/operations/Test/MyClass1.java | 2 +- .../test/Ice/operations/Test/MyStruct.java | 2 +- .../test/Ice/operations/Test/MyStruct1.java | 2 +- .../test/Ice/operations/Test/Structure.java | 2 +- .../swift/test/Ice/optional/Test/A.java | 2 +- .../swift/test/Ice/optional/Test/B.java | 2 +- .../swift/test/Ice/optional/Test/C.java | 2 +- .../Ice/optional/Test/DerivedException.java | 2 +- .../swift/test/Ice/optional/Test/E.java | 2 +- .../swift/test/Ice/optional/Test/F.java | 2 +- .../test/Ice/optional/Test/FixedStruct.java | 2 +- .../swift/test/Ice/optional/Test/G.java | 2 +- .../swift/test/Ice/optional/Test/G1.java | 2 +- .../swift/test/Ice/optional/Test/G2.java | 2 +- .../test/Ice/optional/Test/MultiOptional.java | 2 +- .../test/Ice/optional/Test/OneOptional.java | 2 +- .../Ice/optional/Test/OptionalException.java | 2 +- .../Ice/optional/Test/OptionalWithCustom.java | 2 +- .../Ice/optional/Test/RequiredException.java | 2 +- .../test/Ice/optional/Test/SmallStruct.java | 2 +- .../test/Ice/optional/Test/VarStruct.java | 2 +- .../swift/test/Ice/optional/Test/WD.java | 2 +- slice2java/swift/test/Ice/scope/Test/C.java | 2 +- slice2java/swift/test/Ice/scope/Test/C1.java | 2 +- slice2java/swift/test/Ice/scope/Test/C2.java | 2 +- .../swift/test/Ice/scope/Test/Inner/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/C.java | 2 +- .../test/Ice/scope/Test/Inner/Inner2/S.java | 2 +- .../swift/test/Ice/scope/Test/Inner/S.java | 2 +- slice2java/swift/test/Ice/scope/Test/S.java | 2 +- slice2java/swift/test/Ice/scope/Test/S1.java | 2 +- slice2java/swift/test/Ice/scope/Test/S2.java | 2 +- .../Ice/slicing/exceptions/Test/Base.java | 2 +- .../slicing/exceptions/Test/KnownDerived.java | 2 +- .../exceptions/Test/KnownIntermediate.java | 2 +- .../exceptions/Test/KnownMostDerived.java | 2 +- .../exceptions/Test/UnknownDerived.java | 2 +- .../exceptions/Test/UnknownIntermediate.java | 2 +- .../exceptions/Test/UnknownMostDerived1.java | 2 +- .../exceptions/Test/UnknownMostDerived2.java | 2 +- .../test/Ice/slicing/objects/Test/B.java | 2 +- .../slicing/objects/Test/BaseException.java | 2 +- .../objects/Test/CompactPCDerived.java | 2 +- .../slicing/objects/Test/CompactPDerived.java | 2 +- .../test/Ice/slicing/objects/Test/D1.java | 2 +- .../test/Ice/slicing/objects/Test/D2.java | 2 +- .../test/Ice/slicing/objects/Test/D3.java | 2 +- .../test/Ice/slicing/objects/Test/D4.java | 2 +- .../objects/Test/DerivedException.java | 2 +- .../Ice/slicing/objects/Test/Forward.java | 2 +- .../test/Ice/slicing/objects/Test/Hidden.java | 2 +- .../Ice/slicing/objects/Test/MyClass.java | 2 +- .../test/Ice/slicing/objects/Test/PBase.java | 2 +- .../Ice/slicing/objects/Test/PCDerived.java | 2 +- .../Ice/slicing/objects/Test/PCDerived2.java | 2 +- .../Ice/slicing/objects/Test/PCDerived3.java | 2 +- .../Ice/slicing/objects/Test/PCUnknown.java | 2 +- .../Ice/slicing/objects/Test/PDerived.java | 2 +- .../test/Ice/slicing/objects/Test/PNode.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown.java | 2 +- .../Ice/slicing/objects/Test/PSUnknown2.java | 2 +- .../Ice/slicing/objects/Test/Preserved.java | 2 +- .../slicing/objects/Test/SBSKnownDerived.java | 2 +- .../objects/Test/SBSUnknownDerived.java | 2 +- .../test/Ice/slicing/objects/Test/SBase.java | 2 +- .../test/Ice/slicing/objects/Test/SS1.java | 2 +- .../test/Ice/slicing/objects/Test/SS2.java | 2 +- .../test/Ice/slicing/objects/Test/SS3.java | 2 +- .../Ice/slicing/objects/Test/SUnknown.java | 2 +- .../objects/Test/UnknownDerivedException.java | 2 +- .../test/Ice/stream/Test/LargeStruct.java | 2 +- .../swift/test/Ice/stream/Test/MyClass.java | 2 +- .../test/Ice/stream/Test/MyException.java | 2 +- .../test/Ice/stream/Test/OptionalClass.java | 2 +- .../Ice/stream/Test/Sub/NestedException.java | 2 +- .../Ice/stream/Test/Sub/NestedStruct.java | 2 +- .../stream/Test2/Sub2/NestedException2.java | 2 +- .../Ice/stream/Test2/Sub2/NestedStruct2.java | 2 +- .../swift/test/Slice/escape/Clash/Cls.java | 2 +- .../swift/test/Slice/escape/Clash/Ex.java | 2 +- .../swift/test/Slice/escape/Clash/St.java | 2 +- .../swift/test/Slice/escape/and/_return.java | 2 +- .../swift/test/Slice/escape/and/_switch.java | 2 +- .../swift/test/Slice/escape/and/as.java | 2 +- .../swift/test/Slice/escape/and/defer.java | 2 +- .../swift/test/Slice/escape/and/guard.java | 2 +- slice2js/cpp/src/DataStorm/Contract.js | 591 +++ slice2js/cpp/test/DataStorm/api/Test.js | 69 + slice2js/cpp/test/DataStorm/events/Test.js | 97 + slice2js/cpp/test/DataStorm/partial/Test.js | 53 + slice2js/cpp/test/DataStorm/types/Test.js | 97 + slice2js/cpp/test/Ice/exceptions/TestAMD.js | 4 +- slice2js/python/test/Ice/exceptions/Test.js | 4 +- slice2js/slice/DataStorm/Sample.js | 36 + .../+DataStormContract/ClearHistoryPolicy.m | 62 + .../DataStorm/+DataStormContract/DataSample.m | 98 + .../+DataStormContract/DataSampleSeq.m | 46 + .../+DataStormContract/DataSamples.m | 63 + .../+DataStormContract/DataSamplesSeq.m | 41 + .../+DataStormContract/ElementConfig.m | 78 + .../+DataStormContract/ElementData.m | 60 + .../+DataStormContract/ElementDataAck.m | 74 + .../+DataStormContract/ElementDataAckSeq.m | 37 + .../+DataStormContract/ElementDataSeq.m | 35 + .../+DataStormContract/ElementInfo.m | 70 + .../+DataStormContract/ElementInfoSeq.m | 42 + .../+DataStormContract/ElementSpec.m | 79 + .../+DataStormContract/ElementSpecAck.m | 79 + .../+DataStormContract/ElementSpecAckSeq.m | 36 + .../+DataStormContract/ElementSpecSeq.m | 36 + .../DataStorm/+DataStormContract/FilterInfo.m | 61 + .../+DataStormContract/LongLongDict.m | 56 + .../DataStorm/+DataStormContract/LookupPrx.m | 184 + .../DataStorm/+DataStormContract/NodePrx.m | 141 + .../+DataStormContract/PublisherSessionPrx.m | 45 + .../DataStorm/+DataStormContract/SessionPrx.m | 389 ++ .../+DataStormContract/SubscriberSessionPrx.m | 81 + .../DataStorm/+DataStormContract/TopicInfo.m | 63 + .../+DataStormContract/TopicInfoSeq.m | 41 + .../DataStorm/+DataStormContract/TopicSpec.m | 77 + .../src/DataStorm/+IceCompactId/TypeId_1.m | 6 + .../cpp/test/DataStorm/api/+Test/ClassKey.m | 42 + .../cpp/test/DataStorm/api/+Test/StructKey.m | 54 + .../cpp/test/DataStorm/events/+Test/Base.m | 42 + .../test/DataStorm/events/+Test/Extended.m | 52 + .../test/DataStorm/events/+Test/StructValue.m | 67 + .../cpp/test/DataStorm/partial/+Test/Stock.m | 66 + .../cpp/test/DataStorm/types/+Test/Base.m | 42 + .../cpp/test/DataStorm/types/+Test/Extended.m | 52 + .../test/DataStorm/types/+Test/StructValue.m | 67 + .../slice/DataStorm/+DataStorm/SampleEvent.m | 69 + .../DataStorm/+DataStorm/SampleEventSeq.m | 40 + slice2php/cpp/src/DataStorm/Contract.php | 778 ++++ slice2php/cpp/test/DataStorm/api/Test.php | 76 + slice2php/cpp/test/DataStorm/events/Test.php | 119 + slice2php/cpp/test/DataStorm/partial/Test.php | 47 + slice2php/cpp/test/DataStorm/types/Test.php | 119 + slice2php/slice/DataStorm/Sample.php | 42 + slice2py/cpp/src/DataStorm/Contract_ice.py | 1066 +++++ .../DataStorm/DataStormContract/__init__.py | 10 + .../cpp/test/DataStorm/api/Test/__init__.py | 10 + slice2py/cpp/test/DataStorm/api/Test_ice.py | 128 + .../test/DataStorm/events/Test/__init__.py | 10 + .../cpp/test/DataStorm/events/Test_ice.py | 177 + .../test/DataStorm/partial/Test/__init__.py | 10 + .../cpp/test/DataStorm/partial/Test_ice.py | 64 + .../cpp/test/DataStorm/types/Test/__init__.py | 10 + slice2py/cpp/test/DataStorm/types/Test_ice.py | 177 + .../slice/DataStorm/DataStorm/__init__.py | 10 + slice2py/slice/DataStorm/Sample_ice.py | 64 + slice2rb/cpp/src/DataStorm/Contract.rb | 764 ++++ slice2rb/cpp/test/DataStorm/api/Test.rb | 66 + slice2rb/cpp/test/DataStorm/events/Test.rb | 94 + slice2rb/cpp/test/DataStorm/partial/Test.rb | 59 + slice2rb/cpp/test/DataStorm/types/Test.rb | 94 + slice2rb/slice/DataStorm/Sample.rb | 75 + slice2swift/cpp/src/DataStorm/Contract.swift | 3101 ++++++++++++++ slice2swift/cpp/src/IceGrid/Internal.swift | 8 +- slice2swift/cpp/test/DataStorm/api/Test.swift | 116 + .../cpp/test/DataStorm/events/Test.swift | 170 + .../cpp/test/DataStorm/partial/Test.swift | 84 + .../cpp/test/DataStorm/types/Test.swift | 170 + .../cpp/test/Ice/exceptions/Test.swift | 4 +- slice2swift/slice/DataStorm/Sample.swift | 152 + slice2swift/slice/Glacier2/Router.swift | 8 +- 1635 files changed, 28878 insertions(+), 2207 deletions(-) create mode 100644 slice2cpp/cpp/src/DataStorm/Contract.cpp create mode 100644 slice2cpp/cpp/src/DataStorm/Contract.h create mode 100644 slice2cpp/cpp/test/DataStorm/api/Test.cpp create mode 100644 slice2cpp/cpp/test/DataStorm/api/Test.h create mode 100644 slice2cpp/cpp/test/DataStorm/events/Test.cpp create mode 100644 slice2cpp/cpp/test/DataStorm/events/Test.h create mode 100644 slice2cpp/cpp/test/DataStorm/partial/Test.cpp create mode 100644 slice2cpp/cpp/test/DataStorm/partial/Test.h create mode 100644 slice2cpp/cpp/test/DataStorm/types/Test.cpp create mode 100644 slice2cpp/cpp/test/DataStorm/types/Test.h create mode 100644 slice2cpp/slice/DataStorm/Sample.cpp create mode 100644 slice2cpp/slice/DataStorm/Sample.h create mode 100644 slice2cs/cpp/src/DataStorm/Contract.cs create mode 100644 slice2cs/cpp/test/DataStorm/api/Test.cs create mode 100644 slice2cs/cpp/test/DataStorm/events/Test.cs create mode 100644 slice2cs/cpp/test/DataStorm/partial/Test.cs create mode 100644 slice2cs/cpp/test/DataStorm/types/Test.cs create mode 100644 slice2cs/slice/DataStorm/Sample.cs create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/ClearHistoryPolicy.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/DataSampleSeqHelper.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/DataSamplesSeqHelper.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAckSeqHelper.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/ElementDataSeqHelper.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/ElementInfoSeqHelper.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAckSeqHelper.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecSeqHelper.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/LongLongDictHelper.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/Lookup.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/LookupPrx.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/Node.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/NodePrx.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/PublisherSession.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/PublisherSessionPrx.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/Session.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/SessionPrx.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/SubscriberSession.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/SubscriberSessionPrx.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/TopicInfoSeqHelper.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/_LookupPrxI.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/_NodePrxI.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/_PublisherSessionPrxI.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/_SessionPrxI.java create mode 100644 slice2java/cpp/src/DataStorm/DataStormContract/_SubscriberSessionPrxI.java create mode 100644 slice2java/cpp/src/DataStorm/com/zeroc/IceCompactId/TypeId_1.java create mode 100644 slice2java/cpp/test/DataStorm/api/Test/ClassKey.java create mode 100644 slice2java/cpp/test/DataStorm/api/Test/StructKey.java create mode 100644 slice2java/cpp/test/DataStorm/events/Test/Base.java create mode 100644 slice2java/cpp/test/DataStorm/events/Test/Extended.java create mode 100644 slice2java/cpp/test/DataStorm/events/Test/StructValue.java create mode 100644 slice2java/cpp/test/DataStorm/partial/Test/Stock.java create mode 100644 slice2java/cpp/test/DataStorm/types/Test/Base.java create mode 100644 slice2java/cpp/test/DataStorm/types/Test/Extended.java create mode 100644 slice2java/cpp/test/DataStorm/types/Test/StructValue.java create mode 100644 slice2java/slice/DataStorm/DataStorm/SampleEvent.java create mode 100644 slice2java/slice/DataStorm/DataStorm/SampleEventSeqHelper.java create mode 100644 slice2js/cpp/src/DataStorm/Contract.js create mode 100644 slice2js/cpp/test/DataStorm/api/Test.js create mode 100644 slice2js/cpp/test/DataStorm/events/Test.js create mode 100644 slice2js/cpp/test/DataStorm/partial/Test.js create mode 100644 slice2js/cpp/test/DataStorm/types/Test.js create mode 100644 slice2js/slice/DataStorm/Sample.js create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/ClearHistoryPolicy.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/DataSample.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/DataSampleSeq.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/DataSamples.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/DataSamplesSeq.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementConfig.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementData.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementDataAck.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementDataAckSeq.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementDataSeq.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementInfo.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementInfoSeq.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementSpec.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementSpecAck.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementSpecAckSeq.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementSpecSeq.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/FilterInfo.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/LongLongDict.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/LookupPrx.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/NodePrx.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/PublisherSessionPrx.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/SessionPrx.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/SubscriberSessionPrx.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/TopicInfo.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/TopicInfoSeq.m create mode 100644 slice2matlab/cpp/src/DataStorm/+DataStormContract/TopicSpec.m create mode 100644 slice2matlab/cpp/src/DataStorm/+IceCompactId/TypeId_1.m create mode 100644 slice2matlab/cpp/test/DataStorm/api/+Test/ClassKey.m create mode 100644 slice2matlab/cpp/test/DataStorm/api/+Test/StructKey.m create mode 100644 slice2matlab/cpp/test/DataStorm/events/+Test/Base.m create mode 100644 slice2matlab/cpp/test/DataStorm/events/+Test/Extended.m create mode 100644 slice2matlab/cpp/test/DataStorm/events/+Test/StructValue.m create mode 100644 slice2matlab/cpp/test/DataStorm/partial/+Test/Stock.m create mode 100644 slice2matlab/cpp/test/DataStorm/types/+Test/Base.m create mode 100644 slice2matlab/cpp/test/DataStorm/types/+Test/Extended.m create mode 100644 slice2matlab/cpp/test/DataStorm/types/+Test/StructValue.m create mode 100644 slice2matlab/slice/DataStorm/+DataStorm/SampleEvent.m create mode 100644 slice2matlab/slice/DataStorm/+DataStorm/SampleEventSeq.m create mode 100644 slice2php/cpp/src/DataStorm/Contract.php create mode 100644 slice2php/cpp/test/DataStorm/api/Test.php create mode 100644 slice2php/cpp/test/DataStorm/events/Test.php create mode 100644 slice2php/cpp/test/DataStorm/partial/Test.php create mode 100644 slice2php/cpp/test/DataStorm/types/Test.php create mode 100644 slice2php/slice/DataStorm/Sample.php create mode 100644 slice2py/cpp/src/DataStorm/Contract_ice.py create mode 100644 slice2py/cpp/src/DataStorm/DataStormContract/__init__.py create mode 100644 slice2py/cpp/test/DataStorm/api/Test/__init__.py create mode 100644 slice2py/cpp/test/DataStorm/api/Test_ice.py create mode 100644 slice2py/cpp/test/DataStorm/events/Test/__init__.py create mode 100644 slice2py/cpp/test/DataStorm/events/Test_ice.py create mode 100644 slice2py/cpp/test/DataStorm/partial/Test/__init__.py create mode 100644 slice2py/cpp/test/DataStorm/partial/Test_ice.py create mode 100644 slice2py/cpp/test/DataStorm/types/Test/__init__.py create mode 100644 slice2py/cpp/test/DataStorm/types/Test_ice.py create mode 100644 slice2py/slice/DataStorm/DataStorm/__init__.py create mode 100644 slice2py/slice/DataStorm/Sample_ice.py create mode 100644 slice2rb/cpp/src/DataStorm/Contract.rb create mode 100644 slice2rb/cpp/test/DataStorm/api/Test.rb create mode 100644 slice2rb/cpp/test/DataStorm/events/Test.rb create mode 100644 slice2rb/cpp/test/DataStorm/partial/Test.rb create mode 100644 slice2rb/cpp/test/DataStorm/types/Test.rb create mode 100644 slice2rb/slice/DataStorm/Sample.rb create mode 100644 slice2swift/cpp/src/DataStorm/Contract.swift create mode 100644 slice2swift/cpp/test/DataStorm/api/Test.swift create mode 100644 slice2swift/cpp/test/DataStorm/events/Test.swift create mode 100644 slice2swift/cpp/test/DataStorm/partial/Test.swift create mode 100644 slice2swift/cpp/test/DataStorm/types/Test.swift create mode 100644 slice2swift/slice/DataStorm/Sample.swift diff --git a/slice2cpp/cpp/src/DataStorm/Contract.cpp b/slice2cpp/cpp/src/DataStorm/Contract.cpp new file mode 100644 index 000000000000..06216b49e37e --- /dev/null +++ b/slice2cpp/cpp/src/DataStorm/Contract.cpp @@ -0,0 +1,1528 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +#define ICE_BUILDING_GENERATED_CODE +#include "Contract.h" +#include +#include +#include + +#if defined(_MSC_VER) +# pragma warning(disable : 4458) // declaration of ... hides class member +# pragma warning(disable : 4996) // ... was declared deprecated +#elif defined(__clang__) +# pragma clang diagnostic ignored "-Wshadow" +# pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +# pragma GCC diagnostic ignored "-Wshadow" +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + +#ifndef ICE_IGNORE_VERSION +# if ICE_INT_VERSION != 30850 +# error Ice version mismatch: an exact match is required for beta generated code +# endif +#endif + +namespace +{ + const ::IceInternal::FactoryTableInit iceC_factoryTableInit; + const ::IceInternal::DefaultValueFactoryInit<::DataStormContract::ElementConfig> iceC_DataStormContract_ElementConfig_init("::DataStormContract::ElementConfig"); + const ::IceInternal::CompactIdInit iceC_DataStormContract_ElementConfig_compactIdInit ("::DataStormContract::ElementConfig", 1); +} + +void +DataStormContract::SessionPrx::announceTopics(const TopicInfoSeq& iceP_topics, bool iceP_initialize, const ::Ice::Context& context) const +{ + ::IceInternal::makePromiseOutgoing(true, this, &SessionPrx::_iceI_announceTopics, iceP_topics, iceP_initialize, context).get(); +} + +::std::future +DataStormContract::SessionPrx::announceTopicsAsync(const TopicInfoSeq& iceP_topics, bool iceP_initialize, const ::Ice::Context& context) const +{ + return ::IceInternal::makePromiseOutgoing(false, this, &SessionPrx::_iceI_announceTopics, iceP_topics, iceP_initialize, context); +} + +::std::function +DataStormContract::SessionPrx::announceTopicsAsync(const TopicInfoSeq& iceP_topics, bool iceP_initialize, ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const +{ + return ::IceInternal::makeLambdaOutgoing(::std::move(response), ::std::move(ex), ::std::move(sent), this, &DataStormContract::SessionPrx::_iceI_announceTopics, iceP_topics, iceP_initialize, context); +} + +void +DataStormContract::SessionPrx::_iceI_announceTopics(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const TopicInfoSeq& iceP_topics, bool iceP_initialize, const ::Ice::Context& context) const +{ + static constexpr ::std::string_view operationName = "announceTopics"; + + outAsync->invoke(operationName, ::Ice::OperationMode::Normal, ::std::nullopt, context, + [&](::Ice::OutputStream* ostr) + { + ostr->writeAll(iceP_topics, iceP_initialize); + }, + nullptr); +} + +void +DataStormContract::SessionPrx::attachTopic(const TopicSpec& iceP_topic, const ::Ice::Context& context) const +{ + ::IceInternal::makePromiseOutgoing(true, this, &SessionPrx::_iceI_attachTopic, iceP_topic, context).get(); +} + +::std::future +DataStormContract::SessionPrx::attachTopicAsync(const TopicSpec& iceP_topic, const ::Ice::Context& context) const +{ + return ::IceInternal::makePromiseOutgoing(false, this, &SessionPrx::_iceI_attachTopic, iceP_topic, context); +} + +::std::function +DataStormContract::SessionPrx::attachTopicAsync(const TopicSpec& iceP_topic, ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const +{ + return ::IceInternal::makeLambdaOutgoing(::std::move(response), ::std::move(ex), ::std::move(sent), this, &DataStormContract::SessionPrx::_iceI_attachTopic, iceP_topic, context); +} + +void +DataStormContract::SessionPrx::_iceI_attachTopic(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const TopicSpec& iceP_topic, const ::Ice::Context& context) const +{ + static constexpr ::std::string_view operationName = "attachTopic"; + + outAsync->invoke(operationName, ::Ice::OperationMode::Normal, ::std::nullopt, context, + [&](::Ice::OutputStream* ostr) + { + ostr->writeAll(iceP_topic); + }, + nullptr); +} + +void +DataStormContract::SessionPrx::detachTopic(::std::int64_t iceP_topic, const ::Ice::Context& context) const +{ + ::IceInternal::makePromiseOutgoing(true, this, &SessionPrx::_iceI_detachTopic, iceP_topic, context).get(); +} + +::std::future +DataStormContract::SessionPrx::detachTopicAsync(::std::int64_t iceP_topic, const ::Ice::Context& context) const +{ + return ::IceInternal::makePromiseOutgoing(false, this, &SessionPrx::_iceI_detachTopic, iceP_topic, context); +} + +::std::function +DataStormContract::SessionPrx::detachTopicAsync(::std::int64_t iceP_topic, ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const +{ + return ::IceInternal::makeLambdaOutgoing(::std::move(response), ::std::move(ex), ::std::move(sent), this, &DataStormContract::SessionPrx::_iceI_detachTopic, iceP_topic, context); +} + +void +DataStormContract::SessionPrx::_iceI_detachTopic(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int64_t iceP_topic, const ::Ice::Context& context) const +{ + static constexpr ::std::string_view operationName = "detachTopic"; + + outAsync->invoke(operationName, ::Ice::OperationMode::Normal, ::std::nullopt, context, + [&](::Ice::OutputStream* ostr) + { + ostr->writeAll(iceP_topic); + }, + nullptr); +} + +void +DataStormContract::SessionPrx::attachTags(::std::int64_t iceP_topic, const ElementInfoSeq& iceP_tags, bool iceP_initialize, const ::Ice::Context& context) const +{ + ::IceInternal::makePromiseOutgoing(true, this, &SessionPrx::_iceI_attachTags, iceP_topic, iceP_tags, iceP_initialize, context).get(); +} + +::std::future +DataStormContract::SessionPrx::attachTagsAsync(::std::int64_t iceP_topic, const ElementInfoSeq& iceP_tags, bool iceP_initialize, const ::Ice::Context& context) const +{ + return ::IceInternal::makePromiseOutgoing(false, this, &SessionPrx::_iceI_attachTags, iceP_topic, iceP_tags, iceP_initialize, context); +} + +::std::function +DataStormContract::SessionPrx::attachTagsAsync(::std::int64_t iceP_topic, const ElementInfoSeq& iceP_tags, bool iceP_initialize, ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const +{ + return ::IceInternal::makeLambdaOutgoing(::std::move(response), ::std::move(ex), ::std::move(sent), this, &DataStormContract::SessionPrx::_iceI_attachTags, iceP_topic, iceP_tags, iceP_initialize, context); +} + +void +DataStormContract::SessionPrx::_iceI_attachTags(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int64_t iceP_topic, const ElementInfoSeq& iceP_tags, bool iceP_initialize, const ::Ice::Context& context) const +{ + static constexpr ::std::string_view operationName = "attachTags"; + + outAsync->invoke(operationName, ::Ice::OperationMode::Normal, ::std::nullopt, context, + [&](::Ice::OutputStream* ostr) + { + ostr->writeAll(iceP_topic, iceP_tags, iceP_initialize); + }, + nullptr); +} + +void +DataStormContract::SessionPrx::detachTags(::std::int64_t iceP_topic, const LongSeq& iceP_tags, const ::Ice::Context& context) const +{ + ::IceInternal::makePromiseOutgoing(true, this, &SessionPrx::_iceI_detachTags, iceP_topic, iceP_tags, context).get(); +} + +::std::future +DataStormContract::SessionPrx::detachTagsAsync(::std::int64_t iceP_topic, const LongSeq& iceP_tags, const ::Ice::Context& context) const +{ + return ::IceInternal::makePromiseOutgoing(false, this, &SessionPrx::_iceI_detachTags, iceP_topic, iceP_tags, context); +} + +::std::function +DataStormContract::SessionPrx::detachTagsAsync(::std::int64_t iceP_topic, const LongSeq& iceP_tags, ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const +{ + return ::IceInternal::makeLambdaOutgoing(::std::move(response), ::std::move(ex), ::std::move(sent), this, &DataStormContract::SessionPrx::_iceI_detachTags, iceP_topic, iceP_tags, context); +} + +void +DataStormContract::SessionPrx::_iceI_detachTags(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int64_t iceP_topic, const LongSeq& iceP_tags, const ::Ice::Context& context) const +{ + static constexpr ::std::string_view operationName = "detachTags"; + + outAsync->invoke(operationName, ::Ice::OperationMode::Normal, ::std::nullopt, context, + [&](::Ice::OutputStream* ostr) + { + ostr->writeAll(iceP_topic, iceP_tags); + }, + nullptr); +} + +void +DataStormContract::SessionPrx::announceElements(::std::int64_t iceP_topic, const ElementInfoSeq& iceP_keys, const ::Ice::Context& context) const +{ + ::IceInternal::makePromiseOutgoing(true, this, &SessionPrx::_iceI_announceElements, iceP_topic, iceP_keys, context).get(); +} + +::std::future +DataStormContract::SessionPrx::announceElementsAsync(::std::int64_t iceP_topic, const ElementInfoSeq& iceP_keys, const ::Ice::Context& context) const +{ + return ::IceInternal::makePromiseOutgoing(false, this, &SessionPrx::_iceI_announceElements, iceP_topic, iceP_keys, context); +} + +::std::function +DataStormContract::SessionPrx::announceElementsAsync(::std::int64_t iceP_topic, const ElementInfoSeq& iceP_keys, ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const +{ + return ::IceInternal::makeLambdaOutgoing(::std::move(response), ::std::move(ex), ::std::move(sent), this, &DataStormContract::SessionPrx::_iceI_announceElements, iceP_topic, iceP_keys, context); +} + +void +DataStormContract::SessionPrx::_iceI_announceElements(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int64_t iceP_topic, const ElementInfoSeq& iceP_keys, const ::Ice::Context& context) const +{ + static constexpr ::std::string_view operationName = "announceElements"; + + outAsync->invoke(operationName, ::Ice::OperationMode::Normal, ::std::nullopt, context, + [&](::Ice::OutputStream* ostr) + { + ostr->writeAll(iceP_topic, iceP_keys); + }, + nullptr); +} + +void +DataStormContract::SessionPrx::attachElements(::std::int64_t iceP_topic, const ElementSpecSeq& iceP_elements, bool iceP_initialize, const ::Ice::Context& context) const +{ + ::IceInternal::makePromiseOutgoing(true, this, &SessionPrx::_iceI_attachElements, iceP_topic, iceP_elements, iceP_initialize, context).get(); +} + +::std::future +DataStormContract::SessionPrx::attachElementsAsync(::std::int64_t iceP_topic, const ElementSpecSeq& iceP_elements, bool iceP_initialize, const ::Ice::Context& context) const +{ + return ::IceInternal::makePromiseOutgoing(false, this, &SessionPrx::_iceI_attachElements, iceP_topic, iceP_elements, iceP_initialize, context); +} + +::std::function +DataStormContract::SessionPrx::attachElementsAsync(::std::int64_t iceP_topic, const ElementSpecSeq& iceP_elements, bool iceP_initialize, ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const +{ + return ::IceInternal::makeLambdaOutgoing(::std::move(response), ::std::move(ex), ::std::move(sent), this, &DataStormContract::SessionPrx::_iceI_attachElements, iceP_topic, iceP_elements, iceP_initialize, context); +} + +void +DataStormContract::SessionPrx::_iceI_attachElements(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int64_t iceP_topic, const ElementSpecSeq& iceP_elements, bool iceP_initialize, const ::Ice::Context& context) const +{ + static constexpr ::std::string_view operationName = "attachElements"; + + outAsync->invoke(operationName, ::Ice::OperationMode::Normal, ::std::nullopt, context, + [&](::Ice::OutputStream* ostr) + { + ostr->writeAll(iceP_topic, iceP_elements, iceP_initialize); + ostr->writePendingValues(); + }, + nullptr); +} + +void +DataStormContract::SessionPrx::attachElementsAck(::std::int64_t iceP_topic, const ElementSpecAckSeq& iceP_elements, const ::Ice::Context& context) const +{ + ::IceInternal::makePromiseOutgoing(true, this, &SessionPrx::_iceI_attachElementsAck, iceP_topic, iceP_elements, context).get(); +} + +::std::future +DataStormContract::SessionPrx::attachElementsAckAsync(::std::int64_t iceP_topic, const ElementSpecAckSeq& iceP_elements, const ::Ice::Context& context) const +{ + return ::IceInternal::makePromiseOutgoing(false, this, &SessionPrx::_iceI_attachElementsAck, iceP_topic, iceP_elements, context); +} + +::std::function +DataStormContract::SessionPrx::attachElementsAckAsync(::std::int64_t iceP_topic, const ElementSpecAckSeq& iceP_elements, ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const +{ + return ::IceInternal::makeLambdaOutgoing(::std::move(response), ::std::move(ex), ::std::move(sent), this, &DataStormContract::SessionPrx::_iceI_attachElementsAck, iceP_topic, iceP_elements, context); +} + +void +DataStormContract::SessionPrx::_iceI_attachElementsAck(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int64_t iceP_topic, const ElementSpecAckSeq& iceP_elements, const ::Ice::Context& context) const +{ + static constexpr ::std::string_view operationName = "attachElementsAck"; + + outAsync->invoke(operationName, ::Ice::OperationMode::Normal, ::std::nullopt, context, + [&](::Ice::OutputStream* ostr) + { + ostr->writeAll(iceP_topic, iceP_elements); + ostr->writePendingValues(); + }, + nullptr); +} + +void +DataStormContract::SessionPrx::detachElements(::std::int64_t iceP_topic, const LongSeq& iceP_keys, const ::Ice::Context& context) const +{ + ::IceInternal::makePromiseOutgoing(true, this, &SessionPrx::_iceI_detachElements, iceP_topic, iceP_keys, context).get(); +} + +::std::future +DataStormContract::SessionPrx::detachElementsAsync(::std::int64_t iceP_topic, const LongSeq& iceP_keys, const ::Ice::Context& context) const +{ + return ::IceInternal::makePromiseOutgoing(false, this, &SessionPrx::_iceI_detachElements, iceP_topic, iceP_keys, context); +} + +::std::function +DataStormContract::SessionPrx::detachElementsAsync(::std::int64_t iceP_topic, const LongSeq& iceP_keys, ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const +{ + return ::IceInternal::makeLambdaOutgoing(::std::move(response), ::std::move(ex), ::std::move(sent), this, &DataStormContract::SessionPrx::_iceI_detachElements, iceP_topic, iceP_keys, context); +} + +void +DataStormContract::SessionPrx::_iceI_detachElements(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int64_t iceP_topic, const LongSeq& iceP_keys, const ::Ice::Context& context) const +{ + static constexpr ::std::string_view operationName = "detachElements"; + + outAsync->invoke(operationName, ::Ice::OperationMode::Normal, ::std::nullopt, context, + [&](::Ice::OutputStream* ostr) + { + ostr->writeAll(iceP_topic, iceP_keys); + }, + nullptr); +} + +void +DataStormContract::SessionPrx::initSamples(::std::int64_t iceP_topic, const DataSamplesSeq& iceP_samples, const ::Ice::Context& context) const +{ + ::IceInternal::makePromiseOutgoing(true, this, &SessionPrx::_iceI_initSamples, iceP_topic, iceP_samples, context).get(); +} + +::std::future +DataStormContract::SessionPrx::initSamplesAsync(::std::int64_t iceP_topic, const DataSamplesSeq& iceP_samples, const ::Ice::Context& context) const +{ + return ::IceInternal::makePromiseOutgoing(false, this, &SessionPrx::_iceI_initSamples, iceP_topic, iceP_samples, context); +} + +::std::function +DataStormContract::SessionPrx::initSamplesAsync(::std::int64_t iceP_topic, const DataSamplesSeq& iceP_samples, ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const +{ + return ::IceInternal::makeLambdaOutgoing(::std::move(response), ::std::move(ex), ::std::move(sent), this, &DataStormContract::SessionPrx::_iceI_initSamples, iceP_topic, iceP_samples, context); +} + +void +DataStormContract::SessionPrx::_iceI_initSamples(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int64_t iceP_topic, const DataSamplesSeq& iceP_samples, const ::Ice::Context& context) const +{ + static constexpr ::std::string_view operationName = "initSamples"; + + outAsync->invoke(operationName, ::Ice::OperationMode::Normal, ::std::nullopt, context, + [&](::Ice::OutputStream* ostr) + { + ostr->writeAll(iceP_topic, iceP_samples); + }, + nullptr); +} + +void +DataStormContract::SessionPrx::disconnected(const ::Ice::Context& context) const +{ + ::IceInternal::makePromiseOutgoing(true, this, &SessionPrx::_iceI_disconnected, context).get(); +} + +::std::future +DataStormContract::SessionPrx::disconnectedAsync(const ::Ice::Context& context) const +{ + return ::IceInternal::makePromiseOutgoing(false, this, &SessionPrx::_iceI_disconnected, context); +} + +::std::function +DataStormContract::SessionPrx::disconnectedAsync(::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const +{ + return ::IceInternal::makeLambdaOutgoing(::std::move(response), ::std::move(ex), ::std::move(sent), this, &DataStormContract::SessionPrx::_iceI_disconnected, context); +} + +void +DataStormContract::SessionPrx::_iceI_disconnected(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::Ice::Context& context) const +{ + static constexpr ::std::string_view operationName = "disconnected"; + + outAsync->invoke(operationName, ::Ice::OperationMode::Normal, ::std::nullopt, context, + nullptr, + nullptr); +} + +const char* +DataStormContract::SessionPrx::ice_staticId() noexcept +{ + return "::DataStormContract::Session"; +} + +const char* +DataStormContract::PublisherSessionPrx::ice_staticId() noexcept +{ + return "::DataStormContract::PublisherSession"; +} + +void +DataStormContract::SubscriberSessionPrx::s(::std::int64_t iceP_topicId, ::std::int64_t iceP_elementId, const DataSample& iceP_sample, const ::Ice::Context& context) const +{ + ::IceInternal::makePromiseOutgoing(true, this, &SubscriberSessionPrx::_iceI_s, iceP_topicId, iceP_elementId, iceP_sample, context).get(); +} + +::std::future +DataStormContract::SubscriberSessionPrx::sAsync(::std::int64_t iceP_topicId, ::std::int64_t iceP_elementId, const DataSample& iceP_sample, const ::Ice::Context& context) const +{ + return ::IceInternal::makePromiseOutgoing(false, this, &SubscriberSessionPrx::_iceI_s, iceP_topicId, iceP_elementId, iceP_sample, context); +} + +::std::function +DataStormContract::SubscriberSessionPrx::sAsync(::std::int64_t iceP_topicId, ::std::int64_t iceP_elementId, const DataSample& iceP_sample, ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const +{ + return ::IceInternal::makeLambdaOutgoing(::std::move(response), ::std::move(ex), ::std::move(sent), this, &DataStormContract::SubscriberSessionPrx::_iceI_s, iceP_topicId, iceP_elementId, iceP_sample, context); +} + +void +DataStormContract::SubscriberSessionPrx::_iceI_s(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::int64_t iceP_topicId, ::std::int64_t iceP_elementId, const DataSample& iceP_sample, const ::Ice::Context& context) const +{ + static constexpr ::std::string_view operationName = "s"; + + outAsync->invoke(operationName, ::Ice::OperationMode::Normal, ::std::nullopt, context, + [&](::Ice::OutputStream* ostr) + { + ostr->writeAll(iceP_topicId, iceP_elementId, iceP_sample); + }, + nullptr); +} + +const char* +DataStormContract::SubscriberSessionPrx::ice_staticId() noexcept +{ + return "::DataStormContract::SubscriberSession"; +} + +void +DataStormContract::NodePrx::initiateCreateSession(const ::std::optional& iceP_publisher, const ::Ice::Context& context) const +{ + ::IceInternal::makePromiseOutgoing(true, this, &NodePrx::_iceI_initiateCreateSession, iceP_publisher, context).get(); +} + +::std::future +DataStormContract::NodePrx::initiateCreateSessionAsync(const ::std::optional& iceP_publisher, const ::Ice::Context& context) const +{ + return ::IceInternal::makePromiseOutgoing(false, this, &NodePrx::_iceI_initiateCreateSession, iceP_publisher, context); +} + +::std::function +DataStormContract::NodePrx::initiateCreateSessionAsync(const ::std::optional& iceP_publisher, ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const +{ + return ::IceInternal::makeLambdaOutgoing(::std::move(response), ::std::move(ex), ::std::move(sent), this, &DataStormContract::NodePrx::_iceI_initiateCreateSession, iceP_publisher, context); +} + +void +DataStormContract::NodePrx::_iceI_initiateCreateSession(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::optional& iceP_publisher, const ::Ice::Context& context) const +{ + static constexpr ::std::string_view operationName = "initiateCreateSession"; + + outAsync->invoke(operationName, ::Ice::OperationMode::Normal, ::std::nullopt, context, + [&](::Ice::OutputStream* ostr) + { + ostr->writeAll(iceP_publisher); + }, + nullptr); +} + +void +DataStormContract::NodePrx::createSession(const ::std::optional& iceP_subscriber, const ::std::optional& iceP_session, bool iceP_fromRelay, const ::Ice::Context& context) const +{ + ::IceInternal::makePromiseOutgoing(true, this, &NodePrx::_iceI_createSession, iceP_subscriber, iceP_session, iceP_fromRelay, context).get(); +} + +::std::future +DataStormContract::NodePrx::createSessionAsync(const ::std::optional& iceP_subscriber, const ::std::optional& iceP_session, bool iceP_fromRelay, const ::Ice::Context& context) const +{ + return ::IceInternal::makePromiseOutgoing(false, this, &NodePrx::_iceI_createSession, iceP_subscriber, iceP_session, iceP_fromRelay, context); +} + +::std::function +DataStormContract::NodePrx::createSessionAsync(const ::std::optional& iceP_subscriber, const ::std::optional& iceP_session, bool iceP_fromRelay, ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const +{ + return ::IceInternal::makeLambdaOutgoing(::std::move(response), ::std::move(ex), ::std::move(sent), this, &DataStormContract::NodePrx::_iceI_createSession, iceP_subscriber, iceP_session, iceP_fromRelay, context); +} + +void +DataStormContract::NodePrx::_iceI_createSession(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::optional& iceP_subscriber, const ::std::optional& iceP_session, bool iceP_fromRelay, const ::Ice::Context& context) const +{ + static constexpr ::std::string_view operationName = "createSession"; + + outAsync->invoke(operationName, ::Ice::OperationMode::Normal, ::std::nullopt, context, + [&](::Ice::OutputStream* ostr) + { + ostr->writeAll(iceP_subscriber, iceP_session, iceP_fromRelay); + }, + nullptr); +} + +void +DataStormContract::NodePrx::confirmCreateSession(const ::std::optional& iceP_publisher, const ::std::optional& iceP_session, const ::Ice::Context& context) const +{ + ::IceInternal::makePromiseOutgoing(true, this, &NodePrx::_iceI_confirmCreateSession, iceP_publisher, iceP_session, context).get(); +} + +::std::future +DataStormContract::NodePrx::confirmCreateSessionAsync(const ::std::optional& iceP_publisher, const ::std::optional& iceP_session, const ::Ice::Context& context) const +{ + return ::IceInternal::makePromiseOutgoing(false, this, &NodePrx::_iceI_confirmCreateSession, iceP_publisher, iceP_session, context); +} + +::std::function +DataStormContract::NodePrx::confirmCreateSessionAsync(const ::std::optional& iceP_publisher, const ::std::optional& iceP_session, ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const +{ + return ::IceInternal::makeLambdaOutgoing(::std::move(response), ::std::move(ex), ::std::move(sent), this, &DataStormContract::NodePrx::_iceI_confirmCreateSession, iceP_publisher, iceP_session, context); +} + +void +DataStormContract::NodePrx::_iceI_confirmCreateSession(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const ::std::optional& iceP_publisher, const ::std::optional& iceP_session, const ::Ice::Context& context) const +{ + static constexpr ::std::string_view operationName = "confirmCreateSession"; + + outAsync->invoke(operationName, ::Ice::OperationMode::Normal, ::std::nullopt, context, + [&](::Ice::OutputStream* ostr) + { + ostr->writeAll(iceP_publisher, iceP_session); + }, + nullptr); +} + +const char* +DataStormContract::NodePrx::ice_staticId() noexcept +{ + return "::DataStormContract::Node"; +} + +void +DataStormContract::LookupPrx::announceTopicReader(::std::string_view iceP_topic, const ::std::optional& iceP_node, const ::Ice::Context& context) const +{ + ::IceInternal::makePromiseOutgoing(true, this, &LookupPrx::_iceI_announceTopicReader, iceP_topic, iceP_node, context).get(); +} + +::std::future +DataStormContract::LookupPrx::announceTopicReaderAsync(::std::string_view iceP_topic, const ::std::optional& iceP_node, const ::Ice::Context& context) const +{ + return ::IceInternal::makePromiseOutgoing(false, this, &LookupPrx::_iceI_announceTopicReader, iceP_topic, iceP_node, context); +} + +::std::function +DataStormContract::LookupPrx::announceTopicReaderAsync(::std::string_view iceP_topic, const ::std::optional& iceP_node, ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const +{ + return ::IceInternal::makeLambdaOutgoing(::std::move(response), ::std::move(ex), ::std::move(sent), this, &DataStormContract::LookupPrx::_iceI_announceTopicReader, iceP_topic, iceP_node, context); +} + +void +DataStormContract::LookupPrx::_iceI_announceTopicReader(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::string_view iceP_topic, const ::std::optional& iceP_node, const ::Ice::Context& context) const +{ + static constexpr ::std::string_view operationName = "announceTopicReader"; + + outAsync->invoke(operationName, ::Ice::OperationMode::Idempotent, ::std::nullopt, context, + [&](::Ice::OutputStream* ostr) + { + ostr->writeAll(iceP_topic, iceP_node); + }, + nullptr); +} + +void +DataStormContract::LookupPrx::announceTopicWriter(::std::string_view iceP_topic, const ::std::optional& iceP_node, const ::Ice::Context& context) const +{ + ::IceInternal::makePromiseOutgoing(true, this, &LookupPrx::_iceI_announceTopicWriter, iceP_topic, iceP_node, context).get(); +} + +::std::future +DataStormContract::LookupPrx::announceTopicWriterAsync(::std::string_view iceP_topic, const ::std::optional& iceP_node, const ::Ice::Context& context) const +{ + return ::IceInternal::makePromiseOutgoing(false, this, &LookupPrx::_iceI_announceTopicWriter, iceP_topic, iceP_node, context); +} + +::std::function +DataStormContract::LookupPrx::announceTopicWriterAsync(::std::string_view iceP_topic, const ::std::optional& iceP_node, ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const +{ + return ::IceInternal::makeLambdaOutgoing(::std::move(response), ::std::move(ex), ::std::move(sent), this, &DataStormContract::LookupPrx::_iceI_announceTopicWriter, iceP_topic, iceP_node, context); +} + +void +DataStormContract::LookupPrx::_iceI_announceTopicWriter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, ::std::string_view iceP_topic, const ::std::optional& iceP_node, const ::Ice::Context& context) const +{ + static constexpr ::std::string_view operationName = "announceTopicWriter"; + + outAsync->invoke(operationName, ::Ice::OperationMode::Idempotent, ::std::nullopt, context, + [&](::Ice::OutputStream* ostr) + { + ostr->writeAll(iceP_topic, iceP_node); + }, + nullptr); +} + +void +DataStormContract::LookupPrx::announceTopics(const StringSeq& iceP_readers, const StringSeq& iceP_writers, const ::std::optional& iceP_node, const ::Ice::Context& context) const +{ + ::IceInternal::makePromiseOutgoing(true, this, &LookupPrx::_iceI_announceTopics, iceP_readers, iceP_writers, iceP_node, context).get(); +} + +::std::future +DataStormContract::LookupPrx::announceTopicsAsync(const StringSeq& iceP_readers, const StringSeq& iceP_writers, const ::std::optional& iceP_node, const ::Ice::Context& context) const +{ + return ::IceInternal::makePromiseOutgoing(false, this, &LookupPrx::_iceI_announceTopics, iceP_readers, iceP_writers, iceP_node, context); +} + +::std::function +DataStormContract::LookupPrx::announceTopicsAsync(const StringSeq& iceP_readers, const StringSeq& iceP_writers, const ::std::optional& iceP_node, ::std::function response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const +{ + return ::IceInternal::makeLambdaOutgoing(::std::move(response), ::std::move(ex), ::std::move(sent), this, &DataStormContract::LookupPrx::_iceI_announceTopics, iceP_readers, iceP_writers, iceP_node, context); +} + +void +DataStormContract::LookupPrx::_iceI_announceTopics(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>& outAsync, const StringSeq& iceP_readers, const StringSeq& iceP_writers, const ::std::optional& iceP_node, const ::Ice::Context& context) const +{ + static constexpr ::std::string_view operationName = "announceTopics"; + + outAsync->invoke(operationName, ::Ice::OperationMode::Idempotent, ::std::nullopt, context, + [&](::Ice::OutputStream* ostr) + { + ostr->writeAll(iceP_readers, iceP_writers, iceP_node); + }, + nullptr); +} + +::std::optional<::DataStormContract::NodePrx> +DataStormContract::LookupPrx::createSession(const ::std::optional& iceP_node, const ::Ice::Context& context) const +{ + return ::IceInternal::makePromiseOutgoing<::std::optional>(true, this, &LookupPrx::_iceI_createSession, iceP_node, context).get(); +} + +::std::future<::std::optional<::DataStormContract::NodePrx>> +DataStormContract::LookupPrx::createSessionAsync(const ::std::optional& iceP_node, const ::Ice::Context& context) const +{ + return ::IceInternal::makePromiseOutgoing<::std::optional>(false, this, &LookupPrx::_iceI_createSession, iceP_node, context); +} + +::std::function +DataStormContract::LookupPrx::createSessionAsync(const ::std::optional& iceP_node, ::std::function)> response, ::std::function ex, ::std::function sent, const ::Ice::Context& context) const +{ + return ::IceInternal::makeLambdaOutgoing<::std::optional>(::std::move(response), ::std::move(ex), ::std::move(sent), this, &DataStormContract::LookupPrx::_iceI_createSession, iceP_node, context); +} + +void +DataStormContract::LookupPrx::_iceI_createSession(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>& outAsync, const ::std::optional& iceP_node, const ::Ice::Context& context) const +{ + static constexpr ::std::string_view operationName = "createSession"; + + _checkTwowayOnly(operationName); + outAsync->invoke(operationName, ::Ice::OperationMode::Normal, ::std::nullopt, context, + [&](::Ice::OutputStream* ostr) + { + ostr->writeAll(iceP_node); + }, + nullptr); +} + +const char* +DataStormContract::LookupPrx::ice_staticId() noexcept +{ + return "::DataStormContract::Lookup"; +} + +const char* +DataStormContract::ElementConfig::ice_staticId() noexcept +{ + return "::DataStormContract::ElementConfig"; +} + +const char* +DataStormContract::ElementConfig::ice_id() const noexcept +{ + return ice_staticId(); +} + +::Ice::ValuePtr +DataStormContract::ElementConfig::_iceCloneImpl() const +{ + return CloneEnabler::clone(*this); +} + +void +DataStormContract::ElementConfig::_iceWriteImpl(::Ice::OutputStream* ostr) const +{ + ostr->startSlice(ice_staticId(), -1, true); + ostr->writeAll({1, 2, 3, 4, 10, 11, 12}, this->facet, this->sampleFilter, this->name, this->priority, this->sampleCount, this->sampleLifetime, this->clearHistory); + ostr->endSlice(); +} + +void +DataStormContract::ElementConfig::_iceReadImpl(::Ice::InputStream* istr) +{ + istr->startSlice(); + istr->readAll({1, 2, 3, 4, 10, 11, 12}, this->facet, this->sampleFilter, this->name, this->priority, this->sampleCount, this->sampleLifetime, this->clearHistory); + istr->endSlice(); +} + +::std::vector<::std::string> +DataStormContract::Session::ice_ids(const ::Ice::Current&) const +{ + static const ::std::vector<::std::string> allTypeIds = {"::DataStormContract::Session", "::Ice::Object"}; + return allTypeIds; +} + +::std::string +DataStormContract::Session::ice_id(const ::Ice::Current&) const +{ + return ::std::string{ice_staticId()}; +} + +const char* +DataStormContract::Session::ice_staticId() noexcept +{ + return "::DataStormContract::Session"; +} + +/// \cond INTERNAL +void +DataStormContract::Session::_iceD_announceTopics(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + _iceCheckMode(::Ice::OperationMode::Normal, request.current().mode); + auto istr = &request.inputStream(); + istr->startEncapsulation(); + TopicInfoSeq iceP_topics; + bool iceP_initialize; + istr->readAll(iceP_topics, iceP_initialize); + istr->endEncapsulation(); + this->announceTopics(::std::move(iceP_topics), iceP_initialize, request.current()); + sendResponse(::Ice::makeEmptyOutgoingResponse(request.current())); +} +/// \endcond + +/// \cond INTERNAL +void +DataStormContract::Session::_iceD_attachTopic(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + _iceCheckMode(::Ice::OperationMode::Normal, request.current().mode); + auto istr = &request.inputStream(); + istr->startEncapsulation(); + TopicSpec iceP_topic; + istr->readAll(iceP_topic); + istr->endEncapsulation(); + this->attachTopic(::std::move(iceP_topic), request.current()); + sendResponse(::Ice::makeEmptyOutgoingResponse(request.current())); +} +/// \endcond + +/// \cond INTERNAL +void +DataStormContract::Session::_iceD_detachTopic(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + _iceCheckMode(::Ice::OperationMode::Normal, request.current().mode); + auto istr = &request.inputStream(); + istr->startEncapsulation(); + ::std::int64_t iceP_topic; + istr->readAll(iceP_topic); + istr->endEncapsulation(); + this->detachTopic(iceP_topic, request.current()); + sendResponse(::Ice::makeEmptyOutgoingResponse(request.current())); +} +/// \endcond + +/// \cond INTERNAL +void +DataStormContract::Session::_iceD_attachTags(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + _iceCheckMode(::Ice::OperationMode::Normal, request.current().mode); + auto istr = &request.inputStream(); + istr->startEncapsulation(); + ::std::int64_t iceP_topic; + ElementInfoSeq iceP_tags; + bool iceP_initialize; + istr->readAll(iceP_topic, iceP_tags, iceP_initialize); + istr->endEncapsulation(); + this->attachTags(iceP_topic, ::std::move(iceP_tags), iceP_initialize, request.current()); + sendResponse(::Ice::makeEmptyOutgoingResponse(request.current())); +} +/// \endcond + +/// \cond INTERNAL +void +DataStormContract::Session::_iceD_detachTags(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + _iceCheckMode(::Ice::OperationMode::Normal, request.current().mode); + auto istr = &request.inputStream(); + istr->startEncapsulation(); + ::std::int64_t iceP_topic; + LongSeq iceP_tags; + istr->readAll(iceP_topic, iceP_tags); + istr->endEncapsulation(); + this->detachTags(iceP_topic, ::std::move(iceP_tags), request.current()); + sendResponse(::Ice::makeEmptyOutgoingResponse(request.current())); +} +/// \endcond + +/// \cond INTERNAL +void +DataStormContract::Session::_iceD_announceElements(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + _iceCheckMode(::Ice::OperationMode::Normal, request.current().mode); + auto istr = &request.inputStream(); + istr->startEncapsulation(); + ::std::int64_t iceP_topic; + ElementInfoSeq iceP_keys; + istr->readAll(iceP_topic, iceP_keys); + istr->endEncapsulation(); + this->announceElements(iceP_topic, ::std::move(iceP_keys), request.current()); + sendResponse(::Ice::makeEmptyOutgoingResponse(request.current())); +} +/// \endcond + +/// \cond INTERNAL +void +DataStormContract::Session::_iceD_attachElements(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + _iceCheckMode(::Ice::OperationMode::Normal, request.current().mode); + auto istr = &request.inputStream(); + istr->startEncapsulation(); + ::std::int64_t iceP_topic; + ElementSpecSeq iceP_elements; + bool iceP_initialize; + istr->readAll(iceP_topic, iceP_elements, iceP_initialize); + istr->readPendingValues(); + istr->endEncapsulation(); + this->attachElements(iceP_topic, ::std::move(iceP_elements), iceP_initialize, request.current()); + sendResponse(::Ice::makeEmptyOutgoingResponse(request.current())); +} +/// \endcond + +/// \cond INTERNAL +void +DataStormContract::Session::_iceD_attachElementsAck(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + _iceCheckMode(::Ice::OperationMode::Normal, request.current().mode); + auto istr = &request.inputStream(); + istr->startEncapsulation(); + ::std::int64_t iceP_topic; + ElementSpecAckSeq iceP_elements; + istr->readAll(iceP_topic, iceP_elements); + istr->readPendingValues(); + istr->endEncapsulation(); + this->attachElementsAck(iceP_topic, ::std::move(iceP_elements), request.current()); + sendResponse(::Ice::makeEmptyOutgoingResponse(request.current())); +} +/// \endcond + +/// \cond INTERNAL +void +DataStormContract::Session::_iceD_detachElements(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + _iceCheckMode(::Ice::OperationMode::Normal, request.current().mode); + auto istr = &request.inputStream(); + istr->startEncapsulation(); + ::std::int64_t iceP_topic; + LongSeq iceP_keys; + istr->readAll(iceP_topic, iceP_keys); + istr->endEncapsulation(); + this->detachElements(iceP_topic, ::std::move(iceP_keys), request.current()); + sendResponse(::Ice::makeEmptyOutgoingResponse(request.current())); +} +/// \endcond + +/// \cond INTERNAL +void +DataStormContract::Session::_iceD_initSamples(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + _iceCheckMode(::Ice::OperationMode::Normal, request.current().mode); + auto istr = &request.inputStream(); + istr->startEncapsulation(); + ::std::int64_t iceP_topic; + DataSamplesSeq iceP_samples; + istr->readAll(iceP_topic, iceP_samples); + istr->endEncapsulation(); + this->initSamples(iceP_topic, ::std::move(iceP_samples), request.current()); + sendResponse(::Ice::makeEmptyOutgoingResponse(request.current())); +} +/// \endcond + +/// \cond INTERNAL +void +DataStormContract::Session::_iceD_disconnected(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + _iceCheckMode(::Ice::OperationMode::Normal, request.current().mode); + request.inputStream().skipEmptyEncapsulation(); + this->disconnected(request.current()); + sendResponse(::Ice::makeEmptyOutgoingResponse(request.current())); +} +/// \endcond + +/// \cond INTERNAL +void +DataStormContract::Session::dispatch(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + static constexpr ::std::string_view allOperations[] = {"announceElements", "announceTopics", "attachElements", "attachElementsAck", "attachTags", "attachTopic", "detachElements", "detachTags", "detachTopic", "disconnected", "ice_id", "ice_ids", "ice_isA", "ice_ping", "initSamples"}; + + const ::Ice::Current& current = request.current(); + ::std::pair r = ::std::equal_range(allOperations, allOperations + 15, current.operation); + if(r.first == r.second) + { + sendResponse(::Ice::makeOutgoingResponse(::std::make_exception_ptr(::Ice::OperationNotExistException(__FILE__, __LINE__)), current)); + return; + } + + switch(r.first - allOperations) + { + case 0: + { + _iceD_announceElements(request, ::std::move(sendResponse)); + break; + } + case 1: + { + _iceD_announceTopics(request, ::std::move(sendResponse)); + break; + } + case 2: + { + _iceD_attachElements(request, ::std::move(sendResponse)); + break; + } + case 3: + { + _iceD_attachElementsAck(request, ::std::move(sendResponse)); + break; + } + case 4: + { + _iceD_attachTags(request, ::std::move(sendResponse)); + break; + } + case 5: + { + _iceD_attachTopic(request, ::std::move(sendResponse)); + break; + } + case 6: + { + _iceD_detachElements(request, ::std::move(sendResponse)); + break; + } + case 7: + { + _iceD_detachTags(request, ::std::move(sendResponse)); + break; + } + case 8: + { + _iceD_detachTopic(request, ::std::move(sendResponse)); + break; + } + case 9: + { + _iceD_disconnected(request, ::std::move(sendResponse)); + break; + } + case 10: + { + _iceD_ice_id(request, ::std::move(sendResponse)); + break; + } + case 11: + { + _iceD_ice_ids(request, ::std::move(sendResponse)); + break; + } + case 12: + { + _iceD_ice_isA(request, ::std::move(sendResponse)); + break; + } + case 13: + { + _iceD_ice_ping(request, ::std::move(sendResponse)); + break; + } + case 14: + { + _iceD_initSamples(request, ::std::move(sendResponse)); + break; + } + default: + { + assert(false); + sendResponse(::Ice::makeOutgoingResponse(::std::make_exception_ptr(::Ice::OperationNotExistException(__FILE__, __LINE__)), current)); + } + } +} +/// \endcond + +::std::vector<::std::string> +DataStormContract::PublisherSession::ice_ids(const ::Ice::Current&) const +{ + static const ::std::vector<::std::string> allTypeIds = {"::DataStormContract::PublisherSession", "::DataStormContract::Session", "::Ice::Object"}; + return allTypeIds; +} + +::std::string +DataStormContract::PublisherSession::ice_id(const ::Ice::Current&) const +{ + return ::std::string{ice_staticId()}; +} + +const char* +DataStormContract::PublisherSession::ice_staticId() noexcept +{ + return "::DataStormContract::PublisherSession"; +} + +/// \cond INTERNAL +void +DataStormContract::PublisherSession::dispatch(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + static constexpr ::std::string_view allOperations[] = {"announceElements", "announceTopics", "attachElements", "attachElementsAck", "attachTags", "attachTopic", "detachElements", "detachTags", "detachTopic", "disconnected", "ice_id", "ice_ids", "ice_isA", "ice_ping", "initSamples"}; + + const ::Ice::Current& current = request.current(); + ::std::pair r = ::std::equal_range(allOperations, allOperations + 15, current.operation); + if(r.first == r.second) + { + sendResponse(::Ice::makeOutgoingResponse(::std::make_exception_ptr(::Ice::OperationNotExistException(__FILE__, __LINE__)), current)); + return; + } + + switch(r.first - allOperations) + { + case 0: + { + _iceD_announceElements(request, ::std::move(sendResponse)); + break; + } + case 1: + { + _iceD_announceTopics(request, ::std::move(sendResponse)); + break; + } + case 2: + { + _iceD_attachElements(request, ::std::move(sendResponse)); + break; + } + case 3: + { + _iceD_attachElementsAck(request, ::std::move(sendResponse)); + break; + } + case 4: + { + _iceD_attachTags(request, ::std::move(sendResponse)); + break; + } + case 5: + { + _iceD_attachTopic(request, ::std::move(sendResponse)); + break; + } + case 6: + { + _iceD_detachElements(request, ::std::move(sendResponse)); + break; + } + case 7: + { + _iceD_detachTags(request, ::std::move(sendResponse)); + break; + } + case 8: + { + _iceD_detachTopic(request, ::std::move(sendResponse)); + break; + } + case 9: + { + _iceD_disconnected(request, ::std::move(sendResponse)); + break; + } + case 10: + { + _iceD_ice_id(request, ::std::move(sendResponse)); + break; + } + case 11: + { + _iceD_ice_ids(request, ::std::move(sendResponse)); + break; + } + case 12: + { + _iceD_ice_isA(request, ::std::move(sendResponse)); + break; + } + case 13: + { + _iceD_ice_ping(request, ::std::move(sendResponse)); + break; + } + case 14: + { + _iceD_initSamples(request, ::std::move(sendResponse)); + break; + } + default: + { + assert(false); + sendResponse(::Ice::makeOutgoingResponse(::std::make_exception_ptr(::Ice::OperationNotExistException(__FILE__, __LINE__)), current)); + } + } +} +/// \endcond + +::std::vector<::std::string> +DataStormContract::SubscriberSession::ice_ids(const ::Ice::Current&) const +{ + static const ::std::vector<::std::string> allTypeIds = {"::DataStormContract::Session", "::DataStormContract::SubscriberSession", "::Ice::Object"}; + return allTypeIds; +} + +::std::string +DataStormContract::SubscriberSession::ice_id(const ::Ice::Current&) const +{ + return ::std::string{ice_staticId()}; +} + +const char* +DataStormContract::SubscriberSession::ice_staticId() noexcept +{ + return "::DataStormContract::SubscriberSession"; +} + +/// \cond INTERNAL +void +DataStormContract::SubscriberSession::_iceD_s(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + _iceCheckMode(::Ice::OperationMode::Normal, request.current().mode); + auto istr = &request.inputStream(); + istr->startEncapsulation(); + ::std::int64_t iceP_topicId; + ::std::int64_t iceP_elementId; + DataSample iceP_sample; + istr->readAll(iceP_topicId, iceP_elementId, iceP_sample); + istr->endEncapsulation(); + this->s(iceP_topicId, iceP_elementId, ::std::move(iceP_sample), request.current()); + sendResponse(::Ice::makeEmptyOutgoingResponse(request.current())); +} +/// \endcond + +/// \cond INTERNAL +void +DataStormContract::SubscriberSession::dispatch(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + static constexpr ::std::string_view allOperations[] = {"announceElements", "announceTopics", "attachElements", "attachElementsAck", "attachTags", "attachTopic", "detachElements", "detachTags", "detachTopic", "disconnected", "ice_id", "ice_ids", "ice_isA", "ice_ping", "initSamples", "s"}; + + const ::Ice::Current& current = request.current(); + ::std::pair r = ::std::equal_range(allOperations, allOperations + 16, current.operation); + if(r.first == r.second) + { + sendResponse(::Ice::makeOutgoingResponse(::std::make_exception_ptr(::Ice::OperationNotExistException(__FILE__, __LINE__)), current)); + return; + } + + switch(r.first - allOperations) + { + case 0: + { + _iceD_announceElements(request, ::std::move(sendResponse)); + break; + } + case 1: + { + _iceD_announceTopics(request, ::std::move(sendResponse)); + break; + } + case 2: + { + _iceD_attachElements(request, ::std::move(sendResponse)); + break; + } + case 3: + { + _iceD_attachElementsAck(request, ::std::move(sendResponse)); + break; + } + case 4: + { + _iceD_attachTags(request, ::std::move(sendResponse)); + break; + } + case 5: + { + _iceD_attachTopic(request, ::std::move(sendResponse)); + break; + } + case 6: + { + _iceD_detachElements(request, ::std::move(sendResponse)); + break; + } + case 7: + { + _iceD_detachTags(request, ::std::move(sendResponse)); + break; + } + case 8: + { + _iceD_detachTopic(request, ::std::move(sendResponse)); + break; + } + case 9: + { + _iceD_disconnected(request, ::std::move(sendResponse)); + break; + } + case 10: + { + _iceD_ice_id(request, ::std::move(sendResponse)); + break; + } + case 11: + { + _iceD_ice_ids(request, ::std::move(sendResponse)); + break; + } + case 12: + { + _iceD_ice_isA(request, ::std::move(sendResponse)); + break; + } + case 13: + { + _iceD_ice_ping(request, ::std::move(sendResponse)); + break; + } + case 14: + { + _iceD_initSamples(request, ::std::move(sendResponse)); + break; + } + case 15: + { + _iceD_s(request, ::std::move(sendResponse)); + break; + } + default: + { + assert(false); + sendResponse(::Ice::makeOutgoingResponse(::std::make_exception_ptr(::Ice::OperationNotExistException(__FILE__, __LINE__)), current)); + } + } +} +/// \endcond + +::std::vector<::std::string> +DataStormContract::Node::ice_ids(const ::Ice::Current&) const +{ + static const ::std::vector<::std::string> allTypeIds = {"::DataStormContract::Node", "::Ice::Object"}; + return allTypeIds; +} + +::std::string +DataStormContract::Node::ice_id(const ::Ice::Current&) const +{ + return ::std::string{ice_staticId()}; +} + +const char* +DataStormContract::Node::ice_staticId() noexcept +{ + return "::DataStormContract::Node"; +} + +/// \cond INTERNAL +void +DataStormContract::Node::_iceD_initiateCreateSession(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + _iceCheckMode(::Ice::OperationMode::Normal, request.current().mode); + auto istr = &request.inputStream(); + istr->startEncapsulation(); + ::std::optional iceP_publisher; + istr->readAll(iceP_publisher); + istr->endEncapsulation(); + this->initiateCreateSession(::std::move(iceP_publisher), request.current()); + sendResponse(::Ice::makeEmptyOutgoingResponse(request.current())); +} +/// \endcond + +/// \cond INTERNAL +void +DataStormContract::Node::_iceD_createSession(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + _iceCheckMode(::Ice::OperationMode::Normal, request.current().mode); + auto istr = &request.inputStream(); + istr->startEncapsulation(); + ::std::optional iceP_subscriber; + ::std::optional iceP_session; + bool iceP_fromRelay; + istr->readAll(iceP_subscriber, iceP_session, iceP_fromRelay); + istr->endEncapsulation(); + this->createSession(::std::move(iceP_subscriber), ::std::move(iceP_session), iceP_fromRelay, request.current()); + sendResponse(::Ice::makeEmptyOutgoingResponse(request.current())); +} +/// \endcond + +/// \cond INTERNAL +void +DataStormContract::Node::_iceD_confirmCreateSession(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + _iceCheckMode(::Ice::OperationMode::Normal, request.current().mode); + auto istr = &request.inputStream(); + istr->startEncapsulation(); + ::std::optional iceP_publisher; + ::std::optional iceP_session; + istr->readAll(iceP_publisher, iceP_session); + istr->endEncapsulation(); + this->confirmCreateSession(::std::move(iceP_publisher), ::std::move(iceP_session), request.current()); + sendResponse(::Ice::makeEmptyOutgoingResponse(request.current())); +} +/// \endcond + +/// \cond INTERNAL +void +DataStormContract::Node::dispatch(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + static constexpr ::std::string_view allOperations[] = {"confirmCreateSession", "createSession", "ice_id", "ice_ids", "ice_isA", "ice_ping", "initiateCreateSession"}; + + const ::Ice::Current& current = request.current(); + ::std::pair r = ::std::equal_range(allOperations, allOperations + 7, current.operation); + if(r.first == r.second) + { + sendResponse(::Ice::makeOutgoingResponse(::std::make_exception_ptr(::Ice::OperationNotExistException(__FILE__, __LINE__)), current)); + return; + } + + switch(r.first - allOperations) + { + case 0: + { + _iceD_confirmCreateSession(request, ::std::move(sendResponse)); + break; + } + case 1: + { + _iceD_createSession(request, ::std::move(sendResponse)); + break; + } + case 2: + { + _iceD_ice_id(request, ::std::move(sendResponse)); + break; + } + case 3: + { + _iceD_ice_ids(request, ::std::move(sendResponse)); + break; + } + case 4: + { + _iceD_ice_isA(request, ::std::move(sendResponse)); + break; + } + case 5: + { + _iceD_ice_ping(request, ::std::move(sendResponse)); + break; + } + case 6: + { + _iceD_initiateCreateSession(request, ::std::move(sendResponse)); + break; + } + default: + { + assert(false); + sendResponse(::Ice::makeOutgoingResponse(::std::make_exception_ptr(::Ice::OperationNotExistException(__FILE__, __LINE__)), current)); + } + } +} +/// \endcond + +::std::vector<::std::string> +DataStormContract::Lookup::ice_ids(const ::Ice::Current&) const +{ + static const ::std::vector<::std::string> allTypeIds = {"::DataStormContract::Lookup", "::Ice::Object"}; + return allTypeIds; +} + +::std::string +DataStormContract::Lookup::ice_id(const ::Ice::Current&) const +{ + return ::std::string{ice_staticId()}; +} + +const char* +DataStormContract::Lookup::ice_staticId() noexcept +{ + return "::DataStormContract::Lookup"; +} + +/// \cond INTERNAL +void +DataStormContract::Lookup::_iceD_announceTopicReader(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + _iceCheckMode(::Ice::OperationMode::Idempotent, request.current().mode); + auto istr = &request.inputStream(); + istr->startEncapsulation(); + ::std::string iceP_topic; + ::std::optional iceP_node; + istr->readAll(iceP_topic, iceP_node); + istr->endEncapsulation(); + this->announceTopicReader(::std::move(iceP_topic), ::std::move(iceP_node), request.current()); + sendResponse(::Ice::makeEmptyOutgoingResponse(request.current())); +} +/// \endcond + +/// \cond INTERNAL +void +DataStormContract::Lookup::_iceD_announceTopicWriter(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + _iceCheckMode(::Ice::OperationMode::Idempotent, request.current().mode); + auto istr = &request.inputStream(); + istr->startEncapsulation(); + ::std::string iceP_topic; + ::std::optional iceP_node; + istr->readAll(iceP_topic, iceP_node); + istr->endEncapsulation(); + this->announceTopicWriter(::std::move(iceP_topic), ::std::move(iceP_node), request.current()); + sendResponse(::Ice::makeEmptyOutgoingResponse(request.current())); +} +/// \endcond + +/// \cond INTERNAL +void +DataStormContract::Lookup::_iceD_announceTopics(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + _iceCheckMode(::Ice::OperationMode::Idempotent, request.current().mode); + auto istr = &request.inputStream(); + istr->startEncapsulation(); + StringSeq iceP_readers; + StringSeq iceP_writers; + ::std::optional iceP_node; + istr->readAll(iceP_readers, iceP_writers, iceP_node); + istr->endEncapsulation(); + this->announceTopics(::std::move(iceP_readers), ::std::move(iceP_writers), ::std::move(iceP_node), request.current()); + sendResponse(::Ice::makeEmptyOutgoingResponse(request.current())); +} +/// \endcond + +/// \cond INTERNAL +void +DataStormContract::Lookup::_iceD_createSession(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + _iceCheckMode(::Ice::OperationMode::Normal, request.current().mode); + auto istr = &request.inputStream(); + istr->startEncapsulation(); + ::std::optional iceP_node; + istr->readAll(iceP_node); + istr->endEncapsulation(); + const ::std::optional ret = this->createSession(::std::move(iceP_node), request.current()); + sendResponse(::Ice::makeOutgoingResponse([&](::Ice::OutputStream* ostr) + { + ostr->writeAll(ret); + }, + request.current())); +} +/// \endcond + +/// \cond INTERNAL +void +DataStormContract::Lookup::dispatch(::Ice::IncomingRequest& request, ::std::function sendResponse) +{ + static constexpr ::std::string_view allOperations[] = {"announceTopicReader", "announceTopicWriter", "announceTopics", "createSession", "ice_id", "ice_ids", "ice_isA", "ice_ping"}; + + const ::Ice::Current& current = request.current(); + ::std::pair r = ::std::equal_range(allOperations, allOperations + 8, current.operation); + if(r.first == r.second) + { + sendResponse(::Ice::makeOutgoingResponse(::std::make_exception_ptr(::Ice::OperationNotExistException(__FILE__, __LINE__)), current)); + return; + } + + switch(r.first - allOperations) + { + case 0: + { + _iceD_announceTopicReader(request, ::std::move(sendResponse)); + break; + } + case 1: + { + _iceD_announceTopicWriter(request, ::std::move(sendResponse)); + break; + } + case 2: + { + _iceD_announceTopics(request, ::std::move(sendResponse)); + break; + } + case 3: + { + _iceD_createSession(request, ::std::move(sendResponse)); + break; + } + case 4: + { + _iceD_ice_id(request, ::std::move(sendResponse)); + break; + } + case 5: + { + _iceD_ice_ids(request, ::std::move(sendResponse)); + break; + } + case 6: + { + _iceD_ice_isA(request, ::std::move(sendResponse)); + break; + } + case 7: + { + _iceD_ice_ping(request, ::std::move(sendResponse)); + break; + } + default: + { + assert(false); + sendResponse(::Ice::makeOutgoingResponse(::std::make_exception_ptr(::Ice::OperationNotExistException(__FILE__, __LINE__)), current)); + } + } +} +/// \endcond diff --git a/slice2cpp/cpp/src/DataStorm/Contract.h b/slice2cpp/cpp/src/DataStorm/Contract.h new file mode 100644 index 000000000000..a37170401964 --- /dev/null +++ b/slice2cpp/cpp/src/DataStorm/Contract.h @@ -0,0 +1,1391 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +#ifndef __Contract_h__ +#define __Contract_h__ + +#include +#include +#include +#include +#include + +#ifndef ICE_IGNORE_VERSION +# if ICE_INT_VERSION != 30850 +# error Ice version mismatch: an exact match is required for beta generated code +# endif +#endif + +namespace DataStormContract +{ + enum class ClearHistoryPolicy : ::std::uint8_t + { + OnAdd, + OnRemove, + OnAll, + OnAllExceptPartialUpdate, + Never + }; + + /** + * A sequence of bytes use to hold the encoded key or value + */ + using ByteSeq = ::std::vector; + + /** + * A sequence of long + */ + using LongSeq = ::std::vector<::std::int64_t>; + + /** + * A sequence of strings + */ + using StringSeq = ::std::vector<::std::string>; + + /** + * A dictionary of + */ + using LongLongDict = ::std::map<::std::int64_t, ::std::int64_t>; + + struct DataSample; + + using DataSampleSeq = std::deque; + + struct DataSamples; + + using DataSamplesSeq = ::std::vector; + + struct ElementInfo; + + using ElementInfoSeq = ::std::vector; + + struct TopicInfo; + + using TopicInfoSeq = ::std::vector; + + struct TopicSpec; + + struct FilterInfo; + + class ElementConfig; + using ElementConfigPtr = ::std::shared_ptr; + + struct ElementData; + + using ElementDataSeq = ::std::vector; + + struct ElementSpec; + + using ElementSpecSeq = ::std::vector; + + struct ElementDataAck; + + using ElementDataAckSeq = ::std::vector; + + struct ElementSpecAck; + + using ElementSpecAckSeq = ::std::vector; + + class SessionPrx; + + class PublisherSessionPrx; + + class SubscriberSessionPrx; + + class NodePrx; + + class LookupPrx; + +} + +namespace DataStormContract +{ + +class SessionPrx : public ::Ice::Proxy +{ +public: + + void announceTopics(const TopicInfoSeq& topics, bool initialize, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + [[nodiscard]] ::std::future announceTopicsAsync(const TopicInfoSeq& topics, bool initialize, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + ::std::function + announceTopicsAsync(const TopicInfoSeq& topics, bool initialize, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + /// \cond INTERNAL + void _iceI_announceTopics(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const TopicInfoSeq&, bool, const ::Ice::Context&) const; + /// \endcond + + void attachTopic(const TopicSpec& topic, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + [[nodiscard]] ::std::future attachTopicAsync(const TopicSpec& topic, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + ::std::function + attachTopicAsync(const TopicSpec& topic, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + /// \cond INTERNAL + void _iceI_attachTopic(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const TopicSpec&, const ::Ice::Context&) const; + /// \endcond + + void detachTopic(::std::int64_t topic, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + [[nodiscard]] ::std::future detachTopicAsync(::std::int64_t topic, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + ::std::function + detachTopicAsync(::std::int64_t topic, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + /// \cond INTERNAL + void _iceI_detachTopic(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int64_t, const ::Ice::Context&) const; + /// \endcond + + void attachTags(::std::int64_t topic, const ElementInfoSeq& tags, bool initialize, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + [[nodiscard]] ::std::future attachTagsAsync(::std::int64_t topic, const ElementInfoSeq& tags, bool initialize, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + ::std::function + attachTagsAsync(::std::int64_t topic, const ElementInfoSeq& tags, bool initialize, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + /// \cond INTERNAL + void _iceI_attachTags(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int64_t, const ElementInfoSeq&, bool, const ::Ice::Context&) const; + /// \endcond + + void detachTags(::std::int64_t topic, const LongSeq& tags, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + [[nodiscard]] ::std::future detachTagsAsync(::std::int64_t topic, const LongSeq& tags, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + ::std::function + detachTagsAsync(::std::int64_t topic, const LongSeq& tags, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + /// \cond INTERNAL + void _iceI_detachTags(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int64_t, const LongSeq&, const ::Ice::Context&) const; + /// \endcond + + void announceElements(::std::int64_t topic, const ElementInfoSeq& keys, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + [[nodiscard]] ::std::future announceElementsAsync(::std::int64_t topic, const ElementInfoSeq& keys, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + ::std::function + announceElementsAsync(::std::int64_t topic, const ElementInfoSeq& keys, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + /// \cond INTERNAL + void _iceI_announceElements(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int64_t, const ElementInfoSeq&, const ::Ice::Context&) const; + /// \endcond + + void attachElements(::std::int64_t topic, const ElementSpecSeq& elements, bool initialize, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + [[nodiscard]] ::std::future attachElementsAsync(::std::int64_t topic, const ElementSpecSeq& elements, bool initialize, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + ::std::function + attachElementsAsync(::std::int64_t topic, const ElementSpecSeq& elements, bool initialize, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + /// \cond INTERNAL + void _iceI_attachElements(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int64_t, const ElementSpecSeq&, bool, const ::Ice::Context&) const; + /// \endcond + + void attachElementsAck(::std::int64_t topic, const ElementSpecAckSeq& elements, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + [[nodiscard]] ::std::future attachElementsAckAsync(::std::int64_t topic, const ElementSpecAckSeq& elements, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + ::std::function + attachElementsAckAsync(::std::int64_t topic, const ElementSpecAckSeq& elements, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + /// \cond INTERNAL + void _iceI_attachElementsAck(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int64_t, const ElementSpecAckSeq&, const ::Ice::Context&) const; + /// \endcond + + void detachElements(::std::int64_t topic, const LongSeq& keys, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + [[nodiscard]] ::std::future detachElementsAsync(::std::int64_t topic, const LongSeq& keys, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + ::std::function + detachElementsAsync(::std::int64_t topic, const LongSeq& keys, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + /// \cond INTERNAL + void _iceI_detachElements(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int64_t, const LongSeq&, const ::Ice::Context&) const; + /// \endcond + + void initSamples(::std::int64_t topic, const DataSamplesSeq& samples, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + [[nodiscard]] ::std::future initSamplesAsync(::std::int64_t topic, const DataSamplesSeq& samples, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + ::std::function + initSamplesAsync(::std::int64_t topic, const DataSamplesSeq& samples, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + /// \cond INTERNAL + void _iceI_initSamples(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int64_t, const DataSamplesSeq&, const ::Ice::Context&) const; + /// \endcond + + void disconnected(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + [[nodiscard]] ::std::future disconnectedAsync(const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + ::std::function + disconnectedAsync(::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + /// \cond INTERNAL + void _iceI_disconnected(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::Ice::Context&) const; + /// \endcond + + /** + * Obtains the Slice type ID of this interface. + * @return The fully-scoped type ID. + */ + static const char* ice_staticId() noexcept; + SessionPrx(const SessionPrx& other) noexcept : ::Ice::ObjectPrx(other) + { + } + + SessionPrx(SessionPrx&& other) noexcept : ::Ice::ObjectPrx(::std::move(other)) + { + } + + SessionPrx(const ::Ice::CommunicatorPtr& communicator, std::string_view proxyString) : + ::Ice::ObjectPrx(communicator, proxyString) + { + } + + SessionPrx& operator=(const SessionPrx& rhs) noexcept + { + ::Ice::ObjectPrx::operator=(rhs); + return *this; + } + + SessionPrx& operator=(SessionPrx&& rhs) noexcept + { + ::Ice::ObjectPrx::operator=(::std::move(rhs)); + return *this; + } + + /// \cond INTERNAL + static SessionPrx _fromReference(::IceInternal::ReferencePtr ref) { return SessionPrx(::std::move(ref)); } + +protected: + + SessionPrx() = default; + + explicit SessionPrx(::IceInternal::ReferencePtr&& ref) : ::Ice::ObjectPrx(::std::move(ref)) + { + } + /// \endcond +}; + +class PublisherSessionPrx : public ::Ice::Proxy +{ +public: + + /** + * Obtains the Slice type ID of this interface. + * @return The fully-scoped type ID. + */ + static const char* ice_staticId() noexcept; + +#if defined(__GNUC__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wextra" // initialize all virtual bases in correct order +#endif + PublisherSessionPrx(const PublisherSessionPrx& other) noexcept : ::Ice::ObjectPrx(other) + { + } + + PublisherSessionPrx(PublisherSessionPrx&& other) noexcept : ::Ice::ObjectPrx(::std::move(other)) + { + } + + PublisherSessionPrx(const ::Ice::CommunicatorPtr& communicator, std::string_view proxyString) : + ::Ice::ObjectPrx(communicator, proxyString) + { + } + + PublisherSessionPrx& operator=(const PublisherSessionPrx& rhs) noexcept + { + ::Ice::ObjectPrx::operator=(rhs); + return *this; + } + + PublisherSessionPrx& operator=(PublisherSessionPrx&& rhs) noexcept + { + ::Ice::ObjectPrx::operator=(::std::move(rhs)); + return *this; + } + + /// \cond INTERNAL + static PublisherSessionPrx _fromReference(::IceInternal::ReferencePtr ref) { return PublisherSessionPrx(::std::move(ref)); } + +protected: + + PublisherSessionPrx() = default; + + explicit PublisherSessionPrx(::IceInternal::ReferencePtr&& ref) : ::Ice::ObjectPrx(::std::move(ref)) + { + } + /// \endcond + +#if defined(__GNUC__) +# pragma GCC diagnostic pop +#endif +}; + +class SubscriberSessionPrx : public ::Ice::Proxy +{ +public: + + void s(::std::int64_t topicId, ::std::int64_t elementId, const DataSample& sample, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + [[nodiscard]] ::std::future sAsync(::std::int64_t topicId, ::std::int64_t elementId, const DataSample& sample, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + ::std::function + sAsync(::std::int64_t topicId, ::std::int64_t elementId, const DataSample& sample, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + /// \cond INTERNAL + void _iceI_s(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::int64_t, ::std::int64_t, const DataSample&, const ::Ice::Context&) const; + /// \endcond + + /** + * Obtains the Slice type ID of this interface. + * @return The fully-scoped type ID. + */ + static const char* ice_staticId() noexcept; + +#if defined(__GNUC__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wextra" // initialize all virtual bases in correct order +#endif + SubscriberSessionPrx(const SubscriberSessionPrx& other) noexcept : ::Ice::ObjectPrx(other) + { + } + + SubscriberSessionPrx(SubscriberSessionPrx&& other) noexcept : ::Ice::ObjectPrx(::std::move(other)) + { + } + + SubscriberSessionPrx(const ::Ice::CommunicatorPtr& communicator, std::string_view proxyString) : + ::Ice::ObjectPrx(communicator, proxyString) + { + } + + SubscriberSessionPrx& operator=(const SubscriberSessionPrx& rhs) noexcept + { + ::Ice::ObjectPrx::operator=(rhs); + return *this; + } + + SubscriberSessionPrx& operator=(SubscriberSessionPrx&& rhs) noexcept + { + ::Ice::ObjectPrx::operator=(::std::move(rhs)); + return *this; + } + + /// \cond INTERNAL + static SubscriberSessionPrx _fromReference(::IceInternal::ReferencePtr ref) { return SubscriberSessionPrx(::std::move(ref)); } + +protected: + + SubscriberSessionPrx() = default; + + explicit SubscriberSessionPrx(::IceInternal::ReferencePtr&& ref) : ::Ice::ObjectPrx(::std::move(ref)) + { + } + /// \endcond + +#if defined(__GNUC__) +# pragma GCC diagnostic pop +#endif +}; + +class NodePrx : public ::Ice::Proxy +{ +public: + + void initiateCreateSession(const ::std::optional& publisher, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + [[nodiscard]] ::std::future initiateCreateSessionAsync(const ::std::optional& publisher, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + ::std::function + initiateCreateSessionAsync(const ::std::optional& publisher, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + /// \cond INTERNAL + void _iceI_initiateCreateSession(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::optional&, const ::Ice::Context&) const; + /// \endcond + + void createSession(const ::std::optional& subscriber, const ::std::optional& session, bool fromRelay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + [[nodiscard]] ::std::future createSessionAsync(const ::std::optional& subscriber, const ::std::optional& session, bool fromRelay, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + ::std::function + createSessionAsync(const ::std::optional& subscriber, const ::std::optional& session, bool fromRelay, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + /// \cond INTERNAL + void _iceI_createSession(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::optional&, const ::std::optional&, bool, const ::Ice::Context&) const; + /// \endcond + + void confirmCreateSession(const ::std::optional& publisher, const ::std::optional& session, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + [[nodiscard]] ::std::future confirmCreateSessionAsync(const ::std::optional& publisher, const ::std::optional& session, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + ::std::function + confirmCreateSessionAsync(const ::std::optional& publisher, const ::std::optional& session, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + /// \cond INTERNAL + void _iceI_confirmCreateSession(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const ::std::optional&, const ::std::optional&, const ::Ice::Context&) const; + /// \endcond + + /** + * Obtains the Slice type ID of this interface. + * @return The fully-scoped type ID. + */ + static const char* ice_staticId() noexcept; + NodePrx(const NodePrx& other) noexcept : ::Ice::ObjectPrx(other) + { + } + + NodePrx(NodePrx&& other) noexcept : ::Ice::ObjectPrx(::std::move(other)) + { + } + + NodePrx(const ::Ice::CommunicatorPtr& communicator, std::string_view proxyString) : + ::Ice::ObjectPrx(communicator, proxyString) + { + } + + NodePrx& operator=(const NodePrx& rhs) noexcept + { + ::Ice::ObjectPrx::operator=(rhs); + return *this; + } + + NodePrx& operator=(NodePrx&& rhs) noexcept + { + ::Ice::ObjectPrx::operator=(::std::move(rhs)); + return *this; + } + + /// \cond INTERNAL + static NodePrx _fromReference(::IceInternal::ReferencePtr ref) { return NodePrx(::std::move(ref)); } + +protected: + + NodePrx() = default; + + explicit NodePrx(::IceInternal::ReferencePtr&& ref) : ::Ice::ObjectPrx(::std::move(ref)) + { + } + /// \endcond +}; + +class LookupPrx : public ::Ice::Proxy +{ +public: + + void announceTopicReader(::std::string_view topic, const ::std::optional& node, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + [[nodiscard]] ::std::future announceTopicReaderAsync(::std::string_view topic, const ::std::optional& node, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + ::std::function + announceTopicReaderAsync(::std::string_view topic, const ::std::optional& node, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + /// \cond INTERNAL + void _iceI_announceTopicReader(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::string_view, const ::std::optional&, const ::Ice::Context&) const; + /// \endcond + + void announceTopicWriter(::std::string_view topic, const ::std::optional& node, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + [[nodiscard]] ::std::future announceTopicWriterAsync(::std::string_view topic, const ::std::optional& node, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + ::std::function + announceTopicWriterAsync(::std::string_view topic, const ::std::optional& node, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + /// \cond INTERNAL + void _iceI_announceTopicWriter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, ::std::string_view, const ::std::optional&, const ::Ice::Context&) const; + /// \endcond + + void announceTopics(const StringSeq& readers, const StringSeq& writers, const ::std::optional& node, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + [[nodiscard]] ::std::future announceTopicsAsync(const StringSeq& readers, const StringSeq& writers, const ::std::optional& node, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + ::std::function + announceTopicsAsync(const StringSeq& readers, const StringSeq& writers, const ::std::optional& node, ::std::function response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + /// \cond INTERNAL + void _iceI_announceTopics(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT>&, const StringSeq&, const StringSeq&, const ::std::optional&, const ::Ice::Context&) const; + /// \endcond + + ::std::optional createSession(const ::std::optional& node, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + [[nodiscard]] ::std::future<::std::optional> createSessionAsync(const ::std::optional& node, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + ::std::function + createSessionAsync(const ::std::optional& node, ::std::function)> response, ::std::function ex = nullptr, ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const; + + /// \cond INTERNAL + void _iceI_createSession(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::optional>>&, const ::std::optional&, const ::Ice::Context&) const; + /// \endcond + + /** + * Obtains the Slice type ID of this interface. + * @return The fully-scoped type ID. + */ + static const char* ice_staticId() noexcept; + LookupPrx(const LookupPrx& other) noexcept : ::Ice::ObjectPrx(other) + { + } + + LookupPrx(LookupPrx&& other) noexcept : ::Ice::ObjectPrx(::std::move(other)) + { + } + + LookupPrx(const ::Ice::CommunicatorPtr& communicator, std::string_view proxyString) : + ::Ice::ObjectPrx(communicator, proxyString) + { + } + + LookupPrx& operator=(const LookupPrx& rhs) noexcept + { + ::Ice::ObjectPrx::operator=(rhs); + return *this; + } + + LookupPrx& operator=(LookupPrx&& rhs) noexcept + { + ::Ice::ObjectPrx::operator=(::std::move(rhs)); + return *this; + } + + /// \cond INTERNAL + static LookupPrx _fromReference(::IceInternal::ReferencePtr ref) { return LookupPrx(::std::move(ref)); } + +protected: + + LookupPrx() = default; + + explicit LookupPrx(::IceInternal::ReferencePtr&& ref) : ::Ice::ObjectPrx(::std::move(ref)) + { + } + /// \endcond +}; + +} + +namespace DataStormContract +{ + +struct DataSample +{ + /** + * The sample id. + */ + ::std::int64_t id; + /** + * The key id. + */ + ::std::int64_t keyId; + /** + * The key value if the key ID <= 0. + */ + ::DataStormContract::ByteSeq keyValue; + /** + * The timestamp of the sample (write time). + */ + ::std::int64_t timestamp; + /** + * The update tag if the sample event is PartialUpdate. + */ + ::std::int64_t tag; + /** + * The sample event. + */ + ::DataStorm::SampleEvent event; + /** + * The value of the sample. + */ + ::DataStormContract::ByteSeq value; + + /** + * Obtains a tuple containing all of the struct's data members. + * @return The data members in a tuple. + */ + std::tuple ice_tuple() const + { + return std::tie(id, keyId, keyValue, timestamp, tag, event, value); + } +}; + +struct DataSamples +{ + /** + * The id of the writer or reader. + */ + ::std::int64_t id; + /** + * The samples. + */ + ::DataStormContract::DataSampleSeq samples; + + /** + * Obtains a tuple containing all of the struct's data members. + * @return The data members in a tuple. + */ + std::tuple ice_tuple() const + { + return std::tie(id, samples); + } +}; + +struct ElementInfo +{ + /** + * The key or filter id. + */ + ::std::int64_t id; + /** + * The filter name. + */ + ::std::string name; + /** + * The key or filter value. + */ + ::DataStormContract::ByteSeq value; + + /** + * Obtains a tuple containing all of the struct's data members. + * @return The data members in a tuple. + */ + std::tuple ice_tuple() const + { + return std::tie(id, name, value); + } +}; + +struct TopicInfo +{ + /** + * The topic name. + */ + ::std::string name; + /** + * The id of topic writers or readers. + */ + ::DataStormContract::LongSeq ids; + + /** + * Obtains a tuple containing all of the struct's data members. + * @return The data members in a tuple. + */ + std::tuple ice_tuple() const + { + return std::tie(name, ids); + } +}; + +struct TopicSpec +{ + /** + * The id of the topic. + */ + ::std::int64_t id; + /** + * The name of the topic. + */ + ::std::string name; + /** + * The topic keys or filters. + */ + ::DataStormContract::ElementInfoSeq elements; + /** + * The topic update tags. + */ + ::DataStormContract::ElementInfoSeq tags; + + /** + * Obtains a tuple containing all of the struct's data members. + * @return The data members in a tuple. + */ + std::tuple ice_tuple() const + { + return std::tie(id, name, elements, tags); + } +}; + +struct FilterInfo +{ + ::std::string name; + ::DataStormContract::ByteSeq criteria; + + /** + * Obtains a tuple containing all of the struct's data members. + * @return The data members in a tuple. + */ + std::tuple ice_tuple() const + { + return std::tie(name, criteria); + } +}; + +class ElementConfig : public ::Ice::Value +{ +public: + /** + * Default constructor. + */ + ElementConfig() noexcept = default; + + /** + * One-shot constructor to initialize all data members. + */ + ElementConfig(::std::optional<::std::string> facet, ::std::optional<::DataStormContract::FilterInfo> sampleFilter, ::std::optional<::std::string> name, ::std::optional<::std::int32_t> priority, ::std::optional<::std::int32_t> sampleCount, ::std::optional<::std::int32_t> sampleLifetime, ::std::optional<::DataStormContract::ClearHistoryPolicy> clearHistory) noexcept : + facet(::std::move(facet)), + sampleFilter(::std::move(sampleFilter)), + name(::std::move(name)), + priority(priority), + sampleCount(sampleCount), + sampleLifetime(sampleLifetime), + clearHistory(clearHistory) + { + } + + /** + * Obtains the Slice type ID of this value. + * @return The fully-scoped type ID. + */ + static const char* ice_staticId() noexcept; + + const char* ice_id() const noexcept override; + + /** + * Obtains a tuple containing all of the value's data members. + * @return The data members in a tuple. + */ + std::tuple&, const ::std::optional<::DataStormContract::FilterInfo>&, const ::std::optional<::std::string>&, const ::std::optional<::std::int32_t>&, const ::std::optional<::std::int32_t>&, const ::std::optional<::std::int32_t>&, const ::std::optional<::DataStormContract::ClearHistoryPolicy>&> ice_tuple() const + { + return std::tie(facet, sampleFilter, name, priority, sampleCount, sampleLifetime, clearHistory); + } + + /** + * Creates a shallow polymorphic copy of this instance. + * @return The cloned value. + */ + ElementConfigPtr ice_clone() const { return ::std::static_pointer_cast(_iceCloneImpl()); } + + ::std::optional<::std::string> facet; + ::std::optional<::DataStormContract::FilterInfo> sampleFilter; + ::std::optional<::std::string> name; + ::std::optional<::std::int32_t> priority; + ::std::optional<::std::int32_t> sampleCount; + ::std::optional<::std::int32_t> sampleLifetime; + ::std::optional<::DataStormContract::ClearHistoryPolicy> clearHistory; + +protected: + ElementConfig(const ElementConfig&) = default; + + ::Ice::ValuePtr _iceCloneImpl() const override; + void _iceWriteImpl(::Ice::OutputStream*) const override; + + void _iceReadImpl(::Ice::InputStream*) override; +}; + +struct ElementData +{ + /** + * The id of the writer or reader + */ + ::std::int64_t id; + /** + * The config of the writer or reader + */ + ::DataStormContract::ElementConfigPtr config; + /** + * The lastIds received by the reader. + */ + ::DataStormContract::LongLongDict lastIds; + + /** + * Obtains a tuple containing all of the struct's data members. + * @return The data members in a tuple. + */ + std::tuple ice_tuple() const + { + return std::tie(id, config, lastIds); + } +}; + +struct ElementSpec +{ + /** + * The readers and writers associated with the key or filter. + */ + ::DataStormContract::ElementDataSeq elements; + /** + * The id of the key or filter + */ + ::std::int64_t id; + /** + * The name of the filter. + */ + ::std::string name; + /** + * The value of the key or filter. + */ + ::DataStormContract::ByteSeq value; + /** + * The id of the key or filter from the peer. + */ + ::std::int64_t peerId; + /** + * The name of the filter from the peer. + */ + ::std::string peerName; + + /** + * Obtains a tuple containing all of the struct's data members. + * @return The data members in a tuple. + */ + std::tuple ice_tuple() const + { + return std::tie(elements, id, name, value, peerId, peerName); + } +}; + +struct ElementDataAck +{ + /** + * The id of the writer or filter. + */ + ::std::int64_t id; + /** + * The config of the writer or reader + */ + ::DataStormContract::ElementConfigPtr config; + /** + * The lastIds received by the reader. + */ + ::DataStormContract::LongLongDict lastIds; + /** + * The samples of the writer or reader + */ + ::DataStormContract::DataSampleSeq samples; + /** + * The id of the writer or reader on the peer. + */ + ::std::int64_t peerId; + + /** + * Obtains a tuple containing all of the struct's data members. + * @return The data members in a tuple. + */ + std::tuple ice_tuple() const + { + return std::tie(id, config, lastIds, samples, peerId); + } +}; + +struct ElementSpecAck +{ + /** + * The readers or writers associated with the key or filter. + */ + ::DataStormContract::ElementDataAckSeq elements; + /** + * The id of the key or filter. + */ + ::std::int64_t id; + /** + * The name of the filter. + */ + ::std::string name; + /** + * The key or filter value. + */ + ::DataStormContract::ByteSeq value; + /** + * The id of the key or filter on the peer. + */ + ::std::int64_t peerId; + /** + * The name of the filter on the peer. + */ + ::std::string peerName; + + /** + * Obtains a tuple containing all of the struct's data members. + * @return The data members in a tuple. + */ + std::tuple ice_tuple() const + { + return std::tie(elements, id, name, value, peerId, peerName); + } +}; + +using Ice::Tuple::operator<; +using Ice::Tuple::operator<=; +using Ice::Tuple::operator>; +using Ice::Tuple::operator>=; +using Ice::Tuple::operator==; +using Ice::Tuple::operator!=; + +} + +namespace DataStormContract +{ + +class Session : public virtual ::Ice::Object +{ +public: + + using ProxyType = SessionPrx; + + /** + * Obtains a list of the Slice type IDs representing the interfaces supported by this object. + * @param current The Current object for the invocation. + * @return A list of fully-scoped type IDs. + */ + ::std::vector<::std::string> ice_ids(const ::Ice::Current& current) const override; + + /** + * Obtains a Slice type ID representing the most-derived interface supported by this object. + * @param current The Current object for the invocation. + * @return A fully-scoped type ID. + */ + ::std::string ice_id(const ::Ice::Current& current) const override; + + /** + * Obtains the Slice type ID corresponding to this interface. + * @return A fully-scoped type ID. + */ + static const char* ice_staticId() noexcept; + + virtual void announceTopics(TopicInfoSeq topics, bool initialize, const ::Ice::Current& current) = 0; + /// \cond INTERNAL + void _iceD_announceTopics(::Ice::IncomingRequest&, ::std::function); + /// \endcond + + virtual void attachTopic(TopicSpec topic, const ::Ice::Current& current) = 0; + /// \cond INTERNAL + void _iceD_attachTopic(::Ice::IncomingRequest&, ::std::function); + /// \endcond + + virtual void detachTopic(::std::int64_t topic, const ::Ice::Current& current) = 0; + /// \cond INTERNAL + void _iceD_detachTopic(::Ice::IncomingRequest&, ::std::function); + /// \endcond + + virtual void attachTags(::std::int64_t topic, ElementInfoSeq tags, bool initialize, const ::Ice::Current& current) = 0; + /// \cond INTERNAL + void _iceD_attachTags(::Ice::IncomingRequest&, ::std::function); + /// \endcond + + virtual void detachTags(::std::int64_t topic, LongSeq tags, const ::Ice::Current& current) = 0; + /// \cond INTERNAL + void _iceD_detachTags(::Ice::IncomingRequest&, ::std::function); + /// \endcond + + virtual void announceElements(::std::int64_t topic, ElementInfoSeq keys, const ::Ice::Current& current) = 0; + /// \cond INTERNAL + void _iceD_announceElements(::Ice::IncomingRequest&, ::std::function); + /// \endcond + + virtual void attachElements(::std::int64_t topic, ElementSpecSeq elements, bool initialize, const ::Ice::Current& current) = 0; + /// \cond INTERNAL + void _iceD_attachElements(::Ice::IncomingRequest&, ::std::function); + /// \endcond + + virtual void attachElementsAck(::std::int64_t topic, ElementSpecAckSeq elements, const ::Ice::Current& current) = 0; + /// \cond INTERNAL + void _iceD_attachElementsAck(::Ice::IncomingRequest&, ::std::function); + /// \endcond + + virtual void detachElements(::std::int64_t topic, LongSeq keys, const ::Ice::Current& current) = 0; + /// \cond INTERNAL + void _iceD_detachElements(::Ice::IncomingRequest&, ::std::function); + /// \endcond + + virtual void initSamples(::std::int64_t topic, DataSamplesSeq samples, const ::Ice::Current& current) = 0; + /// \cond INTERNAL + void _iceD_initSamples(::Ice::IncomingRequest&, ::std::function); + /// \endcond + + virtual void disconnected(const ::Ice::Current& current) = 0; + /// \cond INTERNAL + void _iceD_disconnected(::Ice::IncomingRequest&, ::std::function); + /// \endcond + + /// \cond INTERNAL + void dispatch(::Ice::IncomingRequest&, ::std::function) override; + /// \endcond +}; + +using SessionPtr = ::std::shared_ptr; + +class PublisherSession : public virtual Session +{ +public: + + using ProxyType = PublisherSessionPrx; + + /** + * Obtains a list of the Slice type IDs representing the interfaces supported by this object. + * @param current The Current object for the invocation. + * @return A list of fully-scoped type IDs. + */ + ::std::vector<::std::string> ice_ids(const ::Ice::Current& current) const override; + + /** + * Obtains a Slice type ID representing the most-derived interface supported by this object. + * @param current The Current object for the invocation. + * @return A fully-scoped type ID. + */ + ::std::string ice_id(const ::Ice::Current& current) const override; + + /** + * Obtains the Slice type ID corresponding to this interface. + * @return A fully-scoped type ID. + */ + static const char* ice_staticId() noexcept; + + /// \cond INTERNAL + void dispatch(::Ice::IncomingRequest&, ::std::function) override; + /// \endcond +}; + +using PublisherSessionPtr = ::std::shared_ptr; + +class SubscriberSession : public virtual Session +{ +public: + + using ProxyType = SubscriberSessionPrx; + + /** + * Obtains a list of the Slice type IDs representing the interfaces supported by this object. + * @param current The Current object for the invocation. + * @return A list of fully-scoped type IDs. + */ + ::std::vector<::std::string> ice_ids(const ::Ice::Current& current) const override; + + /** + * Obtains a Slice type ID representing the most-derived interface supported by this object. + * @param current The Current object for the invocation. + * @return A fully-scoped type ID. + */ + ::std::string ice_id(const ::Ice::Current& current) const override; + + /** + * Obtains the Slice type ID corresponding to this interface. + * @return A fully-scoped type ID. + */ + static const char* ice_staticId() noexcept; + + virtual void s(::std::int64_t topicId, ::std::int64_t elementId, DataSample sample, const ::Ice::Current& current) = 0; + /// \cond INTERNAL + void _iceD_s(::Ice::IncomingRequest&, ::std::function); + /// \endcond + + /// \cond INTERNAL + void dispatch(::Ice::IncomingRequest&, ::std::function) override; + /// \endcond +}; + +using SubscriberSessionPtr = ::std::shared_ptr; + +class Node : public virtual ::Ice::Object +{ +public: + + using ProxyType = NodePrx; + + /** + * Obtains a list of the Slice type IDs representing the interfaces supported by this object. + * @param current The Current object for the invocation. + * @return A list of fully-scoped type IDs. + */ + ::std::vector<::std::string> ice_ids(const ::Ice::Current& current) const override; + + /** + * Obtains a Slice type ID representing the most-derived interface supported by this object. + * @param current The Current object for the invocation. + * @return A fully-scoped type ID. + */ + ::std::string ice_id(const ::Ice::Current& current) const override; + + /** + * Obtains the Slice type ID corresponding to this interface. + * @return A fully-scoped type ID. + */ + static const char* ice_staticId() noexcept; + + virtual void initiateCreateSession(::std::optional publisher, const ::Ice::Current& current) = 0; + /// \cond INTERNAL + void _iceD_initiateCreateSession(::Ice::IncomingRequest&, ::std::function); + /// \endcond + + virtual void createSession(::std::optional subscriber, ::std::optional session, bool fromRelay, const ::Ice::Current& current) = 0; + /// \cond INTERNAL + void _iceD_createSession(::Ice::IncomingRequest&, ::std::function); + /// \endcond + + virtual void confirmCreateSession(::std::optional publisher, ::std::optional session, const ::Ice::Current& current) = 0; + /// \cond INTERNAL + void _iceD_confirmCreateSession(::Ice::IncomingRequest&, ::std::function); + /// \endcond + + /// \cond INTERNAL + void dispatch(::Ice::IncomingRequest&, ::std::function) override; + /// \endcond +}; + +using NodePtr = ::std::shared_ptr; + +class Lookup : public virtual ::Ice::Object +{ +public: + + using ProxyType = LookupPrx; + + /** + * Obtains a list of the Slice type IDs representing the interfaces supported by this object. + * @param current The Current object for the invocation. + * @return A list of fully-scoped type IDs. + */ + ::std::vector<::std::string> ice_ids(const ::Ice::Current& current) const override; + + /** + * Obtains a Slice type ID representing the most-derived interface supported by this object. + * @param current The Current object for the invocation. + * @return A fully-scoped type ID. + */ + ::std::string ice_id(const ::Ice::Current& current) const override; + + /** + * Obtains the Slice type ID corresponding to this interface. + * @return A fully-scoped type ID. + */ + static const char* ice_staticId() noexcept; + + virtual void announceTopicReader(::std::string topic, ::std::optional node, const ::Ice::Current& current) = 0; + /// \cond INTERNAL + void _iceD_announceTopicReader(::Ice::IncomingRequest&, ::std::function); + /// \endcond + + virtual void announceTopicWriter(::std::string topic, ::std::optional node, const ::Ice::Current& current) = 0; + /// \cond INTERNAL + void _iceD_announceTopicWriter(::Ice::IncomingRequest&, ::std::function); + /// \endcond + + virtual void announceTopics(StringSeq readers, StringSeq writers, ::std::optional node, const ::Ice::Current& current) = 0; + /// \cond INTERNAL + void _iceD_announceTopics(::Ice::IncomingRequest&, ::std::function); + /// \endcond + + virtual ::std::optional createSession(::std::optional node, const ::Ice::Current& current) = 0; + /// \cond INTERNAL + void _iceD_createSession(::Ice::IncomingRequest&, ::std::function); + /// \endcond + + /// \cond INTERNAL + void dispatch(::Ice::IncomingRequest&, ::std::function) override; + /// \endcond +}; + +using LookupPtr = ::std::shared_ptr; + +} + +/// \cond STREAM +namespace Ice +{ + +template<> +struct StreamableTraits< ::DataStormContract::ClearHistoryPolicy> +{ + static const StreamHelperCategory helper = StreamHelperCategoryEnum; + static const int minValue = 0; + static const int maxValue = 4; + static const int minWireSize = 1; + static const bool fixedLength = false; +}; + +template<> +struct StreamableTraits<::DataStormContract::DataSample> +{ + static const StreamHelperCategory helper = StreamHelperCategoryStruct; + static const int minWireSize = 35; + static const bool fixedLength = false; +}; + +template<> +struct StreamReader<::DataStormContract::DataSample> +{ + static void read(InputStream* istr, ::DataStormContract::DataSample& v) + { + istr->readAll(v.id, v.keyId, v.keyValue, v.timestamp, v.tag, v.event, v.value); + } +}; + +template<> +struct StreamableTraits<::DataStormContract::DataSamples> +{ + static const StreamHelperCategory helper = StreamHelperCategoryStruct; + static const int minWireSize = 9; + static const bool fixedLength = false; +}; + +template<> +struct StreamReader<::DataStormContract::DataSamples> +{ + static void read(InputStream* istr, ::DataStormContract::DataSamples& v) + { + istr->readAll(v.id, v.samples); + } +}; + +template<> +struct StreamableTraits<::DataStormContract::ElementInfo> +{ + static const StreamHelperCategory helper = StreamHelperCategoryStruct; + static const int minWireSize = 10; + static const bool fixedLength = false; +}; + +template<> +struct StreamReader<::DataStormContract::ElementInfo> +{ + static void read(InputStream* istr, ::DataStormContract::ElementInfo& v) + { + istr->readAll(v.id, v.name, v.value); + } +}; + +template<> +struct StreamableTraits<::DataStormContract::TopicInfo> +{ + static const StreamHelperCategory helper = StreamHelperCategoryStruct; + static const int minWireSize = 2; + static const bool fixedLength = false; +}; + +template<> +struct StreamReader<::DataStormContract::TopicInfo> +{ + static void read(InputStream* istr, ::DataStormContract::TopicInfo& v) + { + istr->readAll(v.name, v.ids); + } +}; + +template<> +struct StreamableTraits<::DataStormContract::TopicSpec> +{ + static const StreamHelperCategory helper = StreamHelperCategoryStruct; + static const int minWireSize = 11; + static const bool fixedLength = false; +}; + +template<> +struct StreamReader<::DataStormContract::TopicSpec> +{ + static void read(InputStream* istr, ::DataStormContract::TopicSpec& v) + { + istr->readAll(v.id, v.name, v.elements, v.tags); + } +}; + +template<> +struct StreamableTraits<::DataStormContract::FilterInfo> +{ + static const StreamHelperCategory helper = StreamHelperCategoryStruct; + static const int minWireSize = 2; + static const bool fixedLength = false; +}; + +template<> +struct StreamReader<::DataStormContract::FilterInfo> +{ + static void read(InputStream* istr, ::DataStormContract::FilterInfo& v) + { + istr->readAll(v.name, v.criteria); + } +}; + +template<> +struct StreamableTraits<::DataStormContract::ElementData> +{ + static const StreamHelperCategory helper = StreamHelperCategoryStruct; + static const int minWireSize = 10; + static const bool fixedLength = false; +}; + +template<> +struct StreamReader<::DataStormContract::ElementData> +{ + static void read(InputStream* istr, ::DataStormContract::ElementData& v) + { + istr->readAll(v.id, v.config, v.lastIds); + } +}; + +template<> +struct StreamableTraits<::DataStormContract::ElementSpec> +{ + static const StreamHelperCategory helper = StreamHelperCategoryStruct; + static const int minWireSize = 20; + static const bool fixedLength = false; +}; + +template<> +struct StreamReader<::DataStormContract::ElementSpec> +{ + static void read(InputStream* istr, ::DataStormContract::ElementSpec& v) + { + istr->readAll(v.elements, v.id, v.name, v.value, v.peerId, v.peerName); + } +}; + +template<> +struct StreamableTraits<::DataStormContract::ElementDataAck> +{ + static const StreamHelperCategory helper = StreamHelperCategoryStruct; + static const int minWireSize = 19; + static const bool fixedLength = false; +}; + +template<> +struct StreamReader<::DataStormContract::ElementDataAck> +{ + static void read(InputStream* istr, ::DataStormContract::ElementDataAck& v) + { + istr->readAll(v.id, v.config, v.lastIds, v.samples, v.peerId); + } +}; + +template<> +struct StreamableTraits<::DataStormContract::ElementSpecAck> +{ + static const StreamHelperCategory helper = StreamHelperCategoryStruct; + static const int minWireSize = 20; + static const bool fixedLength = false; +}; + +template<> +struct StreamReader<::DataStormContract::ElementSpecAck> +{ + static void read(InputStream* istr, ::DataStormContract::ElementSpecAck& v) + { + istr->readAll(v.elements, v.id, v.name, v.value, v.peerId, v.peerName); + } +}; + +} +/// \endcond + +#include +#endif diff --git a/slice2cpp/cpp/test/DataStorm/api/Test.cpp b/slice2cpp/cpp/test/DataStorm/api/Test.cpp new file mode 100644 index 000000000000..ffe85be72dd5 --- /dev/null +++ b/slice2cpp/cpp/test/DataStorm/api/Test.cpp @@ -0,0 +1,77 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +#define ICE_BUILDING_GENERATED_CODE +#include "Test.h" +#include +#include +#include + +#if defined(_MSC_VER) +# pragma warning(disable : 4458) // declaration of ... hides class member +# pragma warning(disable : 4996) // ... was declared deprecated +#elif defined(__clang__) +# pragma clang diagnostic ignored "-Wshadow" +# pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +# pragma GCC diagnostic ignored "-Wshadow" +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + +#ifndef ICE_IGNORE_VERSION +# if ICE_INT_VERSION != 30850 +# error Ice version mismatch: an exact match is required for beta generated code +# endif +#endif + +namespace +{ + const ::IceInternal::FactoryTableInit iceC_factoryTableInit; + const ::IceInternal::DefaultValueFactoryInit<::Test::ClassKey> iceC_Test_ClassKey_init("::Test::ClassKey"); +} + +const char* +Test::ClassKey::ice_staticId() noexcept +{ + return "::Test::ClassKey"; +} + +const char* +Test::ClassKey::ice_id() const noexcept +{ + return ice_staticId(); +} + +::Ice::ValuePtr +Test::ClassKey::_iceCloneImpl() const +{ + return CloneEnabler::clone(*this); +} + +void +Test::ClassKey::_iceWriteImpl(::Ice::OutputStream* ostr) const +{ + ostr->startSlice(ice_staticId(), -1, true); + ostr->writeAll(this->value); + ostr->endSlice(); +} + +void +Test::ClassKey::_iceReadImpl(::Ice::InputStream* istr) +{ + istr->startSlice(); + istr->readAll(this->value); + istr->endSlice(); +} diff --git a/slice2cpp/cpp/test/DataStorm/api/Test.h b/slice2cpp/cpp/test/DataStorm/api/Test.h new file mode 100644 index 000000000000..c557ec7f80b7 --- /dev/null +++ b/slice2cpp/cpp/test/DataStorm/api/Test.h @@ -0,0 +1,138 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +#ifndef __Test_h__ +#define __Test_h__ + +#include +#include + +#ifndef ICE_IGNORE_VERSION +# if ICE_INT_VERSION != 30850 +# error Ice version mismatch: an exact match is required for beta generated code +# endif +#endif + +namespace Test +{ + struct StructKey; + + class ClassKey; + using ClassKeyPtr = ::std::shared_ptr; + +} + +namespace Test +{ + +struct StructKey +{ + ::std::int32_t value; + + /** + * Obtains a tuple containing all of the struct's data members. + * @return The data members in a tuple. + */ + std::tuple ice_tuple() const + { + return std::tie(value); + } +}; + +class ClassKey : public ::Ice::Value +{ +public: + /** + * Default constructor. + */ + ClassKey() noexcept = default; + + /** + * One-shot constructor to initialize all data members. + */ + explicit ClassKey(::std::int32_t value) noexcept : + value(value) + { + } + + /** + * Obtains the Slice type ID of this value. + * @return The fully-scoped type ID. + */ + static const char* ice_staticId() noexcept; + + const char* ice_id() const noexcept override; + + /** + * Obtains a tuple containing all of the value's data members. + * @return The data members in a tuple. + */ + std::tuple ice_tuple() const + { + return std::tie(value); + } + + /** + * Creates a shallow polymorphic copy of this instance. + * @return The cloned value. + */ + ClassKeyPtr ice_clone() const { return ::std::static_pointer_cast(_iceCloneImpl()); } + + ::std::int32_t value; + +protected: + ClassKey(const ClassKey&) = default; + + ::Ice::ValuePtr _iceCloneImpl() const override; + void _iceWriteImpl(::Ice::OutputStream*) const override; + + void _iceReadImpl(::Ice::InputStream*) override; +}; + +using Ice::Tuple::operator<; +using Ice::Tuple::operator<=; +using Ice::Tuple::operator>; +using Ice::Tuple::operator>=; +using Ice::Tuple::operator==; +using Ice::Tuple::operator!=; + +} + +/// \cond STREAM +namespace Ice +{ + +template<> +struct StreamableTraits<::Test::StructKey> +{ + static const StreamHelperCategory helper = StreamHelperCategoryStruct; + static const int minWireSize = 4; + static const bool fixedLength = true; +}; + +template<> +struct StreamReader<::Test::StructKey> +{ + static void read(InputStream* istr, ::Test::StructKey& v) + { + istr->readAll(v.value); + } +}; + +} +/// \endcond + +#include +#endif diff --git a/slice2cpp/cpp/test/DataStorm/events/Test.cpp b/slice2cpp/cpp/test/DataStorm/events/Test.cpp new file mode 100644 index 000000000000..531eada60913 --- /dev/null +++ b/slice2cpp/cpp/test/DataStorm/events/Test.cpp @@ -0,0 +1,114 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +#define ICE_BUILDING_GENERATED_CODE +#include "Test.h" +#include +#include +#include + +#if defined(_MSC_VER) +# pragma warning(disable : 4458) // declaration of ... hides class member +# pragma warning(disable : 4996) // ... was declared deprecated +#elif defined(__clang__) +# pragma clang diagnostic ignored "-Wshadow" +# pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +# pragma GCC diagnostic ignored "-Wshadow" +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + +#ifndef ICE_IGNORE_VERSION +# if ICE_INT_VERSION != 30850 +# error Ice version mismatch: an exact match is required for beta generated code +# endif +#endif + +namespace +{ + const ::IceInternal::FactoryTableInit iceC_factoryTableInit; + const ::IceInternal::DefaultValueFactoryInit<::Test::Base> iceC_Test_Base_init("::Test::Base"); + const ::IceInternal::DefaultValueFactoryInit<::Test::Extended> iceC_Test_Extended_init("::Test::Extended"); +} + +const char* +Test::Base::ice_staticId() noexcept +{ + return "::Test::Base"; +} + +const char* +Test::Base::ice_id() const noexcept +{ + return ice_staticId(); +} + +::Ice::ValuePtr +Test::Base::_iceCloneImpl() const +{ + return CloneEnabler::clone(*this); +} + +void +Test::Base::_iceWriteImpl(::Ice::OutputStream* ostr) const +{ + ostr->startSlice(ice_staticId(), -1, true); + ostr->writeAll(this->b); + ostr->endSlice(); +} + +void +Test::Base::_iceReadImpl(::Ice::InputStream* istr) +{ + istr->startSlice(); + istr->readAll(this->b); + istr->endSlice(); +} + +const char* +Test::Extended::ice_staticId() noexcept +{ + return "::Test::Extended"; +} + +const char* +Test::Extended::ice_id() const noexcept +{ + return ice_staticId(); +} + +::Ice::ValuePtr +Test::Extended::_iceCloneImpl() const +{ + return CloneEnabler::clone(*this); +} + +void +Test::Extended::_iceWriteImpl(::Ice::OutputStream* ostr) const +{ + ostr->startSlice(ice_staticId(), -1, false); + ostr->writeAll(this->e); + ostr->endSlice(); + Base::_iceWriteImpl(ostr); +} + +void +Test::Extended::_iceReadImpl(::Ice::InputStream* istr) +{ + istr->startSlice(); + istr->readAll(this->e); + istr->endSlice(); + Base::_iceReadImpl(istr); +} diff --git a/slice2cpp/cpp/test/DataStorm/events/Test.h b/slice2cpp/cpp/test/DataStorm/events/Test.h new file mode 100644 index 000000000000..e9172e30f16b --- /dev/null +++ b/slice2cpp/cpp/test/DataStorm/events/Test.h @@ -0,0 +1,194 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +#ifndef __Test_h__ +#define __Test_h__ + +#include +#include + +#ifndef ICE_IGNORE_VERSION +# if ICE_INT_VERSION != 30850 +# error Ice version mismatch: an exact match is required for beta generated code +# endif +#endif + +namespace Test +{ + struct StructValue; + + class Base; + using BasePtr = ::std::shared_ptr; + + class Extended; + using ExtendedPtr = ::std::shared_ptr; + +} + +namespace Test +{ + +struct StructValue +{ + ::std::string firstName; + ::std::string lastName; + ::std::int32_t age; + + /** + * Obtains a tuple containing all of the struct's data members. + * @return The data members in a tuple. + */ + std::tuple ice_tuple() const + { + return std::tie(firstName, lastName, age); + } +}; + +class Base : public ::Ice::Value +{ +public: + /** + * Default constructor. + */ + Base() noexcept = default; + + /** + * One-shot constructor to initialize all data members. + */ + explicit Base(::std::string b) noexcept : + b(::std::move(b)) + { + } + + /** + * Obtains the Slice type ID of this value. + * @return The fully-scoped type ID. + */ + static const char* ice_staticId() noexcept; + + const char* ice_id() const noexcept override; + + /** + * Obtains a tuple containing all of the value's data members. + * @return The data members in a tuple. + */ + std::tuple ice_tuple() const + { + return std::tie(b); + } + + /** + * Creates a shallow polymorphic copy of this instance. + * @return The cloned value. + */ + BasePtr ice_clone() const { return ::std::static_pointer_cast(_iceCloneImpl()); } + + ::std::string b; + +protected: + Base(const Base&) = default; + + ::Ice::ValuePtr _iceCloneImpl() const override; + void _iceWriteImpl(::Ice::OutputStream*) const override; + + void _iceReadImpl(::Ice::InputStream*) override; +}; + +class Extended : public Base +{ +public: + /** + * Default constructor. + */ + Extended() noexcept = default; + + /** + * One-shot constructor to initialize all data members. + */ + Extended(::std::string b, ::std::int32_t e) noexcept : + Base(::std::move(b)), + e(e) + { + } + + /** + * Obtains the Slice type ID of this value. + * @return The fully-scoped type ID. + */ + static const char* ice_staticId() noexcept; + + const char* ice_id() const noexcept override; + + /** + * Obtains a tuple containing all of the value's data members. + * @return The data members in a tuple. + */ + std::tuple ice_tuple() const + { + return std::tie(b, e); + } + + /** + * Creates a shallow polymorphic copy of this instance. + * @return The cloned value. + */ + ExtendedPtr ice_clone() const { return ::std::static_pointer_cast(_iceCloneImpl()); } + + ::std::int32_t e; + +protected: + Extended(const Extended&) = default; + + ::Ice::ValuePtr _iceCloneImpl() const override; + void _iceWriteImpl(::Ice::OutputStream*) const override; + + void _iceReadImpl(::Ice::InputStream*) override; +}; + +using Ice::Tuple::operator<; +using Ice::Tuple::operator<=; +using Ice::Tuple::operator>; +using Ice::Tuple::operator>=; +using Ice::Tuple::operator==; +using Ice::Tuple::operator!=; + +} + +/// \cond STREAM +namespace Ice +{ + +template<> +struct StreamableTraits<::Test::StructValue> +{ + static const StreamHelperCategory helper = StreamHelperCategoryStruct; + static const int minWireSize = 6; + static const bool fixedLength = false; +}; + +template<> +struct StreamReader<::Test::StructValue> +{ + static void read(InputStream* istr, ::Test::StructValue& v) + { + istr->readAll(v.firstName, v.lastName, v.age); + } +}; + +} +/// \endcond + +#include +#endif diff --git a/slice2cpp/cpp/test/DataStorm/partial/Test.cpp b/slice2cpp/cpp/test/DataStorm/partial/Test.cpp new file mode 100644 index 000000000000..6d23368c44fe --- /dev/null +++ b/slice2cpp/cpp/test/DataStorm/partial/Test.cpp @@ -0,0 +1,37 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +#define ICE_BUILDING_GENERATED_CODE +#include "Test.h" +#include +#include +#include + +#if defined(_MSC_VER) +# pragma warning(disable : 4458) // declaration of ... hides class member +# pragma warning(disable : 4996) // ... was declared deprecated +#elif defined(__clang__) +# pragma clang diagnostic ignored "-Wshadow" +# pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +# pragma GCC diagnostic ignored "-Wshadow" +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + +#ifndef ICE_IGNORE_VERSION +# if ICE_INT_VERSION != 30850 +# error Ice version mismatch: an exact match is required for beta generated code +# endif +#endif diff --git a/slice2cpp/cpp/test/DataStorm/partial/Test.h b/slice2cpp/cpp/test/DataStorm/partial/Test.h new file mode 100644 index 000000000000..56945e4ee36a --- /dev/null +++ b/slice2cpp/cpp/test/DataStorm/partial/Test.h @@ -0,0 +1,87 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +#ifndef __Test_h__ +#define __Test_h__ + +#include +#include + +#ifndef ICE_IGNORE_VERSION +# if ICE_INT_VERSION != 30850 +# error Ice version mismatch: an exact match is required for beta generated code +# endif +#endif + +namespace Test +{ + struct Stock; + +} + +namespace Test +{ + +struct Stock +{ + float price; + float lastBid; + float laskAsk; + + /** + * Obtains a tuple containing all of the struct's data members. + * @return The data members in a tuple. + */ + std::tuple ice_tuple() const + { + return std::tie(price, lastBid, laskAsk); + } +}; + +using Ice::Tuple::operator<; +using Ice::Tuple::operator<=; +using Ice::Tuple::operator>; +using Ice::Tuple::operator>=; +using Ice::Tuple::operator==; +using Ice::Tuple::operator!=; + +} + +/// \cond STREAM +namespace Ice +{ + +template<> +struct StreamableTraits<::Test::Stock> +{ + static const StreamHelperCategory helper = StreamHelperCategoryStruct; + static const int minWireSize = 12; + static const bool fixedLength = true; +}; + +template<> +struct StreamReader<::Test::Stock> +{ + static void read(InputStream* istr, ::Test::Stock& v) + { + istr->readAll(v.price, v.lastBid, v.laskAsk); + } +}; + +} +/// \endcond + +#include +#endif diff --git a/slice2cpp/cpp/test/DataStorm/types/Test.cpp b/slice2cpp/cpp/test/DataStorm/types/Test.cpp new file mode 100644 index 000000000000..531eada60913 --- /dev/null +++ b/slice2cpp/cpp/test/DataStorm/types/Test.cpp @@ -0,0 +1,114 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +#define ICE_BUILDING_GENERATED_CODE +#include "Test.h" +#include +#include +#include + +#if defined(_MSC_VER) +# pragma warning(disable : 4458) // declaration of ... hides class member +# pragma warning(disable : 4996) // ... was declared deprecated +#elif defined(__clang__) +# pragma clang diagnostic ignored "-Wshadow" +# pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +# pragma GCC diagnostic ignored "-Wshadow" +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + +#ifndef ICE_IGNORE_VERSION +# if ICE_INT_VERSION != 30850 +# error Ice version mismatch: an exact match is required for beta generated code +# endif +#endif + +namespace +{ + const ::IceInternal::FactoryTableInit iceC_factoryTableInit; + const ::IceInternal::DefaultValueFactoryInit<::Test::Base> iceC_Test_Base_init("::Test::Base"); + const ::IceInternal::DefaultValueFactoryInit<::Test::Extended> iceC_Test_Extended_init("::Test::Extended"); +} + +const char* +Test::Base::ice_staticId() noexcept +{ + return "::Test::Base"; +} + +const char* +Test::Base::ice_id() const noexcept +{ + return ice_staticId(); +} + +::Ice::ValuePtr +Test::Base::_iceCloneImpl() const +{ + return CloneEnabler::clone(*this); +} + +void +Test::Base::_iceWriteImpl(::Ice::OutputStream* ostr) const +{ + ostr->startSlice(ice_staticId(), -1, true); + ostr->writeAll(this->b); + ostr->endSlice(); +} + +void +Test::Base::_iceReadImpl(::Ice::InputStream* istr) +{ + istr->startSlice(); + istr->readAll(this->b); + istr->endSlice(); +} + +const char* +Test::Extended::ice_staticId() noexcept +{ + return "::Test::Extended"; +} + +const char* +Test::Extended::ice_id() const noexcept +{ + return ice_staticId(); +} + +::Ice::ValuePtr +Test::Extended::_iceCloneImpl() const +{ + return CloneEnabler::clone(*this); +} + +void +Test::Extended::_iceWriteImpl(::Ice::OutputStream* ostr) const +{ + ostr->startSlice(ice_staticId(), -1, false); + ostr->writeAll(this->e); + ostr->endSlice(); + Base::_iceWriteImpl(ostr); +} + +void +Test::Extended::_iceReadImpl(::Ice::InputStream* istr) +{ + istr->startSlice(); + istr->readAll(this->e); + istr->endSlice(); + Base::_iceReadImpl(istr); +} diff --git a/slice2cpp/cpp/test/DataStorm/types/Test.h b/slice2cpp/cpp/test/DataStorm/types/Test.h new file mode 100644 index 000000000000..e9172e30f16b --- /dev/null +++ b/slice2cpp/cpp/test/DataStorm/types/Test.h @@ -0,0 +1,194 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +#ifndef __Test_h__ +#define __Test_h__ + +#include +#include + +#ifndef ICE_IGNORE_VERSION +# if ICE_INT_VERSION != 30850 +# error Ice version mismatch: an exact match is required for beta generated code +# endif +#endif + +namespace Test +{ + struct StructValue; + + class Base; + using BasePtr = ::std::shared_ptr; + + class Extended; + using ExtendedPtr = ::std::shared_ptr; + +} + +namespace Test +{ + +struct StructValue +{ + ::std::string firstName; + ::std::string lastName; + ::std::int32_t age; + + /** + * Obtains a tuple containing all of the struct's data members. + * @return The data members in a tuple. + */ + std::tuple ice_tuple() const + { + return std::tie(firstName, lastName, age); + } +}; + +class Base : public ::Ice::Value +{ +public: + /** + * Default constructor. + */ + Base() noexcept = default; + + /** + * One-shot constructor to initialize all data members. + */ + explicit Base(::std::string b) noexcept : + b(::std::move(b)) + { + } + + /** + * Obtains the Slice type ID of this value. + * @return The fully-scoped type ID. + */ + static const char* ice_staticId() noexcept; + + const char* ice_id() const noexcept override; + + /** + * Obtains a tuple containing all of the value's data members. + * @return The data members in a tuple. + */ + std::tuple ice_tuple() const + { + return std::tie(b); + } + + /** + * Creates a shallow polymorphic copy of this instance. + * @return The cloned value. + */ + BasePtr ice_clone() const { return ::std::static_pointer_cast(_iceCloneImpl()); } + + ::std::string b; + +protected: + Base(const Base&) = default; + + ::Ice::ValuePtr _iceCloneImpl() const override; + void _iceWriteImpl(::Ice::OutputStream*) const override; + + void _iceReadImpl(::Ice::InputStream*) override; +}; + +class Extended : public Base +{ +public: + /** + * Default constructor. + */ + Extended() noexcept = default; + + /** + * One-shot constructor to initialize all data members. + */ + Extended(::std::string b, ::std::int32_t e) noexcept : + Base(::std::move(b)), + e(e) + { + } + + /** + * Obtains the Slice type ID of this value. + * @return The fully-scoped type ID. + */ + static const char* ice_staticId() noexcept; + + const char* ice_id() const noexcept override; + + /** + * Obtains a tuple containing all of the value's data members. + * @return The data members in a tuple. + */ + std::tuple ice_tuple() const + { + return std::tie(b, e); + } + + /** + * Creates a shallow polymorphic copy of this instance. + * @return The cloned value. + */ + ExtendedPtr ice_clone() const { return ::std::static_pointer_cast(_iceCloneImpl()); } + + ::std::int32_t e; + +protected: + Extended(const Extended&) = default; + + ::Ice::ValuePtr _iceCloneImpl() const override; + void _iceWriteImpl(::Ice::OutputStream*) const override; + + void _iceReadImpl(::Ice::InputStream*) override; +}; + +using Ice::Tuple::operator<; +using Ice::Tuple::operator<=; +using Ice::Tuple::operator>; +using Ice::Tuple::operator>=; +using Ice::Tuple::operator==; +using Ice::Tuple::operator!=; + +} + +/// \cond STREAM +namespace Ice +{ + +template<> +struct StreamableTraits<::Test::StructValue> +{ + static const StreamHelperCategory helper = StreamHelperCategoryStruct; + static const int minWireSize = 6; + static const bool fixedLength = false; +}; + +template<> +struct StreamReader<::Test::StructValue> +{ + static void read(InputStream* istr, ::Test::StructValue& v) + { + istr->readAll(v.firstName, v.lastName, v.age); + } +}; + +} +/// \endcond + +#include +#endif diff --git a/slice2cpp/slice/DataStorm/Sample.cpp b/slice2cpp/slice/DataStorm/Sample.cpp new file mode 100644 index 000000000000..a22fc5c60c1e --- /dev/null +++ b/slice2cpp/slice/DataStorm/Sample.cpp @@ -0,0 +1,37 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Sample.ice' +// +// Warning: do not edit this file. +// +// +// + +#define ICE_BUILDING_GENERATED_CODE +#include "Sample.h" +#include +#include +#include + +#if defined(_MSC_VER) +# pragma warning(disable : 4458) // declaration of ... hides class member +# pragma warning(disable : 4996) // ... was declared deprecated +#elif defined(__clang__) +# pragma clang diagnostic ignored "-Wshadow" +# pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +# pragma GCC diagnostic ignored "-Wshadow" +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + +#ifndef ICE_IGNORE_VERSION +# if ICE_INT_VERSION != 30850 +# error Ice version mismatch: an exact match is required for beta generated code +# endif +#endif diff --git a/slice2cpp/slice/DataStorm/Sample.h b/slice2cpp/slice/DataStorm/Sample.h new file mode 100644 index 000000000000..42b6a1fa6a34 --- /dev/null +++ b/slice2cpp/slice/DataStorm/Sample.h @@ -0,0 +1,83 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Sample.ice' +// +// Warning: do not edit this file. +// +// +// + +#ifndef __Sample_h__ +#define __Sample_h__ + +#include +#include + +#ifndef ICE_IGNORE_VERSION +# if ICE_INT_VERSION != 30850 +# error Ice version mismatch: an exact match is required for beta generated code +# endif +#endif + +namespace DataStorm +{ + /** + * The sample event. + * + * The sample event matches the operation used by the DataWriter to update + * the data element. It also provides information on what to expect from + * the sample. A sample with the Add or Update event always provide a value + * while a sample with the Remove type doesn't. + */ + enum class SampleEvent : ::std::uint8_t + { + /** + * The element has been added. + */ + Add, + /** + * The element has been updated. + */ + Update, + /** + * The element has been partially updated. + */ + PartialUpdate, + /** + * The element has been removed. + */ + Remove + }; + + /** + * A sequence of sample type enumeration. + */ + using SampleEventSeq = ::std::vector; + +} + +/// \cond STREAM +namespace Ice +{ + +template<> +struct StreamableTraits< ::DataStorm::SampleEvent> +{ + static const StreamHelperCategory helper = StreamHelperCategoryEnum; + static const int minValue = 0; + static const int maxValue = 3; + static const int minWireSize = 1; + static const bool fixedLength = false; +}; + +} +/// \endcond + +#include +#endif diff --git a/slice2cs/cpp/src/DataStorm/Contract.cs b/slice2cs/cpp/src/DataStorm/Contract.cs new file mode 100644 index 000000000000..a7f4920e903d --- /dev/null +++ b/slice2cs/cpp/src/DataStorm/Contract.cs @@ -0,0 +1,3719 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +#nullable enable + +[assembly:Ice.Slice("Contract.ice")] + +#pragma warning disable CS1591 // Missing XML Comment +#pragma warning disable CS1573 // Parameter has no matching param tag in the XML comment +#pragma warning disable CS0612 // Type or member is obsolete +#pragma warning disable CS0618 // Type or member is obsolete +#pragma warning disable CS0619 // Type or member is obsolete + +namespace DataStormContract +{ + public enum ClearHistoryPolicy + { + OnAdd, + OnRemove, + OnAll, + OnAllExceptPartialUpdate, + Never + } + + public sealed class ClearHistoryPolicyHelper + { + public static void write(Ice.OutputStream ostr, ClearHistoryPolicy v) + { + ostr.writeEnum((int)v, 4); + } + + public static ClearHistoryPolicy read(Ice.InputStream istr) + { + ClearHistoryPolicy v; + v = (ClearHistoryPolicy)istr.readEnum(4); + return v; + } + } + + public sealed partial record class DataSample + { + public long id; + + public long keyId; + + public byte[] keyValue; + + public long timestamp; + + public long tag; + + public global::DataStorm.SampleEvent @event; + + public byte[] value; + + partial void ice_initialize(); + + public DataSample(byte[] keyValue, byte[] value) + { + global::System.ArgumentNullException.ThrowIfNull(keyValue); + this.keyValue = keyValue; + global::System.ArgumentNullException.ThrowIfNull(value); + this.value = value; + ice_initialize(); + } + + public DataSample(long id, long keyId, byte[] keyValue, long timestamp, long tag, global::DataStorm.SampleEvent @event, byte[] value) + { + this.id = id; + this.keyId = keyId; + global::System.ArgumentNullException.ThrowIfNull(keyValue); + this.keyValue = keyValue; + this.timestamp = timestamp; + this.tag = tag; + this.@event = @event; + global::System.ArgumentNullException.ThrowIfNull(value); + this.value = value; + ice_initialize(); + } + + public DataSample(Ice.InputStream istr) + { + this.id = istr.readLong(); + this.keyId = istr.readLong(); + this.keyValue = ByteSeqHelper.read(istr); + this.timestamp = istr.readLong(); + this.tag = istr.readLong(); + this.@event = (global::DataStorm.SampleEvent)istr.readEnum(3); + this.value = ByteSeqHelper.read(istr); + ice_initialize(); + } + + public void ice_writeMembers(Ice.OutputStream ostr) + { + ostr.writeLong(this.id); + ostr.writeLong(this.keyId); + ByteSeqHelper.write(ostr, this.keyValue); + ostr.writeLong(this.timestamp); + ostr.writeLong(this.tag); + ostr.writeEnum((int)this.@event, 3); + ByteSeqHelper.write(ostr, this.value); + } + + public static void ice_write(Ice.OutputStream ostr, DataSample v) + { + v.ice_writeMembers(ostr); + } + + public static DataSample ice_read(Ice.InputStream istr) => new(istr); + } + + public sealed partial record class DataSamples + { + public long id; + + public DataSample[] samples; + + partial void ice_initialize(); + + public DataSamples(DataSample[] samples) + { + global::System.ArgumentNullException.ThrowIfNull(samples); + this.samples = samples; + ice_initialize(); + } + + public DataSamples(long id, DataSample[] samples) + { + this.id = id; + global::System.ArgumentNullException.ThrowIfNull(samples); + this.samples = samples; + ice_initialize(); + } + + public DataSamples(Ice.InputStream istr) + { + this.id = istr.readLong(); + this.samples = DataSampleSeqHelper.read(istr); + ice_initialize(); + } + + public void ice_writeMembers(Ice.OutputStream ostr) + { + ostr.writeLong(this.id); + DataSampleSeqHelper.write(ostr, this.samples); + } + + public static void ice_write(Ice.OutputStream ostr, DataSamples v) + { + v.ice_writeMembers(ostr); + } + + public static DataSamples ice_read(Ice.InputStream istr) => new(istr); + } + + public sealed partial record class ElementInfo + { + public long id; + + public string name = ""; + + public byte[] value; + + partial void ice_initialize(); + + public ElementInfo(byte[] value) + { + global::System.ArgumentNullException.ThrowIfNull(value); + this.value = value; + ice_initialize(); + } + + public ElementInfo(long id, string name, byte[] value) + { + this.id = id; + global::System.ArgumentNullException.ThrowIfNull(name); + this.name = name; + global::System.ArgumentNullException.ThrowIfNull(value); + this.value = value; + ice_initialize(); + } + + public ElementInfo(Ice.InputStream istr) + { + this.id = istr.readLong(); + this.name = istr.readString(); + this.value = ByteSeqHelper.read(istr); + ice_initialize(); + } + + public void ice_writeMembers(Ice.OutputStream ostr) + { + ostr.writeLong(this.id); + ostr.writeString(this.name); + ByteSeqHelper.write(ostr, this.value); + } + + public static void ice_write(Ice.OutputStream ostr, ElementInfo v) + { + v.ice_writeMembers(ostr); + } + + public static ElementInfo ice_read(Ice.InputStream istr) => new(istr); + } + + public sealed partial record class TopicInfo + { + public string name = ""; + + public long[] ids; + + partial void ice_initialize(); + + public TopicInfo(long[] ids) + { + global::System.ArgumentNullException.ThrowIfNull(ids); + this.ids = ids; + ice_initialize(); + } + + public TopicInfo(string name, long[] ids) + { + global::System.ArgumentNullException.ThrowIfNull(name); + this.name = name; + global::System.ArgumentNullException.ThrowIfNull(ids); + this.ids = ids; + ice_initialize(); + } + + public TopicInfo(Ice.InputStream istr) + { + this.name = istr.readString(); + this.ids = LongSeqHelper.read(istr); + ice_initialize(); + } + + public void ice_writeMembers(Ice.OutputStream ostr) + { + ostr.writeString(this.name); + LongSeqHelper.write(ostr, this.ids); + } + + public static void ice_write(Ice.OutputStream ostr, TopicInfo v) + { + v.ice_writeMembers(ostr); + } + + public static TopicInfo ice_read(Ice.InputStream istr) => new(istr); + } + + public sealed partial record class TopicSpec + { + public long id; + + public string name = ""; + + public ElementInfo[] elements; + + public ElementInfo[] tags; + + partial void ice_initialize(); + + public TopicSpec(ElementInfo[] elements, ElementInfo[] tags) + { + global::System.ArgumentNullException.ThrowIfNull(elements); + this.elements = elements; + global::System.ArgumentNullException.ThrowIfNull(tags); + this.tags = tags; + ice_initialize(); + } + + public TopicSpec(long id, string name, ElementInfo[] elements, ElementInfo[] tags) + { + this.id = id; + global::System.ArgumentNullException.ThrowIfNull(name); + this.name = name; + global::System.ArgumentNullException.ThrowIfNull(elements); + this.elements = elements; + global::System.ArgumentNullException.ThrowIfNull(tags); + this.tags = tags; + ice_initialize(); + } + + public TopicSpec(Ice.InputStream istr) + { + this.id = istr.readLong(); + this.name = istr.readString(); + this.elements = ElementInfoSeqHelper.read(istr); + this.tags = ElementInfoSeqHelper.read(istr); + ice_initialize(); + } + + public void ice_writeMembers(Ice.OutputStream ostr) + { + ostr.writeLong(this.id); + ostr.writeString(this.name); + ElementInfoSeqHelper.write(ostr, this.elements); + ElementInfoSeqHelper.write(ostr, this.tags); + } + + public static void ice_write(Ice.OutputStream ostr, TopicSpec v) + { + v.ice_writeMembers(ostr); + } + + public static TopicSpec ice_read(Ice.InputStream istr) => new(istr); + } + + public sealed partial record class FilterInfo + { + public string name = ""; + + public byte[] criteria; + + partial void ice_initialize(); + + public FilterInfo(byte[] criteria) + { + global::System.ArgumentNullException.ThrowIfNull(criteria); + this.criteria = criteria; + ice_initialize(); + } + + public FilterInfo(string name, byte[] criteria) + { + global::System.ArgumentNullException.ThrowIfNull(name); + this.name = name; + global::System.ArgumentNullException.ThrowIfNull(criteria); + this.criteria = criteria; + ice_initialize(); + } + + public FilterInfo(Ice.InputStream istr) + { + this.name = istr.readString(); + this.criteria = ByteSeqHelper.read(istr); + ice_initialize(); + } + + public void ice_writeMembers(Ice.OutputStream ostr) + { + ostr.writeString(this.name); + ByteSeqHelper.write(ostr, this.criteria); + } + + public static void ice_write(Ice.OutputStream ostr, FilterInfo v) + { + v.ice_writeMembers(ostr); + } + + public static FilterInfo ice_read(Ice.InputStream istr) => new(istr); + } + + [Ice.SliceTypeId("::DataStormContract::ElementConfig")] + [Ice.CompactSliceTypeId(1)] + public partial class ElementConfig : Ice.Value + { + public string? facet; + + public FilterInfo? sampleFilter; + + public string? name; + + public int? priority; + + public int? sampleCount; + + public int? sampleLifetime; + + public ClearHistoryPolicy? clearHistory; + + partial void ice_initialize(); + + public ElementConfig(string? facet, FilterInfo? sampleFilter, string? name, int? priority, int? sampleCount, int? sampleLifetime, ClearHistoryPolicy? clearHistory) + { + this.facet = facet; + this.sampleFilter = sampleFilter; + this.name = name; + this.priority = priority; + this.sampleCount = sampleCount; + this.sampleLifetime = sampleLifetime; + this.clearHistory = clearHistory; + ice_initialize(); + } + + public ElementConfig() + { + ice_initialize(); + } + + public static new string ice_staticId() => "::DataStormContract::ElementConfig"; + public override string ice_id() => ice_staticId(); + + protected override void iceWriteImpl(Ice.OutputStream ostr_) + { + ostr_.startSlice(ice_staticId(), 1, true); + ostr_.writeString(1, facet); + if (sampleFilter is not null && ostr_.writeOptional(2, Ice.OptionalFormat.FSize)) + { + int pos = ostr_.startSize(); + FilterInfo.ice_write(ostr_, sampleFilter); + ostr_.endSize(pos); + } + ostr_.writeString(3, name); + ostr_.writeInt(4, priority); + ostr_.writeInt(10, sampleCount); + ostr_.writeInt(11, sampleLifetime); + if (clearHistory is not null) + { + ostr_.writeEnum(12, (int)clearHistory.Value, 5); + } + ostr_.endSlice(); + } + + protected override void iceReadImpl(Ice.InputStream istr_) + { + istr_.startSlice(); + facet = istr_.readString(1); + if (istr_.readOptional(2, Ice.OptionalFormat.FSize)) + { + istr_.skip(4); + FilterInfo tmpVal; + tmpVal = new FilterInfo(istr_); + sampleFilter = tmpVal; + } + else + { + sampleFilter = null; + } + name = istr_.readString(3); + priority = istr_.readInt(4); + sampleCount = istr_.readInt(10); + sampleLifetime = istr_.readInt(11); + if (istr_.readOptional(12, Ice.OptionalFormat.Size)) + { + ClearHistoryPolicy tmpVal; + tmpVal = (ClearHistoryPolicy)istr_.readEnum(4); + clearHistory = tmpVal; + } + else + { + clearHistory = null; + } + istr_.endSlice(); + } + } + + public sealed partial record class ElementData + { + public long id; + + public ElementConfig? config; + + public global::System.Collections.Generic.Dictionary lastIds; + + partial void ice_initialize(); + + public ElementData(global::System.Collections.Generic.Dictionary lastIds) + { + global::System.ArgumentNullException.ThrowIfNull(lastIds); + this.lastIds = lastIds; + ice_initialize(); + } + + public ElementData(long id, ElementConfig? config, global::System.Collections.Generic.Dictionary lastIds) + { + this.id = id; + this.config = config; + global::System.ArgumentNullException.ThrowIfNull(lastIds); + this.lastIds = lastIds; + ice_initialize(); + } + + public ElementData(Ice.InputStream istr) + { + this.id = istr.readLong(); + istr.readValue((ElementConfig? v) => { this.config = v; }); + this.lastIds = LongLongDictHelper.read(istr); + ice_initialize(); + } + + public void ice_writeMembers(Ice.OutputStream ostr) + { + ostr.writeLong(this.id); + ostr.writeValue(this.config); + LongLongDictHelper.write(ostr, this.lastIds); + } + + public static void ice_write(Ice.OutputStream ostr, ElementData v) + { + v.ice_writeMembers(ostr); + } + + public static ElementData ice_read(Ice.InputStream istr) => new(istr); + } + + public sealed partial record class ElementSpec + { + public ElementData[] elements; + + public long id; + + public string name = ""; + + public byte[] value; + + public long peerId; + + public string peerName = ""; + + partial void ice_initialize(); + + public ElementSpec(ElementData[] elements, byte[] value) + { + global::System.ArgumentNullException.ThrowIfNull(elements); + this.elements = elements; + global::System.ArgumentNullException.ThrowIfNull(value); + this.value = value; + ice_initialize(); + } + + public ElementSpec(ElementData[] elements, long id, string name, byte[] value, long peerId, string peerName) + { + global::System.ArgumentNullException.ThrowIfNull(elements); + this.elements = elements; + this.id = id; + global::System.ArgumentNullException.ThrowIfNull(name); + this.name = name; + global::System.ArgumentNullException.ThrowIfNull(value); + this.value = value; + this.peerId = peerId; + global::System.ArgumentNullException.ThrowIfNull(peerName); + this.peerName = peerName; + ice_initialize(); + } + + public ElementSpec(Ice.InputStream istr) + { + this.elements = ElementDataSeqHelper.read(istr); + this.id = istr.readLong(); + this.name = istr.readString(); + this.value = ByteSeqHelper.read(istr); + this.peerId = istr.readLong(); + this.peerName = istr.readString(); + ice_initialize(); + } + + public void ice_writeMembers(Ice.OutputStream ostr) + { + ElementDataSeqHelper.write(ostr, this.elements); + ostr.writeLong(this.id); + ostr.writeString(this.name); + ByteSeqHelper.write(ostr, this.value); + ostr.writeLong(this.peerId); + ostr.writeString(this.peerName); + } + + public static void ice_write(Ice.OutputStream ostr, ElementSpec v) + { + v.ice_writeMembers(ostr); + } + + public static ElementSpec ice_read(Ice.InputStream istr) => new(istr); + } + + public sealed partial record class ElementDataAck + { + public long id; + + public ElementConfig? config; + + public global::System.Collections.Generic.Dictionary lastIds; + + public DataSample[] samples; + + public long peerId; + + partial void ice_initialize(); + + public ElementDataAck(global::System.Collections.Generic.Dictionary lastIds, DataSample[] samples) + { + global::System.ArgumentNullException.ThrowIfNull(lastIds); + this.lastIds = lastIds; + global::System.ArgumentNullException.ThrowIfNull(samples); + this.samples = samples; + ice_initialize(); + } + + public ElementDataAck(long id, ElementConfig? config, global::System.Collections.Generic.Dictionary lastIds, DataSample[] samples, long peerId) + { + this.id = id; + this.config = config; + global::System.ArgumentNullException.ThrowIfNull(lastIds); + this.lastIds = lastIds; + global::System.ArgumentNullException.ThrowIfNull(samples); + this.samples = samples; + this.peerId = peerId; + ice_initialize(); + } + + public ElementDataAck(Ice.InputStream istr) + { + this.id = istr.readLong(); + istr.readValue((ElementConfig? v) => { this.config = v; }); + this.lastIds = LongLongDictHelper.read(istr); + this.samples = DataSampleSeqHelper.read(istr); + this.peerId = istr.readLong(); + ice_initialize(); + } + + public void ice_writeMembers(Ice.OutputStream ostr) + { + ostr.writeLong(this.id); + ostr.writeValue(this.config); + LongLongDictHelper.write(ostr, this.lastIds); + DataSampleSeqHelper.write(ostr, this.samples); + ostr.writeLong(this.peerId); + } + + public static void ice_write(Ice.OutputStream ostr, ElementDataAck v) + { + v.ice_writeMembers(ostr); + } + + public static ElementDataAck ice_read(Ice.InputStream istr) => new(istr); + } + + public sealed partial record class ElementSpecAck + { + public ElementDataAck[] elements; + + public long id; + + public string name = ""; + + public byte[] value; + + public long peerId; + + public string peerName = ""; + + partial void ice_initialize(); + + public ElementSpecAck(ElementDataAck[] elements, byte[] value) + { + global::System.ArgumentNullException.ThrowIfNull(elements); + this.elements = elements; + global::System.ArgumentNullException.ThrowIfNull(value); + this.value = value; + ice_initialize(); + } + + public ElementSpecAck(ElementDataAck[] elements, long id, string name, byte[] value, long peerId, string peerName) + { + global::System.ArgumentNullException.ThrowIfNull(elements); + this.elements = elements; + this.id = id; + global::System.ArgumentNullException.ThrowIfNull(name); + this.name = name; + global::System.ArgumentNullException.ThrowIfNull(value); + this.value = value; + this.peerId = peerId; + global::System.ArgumentNullException.ThrowIfNull(peerName); + this.peerName = peerName; + ice_initialize(); + } + + public ElementSpecAck(Ice.InputStream istr) + { + this.elements = ElementDataAckSeqHelper.read(istr); + this.id = istr.readLong(); + this.name = istr.readString(); + this.value = ByteSeqHelper.read(istr); + this.peerId = istr.readLong(); + this.peerName = istr.readString(); + ice_initialize(); + } + + public void ice_writeMembers(Ice.OutputStream ostr) + { + ElementDataAckSeqHelper.write(ostr, this.elements); + ostr.writeLong(this.id); + ostr.writeString(this.name); + ByteSeqHelper.write(ostr, this.value); + ostr.writeLong(this.peerId); + ostr.writeString(this.peerName); + } + + public static void ice_write(Ice.OutputStream ostr, ElementSpecAck v) + { + v.ice_writeMembers(ostr); + } + + public static ElementSpecAck ice_read(Ice.InputStream istr) => new(istr); + } + + [Ice.SliceTypeId("::DataStormContract::Session")] + public partial interface Session : Ice.Object + { + void announceTopics(TopicInfo[] topics, bool initialize, Ice.Current current); + + void attachTopic(TopicSpec topic, Ice.Current current); + + void detachTopic(long topic, Ice.Current current); + + void attachTags(long topic, ElementInfo[] tags, bool initialize, Ice.Current current); + + void detachTags(long topic, long[] tags, Ice.Current current); + + void announceElements(long topic, ElementInfo[] keys, Ice.Current current); + + void attachElements(long topic, ElementSpec[] elements, bool initialize, Ice.Current current); + + void attachElementsAck(long topic, ElementSpecAck[] elements, Ice.Current current); + + void detachElements(long topic, long[] keys, Ice.Current current); + + void initSamples(long topic, DataSamples[] samples, Ice.Current current); + + void disconnected(Ice.Current current); + } + + [Ice.SliceTypeId("::DataStormContract::PublisherSession")] + public partial interface PublisherSession : Session + { + } + + [Ice.SliceTypeId("::DataStormContract::SubscriberSession")] + public partial interface SubscriberSession : Session + { + void s(long topicId, long elementId, DataSample sample, Ice.Current current); + } + + [Ice.SliceTypeId("::DataStormContract::Node")] + public partial interface Node : Ice.Object + { + void initiateCreateSession(NodePrx? publisher, Ice.Current current); + + void createSession(NodePrx? subscriber, SubscriberSessionPrx? session, bool fromRelay, Ice.Current current); + + void confirmCreateSession(NodePrx? publisher, PublisherSessionPrx? session, Ice.Current current); + } + + [Ice.SliceTypeId("::DataStormContract::Lookup")] + public partial interface Lookup : Ice.Object + { + void announceTopicReader(string topic, NodePrx? node, Ice.Current current); + + void announceTopicWriter(string topic, NodePrx? node, Ice.Current current); + + void announceTopics(string[] readers, string[] writers, NodePrx? node, Ice.Current current); + + NodePrx? createSession(NodePrx? node, Ice.Current current); + } +} + +namespace DataStormContract +{ + public interface SessionPrx : Ice.ObjectPrx + { + void announceTopics(TopicInfo[] topics, bool initialize, global::System.Collections.Generic.Dictionary? context = null); + + global::System.Threading.Tasks.Task announceTopicsAsync(TopicInfo[] topics, bool initialize, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default); + + void attachTopic(TopicSpec topic, global::System.Collections.Generic.Dictionary? context = null); + + global::System.Threading.Tasks.Task attachTopicAsync(TopicSpec topic, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default); + + void detachTopic(long topic, global::System.Collections.Generic.Dictionary? context = null); + + global::System.Threading.Tasks.Task detachTopicAsync(long topic, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default); + + void attachTags(long topic, ElementInfo[] tags, bool initialize, global::System.Collections.Generic.Dictionary? context = null); + + global::System.Threading.Tasks.Task attachTagsAsync(long topic, ElementInfo[] tags, bool initialize, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default); + + void detachTags(long topic, long[] tags, global::System.Collections.Generic.Dictionary? context = null); + + global::System.Threading.Tasks.Task detachTagsAsync(long topic, long[] tags, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default); + + void announceElements(long topic, ElementInfo[] keys, global::System.Collections.Generic.Dictionary? context = null); + + global::System.Threading.Tasks.Task announceElementsAsync(long topic, ElementInfo[] keys, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default); + + void attachElements(long topic, ElementSpec[] elements, bool initialize, global::System.Collections.Generic.Dictionary? context = null); + + global::System.Threading.Tasks.Task attachElementsAsync(long topic, ElementSpec[] elements, bool initialize, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default); + + void attachElementsAck(long topic, ElementSpecAck[] elements, global::System.Collections.Generic.Dictionary? context = null); + + global::System.Threading.Tasks.Task attachElementsAckAsync(long topic, ElementSpecAck[] elements, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default); + + void detachElements(long topic, long[] keys, global::System.Collections.Generic.Dictionary? context = null); + + global::System.Threading.Tasks.Task detachElementsAsync(long topic, long[] keys, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default); + + void initSamples(long topic, DataSamples[] samples, global::System.Collections.Generic.Dictionary? context = null); + + global::System.Threading.Tasks.Task initSamplesAsync(long topic, DataSamples[] samples, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default); + + void disconnected(global::System.Collections.Generic.Dictionary? context = null); + + global::System.Threading.Tasks.Task disconnectedAsync(global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default); + } + + public interface PublisherSessionPrx : SessionPrx + { + } + + public interface SubscriberSessionPrx : SessionPrx + { + void s(long topicId, long elementId, DataSample sample, global::System.Collections.Generic.Dictionary? context = null); + + global::System.Threading.Tasks.Task sAsync(long topicId, long elementId, DataSample sample, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default); + } + + public interface NodePrx : Ice.ObjectPrx + { + void initiateCreateSession(NodePrx? publisher, global::System.Collections.Generic.Dictionary? context = null); + + global::System.Threading.Tasks.Task initiateCreateSessionAsync(NodePrx? publisher, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default); + + void createSession(NodePrx? subscriber, SubscriberSessionPrx? session, bool fromRelay, global::System.Collections.Generic.Dictionary? context = null); + + global::System.Threading.Tasks.Task createSessionAsync(NodePrx? subscriber, SubscriberSessionPrx? session, bool fromRelay, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default); + + void confirmCreateSession(NodePrx? publisher, PublisherSessionPrx? session, global::System.Collections.Generic.Dictionary? context = null); + + global::System.Threading.Tasks.Task confirmCreateSessionAsync(NodePrx? publisher, PublisherSessionPrx? session, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default); + } + + public interface LookupPrx : Ice.ObjectPrx + { + void announceTopicReader(string topic, NodePrx? node, global::System.Collections.Generic.Dictionary? context = null); + + global::System.Threading.Tasks.Task announceTopicReaderAsync(string topic, NodePrx? node, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default); + + void announceTopicWriter(string topic, NodePrx? node, global::System.Collections.Generic.Dictionary? context = null); + + global::System.Threading.Tasks.Task announceTopicWriterAsync(string topic, NodePrx? node, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default); + + void announceTopics(string[] readers, string[] writers, NodePrx? node, global::System.Collections.Generic.Dictionary? context = null); + + global::System.Threading.Tasks.Task announceTopicsAsync(string[] readers, string[] writers, NodePrx? node, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default); + + NodePrx? createSession(NodePrx? node, global::System.Collections.Generic.Dictionary? context = null); + + global::System.Threading.Tasks.Task createSessionAsync(NodePrx? node, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default); + } +} + +namespace DataStormContract +{ + public sealed class ByteSeqHelper + { + public static void write(Ice.OutputStream ostr, byte[] v) + { + ostr.writeByteSeq(v); + } + + public static byte[] read(Ice.InputStream istr) + { + byte[] v; + v = istr.readByteSeq(); + return v; + } + } + + public sealed class LongSeqHelper + { + public static void write(Ice.OutputStream ostr, long[] v) + { + ostr.writeLongSeq(v); + } + + public static long[] read(Ice.InputStream istr) + { + long[] v; + v = istr.readLongSeq(); + return v; + } + } + + public sealed class StringSeqHelper + { + public static void write(Ice.OutputStream ostr, string[] v) + { + ostr.writeStringSeq(v); + } + + public static string[] read(Ice.InputStream istr) + { + string[] v; + v = istr.readStringSeq(); + return v; + } + } + + public sealed class LongLongDictHelper + { + public static void write(Ice.OutputStream ostr, + global::System.Collections.Generic.Dictionary v) + { + if(v == null) + { + ostr.writeSize(0); + } + else + { + ostr.writeSize(v.Count); + foreach(global::System.Collections.Generic.KeyValuePair e in v) + { + ostr.writeLong(e.Key); + ostr.writeLong(e.Value); + } + } + } + + public static global::System.Collections.Generic.Dictionary read(Ice.InputStream istr) + { + int sz = istr.readSize(); + global::System.Collections.Generic.Dictionary r = new global::System.Collections.Generic.Dictionary(); + for(int i = 0; i < sz; ++i) + { + long k; + k = istr.readLong(); + long v; + v = istr.readLong(); + r[k] = v; + } + return r; + } + } + + public sealed class DataSampleSeqHelper + { + public static void write(Ice.OutputStream ostr, DataSample[] v) + { + if (v is null) + { + ostr.writeSize(0); + } + else + { + ostr.writeSize(v.Length); + for(int ix = 0; ix < v.Length; ++ix) + { + v[ix].ice_writeMembers(ostr); + } + } + } + + public static DataSample[] read(Ice.InputStream istr) + { + DataSample[] v; + { + int szx = istr.readAndCheckSeqSize(35); + v = new DataSample[szx]; + for(int ix = 0; ix < szx; ++ix) + { + v[ix] = new DataSample(istr); + } + } + return v; + } + } + + public sealed class DataSamplesSeqHelper + { + public static void write(Ice.OutputStream ostr, DataSamples[] v) + { + if (v is null) + { + ostr.writeSize(0); + } + else + { + ostr.writeSize(v.Length); + for(int ix = 0; ix < v.Length; ++ix) + { + v[ix].ice_writeMembers(ostr); + } + } + } + + public static DataSamples[] read(Ice.InputStream istr) + { + DataSamples[] v; + { + int szx = istr.readAndCheckSeqSize(9); + v = new DataSamples[szx]; + for(int ix = 0; ix < szx; ++ix) + { + v[ix] = new DataSamples(istr); + } + } + return v; + } + } + + public sealed class ElementInfoSeqHelper + { + public static void write(Ice.OutputStream ostr, ElementInfo[] v) + { + if (v is null) + { + ostr.writeSize(0); + } + else + { + ostr.writeSize(v.Length); + for(int ix = 0; ix < v.Length; ++ix) + { + v[ix].ice_writeMembers(ostr); + } + } + } + + public static ElementInfo[] read(Ice.InputStream istr) + { + ElementInfo[] v; + { + int szx = istr.readAndCheckSeqSize(10); + v = new ElementInfo[szx]; + for(int ix = 0; ix < szx; ++ix) + { + v[ix] = new ElementInfo(istr); + } + } + return v; + } + } + + public sealed class TopicInfoSeqHelper + { + public static void write(Ice.OutputStream ostr, TopicInfo[] v) + { + if (v is null) + { + ostr.writeSize(0); + } + else + { + ostr.writeSize(v.Length); + for(int ix = 0; ix < v.Length; ++ix) + { + v[ix].ice_writeMembers(ostr); + } + } + } + + public static TopicInfo[] read(Ice.InputStream istr) + { + TopicInfo[] v; + { + int szx = istr.readAndCheckSeqSize(2); + v = new TopicInfo[szx]; + for(int ix = 0; ix < szx; ++ix) + { + v[ix] = new TopicInfo(istr); + } + } + return v; + } + } + + public sealed class ElementDataSeqHelper + { + public static void write(Ice.OutputStream ostr, ElementData[] v) + { + if (v is null) + { + ostr.writeSize(0); + } + else + { + ostr.writeSize(v.Length); + for(int ix = 0; ix < v.Length; ++ix) + { + v[ix].ice_writeMembers(ostr); + } + } + } + + public static ElementData[] read(Ice.InputStream istr) + { + ElementData[] v; + { + int szx = istr.readAndCheckSeqSize(10); + v = new ElementData[szx]; + for(int ix = 0; ix < szx; ++ix) + { + v[ix] = new ElementData(istr); + } + } + return v; + } + } + + public sealed class ElementSpecSeqHelper + { + public static void write(Ice.OutputStream ostr, ElementSpec[] v) + { + if (v is null) + { + ostr.writeSize(0); + } + else + { + ostr.writeSize(v.Length); + for(int ix = 0; ix < v.Length; ++ix) + { + v[ix].ice_writeMembers(ostr); + } + } + } + + public static ElementSpec[] read(Ice.InputStream istr) + { + ElementSpec[] v; + { + int szx = istr.readAndCheckSeqSize(20); + v = new ElementSpec[szx]; + for(int ix = 0; ix < szx; ++ix) + { + v[ix] = new ElementSpec(istr); + } + } + return v; + } + } + + public sealed class ElementDataAckSeqHelper + { + public static void write(Ice.OutputStream ostr, ElementDataAck[] v) + { + if (v is null) + { + ostr.writeSize(0); + } + else + { + ostr.writeSize(v.Length); + for(int ix = 0; ix < v.Length; ++ix) + { + v[ix].ice_writeMembers(ostr); + } + } + } + + public static ElementDataAck[] read(Ice.InputStream istr) + { + ElementDataAck[] v; + { + int szx = istr.readAndCheckSeqSize(19); + v = new ElementDataAck[szx]; + for(int ix = 0; ix < szx; ++ix) + { + v[ix] = new ElementDataAck(istr); + } + } + return v; + } + } + + public sealed class ElementSpecAckSeqHelper + { + public static void write(Ice.OutputStream ostr, ElementSpecAck[] v) + { + if (v is null) + { + ostr.writeSize(0); + } + else + { + ostr.writeSize(v.Length); + for(int ix = 0; ix < v.Length; ++ix) + { + v[ix].ice_writeMembers(ostr); + } + } + } + + public static ElementSpecAck[] read(Ice.InputStream istr) + { + ElementSpecAck[] v; + { + int szx = istr.readAndCheckSeqSize(20); + v = new ElementSpecAck[szx]; + for(int ix = 0; ix < szx; ++ix) + { + v[ix] = new ElementSpecAck(istr); + } + } + return v; + } + } + + public sealed class SessionPrxHelper : Ice.ObjectPrxHelperBase, SessionPrx + { + public void announceTopics(TopicInfo[] topics, bool initialize, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_announceTopicsAsync(topics, initialize, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void attachTopic(TopicSpec topic, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_attachTopicAsync(topic, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void detachTopic(long topic, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_detachTopicAsync(topic, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void attachTags(long topic, ElementInfo[] tags, bool initialize, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_attachTagsAsync(topic, tags, initialize, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void detachTags(long topic, long[] tags, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_detachTagsAsync(topic, tags, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void announceElements(long topic, ElementInfo[] keys, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_announceElementsAsync(topic, keys, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void attachElements(long topic, ElementSpec[] elements, bool initialize, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_attachElementsAsync(topic, elements, initialize, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void attachElementsAck(long topic, ElementSpecAck[] elements, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_attachElementsAckAsync(topic, elements, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void detachElements(long topic, long[] keys, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_detachElementsAsync(topic, keys, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void initSamples(long topic, DataSamples[] samples, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_initSamplesAsync(topic, samples, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void disconnected(global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_disconnectedAsync(context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public global::System.Threading.Tasks.Task announceTopicsAsync(TopicInfo[] topics, bool initialize, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_announceTopicsAsync(topics, initialize, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_announceTopicsAsync(TopicInfo[] iceP_topics, bool iceP_initialize, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_announceTopics(iceP_topics, iceP_initialize, context, synchronous, completed); + return completed.Task; + } + + private const string _announceTopics_name = "announceTopics"; + + private void _iceI_announceTopics(TopicInfo[] iceP_topics, bool iceP_initialize, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _announceTopics_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + TopicInfoSeqHelper.write(ostr, iceP_topics); + ostr.writeBool(iceP_initialize); + }); + } + + public global::System.Threading.Tasks.Task attachTopicAsync(TopicSpec topic, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_attachTopicAsync(topic, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_attachTopicAsync(TopicSpec iceP_topic, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_attachTopic(iceP_topic, context, synchronous, completed); + return completed.Task; + } + + private const string _attachTopic_name = "attachTopic"; + + private void _iceI_attachTopic(TopicSpec iceP_topic, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _attachTopic_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + TopicSpec.ice_write(ostr, iceP_topic); + }); + } + + public global::System.Threading.Tasks.Task detachTopicAsync(long topic, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_detachTopicAsync(topic, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_detachTopicAsync(long iceP_topic, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_detachTopic(iceP_topic, context, synchronous, completed); + return completed.Task; + } + + private const string _detachTopic_name = "detachTopic"; + + private void _iceI_detachTopic(long iceP_topic, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _detachTopic_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + }); + } + + public global::System.Threading.Tasks.Task attachTagsAsync(long topic, ElementInfo[] tags, bool initialize, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_attachTagsAsync(topic, tags, initialize, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_attachTagsAsync(long iceP_topic, ElementInfo[] iceP_tags, bool iceP_initialize, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_attachTags(iceP_topic, iceP_tags, iceP_initialize, context, synchronous, completed); + return completed.Task; + } + + private const string _attachTags_name = "attachTags"; + + private void _iceI_attachTags(long iceP_topic, ElementInfo[] iceP_tags, bool iceP_initialize, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _attachTags_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + ElementInfoSeqHelper.write(ostr, iceP_tags); + ostr.writeBool(iceP_initialize); + }); + } + + public global::System.Threading.Tasks.Task detachTagsAsync(long topic, long[] tags, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_detachTagsAsync(topic, tags, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_detachTagsAsync(long iceP_topic, long[] iceP_tags, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_detachTags(iceP_topic, iceP_tags, context, synchronous, completed); + return completed.Task; + } + + private const string _detachTags_name = "detachTags"; + + private void _iceI_detachTags(long iceP_topic, long[] iceP_tags, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _detachTags_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + LongSeqHelper.write(ostr, iceP_tags); + }); + } + + public global::System.Threading.Tasks.Task announceElementsAsync(long topic, ElementInfo[] keys, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_announceElementsAsync(topic, keys, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_announceElementsAsync(long iceP_topic, ElementInfo[] iceP_keys, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_announceElements(iceP_topic, iceP_keys, context, synchronous, completed); + return completed.Task; + } + + private const string _announceElements_name = "announceElements"; + + private void _iceI_announceElements(long iceP_topic, ElementInfo[] iceP_keys, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _announceElements_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + ElementInfoSeqHelper.write(ostr, iceP_keys); + }); + } + + public global::System.Threading.Tasks.Task attachElementsAsync(long topic, ElementSpec[] elements, bool initialize, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_attachElementsAsync(topic, elements, initialize, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_attachElementsAsync(long iceP_topic, ElementSpec[] iceP_elements, bool iceP_initialize, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_attachElements(iceP_topic, iceP_elements, iceP_initialize, context, synchronous, completed); + return completed.Task; + } + + private const string _attachElements_name = "attachElements"; + + private void _iceI_attachElements(long iceP_topic, ElementSpec[] iceP_elements, bool iceP_initialize, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _attachElements_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + ElementSpecSeqHelper.write(ostr, iceP_elements); + ostr.writeBool(iceP_initialize); + ostr.writePendingValues(); + }); + } + + public global::System.Threading.Tasks.Task attachElementsAckAsync(long topic, ElementSpecAck[] elements, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_attachElementsAckAsync(topic, elements, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_attachElementsAckAsync(long iceP_topic, ElementSpecAck[] iceP_elements, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_attachElementsAck(iceP_topic, iceP_elements, context, synchronous, completed); + return completed.Task; + } + + private const string _attachElementsAck_name = "attachElementsAck"; + + private void _iceI_attachElementsAck(long iceP_topic, ElementSpecAck[] iceP_elements, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _attachElementsAck_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + ElementSpecAckSeqHelper.write(ostr, iceP_elements); + ostr.writePendingValues(); + }); + } + + public global::System.Threading.Tasks.Task detachElementsAsync(long topic, long[] keys, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_detachElementsAsync(topic, keys, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_detachElementsAsync(long iceP_topic, long[] iceP_keys, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_detachElements(iceP_topic, iceP_keys, context, synchronous, completed); + return completed.Task; + } + + private const string _detachElements_name = "detachElements"; + + private void _iceI_detachElements(long iceP_topic, long[] iceP_keys, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _detachElements_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + LongSeqHelper.write(ostr, iceP_keys); + }); + } + + public global::System.Threading.Tasks.Task initSamplesAsync(long topic, DataSamples[] samples, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_initSamplesAsync(topic, samples, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_initSamplesAsync(long iceP_topic, DataSamples[] iceP_samples, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_initSamples(iceP_topic, iceP_samples, context, synchronous, completed); + return completed.Task; + } + + private const string _initSamples_name = "initSamples"; + + private void _iceI_initSamples(long iceP_topic, DataSamples[] iceP_samples, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _initSamples_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + DataSamplesSeqHelper.write(ostr, iceP_samples); + }); + } + + public global::System.Threading.Tasks.Task disconnectedAsync(global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_disconnectedAsync(context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_disconnectedAsync(global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_disconnected(context, synchronous, completed); + return completed.Task; + } + + private const string _disconnected_name = "disconnected"; + + private void _iceI_disconnected(global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _disconnected_name, + Ice.OperationMode.Normal, + null, + context, + synchronous); + } + + public static SessionPrx createProxy(Ice.Communicator communicator, string proxyString) => + new SessionPrxHelper(Ice.ObjectPrxHelper.createProxy(communicator, proxyString)); + + public static SessionPrx? checkedCast(Ice.ObjectPrx? b, global::System.Collections.Generic.Dictionary? ctx = null) => + b is not null && b.ice_isA(ice_staticId(), ctx) ? new SessionPrxHelper(b) : null; + + public static SessionPrx? checkedCast(Ice.ObjectPrx? b, string f, global::System.Collections.Generic.Dictionary? ctx = null) => + checkedCast(b?.ice_facet(f), ctx); + + [return: global::System.Diagnostics.CodeAnalysis.NotNullIfNotNull(nameof(b))] + + public static SessionPrx? uncheckedCast(Ice.ObjectPrx? b) => + b is not null ? new SessionPrxHelper(b) : null; + + [return: global::System.Diagnostics.CodeAnalysis.NotNullIfNotNull(nameof(b))] + + public static SessionPrx? uncheckedCast(Ice.ObjectPrx? b, string f) => + uncheckedCast(b?.ice_facet(f)); + + private static readonly string[] _ids = + { + "::DataStormContract::Session", + "::Ice::Object" + }; + + public static string ice_staticId() => "::DataStormContract::Session"; + + public static void write(Ice.OutputStream ostr, SessionPrx? v) + { + ostr.writeProxy(v); + } + + public static SessionPrx? read(Ice.InputStream istr) => + istr.readProxy() is Ice.ObjectPrx proxy ? new SessionPrxHelper(proxy) : null; + + protected override Ice.ObjectPrxHelperBase iceNewInstance(Ice.Internal.Reference reference) => new SessionPrxHelper(reference); + + private SessionPrxHelper(Ice.ObjectPrx proxy) + : base(proxy) + { + } + + private SessionPrxHelper(Ice.Internal.Reference reference) + : base(reference) + { + } + } + + public sealed class PublisherSessionPrxHelper : Ice.ObjectPrxHelperBase, PublisherSessionPrx + { + public void announceTopics(TopicInfo[] topics, bool initialize, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_announceTopicsAsync(topics, initialize, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void attachTopic(TopicSpec topic, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_attachTopicAsync(topic, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void detachTopic(long topic, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_detachTopicAsync(topic, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void attachTags(long topic, ElementInfo[] tags, bool initialize, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_attachTagsAsync(topic, tags, initialize, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void detachTags(long topic, long[] tags, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_detachTagsAsync(topic, tags, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void announceElements(long topic, ElementInfo[] keys, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_announceElementsAsync(topic, keys, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void attachElements(long topic, ElementSpec[] elements, bool initialize, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_attachElementsAsync(topic, elements, initialize, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void attachElementsAck(long topic, ElementSpecAck[] elements, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_attachElementsAckAsync(topic, elements, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void detachElements(long topic, long[] keys, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_detachElementsAsync(topic, keys, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void initSamples(long topic, DataSamples[] samples, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_initSamplesAsync(topic, samples, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void disconnected(global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_disconnectedAsync(context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public global::System.Threading.Tasks.Task announceTopicsAsync(TopicInfo[] topics, bool initialize, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_announceTopicsAsync(topics, initialize, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_announceTopicsAsync(TopicInfo[] iceP_topics, bool iceP_initialize, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_announceTopics(iceP_topics, iceP_initialize, context, synchronous, completed); + return completed.Task; + } + + private const string _announceTopics_name = "announceTopics"; + + private void _iceI_announceTopics(TopicInfo[] iceP_topics, bool iceP_initialize, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _announceTopics_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + TopicInfoSeqHelper.write(ostr, iceP_topics); + ostr.writeBool(iceP_initialize); + }); + } + + public global::System.Threading.Tasks.Task attachTopicAsync(TopicSpec topic, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_attachTopicAsync(topic, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_attachTopicAsync(TopicSpec iceP_topic, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_attachTopic(iceP_topic, context, synchronous, completed); + return completed.Task; + } + + private const string _attachTopic_name = "attachTopic"; + + private void _iceI_attachTopic(TopicSpec iceP_topic, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _attachTopic_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + TopicSpec.ice_write(ostr, iceP_topic); + }); + } + + public global::System.Threading.Tasks.Task detachTopicAsync(long topic, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_detachTopicAsync(topic, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_detachTopicAsync(long iceP_topic, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_detachTopic(iceP_topic, context, synchronous, completed); + return completed.Task; + } + + private const string _detachTopic_name = "detachTopic"; + + private void _iceI_detachTopic(long iceP_topic, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _detachTopic_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + }); + } + + public global::System.Threading.Tasks.Task attachTagsAsync(long topic, ElementInfo[] tags, bool initialize, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_attachTagsAsync(topic, tags, initialize, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_attachTagsAsync(long iceP_topic, ElementInfo[] iceP_tags, bool iceP_initialize, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_attachTags(iceP_topic, iceP_tags, iceP_initialize, context, synchronous, completed); + return completed.Task; + } + + private const string _attachTags_name = "attachTags"; + + private void _iceI_attachTags(long iceP_topic, ElementInfo[] iceP_tags, bool iceP_initialize, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _attachTags_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + ElementInfoSeqHelper.write(ostr, iceP_tags); + ostr.writeBool(iceP_initialize); + }); + } + + public global::System.Threading.Tasks.Task detachTagsAsync(long topic, long[] tags, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_detachTagsAsync(topic, tags, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_detachTagsAsync(long iceP_topic, long[] iceP_tags, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_detachTags(iceP_topic, iceP_tags, context, synchronous, completed); + return completed.Task; + } + + private const string _detachTags_name = "detachTags"; + + private void _iceI_detachTags(long iceP_topic, long[] iceP_tags, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _detachTags_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + LongSeqHelper.write(ostr, iceP_tags); + }); + } + + public global::System.Threading.Tasks.Task announceElementsAsync(long topic, ElementInfo[] keys, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_announceElementsAsync(topic, keys, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_announceElementsAsync(long iceP_topic, ElementInfo[] iceP_keys, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_announceElements(iceP_topic, iceP_keys, context, synchronous, completed); + return completed.Task; + } + + private const string _announceElements_name = "announceElements"; + + private void _iceI_announceElements(long iceP_topic, ElementInfo[] iceP_keys, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _announceElements_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + ElementInfoSeqHelper.write(ostr, iceP_keys); + }); + } + + public global::System.Threading.Tasks.Task attachElementsAsync(long topic, ElementSpec[] elements, bool initialize, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_attachElementsAsync(topic, elements, initialize, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_attachElementsAsync(long iceP_topic, ElementSpec[] iceP_elements, bool iceP_initialize, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_attachElements(iceP_topic, iceP_elements, iceP_initialize, context, synchronous, completed); + return completed.Task; + } + + private const string _attachElements_name = "attachElements"; + + private void _iceI_attachElements(long iceP_topic, ElementSpec[] iceP_elements, bool iceP_initialize, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _attachElements_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + ElementSpecSeqHelper.write(ostr, iceP_elements); + ostr.writeBool(iceP_initialize); + ostr.writePendingValues(); + }); + } + + public global::System.Threading.Tasks.Task attachElementsAckAsync(long topic, ElementSpecAck[] elements, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_attachElementsAckAsync(topic, elements, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_attachElementsAckAsync(long iceP_topic, ElementSpecAck[] iceP_elements, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_attachElementsAck(iceP_topic, iceP_elements, context, synchronous, completed); + return completed.Task; + } + + private const string _attachElementsAck_name = "attachElementsAck"; + + private void _iceI_attachElementsAck(long iceP_topic, ElementSpecAck[] iceP_elements, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _attachElementsAck_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + ElementSpecAckSeqHelper.write(ostr, iceP_elements); + ostr.writePendingValues(); + }); + } + + public global::System.Threading.Tasks.Task detachElementsAsync(long topic, long[] keys, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_detachElementsAsync(topic, keys, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_detachElementsAsync(long iceP_topic, long[] iceP_keys, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_detachElements(iceP_topic, iceP_keys, context, synchronous, completed); + return completed.Task; + } + + private const string _detachElements_name = "detachElements"; + + private void _iceI_detachElements(long iceP_topic, long[] iceP_keys, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _detachElements_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + LongSeqHelper.write(ostr, iceP_keys); + }); + } + + public global::System.Threading.Tasks.Task initSamplesAsync(long topic, DataSamples[] samples, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_initSamplesAsync(topic, samples, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_initSamplesAsync(long iceP_topic, DataSamples[] iceP_samples, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_initSamples(iceP_topic, iceP_samples, context, synchronous, completed); + return completed.Task; + } + + private const string _initSamples_name = "initSamples"; + + private void _iceI_initSamples(long iceP_topic, DataSamples[] iceP_samples, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _initSamples_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + DataSamplesSeqHelper.write(ostr, iceP_samples); + }); + } + + public global::System.Threading.Tasks.Task disconnectedAsync(global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_disconnectedAsync(context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_disconnectedAsync(global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_disconnected(context, synchronous, completed); + return completed.Task; + } + + private const string _disconnected_name = "disconnected"; + + private void _iceI_disconnected(global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _disconnected_name, + Ice.OperationMode.Normal, + null, + context, + synchronous); + } + + public static PublisherSessionPrx createProxy(Ice.Communicator communicator, string proxyString) => + new PublisherSessionPrxHelper(Ice.ObjectPrxHelper.createProxy(communicator, proxyString)); + + public static PublisherSessionPrx? checkedCast(Ice.ObjectPrx? b, global::System.Collections.Generic.Dictionary? ctx = null) => + b is not null && b.ice_isA(ice_staticId(), ctx) ? new PublisherSessionPrxHelper(b) : null; + + public static PublisherSessionPrx? checkedCast(Ice.ObjectPrx? b, string f, global::System.Collections.Generic.Dictionary? ctx = null) => + checkedCast(b?.ice_facet(f), ctx); + + [return: global::System.Diagnostics.CodeAnalysis.NotNullIfNotNull(nameof(b))] + + public static PublisherSessionPrx? uncheckedCast(Ice.ObjectPrx? b) => + b is not null ? new PublisherSessionPrxHelper(b) : null; + + [return: global::System.Diagnostics.CodeAnalysis.NotNullIfNotNull(nameof(b))] + + public static PublisherSessionPrx? uncheckedCast(Ice.ObjectPrx? b, string f) => + uncheckedCast(b?.ice_facet(f)); + + private static readonly string[] _ids = + { + "::DataStormContract::PublisherSession", + "::DataStormContract::Session", + "::Ice::Object" + }; + + public static string ice_staticId() => "::DataStormContract::PublisherSession"; + + public static void write(Ice.OutputStream ostr, PublisherSessionPrx? v) + { + ostr.writeProxy(v); + } + + public static PublisherSessionPrx? read(Ice.InputStream istr) => + istr.readProxy() is Ice.ObjectPrx proxy ? new PublisherSessionPrxHelper(proxy) : null; + + protected override Ice.ObjectPrxHelperBase iceNewInstance(Ice.Internal.Reference reference) => new PublisherSessionPrxHelper(reference); + + private PublisherSessionPrxHelper(Ice.ObjectPrx proxy) + : base(proxy) + { + } + + private PublisherSessionPrxHelper(Ice.Internal.Reference reference) + : base(reference) + { + } + } + + public sealed class SubscriberSessionPrxHelper : Ice.ObjectPrxHelperBase, SubscriberSessionPrx + { + public void announceTopics(TopicInfo[] topics, bool initialize, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_announceTopicsAsync(topics, initialize, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void attachTopic(TopicSpec topic, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_attachTopicAsync(topic, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void detachTopic(long topic, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_detachTopicAsync(topic, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void attachTags(long topic, ElementInfo[] tags, bool initialize, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_attachTagsAsync(topic, tags, initialize, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void detachTags(long topic, long[] tags, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_detachTagsAsync(topic, tags, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void announceElements(long topic, ElementInfo[] keys, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_announceElementsAsync(topic, keys, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void attachElements(long topic, ElementSpec[] elements, bool initialize, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_attachElementsAsync(topic, elements, initialize, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void attachElementsAck(long topic, ElementSpecAck[] elements, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_attachElementsAckAsync(topic, elements, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void detachElements(long topic, long[] keys, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_detachElementsAsync(topic, keys, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void initSamples(long topic, DataSamples[] samples, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_initSamplesAsync(topic, samples, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void disconnected(global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_disconnectedAsync(context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void s(long topicId, long elementId, DataSample sample, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_sAsync(topicId, elementId, sample, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public global::System.Threading.Tasks.Task announceTopicsAsync(TopicInfo[] topics, bool initialize, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_announceTopicsAsync(topics, initialize, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_announceTopicsAsync(TopicInfo[] iceP_topics, bool iceP_initialize, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_announceTopics(iceP_topics, iceP_initialize, context, synchronous, completed); + return completed.Task; + } + + private const string _announceTopics_name = "announceTopics"; + + private void _iceI_announceTopics(TopicInfo[] iceP_topics, bool iceP_initialize, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _announceTopics_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + TopicInfoSeqHelper.write(ostr, iceP_topics); + ostr.writeBool(iceP_initialize); + }); + } + + public global::System.Threading.Tasks.Task attachTopicAsync(TopicSpec topic, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_attachTopicAsync(topic, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_attachTopicAsync(TopicSpec iceP_topic, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_attachTopic(iceP_topic, context, synchronous, completed); + return completed.Task; + } + + private const string _attachTopic_name = "attachTopic"; + + private void _iceI_attachTopic(TopicSpec iceP_topic, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _attachTopic_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + TopicSpec.ice_write(ostr, iceP_topic); + }); + } + + public global::System.Threading.Tasks.Task detachTopicAsync(long topic, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_detachTopicAsync(topic, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_detachTopicAsync(long iceP_topic, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_detachTopic(iceP_topic, context, synchronous, completed); + return completed.Task; + } + + private const string _detachTopic_name = "detachTopic"; + + private void _iceI_detachTopic(long iceP_topic, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _detachTopic_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + }); + } + + public global::System.Threading.Tasks.Task attachTagsAsync(long topic, ElementInfo[] tags, bool initialize, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_attachTagsAsync(topic, tags, initialize, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_attachTagsAsync(long iceP_topic, ElementInfo[] iceP_tags, bool iceP_initialize, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_attachTags(iceP_topic, iceP_tags, iceP_initialize, context, synchronous, completed); + return completed.Task; + } + + private const string _attachTags_name = "attachTags"; + + private void _iceI_attachTags(long iceP_topic, ElementInfo[] iceP_tags, bool iceP_initialize, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _attachTags_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + ElementInfoSeqHelper.write(ostr, iceP_tags); + ostr.writeBool(iceP_initialize); + }); + } + + public global::System.Threading.Tasks.Task detachTagsAsync(long topic, long[] tags, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_detachTagsAsync(topic, tags, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_detachTagsAsync(long iceP_topic, long[] iceP_tags, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_detachTags(iceP_topic, iceP_tags, context, synchronous, completed); + return completed.Task; + } + + private const string _detachTags_name = "detachTags"; + + private void _iceI_detachTags(long iceP_topic, long[] iceP_tags, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _detachTags_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + LongSeqHelper.write(ostr, iceP_tags); + }); + } + + public global::System.Threading.Tasks.Task announceElementsAsync(long topic, ElementInfo[] keys, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_announceElementsAsync(topic, keys, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_announceElementsAsync(long iceP_topic, ElementInfo[] iceP_keys, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_announceElements(iceP_topic, iceP_keys, context, synchronous, completed); + return completed.Task; + } + + private const string _announceElements_name = "announceElements"; + + private void _iceI_announceElements(long iceP_topic, ElementInfo[] iceP_keys, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _announceElements_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + ElementInfoSeqHelper.write(ostr, iceP_keys); + }); + } + + public global::System.Threading.Tasks.Task attachElementsAsync(long topic, ElementSpec[] elements, bool initialize, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_attachElementsAsync(topic, elements, initialize, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_attachElementsAsync(long iceP_topic, ElementSpec[] iceP_elements, bool iceP_initialize, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_attachElements(iceP_topic, iceP_elements, iceP_initialize, context, synchronous, completed); + return completed.Task; + } + + private const string _attachElements_name = "attachElements"; + + private void _iceI_attachElements(long iceP_topic, ElementSpec[] iceP_elements, bool iceP_initialize, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _attachElements_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + ElementSpecSeqHelper.write(ostr, iceP_elements); + ostr.writeBool(iceP_initialize); + ostr.writePendingValues(); + }); + } + + public global::System.Threading.Tasks.Task attachElementsAckAsync(long topic, ElementSpecAck[] elements, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_attachElementsAckAsync(topic, elements, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_attachElementsAckAsync(long iceP_topic, ElementSpecAck[] iceP_elements, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_attachElementsAck(iceP_topic, iceP_elements, context, synchronous, completed); + return completed.Task; + } + + private const string _attachElementsAck_name = "attachElementsAck"; + + private void _iceI_attachElementsAck(long iceP_topic, ElementSpecAck[] iceP_elements, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _attachElementsAck_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + ElementSpecAckSeqHelper.write(ostr, iceP_elements); + ostr.writePendingValues(); + }); + } + + public global::System.Threading.Tasks.Task detachElementsAsync(long topic, long[] keys, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_detachElementsAsync(topic, keys, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_detachElementsAsync(long iceP_topic, long[] iceP_keys, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_detachElements(iceP_topic, iceP_keys, context, synchronous, completed); + return completed.Task; + } + + private const string _detachElements_name = "detachElements"; + + private void _iceI_detachElements(long iceP_topic, long[] iceP_keys, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _detachElements_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + LongSeqHelper.write(ostr, iceP_keys); + }); + } + + public global::System.Threading.Tasks.Task initSamplesAsync(long topic, DataSamples[] samples, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_initSamplesAsync(topic, samples, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_initSamplesAsync(long iceP_topic, DataSamples[] iceP_samples, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_initSamples(iceP_topic, iceP_samples, context, synchronous, completed); + return completed.Task; + } + + private const string _initSamples_name = "initSamples"; + + private void _iceI_initSamples(long iceP_topic, DataSamples[] iceP_samples, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _initSamples_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topic); + DataSamplesSeqHelper.write(ostr, iceP_samples); + }); + } + + public global::System.Threading.Tasks.Task disconnectedAsync(global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_disconnectedAsync(context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_disconnectedAsync(global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_disconnected(context, synchronous, completed); + return completed.Task; + } + + private const string _disconnected_name = "disconnected"; + + private void _iceI_disconnected(global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _disconnected_name, + Ice.OperationMode.Normal, + null, + context, + synchronous); + } + + public global::System.Threading.Tasks.Task sAsync(long topicId, long elementId, DataSample sample, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_sAsync(topicId, elementId, sample, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_sAsync(long iceP_topicId, long iceP_elementId, DataSample iceP_sample, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_s(iceP_topicId, iceP_elementId, iceP_sample, context, synchronous, completed); + return completed.Task; + } + + private const string _s_name = "s"; + + private void _iceI_s(long iceP_topicId, long iceP_elementId, DataSample iceP_sample, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _s_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeLong(iceP_topicId); + ostr.writeLong(iceP_elementId); + DataSample.ice_write(ostr, iceP_sample); + }); + } + + public static SubscriberSessionPrx createProxy(Ice.Communicator communicator, string proxyString) => + new SubscriberSessionPrxHelper(Ice.ObjectPrxHelper.createProxy(communicator, proxyString)); + + public static SubscriberSessionPrx? checkedCast(Ice.ObjectPrx? b, global::System.Collections.Generic.Dictionary? ctx = null) => + b is not null && b.ice_isA(ice_staticId(), ctx) ? new SubscriberSessionPrxHelper(b) : null; + + public static SubscriberSessionPrx? checkedCast(Ice.ObjectPrx? b, string f, global::System.Collections.Generic.Dictionary? ctx = null) => + checkedCast(b?.ice_facet(f), ctx); + + [return: global::System.Diagnostics.CodeAnalysis.NotNullIfNotNull(nameof(b))] + + public static SubscriberSessionPrx? uncheckedCast(Ice.ObjectPrx? b) => + b is not null ? new SubscriberSessionPrxHelper(b) : null; + + [return: global::System.Diagnostics.CodeAnalysis.NotNullIfNotNull(nameof(b))] + + public static SubscriberSessionPrx? uncheckedCast(Ice.ObjectPrx? b, string f) => + uncheckedCast(b?.ice_facet(f)); + + private static readonly string[] _ids = + { + "::DataStormContract::Session", + "::DataStormContract::SubscriberSession", + "::Ice::Object" + }; + + public static string ice_staticId() => "::DataStormContract::SubscriberSession"; + + public static void write(Ice.OutputStream ostr, SubscriberSessionPrx? v) + { + ostr.writeProxy(v); + } + + public static SubscriberSessionPrx? read(Ice.InputStream istr) => + istr.readProxy() is Ice.ObjectPrx proxy ? new SubscriberSessionPrxHelper(proxy) : null; + + protected override Ice.ObjectPrxHelperBase iceNewInstance(Ice.Internal.Reference reference) => new SubscriberSessionPrxHelper(reference); + + private SubscriberSessionPrxHelper(Ice.ObjectPrx proxy) + : base(proxy) + { + } + + private SubscriberSessionPrxHelper(Ice.Internal.Reference reference) + : base(reference) + { + } + } + + public sealed class NodePrxHelper : Ice.ObjectPrxHelperBase, NodePrx + { + public void initiateCreateSession(NodePrx? publisher, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_initiateCreateSessionAsync(publisher, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void createSession(NodePrx? subscriber, SubscriberSessionPrx? session, bool fromRelay, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_createSessionAsync(subscriber, session, fromRelay, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void confirmCreateSession(NodePrx? publisher, PublisherSessionPrx? session, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_confirmCreateSessionAsync(publisher, session, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public global::System.Threading.Tasks.Task initiateCreateSessionAsync(NodePrx? publisher, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_initiateCreateSessionAsync(publisher, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_initiateCreateSessionAsync(NodePrx? iceP_publisher, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_initiateCreateSession(iceP_publisher, context, synchronous, completed); + return completed.Task; + } + + private const string _initiateCreateSession_name = "initiateCreateSession"; + + private void _iceI_initiateCreateSession(NodePrx? iceP_publisher, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _initiateCreateSession_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + NodePrxHelper.write(ostr, iceP_publisher); + }); + } + + public global::System.Threading.Tasks.Task createSessionAsync(NodePrx? subscriber, SubscriberSessionPrx? session, bool fromRelay, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_createSessionAsync(subscriber, session, fromRelay, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_createSessionAsync(NodePrx? iceP_subscriber, SubscriberSessionPrx? iceP_session, bool iceP_fromRelay, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_createSession(iceP_subscriber, iceP_session, iceP_fromRelay, context, synchronous, completed); + return completed.Task; + } + + private const string _createSession_name = "createSession"; + + private void _iceI_createSession(NodePrx? iceP_subscriber, SubscriberSessionPrx? iceP_session, bool iceP_fromRelay, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _createSession_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + NodePrxHelper.write(ostr, iceP_subscriber); + SubscriberSessionPrxHelper.write(ostr, iceP_session); + ostr.writeBool(iceP_fromRelay); + }); + } + + public global::System.Threading.Tasks.Task confirmCreateSessionAsync(NodePrx? publisher, PublisherSessionPrx? session, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_confirmCreateSessionAsync(publisher, session, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_confirmCreateSessionAsync(NodePrx? iceP_publisher, PublisherSessionPrx? iceP_session, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_confirmCreateSession(iceP_publisher, iceP_session, context, synchronous, completed); + return completed.Task; + } + + private const string _confirmCreateSession_name = "confirmCreateSession"; + + private void _iceI_confirmCreateSession(NodePrx? iceP_publisher, PublisherSessionPrx? iceP_session, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _confirmCreateSession_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + NodePrxHelper.write(ostr, iceP_publisher); + PublisherSessionPrxHelper.write(ostr, iceP_session); + }); + } + + public static NodePrx createProxy(Ice.Communicator communicator, string proxyString) => + new NodePrxHelper(Ice.ObjectPrxHelper.createProxy(communicator, proxyString)); + + public static NodePrx? checkedCast(Ice.ObjectPrx? b, global::System.Collections.Generic.Dictionary? ctx = null) => + b is not null && b.ice_isA(ice_staticId(), ctx) ? new NodePrxHelper(b) : null; + + public static NodePrx? checkedCast(Ice.ObjectPrx? b, string f, global::System.Collections.Generic.Dictionary? ctx = null) => + checkedCast(b?.ice_facet(f), ctx); + + [return: global::System.Diagnostics.CodeAnalysis.NotNullIfNotNull(nameof(b))] + + public static NodePrx? uncheckedCast(Ice.ObjectPrx? b) => + b is not null ? new NodePrxHelper(b) : null; + + [return: global::System.Diagnostics.CodeAnalysis.NotNullIfNotNull(nameof(b))] + + public static NodePrx? uncheckedCast(Ice.ObjectPrx? b, string f) => + uncheckedCast(b?.ice_facet(f)); + + private static readonly string[] _ids = + { + "::DataStormContract::Node", + "::Ice::Object" + }; + + public static string ice_staticId() => "::DataStormContract::Node"; + + public static void write(Ice.OutputStream ostr, NodePrx? v) + { + ostr.writeProxy(v); + } + + public static NodePrx? read(Ice.InputStream istr) => + istr.readProxy() is Ice.ObjectPrx proxy ? new NodePrxHelper(proxy) : null; + + protected override Ice.ObjectPrxHelperBase iceNewInstance(Ice.Internal.Reference reference) => new NodePrxHelper(reference); + + private NodePrxHelper(Ice.ObjectPrx proxy) + : base(proxy) + { + } + + private NodePrxHelper(Ice.Internal.Reference reference) + : base(reference) + { + } + } + + public sealed class LookupPrxHelper : Ice.ObjectPrxHelperBase, LookupPrx + { + public void announceTopicReader(string topic, NodePrx? node, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_announceTopicReaderAsync(topic, node, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void announceTopicWriter(string topic, NodePrx? node, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_announceTopicWriterAsync(topic, node, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public void announceTopics(string[] readers, string[] writers, NodePrx? node, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + _iceI_announceTopicsAsync(readers, writers, node, context, null, global::System.Threading.CancellationToken.None, true).Wait(); + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public NodePrx? createSession(NodePrx? node, global::System.Collections.Generic.Dictionary? context = null) + { + try + { + return _iceI_createSessionAsync(node, context, null, global::System.Threading.CancellationToken.None, true).Result; + } + catch (global::System.AggregateException ex_) + { + throw ex_.InnerException!; + } + } + + public global::System.Threading.Tasks.Task announceTopicReaderAsync(string topic, NodePrx? node, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_announceTopicReaderAsync(topic, node, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_announceTopicReaderAsync(string iceP_topic, NodePrx? iceP_node, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_announceTopicReader(iceP_topic, iceP_node, context, synchronous, completed); + return completed.Task; + } + + private const string _announceTopicReader_name = "announceTopicReader"; + + private void _iceI_announceTopicReader(string iceP_topic, NodePrx? iceP_node, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _announceTopicReader_name, + Ice.OperationMode.Idempotent, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeString(iceP_topic); + NodePrxHelper.write(ostr, iceP_node); + }); + } + + public global::System.Threading.Tasks.Task announceTopicWriterAsync(string topic, NodePrx? node, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_announceTopicWriterAsync(topic, node, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_announceTopicWriterAsync(string iceP_topic, NodePrx? iceP_node, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_announceTopicWriter(iceP_topic, iceP_node, context, synchronous, completed); + return completed.Task; + } + + private const string _announceTopicWriter_name = "announceTopicWriter"; + + private void _iceI_announceTopicWriter(string iceP_topic, NodePrx? iceP_node, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _announceTopicWriter_name, + Ice.OperationMode.Idempotent, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + ostr.writeString(iceP_topic); + NodePrxHelper.write(ostr, iceP_node); + }); + } + + public global::System.Threading.Tasks.Task announceTopicsAsync(string[] readers, string[] writers, NodePrx? node, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_announceTopicsAsync(readers, writers, node, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_announceTopicsAsync(string[] iceP_readers, string[] iceP_writers, NodePrx? iceP_node, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_announceTopics(iceP_readers, iceP_writers, iceP_node, context, synchronous, completed); + return completed.Task; + } + + private const string _announceTopics_name = "announceTopics"; + + private void _iceI_announceTopics(string[] iceP_readers, string[] iceP_writers, NodePrx? iceP_node, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _announceTopics_name, + Ice.OperationMode.Idempotent, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + StringSeqHelper.write(ostr, iceP_readers); + StringSeqHelper.write(ostr, iceP_writers); + NodePrxHelper.write(ostr, iceP_node); + }); + } + + public global::System.Threading.Tasks.Task createSessionAsync(NodePrx? node, global::System.Collections.Generic.Dictionary? context = null, global::System.IProgress? progress = null, global::System.Threading.CancellationToken cancel = default) + { + return _iceI_createSessionAsync(node, context, progress, cancel, false); + } + + private global::System.Threading.Tasks.Task _iceI_createSessionAsync(NodePrx? iceP_node, global::System.Collections.Generic.Dictionary? context, global::System.IProgress? progress, global::System.Threading.CancellationToken cancel, bool synchronous) + { + iceCheckTwowayOnly(_createSession_name); + var completed = new Ice.Internal.OperationTaskCompletionCallback(progress, cancel); + _iceI_createSession(iceP_node, context, synchronous, completed); + return completed.Task; + } + + private const string _createSession_name = "createSession"; + + private void _iceI_createSession(NodePrx? iceP_node, global::System.Collections.Generic.Dictionary? context, bool synchronous, Ice.Internal.OutgoingAsyncCompletionCallback completed) + { + var outAsync = getOutgoingAsync(completed); + outAsync.invoke( + _createSession_name, + Ice.OperationMode.Normal, + null, + context, + synchronous, + write: (Ice.OutputStream ostr) => + { + NodePrxHelper.write(ostr, iceP_node); + }, + read: (Ice.InputStream istr) => + { + NodePrx? ret; + ret = NodePrxHelper.read(istr); + return ret; + }); + } + + public static LookupPrx createProxy(Ice.Communicator communicator, string proxyString) => + new LookupPrxHelper(Ice.ObjectPrxHelper.createProxy(communicator, proxyString)); + + public static LookupPrx? checkedCast(Ice.ObjectPrx? b, global::System.Collections.Generic.Dictionary? ctx = null) => + b is not null && b.ice_isA(ice_staticId(), ctx) ? new LookupPrxHelper(b) : null; + + public static LookupPrx? checkedCast(Ice.ObjectPrx? b, string f, global::System.Collections.Generic.Dictionary? ctx = null) => + checkedCast(b?.ice_facet(f), ctx); + + [return: global::System.Diagnostics.CodeAnalysis.NotNullIfNotNull(nameof(b))] + + public static LookupPrx? uncheckedCast(Ice.ObjectPrx? b) => + b is not null ? new LookupPrxHelper(b) : null; + + [return: global::System.Diagnostics.CodeAnalysis.NotNullIfNotNull(nameof(b))] + + public static LookupPrx? uncheckedCast(Ice.ObjectPrx? b, string f) => + uncheckedCast(b?.ice_facet(f)); + + private static readonly string[] _ids = + { + "::DataStormContract::Lookup", + "::Ice::Object" + }; + + public static string ice_staticId() => "::DataStormContract::Lookup"; + + public static void write(Ice.OutputStream ostr, LookupPrx? v) + { + ostr.writeProxy(v); + } + + public static LookupPrx? read(Ice.InputStream istr) => + istr.readProxy() is Ice.ObjectPrx proxy ? new LookupPrxHelper(proxy) : null; + + protected override Ice.ObjectPrxHelperBase iceNewInstance(Ice.Internal.Reference reference) => new LookupPrxHelper(reference); + + private LookupPrxHelper(Ice.ObjectPrx proxy) + : base(proxy) + { + } + + private LookupPrxHelper(Ice.Internal.Reference reference) + : base(reference) + { + } + } +} + +namespace DataStormContract +{ + public abstract class SessionDisp_ : Ice.ObjectImpl, Session + { + public abstract void announceTopics(TopicInfo[] topics, bool initialize, Ice.Current current); + + public abstract void attachTopic(TopicSpec topic, Ice.Current current); + + public abstract void detachTopic(long topic, Ice.Current current); + + public abstract void attachTags(long topic, ElementInfo[] tags, bool initialize, Ice.Current current); + + public abstract void detachTags(long topic, long[] tags, Ice.Current current); + + public abstract void announceElements(long topic, ElementInfo[] keys, Ice.Current current); + + public abstract void attachElements(long topic, ElementSpec[] elements, bool initialize, Ice.Current current); + + public abstract void attachElementsAck(long topic, ElementSpecAck[] elements, Ice.Current current); + + public abstract void detachElements(long topic, long[] keys, Ice.Current current); + + public abstract void initSamples(long topic, DataSamples[] samples, Ice.Current current); + + public abstract void disconnected(Ice.Current current); + + public override string ice_id(Ice.Current current) => ice_staticId(); + + public static new string ice_staticId() => "::DataStormContract::Session"; + + public override global::System.Threading.Tasks.ValueTask dispatchAsync(Ice.IncomingRequest request) => + request.current.operation switch + { + "announceTopics" => Session.iceD_announceTopicsAsync(this, request), + "attachTopic" => Session.iceD_attachTopicAsync(this, request), + "detachTopic" => Session.iceD_detachTopicAsync(this, request), + "attachTags" => Session.iceD_attachTagsAsync(this, request), + "detachTags" => Session.iceD_detachTagsAsync(this, request), + "announceElements" => Session.iceD_announceElementsAsync(this, request), + "attachElements" => Session.iceD_attachElementsAsync(this, request), + "attachElementsAck" => Session.iceD_attachElementsAckAsync(this, request), + "detachElements" => Session.iceD_detachElementsAsync(this, request), + "initSamples" => Session.iceD_initSamplesAsync(this, request), + "disconnected" => Session.iceD_disconnectedAsync(this, request), + "ice_id" => Ice.Object.iceD_ice_idAsync(this, request), + "ice_ids" => Ice.Object.iceD_ice_idsAsync(this, request), + "ice_isA" => Ice.Object.iceD_ice_isAAsync(this, request), + "ice_ping" => Ice.Object.iceD_ice_pingAsync(this, request), + _ => throw new Ice.OperationNotExistException() + }; + } + + public abstract class PublisherSessionDisp_ : Ice.ObjectImpl, PublisherSession + { + public abstract void announceTopics(TopicInfo[] topics, bool initialize, Ice.Current current); + + public abstract void attachTopic(TopicSpec topic, Ice.Current current); + + public abstract void detachTopic(long topic, Ice.Current current); + + public abstract void attachElements(long topic, ElementSpec[] elements, bool initialize, Ice.Current current); + + public abstract void attachElementsAck(long topic, ElementSpecAck[] elements, Ice.Current current); + + public abstract void detachElements(long topic, long[] keys, Ice.Current current); + + public abstract void initSamples(long topic, DataSamples[] samples, Ice.Current current); + + public abstract void disconnected(Ice.Current current); + + public abstract void attachTags(long topic, ElementInfo[] tags, bool initialize, Ice.Current current); + + public abstract void detachTags(long topic, long[] tags, Ice.Current current); + + public abstract void announceElements(long topic, ElementInfo[] keys, Ice.Current current); + + public override string ice_id(Ice.Current current) => ice_staticId(); + + public static new string ice_staticId() => "::DataStormContract::PublisherSession"; + + public override global::System.Threading.Tasks.ValueTask dispatchAsync(Ice.IncomingRequest request) => + request.current.operation switch + { + "announceTopics" => Session.iceD_announceTopicsAsync(this, request), + "attachTopic" => Session.iceD_attachTopicAsync(this, request), + "detachTopic" => Session.iceD_detachTopicAsync(this, request), + "attachTags" => Session.iceD_attachTagsAsync(this, request), + "detachTags" => Session.iceD_detachTagsAsync(this, request), + "announceElements" => Session.iceD_announceElementsAsync(this, request), + "attachElements" => Session.iceD_attachElementsAsync(this, request), + "attachElementsAck" => Session.iceD_attachElementsAckAsync(this, request), + "detachElements" => Session.iceD_detachElementsAsync(this, request), + "initSamples" => Session.iceD_initSamplesAsync(this, request), + "disconnected" => Session.iceD_disconnectedAsync(this, request), + "ice_id" => Ice.Object.iceD_ice_idAsync(this, request), + "ice_ids" => Ice.Object.iceD_ice_idsAsync(this, request), + "ice_isA" => Ice.Object.iceD_ice_isAAsync(this, request), + "ice_ping" => Ice.Object.iceD_ice_pingAsync(this, request), + _ => throw new Ice.OperationNotExistException() + }; + } + + public abstract class SubscriberSessionDisp_ : Ice.ObjectImpl, SubscriberSession + { + public abstract void s(long topicId, long elementId, DataSample sample, Ice.Current current); + + public abstract void announceTopics(TopicInfo[] topics, bool initialize, Ice.Current current); + + public abstract void attachTopic(TopicSpec topic, Ice.Current current); + + public abstract void detachTopic(long topic, Ice.Current current); + + public abstract void attachElements(long topic, ElementSpec[] elements, bool initialize, Ice.Current current); + + public abstract void attachElementsAck(long topic, ElementSpecAck[] elements, Ice.Current current); + + public abstract void detachElements(long topic, long[] keys, Ice.Current current); + + public abstract void initSamples(long topic, DataSamples[] samples, Ice.Current current); + + public abstract void disconnected(Ice.Current current); + + public abstract void attachTags(long topic, ElementInfo[] tags, bool initialize, Ice.Current current); + + public abstract void detachTags(long topic, long[] tags, Ice.Current current); + + public abstract void announceElements(long topic, ElementInfo[] keys, Ice.Current current); + + public override string ice_id(Ice.Current current) => ice_staticId(); + + public static new string ice_staticId() => "::DataStormContract::SubscriberSession"; + + public override global::System.Threading.Tasks.ValueTask dispatchAsync(Ice.IncomingRequest request) => + request.current.operation switch + { + "announceTopics" => Session.iceD_announceTopicsAsync(this, request), + "attachTopic" => Session.iceD_attachTopicAsync(this, request), + "detachTopic" => Session.iceD_detachTopicAsync(this, request), + "attachTags" => Session.iceD_attachTagsAsync(this, request), + "detachTags" => Session.iceD_detachTagsAsync(this, request), + "announceElements" => Session.iceD_announceElementsAsync(this, request), + "attachElements" => Session.iceD_attachElementsAsync(this, request), + "attachElementsAck" => Session.iceD_attachElementsAckAsync(this, request), + "detachElements" => Session.iceD_detachElementsAsync(this, request), + "initSamples" => Session.iceD_initSamplesAsync(this, request), + "disconnected" => Session.iceD_disconnectedAsync(this, request), + "s" => SubscriberSession.iceD_sAsync(this, request), + "ice_id" => Ice.Object.iceD_ice_idAsync(this, request), + "ice_ids" => Ice.Object.iceD_ice_idsAsync(this, request), + "ice_isA" => Ice.Object.iceD_ice_isAAsync(this, request), + "ice_ping" => Ice.Object.iceD_ice_pingAsync(this, request), + _ => throw new Ice.OperationNotExistException() + }; + } + + public abstract class NodeDisp_ : Ice.ObjectImpl, Node + { + public abstract void initiateCreateSession(NodePrx? publisher, Ice.Current current); + + public abstract void createSession(NodePrx? subscriber, SubscriberSessionPrx? session, bool fromRelay, Ice.Current current); + + public abstract void confirmCreateSession(NodePrx? publisher, PublisherSessionPrx? session, Ice.Current current); + + public override string ice_id(Ice.Current current) => ice_staticId(); + + public static new string ice_staticId() => "::DataStormContract::Node"; + + public override global::System.Threading.Tasks.ValueTask dispatchAsync(Ice.IncomingRequest request) => + request.current.operation switch + { + "initiateCreateSession" => Node.iceD_initiateCreateSessionAsync(this, request), + "createSession" => Node.iceD_createSessionAsync(this, request), + "confirmCreateSession" => Node.iceD_confirmCreateSessionAsync(this, request), + "ice_id" => Ice.Object.iceD_ice_idAsync(this, request), + "ice_ids" => Ice.Object.iceD_ice_idsAsync(this, request), + "ice_isA" => Ice.Object.iceD_ice_isAAsync(this, request), + "ice_ping" => Ice.Object.iceD_ice_pingAsync(this, request), + _ => throw new Ice.OperationNotExistException() + }; + } + + public abstract class LookupDisp_ : Ice.ObjectImpl, Lookup + { + public abstract void announceTopicReader(string topic, NodePrx? node, Ice.Current current); + + public abstract void announceTopicWriter(string topic, NodePrx? node, Ice.Current current); + + public abstract void announceTopics(string[] readers, string[] writers, NodePrx? node, Ice.Current current); + + public abstract NodePrx? createSession(NodePrx? node, Ice.Current current); + + public override string ice_id(Ice.Current current) => ice_staticId(); + + public static new string ice_staticId() => "::DataStormContract::Lookup"; + + public override global::System.Threading.Tasks.ValueTask dispatchAsync(Ice.IncomingRequest request) => + request.current.operation switch + { + "announceTopicReader" => Lookup.iceD_announceTopicReaderAsync(this, request), + "announceTopicWriter" => Lookup.iceD_announceTopicWriterAsync(this, request), + "announceTopics" => Lookup.iceD_announceTopicsAsync(this, request), + "createSession" => Lookup.iceD_createSessionAsync(this, request), + "ice_id" => Ice.Object.iceD_ice_idAsync(this, request), + "ice_ids" => Ice.Object.iceD_ice_idsAsync(this, request), + "ice_isA" => Ice.Object.iceD_ice_isAAsync(this, request), + "ice_ping" => Ice.Object.iceD_ice_pingAsync(this, request), + _ => throw new Ice.OperationNotExistException() + }; + } +} + +namespace DataStormContract +{ + public partial interface Session + { + protected static global::System.Threading.Tasks.ValueTask iceD_announceTopicsAsync( + Session obj, + Ice.IncomingRequest request) + { + Ice.ObjectImpl.iceCheckMode(Ice.OperationMode.Normal, request.current.mode); + var istr = request.inputStream; + istr.startEncapsulation(); + TopicInfo[] iceP_topics; + bool iceP_initialize; + iceP_topics = TopicInfoSeqHelper.read(istr); + iceP_initialize = istr.readBool(); + istr.endEncapsulation(); + obj.announceTopics(iceP_topics, iceP_initialize, request.current); + return new(Ice.CurrentExtensions.createEmptyOutgoingResponse(request.current)); + } + + protected static global::System.Threading.Tasks.ValueTask iceD_attachTopicAsync( + Session obj, + Ice.IncomingRequest request) + { + Ice.ObjectImpl.iceCheckMode(Ice.OperationMode.Normal, request.current.mode); + var istr = request.inputStream; + istr.startEncapsulation(); + TopicSpec iceP_topic; + iceP_topic = new TopicSpec(istr); + istr.endEncapsulation(); + obj.attachTopic(iceP_topic, request.current); + return new(Ice.CurrentExtensions.createEmptyOutgoingResponse(request.current)); + } + + protected static global::System.Threading.Tasks.ValueTask iceD_detachTopicAsync( + Session obj, + Ice.IncomingRequest request) + { + Ice.ObjectImpl.iceCheckMode(Ice.OperationMode.Normal, request.current.mode); + var istr = request.inputStream; + istr.startEncapsulation(); + long iceP_topic; + iceP_topic = istr.readLong(); + istr.endEncapsulation(); + obj.detachTopic(iceP_topic, request.current); + return new(Ice.CurrentExtensions.createEmptyOutgoingResponse(request.current)); + } + + protected static global::System.Threading.Tasks.ValueTask iceD_attachTagsAsync( + Session obj, + Ice.IncomingRequest request) + { + Ice.ObjectImpl.iceCheckMode(Ice.OperationMode.Normal, request.current.mode); + var istr = request.inputStream; + istr.startEncapsulation(); + long iceP_topic; + ElementInfo[] iceP_tags; + bool iceP_initialize; + iceP_topic = istr.readLong(); + iceP_tags = ElementInfoSeqHelper.read(istr); + iceP_initialize = istr.readBool(); + istr.endEncapsulation(); + obj.attachTags(iceP_topic, iceP_tags, iceP_initialize, request.current); + return new(Ice.CurrentExtensions.createEmptyOutgoingResponse(request.current)); + } + + protected static global::System.Threading.Tasks.ValueTask iceD_detachTagsAsync( + Session obj, + Ice.IncomingRequest request) + { + Ice.ObjectImpl.iceCheckMode(Ice.OperationMode.Normal, request.current.mode); + var istr = request.inputStream; + istr.startEncapsulation(); + long iceP_topic; + long[] iceP_tags; + iceP_topic = istr.readLong(); + iceP_tags = LongSeqHelper.read(istr); + istr.endEncapsulation(); + obj.detachTags(iceP_topic, iceP_tags, request.current); + return new(Ice.CurrentExtensions.createEmptyOutgoingResponse(request.current)); + } + + protected static global::System.Threading.Tasks.ValueTask iceD_announceElementsAsync( + Session obj, + Ice.IncomingRequest request) + { + Ice.ObjectImpl.iceCheckMode(Ice.OperationMode.Normal, request.current.mode); + var istr = request.inputStream; + istr.startEncapsulation(); + long iceP_topic; + ElementInfo[] iceP_keys; + iceP_topic = istr.readLong(); + iceP_keys = ElementInfoSeqHelper.read(istr); + istr.endEncapsulation(); + obj.announceElements(iceP_topic, iceP_keys, request.current); + return new(Ice.CurrentExtensions.createEmptyOutgoingResponse(request.current)); + } + + protected static global::System.Threading.Tasks.ValueTask iceD_attachElementsAsync( + Session obj, + Ice.IncomingRequest request) + { + Ice.ObjectImpl.iceCheckMode(Ice.OperationMode.Normal, request.current.mode); + var istr = request.inputStream; + istr.startEncapsulation(); + long iceP_topic; + ElementSpec[] iceP_elements; + bool iceP_initialize; + iceP_topic = istr.readLong(); + iceP_elements = ElementSpecSeqHelper.read(istr); + iceP_initialize = istr.readBool(); + istr.readPendingValues(); + istr.endEncapsulation(); + obj.attachElements(iceP_topic, iceP_elements, iceP_initialize, request.current); + return new(Ice.CurrentExtensions.createEmptyOutgoingResponse(request.current)); + } + + protected static global::System.Threading.Tasks.ValueTask iceD_attachElementsAckAsync( + Session obj, + Ice.IncomingRequest request) + { + Ice.ObjectImpl.iceCheckMode(Ice.OperationMode.Normal, request.current.mode); + var istr = request.inputStream; + istr.startEncapsulation(); + long iceP_topic; + ElementSpecAck[] iceP_elements; + iceP_topic = istr.readLong(); + iceP_elements = ElementSpecAckSeqHelper.read(istr); + istr.readPendingValues(); + istr.endEncapsulation(); + obj.attachElementsAck(iceP_topic, iceP_elements, request.current); + return new(Ice.CurrentExtensions.createEmptyOutgoingResponse(request.current)); + } + + protected static global::System.Threading.Tasks.ValueTask iceD_detachElementsAsync( + Session obj, + Ice.IncomingRequest request) + { + Ice.ObjectImpl.iceCheckMode(Ice.OperationMode.Normal, request.current.mode); + var istr = request.inputStream; + istr.startEncapsulation(); + long iceP_topic; + long[] iceP_keys; + iceP_topic = istr.readLong(); + iceP_keys = LongSeqHelper.read(istr); + istr.endEncapsulation(); + obj.detachElements(iceP_topic, iceP_keys, request.current); + return new(Ice.CurrentExtensions.createEmptyOutgoingResponse(request.current)); + } + + protected static global::System.Threading.Tasks.ValueTask iceD_initSamplesAsync( + Session obj, + Ice.IncomingRequest request) + { + Ice.ObjectImpl.iceCheckMode(Ice.OperationMode.Normal, request.current.mode); + var istr = request.inputStream; + istr.startEncapsulation(); + long iceP_topic; + DataSamples[] iceP_samples; + iceP_topic = istr.readLong(); + iceP_samples = DataSamplesSeqHelper.read(istr); + istr.endEncapsulation(); + obj.initSamples(iceP_topic, iceP_samples, request.current); + return new(Ice.CurrentExtensions.createEmptyOutgoingResponse(request.current)); + } + + protected static global::System.Threading.Tasks.ValueTask iceD_disconnectedAsync( + Session obj, + Ice.IncomingRequest request) + { + Ice.ObjectImpl.iceCheckMode(Ice.OperationMode.Normal, request.current.mode); + request.inputStream.skipEmptyEncapsulation(); + obj.disconnected(request.current); + return new(Ice.CurrentExtensions.createEmptyOutgoingResponse(request.current)); + } + } + + public partial interface PublisherSession + { + } + + public partial interface SubscriberSession + { + protected static global::System.Threading.Tasks.ValueTask iceD_sAsync( + SubscriberSession obj, + Ice.IncomingRequest request) + { + Ice.ObjectImpl.iceCheckMode(Ice.OperationMode.Normal, request.current.mode); + var istr = request.inputStream; + istr.startEncapsulation(); + long iceP_topicId; + long iceP_elementId; + DataSample iceP_sample; + iceP_topicId = istr.readLong(); + iceP_elementId = istr.readLong(); + iceP_sample = new DataSample(istr); + istr.endEncapsulation(); + obj.s(iceP_topicId, iceP_elementId, iceP_sample, request.current); + return new(Ice.CurrentExtensions.createEmptyOutgoingResponse(request.current)); + } + } + + public partial interface Node + { + protected static global::System.Threading.Tasks.ValueTask iceD_initiateCreateSessionAsync( + Node obj, + Ice.IncomingRequest request) + { + Ice.ObjectImpl.iceCheckMode(Ice.OperationMode.Normal, request.current.mode); + var istr = request.inputStream; + istr.startEncapsulation(); + NodePrx? iceP_publisher; + iceP_publisher = NodePrxHelper.read(istr); + istr.endEncapsulation(); + obj.initiateCreateSession(iceP_publisher, request.current); + return new(Ice.CurrentExtensions.createEmptyOutgoingResponse(request.current)); + } + + protected static global::System.Threading.Tasks.ValueTask iceD_createSessionAsync( + Node obj, + Ice.IncomingRequest request) + { + Ice.ObjectImpl.iceCheckMode(Ice.OperationMode.Normal, request.current.mode); + var istr = request.inputStream; + istr.startEncapsulation(); + NodePrx? iceP_subscriber; + SubscriberSessionPrx? iceP_session; + bool iceP_fromRelay; + iceP_subscriber = NodePrxHelper.read(istr); + iceP_session = SubscriberSessionPrxHelper.read(istr); + iceP_fromRelay = istr.readBool(); + istr.endEncapsulation(); + obj.createSession(iceP_subscriber, iceP_session, iceP_fromRelay, request.current); + return new(Ice.CurrentExtensions.createEmptyOutgoingResponse(request.current)); + } + + protected static global::System.Threading.Tasks.ValueTask iceD_confirmCreateSessionAsync( + Node obj, + Ice.IncomingRequest request) + { + Ice.ObjectImpl.iceCheckMode(Ice.OperationMode.Normal, request.current.mode); + var istr = request.inputStream; + istr.startEncapsulation(); + NodePrx? iceP_publisher; + PublisherSessionPrx? iceP_session; + iceP_publisher = NodePrxHelper.read(istr); + iceP_session = PublisherSessionPrxHelper.read(istr); + istr.endEncapsulation(); + obj.confirmCreateSession(iceP_publisher, iceP_session, request.current); + return new(Ice.CurrentExtensions.createEmptyOutgoingResponse(request.current)); + } + } + + public partial interface Lookup + { + protected static global::System.Threading.Tasks.ValueTask iceD_announceTopicReaderAsync( + Lookup obj, + Ice.IncomingRequest request) + { + Ice.ObjectImpl.iceCheckMode(Ice.OperationMode.Idempotent, request.current.mode); + var istr = request.inputStream; + istr.startEncapsulation(); + string iceP_topic; + NodePrx? iceP_node; + iceP_topic = istr.readString(); + iceP_node = NodePrxHelper.read(istr); + istr.endEncapsulation(); + obj.announceTopicReader(iceP_topic, iceP_node, request.current); + return new(Ice.CurrentExtensions.createEmptyOutgoingResponse(request.current)); + } + + protected static global::System.Threading.Tasks.ValueTask iceD_announceTopicWriterAsync( + Lookup obj, + Ice.IncomingRequest request) + { + Ice.ObjectImpl.iceCheckMode(Ice.OperationMode.Idempotent, request.current.mode); + var istr = request.inputStream; + istr.startEncapsulation(); + string iceP_topic; + NodePrx? iceP_node; + iceP_topic = istr.readString(); + iceP_node = NodePrxHelper.read(istr); + istr.endEncapsulation(); + obj.announceTopicWriter(iceP_topic, iceP_node, request.current); + return new(Ice.CurrentExtensions.createEmptyOutgoingResponse(request.current)); + } + + protected static global::System.Threading.Tasks.ValueTask iceD_announceTopicsAsync( + Lookup obj, + Ice.IncomingRequest request) + { + Ice.ObjectImpl.iceCheckMode(Ice.OperationMode.Idempotent, request.current.mode); + var istr = request.inputStream; + istr.startEncapsulation(); + string[] iceP_readers; + string[] iceP_writers; + NodePrx? iceP_node; + iceP_readers = StringSeqHelper.read(istr); + iceP_writers = StringSeqHelper.read(istr); + iceP_node = NodePrxHelper.read(istr); + istr.endEncapsulation(); + obj.announceTopics(iceP_readers, iceP_writers, iceP_node, request.current); + return new(Ice.CurrentExtensions.createEmptyOutgoingResponse(request.current)); + } + + protected static global::System.Threading.Tasks.ValueTask iceD_createSessionAsync( + Lookup obj, + Ice.IncomingRequest request) + { + Ice.ObjectImpl.iceCheckMode(Ice.OperationMode.Normal, request.current.mode); + var istr = request.inputStream; + istr.startEncapsulation(); + NodePrx? iceP_node; + iceP_node = NodePrxHelper.read(istr); + istr.endEncapsulation(); + var ret = obj.createSession(iceP_node, request.current); + var ostr = Ice.CurrentExtensions.startReplyStream(request.current); + ostr.startEncapsulation(request.current.encoding, null); + NodePrxHelper.write(ostr, ret); + ostr.endEncapsulation(); + return new(new Ice.OutgoingResponse(ostr)); + } + } +} diff --git a/slice2cs/cpp/test/DataStorm/api/Test.cs b/slice2cs/cpp/test/DataStorm/api/Test.cs new file mode 100644 index 000000000000..4feb5eb98730 --- /dev/null +++ b/slice2cs/cpp/test/DataStorm/api/Test.cs @@ -0,0 +1,94 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +#nullable enable + +[assembly:Ice.Slice("Test.ice")] + +#pragma warning disable CS1591 // Missing XML Comment +#pragma warning disable CS1573 // Parameter has no matching param tag in the XML comment +#pragma warning disable CS0612 // Type or member is obsolete +#pragma warning disable CS0618 // Type or member is obsolete +#pragma warning disable CS0619 // Type or member is obsolete + +namespace Test +{ + public partial record struct StructKey + { + public int value; + + partial void ice_initialize(); + + public StructKey(int value) + { + this.value = value; + ice_initialize(); + } + + public StructKey(Ice.InputStream istr) + { + this.value = istr.readInt(); + ice_initialize(); + } + + public void ice_writeMembers(Ice.OutputStream ostr) + { + ostr.writeInt(this.value); + } + + public static void ice_write(Ice.OutputStream ostr, StructKey v) + { + v.ice_writeMembers(ostr); + } + + public static StructKey ice_read(Ice.InputStream istr) => new(istr); + } + + [Ice.SliceTypeId("::Test::ClassKey")] + public partial class ClassKey : Ice.Value + { + public int value; + + partial void ice_initialize(); + + public ClassKey(int value) + { + this.value = value; + ice_initialize(); + } + + public ClassKey() + { + ice_initialize(); + } + + public static new string ice_staticId() => "::Test::ClassKey"; + public override string ice_id() => ice_staticId(); + + protected override void iceWriteImpl(Ice.OutputStream ostr_) + { + ostr_.startSlice(ice_staticId(), -1, true); + ostr_.writeInt(value); + ostr_.endSlice(); + } + + protected override void iceReadImpl(Ice.InputStream istr_) + { + istr_.startSlice(); + value = istr_.readInt(); + istr_.endSlice(); + } + } +} diff --git a/slice2cs/cpp/test/DataStorm/events/Test.cs b/slice2cs/cpp/test/DataStorm/events/Test.cs new file mode 100644 index 000000000000..3b93d36ff21c --- /dev/null +++ b/slice2cs/cpp/test/DataStorm/events/Test.cs @@ -0,0 +1,150 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +#nullable enable + +[assembly:Ice.Slice("Test.ice")] + +#pragma warning disable CS1591 // Missing XML Comment +#pragma warning disable CS1573 // Parameter has no matching param tag in the XML comment +#pragma warning disable CS0612 // Type or member is obsolete +#pragma warning disable CS0618 // Type or member is obsolete +#pragma warning disable CS0619 // Type or member is obsolete + +namespace Test +{ + public sealed partial record class StructValue + { + public string firstName = ""; + + public string lastName = ""; + + public int age; + + partial void ice_initialize(); + + public StructValue() + { + ice_initialize(); + } + + public StructValue(string firstName, string lastName, int age) + { + global::System.ArgumentNullException.ThrowIfNull(firstName); + this.firstName = firstName; + global::System.ArgumentNullException.ThrowIfNull(lastName); + this.lastName = lastName; + this.age = age; + ice_initialize(); + } + + public StructValue(Ice.InputStream istr) + { + this.firstName = istr.readString(); + this.lastName = istr.readString(); + this.age = istr.readInt(); + ice_initialize(); + } + + public void ice_writeMembers(Ice.OutputStream ostr) + { + ostr.writeString(this.firstName); + ostr.writeString(this.lastName); + ostr.writeInt(this.age); + } + + public static void ice_write(Ice.OutputStream ostr, StructValue v) + { + v.ice_writeMembers(ostr); + } + + public static StructValue ice_read(Ice.InputStream istr) => new(istr); + } + + [Ice.SliceTypeId("::Test::Base")] + public partial class Base : Ice.Value + { + public string b = ""; + + partial void ice_initialize(); + + public Base(string b) + { + global::System.ArgumentNullException.ThrowIfNull(b); + this.b = b; + ice_initialize(); + } + + public Base() + { + ice_initialize(); + } + + public static new string ice_staticId() => "::Test::Base"; + public override string ice_id() => ice_staticId(); + + protected override void iceWriteImpl(Ice.OutputStream ostr_) + { + ostr_.startSlice(ice_staticId(), -1, true); + ostr_.writeString(b); + ostr_.endSlice(); + } + + protected override void iceReadImpl(Ice.InputStream istr_) + { + istr_.startSlice(); + b = istr_.readString(); + istr_.endSlice(); + } + } + + [Ice.SliceTypeId("::Test::Extended")] + public partial class Extended : Base + { + public int e; + + partial void ice_initialize(); + + public Extended(string b, int e) : base(b) + { + this.e = e; + ice_initialize(); + } + + public Extended() + { + ice_initialize(); + } + + public static new string ice_staticId() => "::Test::Extended"; + public override string ice_id() => ice_staticId(); + + protected override void iceWriteImpl(Ice.OutputStream ostr_) + { + ostr_.startSlice(ice_staticId(), -1, false); + ostr_.writeInt(e); + ostr_.endSlice(); + base.iceWriteImpl(ostr_); + } + + protected override void iceReadImpl(Ice.InputStream istr_) + { + istr_.startSlice(); + e = istr_.readInt(); + istr_.endSlice(); + base.iceReadImpl(istr_); + } + } +} diff --git a/slice2cs/cpp/test/DataStorm/partial/Test.cs b/slice2cs/cpp/test/DataStorm/partial/Test.cs new file mode 100644 index 000000000000..674b3b7b5bc3 --- /dev/null +++ b/slice2cs/cpp/test/DataStorm/partial/Test.cs @@ -0,0 +1,68 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +#nullable enable + +[assembly:Ice.Slice("Test.ice")] + +#pragma warning disable CS1591 // Missing XML Comment +#pragma warning disable CS1573 // Parameter has no matching param tag in the XML comment +#pragma warning disable CS0612 // Type or member is obsolete +#pragma warning disable CS0618 // Type or member is obsolete +#pragma warning disable CS0619 // Type or member is obsolete + +namespace Test +{ + public partial record struct Stock + { + public float price; + + public float lastBid; + + public float laskAsk; + + partial void ice_initialize(); + + public Stock(float price, float lastBid, float laskAsk) + { + this.price = price; + this.lastBid = lastBid; + this.laskAsk = laskAsk; + ice_initialize(); + } + + public Stock(Ice.InputStream istr) + { + this.price = istr.readFloat(); + this.lastBid = istr.readFloat(); + this.laskAsk = istr.readFloat(); + ice_initialize(); + } + + public void ice_writeMembers(Ice.OutputStream ostr) + { + ostr.writeFloat(this.price); + ostr.writeFloat(this.lastBid); + ostr.writeFloat(this.laskAsk); + } + + public static void ice_write(Ice.OutputStream ostr, Stock v) + { + v.ice_writeMembers(ostr); + } + + public static Stock ice_read(Ice.InputStream istr) => new(istr); + } +} diff --git a/slice2cs/cpp/test/DataStorm/types/Test.cs b/slice2cs/cpp/test/DataStorm/types/Test.cs new file mode 100644 index 000000000000..3b93d36ff21c --- /dev/null +++ b/slice2cs/cpp/test/DataStorm/types/Test.cs @@ -0,0 +1,150 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +#nullable enable + +[assembly:Ice.Slice("Test.ice")] + +#pragma warning disable CS1591 // Missing XML Comment +#pragma warning disable CS1573 // Parameter has no matching param tag in the XML comment +#pragma warning disable CS0612 // Type or member is obsolete +#pragma warning disable CS0618 // Type or member is obsolete +#pragma warning disable CS0619 // Type or member is obsolete + +namespace Test +{ + public sealed partial record class StructValue + { + public string firstName = ""; + + public string lastName = ""; + + public int age; + + partial void ice_initialize(); + + public StructValue() + { + ice_initialize(); + } + + public StructValue(string firstName, string lastName, int age) + { + global::System.ArgumentNullException.ThrowIfNull(firstName); + this.firstName = firstName; + global::System.ArgumentNullException.ThrowIfNull(lastName); + this.lastName = lastName; + this.age = age; + ice_initialize(); + } + + public StructValue(Ice.InputStream istr) + { + this.firstName = istr.readString(); + this.lastName = istr.readString(); + this.age = istr.readInt(); + ice_initialize(); + } + + public void ice_writeMembers(Ice.OutputStream ostr) + { + ostr.writeString(this.firstName); + ostr.writeString(this.lastName); + ostr.writeInt(this.age); + } + + public static void ice_write(Ice.OutputStream ostr, StructValue v) + { + v.ice_writeMembers(ostr); + } + + public static StructValue ice_read(Ice.InputStream istr) => new(istr); + } + + [Ice.SliceTypeId("::Test::Base")] + public partial class Base : Ice.Value + { + public string b = ""; + + partial void ice_initialize(); + + public Base(string b) + { + global::System.ArgumentNullException.ThrowIfNull(b); + this.b = b; + ice_initialize(); + } + + public Base() + { + ice_initialize(); + } + + public static new string ice_staticId() => "::Test::Base"; + public override string ice_id() => ice_staticId(); + + protected override void iceWriteImpl(Ice.OutputStream ostr_) + { + ostr_.startSlice(ice_staticId(), -1, true); + ostr_.writeString(b); + ostr_.endSlice(); + } + + protected override void iceReadImpl(Ice.InputStream istr_) + { + istr_.startSlice(); + b = istr_.readString(); + istr_.endSlice(); + } + } + + [Ice.SliceTypeId("::Test::Extended")] + public partial class Extended : Base + { + public int e; + + partial void ice_initialize(); + + public Extended(string b, int e) : base(b) + { + this.e = e; + ice_initialize(); + } + + public Extended() + { + ice_initialize(); + } + + public static new string ice_staticId() => "::Test::Extended"; + public override string ice_id() => ice_staticId(); + + protected override void iceWriteImpl(Ice.OutputStream ostr_) + { + ostr_.startSlice(ice_staticId(), -1, false); + ostr_.writeInt(e); + ostr_.endSlice(); + base.iceWriteImpl(ostr_); + } + + protected override void iceReadImpl(Ice.InputStream istr_) + { + istr_.startSlice(); + e = istr_.readInt(); + istr_.endSlice(); + base.iceReadImpl(istr_); + } + } +} diff --git a/slice2cs/cpp/test/Ice/operations/TestAMD.cs b/slice2cs/cpp/test/Ice/operations/TestAMD.cs index 337d2f39ab40..b5183a804a12 100644 --- a/slice2cs/cpp/test/Ice/operations/TestAMD.cs +++ b/slice2cs/cpp/test/Ice/operations/TestAMD.cs @@ -10024,30 +10024,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opMyStruct1Async(MyStruct1 opMyStruct1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opIntIntSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opLongLongSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringFloatSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringDoubleSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringStringSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opMyEnumMyEnumSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opIntSAsync(int[] s, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opByteSOnewayAsync(byte[] s, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opByteSOnewayCallCountAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task> opContextAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opDoubleMarshalingAsync(double p1, double[] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opIdempotentAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opByte1Async(byte opByte1, Ice.Current current); public abstract global::System.Threading.Tasks.Task opShort1Async(short opShort1, Ice.Current current); @@ -10164,6 +10140,30 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opShortShortSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opIntIntSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opLongLongSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringFloatSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringDoubleSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringStringSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMyEnumMyEnumSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opIntSAsync(int[] s, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opByteSOnewayAsync(byte[] s, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opByteSOnewayCallCountAsync(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task> opContextAsync(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opDoubleMarshalingAsync(double p1, double[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opIdempotentAsync(Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; diff --git a/slice2cs/csharp/test/Ice/exceptions/TestAMD.cs b/slice2cs/csharp/test/Ice/exceptions/TestAMD.cs index 5a1faaefa019..ce3fb1c914c5 100644 --- a/slice2cs/csharp/test/Ice/exceptions/TestAMD.cs +++ b/slice2cs/csharp/test/Ice/exceptions/TestAMD.cs @@ -775,11 +775,11 @@ private void _iceI_throwAorDasAorD(int iceP_a, global::System.Collections.Generi { throw ex; } - catch(D) + catch(A) { throw; } - catch(A) + catch(D) { throw; } diff --git a/slice2cs/csharp/test/Ice/facets/Test.cs b/slice2cs/csharp/test/Ice/facets/Test.cs index c7a1c0c325be..65b4c36c0d98 100644 --- a/slice2cs/csharp/test/Ice/facets/Test.cs +++ b/slice2cs/csharp/test/Ice/facets/Test.cs @@ -1432,12 +1432,12 @@ public abstract class DDisp_ : Ice.ObjectImpl, D { public abstract string callD(Ice.Current current); + public abstract string callA(Ice.Current current); + public abstract string callB(Ice.Current current); public abstract string callC(Ice.Current current); - public abstract string callA(Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::D"; diff --git a/slice2cs/csharp/test/Ice/operations/Test.cs b/slice2cs/csharp/test/Ice/operations/Test.cs index 7be4a6c7ce5c..968a631c2429 100644 --- a/slice2cs/csharp/test/Ice/operations/Test.cs +++ b/slice2cs/csharp/test/Ice/operations/Test.cs @@ -13460,26 +13460,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); - public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); @@ -13488,8 +13468,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); @@ -13500,21 +13478,19 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opStringStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteByteSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); @@ -13580,6 +13556,30 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opStringStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteByteSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -13694,26 +13694,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::Ice.operations.Test.MyClassPrx? opMyClass(global::Ice.operations.Test.MyClassPrx? p1, out global::Ice.operations.Test.MyClassPrx? p2, out global::Ice.operations.Test.MyClassPrx? p3, Ice.Current current); - public abstract global::Ice.operations.Test.Structure opStruct(global::Ice.operations.Test.Structure p1, global::Ice.operations.Test.Structure p2, out global::Ice.operations.Test.Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); @@ -13722,8 +13702,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); @@ -13734,21 +13712,19 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opStringStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteByteSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); @@ -13814,6 +13790,30 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::Ice.operations.Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract global::Ice.operations.Test.Structure opStruct(global::Ice.operations.Test.Structure p1, global::Ice.operations.Test.Structure p2, out global::Ice.operations.Test.Structure p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opStringStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteByteSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2cs/csharp/test/Ice/proxy/Test.cs b/slice2cs/csharp/test/Ice/proxy/Test.cs index 5c61589e2473..33c23f21d258 100644 --- a/slice2cs/csharp/test/Ice/proxy/Test.cs +++ b/slice2cs/csharp/test/Ice/proxy/Test.cs @@ -415,10 +415,10 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { public abstract global::Ice.ObjectPrx? echo(global::Ice.ObjectPrx? obj, Ice.Current current); - public abstract void shutdown(Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary getContext(Ice.Current current); + public abstract void shutdown(Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; diff --git a/slice2cs/java/test/src/main/java/test/Ice/location/Test.cs b/slice2cs/java/test/src/main/java/test/Ice/location/Test.cs index d2e030c82bd8..22fbf70df828 100644 --- a/slice2cs/java/test/src/main/java/test/Ice/location/Test.cs +++ b/slice2cs/java/test/src/main/java/test/Ice/location/Test.cs @@ -1118,12 +1118,12 @@ public abstract class TestLocatorDisp_ : Ice.ObjectImpl, TestLocator { public abstract int getRequestCount(Ice.Current current); + public abstract global::System.Threading.Tasks.Task findObjectByIdAsync(global::Ice.Identity id, Ice.Current current); + public abstract global::System.Threading.Tasks.Task findAdapterByIdAsync(string id, Ice.Current current); public abstract global::Ice.LocatorRegistryPrx? getRegistry(Ice.Current current); - public abstract global::System.Threading.Tasks.Task findObjectByIdAsync(global::Ice.Identity id, Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::TestLocator"; diff --git a/slice2cs/java/test/src/main/java/test/Ice/operations/Test.cs b/slice2cs/java/test/src/main/java/test/Ice/operations/Test.cs index be8982f76126..68f86ac6f8bf 100644 --- a/slice2cs/java/test/src/main/java/test/Ice/operations/Test.cs +++ b/slice2cs/java/test/src/main/java/test/Ice/operations/Test.cs @@ -13484,23 +13484,25 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract string[] opStringS2(string[] stringS, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract string[] opStringLiterals(Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract string[] opWStringLiterals(Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); - public abstract int[] opIntS(int[] s, Ice.Current current); + public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); - public abstract void opByteSOneway(byte[] s, Ice.Current current); + public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); + + public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); public abstract int opByteSOnewayCallCount(Ice.Current current); @@ -13524,29 +13526,27 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract string opString1(string opString1, Ice.Current current); - public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract string[] opStringS2(string[] stringS, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract string[] opStringLiterals(Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract string[] opWStringLiterals(Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + public abstract int[] opIntS(int[] s, Ice.Current current); - public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); + public abstract void opByteSOneway(byte[] s, Ice.Current current); - public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); + public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); - public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); public override string ice_id(Ice.Current current) => ice_staticId(); @@ -13717,23 +13717,25 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract string[] opStringS2(string[] stringS, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract string[] opStringLiterals(Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract string[] opWStringLiterals(Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); - public abstract int[] opIntS(int[] s, Ice.Current current); + public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); - public abstract void opByteSOneway(byte[] s, Ice.Current current); + public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); + + public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); public abstract int opByteSOnewayCallCount(Ice.Current current); @@ -13757,29 +13759,27 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract string opString1(string opString1, Ice.Current current); - public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract string[] opStringS2(string[] stringS, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract string[] opStringLiterals(Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract string[] opWStringLiterals(Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + public abstract int[] opIntS(int[] s, Ice.Current current); - public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); + public abstract void opByteSOneway(byte[] s, Ice.Current current); - public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); + public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); - public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); public override string ice_id(Ice.Current current) => ice_staticId(); diff --git a/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs b/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs index 1a2edd252430..48ca727a33c9 100644 --- a/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs +++ b/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs @@ -9854,54 +9854,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opMyStruct1Async(MyStruct1 opMyStruct1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task supportsCompressAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opByteAsync(byte p1, byte p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opBoolAsync(bool p1, bool p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opFloatDoubleAsync(float p1, double p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringAsync(string p1, string p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opMyEnumAsync(MyEnum p1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opMyClassAsync(MyClassPrx? p1, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStructAsync(Structure p1, Structure p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opByteSAsync(byte[] p1, byte[] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringSAsync(string[] p1, string[] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opByteSSAsync(byte[][] p1, byte[][] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opBoolSSAsync(bool[][] p1, bool[][] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opFloatDoubleSSAsync(float[][] p1, double[][] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringSSAsync(string[][] p1, string[][] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringSSSAsync(string[][][] p1, string[][][] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opByteBoolDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opShortIntDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opLongFloatDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); public abstract global::System.Threading.Tasks.Task opStringStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); @@ -9994,6 +9946,54 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opMDict2Async(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task supportsCompressAsync(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opByteAsync(byte p1, byte p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opBoolAsync(bool p1, bool p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opFloatDoubleAsync(float p1, double p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringAsync(string p1, string p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMyEnumAsync(MyEnum p1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMyClassAsync(MyClassPrx? p1, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStructAsync(Structure p1, Structure p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opByteSAsync(byte[] p1, byte[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringSAsync(string[] p1, string[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opByteSSAsync(byte[][] p1, byte[][] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opBoolSSAsync(bool[][] p1, bool[][] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opFloatDoubleSSAsync(float[][] p1, double[][] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringSSAsync(string[][] p1, string[][] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringSSSAsync(string[][][] p1, string[][][] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opByteBoolDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opShortIntDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; diff --git a/slice2cs/js/test/Ice/operations/Test.cs b/slice2cs/js/test/Ice/operations/Test.cs index e53006681dcf..66d883704875 100644 --- a/slice2cs/js/test/Ice/operations/Test.cs +++ b/slice2cs/js/test/Ice/operations/Test.cs @@ -13702,6 +13702,66 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract void shutdown(Ice.Current current); + + public abstract bool supportsCompress(Ice.Current current); + + public abstract void opVoid(Ice.Current current); + + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); + + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); + + public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); + + public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); + + public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); + + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); @@ -13782,66 +13842,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); - - public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); - - public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); - - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -13967,6 +13967,66 @@ namespace Test2 { public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract void shutdown(Ice.Current current); + + public abstract bool supportsCompress(Ice.Current current); + + public abstract void opVoid(Ice.Current current); + + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); + + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); + + public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current); + + public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); + + public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); + + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); @@ -14047,66 +14107,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current); - - public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); - - public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); - - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2cs/matlab/test/Ice/operations/Test.cs b/slice2cs/matlab/test/Ice/operations/Test.cs index 16119c519065..bcf257ead20a 100644 --- a/slice2cs/matlab/test/Ice/operations/Test.cs +++ b/slice2cs/matlab/test/Ice/operations/Test.cs @@ -13330,40 +13330,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current); - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); - - public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); - - public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); @@ -13468,6 +13434,40 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract void shutdown(Ice.Current current); + + public abstract bool supportsCompress(Ice.Current current); + + public abstract void opVoid(Ice.Current current); + + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); + + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); + + public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); + + public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); + + public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -13560,40 +13560,6 @@ namespace Test2 { public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current); - - public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); - - public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); @@ -13698,6 +13664,40 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract void shutdown(Ice.Current current); + + public abstract bool supportsCompress(Ice.Current current); + + public abstract void opVoid(Ice.Current current); + + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); + + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); + + public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current); + + public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); + + public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2cs/php/test/Ice/exceptions/Test.cs b/slice2cs/php/test/Ice/exceptions/Test.cs index efff5b72d796..bf2b483153e4 100644 --- a/slice2cs/php/test/Ice/exceptions/Test.cs +++ b/slice2cs/php/test/Ice/exceptions/Test.cs @@ -663,11 +663,11 @@ private void _iceI_throwAorDasAorD(int iceP_a, global::System.Collections.Generi { throw ex; } - catch(D) + catch(A) { throw; } - catch(A) + catch(D) { throw; } diff --git a/slice2cs/php/test/Ice/operations/Test.cs b/slice2cs/php/test/Ice/operations/Test.cs index ec167ca9d005..36fbd2937e7a 100644 --- a/slice2cs/php/test/Ice/operations/Test.cs +++ b/slice2cs/php/test/Ice/operations/Test.cs @@ -12220,10 +12220,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClass1? opMyClass1(MyClass1? c, Ice.Current current); - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - public abstract void opVoid(Ice.Current current); public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); @@ -12240,50 +12236,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); - public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opStringStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opByteByteSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); @@ -12346,6 +12298,54 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract void shutdown(Ice.Current current); + + public abstract bool supportsCompress(Ice.Current current); + + public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opStringStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -12432,10 +12432,6 @@ namespace Test2 { public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - public abstract void opVoid(Ice.Current current); public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); @@ -12452,50 +12448,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); - public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opStringStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opByteByteSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); @@ -12558,6 +12510,54 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract void shutdown(Ice.Current current); + + public abstract bool supportsCompress(Ice.Current current); + + public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); + + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); + + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); + + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); + + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); + + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); + + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opStringStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2cs/python/test/Ice/operations/Test.cs b/slice2cs/python/test/Ice/operations/Test.cs index f1cf7d8eed15..2ff1123f3769 100644 --- a/slice2cs/python/test/Ice/operations/Test.cs +++ b/slice2cs/python/test/Ice/operations/Test.cs @@ -13375,50 +13375,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract int[] opIntS(int[] s, Ice.Current current); - - public abstract void opByteSOneway(byte[] s, Ice.Current current); - - public abstract int opByteSOnewayCallCount(Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opContext(Ice.Current current); - - public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current); - - public abstract void opIdempotent(Ice.Current current); - - public abstract byte opByte1(byte opByte1, Ice.Current current); - - public abstract short opShort1(short opShort1, Ice.Current current); - - public abstract int opInt1(int opInt1, Ice.Current current); - - public abstract long opLong1(long opLong1, Ice.Current current); - - public abstract float opFloat1(float opFloat1, Ice.Current current); - - public abstract double opDouble1(double opDouble1, Ice.Current current); - - public abstract string opString1(string opString1, Ice.Current current); - - public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); - - public abstract string[] opStringS2(string[] stringS, Ice.Current current); - public abstract void shutdown(Ice.Current current); public abstract bool supportsCompress(Ice.Current current); @@ -13497,6 +13453,50 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract int[] opIntS(int[] s, Ice.Current current); + + public abstract void opByteSOneway(byte[] s, Ice.Current current); + + public abstract int opByteSOnewayCallCount(Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opContext(Ice.Current current); + + public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current); + + public abstract void opIdempotent(Ice.Current current); + + public abstract byte opByte1(byte opByte1, Ice.Current current); + + public abstract short opShort1(short opShort1, Ice.Current current); + + public abstract int opInt1(int opInt1, Ice.Current current); + + public abstract long opLong1(long opLong1, Ice.Current current); + + public abstract float opFloat1(float opFloat1, Ice.Current current); + + public abstract double opDouble1(double opDouble1, Ice.Current current); + + public abstract string opString1(string opString1, Ice.Current current); + + public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); + + public abstract string[] opStringS2(string[] stringS, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); public abstract string[] opStringLiterals(Ice.Current current); @@ -13608,50 +13608,6 @@ namespace Test2 { public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { - public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract int[] opIntS(int[] s, Ice.Current current); - - public abstract void opByteSOneway(byte[] s, Ice.Current current); - - public abstract int opByteSOnewayCallCount(Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opContext(Ice.Current current); - - public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current); - - public abstract void opIdempotent(Ice.Current current); - - public abstract byte opByte1(byte opByte1, Ice.Current current); - - public abstract short opShort1(short opShort1, Ice.Current current); - - public abstract int opInt1(int opInt1, Ice.Current current); - - public abstract long opLong1(long opLong1, Ice.Current current); - - public abstract float opFloat1(float opFloat1, Ice.Current current); - - public abstract double opDouble1(double opDouble1, Ice.Current current); - - public abstract string opString1(string opString1, Ice.Current current); - - public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); - - public abstract string[] opStringS2(string[] stringS, Ice.Current current); - public abstract void shutdown(Ice.Current current); public abstract bool supportsCompress(Ice.Current current); @@ -13730,6 +13686,50 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract int[] opIntS(int[] s, Ice.Current current); + + public abstract void opByteSOneway(byte[] s, Ice.Current current); + + public abstract int opByteSOnewayCallCount(Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opContext(Ice.Current current); + + public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current); + + public abstract void opIdempotent(Ice.Current current); + + public abstract byte opByte1(byte opByte1, Ice.Current current); + + public abstract short opShort1(short opShort1, Ice.Current current); + + public abstract int opInt1(int opInt1, Ice.Current current); + + public abstract long opLong1(long opLong1, Ice.Current current); + + public abstract float opFloat1(float opFloat1, Ice.Current current); + + public abstract double opDouble1(double opDouble1, Ice.Current current); + + public abstract string opString1(string opString1, Ice.Current current); + + public abstract string[] opStringS1(string[] opStringS1, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteBoolD1(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); + + public abstract string[] opStringS2(string[] stringS, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); public abstract string[] opStringLiterals(Ice.Current current); diff --git a/slice2cs/ruby/test/Ice/operations/Test.cs b/slice2cs/ruby/test/Ice/operations/Test.cs index 21117d3826eb..bb776b6696ba 100644 --- a/slice2cs/ruby/test/Ice/operations/Test.cs +++ b/slice2cs/ruby/test/Ice/operations/Test.cs @@ -13066,34 +13066,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current); - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); - - public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); - - public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); @@ -13202,6 +13174,34 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract void shutdown(Ice.Current current); + + public abstract bool supportsCompress(Ice.Current current); + + public abstract void opVoid(Ice.Current current); + + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); + + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); + + public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current); + + public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current); + + public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -13293,34 +13293,6 @@ namespace Test2 { public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { - public abstract void shutdown(Ice.Current current); - - public abstract bool supportsCompress(Ice.Current current); - - public abstract void opVoid(Ice.Current current); - - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); - - public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); - - public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); - - public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); - - public abstract string opString(string p1, string p2, out string p3, Ice.Current current); - - public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current); - - public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); - - public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); - - public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); - - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); @@ -13429,6 +13401,34 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); + public abstract void shutdown(Ice.Current current); + + public abstract bool supportsCompress(Ice.Current current); + + public abstract void opVoid(Ice.Current current); + + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); + + public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); + + public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current); + + public abstract string opString(string p1, string p2, out string p3, Ice.Current current); + + public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current); + + public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current); + + public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current); + + public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2cs/slice/DataStorm/Sample.cs b/slice2cs/slice/DataStorm/Sample.cs new file mode 100644 index 000000000000..2439dfe5f34f --- /dev/null +++ b/slice2cs/slice/DataStorm/Sample.cs @@ -0,0 +1,110 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Sample.ice' +// +// Warning: do not edit this file. +// +// +// + +#nullable enable + +[assembly:Ice.Slice("Sample.ice")] + +#pragma warning disable CS1591 // Missing XML Comment +#pragma warning disable CS1573 // Parameter has no matching param tag in the XML comment +#pragma warning disable CS0612 // Type or member is obsolete +#pragma warning disable CS0618 // Type or member is obsolete +#pragma warning disable CS0619 // Type or member is obsolete + +namespace DataStorm +{ + /// + /// The sample event. + /// The sample event matches the operation used by the DataWriter to update + /// the data element. It also provides information on what to expect from + /// the sample. A sample with the Add or Update event always provide a value + /// while a sample with the Remove type doesn't. + /// + + public enum SampleEvent + { + /// + /// The element has been added. + /// + + Add, + /// + /// The element has been updated. + /// + + Update, + /// + /// The element has been partially updated. + /// + + PartialUpdate, + /// + /// The element has been removed. + /// + + Remove + } + + public sealed class SampleEventHelper + { + public static void write(Ice.OutputStream ostr, SampleEvent v) + { + ostr.writeEnum((int)v, 3); + } + + public static SampleEvent read(Ice.InputStream istr) + { + SampleEvent v; + v = (SampleEvent)istr.readEnum(3); + return v; + } + } +} + +namespace DataStorm +{ + public sealed class SampleEventSeqHelper + { + public static void write(Ice.OutputStream ostr, SampleEvent[] v) + { + if (v is null) + { + ostr.writeSize(0); + } + else + { + ostr.writeSize(v.Length); + for(int ix = 0; ix < v.Length; ++ix) + { + ostr.writeEnum((int)v[ix], 3); + } + } + } + + public static SampleEvent[] read(Ice.InputStream istr) + { + SampleEvent[] v; + { + int szx = istr.readAndCheckSeqSize(1); + v = new SampleEvent[szx]; + for(int ix = 0; ix < szx; ++ix) + { + v[ix] = (SampleEvent)istr.readEnum(3); + } + } + return v; + } + } +} diff --git a/slice2cs/swift/test/Ice/operations/Test.cs b/slice2cs/swift/test/Ice/operations/Test.cs index 2f08dfeacb43..27d828fdcedd 100644 --- a/slice2cs/swift/test/Ice/operations/Test.cs +++ b/slice2cs/swift/test/Ice/operations/Test.cs @@ -13606,40 +13606,52 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current); - public abstract void shutdown(Ice.Current current); + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - public abstract bool supportsCompress(Ice.Current current); + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - public abstract void opVoid(Ice.Current current); + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opStringStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteByteSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract void shutdown(Ice.Current current); + + public abstract bool supportsCompress(Ice.Current current); + + public abstract void opVoid(Ice.Current current); + + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); @@ -13656,6 +13668,30 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opStringStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteByteSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); @@ -13710,42 +13746,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); - - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -13839,40 +13839,52 @@ namespace Test2 { public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { - public abstract void shutdown(Ice.Current current); + public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - public abstract bool supportsCompress(Ice.Current current); + public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - public abstract void opVoid(Ice.Current current); + public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opStringStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opByteByteSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary[] opShortIntDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary[] opLongFloatDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + public abstract void shutdown(Ice.Current current); + + public abstract bool supportsCompress(Ice.Current current); + + public abstract void opVoid(Ice.Current current); + + public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current); + public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current); public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current); @@ -13889,6 +13901,30 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current); + public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opStringStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opByteByteSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opBoolBoolSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opShortShortSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opIntIntSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opLongLongSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringFloatSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + + public abstract global::System.Collections.Generic.Dictionary opStringDoubleSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); + public abstract global::System.Collections.Generic.Dictionary opStringStringSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); public abstract global::System.Collections.Generic.Dictionary opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); @@ -13943,42 +13979,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, Ice.Current current); - public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current); - - public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current); - - public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current); - - public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current); - - public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current); - - public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current); - - public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current); - - public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current); - - public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current); - - public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opByteBoolD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opShortIntD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opLongFloatD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opStringMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyEnumStringD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary opMyStructMyEnumD(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, out global::System.Collections.Generic.Dictionary p3, Ice.Current current); - - public abstract global::System.Collections.Generic.Dictionary[] opByteBoolDS(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, out global::System.Collections.Generic.Dictionary[] p3, Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ClearHistoryPolicy.java b/slice2java/cpp/src/DataStorm/DataStormContract/ClearHistoryPolicy.java new file mode 100644 index 000000000000..ab7620727d1e --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ClearHistoryPolicy.java @@ -0,0 +1,116 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public enum ClearHistoryPolicy +{ + OnAdd(0), + OnRemove(1), + OnAll(2), + OnAllExceptPartialUpdate(3), + Never(4); + + public int value() + { + return _value; + } + + public static ClearHistoryPolicy valueOf(int v) + { + switch(v) + { + case 0: + return OnAdd; + case 1: + return OnRemove; + case 2: + return OnAll; + case 3: + return OnAllExceptPartialUpdate; + case 4: + return Never; + } + return null; + } + + private ClearHistoryPolicy(int v) + { + _value = v; + } + + public void ice_write(com.zeroc.Ice.OutputStream ostr) + { + ostr.writeEnum(_value, 4); + } + + public static void ice_write(com.zeroc.Ice.OutputStream ostr, ClearHistoryPolicy v) + { + if(v == null) + { + ostr.writeEnum(DataStormContract.ClearHistoryPolicy.OnAdd.value(), 4); + } + else + { + ostr.writeEnum(v.value(), 4); + } + } + + public static ClearHistoryPolicy ice_read(com.zeroc.Ice.InputStream istr) + { + int v = istr.readEnum(4); + return validate(v); + } + + public static void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + ice_write(ostr, tag, v.get()); + } + } + + public static void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, ClearHistoryPolicy v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.Size)) + { + ice_write(ostr, v); + } + } + + public static java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.Size)) + { + return java.util.Optional.of(ice_read(istr)); + } + else + { + return java.util.Optional.empty(); + } + } + + private static ClearHistoryPolicy validate(int v) + { + final ClearHistoryPolicy e = valueOf(v); + if(e == null) + { + throw new com.zeroc.Ice.MarshalException("enumerator value " + v + " is out of range"); + } + return e; + } + + private final int _value; +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java b/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java new file mode 100644 index 000000000000..e9c4b0c89ac7 --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java @@ -0,0 +1,228 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public class DataSample implements java.lang.Cloneable, + java.io.Serializable +{ + /** + * The sample id. + **/ + public long id; + + /** + * The key id. + **/ + public long keyId; + + /** + * The key value if the key ID <= 0. + **/ + public byte[] keyValue; + + /** + * The timestamp of the sample (write time). + **/ + public long timestamp; + + /** + * The update tag if the sample event is PartialUpdate. + **/ + public long tag; + + /** + * The sample event. + **/ + public DataStorm.SampleEvent event; + + /** + * The value of the sample. + **/ + public byte[] value; + + public DataSample() + { + this.event = DataStorm.SampleEvent.Add; + } + + public DataSample(long id, long keyId, byte[] keyValue, long timestamp, long tag, DataStorm.SampleEvent event, byte[] value) + { + this.id = id; + this.keyId = keyId; + this.keyValue = keyValue; + this.timestamp = timestamp; + this.tag = tag; + this.event = event; + this.value = value; + } + + public boolean equals(java.lang.Object rhs) + { + if(this == rhs) + { + return true; + } + DataSample r = null; + if(rhs instanceof DataSample) + { + r = (DataSample)rhs; + } + + if(r != null) + { + if(this.id != r.id) + { + return false; + } + if(this.keyId != r.keyId) + { + return false; + } + if(!java.util.Arrays.equals(this.keyValue, r.keyValue)) + { + return false; + } + if(this.timestamp != r.timestamp) + { + return false; + } + if(this.tag != r.tag) + { + return false; + } + if(this.event != r.event) + { + if(this.event == null || r.event == null || !this.event.equals(r.event)) + { + return false; + } + } + if(!java.util.Arrays.equals(this.value, r.value)) + { + return false; + } + + return true; + } + + return false; + } + + public int hashCode() + { + int h_ = 5381; + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, "::DataStormContract::DataSample"); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, id); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, keyId); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, keyValue); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, timestamp); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, tag); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, event); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, value); + return h_; + } + + public DataSample clone() + { + DataSample c = null; + try + { + c = (DataSample)super.clone(); + } + catch(CloneNotSupportedException ex) + { + assert false; // impossible + } + return c; + } + + public void ice_writeMembers(com.zeroc.Ice.OutputStream ostr) + { + ostr.writeLong(this.id); + ostr.writeLong(this.keyId); + ostr.writeByteSeq(this.keyValue); + ostr.writeLong(this.timestamp); + ostr.writeLong(this.tag); + DataStorm.SampleEvent.ice_write(ostr, this.event); + ostr.writeByteSeq(this.value); + } + + public void ice_readMembers(com.zeroc.Ice.InputStream istr) + { + this.id = istr.readLong(); + this.keyId = istr.readLong(); + this.keyValue = istr.readByteSeq(); + this.timestamp = istr.readLong(); + this.tag = istr.readLong(); + this.event = DataStorm.SampleEvent.ice_read(istr); + this.value = istr.readByteSeq(); + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, DataSample v) + { + if(v == null) + { + _nullMarshalValue.ice_writeMembers(ostr); + } + else + { + v.ice_writeMembers(ostr); + } + } + + static public DataSample ice_read(com.zeroc.Ice.InputStream istr) + { + DataSample v = new DataSample(); + v.ice_readMembers(istr); + return v; + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + ice_write(ostr, tag, v.get()); + } + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, DataSample v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + int pos = ostr.startSize(); + ice_write(ostr, v); + ostr.endSize(pos); + } + } + + static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr.skip(4); + return java.util.Optional.of(DataSample.ice_read(istr)); + } + else + { + return java.util.Optional.empty(); + } + } + + private static final DataSample _nullMarshalValue = new DataSample(); + + /** @hidden */ + private static final long serialVersionUID = 7182658782827347437L; +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/DataSampleSeqHelper.java b/slice2java/cpp/src/DataStorm/DataStormContract/DataSampleSeqHelper.java new file mode 100644 index 000000000000..c9a463a5cbc9 --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/DataSampleSeqHelper.java @@ -0,0 +1,83 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +/** + * Helper class for marshaling/unmarshaling DataSampleSeq. + **/ +public final class DataSampleSeqHelper +{ + public static void write(com.zeroc.Ice.OutputStream ostr, DataSample[] v) + { + if(v == null) + { + ostr.writeSize(0); + } + else + { + ostr.writeSize(v.length); + for(int i0 = 0; i0 < v.length; i0++) + { + DataSample.ice_write(ostr, v[i0]); + } + } + } + + public static DataSample[] read(com.zeroc.Ice.InputStream istr) + { + final DataSample[] v; + final int len0 = istr.readAndCheckSeqSize(35); + v = new DataSample[len0]; + for(int i0 = 0; i0 < len0; i0++) + { + v[i0] = DataSample.ice_read(istr); + } + return v; + } + + public static void write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + write(ostr, tag, v.get()); + } + } + + public static void write(com.zeroc.Ice.OutputStream ostr, int tag, DataSample[] v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + int pos = ostr.startSize(); + DataSampleSeqHelper.write(ostr, v); + ostr.endSize(pos); + } + } + + public static java.util.Optional read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr.skip(4); + DataSample[] v; + v = DataSampleSeqHelper.read(istr); + return java.util.Optional.of(v); + } + else + { + return java.util.Optional.empty(); + } + } +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java b/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java new file mode 100644 index 000000000000..801826356fea --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java @@ -0,0 +1,159 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public class DataSamples implements java.lang.Cloneable, + java.io.Serializable +{ + /** + * The id of the writer or reader. + **/ + public long id; + + /** + * The samples. + **/ + public DataSample[] samples; + + public DataSamples() + { + } + + public DataSamples(long id, DataSample[] samples) + { + this.id = id; + this.samples = samples; + } + + public boolean equals(java.lang.Object rhs) + { + if(this == rhs) + { + return true; + } + DataSamples r = null; + if(rhs instanceof DataSamples) + { + r = (DataSamples)rhs; + } + + if(r != null) + { + if(this.id != r.id) + { + return false; + } + if(!java.util.Arrays.equals(this.samples, r.samples)) + { + return false; + } + + return true; + } + + return false; + } + + public int hashCode() + { + int h_ = 5381; + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, "::DataStormContract::DataSamples"); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, id); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, samples); + return h_; + } + + public DataSamples clone() + { + DataSamples c = null; + try + { + c = (DataSamples)super.clone(); + } + catch(CloneNotSupportedException ex) + { + assert false; // impossible + } + return c; + } + + public void ice_writeMembers(com.zeroc.Ice.OutputStream ostr) + { + ostr.writeLong(this.id); + DataSampleSeqHelper.write(ostr, this.samples); + } + + public void ice_readMembers(com.zeroc.Ice.InputStream istr) + { + this.id = istr.readLong(); + this.samples = DataSampleSeqHelper.read(istr); + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, DataSamples v) + { + if(v == null) + { + _nullMarshalValue.ice_writeMembers(ostr); + } + else + { + v.ice_writeMembers(ostr); + } + } + + static public DataSamples ice_read(com.zeroc.Ice.InputStream istr) + { + DataSamples v = new DataSamples(); + v.ice_readMembers(istr); + return v; + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + ice_write(ostr, tag, v.get()); + } + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, DataSamples v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + int pos = ostr.startSize(); + ice_write(ostr, v); + ostr.endSize(pos); + } + } + + static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr.skip(4); + return java.util.Optional.of(DataSamples.ice_read(istr)); + } + else + { + return java.util.Optional.empty(); + } + } + + private static final DataSamples _nullMarshalValue = new DataSamples(); + + /** @hidden */ + private static final long serialVersionUID = -8438416644357276679L; +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/DataSamplesSeqHelper.java b/slice2java/cpp/src/DataStorm/DataStormContract/DataSamplesSeqHelper.java new file mode 100644 index 000000000000..00c1ad2935a4 --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/DataSamplesSeqHelper.java @@ -0,0 +1,83 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +/** + * Helper class for marshaling/unmarshaling DataSamplesSeq. + **/ +public final class DataSamplesSeqHelper +{ + public static void write(com.zeroc.Ice.OutputStream ostr, DataSamples[] v) + { + if(v == null) + { + ostr.writeSize(0); + } + else + { + ostr.writeSize(v.length); + for(int i0 = 0; i0 < v.length; i0++) + { + DataSamples.ice_write(ostr, v[i0]); + } + } + } + + public static DataSamples[] read(com.zeroc.Ice.InputStream istr) + { + final DataSamples[] v; + final int len0 = istr.readAndCheckSeqSize(9); + v = new DataSamples[len0]; + for(int i0 = 0; i0 < len0; i0++) + { + v[i0] = DataSamples.ice_read(istr); + } + return v; + } + + public static void write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + write(ostr, tag, v.get()); + } + } + + public static void write(com.zeroc.Ice.OutputStream ostr, int tag, DataSamples[] v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + int pos = ostr.startSize(); + DataSamplesSeqHelper.write(ostr, v); + ostr.endSize(pos); + } + } + + public static java.util.Optional read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr.skip(4); + DataSamples[] v; + v = DataSamplesSeqHelper.read(istr); + return java.util.Optional.of(v); + } + else + { + return java.util.Optional.empty(); + } + } +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java new file mode 100644 index 000000000000..ce85e19577fe --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java @@ -0,0 +1,501 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public class ElementConfig extends com.zeroc.Ice.Value +{ + public ElementConfig() + { + this.facet = ""; + this.sampleFilter = new FilterInfo(); + this.name = ""; + this.clearHistory = ClearHistoryPolicy.OnAdd; + } + + public ElementConfig(String facet, FilterInfo sampleFilter, String name, int priority, int sampleCount, int sampleLifetime, ClearHistoryPolicy clearHistory) + { + setFacet(facet); + setSampleFilter(sampleFilter); + setName(name); + setPriority(priority); + setSampleCount(sampleCount); + setSampleLifetime(sampleLifetime); + setClearHistory(clearHistory); + } + + private String facet; + private boolean _facet; + + public String getFacet() + { + if(!_facet) + { + throw new java.util.NoSuchElementException("facet is not set"); + } + return facet; + } + + public void setFacet(String facet) + { + _facet = true; + this.facet = facet; + } + + public boolean hasFacet() + { + return _facet; + } + + public void clearFacet() + { + _facet = false; + } + + public void optionalFacet(java.util.Optional v) + { + if(v == null || !v.isPresent()) + { + _facet = false; + } + else + { + _facet = true; + facet = v.get(); + } + } + + public java.util.Optional optionalFacet() + { + if(_facet) + { + return java.util.Optional.of(facet); + } + else + { + return java.util.Optional.empty(); + } + } + + private FilterInfo sampleFilter; + private boolean _sampleFilter; + + public FilterInfo getSampleFilter() + { + if(!_sampleFilter) + { + throw new java.util.NoSuchElementException("sampleFilter is not set"); + } + return sampleFilter; + } + + public void setSampleFilter(FilterInfo sampleFilter) + { + _sampleFilter = true; + this.sampleFilter = sampleFilter; + } + + public boolean hasSampleFilter() + { + return _sampleFilter; + } + + public void clearSampleFilter() + { + _sampleFilter = false; + } + + public void optionalSampleFilter(java.util.Optional v) + { + if(v == null || !v.isPresent()) + { + _sampleFilter = false; + } + else + { + _sampleFilter = true; + sampleFilter = v.get(); + } + } + + public java.util.Optional optionalSampleFilter() + { + if(_sampleFilter) + { + return java.util.Optional.of(sampleFilter); + } + else + { + return java.util.Optional.empty(); + } + } + + private String name; + private boolean _name; + + public String getName() + { + if(!_name) + { + throw new java.util.NoSuchElementException("name is not set"); + } + return name; + } + + public void setName(String name) + { + _name = true; + this.name = name; + } + + public boolean hasName() + { + return _name; + } + + public void clearName() + { + _name = false; + } + + public void optionalName(java.util.Optional v) + { + if(v == null || !v.isPresent()) + { + _name = false; + } + else + { + _name = true; + name = v.get(); + } + } + + public java.util.Optional optionalName() + { + if(_name) + { + return java.util.Optional.of(name); + } + else + { + return java.util.Optional.empty(); + } + } + + private int priority; + private boolean _priority; + + public int getPriority() + { + if(!_priority) + { + throw new java.util.NoSuchElementException("priority is not set"); + } + return priority; + } + + public void setPriority(int priority) + { + _priority = true; + this.priority = priority; + } + + public boolean hasPriority() + { + return _priority; + } + + public void clearPriority() + { + _priority = false; + } + + public void optionalPriority(java.util.OptionalInt v) + { + if(v == null || !v.isPresent()) + { + _priority = false; + } + else + { + _priority = true; + priority = v.getAsInt(); + } + } + + public java.util.OptionalInt optionalPriority() + { + if(_priority) + { + return java.util.OptionalInt.of(priority); + } + else + { + return java.util.OptionalInt.empty(); + } + } + + private int sampleCount; + private boolean _sampleCount; + + public int getSampleCount() + { + if(!_sampleCount) + { + throw new java.util.NoSuchElementException("sampleCount is not set"); + } + return sampleCount; + } + + public void setSampleCount(int sampleCount) + { + _sampleCount = true; + this.sampleCount = sampleCount; + } + + public boolean hasSampleCount() + { + return _sampleCount; + } + + public void clearSampleCount() + { + _sampleCount = false; + } + + public void optionalSampleCount(java.util.OptionalInt v) + { + if(v == null || !v.isPresent()) + { + _sampleCount = false; + } + else + { + _sampleCount = true; + sampleCount = v.getAsInt(); + } + } + + public java.util.OptionalInt optionalSampleCount() + { + if(_sampleCount) + { + return java.util.OptionalInt.of(sampleCount); + } + else + { + return java.util.OptionalInt.empty(); + } + } + + private int sampleLifetime; + private boolean _sampleLifetime; + + public int getSampleLifetime() + { + if(!_sampleLifetime) + { + throw new java.util.NoSuchElementException("sampleLifetime is not set"); + } + return sampleLifetime; + } + + public void setSampleLifetime(int sampleLifetime) + { + _sampleLifetime = true; + this.sampleLifetime = sampleLifetime; + } + + public boolean hasSampleLifetime() + { + return _sampleLifetime; + } + + public void clearSampleLifetime() + { + _sampleLifetime = false; + } + + public void optionalSampleLifetime(java.util.OptionalInt v) + { + if(v == null || !v.isPresent()) + { + _sampleLifetime = false; + } + else + { + _sampleLifetime = true; + sampleLifetime = v.getAsInt(); + } + } + + public java.util.OptionalInt optionalSampleLifetime() + { + if(_sampleLifetime) + { + return java.util.OptionalInt.of(sampleLifetime); + } + else + { + return java.util.OptionalInt.empty(); + } + } + + private ClearHistoryPolicy clearHistory; + private boolean _clearHistory; + + public ClearHistoryPolicy getClearHistory() + { + if(!_clearHistory) + { + throw new java.util.NoSuchElementException("clearHistory is not set"); + } + return clearHistory; + } + + public void setClearHistory(ClearHistoryPolicy clearHistory) + { + _clearHistory = true; + this.clearHistory = clearHistory; + } + + public boolean hasClearHistory() + { + return _clearHistory; + } + + public void clearClearHistory() + { + _clearHistory = false; + } + + public void optionalClearHistory(java.util.Optional v) + { + if(v == null || !v.isPresent()) + { + _clearHistory = false; + } + else + { + _clearHistory = true; + clearHistory = v.get(); + } + } + + public java.util.Optional optionalClearHistory() + { + if(_clearHistory) + { + return java.util.Optional.of(clearHistory); + } + else + { + return java.util.Optional.empty(); + } + } + + public ElementConfig clone() + { + return (ElementConfig)super.clone(); + } + + public static String ice_staticId() + { + return "::DataStormContract::ElementConfig"; + } + + @Override + public String ice_id() + { + return ice_staticId(); + } + + /** @hidden */ + private static final long serialVersionUID = 7894182022208183595L; + + /** @hidden */ + @Override + protected void _iceWriteImpl(com.zeroc.Ice.OutputStream ostr_) + { + ostr_.startSlice(ice_staticId(), 1, true); + if(_facet) + { + ostr_.writeString(1, facet); + } + if(_sampleFilter) + { + FilterInfo.ice_write(ostr_, 2, sampleFilter); + } + if(_name) + { + ostr_.writeString(3, name); + } + if(_priority) + { + ostr_.writeInt(4, priority); + } + if(_sampleCount) + { + ostr_.writeInt(10, sampleCount); + } + if(_sampleLifetime) + { + ostr_.writeInt(11, sampleLifetime); + } + if(_clearHistory) + { + ClearHistoryPolicy.ice_write(ostr_, 12, clearHistory); + } + ostr_.endSlice(); + } + + /** @hidden */ + @Override + protected void _iceReadImpl(com.zeroc.Ice.InputStream istr_) + { + istr_.startSlice(); + if(_facet = istr_.readOptional(1, com.zeroc.Ice.OptionalFormat.VSize)) + { + facet = istr_.readString(); + } + if(_sampleFilter = istr_.readOptional(2, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr_.skip(4); + sampleFilter = FilterInfo.ice_read(istr_); + } + if(_name = istr_.readOptional(3, com.zeroc.Ice.OptionalFormat.VSize)) + { + name = istr_.readString(); + } + if(_priority = istr_.readOptional(4, com.zeroc.Ice.OptionalFormat.F4)) + { + priority = istr_.readInt(); + } + if(_sampleCount = istr_.readOptional(10, com.zeroc.Ice.OptionalFormat.F4)) + { + sampleCount = istr_.readInt(); + } + if(_sampleLifetime = istr_.readOptional(11, com.zeroc.Ice.OptionalFormat.F4)) + { + sampleLifetime = istr_.readInt(); + } + if(_clearHistory = istr_.readOptional(12, com.zeroc.Ice.OptionalFormat.Size)) + { + clearHistory = ClearHistoryPolicy.ice_read(istr_); + } + istr_.endSlice(); + } +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java new file mode 100644 index 000000000000..df6e1a657ef8 --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java @@ -0,0 +1,178 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public class ElementData implements java.lang.Cloneable, + java.io.Serializable +{ + /** + * The id of the writer or reader + **/ + public long id; + + /** + * The config of the writer or reader + **/ + public ElementConfig config; + + /** + * The lastIds received by the reader. + **/ + public java.util.Map lastIds; + + public ElementData() + { + } + + public ElementData(long id, ElementConfig config, java.util.Map lastIds) + { + this.id = id; + this.config = config; + this.lastIds = lastIds; + } + + public boolean equals(java.lang.Object rhs) + { + if(this == rhs) + { + return true; + } + ElementData r = null; + if(rhs instanceof ElementData) + { + r = (ElementData)rhs; + } + + if(r != null) + { + if(this.id != r.id) + { + return false; + } + if(this.config != r.config) + { + if(this.config == null || r.config == null || !this.config.equals(r.config)) + { + return false; + } + } + if(this.lastIds != r.lastIds) + { + if(this.lastIds == null || r.lastIds == null || !this.lastIds.equals(r.lastIds)) + { + return false; + } + } + + return true; + } + + return false; + } + + public int hashCode() + { + int h_ = 5381; + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, "::DataStormContract::ElementData"); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, id); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, config); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, lastIds); + return h_; + } + + public ElementData clone() + { + ElementData c = null; + try + { + c = (ElementData)super.clone(); + } + catch(CloneNotSupportedException ex) + { + assert false; // impossible + } + return c; + } + + public void ice_writeMembers(com.zeroc.Ice.OutputStream ostr) + { + ostr.writeLong(this.id); + ostr.writeValue(this.config); + LongLongDictHelper.write(ostr, this.lastIds); + } + + public void ice_readMembers(com.zeroc.Ice.InputStream istr) + { + this.id = istr.readLong(); + istr.readValue(v -> config = v, ElementConfig.class); + this.lastIds = LongLongDictHelper.read(istr); + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, ElementData v) + { + if(v == null) + { + _nullMarshalValue.ice_writeMembers(ostr); + } + else + { + v.ice_writeMembers(ostr); + } + } + + static public ElementData ice_read(com.zeroc.Ice.InputStream istr) + { + ElementData v = new ElementData(); + v.ice_readMembers(istr); + return v; + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + ice_write(ostr, tag, v.get()); + } + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, ElementData v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + int pos = ostr.startSize(); + ice_write(ostr, v); + ostr.endSize(pos); + } + } + + static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr.skip(4); + return java.util.Optional.of(ElementData.ice_read(istr)); + } + else + { + return java.util.Optional.empty(); + } + } + + private static final ElementData _nullMarshalValue = new ElementData(); + + /** @hidden */ + private static final long serialVersionUID = 819366988640338382L; +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java new file mode 100644 index 000000000000..6df9d635eec9 --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java @@ -0,0 +1,204 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public class ElementDataAck implements java.lang.Cloneable, + java.io.Serializable +{ + /** + * The id of the writer or filter. + **/ + public long id; + + /** + * The config of the writer or reader + **/ + public ElementConfig config; + + /** + * The lastIds received by the reader. + **/ + public java.util.Map lastIds; + + /** + * The samples of the writer or reader + **/ + public DataSample[] samples; + + /** + * The id of the writer or reader on the peer. + **/ + public long peerId; + + public ElementDataAck() + { + } + + public ElementDataAck(long id, ElementConfig config, java.util.Map lastIds, DataSample[] samples, long peerId) + { + this.id = id; + this.config = config; + this.lastIds = lastIds; + this.samples = samples; + this.peerId = peerId; + } + + public boolean equals(java.lang.Object rhs) + { + if(this == rhs) + { + return true; + } + ElementDataAck r = null; + if(rhs instanceof ElementDataAck) + { + r = (ElementDataAck)rhs; + } + + if(r != null) + { + if(this.id != r.id) + { + return false; + } + if(this.config != r.config) + { + if(this.config == null || r.config == null || !this.config.equals(r.config)) + { + return false; + } + } + if(this.lastIds != r.lastIds) + { + if(this.lastIds == null || r.lastIds == null || !this.lastIds.equals(r.lastIds)) + { + return false; + } + } + if(!java.util.Arrays.equals(this.samples, r.samples)) + { + return false; + } + if(this.peerId != r.peerId) + { + return false; + } + + return true; + } + + return false; + } + + public int hashCode() + { + int h_ = 5381; + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, "::DataStormContract::ElementDataAck"); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, id); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, config); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, lastIds); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, samples); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, peerId); + return h_; + } + + public ElementDataAck clone() + { + ElementDataAck c = null; + try + { + c = (ElementDataAck)super.clone(); + } + catch(CloneNotSupportedException ex) + { + assert false; // impossible + } + return c; + } + + public void ice_writeMembers(com.zeroc.Ice.OutputStream ostr) + { + ostr.writeLong(this.id); + ostr.writeValue(this.config); + LongLongDictHelper.write(ostr, this.lastIds); + DataSampleSeqHelper.write(ostr, this.samples); + ostr.writeLong(this.peerId); + } + + public void ice_readMembers(com.zeroc.Ice.InputStream istr) + { + this.id = istr.readLong(); + istr.readValue(v -> config = v, ElementConfig.class); + this.lastIds = LongLongDictHelper.read(istr); + this.samples = DataSampleSeqHelper.read(istr); + this.peerId = istr.readLong(); + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, ElementDataAck v) + { + if(v == null) + { + _nullMarshalValue.ice_writeMembers(ostr); + } + else + { + v.ice_writeMembers(ostr); + } + } + + static public ElementDataAck ice_read(com.zeroc.Ice.InputStream istr) + { + ElementDataAck v = new ElementDataAck(); + v.ice_readMembers(istr); + return v; + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + ice_write(ostr, tag, v.get()); + } + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, ElementDataAck v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + int pos = ostr.startSize(); + ice_write(ostr, v); + ostr.endSize(pos); + } + } + + static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr.skip(4); + return java.util.Optional.of(ElementDataAck.ice_read(istr)); + } + else + { + return java.util.Optional.empty(); + } + } + + private static final ElementDataAck _nullMarshalValue = new ElementDataAck(); + + /** @hidden */ + private static final long serialVersionUID = -157115441906840537L; +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAckSeqHelper.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAckSeqHelper.java new file mode 100644 index 000000000000..e2bc4f41f5db --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAckSeqHelper.java @@ -0,0 +1,83 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +/** + * Helper class for marshaling/unmarshaling ElementDataAckSeq. + **/ +public final class ElementDataAckSeqHelper +{ + public static void write(com.zeroc.Ice.OutputStream ostr, ElementDataAck[] v) + { + if(v == null) + { + ostr.writeSize(0); + } + else + { + ostr.writeSize(v.length); + for(int i0 = 0; i0 < v.length; i0++) + { + ElementDataAck.ice_write(ostr, v[i0]); + } + } + } + + public static ElementDataAck[] read(com.zeroc.Ice.InputStream istr) + { + final ElementDataAck[] v; + final int len0 = istr.readAndCheckSeqSize(19); + v = new ElementDataAck[len0]; + for(int i0 = 0; i0 < len0; i0++) + { + v[i0] = ElementDataAck.ice_read(istr); + } + return v; + } + + public static void write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + write(ostr, tag, v.get()); + } + } + + public static void write(com.zeroc.Ice.OutputStream ostr, int tag, ElementDataAck[] v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + int pos = ostr.startSize(); + ElementDataAckSeqHelper.write(ostr, v); + ostr.endSize(pos); + } + } + + public static java.util.Optional read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr.skip(4); + ElementDataAck[] v; + v = ElementDataAckSeqHelper.read(istr); + return java.util.Optional.of(v); + } + else + { + return java.util.Optional.empty(); + } + } +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataSeqHelper.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataSeqHelper.java new file mode 100644 index 000000000000..241c46c7735a --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataSeqHelper.java @@ -0,0 +1,83 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +/** + * Helper class for marshaling/unmarshaling ElementDataSeq. + **/ +public final class ElementDataSeqHelper +{ + public static void write(com.zeroc.Ice.OutputStream ostr, ElementData[] v) + { + if(v == null) + { + ostr.writeSize(0); + } + else + { + ostr.writeSize(v.length); + for(int i0 = 0; i0 < v.length; i0++) + { + ElementData.ice_write(ostr, v[i0]); + } + } + } + + public static ElementData[] read(com.zeroc.Ice.InputStream istr) + { + final ElementData[] v; + final int len0 = istr.readAndCheckSeqSize(10); + v = new ElementData[len0]; + for(int i0 = 0; i0 < len0; i0++) + { + v[i0] = ElementData.ice_read(istr); + } + return v; + } + + public static void write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + write(ostr, tag, v.get()); + } + } + + public static void write(com.zeroc.Ice.OutputStream ostr, int tag, ElementData[] v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + int pos = ostr.startSize(); + ElementDataSeqHelper.write(ostr, v); + ostr.endSize(pos); + } + } + + public static java.util.Optional read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr.skip(4); + ElementData[] v; + v = ElementDataSeqHelper.read(istr); + return java.util.Optional.of(v); + } + else + { + return java.util.Optional.empty(); + } + } +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java new file mode 100644 index 000000000000..db2b6d841169 --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java @@ -0,0 +1,176 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public class ElementInfo implements java.lang.Cloneable, + java.io.Serializable +{ + /** + * The key or filter id. + **/ + public long id; + + /** + * The filter name. + **/ + public String name; + + /** + * The key or filter value. + **/ + public byte[] value; + + public ElementInfo() + { + this.name = ""; + } + + public ElementInfo(long id, String name, byte[] value) + { + this.id = id; + this.name = name; + this.value = value; + } + + public boolean equals(java.lang.Object rhs) + { + if(this == rhs) + { + return true; + } + ElementInfo r = null; + if(rhs instanceof ElementInfo) + { + r = (ElementInfo)rhs; + } + + if(r != null) + { + if(this.id != r.id) + { + return false; + } + if(this.name != r.name) + { + if(this.name == null || r.name == null || !this.name.equals(r.name)) + { + return false; + } + } + if(!java.util.Arrays.equals(this.value, r.value)) + { + return false; + } + + return true; + } + + return false; + } + + public int hashCode() + { + int h_ = 5381; + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, "::DataStormContract::ElementInfo"); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, id); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, name); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, value); + return h_; + } + + public ElementInfo clone() + { + ElementInfo c = null; + try + { + c = (ElementInfo)super.clone(); + } + catch(CloneNotSupportedException ex) + { + assert false; // impossible + } + return c; + } + + public void ice_writeMembers(com.zeroc.Ice.OutputStream ostr) + { + ostr.writeLong(this.id); + ostr.writeString(this.name); + ostr.writeByteSeq(this.value); + } + + public void ice_readMembers(com.zeroc.Ice.InputStream istr) + { + this.id = istr.readLong(); + this.name = istr.readString(); + this.value = istr.readByteSeq(); + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, ElementInfo v) + { + if(v == null) + { + _nullMarshalValue.ice_writeMembers(ostr); + } + else + { + v.ice_writeMembers(ostr); + } + } + + static public ElementInfo ice_read(com.zeroc.Ice.InputStream istr) + { + ElementInfo v = new ElementInfo(); + v.ice_readMembers(istr); + return v; + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + ice_write(ostr, tag, v.get()); + } + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, ElementInfo v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + int pos = ostr.startSize(); + ice_write(ostr, v); + ostr.endSize(pos); + } + } + + static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr.skip(4); + return java.util.Optional.of(ElementInfo.ice_read(istr)); + } + else + { + return java.util.Optional.empty(); + } + } + + private static final ElementInfo _nullMarshalValue = new ElementInfo(); + + /** @hidden */ + private static final long serialVersionUID = 4025670780140632336L; +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfoSeqHelper.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfoSeqHelper.java new file mode 100644 index 000000000000..1fa42e4b1b1f --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfoSeqHelper.java @@ -0,0 +1,83 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +/** + * Helper class for marshaling/unmarshaling ElementInfoSeq. + **/ +public final class ElementInfoSeqHelper +{ + public static void write(com.zeroc.Ice.OutputStream ostr, ElementInfo[] v) + { + if(v == null) + { + ostr.writeSize(0); + } + else + { + ostr.writeSize(v.length); + for(int i0 = 0; i0 < v.length; i0++) + { + ElementInfo.ice_write(ostr, v[i0]); + } + } + } + + public static ElementInfo[] read(com.zeroc.Ice.InputStream istr) + { + final ElementInfo[] v; + final int len0 = istr.readAndCheckSeqSize(10); + v = new ElementInfo[len0]; + for(int i0 = 0; i0 < len0; i0++) + { + v[i0] = ElementInfo.ice_read(istr); + } + return v; + } + + public static void write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + write(ostr, tag, v.get()); + } + } + + public static void write(com.zeroc.Ice.OutputStream ostr, int tag, ElementInfo[] v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + int pos = ostr.startSize(); + ElementInfoSeqHelper.write(ostr, v); + ostr.endSize(pos); + } + } + + public static java.util.Optional read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr.skip(4); + ElementInfo[] v; + v = ElementInfoSeqHelper.read(istr); + return java.util.Optional.of(v); + } + else + { + return java.util.Optional.empty(); + } + } +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java new file mode 100644 index 000000000000..4cef31d9fae8 --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java @@ -0,0 +1,219 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public class ElementSpec implements java.lang.Cloneable, + java.io.Serializable +{ + /** + * The readers and writers associated with the key or filter. + **/ + public ElementData[] elements; + + /** + * The id of the key or filter + **/ + public long id; + + /** + * The name of the filter. + **/ + public String name; + + /** + * The value of the key or filter. + **/ + public byte[] value; + + /** + * The id of the key or filter from the peer. + **/ + public long peerId; + + /** + * The name of the filter from the peer. + **/ + public String peerName; + + public ElementSpec() + { + this.name = ""; + this.peerName = ""; + } + + public ElementSpec(ElementData[] elements, long id, String name, byte[] value, long peerId, String peerName) + { + this.elements = elements; + this.id = id; + this.name = name; + this.value = value; + this.peerId = peerId; + this.peerName = peerName; + } + + public boolean equals(java.lang.Object rhs) + { + if(this == rhs) + { + return true; + } + ElementSpec r = null; + if(rhs instanceof ElementSpec) + { + r = (ElementSpec)rhs; + } + + if(r != null) + { + if(!java.util.Arrays.equals(this.elements, r.elements)) + { + return false; + } + if(this.id != r.id) + { + return false; + } + if(this.name != r.name) + { + if(this.name == null || r.name == null || !this.name.equals(r.name)) + { + return false; + } + } + if(!java.util.Arrays.equals(this.value, r.value)) + { + return false; + } + if(this.peerId != r.peerId) + { + return false; + } + if(this.peerName != r.peerName) + { + if(this.peerName == null || r.peerName == null || !this.peerName.equals(r.peerName)) + { + return false; + } + } + + return true; + } + + return false; + } + + public int hashCode() + { + int h_ = 5381; + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, "::DataStormContract::ElementSpec"); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, elements); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, id); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, name); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, value); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, peerId); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, peerName); + return h_; + } + + public ElementSpec clone() + { + ElementSpec c = null; + try + { + c = (ElementSpec)super.clone(); + } + catch(CloneNotSupportedException ex) + { + assert false; // impossible + } + return c; + } + + public void ice_writeMembers(com.zeroc.Ice.OutputStream ostr) + { + ElementDataSeqHelper.write(ostr, this.elements); + ostr.writeLong(this.id); + ostr.writeString(this.name); + ostr.writeByteSeq(this.value); + ostr.writeLong(this.peerId); + ostr.writeString(this.peerName); + } + + public void ice_readMembers(com.zeroc.Ice.InputStream istr) + { + this.elements = ElementDataSeqHelper.read(istr); + this.id = istr.readLong(); + this.name = istr.readString(); + this.value = istr.readByteSeq(); + this.peerId = istr.readLong(); + this.peerName = istr.readString(); + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, ElementSpec v) + { + if(v == null) + { + _nullMarshalValue.ice_writeMembers(ostr); + } + else + { + v.ice_writeMembers(ostr); + } + } + + static public ElementSpec ice_read(com.zeroc.Ice.InputStream istr) + { + ElementSpec v = new ElementSpec(); + v.ice_readMembers(istr); + return v; + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + ice_write(ostr, tag, v.get()); + } + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, ElementSpec v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + int pos = ostr.startSize(); + ice_write(ostr, v); + ostr.endSize(pos); + } + } + + static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr.skip(4); + return java.util.Optional.of(ElementSpec.ice_read(istr)); + } + else + { + return java.util.Optional.empty(); + } + } + + private static final ElementSpec _nullMarshalValue = new ElementSpec(); + + /** @hidden */ + private static final long serialVersionUID = 977792003216390084L; +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java new file mode 100644 index 000000000000..2e0264e9eab0 --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java @@ -0,0 +1,219 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public class ElementSpecAck implements java.lang.Cloneable, + java.io.Serializable +{ + /** + * The readers or writers associated with the key or filter. + **/ + public ElementDataAck[] elements; + + /** + * The id of the key or filter. + **/ + public long id; + + /** + * The name of the filter. + **/ + public String name; + + /** + * The key or filter value. + **/ + public byte[] value; + + /** + * The id of the key or filter on the peer. + **/ + public long peerId; + + /** + * The name of the filter on the peer. + **/ + public String peerName; + + public ElementSpecAck() + { + this.name = ""; + this.peerName = ""; + } + + public ElementSpecAck(ElementDataAck[] elements, long id, String name, byte[] value, long peerId, String peerName) + { + this.elements = elements; + this.id = id; + this.name = name; + this.value = value; + this.peerId = peerId; + this.peerName = peerName; + } + + public boolean equals(java.lang.Object rhs) + { + if(this == rhs) + { + return true; + } + ElementSpecAck r = null; + if(rhs instanceof ElementSpecAck) + { + r = (ElementSpecAck)rhs; + } + + if(r != null) + { + if(!java.util.Arrays.equals(this.elements, r.elements)) + { + return false; + } + if(this.id != r.id) + { + return false; + } + if(this.name != r.name) + { + if(this.name == null || r.name == null || !this.name.equals(r.name)) + { + return false; + } + } + if(!java.util.Arrays.equals(this.value, r.value)) + { + return false; + } + if(this.peerId != r.peerId) + { + return false; + } + if(this.peerName != r.peerName) + { + if(this.peerName == null || r.peerName == null || !this.peerName.equals(r.peerName)) + { + return false; + } + } + + return true; + } + + return false; + } + + public int hashCode() + { + int h_ = 5381; + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, "::DataStormContract::ElementSpecAck"); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, elements); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, id); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, name); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, value); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, peerId); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, peerName); + return h_; + } + + public ElementSpecAck clone() + { + ElementSpecAck c = null; + try + { + c = (ElementSpecAck)super.clone(); + } + catch(CloneNotSupportedException ex) + { + assert false; // impossible + } + return c; + } + + public void ice_writeMembers(com.zeroc.Ice.OutputStream ostr) + { + ElementDataAckSeqHelper.write(ostr, this.elements); + ostr.writeLong(this.id); + ostr.writeString(this.name); + ostr.writeByteSeq(this.value); + ostr.writeLong(this.peerId); + ostr.writeString(this.peerName); + } + + public void ice_readMembers(com.zeroc.Ice.InputStream istr) + { + this.elements = ElementDataAckSeqHelper.read(istr); + this.id = istr.readLong(); + this.name = istr.readString(); + this.value = istr.readByteSeq(); + this.peerId = istr.readLong(); + this.peerName = istr.readString(); + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, ElementSpecAck v) + { + if(v == null) + { + _nullMarshalValue.ice_writeMembers(ostr); + } + else + { + v.ice_writeMembers(ostr); + } + } + + static public ElementSpecAck ice_read(com.zeroc.Ice.InputStream istr) + { + ElementSpecAck v = new ElementSpecAck(); + v.ice_readMembers(istr); + return v; + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + ice_write(ostr, tag, v.get()); + } + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, ElementSpecAck v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + int pos = ostr.startSize(); + ice_write(ostr, v); + ostr.endSize(pos); + } + } + + static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr.skip(4); + return java.util.Optional.of(ElementSpecAck.ice_read(istr)); + } + else + { + return java.util.Optional.empty(); + } + } + + private static final ElementSpecAck _nullMarshalValue = new ElementSpecAck(); + + /** @hidden */ + private static final long serialVersionUID = -2282735957275134310L; +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAckSeqHelper.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAckSeqHelper.java new file mode 100644 index 000000000000..ec4ffc6ce856 --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAckSeqHelper.java @@ -0,0 +1,83 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +/** + * Helper class for marshaling/unmarshaling ElementSpecAckSeq. + **/ +public final class ElementSpecAckSeqHelper +{ + public static void write(com.zeroc.Ice.OutputStream ostr, ElementSpecAck[] v) + { + if(v == null) + { + ostr.writeSize(0); + } + else + { + ostr.writeSize(v.length); + for(int i0 = 0; i0 < v.length; i0++) + { + ElementSpecAck.ice_write(ostr, v[i0]); + } + } + } + + public static ElementSpecAck[] read(com.zeroc.Ice.InputStream istr) + { + final ElementSpecAck[] v; + final int len0 = istr.readAndCheckSeqSize(20); + v = new ElementSpecAck[len0]; + for(int i0 = 0; i0 < len0; i0++) + { + v[i0] = ElementSpecAck.ice_read(istr); + } + return v; + } + + public static void write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + write(ostr, tag, v.get()); + } + } + + public static void write(com.zeroc.Ice.OutputStream ostr, int tag, ElementSpecAck[] v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + int pos = ostr.startSize(); + ElementSpecAckSeqHelper.write(ostr, v); + ostr.endSize(pos); + } + } + + public static java.util.Optional read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr.skip(4); + ElementSpecAck[] v; + v = ElementSpecAckSeqHelper.read(istr); + return java.util.Optional.of(v); + } + else + { + return java.util.Optional.empty(); + } + } +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecSeqHelper.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecSeqHelper.java new file mode 100644 index 000000000000..795751a4a277 --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecSeqHelper.java @@ -0,0 +1,83 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +/** + * Helper class for marshaling/unmarshaling ElementSpecSeq. + **/ +public final class ElementSpecSeqHelper +{ + public static void write(com.zeroc.Ice.OutputStream ostr, ElementSpec[] v) + { + if(v == null) + { + ostr.writeSize(0); + } + else + { + ostr.writeSize(v.length); + for(int i0 = 0; i0 < v.length; i0++) + { + ElementSpec.ice_write(ostr, v[i0]); + } + } + } + + public static ElementSpec[] read(com.zeroc.Ice.InputStream istr) + { + final ElementSpec[] v; + final int len0 = istr.readAndCheckSeqSize(20); + v = new ElementSpec[len0]; + for(int i0 = 0; i0 < len0; i0++) + { + v[i0] = ElementSpec.ice_read(istr); + } + return v; + } + + public static void write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + write(ostr, tag, v.get()); + } + } + + public static void write(com.zeroc.Ice.OutputStream ostr, int tag, ElementSpec[] v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + int pos = ostr.startSize(); + ElementSpecSeqHelper.write(ostr, v); + ostr.endSize(pos); + } + } + + public static java.util.Optional read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr.skip(4); + ElementSpec[] v; + v = ElementSpecSeqHelper.read(istr); + return java.util.Optional.of(v); + } + else + { + return java.util.Optional.empty(); + } + } +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java b/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java new file mode 100644 index 000000000000..90bd0b83bdd7 --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java @@ -0,0 +1,157 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public class FilterInfo implements java.lang.Cloneable, + java.io.Serializable +{ + public String name; + + public byte[] criteria; + + public FilterInfo() + { + this.name = ""; + } + + public FilterInfo(String name, byte[] criteria) + { + this.name = name; + this.criteria = criteria; + } + + public boolean equals(java.lang.Object rhs) + { + if(this == rhs) + { + return true; + } + FilterInfo r = null; + if(rhs instanceof FilterInfo) + { + r = (FilterInfo)rhs; + } + + if(r != null) + { + if(this.name != r.name) + { + if(this.name == null || r.name == null || !this.name.equals(r.name)) + { + return false; + } + } + if(!java.util.Arrays.equals(this.criteria, r.criteria)) + { + return false; + } + + return true; + } + + return false; + } + + public int hashCode() + { + int h_ = 5381; + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, "::DataStormContract::FilterInfo"); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, name); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, criteria); + return h_; + } + + public FilterInfo clone() + { + FilterInfo c = null; + try + { + c = (FilterInfo)super.clone(); + } + catch(CloneNotSupportedException ex) + { + assert false; // impossible + } + return c; + } + + public void ice_writeMembers(com.zeroc.Ice.OutputStream ostr) + { + ostr.writeString(this.name); + ostr.writeByteSeq(this.criteria); + } + + public void ice_readMembers(com.zeroc.Ice.InputStream istr) + { + this.name = istr.readString(); + this.criteria = istr.readByteSeq(); + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, FilterInfo v) + { + if(v == null) + { + _nullMarshalValue.ice_writeMembers(ostr); + } + else + { + v.ice_writeMembers(ostr); + } + } + + static public FilterInfo ice_read(com.zeroc.Ice.InputStream istr) + { + FilterInfo v = new FilterInfo(); + v.ice_readMembers(istr); + return v; + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + ice_write(ostr, tag, v.get()); + } + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, FilterInfo v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + int pos = ostr.startSize(); + ice_write(ostr, v); + ostr.endSize(pos); + } + } + + static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr.skip(4); + return java.util.Optional.of(FilterInfo.ice_read(istr)); + } + else + { + return java.util.Optional.empty(); + } + } + + private static final FilterInfo _nullMarshalValue = new FilterInfo(); + + /** @hidden */ + private static final long serialVersionUID = -2732706502145579134L; +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/LongLongDictHelper.java b/slice2java/cpp/src/DataStorm/DataStormContract/LongLongDictHelper.java new file mode 100644 index 000000000000..e33ae6f250bb --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/LongLongDictHelper.java @@ -0,0 +1,88 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; +/** + * Helper class for marshaling/unmarshaling LongLongDict. + **/ + +public final class LongLongDictHelper +{ + public static void write(com.zeroc.Ice.OutputStream ostr, java.util.Map v) + { + if(v == null) + { + ostr.writeSize(0); + } + else + { + ostr.writeSize(v.size()); + for(java.util.Map.Entry e : v.entrySet()) + { + ostr.writeLong(e.getKey()); + ostr.writeLong(e.getValue()); + } + } + } + + public static java.util.Map read(com.zeroc.Ice.InputStream istr) + { + java.util.Map v; + v = new java.util.HashMap(); + int sz0 = istr.readSize(); + for(int i0 = 0; i0 < sz0; i0++) + { + long key; + key = istr.readLong(); + long value; + value = istr.readLong(); + v.put(key, value); + } + return v; + } + + public static void write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional> v) + { + if(v != null && v.isPresent()) + { + write(ostr, tag, v.get()); + } + } + + public static void write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Map v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.VSize)) + { + final int optSize = v == null ? 0 : v.size(); + ostr.writeSize(optSize > 254 ? optSize * 16 + 5 : optSize * 16 + 1); + LongLongDictHelper.write(ostr, v); + } + } + + public static java.util.Optional> read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.VSize)) + { + istr.skipSize(); + java.util.Map v; + v = LongLongDictHelper.read(istr); + return java.util.Optional.of(v); + } + else + { + return java.util.Optional.empty(); + } + } +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/Lookup.java b/slice2java/cpp/src/DataStorm/DataStormContract/Lookup.java new file mode 100644 index 000000000000..eb626bd6af8c --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/Lookup.java @@ -0,0 +1,133 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public interface Lookup extends com.zeroc.Ice.Object +{ + void announceTopicReader(String topic, NodePrx node, com.zeroc.Ice.Current current); + + void announceTopicWriter(String topic, NodePrx node, com.zeroc.Ice.Current current); + + void announceTopics(String[] readers, String[] writers, NodePrx node, com.zeroc.Ice.Current current); + + NodePrx createSession(NodePrx node, com.zeroc.Ice.Current current); + + /** @hidden */ + static final String[] _iceIds = + { + "::DataStormContract::Lookup", + "::Ice::Object" + }; + + @Override + default String[] ice_ids(com.zeroc.Ice.Current current) + { + return _iceIds; + } + + @Override + default String ice_id(com.zeroc.Ice.Current current) + { + return ice_staticId(); + } + + static String ice_staticId() + { + return "::DataStormContract::Lookup"; + } + + /** @hidden */ + static java.util.concurrent.CompletionStage _iceD_announceTopicReader(Lookup obj, com.zeroc.Ice.IncomingRequest request) + { + com.zeroc.Ice.Object._iceCheckMode(com.zeroc.Ice.OperationMode.Idempotent, request.current.mode); + com.zeroc.Ice.InputStream istr = request.inputStream; + istr.startEncapsulation(); + String iceP_topic; + NodePrx iceP_node; + iceP_topic = istr.readString(); + iceP_node = NodePrx.uncheckedCast(istr.readProxy()); + istr.endEncapsulation(); + obj.announceTopicReader(iceP_topic, iceP_node, request.current); + return java.util.concurrent.CompletableFuture.completedFuture(request.current.createEmptyOutgoingResponse()); + } + + /** @hidden */ + static java.util.concurrent.CompletionStage _iceD_announceTopicWriter(Lookup obj, com.zeroc.Ice.IncomingRequest request) + { + com.zeroc.Ice.Object._iceCheckMode(com.zeroc.Ice.OperationMode.Idempotent, request.current.mode); + com.zeroc.Ice.InputStream istr = request.inputStream; + istr.startEncapsulation(); + String iceP_topic; + NodePrx iceP_node; + iceP_topic = istr.readString(); + iceP_node = NodePrx.uncheckedCast(istr.readProxy()); + istr.endEncapsulation(); + obj.announceTopicWriter(iceP_topic, iceP_node, request.current); + return java.util.concurrent.CompletableFuture.completedFuture(request.current.createEmptyOutgoingResponse()); + } + + /** @hidden */ + static java.util.concurrent.CompletionStage _iceD_announceTopics(Lookup obj, com.zeroc.Ice.IncomingRequest request) + { + com.zeroc.Ice.Object._iceCheckMode(com.zeroc.Ice.OperationMode.Idempotent, request.current.mode); + com.zeroc.Ice.InputStream istr = request.inputStream; + istr.startEncapsulation(); + String[] iceP_readers; + String[] iceP_writers; + NodePrx iceP_node; + iceP_readers = istr.readStringSeq(); + iceP_writers = istr.readStringSeq(); + iceP_node = NodePrx.uncheckedCast(istr.readProxy()); + istr.endEncapsulation(); + obj.announceTopics(iceP_readers, iceP_writers, iceP_node, request.current); + return java.util.concurrent.CompletableFuture.completedFuture(request.current.createEmptyOutgoingResponse()); + } + + /** @hidden */ + static java.util.concurrent.CompletionStage _iceD_createSession(Lookup obj, com.zeroc.Ice.IncomingRequest request) + { + com.zeroc.Ice.Object._iceCheckMode(null, request.current.mode); + com.zeroc.Ice.InputStream istr = request.inputStream; + istr.startEncapsulation(); + NodePrx iceP_node; + iceP_node = NodePrx.uncheckedCast(istr.readProxy()); + istr.endEncapsulation(); + NodePrx ret = obj.createSession(iceP_node, request.current); + var ostr = request.current.startReplyStream(); + ostr.startEncapsulation(request.current.encoding, null); + ostr.writeProxy(ret); + ostr.endEncapsulation(); + return java.util.concurrent.CompletableFuture.completedFuture(new com.zeroc.Ice.OutgoingResponse(ostr)); + } + + @Override + default java.util.concurrent.CompletionStage dispatch(com.zeroc.Ice.IncomingRequest request) + throws com.zeroc.Ice.UserException + { + return switch (request.current.operation) + { + case "announceTopicReader" -> Lookup._iceD_announceTopicReader(this, request); + case "announceTopicWriter" -> Lookup._iceD_announceTopicWriter(this, request); + case "announceTopics" -> Lookup._iceD_announceTopics(this, request); + case "createSession" -> Lookup._iceD_createSession(this, request); + case "ice_id" -> com.zeroc.Ice.Object._iceD_ice_id(this, request); + case "ice_ids" -> com.zeroc.Ice.Object._iceD_ice_ids(this, request); + case "ice_isA" -> com.zeroc.Ice.Object._iceD_ice_isA(this, request); + case "ice_ping" -> com.zeroc.Ice.Object._iceD_ice_ping(this, request); + default -> throw new com.zeroc.Ice.OperationNotExistException(); + }; + } +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/LookupPrx.java b/slice2java/cpp/src/DataStorm/DataStormContract/LookupPrx.java new file mode 100644 index 000000000000..0247ce8471a0 --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/LookupPrx.java @@ -0,0 +1,332 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public interface LookupPrx extends com.zeroc.Ice.ObjectPrx +{ + default void announceTopicReader(String topic, NodePrx node) + { + announceTopicReader(topic, node, com.zeroc.Ice.ObjectPrx.noExplicitContext); + } + + default void announceTopicReader(String topic, NodePrx node, java.util.Map context) + { + _iceI_announceTopicReaderAsync(topic, node, context, true).waitForResponse(); + } + + default java.util.concurrent.CompletableFuture announceTopicReaderAsync(String topic, NodePrx node) + { + return _iceI_announceTopicReaderAsync(topic, node, com.zeroc.Ice.ObjectPrx.noExplicitContext, false); + } + + default java.util.concurrent.CompletableFuture announceTopicReaderAsync(String topic, NodePrx node, java.util.Map context) + { + return _iceI_announceTopicReaderAsync(topic, node, context, false); + } + + /** + * @hidden + * @param iceP_topic - + * @param iceP_node - + * @param context - + * @param sync - + * @return - + **/ + default com.zeroc.Ice.OutgoingAsync _iceI_announceTopicReaderAsync(String iceP_topic, NodePrx iceP_node, java.util.Map context, boolean sync) + { + com.zeroc.Ice.OutgoingAsync f = new com.zeroc.Ice.OutgoingAsync<>(this, "announceTopicReader", com.zeroc.Ice.OperationMode.Idempotent, sync, null); + f.invoke(false, context, null, ostr -> { + ostr.writeString(iceP_topic); + ostr.writeProxy(iceP_node); + }, null); + return f; + } + + default void announceTopicWriter(String topic, NodePrx node) + { + announceTopicWriter(topic, node, com.zeroc.Ice.ObjectPrx.noExplicitContext); + } + + default void announceTopicWriter(String topic, NodePrx node, java.util.Map context) + { + _iceI_announceTopicWriterAsync(topic, node, context, true).waitForResponse(); + } + + default java.util.concurrent.CompletableFuture announceTopicWriterAsync(String topic, NodePrx node) + { + return _iceI_announceTopicWriterAsync(topic, node, com.zeroc.Ice.ObjectPrx.noExplicitContext, false); + } + + default java.util.concurrent.CompletableFuture announceTopicWriterAsync(String topic, NodePrx node, java.util.Map context) + { + return _iceI_announceTopicWriterAsync(topic, node, context, false); + } + + /** + * @hidden + * @param iceP_topic - + * @param iceP_node - + * @param context - + * @param sync - + * @return - + **/ + default com.zeroc.Ice.OutgoingAsync _iceI_announceTopicWriterAsync(String iceP_topic, NodePrx iceP_node, java.util.Map context, boolean sync) + { + com.zeroc.Ice.OutgoingAsync f = new com.zeroc.Ice.OutgoingAsync<>(this, "announceTopicWriter", com.zeroc.Ice.OperationMode.Idempotent, sync, null); + f.invoke(false, context, null, ostr -> { + ostr.writeString(iceP_topic); + ostr.writeProxy(iceP_node); + }, null); + return f; + } + + default void announceTopics(String[] readers, String[] writers, NodePrx node) + { + announceTopics(readers, writers, node, com.zeroc.Ice.ObjectPrx.noExplicitContext); + } + + default void announceTopics(String[] readers, String[] writers, NodePrx node, java.util.Map context) + { + _iceI_announceTopicsAsync(readers, writers, node, context, true).waitForResponse(); + } + + default java.util.concurrent.CompletableFuture announceTopicsAsync(String[] readers, String[] writers, NodePrx node) + { + return _iceI_announceTopicsAsync(readers, writers, node, com.zeroc.Ice.ObjectPrx.noExplicitContext, false); + } + + default java.util.concurrent.CompletableFuture announceTopicsAsync(String[] readers, String[] writers, NodePrx node, java.util.Map context) + { + return _iceI_announceTopicsAsync(readers, writers, node, context, false); + } + + /** + * @hidden + * @param iceP_readers - + * @param iceP_writers - + * @param iceP_node - + * @param context - + * @param sync - + * @return - + **/ + default com.zeroc.Ice.OutgoingAsync _iceI_announceTopicsAsync(String[] iceP_readers, String[] iceP_writers, NodePrx iceP_node, java.util.Map context, boolean sync) + { + com.zeroc.Ice.OutgoingAsync f = new com.zeroc.Ice.OutgoingAsync<>(this, "announceTopics", com.zeroc.Ice.OperationMode.Idempotent, sync, null); + f.invoke(false, context, null, ostr -> { + ostr.writeStringSeq(iceP_readers); + ostr.writeStringSeq(iceP_writers); + ostr.writeProxy(iceP_node); + }, null); + return f; + } + + default NodePrx createSession(NodePrx node) + { + return createSession(node, com.zeroc.Ice.ObjectPrx.noExplicitContext); + } + + default NodePrx createSession(NodePrx node, java.util.Map context) + { + return _iceI_createSessionAsync(node, context, true).waitForResponse(); + } + + default java.util.concurrent.CompletableFuture createSessionAsync(NodePrx node) + { + return _iceI_createSessionAsync(node, com.zeroc.Ice.ObjectPrx.noExplicitContext, false); + } + + default java.util.concurrent.CompletableFuture createSessionAsync(NodePrx node, java.util.Map context) + { + return _iceI_createSessionAsync(node, context, false); + } + + /** + * @hidden + * @param iceP_node - + * @param context - + * @param sync - + * @return - + **/ + default com.zeroc.Ice.OutgoingAsync _iceI_createSessionAsync(NodePrx iceP_node, java.util.Map context, boolean sync) + { + com.zeroc.Ice.OutgoingAsync f = new com.zeroc.Ice.OutgoingAsync<>(this, "createSession", null, sync, null); + f.invoke(true, context, null, ostr -> { + ostr.writeProxy(iceP_node); + }, istr -> { + NodePrx ret; + ret = NodePrx.uncheckedCast(istr.readProxy()); + return ret; + }); + return f; + } + + /** + * Creates a new proxy that implements {@link LookupPrx}. + * @param communicator The communicator of the new proxy. + * @param proxyString The string representation of the proxy. + * @return The new proxy. + **/ + public static LookupPrx createProxy(com.zeroc.Ice.Communicator communicator, String proxyString) + { + return new _LookupPrxI(com.zeroc.Ice.ObjectPrx.createProxy(communicator, proxyString)); + } + + /** + * Contacts the remote server to verify that the object implements this type. + * Raises a local exception if a communication error occurs. + * @param obj The untyped proxy. + * @return A proxy for this type, or null if the object does not support this type. + **/ + static LookupPrx checkedCast(com.zeroc.Ice.ObjectPrx obj) + { + return checkedCast(obj, noExplicitContext); + } + + /** + * Contacts the remote server to verify that the object implements this type. + * Raises a local exception if a communication error occurs. + * @param obj The untyped proxy. + * @param context The Context map to send with the invocation. + * @return A proxy for this type, or null if the object does not support this type. + **/ + static LookupPrx checkedCast(com.zeroc.Ice.ObjectPrx obj, java.util.Map context) + { + return (obj != null && obj.ice_isA(ice_staticId(), context)) ? new _LookupPrxI(obj) : null; + } + + /** + * Contacts the remote server to verify that a facet of the object implements this type. + * Raises a local exception if a communication error occurs. + * @param obj The untyped proxy. + * @param facet The name of the desired facet. + * @return A proxy for this type, or null if the object does not support this type. + **/ + static LookupPrx checkedCast(com.zeroc.Ice.ObjectPrx obj, String facet) + { + return checkedCast(obj, facet, noExplicitContext); + } + + /** + * Contacts the remote server to verify that a facet of the object implements this type. + * Raises a local exception if a communication error occurs. + * @param obj The untyped proxy. + * @param facet The name of the desired facet. + * @param context The Context map to send with the invocation. + * @return A proxy for this type, or null if the object does not support this type. + **/ + static LookupPrx checkedCast(com.zeroc.Ice.ObjectPrx obj, String facet, java.util.Map context) + { + return (obj == null) ? null : checkedCast(obj.ice_facet(facet), context); + } + + /** + * Downcasts the given proxy to this type without contacting the remote server. + * @param obj The untyped proxy. + * @return A proxy for this type. + **/ + static LookupPrx uncheckedCast(com.zeroc.Ice.ObjectPrx obj) + { + return (obj == null) ? null : new _LookupPrxI(obj); + } + + /** + * Downcasts the given proxy to this type without contacting the remote server. + * @param obj The untyped proxy. + * @param facet The name of the desired facet. + * @return A proxy for this type. + **/ + static LookupPrx uncheckedCast(com.zeroc.Ice.ObjectPrx obj, String facet) + { + return (obj == null) ? null : new _LookupPrxI(obj.ice_facet(facet)); + } + + @Override + LookupPrx ice_context(java.util.Map newContext); + + @Override + LookupPrx ice_adapterId(String newAdapterId); + + @Override + LookupPrx ice_endpoints(com.zeroc.Ice.Endpoint[] newEndpoints); + + @Override + LookupPrx ice_locatorCacheTimeout(int newTimeout); + + @Override + LookupPrx ice_invocationTimeout(int newTimeout); + + @Override + LookupPrx ice_connectionCached(boolean newCache); + + @Override + LookupPrx ice_endpointSelection(com.zeroc.Ice.EndpointSelectionType newType); + + @Override + LookupPrx ice_secure(boolean b); + + @Override + LookupPrx ice_encodingVersion(com.zeroc.Ice.EncodingVersion e); + + @Override + LookupPrx ice_preferSecure(boolean b); + + @Override + LookupPrx ice_router(com.zeroc.Ice.RouterPrx router); + + @Override + LookupPrx ice_locator(com.zeroc.Ice.LocatorPrx locator); + + @Override + LookupPrx ice_collocationOptimized(boolean b); + + @Override + LookupPrx ice_twoway(); + + @Override + LookupPrx ice_oneway(); + + @Override + LookupPrx ice_batchOneway(); + + @Override + LookupPrx ice_datagram(); + + @Override + LookupPrx ice_batchDatagram(); + + @Override + LookupPrx ice_compress(boolean co); + + @Override + LookupPrx ice_connectionId(String connectionId); + + @Override + LookupPrx ice_fixed(com.zeroc.Ice.Connection connection); + + static String ice_staticId() + { + return "::DataStormContract::Lookup"; + } + + /** + * @hidden + **/ + @Override + default LookupPrx _newInstance(com.zeroc.Ice.Reference ref) + { + return new _LookupPrxI(ref); + } +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/Node.java b/slice2java/cpp/src/DataStorm/DataStormContract/Node.java new file mode 100644 index 000000000000..5ca9ef046a9b --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/Node.java @@ -0,0 +1,111 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public interface Node extends com.zeroc.Ice.Object +{ + void initiateCreateSession(NodePrx publisher, com.zeroc.Ice.Current current); + + void createSession(NodePrx subscriber, SubscriberSessionPrx session, boolean fromRelay, com.zeroc.Ice.Current current); + + void confirmCreateSession(NodePrx publisher, PublisherSessionPrx session, com.zeroc.Ice.Current current); + + /** @hidden */ + static final String[] _iceIds = + { + "::DataStormContract::Node", + "::Ice::Object" + }; + + @Override + default String[] ice_ids(com.zeroc.Ice.Current current) + { + return _iceIds; + } + + @Override + default String ice_id(com.zeroc.Ice.Current current) + { + return ice_staticId(); + } + + static String ice_staticId() + { + return "::DataStormContract::Node"; + } + + /** @hidden */ + static java.util.concurrent.CompletionStage _iceD_initiateCreateSession(Node obj, com.zeroc.Ice.IncomingRequest request) + { + com.zeroc.Ice.Object._iceCheckMode(null, request.current.mode); + com.zeroc.Ice.InputStream istr = request.inputStream; + istr.startEncapsulation(); + NodePrx iceP_publisher; + iceP_publisher = NodePrx.uncheckedCast(istr.readProxy()); + istr.endEncapsulation(); + obj.initiateCreateSession(iceP_publisher, request.current); + return java.util.concurrent.CompletableFuture.completedFuture(request.current.createEmptyOutgoingResponse()); + } + + /** @hidden */ + static java.util.concurrent.CompletionStage _iceD_createSession(Node obj, com.zeroc.Ice.IncomingRequest request) + { + com.zeroc.Ice.Object._iceCheckMode(null, request.current.mode); + com.zeroc.Ice.InputStream istr = request.inputStream; + istr.startEncapsulation(); + NodePrx iceP_subscriber; + SubscriberSessionPrx iceP_session; + boolean iceP_fromRelay; + iceP_subscriber = NodePrx.uncheckedCast(istr.readProxy()); + iceP_session = SubscriberSessionPrx.uncheckedCast(istr.readProxy()); + iceP_fromRelay = istr.readBool(); + istr.endEncapsulation(); + obj.createSession(iceP_subscriber, iceP_session, iceP_fromRelay, request.current); + return java.util.concurrent.CompletableFuture.completedFuture(request.current.createEmptyOutgoingResponse()); + } + + /** @hidden */ + static java.util.concurrent.CompletionStage _iceD_confirmCreateSession(Node obj, com.zeroc.Ice.IncomingRequest request) + { + com.zeroc.Ice.Object._iceCheckMode(null, request.current.mode); + com.zeroc.Ice.InputStream istr = request.inputStream; + istr.startEncapsulation(); + NodePrx iceP_publisher; + PublisherSessionPrx iceP_session; + iceP_publisher = NodePrx.uncheckedCast(istr.readProxy()); + iceP_session = PublisherSessionPrx.uncheckedCast(istr.readProxy()); + istr.endEncapsulation(); + obj.confirmCreateSession(iceP_publisher, iceP_session, request.current); + return java.util.concurrent.CompletableFuture.completedFuture(request.current.createEmptyOutgoingResponse()); + } + + @Override + default java.util.concurrent.CompletionStage dispatch(com.zeroc.Ice.IncomingRequest request) + throws com.zeroc.Ice.UserException + { + return switch (request.current.operation) + { + case "initiateCreateSession" -> Node._iceD_initiateCreateSession(this, request); + case "createSession" -> Node._iceD_createSession(this, request); + case "confirmCreateSession" -> Node._iceD_confirmCreateSession(this, request); + case "ice_id" -> com.zeroc.Ice.Object._iceD_ice_id(this, request); + case "ice_ids" -> com.zeroc.Ice.Object._iceD_ice_ids(this, request); + case "ice_isA" -> com.zeroc.Ice.Object._iceD_ice_isA(this, request); + case "ice_ping" -> com.zeroc.Ice.Object._iceD_ice_ping(this, request); + default -> throw new com.zeroc.Ice.OperationNotExistException(); + }; + } +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/NodePrx.java b/slice2java/cpp/src/DataStorm/DataStormContract/NodePrx.java new file mode 100644 index 000000000000..b374b6c13ed5 --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/NodePrx.java @@ -0,0 +1,290 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public interface NodePrx extends com.zeroc.Ice.ObjectPrx +{ + default void initiateCreateSession(NodePrx publisher) + { + initiateCreateSession(publisher, com.zeroc.Ice.ObjectPrx.noExplicitContext); + } + + default void initiateCreateSession(NodePrx publisher, java.util.Map context) + { + _iceI_initiateCreateSessionAsync(publisher, context, true).waitForResponse(); + } + + default java.util.concurrent.CompletableFuture initiateCreateSessionAsync(NodePrx publisher) + { + return _iceI_initiateCreateSessionAsync(publisher, com.zeroc.Ice.ObjectPrx.noExplicitContext, false); + } + + default java.util.concurrent.CompletableFuture initiateCreateSessionAsync(NodePrx publisher, java.util.Map context) + { + return _iceI_initiateCreateSessionAsync(publisher, context, false); + } + + /** + * @hidden + * @param iceP_publisher - + * @param context - + * @param sync - + * @return - + **/ + default com.zeroc.Ice.OutgoingAsync _iceI_initiateCreateSessionAsync(NodePrx iceP_publisher, java.util.Map context, boolean sync) + { + com.zeroc.Ice.OutgoingAsync f = new com.zeroc.Ice.OutgoingAsync<>(this, "initiateCreateSession", null, sync, null); + f.invoke(false, context, null, ostr -> { + ostr.writeProxy(iceP_publisher); + }, null); + return f; + } + + default void createSession(NodePrx subscriber, SubscriberSessionPrx session, boolean fromRelay) + { + createSession(subscriber, session, fromRelay, com.zeroc.Ice.ObjectPrx.noExplicitContext); + } + + default void createSession(NodePrx subscriber, SubscriberSessionPrx session, boolean fromRelay, java.util.Map context) + { + _iceI_createSessionAsync(subscriber, session, fromRelay, context, true).waitForResponse(); + } + + default java.util.concurrent.CompletableFuture createSessionAsync(NodePrx subscriber, SubscriberSessionPrx session, boolean fromRelay) + { + return _iceI_createSessionAsync(subscriber, session, fromRelay, com.zeroc.Ice.ObjectPrx.noExplicitContext, false); + } + + default java.util.concurrent.CompletableFuture createSessionAsync(NodePrx subscriber, SubscriberSessionPrx session, boolean fromRelay, java.util.Map context) + { + return _iceI_createSessionAsync(subscriber, session, fromRelay, context, false); + } + + /** + * @hidden + * @param iceP_subscriber - + * @param iceP_session - + * @param iceP_fromRelay - + * @param context - + * @param sync - + * @return - + **/ + default com.zeroc.Ice.OutgoingAsync _iceI_createSessionAsync(NodePrx iceP_subscriber, SubscriberSessionPrx iceP_session, boolean iceP_fromRelay, java.util.Map context, boolean sync) + { + com.zeroc.Ice.OutgoingAsync f = new com.zeroc.Ice.OutgoingAsync<>(this, "createSession", null, sync, null); + f.invoke(false, context, null, ostr -> { + ostr.writeProxy(iceP_subscriber); + ostr.writeProxy(iceP_session); + ostr.writeBool(iceP_fromRelay); + }, null); + return f; + } + + default void confirmCreateSession(NodePrx publisher, PublisherSessionPrx session) + { + confirmCreateSession(publisher, session, com.zeroc.Ice.ObjectPrx.noExplicitContext); + } + + default void confirmCreateSession(NodePrx publisher, PublisherSessionPrx session, java.util.Map context) + { + _iceI_confirmCreateSessionAsync(publisher, session, context, true).waitForResponse(); + } + + default java.util.concurrent.CompletableFuture confirmCreateSessionAsync(NodePrx publisher, PublisherSessionPrx session) + { + return _iceI_confirmCreateSessionAsync(publisher, session, com.zeroc.Ice.ObjectPrx.noExplicitContext, false); + } + + default java.util.concurrent.CompletableFuture confirmCreateSessionAsync(NodePrx publisher, PublisherSessionPrx session, java.util.Map context) + { + return _iceI_confirmCreateSessionAsync(publisher, session, context, false); + } + + /** + * @hidden + * @param iceP_publisher - + * @param iceP_session - + * @param context - + * @param sync - + * @return - + **/ + default com.zeroc.Ice.OutgoingAsync _iceI_confirmCreateSessionAsync(NodePrx iceP_publisher, PublisherSessionPrx iceP_session, java.util.Map context, boolean sync) + { + com.zeroc.Ice.OutgoingAsync f = new com.zeroc.Ice.OutgoingAsync<>(this, "confirmCreateSession", null, sync, null); + f.invoke(false, context, null, ostr -> { + ostr.writeProxy(iceP_publisher); + ostr.writeProxy(iceP_session); + }, null); + return f; + } + + /** + * Creates a new proxy that implements {@link NodePrx}. + * @param communicator The communicator of the new proxy. + * @param proxyString The string representation of the proxy. + * @return The new proxy. + **/ + public static NodePrx createProxy(com.zeroc.Ice.Communicator communicator, String proxyString) + { + return new _NodePrxI(com.zeroc.Ice.ObjectPrx.createProxy(communicator, proxyString)); + } + + /** + * Contacts the remote server to verify that the object implements this type. + * Raises a local exception if a communication error occurs. + * @param obj The untyped proxy. + * @return A proxy for this type, or null if the object does not support this type. + **/ + static NodePrx checkedCast(com.zeroc.Ice.ObjectPrx obj) + { + return checkedCast(obj, noExplicitContext); + } + + /** + * Contacts the remote server to verify that the object implements this type. + * Raises a local exception if a communication error occurs. + * @param obj The untyped proxy. + * @param context The Context map to send with the invocation. + * @return A proxy for this type, or null if the object does not support this type. + **/ + static NodePrx checkedCast(com.zeroc.Ice.ObjectPrx obj, java.util.Map context) + { + return (obj != null && obj.ice_isA(ice_staticId(), context)) ? new _NodePrxI(obj) : null; + } + + /** + * Contacts the remote server to verify that a facet of the object implements this type. + * Raises a local exception if a communication error occurs. + * @param obj The untyped proxy. + * @param facet The name of the desired facet. + * @return A proxy for this type, or null if the object does not support this type. + **/ + static NodePrx checkedCast(com.zeroc.Ice.ObjectPrx obj, String facet) + { + return checkedCast(obj, facet, noExplicitContext); + } + + /** + * Contacts the remote server to verify that a facet of the object implements this type. + * Raises a local exception if a communication error occurs. + * @param obj The untyped proxy. + * @param facet The name of the desired facet. + * @param context The Context map to send with the invocation. + * @return A proxy for this type, or null if the object does not support this type. + **/ + static NodePrx checkedCast(com.zeroc.Ice.ObjectPrx obj, String facet, java.util.Map context) + { + return (obj == null) ? null : checkedCast(obj.ice_facet(facet), context); + } + + /** + * Downcasts the given proxy to this type without contacting the remote server. + * @param obj The untyped proxy. + * @return A proxy for this type. + **/ + static NodePrx uncheckedCast(com.zeroc.Ice.ObjectPrx obj) + { + return (obj == null) ? null : new _NodePrxI(obj); + } + + /** + * Downcasts the given proxy to this type without contacting the remote server. + * @param obj The untyped proxy. + * @param facet The name of the desired facet. + * @return A proxy for this type. + **/ + static NodePrx uncheckedCast(com.zeroc.Ice.ObjectPrx obj, String facet) + { + return (obj == null) ? null : new _NodePrxI(obj.ice_facet(facet)); + } + + @Override + NodePrx ice_context(java.util.Map newContext); + + @Override + NodePrx ice_adapterId(String newAdapterId); + + @Override + NodePrx ice_endpoints(com.zeroc.Ice.Endpoint[] newEndpoints); + + @Override + NodePrx ice_locatorCacheTimeout(int newTimeout); + + @Override + NodePrx ice_invocationTimeout(int newTimeout); + + @Override + NodePrx ice_connectionCached(boolean newCache); + + @Override + NodePrx ice_endpointSelection(com.zeroc.Ice.EndpointSelectionType newType); + + @Override + NodePrx ice_secure(boolean b); + + @Override + NodePrx ice_encodingVersion(com.zeroc.Ice.EncodingVersion e); + + @Override + NodePrx ice_preferSecure(boolean b); + + @Override + NodePrx ice_router(com.zeroc.Ice.RouterPrx router); + + @Override + NodePrx ice_locator(com.zeroc.Ice.LocatorPrx locator); + + @Override + NodePrx ice_collocationOptimized(boolean b); + + @Override + NodePrx ice_twoway(); + + @Override + NodePrx ice_oneway(); + + @Override + NodePrx ice_batchOneway(); + + @Override + NodePrx ice_datagram(); + + @Override + NodePrx ice_batchDatagram(); + + @Override + NodePrx ice_compress(boolean co); + + @Override + NodePrx ice_connectionId(String connectionId); + + @Override + NodePrx ice_fixed(com.zeroc.Ice.Connection connection); + + static String ice_staticId() + { + return "::DataStormContract::Node"; + } + + /** + * @hidden + **/ + @Override + default NodePrx _newInstance(com.zeroc.Ice.Reference ref) + { + return new _NodePrxI(ref); + } +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/PublisherSession.java b/slice2java/cpp/src/DataStorm/DataStormContract/PublisherSession.java new file mode 100644 index 000000000000..146b21f95bec --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/PublisherSession.java @@ -0,0 +1,69 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public interface PublisherSession extends Session +{ + /** @hidden */ + static final String[] _iceIds = + { + "::DataStormContract::PublisherSession", + "::DataStormContract::Session", + "::Ice::Object" + }; + + @Override + default String[] ice_ids(com.zeroc.Ice.Current current) + { + return _iceIds; + } + + @Override + default String ice_id(com.zeroc.Ice.Current current) + { + return ice_staticId(); + } + + static String ice_staticId() + { + return "::DataStormContract::PublisherSession"; + } + + @Override + default java.util.concurrent.CompletionStage dispatch(com.zeroc.Ice.IncomingRequest request) + throws com.zeroc.Ice.UserException + { + return switch (request.current.operation) + { + case "announceTopics" -> Session._iceD_announceTopics(this, request); + case "attachTopic" -> Session._iceD_attachTopic(this, request); + case "detachTopic" -> Session._iceD_detachTopic(this, request); + case "attachTags" -> Session._iceD_attachTags(this, request); + case "detachTags" -> Session._iceD_detachTags(this, request); + case "announceElements" -> Session._iceD_announceElements(this, request); + case "attachElements" -> Session._iceD_attachElements(this, request); + case "attachElementsAck" -> Session._iceD_attachElementsAck(this, request); + case "detachElements" -> Session._iceD_detachElements(this, request); + case "initSamples" -> Session._iceD_initSamples(this, request); + case "disconnected" -> Session._iceD_disconnected(this, request); + case "ice_id" -> com.zeroc.Ice.Object._iceD_ice_id(this, request); + case "ice_ids" -> com.zeroc.Ice.Object._iceD_ice_ids(this, request); + case "ice_isA" -> com.zeroc.Ice.Object._iceD_ice_isA(this, request); + case "ice_ping" -> com.zeroc.Ice.Object._iceD_ice_ping(this, request); + default -> throw new com.zeroc.Ice.OperationNotExistException(); + }; + } +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/PublisherSessionPrx.java b/slice2java/cpp/src/DataStorm/DataStormContract/PublisherSessionPrx.java new file mode 100644 index 000000000000..04625fc765fd --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/PublisherSessionPrx.java @@ -0,0 +1,176 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public interface PublisherSessionPrx extends SessionPrx +{ + /** + * Creates a new proxy that implements {@link PublisherSessionPrx}. + * @param communicator The communicator of the new proxy. + * @param proxyString The string representation of the proxy. + * @return The new proxy. + **/ + public static PublisherSessionPrx createProxy(com.zeroc.Ice.Communicator communicator, String proxyString) + { + return new _PublisherSessionPrxI(com.zeroc.Ice.ObjectPrx.createProxy(communicator, proxyString)); + } + + /** + * Contacts the remote server to verify that the object implements this type. + * Raises a local exception if a communication error occurs. + * @param obj The untyped proxy. + * @return A proxy for this type, or null if the object does not support this type. + **/ + static PublisherSessionPrx checkedCast(com.zeroc.Ice.ObjectPrx obj) + { + return checkedCast(obj, noExplicitContext); + } + + /** + * Contacts the remote server to verify that the object implements this type. + * Raises a local exception if a communication error occurs. + * @param obj The untyped proxy. + * @param context The Context map to send with the invocation. + * @return A proxy for this type, or null if the object does not support this type. + **/ + static PublisherSessionPrx checkedCast(com.zeroc.Ice.ObjectPrx obj, java.util.Map context) + { + return (obj != null && obj.ice_isA(ice_staticId(), context)) ? new _PublisherSessionPrxI(obj) : null; + } + + /** + * Contacts the remote server to verify that a facet of the object implements this type. + * Raises a local exception if a communication error occurs. + * @param obj The untyped proxy. + * @param facet The name of the desired facet. + * @return A proxy for this type, or null if the object does not support this type. + **/ + static PublisherSessionPrx checkedCast(com.zeroc.Ice.ObjectPrx obj, String facet) + { + return checkedCast(obj, facet, noExplicitContext); + } + + /** + * Contacts the remote server to verify that a facet of the object implements this type. + * Raises a local exception if a communication error occurs. + * @param obj The untyped proxy. + * @param facet The name of the desired facet. + * @param context The Context map to send with the invocation. + * @return A proxy for this type, or null if the object does not support this type. + **/ + static PublisherSessionPrx checkedCast(com.zeroc.Ice.ObjectPrx obj, String facet, java.util.Map context) + { + return (obj == null) ? null : checkedCast(obj.ice_facet(facet), context); + } + + /** + * Downcasts the given proxy to this type without contacting the remote server. + * @param obj The untyped proxy. + * @return A proxy for this type. + **/ + static PublisherSessionPrx uncheckedCast(com.zeroc.Ice.ObjectPrx obj) + { + return (obj == null) ? null : new _PublisherSessionPrxI(obj); + } + + /** + * Downcasts the given proxy to this type without contacting the remote server. + * @param obj The untyped proxy. + * @param facet The name of the desired facet. + * @return A proxy for this type. + **/ + static PublisherSessionPrx uncheckedCast(com.zeroc.Ice.ObjectPrx obj, String facet) + { + return (obj == null) ? null : new _PublisherSessionPrxI(obj.ice_facet(facet)); + } + + @Override + PublisherSessionPrx ice_context(java.util.Map newContext); + + @Override + PublisherSessionPrx ice_adapterId(String newAdapterId); + + @Override + PublisherSessionPrx ice_endpoints(com.zeroc.Ice.Endpoint[] newEndpoints); + + @Override + PublisherSessionPrx ice_locatorCacheTimeout(int newTimeout); + + @Override + PublisherSessionPrx ice_invocationTimeout(int newTimeout); + + @Override + PublisherSessionPrx ice_connectionCached(boolean newCache); + + @Override + PublisherSessionPrx ice_endpointSelection(com.zeroc.Ice.EndpointSelectionType newType); + + @Override + PublisherSessionPrx ice_secure(boolean b); + + @Override + PublisherSessionPrx ice_encodingVersion(com.zeroc.Ice.EncodingVersion e); + + @Override + PublisherSessionPrx ice_preferSecure(boolean b); + + @Override + PublisherSessionPrx ice_router(com.zeroc.Ice.RouterPrx router); + + @Override + PublisherSessionPrx ice_locator(com.zeroc.Ice.LocatorPrx locator); + + @Override + PublisherSessionPrx ice_collocationOptimized(boolean b); + + @Override + PublisherSessionPrx ice_twoway(); + + @Override + PublisherSessionPrx ice_oneway(); + + @Override + PublisherSessionPrx ice_batchOneway(); + + @Override + PublisherSessionPrx ice_datagram(); + + @Override + PublisherSessionPrx ice_batchDatagram(); + + @Override + PublisherSessionPrx ice_compress(boolean co); + + @Override + PublisherSessionPrx ice_connectionId(String connectionId); + + @Override + PublisherSessionPrx ice_fixed(com.zeroc.Ice.Connection connection); + + static String ice_staticId() + { + return "::DataStormContract::PublisherSession"; + } + + /** + * @hidden + **/ + @Override + default PublisherSessionPrx _newInstance(com.zeroc.Ice.Reference ref) + { + return new _PublisherSessionPrxI(ref); + } +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/Session.java b/slice2java/cpp/src/DataStorm/DataStormContract/Session.java new file mode 100644 index 000000000000..0534d91e7b39 --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/Session.java @@ -0,0 +1,251 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public interface Session extends com.zeroc.Ice.Object +{ + void announceTopics(TopicInfo[] topics, boolean initialize, com.zeroc.Ice.Current current); + + void attachTopic(TopicSpec topic, com.zeroc.Ice.Current current); + + void detachTopic(long topic, com.zeroc.Ice.Current current); + + void attachTags(long topic, ElementInfo[] tags, boolean initialize, com.zeroc.Ice.Current current); + + void detachTags(long topic, long[] tags, com.zeroc.Ice.Current current); + + void announceElements(long topic, ElementInfo[] keys, com.zeroc.Ice.Current current); + + void attachElements(long topic, ElementSpec[] elements, boolean initialize, com.zeroc.Ice.Current current); + + void attachElementsAck(long topic, ElementSpecAck[] elements, com.zeroc.Ice.Current current); + + void detachElements(long topic, long[] keys, com.zeroc.Ice.Current current); + + void initSamples(long topic, DataSamples[] samples, com.zeroc.Ice.Current current); + + void disconnected(com.zeroc.Ice.Current current); + + /** @hidden */ + static final String[] _iceIds = + { + "::DataStormContract::Session", + "::Ice::Object" + }; + + @Override + default String[] ice_ids(com.zeroc.Ice.Current current) + { + return _iceIds; + } + + @Override + default String ice_id(com.zeroc.Ice.Current current) + { + return ice_staticId(); + } + + static String ice_staticId() + { + return "::DataStormContract::Session"; + } + + /** @hidden */ + static java.util.concurrent.CompletionStage _iceD_announceTopics(Session obj, com.zeroc.Ice.IncomingRequest request) + { + com.zeroc.Ice.Object._iceCheckMode(null, request.current.mode); + com.zeroc.Ice.InputStream istr = request.inputStream; + istr.startEncapsulation(); + TopicInfo[] iceP_topics; + boolean iceP_initialize; + iceP_topics = TopicInfoSeqHelper.read(istr); + iceP_initialize = istr.readBool(); + istr.endEncapsulation(); + obj.announceTopics(iceP_topics, iceP_initialize, request.current); + return java.util.concurrent.CompletableFuture.completedFuture(request.current.createEmptyOutgoingResponse()); + } + + /** @hidden */ + static java.util.concurrent.CompletionStage _iceD_attachTopic(Session obj, com.zeroc.Ice.IncomingRequest request) + { + com.zeroc.Ice.Object._iceCheckMode(null, request.current.mode); + com.zeroc.Ice.InputStream istr = request.inputStream; + istr.startEncapsulation(); + TopicSpec iceP_topic; + iceP_topic = TopicSpec.ice_read(istr); + istr.endEncapsulation(); + obj.attachTopic(iceP_topic, request.current); + return java.util.concurrent.CompletableFuture.completedFuture(request.current.createEmptyOutgoingResponse()); + } + + /** @hidden */ + static java.util.concurrent.CompletionStage _iceD_detachTopic(Session obj, com.zeroc.Ice.IncomingRequest request) + { + com.zeroc.Ice.Object._iceCheckMode(null, request.current.mode); + com.zeroc.Ice.InputStream istr = request.inputStream; + istr.startEncapsulation(); + long iceP_topic; + iceP_topic = istr.readLong(); + istr.endEncapsulation(); + obj.detachTopic(iceP_topic, request.current); + return java.util.concurrent.CompletableFuture.completedFuture(request.current.createEmptyOutgoingResponse()); + } + + /** @hidden */ + static java.util.concurrent.CompletionStage _iceD_attachTags(Session obj, com.zeroc.Ice.IncomingRequest request) + { + com.zeroc.Ice.Object._iceCheckMode(null, request.current.mode); + com.zeroc.Ice.InputStream istr = request.inputStream; + istr.startEncapsulation(); + long iceP_topic; + ElementInfo[] iceP_tags; + boolean iceP_initialize; + iceP_topic = istr.readLong(); + iceP_tags = ElementInfoSeqHelper.read(istr); + iceP_initialize = istr.readBool(); + istr.endEncapsulation(); + obj.attachTags(iceP_topic, iceP_tags, iceP_initialize, request.current); + return java.util.concurrent.CompletableFuture.completedFuture(request.current.createEmptyOutgoingResponse()); + } + + /** @hidden */ + static java.util.concurrent.CompletionStage _iceD_detachTags(Session obj, com.zeroc.Ice.IncomingRequest request) + { + com.zeroc.Ice.Object._iceCheckMode(null, request.current.mode); + com.zeroc.Ice.InputStream istr = request.inputStream; + istr.startEncapsulation(); + long iceP_topic; + long[] iceP_tags; + iceP_topic = istr.readLong(); + iceP_tags = istr.readLongSeq(); + istr.endEncapsulation(); + obj.detachTags(iceP_topic, iceP_tags, request.current); + return java.util.concurrent.CompletableFuture.completedFuture(request.current.createEmptyOutgoingResponse()); + } + + /** @hidden */ + static java.util.concurrent.CompletionStage _iceD_announceElements(Session obj, com.zeroc.Ice.IncomingRequest request) + { + com.zeroc.Ice.Object._iceCheckMode(null, request.current.mode); + com.zeroc.Ice.InputStream istr = request.inputStream; + istr.startEncapsulation(); + long iceP_topic; + ElementInfo[] iceP_keys; + iceP_topic = istr.readLong(); + iceP_keys = ElementInfoSeqHelper.read(istr); + istr.endEncapsulation(); + obj.announceElements(iceP_topic, iceP_keys, request.current); + return java.util.concurrent.CompletableFuture.completedFuture(request.current.createEmptyOutgoingResponse()); + } + + /** @hidden */ + static java.util.concurrent.CompletionStage _iceD_attachElements(Session obj, com.zeroc.Ice.IncomingRequest request) + { + com.zeroc.Ice.Object._iceCheckMode(null, request.current.mode); + com.zeroc.Ice.InputStream istr = request.inputStream; + istr.startEncapsulation(); + long iceP_topic; + ElementSpec[] iceP_elements; + boolean iceP_initialize; + iceP_topic = istr.readLong(); + iceP_elements = ElementSpecSeqHelper.read(istr); + iceP_initialize = istr.readBool(); + istr.readPendingValues(); + istr.endEncapsulation(); + obj.attachElements(iceP_topic, iceP_elements, iceP_initialize, request.current); + return java.util.concurrent.CompletableFuture.completedFuture(request.current.createEmptyOutgoingResponse()); + } + + /** @hidden */ + static java.util.concurrent.CompletionStage _iceD_attachElementsAck(Session obj, com.zeroc.Ice.IncomingRequest request) + { + com.zeroc.Ice.Object._iceCheckMode(null, request.current.mode); + com.zeroc.Ice.InputStream istr = request.inputStream; + istr.startEncapsulation(); + long iceP_topic; + ElementSpecAck[] iceP_elements; + iceP_topic = istr.readLong(); + iceP_elements = ElementSpecAckSeqHelper.read(istr); + istr.readPendingValues(); + istr.endEncapsulation(); + obj.attachElementsAck(iceP_topic, iceP_elements, request.current); + return java.util.concurrent.CompletableFuture.completedFuture(request.current.createEmptyOutgoingResponse()); + } + + /** @hidden */ + static java.util.concurrent.CompletionStage _iceD_detachElements(Session obj, com.zeroc.Ice.IncomingRequest request) + { + com.zeroc.Ice.Object._iceCheckMode(null, request.current.mode); + com.zeroc.Ice.InputStream istr = request.inputStream; + istr.startEncapsulation(); + long iceP_topic; + long[] iceP_keys; + iceP_topic = istr.readLong(); + iceP_keys = istr.readLongSeq(); + istr.endEncapsulation(); + obj.detachElements(iceP_topic, iceP_keys, request.current); + return java.util.concurrent.CompletableFuture.completedFuture(request.current.createEmptyOutgoingResponse()); + } + + /** @hidden */ + static java.util.concurrent.CompletionStage _iceD_initSamples(Session obj, com.zeroc.Ice.IncomingRequest request) + { + com.zeroc.Ice.Object._iceCheckMode(null, request.current.mode); + com.zeroc.Ice.InputStream istr = request.inputStream; + istr.startEncapsulation(); + long iceP_topic; + DataSamples[] iceP_samples; + iceP_topic = istr.readLong(); + iceP_samples = DataSamplesSeqHelper.read(istr); + istr.endEncapsulation(); + obj.initSamples(iceP_topic, iceP_samples, request.current); + return java.util.concurrent.CompletableFuture.completedFuture(request.current.createEmptyOutgoingResponse()); + } + + /** @hidden */ + static java.util.concurrent.CompletionStage _iceD_disconnected(Session obj, com.zeroc.Ice.IncomingRequest request) + { + com.zeroc.Ice.Object._iceCheckMode(null, request.current.mode); + request.inputStream.skipEmptyEncapsulation(); + obj.disconnected(request.current); + return java.util.concurrent.CompletableFuture.completedFuture(request.current.createEmptyOutgoingResponse()); + } + + @Override + default java.util.concurrent.CompletionStage dispatch(com.zeroc.Ice.IncomingRequest request) + throws com.zeroc.Ice.UserException + { + return switch (request.current.operation) + { + case "announceTopics" -> Session._iceD_announceTopics(this, request); + case "attachTopic" -> Session._iceD_attachTopic(this, request); + case "detachTopic" -> Session._iceD_detachTopic(this, request); + case "attachTags" -> Session._iceD_attachTags(this, request); + case "detachTags" -> Session._iceD_detachTags(this, request); + case "announceElements" -> Session._iceD_announceElements(this, request); + case "attachElements" -> Session._iceD_attachElements(this, request); + case "attachElementsAck" -> Session._iceD_attachElementsAck(this, request); + case "detachElements" -> Session._iceD_detachElements(this, request); + case "initSamples" -> Session._iceD_initSamples(this, request); + case "disconnected" -> Session._iceD_disconnected(this, request); + case "ice_id" -> com.zeroc.Ice.Object._iceD_ice_id(this, request); + case "ice_ids" -> com.zeroc.Ice.Object._iceD_ice_ids(this, request); + case "ice_isA" -> com.zeroc.Ice.Object._iceD_ice_isA(this, request); + case "ice_ping" -> com.zeroc.Ice.Object._iceD_ice_ping(this, request); + default -> throw new com.zeroc.Ice.OperationNotExistException(); + }; + } +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/SessionPrx.java b/slice2java/cpp/src/DataStorm/DataStormContract/SessionPrx.java new file mode 100644 index 000000000000..064fa390da8e --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/SessionPrx.java @@ -0,0 +1,591 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public interface SessionPrx extends com.zeroc.Ice.ObjectPrx +{ + default void announceTopics(TopicInfo[] topics, boolean initialize) + { + announceTopics(topics, initialize, com.zeroc.Ice.ObjectPrx.noExplicitContext); + } + + default void announceTopics(TopicInfo[] topics, boolean initialize, java.util.Map context) + { + _iceI_announceTopicsAsync(topics, initialize, context, true).waitForResponse(); + } + + default java.util.concurrent.CompletableFuture announceTopicsAsync(TopicInfo[] topics, boolean initialize) + { + return _iceI_announceTopicsAsync(topics, initialize, com.zeroc.Ice.ObjectPrx.noExplicitContext, false); + } + + default java.util.concurrent.CompletableFuture announceTopicsAsync(TopicInfo[] topics, boolean initialize, java.util.Map context) + { + return _iceI_announceTopicsAsync(topics, initialize, context, false); + } + + /** + * @hidden + * @param iceP_topics - + * @param iceP_initialize - + * @param context - + * @param sync - + * @return - + **/ + default com.zeroc.Ice.OutgoingAsync _iceI_announceTopicsAsync(TopicInfo[] iceP_topics, boolean iceP_initialize, java.util.Map context, boolean sync) + { + com.zeroc.Ice.OutgoingAsync f = new com.zeroc.Ice.OutgoingAsync<>(this, "announceTopics", null, sync, null); + f.invoke(false, context, null, ostr -> { + TopicInfoSeqHelper.write(ostr, iceP_topics); + ostr.writeBool(iceP_initialize); + }, null); + return f; + } + + default void attachTopic(TopicSpec topic) + { + attachTopic(topic, com.zeroc.Ice.ObjectPrx.noExplicitContext); + } + + default void attachTopic(TopicSpec topic, java.util.Map context) + { + _iceI_attachTopicAsync(topic, context, true).waitForResponse(); + } + + default java.util.concurrent.CompletableFuture attachTopicAsync(TopicSpec topic) + { + return _iceI_attachTopicAsync(topic, com.zeroc.Ice.ObjectPrx.noExplicitContext, false); + } + + default java.util.concurrent.CompletableFuture attachTopicAsync(TopicSpec topic, java.util.Map context) + { + return _iceI_attachTopicAsync(topic, context, false); + } + + /** + * @hidden + * @param iceP_topic - + * @param context - + * @param sync - + * @return - + **/ + default com.zeroc.Ice.OutgoingAsync _iceI_attachTopicAsync(TopicSpec iceP_topic, java.util.Map context, boolean sync) + { + com.zeroc.Ice.OutgoingAsync f = new com.zeroc.Ice.OutgoingAsync<>(this, "attachTopic", null, sync, null); + f.invoke(false, context, null, ostr -> { + TopicSpec.ice_write(ostr, iceP_topic); + }, null); + return f; + } + + default void detachTopic(long topic) + { + detachTopic(topic, com.zeroc.Ice.ObjectPrx.noExplicitContext); + } + + default void detachTopic(long topic, java.util.Map context) + { + _iceI_detachTopicAsync(topic, context, true).waitForResponse(); + } + + default java.util.concurrent.CompletableFuture detachTopicAsync(long topic) + { + return _iceI_detachTopicAsync(topic, com.zeroc.Ice.ObjectPrx.noExplicitContext, false); + } + + default java.util.concurrent.CompletableFuture detachTopicAsync(long topic, java.util.Map context) + { + return _iceI_detachTopicAsync(topic, context, false); + } + + /** + * @hidden + * @param iceP_topic - + * @param context - + * @param sync - + * @return - + **/ + default com.zeroc.Ice.OutgoingAsync _iceI_detachTopicAsync(long iceP_topic, java.util.Map context, boolean sync) + { + com.zeroc.Ice.OutgoingAsync f = new com.zeroc.Ice.OutgoingAsync<>(this, "detachTopic", null, sync, null); + f.invoke(false, context, null, ostr -> { + ostr.writeLong(iceP_topic); + }, null); + return f; + } + + default void attachTags(long topic, ElementInfo[] tags, boolean initialize) + { + attachTags(topic, tags, initialize, com.zeroc.Ice.ObjectPrx.noExplicitContext); + } + + default void attachTags(long topic, ElementInfo[] tags, boolean initialize, java.util.Map context) + { + _iceI_attachTagsAsync(topic, tags, initialize, context, true).waitForResponse(); + } + + default java.util.concurrent.CompletableFuture attachTagsAsync(long topic, ElementInfo[] tags, boolean initialize) + { + return _iceI_attachTagsAsync(topic, tags, initialize, com.zeroc.Ice.ObjectPrx.noExplicitContext, false); + } + + default java.util.concurrent.CompletableFuture attachTagsAsync(long topic, ElementInfo[] tags, boolean initialize, java.util.Map context) + { + return _iceI_attachTagsAsync(topic, tags, initialize, context, false); + } + + /** + * @hidden + * @param iceP_topic - + * @param iceP_tags - + * @param iceP_initialize - + * @param context - + * @param sync - + * @return - + **/ + default com.zeroc.Ice.OutgoingAsync _iceI_attachTagsAsync(long iceP_topic, ElementInfo[] iceP_tags, boolean iceP_initialize, java.util.Map context, boolean sync) + { + com.zeroc.Ice.OutgoingAsync f = new com.zeroc.Ice.OutgoingAsync<>(this, "attachTags", null, sync, null); + f.invoke(false, context, null, ostr -> { + ostr.writeLong(iceP_topic); + ElementInfoSeqHelper.write(ostr, iceP_tags); + ostr.writeBool(iceP_initialize); + }, null); + return f; + } + + default void detachTags(long topic, long[] tags) + { + detachTags(topic, tags, com.zeroc.Ice.ObjectPrx.noExplicitContext); + } + + default void detachTags(long topic, long[] tags, java.util.Map context) + { + _iceI_detachTagsAsync(topic, tags, context, true).waitForResponse(); + } + + default java.util.concurrent.CompletableFuture detachTagsAsync(long topic, long[] tags) + { + return _iceI_detachTagsAsync(topic, tags, com.zeroc.Ice.ObjectPrx.noExplicitContext, false); + } + + default java.util.concurrent.CompletableFuture detachTagsAsync(long topic, long[] tags, java.util.Map context) + { + return _iceI_detachTagsAsync(topic, tags, context, false); + } + + /** + * @hidden + * @param iceP_topic - + * @param iceP_tags - + * @param context - + * @param sync - + * @return - + **/ + default com.zeroc.Ice.OutgoingAsync _iceI_detachTagsAsync(long iceP_topic, long[] iceP_tags, java.util.Map context, boolean sync) + { + com.zeroc.Ice.OutgoingAsync f = new com.zeroc.Ice.OutgoingAsync<>(this, "detachTags", null, sync, null); + f.invoke(false, context, null, ostr -> { + ostr.writeLong(iceP_topic); + ostr.writeLongSeq(iceP_tags); + }, null); + return f; + } + + default void announceElements(long topic, ElementInfo[] keys) + { + announceElements(topic, keys, com.zeroc.Ice.ObjectPrx.noExplicitContext); + } + + default void announceElements(long topic, ElementInfo[] keys, java.util.Map context) + { + _iceI_announceElementsAsync(topic, keys, context, true).waitForResponse(); + } + + default java.util.concurrent.CompletableFuture announceElementsAsync(long topic, ElementInfo[] keys) + { + return _iceI_announceElementsAsync(topic, keys, com.zeroc.Ice.ObjectPrx.noExplicitContext, false); + } + + default java.util.concurrent.CompletableFuture announceElementsAsync(long topic, ElementInfo[] keys, java.util.Map context) + { + return _iceI_announceElementsAsync(topic, keys, context, false); + } + + /** + * @hidden + * @param iceP_topic - + * @param iceP_keys - + * @param context - + * @param sync - + * @return - + **/ + default com.zeroc.Ice.OutgoingAsync _iceI_announceElementsAsync(long iceP_topic, ElementInfo[] iceP_keys, java.util.Map context, boolean sync) + { + com.zeroc.Ice.OutgoingAsync f = new com.zeroc.Ice.OutgoingAsync<>(this, "announceElements", null, sync, null); + f.invoke(false, context, null, ostr -> { + ostr.writeLong(iceP_topic); + ElementInfoSeqHelper.write(ostr, iceP_keys); + }, null); + return f; + } + + default void attachElements(long topic, ElementSpec[] elements, boolean initialize) + { + attachElements(topic, elements, initialize, com.zeroc.Ice.ObjectPrx.noExplicitContext); + } + + default void attachElements(long topic, ElementSpec[] elements, boolean initialize, java.util.Map context) + { + _iceI_attachElementsAsync(topic, elements, initialize, context, true).waitForResponse(); + } + + default java.util.concurrent.CompletableFuture attachElementsAsync(long topic, ElementSpec[] elements, boolean initialize) + { + return _iceI_attachElementsAsync(topic, elements, initialize, com.zeroc.Ice.ObjectPrx.noExplicitContext, false); + } + + default java.util.concurrent.CompletableFuture attachElementsAsync(long topic, ElementSpec[] elements, boolean initialize, java.util.Map context) + { + return _iceI_attachElementsAsync(topic, elements, initialize, context, false); + } + + /** + * @hidden + * @param iceP_topic - + * @param iceP_elements - + * @param iceP_initialize - + * @param context - + * @param sync - + * @return - + **/ + default com.zeroc.Ice.OutgoingAsync _iceI_attachElementsAsync(long iceP_topic, ElementSpec[] iceP_elements, boolean iceP_initialize, java.util.Map context, boolean sync) + { + com.zeroc.Ice.OutgoingAsync f = new com.zeroc.Ice.OutgoingAsync<>(this, "attachElements", null, sync, null); + f.invoke(false, context, null, ostr -> { + ostr.writeLong(iceP_topic); + ElementSpecSeqHelper.write(ostr, iceP_elements); + ostr.writeBool(iceP_initialize); + ostr.writePendingValues(); + }, null); + return f; + } + + default void attachElementsAck(long topic, ElementSpecAck[] elements) + { + attachElementsAck(topic, elements, com.zeroc.Ice.ObjectPrx.noExplicitContext); + } + + default void attachElementsAck(long topic, ElementSpecAck[] elements, java.util.Map context) + { + _iceI_attachElementsAckAsync(topic, elements, context, true).waitForResponse(); + } + + default java.util.concurrent.CompletableFuture attachElementsAckAsync(long topic, ElementSpecAck[] elements) + { + return _iceI_attachElementsAckAsync(topic, elements, com.zeroc.Ice.ObjectPrx.noExplicitContext, false); + } + + default java.util.concurrent.CompletableFuture attachElementsAckAsync(long topic, ElementSpecAck[] elements, java.util.Map context) + { + return _iceI_attachElementsAckAsync(topic, elements, context, false); + } + + /** + * @hidden + * @param iceP_topic - + * @param iceP_elements - + * @param context - + * @param sync - + * @return - + **/ + default com.zeroc.Ice.OutgoingAsync _iceI_attachElementsAckAsync(long iceP_topic, ElementSpecAck[] iceP_elements, java.util.Map context, boolean sync) + { + com.zeroc.Ice.OutgoingAsync f = new com.zeroc.Ice.OutgoingAsync<>(this, "attachElementsAck", null, sync, null); + f.invoke(false, context, null, ostr -> { + ostr.writeLong(iceP_topic); + ElementSpecAckSeqHelper.write(ostr, iceP_elements); + ostr.writePendingValues(); + }, null); + return f; + } + + default void detachElements(long topic, long[] keys) + { + detachElements(topic, keys, com.zeroc.Ice.ObjectPrx.noExplicitContext); + } + + default void detachElements(long topic, long[] keys, java.util.Map context) + { + _iceI_detachElementsAsync(topic, keys, context, true).waitForResponse(); + } + + default java.util.concurrent.CompletableFuture detachElementsAsync(long topic, long[] keys) + { + return _iceI_detachElementsAsync(topic, keys, com.zeroc.Ice.ObjectPrx.noExplicitContext, false); + } + + default java.util.concurrent.CompletableFuture detachElementsAsync(long topic, long[] keys, java.util.Map context) + { + return _iceI_detachElementsAsync(topic, keys, context, false); + } + + /** + * @hidden + * @param iceP_topic - + * @param iceP_keys - + * @param context - + * @param sync - + * @return - + **/ + default com.zeroc.Ice.OutgoingAsync _iceI_detachElementsAsync(long iceP_topic, long[] iceP_keys, java.util.Map context, boolean sync) + { + com.zeroc.Ice.OutgoingAsync f = new com.zeroc.Ice.OutgoingAsync<>(this, "detachElements", null, sync, null); + f.invoke(false, context, null, ostr -> { + ostr.writeLong(iceP_topic); + ostr.writeLongSeq(iceP_keys); + }, null); + return f; + } + + default void initSamples(long topic, DataSamples[] samples) + { + initSamples(topic, samples, com.zeroc.Ice.ObjectPrx.noExplicitContext); + } + + default void initSamples(long topic, DataSamples[] samples, java.util.Map context) + { + _iceI_initSamplesAsync(topic, samples, context, true).waitForResponse(); + } + + default java.util.concurrent.CompletableFuture initSamplesAsync(long topic, DataSamples[] samples) + { + return _iceI_initSamplesAsync(topic, samples, com.zeroc.Ice.ObjectPrx.noExplicitContext, false); + } + + default java.util.concurrent.CompletableFuture initSamplesAsync(long topic, DataSamples[] samples, java.util.Map context) + { + return _iceI_initSamplesAsync(topic, samples, context, false); + } + + /** + * @hidden + * @param iceP_topic - + * @param iceP_samples - + * @param context - + * @param sync - + * @return - + **/ + default com.zeroc.Ice.OutgoingAsync _iceI_initSamplesAsync(long iceP_topic, DataSamples[] iceP_samples, java.util.Map context, boolean sync) + { + com.zeroc.Ice.OutgoingAsync f = new com.zeroc.Ice.OutgoingAsync<>(this, "initSamples", null, sync, null); + f.invoke(false, context, null, ostr -> { + ostr.writeLong(iceP_topic); + DataSamplesSeqHelper.write(ostr, iceP_samples); + }, null); + return f; + } + + default void disconnected() + { + disconnected(com.zeroc.Ice.ObjectPrx.noExplicitContext); + } + + default void disconnected(java.util.Map context) + { + _iceI_disconnectedAsync(context, true).waitForResponse(); + } + + default java.util.concurrent.CompletableFuture disconnectedAsync() + { + return _iceI_disconnectedAsync(com.zeroc.Ice.ObjectPrx.noExplicitContext, false); + } + + default java.util.concurrent.CompletableFuture disconnectedAsync(java.util.Map context) + { + return _iceI_disconnectedAsync(context, false); + } + + /** + * @hidden + * @param context - + * @param sync - + * @return - + **/ + default com.zeroc.Ice.OutgoingAsync _iceI_disconnectedAsync(java.util.Map context, boolean sync) + { + com.zeroc.Ice.OutgoingAsync f = new com.zeroc.Ice.OutgoingAsync<>(this, "disconnected", null, sync, null); + f.invoke(false, context, null, null, null); + return f; + } + + /** + * Creates a new proxy that implements {@link SessionPrx}. + * @param communicator The communicator of the new proxy. + * @param proxyString The string representation of the proxy. + * @return The new proxy. + **/ + public static SessionPrx createProxy(com.zeroc.Ice.Communicator communicator, String proxyString) + { + return new _SessionPrxI(com.zeroc.Ice.ObjectPrx.createProxy(communicator, proxyString)); + } + + /** + * Contacts the remote server to verify that the object implements this type. + * Raises a local exception if a communication error occurs. + * @param obj The untyped proxy. + * @return A proxy for this type, or null if the object does not support this type. + **/ + static SessionPrx checkedCast(com.zeroc.Ice.ObjectPrx obj) + { + return checkedCast(obj, noExplicitContext); + } + + /** + * Contacts the remote server to verify that the object implements this type. + * Raises a local exception if a communication error occurs. + * @param obj The untyped proxy. + * @param context The Context map to send with the invocation. + * @return A proxy for this type, or null if the object does not support this type. + **/ + static SessionPrx checkedCast(com.zeroc.Ice.ObjectPrx obj, java.util.Map context) + { + return (obj != null && obj.ice_isA(ice_staticId(), context)) ? new _SessionPrxI(obj) : null; + } + + /** + * Contacts the remote server to verify that a facet of the object implements this type. + * Raises a local exception if a communication error occurs. + * @param obj The untyped proxy. + * @param facet The name of the desired facet. + * @return A proxy for this type, or null if the object does not support this type. + **/ + static SessionPrx checkedCast(com.zeroc.Ice.ObjectPrx obj, String facet) + { + return checkedCast(obj, facet, noExplicitContext); + } + + /** + * Contacts the remote server to verify that a facet of the object implements this type. + * Raises a local exception if a communication error occurs. + * @param obj The untyped proxy. + * @param facet The name of the desired facet. + * @param context The Context map to send with the invocation. + * @return A proxy for this type, or null if the object does not support this type. + **/ + static SessionPrx checkedCast(com.zeroc.Ice.ObjectPrx obj, String facet, java.util.Map context) + { + return (obj == null) ? null : checkedCast(obj.ice_facet(facet), context); + } + + /** + * Downcasts the given proxy to this type without contacting the remote server. + * @param obj The untyped proxy. + * @return A proxy for this type. + **/ + static SessionPrx uncheckedCast(com.zeroc.Ice.ObjectPrx obj) + { + return (obj == null) ? null : new _SessionPrxI(obj); + } + + /** + * Downcasts the given proxy to this type without contacting the remote server. + * @param obj The untyped proxy. + * @param facet The name of the desired facet. + * @return A proxy for this type. + **/ + static SessionPrx uncheckedCast(com.zeroc.Ice.ObjectPrx obj, String facet) + { + return (obj == null) ? null : new _SessionPrxI(obj.ice_facet(facet)); + } + + @Override + SessionPrx ice_context(java.util.Map newContext); + + @Override + SessionPrx ice_adapterId(String newAdapterId); + + @Override + SessionPrx ice_endpoints(com.zeroc.Ice.Endpoint[] newEndpoints); + + @Override + SessionPrx ice_locatorCacheTimeout(int newTimeout); + + @Override + SessionPrx ice_invocationTimeout(int newTimeout); + + @Override + SessionPrx ice_connectionCached(boolean newCache); + + @Override + SessionPrx ice_endpointSelection(com.zeroc.Ice.EndpointSelectionType newType); + + @Override + SessionPrx ice_secure(boolean b); + + @Override + SessionPrx ice_encodingVersion(com.zeroc.Ice.EncodingVersion e); + + @Override + SessionPrx ice_preferSecure(boolean b); + + @Override + SessionPrx ice_router(com.zeroc.Ice.RouterPrx router); + + @Override + SessionPrx ice_locator(com.zeroc.Ice.LocatorPrx locator); + + @Override + SessionPrx ice_collocationOptimized(boolean b); + + @Override + SessionPrx ice_twoway(); + + @Override + SessionPrx ice_oneway(); + + @Override + SessionPrx ice_batchOneway(); + + @Override + SessionPrx ice_datagram(); + + @Override + SessionPrx ice_batchDatagram(); + + @Override + SessionPrx ice_compress(boolean co); + + @Override + SessionPrx ice_connectionId(String connectionId); + + @Override + SessionPrx ice_fixed(com.zeroc.Ice.Connection connection); + + static String ice_staticId() + { + return "::DataStormContract::Session"; + } + + /** + * @hidden + **/ + @Override + default SessionPrx _newInstance(com.zeroc.Ice.Reference ref) + { + return new _SessionPrxI(ref); + } +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/SubscriberSession.java b/slice2java/cpp/src/DataStorm/DataStormContract/SubscriberSession.java new file mode 100644 index 000000000000..ab9650c69670 --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/SubscriberSession.java @@ -0,0 +1,89 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public interface SubscriberSession extends Session +{ + void s(long topicId, long elementId, DataSample sample, com.zeroc.Ice.Current current); + + /** @hidden */ + static final String[] _iceIds = + { + "::DataStormContract::Session", + "::DataStormContract::SubscriberSession", + "::Ice::Object" + }; + + @Override + default String[] ice_ids(com.zeroc.Ice.Current current) + { + return _iceIds; + } + + @Override + default String ice_id(com.zeroc.Ice.Current current) + { + return ice_staticId(); + } + + static String ice_staticId() + { + return "::DataStormContract::SubscriberSession"; + } + + /** @hidden */ + static java.util.concurrent.CompletionStage _iceD_s(SubscriberSession obj, com.zeroc.Ice.IncomingRequest request) + { + com.zeroc.Ice.Object._iceCheckMode(null, request.current.mode); + com.zeroc.Ice.InputStream istr = request.inputStream; + istr.startEncapsulation(); + long iceP_topicId; + long iceP_elementId; + DataSample iceP_sample; + iceP_topicId = istr.readLong(); + iceP_elementId = istr.readLong(); + iceP_sample = DataSample.ice_read(istr); + istr.endEncapsulation(); + obj.s(iceP_topicId, iceP_elementId, iceP_sample, request.current); + return java.util.concurrent.CompletableFuture.completedFuture(request.current.createEmptyOutgoingResponse()); + } + + @Override + default java.util.concurrent.CompletionStage dispatch(com.zeroc.Ice.IncomingRequest request) + throws com.zeroc.Ice.UserException + { + return switch (request.current.operation) + { + case "announceTopics" -> Session._iceD_announceTopics(this, request); + case "attachTopic" -> Session._iceD_attachTopic(this, request); + case "detachTopic" -> Session._iceD_detachTopic(this, request); + case "attachTags" -> Session._iceD_attachTags(this, request); + case "detachTags" -> Session._iceD_detachTags(this, request); + case "announceElements" -> Session._iceD_announceElements(this, request); + case "attachElements" -> Session._iceD_attachElements(this, request); + case "attachElementsAck" -> Session._iceD_attachElementsAck(this, request); + case "detachElements" -> Session._iceD_detachElements(this, request); + case "initSamples" -> Session._iceD_initSamples(this, request); + case "disconnected" -> Session._iceD_disconnected(this, request); + case "s" -> SubscriberSession._iceD_s(this, request); + case "ice_id" -> com.zeroc.Ice.Object._iceD_ice_id(this, request); + case "ice_ids" -> com.zeroc.Ice.Object._iceD_ice_ids(this, request); + case "ice_isA" -> com.zeroc.Ice.Object._iceD_ice_isA(this, request); + case "ice_ping" -> com.zeroc.Ice.Object._iceD_ice_ping(this, request); + default -> throw new com.zeroc.Ice.OperationNotExistException(); + }; + } +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/SubscriberSessionPrx.java b/slice2java/cpp/src/DataStorm/DataStormContract/SubscriberSessionPrx.java new file mode 100644 index 000000000000..adff26808bc9 --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/SubscriberSessionPrx.java @@ -0,0 +1,216 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public interface SubscriberSessionPrx extends SessionPrx +{ + default void s(long topicId, long elementId, DataSample sample) + { + s(topicId, elementId, sample, com.zeroc.Ice.ObjectPrx.noExplicitContext); + } + + default void s(long topicId, long elementId, DataSample sample, java.util.Map context) + { + _iceI_sAsync(topicId, elementId, sample, context, true).waitForResponse(); + } + + default java.util.concurrent.CompletableFuture sAsync(long topicId, long elementId, DataSample sample) + { + return _iceI_sAsync(topicId, elementId, sample, com.zeroc.Ice.ObjectPrx.noExplicitContext, false); + } + + default java.util.concurrent.CompletableFuture sAsync(long topicId, long elementId, DataSample sample, java.util.Map context) + { + return _iceI_sAsync(topicId, elementId, sample, context, false); + } + + /** + * @hidden + * @param iceP_topicId - + * @param iceP_elementId - + * @param iceP_sample - + * @param context - + * @param sync - + * @return - + **/ + default com.zeroc.Ice.OutgoingAsync _iceI_sAsync(long iceP_topicId, long iceP_elementId, DataSample iceP_sample, java.util.Map context, boolean sync) + { + com.zeroc.Ice.OutgoingAsync f = new com.zeroc.Ice.OutgoingAsync<>(this, "s", null, sync, null); + f.invoke(false, context, null, ostr -> { + ostr.writeLong(iceP_topicId); + ostr.writeLong(iceP_elementId); + DataSample.ice_write(ostr, iceP_sample); + }, null); + return f; + } + + /** + * Creates a new proxy that implements {@link SubscriberSessionPrx}. + * @param communicator The communicator of the new proxy. + * @param proxyString The string representation of the proxy. + * @return The new proxy. + **/ + public static SubscriberSessionPrx createProxy(com.zeroc.Ice.Communicator communicator, String proxyString) + { + return new _SubscriberSessionPrxI(com.zeroc.Ice.ObjectPrx.createProxy(communicator, proxyString)); + } + + /** + * Contacts the remote server to verify that the object implements this type. + * Raises a local exception if a communication error occurs. + * @param obj The untyped proxy. + * @return A proxy for this type, or null if the object does not support this type. + **/ + static SubscriberSessionPrx checkedCast(com.zeroc.Ice.ObjectPrx obj) + { + return checkedCast(obj, noExplicitContext); + } + + /** + * Contacts the remote server to verify that the object implements this type. + * Raises a local exception if a communication error occurs. + * @param obj The untyped proxy. + * @param context The Context map to send with the invocation. + * @return A proxy for this type, or null if the object does not support this type. + **/ + static SubscriberSessionPrx checkedCast(com.zeroc.Ice.ObjectPrx obj, java.util.Map context) + { + return (obj != null && obj.ice_isA(ice_staticId(), context)) ? new _SubscriberSessionPrxI(obj) : null; + } + + /** + * Contacts the remote server to verify that a facet of the object implements this type. + * Raises a local exception if a communication error occurs. + * @param obj The untyped proxy. + * @param facet The name of the desired facet. + * @return A proxy for this type, or null if the object does not support this type. + **/ + static SubscriberSessionPrx checkedCast(com.zeroc.Ice.ObjectPrx obj, String facet) + { + return checkedCast(obj, facet, noExplicitContext); + } + + /** + * Contacts the remote server to verify that a facet of the object implements this type. + * Raises a local exception if a communication error occurs. + * @param obj The untyped proxy. + * @param facet The name of the desired facet. + * @param context The Context map to send with the invocation. + * @return A proxy for this type, or null if the object does not support this type. + **/ + static SubscriberSessionPrx checkedCast(com.zeroc.Ice.ObjectPrx obj, String facet, java.util.Map context) + { + return (obj == null) ? null : checkedCast(obj.ice_facet(facet), context); + } + + /** + * Downcasts the given proxy to this type without contacting the remote server. + * @param obj The untyped proxy. + * @return A proxy for this type. + **/ + static SubscriberSessionPrx uncheckedCast(com.zeroc.Ice.ObjectPrx obj) + { + return (obj == null) ? null : new _SubscriberSessionPrxI(obj); + } + + /** + * Downcasts the given proxy to this type without contacting the remote server. + * @param obj The untyped proxy. + * @param facet The name of the desired facet. + * @return A proxy for this type. + **/ + static SubscriberSessionPrx uncheckedCast(com.zeroc.Ice.ObjectPrx obj, String facet) + { + return (obj == null) ? null : new _SubscriberSessionPrxI(obj.ice_facet(facet)); + } + + @Override + SubscriberSessionPrx ice_context(java.util.Map newContext); + + @Override + SubscriberSessionPrx ice_adapterId(String newAdapterId); + + @Override + SubscriberSessionPrx ice_endpoints(com.zeroc.Ice.Endpoint[] newEndpoints); + + @Override + SubscriberSessionPrx ice_locatorCacheTimeout(int newTimeout); + + @Override + SubscriberSessionPrx ice_invocationTimeout(int newTimeout); + + @Override + SubscriberSessionPrx ice_connectionCached(boolean newCache); + + @Override + SubscriberSessionPrx ice_endpointSelection(com.zeroc.Ice.EndpointSelectionType newType); + + @Override + SubscriberSessionPrx ice_secure(boolean b); + + @Override + SubscriberSessionPrx ice_encodingVersion(com.zeroc.Ice.EncodingVersion e); + + @Override + SubscriberSessionPrx ice_preferSecure(boolean b); + + @Override + SubscriberSessionPrx ice_router(com.zeroc.Ice.RouterPrx router); + + @Override + SubscriberSessionPrx ice_locator(com.zeroc.Ice.LocatorPrx locator); + + @Override + SubscriberSessionPrx ice_collocationOptimized(boolean b); + + @Override + SubscriberSessionPrx ice_twoway(); + + @Override + SubscriberSessionPrx ice_oneway(); + + @Override + SubscriberSessionPrx ice_batchOneway(); + + @Override + SubscriberSessionPrx ice_datagram(); + + @Override + SubscriberSessionPrx ice_batchDatagram(); + + @Override + SubscriberSessionPrx ice_compress(boolean co); + + @Override + SubscriberSessionPrx ice_connectionId(String connectionId); + + @Override + SubscriberSessionPrx ice_fixed(com.zeroc.Ice.Connection connection); + + static String ice_staticId() + { + return "::DataStormContract::SubscriberSession"; + } + + /** + * @hidden + **/ + @Override + default SubscriberSessionPrx _newInstance(com.zeroc.Ice.Reference ref) + { + return new _SubscriberSessionPrxI(ref); + } +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java b/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java new file mode 100644 index 000000000000..14681250525a --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java @@ -0,0 +1,163 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public class TopicInfo implements java.lang.Cloneable, + java.io.Serializable +{ + /** + * The topic name. + **/ + public String name; + + /** + * The id of topic writers or readers. + **/ + public long[] ids; + + public TopicInfo() + { + this.name = ""; + } + + public TopicInfo(String name, long[] ids) + { + this.name = name; + this.ids = ids; + } + + public boolean equals(java.lang.Object rhs) + { + if(this == rhs) + { + return true; + } + TopicInfo r = null; + if(rhs instanceof TopicInfo) + { + r = (TopicInfo)rhs; + } + + if(r != null) + { + if(this.name != r.name) + { + if(this.name == null || r.name == null || !this.name.equals(r.name)) + { + return false; + } + } + if(!java.util.Arrays.equals(this.ids, r.ids)) + { + return false; + } + + return true; + } + + return false; + } + + public int hashCode() + { + int h_ = 5381; + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, "::DataStormContract::TopicInfo"); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, name); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, ids); + return h_; + } + + public TopicInfo clone() + { + TopicInfo c = null; + try + { + c = (TopicInfo)super.clone(); + } + catch(CloneNotSupportedException ex) + { + assert false; // impossible + } + return c; + } + + public void ice_writeMembers(com.zeroc.Ice.OutputStream ostr) + { + ostr.writeString(this.name); + ostr.writeLongSeq(this.ids); + } + + public void ice_readMembers(com.zeroc.Ice.InputStream istr) + { + this.name = istr.readString(); + this.ids = istr.readLongSeq(); + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, TopicInfo v) + { + if(v == null) + { + _nullMarshalValue.ice_writeMembers(ostr); + } + else + { + v.ice_writeMembers(ostr); + } + } + + static public TopicInfo ice_read(com.zeroc.Ice.InputStream istr) + { + TopicInfo v = new TopicInfo(); + v.ice_readMembers(istr); + return v; + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + ice_write(ostr, tag, v.get()); + } + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, TopicInfo v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + int pos = ostr.startSize(); + ice_write(ostr, v); + ostr.endSize(pos); + } + } + + static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr.skip(4); + return java.util.Optional.of(TopicInfo.ice_read(istr)); + } + else + { + return java.util.Optional.empty(); + } + } + + private static final TopicInfo _nullMarshalValue = new TopicInfo(); + + /** @hidden */ + private static final long serialVersionUID = 3878971160678381159L; +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfoSeqHelper.java b/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfoSeqHelper.java new file mode 100644 index 000000000000..00961f7a496c --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfoSeqHelper.java @@ -0,0 +1,83 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +/** + * Helper class for marshaling/unmarshaling TopicInfoSeq. + **/ +public final class TopicInfoSeqHelper +{ + public static void write(com.zeroc.Ice.OutputStream ostr, TopicInfo[] v) + { + if(v == null) + { + ostr.writeSize(0); + } + else + { + ostr.writeSize(v.length); + for(int i0 = 0; i0 < v.length; i0++) + { + TopicInfo.ice_write(ostr, v[i0]); + } + } + } + + public static TopicInfo[] read(com.zeroc.Ice.InputStream istr) + { + final TopicInfo[] v; + final int len0 = istr.readAndCheckSeqSize(2); + v = new TopicInfo[len0]; + for(int i0 = 0; i0 < len0; i0++) + { + v[i0] = TopicInfo.ice_read(istr); + } + return v; + } + + public static void write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + write(ostr, tag, v.get()); + } + } + + public static void write(com.zeroc.Ice.OutputStream ostr, int tag, TopicInfo[] v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + int pos = ostr.startSize(); + TopicInfoSeqHelper.write(ostr, v); + ostr.endSize(pos); + } + } + + public static java.util.Optional read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr.skip(4); + TopicInfo[] v; + v = TopicInfoSeqHelper.read(istr); + return java.util.Optional.of(v); + } + else + { + return java.util.Optional.empty(); + } + } +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java b/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java new file mode 100644 index 000000000000..d71a0dea4fef --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java @@ -0,0 +1,189 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +public class TopicSpec implements java.lang.Cloneable, + java.io.Serializable +{ + /** + * The id of the topic. + **/ + public long id; + + /** + * The name of the topic. + **/ + public String name; + + /** + * The topic keys or filters. + **/ + public ElementInfo[] elements; + + /** + * The topic update tags. + **/ + public ElementInfo[] tags; + + public TopicSpec() + { + this.name = ""; + } + + public TopicSpec(long id, String name, ElementInfo[] elements, ElementInfo[] tags) + { + this.id = id; + this.name = name; + this.elements = elements; + this.tags = tags; + } + + public boolean equals(java.lang.Object rhs) + { + if(this == rhs) + { + return true; + } + TopicSpec r = null; + if(rhs instanceof TopicSpec) + { + r = (TopicSpec)rhs; + } + + if(r != null) + { + if(this.id != r.id) + { + return false; + } + if(this.name != r.name) + { + if(this.name == null || r.name == null || !this.name.equals(r.name)) + { + return false; + } + } + if(!java.util.Arrays.equals(this.elements, r.elements)) + { + return false; + } + if(!java.util.Arrays.equals(this.tags, r.tags)) + { + return false; + } + + return true; + } + + return false; + } + + public int hashCode() + { + int h_ = 5381; + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, "::DataStormContract::TopicSpec"); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, id); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, name); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, elements); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, tags); + return h_; + } + + public TopicSpec clone() + { + TopicSpec c = null; + try + { + c = (TopicSpec)super.clone(); + } + catch(CloneNotSupportedException ex) + { + assert false; // impossible + } + return c; + } + + public void ice_writeMembers(com.zeroc.Ice.OutputStream ostr) + { + ostr.writeLong(this.id); + ostr.writeString(this.name); + ElementInfoSeqHelper.write(ostr, this.elements); + ElementInfoSeqHelper.write(ostr, this.tags); + } + + public void ice_readMembers(com.zeroc.Ice.InputStream istr) + { + this.id = istr.readLong(); + this.name = istr.readString(); + this.elements = ElementInfoSeqHelper.read(istr); + this.tags = ElementInfoSeqHelper.read(istr); + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, TopicSpec v) + { + if(v == null) + { + _nullMarshalValue.ice_writeMembers(ostr); + } + else + { + v.ice_writeMembers(ostr); + } + } + + static public TopicSpec ice_read(com.zeroc.Ice.InputStream istr) + { + TopicSpec v = new TopicSpec(); + v.ice_readMembers(istr); + return v; + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + ice_write(ostr, tag, v.get()); + } + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, TopicSpec v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + int pos = ostr.startSize(); + ice_write(ostr, v); + ostr.endSize(pos); + } + } + + static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr.skip(4); + return java.util.Optional.of(TopicSpec.ice_read(istr)); + } + else + { + return java.util.Optional.empty(); + } + } + + private static final TopicSpec _nullMarshalValue = new TopicSpec(); + + /** @hidden */ + private static final long serialVersionUID = 1888246219345232563L; +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/_LookupPrxI.java b/slice2java/cpp/src/DataStorm/DataStormContract/_LookupPrxI.java new file mode 100644 index 000000000000..7e3c1241eb45 --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/_LookupPrxI.java @@ -0,0 +1,32 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +/** @hidden */ +public class _LookupPrxI extends com.zeroc.Ice._ObjectPrxFactoryMethods implements LookupPrx +{ + _LookupPrxI(com.zeroc.Ice.Reference ref) + { + super(ref); + } + + _LookupPrxI(com.zeroc.Ice.ObjectPrx obj) + { + super(obj); + } + + private static final long serialVersionUID = 0L; +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/_NodePrxI.java b/slice2java/cpp/src/DataStorm/DataStormContract/_NodePrxI.java new file mode 100644 index 000000000000..f8a0b2d6cb35 --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/_NodePrxI.java @@ -0,0 +1,32 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +/** @hidden */ +public class _NodePrxI extends com.zeroc.Ice._ObjectPrxFactoryMethods implements NodePrx +{ + _NodePrxI(com.zeroc.Ice.Reference ref) + { + super(ref); + } + + _NodePrxI(com.zeroc.Ice.ObjectPrx obj) + { + super(obj); + } + + private static final long serialVersionUID = 0L; +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/_PublisherSessionPrxI.java b/slice2java/cpp/src/DataStorm/DataStormContract/_PublisherSessionPrxI.java new file mode 100644 index 000000000000..08b2dddc930b --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/_PublisherSessionPrxI.java @@ -0,0 +1,32 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +/** @hidden */ +public class _PublisherSessionPrxI extends com.zeroc.Ice._ObjectPrxFactoryMethods implements PublisherSessionPrx +{ + _PublisherSessionPrxI(com.zeroc.Ice.Reference ref) + { + super(ref); + } + + _PublisherSessionPrxI(com.zeroc.Ice.ObjectPrx obj) + { + super(obj); + } + + private static final long serialVersionUID = 0L; +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/_SessionPrxI.java b/slice2java/cpp/src/DataStorm/DataStormContract/_SessionPrxI.java new file mode 100644 index 000000000000..d05abe4a3ae7 --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/_SessionPrxI.java @@ -0,0 +1,32 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +/** @hidden */ +public class _SessionPrxI extends com.zeroc.Ice._ObjectPrxFactoryMethods implements SessionPrx +{ + _SessionPrxI(com.zeroc.Ice.Reference ref) + { + super(ref); + } + + _SessionPrxI(com.zeroc.Ice.ObjectPrx obj) + { + super(obj); + } + + private static final long serialVersionUID = 0L; +} diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/_SubscriberSessionPrxI.java b/slice2java/cpp/src/DataStorm/DataStormContract/_SubscriberSessionPrxI.java new file mode 100644 index 000000000000..b00735ab124d --- /dev/null +++ b/slice2java/cpp/src/DataStorm/DataStormContract/_SubscriberSessionPrxI.java @@ -0,0 +1,32 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStormContract; + +/** @hidden */ +public class _SubscriberSessionPrxI extends com.zeroc.Ice._ObjectPrxFactoryMethods implements SubscriberSessionPrx +{ + _SubscriberSessionPrxI(com.zeroc.Ice.Reference ref) + { + super(ref); + } + + _SubscriberSessionPrxI(com.zeroc.Ice.ObjectPrx obj) + { + super(obj); + } + + private static final long serialVersionUID = 0L; +} diff --git a/slice2java/cpp/src/DataStorm/com/zeroc/IceCompactId/TypeId_1.java b/slice2java/cpp/src/DataStorm/com/zeroc/IceCompactId/TypeId_1.java new file mode 100644 index 000000000000..71f399f26228 --- /dev/null +++ b/slice2java/cpp/src/DataStorm/com/zeroc/IceCompactId/TypeId_1.java @@ -0,0 +1,22 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +package com.zeroc.IceCompactId; + +/** @hidden */ +public class TypeId_1 +{ + public final static String typeId = "::DataStormContract::ElementConfig"; +} diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java index e9a293d59d68..a7e91334b30d 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3774321888422023216L; + private static final long serialVersionUID = 3774325877909497198L; } diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java index e91cd1be9ef7..fd5b18c30010 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7872702895108357238L; + private static final long serialVersionUID = 7872706724382577332L; } diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java index 1d27468a51a9..27515ea04fa9 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java @@ -55,7 +55,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8887779505828309129L; + private static final long serialVersionUID = -3149776609508872683L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java index 28447332972d..e2e67d4c8da9 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java @@ -55,7 +55,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3579631363755809677L; + private static final long serialVersionUID = 3144733568523437021L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java index 80fde237375b..9d892f39d610 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java @@ -100,7 +100,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6628127381636148388L; + private static final long serialVersionUID = -6845962246531313692L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java index 5ab815e7bb83..ffdd83e272a3 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java @@ -59,7 +59,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1786588562209783804L; + private static final long serialVersionUID = -6793309366177416836L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java index b74b6698b212..27fbcd855f15 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java @@ -272,7 +272,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4504673466505853838L; + private static final long serialVersionUID = -8269169396159249262L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceStorm/IceStorm/AllData.java b/slice2java/cpp/src/IceStorm/IceStorm/AllData.java index 2872dc472de3..dceb3fccbe73 100644 --- a/slice2java/cpp/src/IceStorm/IceStorm/AllData.java +++ b/slice2java/cpp/src/IceStorm/IceStorm/AllData.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final AllData _nullMarshalValue = new AllData(); /** @hidden */ - private static final long serialVersionUID = 3689907478677624724L; + private static final long serialVersionUID = 3943844256655209716L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/EventData.java b/slice2java/cpp/src/IceStorm/IceStorm/EventData.java index 0776bb013d51..46f393c97c3e 100644 --- a/slice2java/cpp/src/IceStorm/IceStorm/EventData.java +++ b/slice2java/cpp/src/IceStorm/IceStorm/EventData.java @@ -195,5 +195,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final EventData _nullMarshalValue = new EventData(); /** @hidden */ - private static final long serialVersionUID = 7637388192416333823L; + private static final long serialVersionUID = -1221561704643336508L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java index 70ea5a867fb0..bb9d8e8d891d 100644 --- a/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java +++ b/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java @@ -177,5 +177,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LinkRecord _nullMarshalValue = new LinkRecord(); /** @hidden */ - private static final long serialVersionUID = -3438187751658436327L; + private static final long serialVersionUID = -5756496267939815239L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java index 24ab75025a04..d1eaea02e5fe 100644 --- a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java +++ b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final SubscriberRecord _nullMarshalValue = new SubscriberRecord(); /** @hidden */ - private static final long serialVersionUID = -3804084544470403200L; + private static final long serialVersionUID = 8752383712572972724L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java index 7cbea048355a..87330e01328f 100644 --- a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java +++ b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java @@ -168,5 +168,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Inp private static final SubscriberRecordKey _nullMarshalValue = new SubscriberRecordKey(); /** @hidden */ - private static final long serialVersionUID = 1068106834254046431L; + private static final long serialVersionUID = 4354132220085469407L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java index c9e9e7ff8c5e..96bcbba5e03a 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java @@ -161,5 +161,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final GroupInfo _nullMarshalValue = new GroupInfo(); /** @hidden */ - private static final long serialVersionUID = -2753322276637242774L; + private static final long serialVersionUID = 160020418959666383L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java b/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java index c7143247c20d..0929b7961568 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java @@ -157,5 +157,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final LogUpdate _nullMarshalValue = new LogUpdate(); /** @hidden */ - private static final long serialVersionUID = -6094715607360662620L; + private static final long serialVersionUID = 1759779244317018116L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java index 4245fd03041c..30b3e591f011 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java @@ -161,5 +161,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final NodeInfo _nullMarshalValue = new NodeInfo(); /** @hidden */ - private static final long serialVersionUID = -7263608881211333165L; + private static final long serialVersionUID = 3085567964405766160L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java b/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java index b0c4cc99f233..2954e050b4dc 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 938912380660676269L; + private static final long serialVersionUID = 938914307516028342L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java index e4d11e979a69..d57117f57739 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java @@ -231,5 +231,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final QueryInfo _nullMarshalValue = new QueryInfo(); /** @hidden */ - private static final long serialVersionUID = -4127553162196096592L; + private static final long serialVersionUID = -6665988576069949564L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java b/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java index 3456058c46a3..b6db7c1389f4 100644 --- a/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java +++ b/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java @@ -162,5 +162,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final TopicContent _nullMarshalValue = new TopicContent(); /** @hidden */ - private static final long serialVersionUID = 175801035578993371L; + private static final long serialVersionUID = -6020105510140092544L; } diff --git a/slice2java/cpp/src/icegriddb/IceGrid/AllData.java b/slice2java/cpp/src/icegriddb/IceGrid/AllData.java index ffe5e748aa1a..ead84779684e 100644 --- a/slice2java/cpp/src/icegriddb/IceGrid/AllData.java +++ b/slice2java/cpp/src/icegriddb/IceGrid/AllData.java @@ -185,5 +185,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final AllData _nullMarshalValue = new AllData(); /** @hidden */ - private static final long serialVersionUID = -8344913445876803352L; + private static final long serialVersionUID = 5863824874101003401L; } diff --git a/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java b/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java new file mode 100644 index 000000000000..964b73c3f0fd --- /dev/null +++ b/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java @@ -0,0 +1,67 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +package Test; + +public class ClassKey extends com.zeroc.Ice.Value +{ + public ClassKey() + { + } + + public ClassKey(int value) + { + this.value = value; + } + + public int value; + + public ClassKey clone() + { + return (ClassKey)super.clone(); + } + + public static String ice_staticId() + { + return "::Test::ClassKey"; + } + + @Override + public String ice_id() + { + return ice_staticId(); + } + + /** @hidden */ + private static final long serialVersionUID = 1632402275378211259L; + + /** @hidden */ + @Override + protected void _iceWriteImpl(com.zeroc.Ice.OutputStream ostr_) + { + ostr_.startSlice(ice_staticId(), -1, true); + ostr_.writeInt(value); + ostr_.endSlice(); + } + + /** @hidden */ + @Override + protected void _iceReadImpl(com.zeroc.Ice.InputStream istr_) + { + istr_.startSlice(); + value = istr_.readInt(); + istr_.endSlice(); + } +} diff --git a/slice2java/cpp/test/DataStorm/api/Test/StructKey.java b/slice2java/cpp/test/DataStorm/api/Test/StructKey.java new file mode 100644 index 000000000000..57b44322c7f8 --- /dev/null +++ b/slice2java/cpp/test/DataStorm/api/Test/StructKey.java @@ -0,0 +1,142 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +package Test; + +public class StructKey implements java.lang.Cloneable, + java.io.Serializable +{ + public int value; + + public StructKey() + { + } + + public StructKey(int value) + { + this.value = value; + } + + public boolean equals(java.lang.Object rhs) + { + if(this == rhs) + { + return true; + } + StructKey r = null; + if(rhs instanceof StructKey) + { + r = (StructKey)rhs; + } + + if(r != null) + { + if(this.value != r.value) + { + return false; + } + + return true; + } + + return false; + } + + public int hashCode() + { + int h_ = 5381; + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, "::Test::StructKey"); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, value); + return h_; + } + + public StructKey clone() + { + StructKey c = null; + try + { + c = (StructKey)super.clone(); + } + catch(CloneNotSupportedException ex) + { + assert false; // impossible + } + return c; + } + + public void ice_writeMembers(com.zeroc.Ice.OutputStream ostr) + { + ostr.writeInt(this.value); + } + + public void ice_readMembers(com.zeroc.Ice.InputStream istr) + { + this.value = istr.readInt(); + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, StructKey v) + { + if(v == null) + { + _nullMarshalValue.ice_writeMembers(ostr); + } + else + { + v.ice_writeMembers(ostr); + } + } + + static public StructKey ice_read(com.zeroc.Ice.InputStream istr) + { + StructKey v = new StructKey(); + v.ice_readMembers(istr); + return v; + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + ice_write(ostr, tag, v.get()); + } + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, StructKey v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.VSize)) + { + ostr.writeSize(4); + ice_write(ostr, v); + } + } + + static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.VSize)) + { + istr.skipSize(); + return java.util.Optional.of(StructKey.ice_read(istr)); + } + else + { + return java.util.Optional.empty(); + } + } + + private static final StructKey _nullMarshalValue = new StructKey(); + + /** @hidden */ + private static final long serialVersionUID = -8144777857005577621L; +} diff --git a/slice2java/cpp/test/DataStorm/events/Test/Base.java b/slice2java/cpp/test/DataStorm/events/Test/Base.java new file mode 100644 index 000000000000..c98b6df9ed3f --- /dev/null +++ b/slice2java/cpp/test/DataStorm/events/Test/Base.java @@ -0,0 +1,68 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +package Test; + +public class Base extends com.zeroc.Ice.Value +{ + public Base() + { + this.b = ""; + } + + public Base(String b) + { + this.b = b; + } + + public String b; + + public Base clone() + { + return (Base)super.clone(); + } + + public static String ice_staticId() + { + return "::Test::Base"; + } + + @Override + public String ice_id() + { + return ice_staticId(); + } + + /** @hidden */ + private static final long serialVersionUID = -2623897448491185265L; + + /** @hidden */ + @Override + protected void _iceWriteImpl(com.zeroc.Ice.OutputStream ostr_) + { + ostr_.startSlice(ice_staticId(), -1, true); + ostr_.writeString(b); + ostr_.endSlice(); + } + + /** @hidden */ + @Override + protected void _iceReadImpl(com.zeroc.Ice.InputStream istr_) + { + istr_.startSlice(); + b = istr_.readString(); + istr_.endSlice(); + } +} diff --git a/slice2java/cpp/test/DataStorm/events/Test/Extended.java b/slice2java/cpp/test/DataStorm/events/Test/Extended.java new file mode 100644 index 000000000000..dbb1a154cee0 --- /dev/null +++ b/slice2java/cpp/test/DataStorm/events/Test/Extended.java @@ -0,0 +1,71 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +package Test; + +public class Extended extends Base +{ + public Extended() + { + super(); + } + + public Extended(String b, int e) + { + super(b); + this.e = e; + } + + public int e; + + public Extended clone() + { + return (Extended)super.clone(); + } + + public static String ice_staticId() + { + return "::Test::Extended"; + } + + @Override + public String ice_id() + { + return ice_staticId(); + } + + /** @hidden */ + private static final long serialVersionUID = 2516997731546302841L; + + /** @hidden */ + @Override + protected void _iceWriteImpl(com.zeroc.Ice.OutputStream ostr_) + { + ostr_.startSlice(ice_staticId(), -1, false); + ostr_.writeInt(e); + ostr_.endSlice(); + super._iceWriteImpl(ostr_); + } + + /** @hidden */ + @Override + protected void _iceReadImpl(com.zeroc.Ice.InputStream istr_) + { + istr_.startSlice(); + e = istr_.readInt(); + istr_.endSlice(); + super._iceReadImpl(istr_); + } +} diff --git a/slice2java/cpp/test/DataStorm/events/Test/StructValue.java b/slice2java/cpp/test/DataStorm/events/Test/StructValue.java new file mode 100644 index 000000000000..c6961e093aab --- /dev/null +++ b/slice2java/cpp/test/DataStorm/events/Test/StructValue.java @@ -0,0 +1,171 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +package Test; + +public class StructValue implements java.lang.Cloneable, + java.io.Serializable +{ + public String firstName; + + public String lastName; + + public int age; + + public StructValue() + { + this.firstName = ""; + this.lastName = ""; + } + + public StructValue(String firstName, String lastName, int age) + { + this.firstName = firstName; + this.lastName = lastName; + this.age = age; + } + + public boolean equals(java.lang.Object rhs) + { + if(this == rhs) + { + return true; + } + StructValue r = null; + if(rhs instanceof StructValue) + { + r = (StructValue)rhs; + } + + if(r != null) + { + if(this.firstName != r.firstName) + { + if(this.firstName == null || r.firstName == null || !this.firstName.equals(r.firstName)) + { + return false; + } + } + if(this.lastName != r.lastName) + { + if(this.lastName == null || r.lastName == null || !this.lastName.equals(r.lastName)) + { + return false; + } + } + if(this.age != r.age) + { + return false; + } + + return true; + } + + return false; + } + + public int hashCode() + { + int h_ = 5381; + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, "::Test::StructValue"); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, firstName); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, lastName); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, age); + return h_; + } + + public StructValue clone() + { + StructValue c = null; + try + { + c = (StructValue)super.clone(); + } + catch(CloneNotSupportedException ex) + { + assert false; // impossible + } + return c; + } + + public void ice_writeMembers(com.zeroc.Ice.OutputStream ostr) + { + ostr.writeString(this.firstName); + ostr.writeString(this.lastName); + ostr.writeInt(this.age); + } + + public void ice_readMembers(com.zeroc.Ice.InputStream istr) + { + this.firstName = istr.readString(); + this.lastName = istr.readString(); + this.age = istr.readInt(); + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, StructValue v) + { + if(v == null) + { + _nullMarshalValue.ice_writeMembers(ostr); + } + else + { + v.ice_writeMembers(ostr); + } + } + + static public StructValue ice_read(com.zeroc.Ice.InputStream istr) + { + StructValue v = new StructValue(); + v.ice_readMembers(istr); + return v; + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + ice_write(ostr, tag, v.get()); + } + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, StructValue v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + int pos = ostr.startSize(); + ice_write(ostr, v); + ostr.endSize(pos); + } + } + + static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr.skip(4); + return java.util.Optional.of(StructValue.ice_read(istr)); + } + else + { + return java.util.Optional.empty(); + } + } + + private static final StructValue _nullMarshalValue = new StructValue(); + + /** @hidden */ + private static final long serialVersionUID = -8344205119022952034L; +} diff --git a/slice2java/cpp/test/DataStorm/partial/Test/Stock.java b/slice2java/cpp/test/DataStorm/partial/Test/Stock.java new file mode 100644 index 000000000000..883aaae2c736 --- /dev/null +++ b/slice2java/cpp/test/DataStorm/partial/Test/Stock.java @@ -0,0 +1,162 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +package Test; + +public class Stock implements java.lang.Cloneable, + java.io.Serializable +{ + public float price; + + public float lastBid; + + public float laskAsk; + + public Stock() + { + } + + public Stock(float price, float lastBid, float laskAsk) + { + this.price = price; + this.lastBid = lastBid; + this.laskAsk = laskAsk; + } + + public boolean equals(java.lang.Object rhs) + { + if(this == rhs) + { + return true; + } + Stock r = null; + if(rhs instanceof Stock) + { + r = (Stock)rhs; + } + + if(r != null) + { + if(this.price != r.price) + { + return false; + } + if(this.lastBid != r.lastBid) + { + return false; + } + if(this.laskAsk != r.laskAsk) + { + return false; + } + + return true; + } + + return false; + } + + public int hashCode() + { + int h_ = 5381; + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, "::Test::Stock"); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, price); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, lastBid); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, laskAsk); + return h_; + } + + public Stock clone() + { + Stock c = null; + try + { + c = (Stock)super.clone(); + } + catch(CloneNotSupportedException ex) + { + assert false; // impossible + } + return c; + } + + public void ice_writeMembers(com.zeroc.Ice.OutputStream ostr) + { + ostr.writeFloat(this.price); + ostr.writeFloat(this.lastBid); + ostr.writeFloat(this.laskAsk); + } + + public void ice_readMembers(com.zeroc.Ice.InputStream istr) + { + this.price = istr.readFloat(); + this.lastBid = istr.readFloat(); + this.laskAsk = istr.readFloat(); + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, Stock v) + { + if(v == null) + { + _nullMarshalValue.ice_writeMembers(ostr); + } + else + { + v.ice_writeMembers(ostr); + } + } + + static public Stock ice_read(com.zeroc.Ice.InputStream istr) + { + Stock v = new Stock(); + v.ice_readMembers(istr); + return v; + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + ice_write(ostr, tag, v.get()); + } + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, Stock v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.VSize)) + { + ostr.writeSize(12); + ice_write(ostr, v); + } + } + + static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.VSize)) + { + istr.skipSize(); + return java.util.Optional.of(Stock.ice_read(istr)); + } + else + { + return java.util.Optional.empty(); + } + } + + private static final Stock _nullMarshalValue = new Stock(); + + /** @hidden */ + private static final long serialVersionUID = -5643600364919440474L; +} diff --git a/slice2java/cpp/test/DataStorm/types/Test/Base.java b/slice2java/cpp/test/DataStorm/types/Test/Base.java new file mode 100644 index 000000000000..b2184260dc07 --- /dev/null +++ b/slice2java/cpp/test/DataStorm/types/Test/Base.java @@ -0,0 +1,68 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +package Test; + +public class Base extends com.zeroc.Ice.Value +{ + public Base() + { + this.b = ""; + } + + public Base(String b) + { + this.b = b; + } + + public String b; + + public Base clone() + { + return (Base)super.clone(); + } + + public static String ice_staticId() + { + return "::Test::Base"; + } + + @Override + public String ice_id() + { + return ice_staticId(); + } + + /** @hidden */ + private static final long serialVersionUID = -2623894961124160119L; + + /** @hidden */ + @Override + protected void _iceWriteImpl(com.zeroc.Ice.OutputStream ostr_) + { + ostr_.startSlice(ice_staticId(), -1, true); + ostr_.writeString(b); + ostr_.endSlice(); + } + + /** @hidden */ + @Override + protected void _iceReadImpl(com.zeroc.Ice.InputStream istr_) + { + istr_.startSlice(); + b = istr_.readString(); + istr_.endSlice(); + } +} diff --git a/slice2java/cpp/test/DataStorm/types/Test/Extended.java b/slice2java/cpp/test/DataStorm/types/Test/Extended.java new file mode 100644 index 000000000000..2dc97252ea06 --- /dev/null +++ b/slice2java/cpp/test/DataStorm/types/Test/Extended.java @@ -0,0 +1,71 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +package Test; + +public class Extended extends Base +{ + public Extended() + { + super(); + } + + public Extended(String b, int e) + { + super(b); + this.e = e; + } + + public int e; + + public Extended clone() + { + return (Extended)super.clone(); + } + + public static String ice_staticId() + { + return "::Test::Extended"; + } + + @Override + public String ice_id() + { + return ice_staticId(); + } + + /** @hidden */ + private static final long serialVersionUID = 2516995244174538367L; + + /** @hidden */ + @Override + protected void _iceWriteImpl(com.zeroc.Ice.OutputStream ostr_) + { + ostr_.startSlice(ice_staticId(), -1, false); + ostr_.writeInt(e); + ostr_.endSlice(); + super._iceWriteImpl(ostr_); + } + + /** @hidden */ + @Override + protected void _iceReadImpl(com.zeroc.Ice.InputStream istr_) + { + istr_.startSlice(); + e = istr_.readInt(); + istr_.endSlice(); + super._iceReadImpl(istr_); + } +} diff --git a/slice2java/cpp/test/DataStorm/types/Test/StructValue.java b/slice2java/cpp/test/DataStorm/types/Test/StructValue.java new file mode 100644 index 000000000000..3c26836477c5 --- /dev/null +++ b/slice2java/cpp/test/DataStorm/types/Test/StructValue.java @@ -0,0 +1,171 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +package Test; + +public class StructValue implements java.lang.Cloneable, + java.io.Serializable +{ + public String firstName; + + public String lastName; + + public int age; + + public StructValue() + { + this.firstName = ""; + this.lastName = ""; + } + + public StructValue(String firstName, String lastName, int age) + { + this.firstName = firstName; + this.lastName = lastName; + this.age = age; + } + + public boolean equals(java.lang.Object rhs) + { + if(this == rhs) + { + return true; + } + StructValue r = null; + if(rhs instanceof StructValue) + { + r = (StructValue)rhs; + } + + if(r != null) + { + if(this.firstName != r.firstName) + { + if(this.firstName == null || r.firstName == null || !this.firstName.equals(r.firstName)) + { + return false; + } + } + if(this.lastName != r.lastName) + { + if(this.lastName == null || r.lastName == null || !this.lastName.equals(r.lastName)) + { + return false; + } + } + if(this.age != r.age) + { + return false; + } + + return true; + } + + return false; + } + + public int hashCode() + { + int h_ = 5381; + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, "::Test::StructValue"); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, firstName); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, lastName); + h_ = com.zeroc.Ice.HashUtil.hashAdd(h_, age); + return h_; + } + + public StructValue clone() + { + StructValue c = null; + try + { + c = (StructValue)super.clone(); + } + catch(CloneNotSupportedException ex) + { + assert false; // impossible + } + return c; + } + + public void ice_writeMembers(com.zeroc.Ice.OutputStream ostr) + { + ostr.writeString(this.firstName); + ostr.writeString(this.lastName); + ostr.writeInt(this.age); + } + + public void ice_readMembers(com.zeroc.Ice.InputStream istr) + { + this.firstName = istr.readString(); + this.lastName = istr.readString(); + this.age = istr.readInt(); + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, StructValue v) + { + if(v == null) + { + _nullMarshalValue.ice_writeMembers(ostr); + } + else + { + v.ice_writeMembers(ostr); + } + } + + static public StructValue ice_read(com.zeroc.Ice.InputStream istr) + { + StructValue v = new StructValue(); + v.ice_readMembers(istr); + return v; + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + ice_write(ostr, tag, v.get()); + } + } + + static public void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, StructValue v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + int pos = ostr.startSize(); + ice_write(ostr, v); + ostr.endSize(pos); + } + } + + static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr.skip(4); + return java.util.Optional.of(StructValue.ice_read(istr)); + } + else + { + return java.util.Optional.empty(); + } + } + + private static final StructValue _nullMarshalValue = new StructValue(); + + /** @hidden */ + private static final long serialVersionUID = -5050745199882263016L; +} diff --git a/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java b/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java index 94307f85b3de..efbf8cc49cd4 100644 --- a/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java +++ b/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java @@ -201,5 +201,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final TestToken _nullMarshalValue = new TestToken(); /** @hidden */ - private static final long serialVersionUID = 777498352014820787L; + private static final long serialVersionUID = 5228658152914976804L; } diff --git a/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java b/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java index b3bfe3fd5a7c..f7f085c0e41e 100644 --- a/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java +++ b/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java @@ -58,5 +58,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4431607270976083887L; + private static final long serialVersionUID = -2892919081820583618L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java b/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java index f6c464ecc2d5..16d8971c7160 100644 --- a/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java +++ b/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java @@ -199,5 +199,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final BufferStruct _nullMarshalValue = new BufferStruct(); /** @hidden */ - private static final long serialVersionUID = -1691697853992386169L; + private static final long serialVersionUID = -7791479685173716808L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/DictClass.java b/slice2java/cpp/test/Ice/custom/Test/DictClass.java index 68bc16cb0137..2b72c3a38ed2 100644 --- a/slice2java/cpp/test/Ice/custom/Test/DictClass.java +++ b/slice2java/cpp/test/Ice/custom/Test/DictClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6545915278402729673L; + private static final long serialVersionUID = 6545926010399258454L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/custom/Test/Fixed.java b/slice2java/cpp/test/Ice/custom/Test/Fixed.java index 22312ac080fa..cb69dea311f8 100644 --- a/slice2java/cpp/test/Ice/custom/Test/Fixed.java +++ b/slice2java/cpp/test/Ice/custom/Test/Fixed.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Fixed _nullMarshalValue = new Fixed(); /** @hidden */ - private static final long serialVersionUID = -5072326853752181665L; + private static final long serialVersionUID = -5072318092273547008L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/Variable.java b/slice2java/cpp/test/Ice/custom/Test/Variable.java index fedd6ff4da77..0743e40346ba 100644 --- a/slice2java/cpp/test/Ice/custom/Test/Variable.java +++ b/slice2java/cpp/test/Ice/custom/Test/Variable.java @@ -163,5 +163,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final Variable _nullMarshalValue = new Variable(); /** @hidden */ - private static final long serialVersionUID = 7486581596555824971L; + private static final long serialVersionUID = -6773105287964465260L; } diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringException.java b/slice2java/cpp/test/Ice/custom/Test1/WstringException.java index 971333520597..1bc8e204f4e4 100644 --- a/slice2java/cpp/test/Ice/custom/Test1/WstringException.java +++ b/slice2java/cpp/test/Ice/custom/Test1/WstringException.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1345707861543644268L; + private static final long serialVersionUID = 1345710583967331368L; } diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java index 3cfd3039a1bb..9ca5802e531c 100644 --- a/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java +++ b/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final WstringStruct _nullMarshalValue = new WstringStruct(); /** @hidden */ - private static final long serialVersionUID = -6616020360015752965L; + private static final long serialVersionUID = -6616023413055240385L; } diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringException.java b/slice2java/cpp/test/Ice/custom/Test2/WstringException.java index c2b29c5af6d7..87fd7e891b19 100644 --- a/slice2java/cpp/test/Ice/custom/Test2/WstringException.java +++ b/slice2java/cpp/test/Ice/custom/Test2/WstringException.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4583035161857582255L; + private static final long serialVersionUID = 4583043670057770731L; } diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java index 00cc9d47afba..cf3c45613704 100644 --- a/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java +++ b/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final WstringStruct _nullMarshalValue = new WstringStruct(); /** @hidden */ - private static final long serialVersionUID = 5997329408022245688L; + private static final long serialVersionUID = 5997321230437857532L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Base.java b/slice2java/cpp/test/Ice/defaultValue/Test/Base.java index 4308a17ba16e..8d1049caa58c 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -955813743205985625L; + private static final long serialVersionUID = 2978146302919988042L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java index 37f8f0f17726..0d13b2d85141 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java @@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1849450329950849325L; + private static final long serialVersionUID = -6950551564382787586L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java b/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java index 1254e235947d..3234116a3875 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6503772757020529313L; + private static final long serialVersionUID = -4584980222464287132L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java index 45a7f791a974..43aa41f7acf9 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java @@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 9154464352546864790L; + private static final long serialVersionUID = -8748003370014988333L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java index 76d5294fdf13..c454f957da8e 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = 7809368377400535462L; + private static final long serialVersionUID = -1022175271900313362L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java index 2201bfa186ae..c5d12f223749 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = 8747474162806479110L; + private static final long serialVersionUID = 3483231849234415119L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java index f636b6318ccb..f03edd879846 100644 --- a/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java +++ b/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct3 _nullMarshalValue = new Struct3(); /** @hidden */ - private static final long serialVersionUID = -3174999828917685468L; + private static final long serialVersionUID = -8046090824828177172L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/A.java b/slice2java/cpp/test/Ice/exceptions/Test/A.java index ad36e4f8368e..c540925842c9 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/A.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/A.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7823746769976603736L; + private static final long serialVersionUID = 7823738593517491005L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/B.java b/slice2java/cpp/test/Ice/exceptions/Test/B.java index b45321c7b7ef..4c3edb4781d0 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/B.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/B.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3861408963379309800L; + private static final long serialVersionUID = -3861417470302563843L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/C.java b/slice2java/cpp/test/Ice/exceptions/Test/C.java index 74a0215f3344..56d6709445af 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/C.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/C.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1080700461179389016L; + private static final long serialVersionUID = 1080692284720276285L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/D.java b/slice2java/cpp/test/Ice/exceptions/Test/D.java index 019886aafc07..36c37b2f9ec5 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/D.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/D.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4780383304722768408L; + private static final long serialVersionUID = 4780374797799514365L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/E.java b/slice2java/cpp/test/Ice/exceptions/Test/E.java index 55a234435380..fccfc21923e8 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/E.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/E.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1876971853535222053L; + private static final long serialVersionUID = -1876980365428147330L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/F.java b/slice2java/cpp/test/Ice/exceptions/Test/F.java index 3c2c3dfb8693..c36e8d714f27 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/F.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/F.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 733479553379084248L; + private static final long serialVersionUID = 733476834698314941L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java b/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java index 13e40b422182..39aff8f4aaa9 100644 --- a/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java +++ b/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4641412376811739188L; + private static final long serialVersionUID = -4641409322620491863L; } diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java index 90df982ad49a..e1bac878e6ae 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 954232111406921419L; + private static final long serialVersionUID = 954231851592070212L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MC/B.java b/slice2java/cpp/test/Ice/inheritance/Test/MC/B.java index ed99986c597c..1f3795feb123 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MC/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MC/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1339641114839220049L; + private static final long serialVersionUID = 1339641697061492318L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MC/C.java b/slice2java/cpp/test/Ice/inheritance/Test/MC/C.java index 9acdc5fccee1..096f118fd92c 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MC/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MC/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2729304461461658029L; + private static final long serialVersionUID = -2729304039381422628L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MC/D.java b/slice2java/cpp/test/Ice/inheritance/Test/MC/D.java index f32b1687e92c..1337374125f3 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MC/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MC/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3435401654797418667L; + private static final long serialVersionUID = -3435401392859760294L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MD/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MD/A.java index b86dedffae2a..4ce4b972e02d 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MD/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MD/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -836183826953616948L; + private static final long serialVersionUID = -836184249033852349L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MD/B.java b/slice2java/cpp/test/Ice/inheritance/Test/MD/B.java index cf308d4c8b79..f12d722bf24d 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MD/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MD/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1132530082501177585L; + private static final long serialVersionUID = 1132530660022311038L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MD/C.java b/slice2java/cpp/test/Ice/inheritance/Test/MD/C.java index 2b97e0b734db..edb32794f4a8 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MD/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MD/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6335553133953667597L; + private static final long serialVersionUID = -6335552716574571012L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MD/D.java b/slice2java/cpp/test/Ice/inheritance/Test/MD/D.java index 9e2c2790646a..2b8ecdeabdea 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MD/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MD/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4007413190754000907L; + private static final long serialVersionUID = -4007412933517481350L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/ME/A.java b/slice2java/cpp/test/Ice/inheritance/Test/ME/A.java index 70571e290739..bba2080e32ca 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/ME/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/ME/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 991425939354171341L; + private static final long serialVersionUID = 991425519396743106L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/ME/B.java b/slice2java/cpp/test/Ice/inheritance/Test/ME/B.java index 71f221da2183..6b2810b83cc4 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/ME/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/ME/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2880326832289587695L; + private static final long serialVersionUID = -2880326249763719650L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/ME/C.java b/slice2java/cpp/test/Ice/inheritance/Test/ME/C.java index 0b6d7ccab568..b81b573f6344 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/ME/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/ME/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8808265623983889133L; + private static final long serialVersionUID = -8808265201600057956L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/ME/D.java b/slice2java/cpp/test/Ice/inheritance/Test/ME/D.java index b91e2ed55f9e..87c293a01c0f 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/ME/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/ME/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -771856401368781035L; + private static final long serialVersionUID = -771856139127526886L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MF/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MF/A.java index 5d11b18a624c..2a929538a528 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MF/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MF/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6566346604188735438L; + private static final long serialVersionUID = 6566346021966463169L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MF/B.java b/slice2java/cpp/test/Ice/inheritance/Test/MF/B.java index c2fb3bc3735a..78eed1f30f64 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MF/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MF/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6983806997629529521L; + private static final long serialVersionUID = 6983807574847067198L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MF/C.java b/slice2java/cpp/test/Ice/inheritance/Test/MF/C.java index 931f453976c7..6962dcdbd43f 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MF/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MF/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1175217313189007437L; + private static final long serialVersionUID = -1175216896113506628L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MF/D.java b/slice2java/cpp/test/Ice/inheritance/Test/MF/D.java index 393e899dba38..9e55a8c1569c 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MF/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MF/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3279721488642625611L; + private static final long serialVersionUID = -3279721231709701830L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MG/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MG/A.java index b1cf4984c7d1..49b0844af8e6 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MG/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MG/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4359179889022735153L; + private static final long serialVersionUID = -4359180469122200256L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MG/B.java b/slice2java/cpp/test/Ice/inheritance/Test/MG/B.java index d11e3b49bd08..d9f3b1e7ed27 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MG/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MG/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5904697902390608081L; + private static final long serialVersionUID = 5904698484612880350L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MG/C.java b/slice2java/cpp/test/Ice/inheritance/Test/MG/C.java index 14d58e8b73d4..ce2e0ae55943 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MG/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MG/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1835752326089730003L; + private static final long serialVersionUID = 1835752748169965404L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MG/D.java b/slice2java/cpp/test/Ice/inheritance/Test/MG/D.java index 91f1a8b1cee4..9f5c99482ea5 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MG/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MG/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2252402308027735851L; + private static final long serialVersionUID = -2252402046090077478L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MH/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MH/A.java index aa29c2351ddb..004c55432ff0 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MH/A.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MH/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1203531669570509376L; + private static final long serialVersionUID = -1203531089471044273L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MH/B.java b/slice2java/cpp/test/Ice/inheritance/Test/MH/B.java index 2d5cd63dda63..604866ce52dd 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MH/B.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MH/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7537761949086107535L; + private static final long serialVersionUID = -7537761371564974082L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MH/C.java b/slice2java/cpp/test/Ice/inheritance/Test/MH/C.java index e006752536b4..178a9e49829e 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MH/C.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MH/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3440898908168598899L; + private static final long serialVersionUID = 3440899325547695484L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MH/D.java b/slice2java/cpp/test/Ice/inheritance/Test/MH/D.java index f34d3eeb9603..b012567f8b5e 100644 --- a/slice2java/cpp/test/Ice/inheritance/Test/MH/D.java +++ b/slice2java/cpp/test/Ice/inheritance/Test/MH/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9151096292149970805L; + private static final long serialVersionUID = 9151096549386490362L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/library/Test/UserError.java b/slice2java/cpp/test/Ice/library/Test/UserError.java index 6f95486912e8..87894b6b5718 100644 --- a/slice2java/cpp/test/Ice/library/Test/UserError.java +++ b/slice2java/cpp/test/Ice/library/Test/UserError.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1126963025970374393L; + private static final long serialVersionUID = -1126955339148607457L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/A.java b/slice2java/cpp/test/Ice/objects/Test/A.java index e9004be4d179..3981da9c781d 100644 --- a/slice2java/cpp/test/Ice/objects/Test/A.java +++ b/slice2java/cpp/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6710120990488028274L; + private static final long serialVersionUID = 2574491289118205134L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/A1.java b/slice2java/cpp/test/Ice/objects/Test/A1.java index a019117c3325..fcfdfa0d8608 100644 --- a/slice2java/cpp/test/Ice/objects/Test/A1.java +++ b/slice2java/cpp/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926752096183064550L; + private static final long serialVersionUID = -5926743857828354392L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/B.java b/slice2java/cpp/test/Ice/objects/Test/B.java index b837e01a2828..aeaee44b43c2 100644 --- a/slice2java/cpp/test/Ice/objects/Test/B.java +++ b/slice2java/cpp/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890917815933123075L; + private static final long serialVersionUID = -8890915061124060273L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/B1.java b/slice2java/cpp/test/Ice/objects/Test/B1.java index 884a11111af3..86a7ed9241c8 100644 --- a/slice2java/cpp/test/Ice/objects/Test/B1.java +++ b/slice2java/cpp/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6464369619676740476L; + private static final long serialVersionUID = -5386210068585088252L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Base.java b/slice2java/cpp/test/Ice/objects/Test/Base.java index 2030be077cd0..60730b195e77 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Base.java +++ b/slice2java/cpp/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2577327471262444350L; + private static final long serialVersionUID = 9056151123028093058L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/BaseEx.java b/slice2java/cpp/test/Ice/objects/Test/BaseEx.java index 8fe1f0ee818c..7a5a14a933b5 100644 --- a/slice2java/cpp/test/Ice/objects/Test/BaseEx.java +++ b/slice2java/cpp/test/Ice/objects/Test/BaseEx.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3897764425187945288L; + private static final long serialVersionUID = 3897767009344015354L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/C.java b/slice2java/cpp/test/Ice/objects/Test/C.java index ed6ae76f84e4..d489451ddd47 100644 --- a/slice2java/cpp/test/Ice/objects/Test/C.java +++ b/slice2java/cpp/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7625161923407868309L; + private static final long serialVersionUID = -4228613092897065881L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/COneMember.java b/slice2java/cpp/test/Ice/objects/Test/COneMember.java index 364aa99da053..332939b086e1 100644 --- a/slice2java/cpp/test/Ice/objects/Test/COneMember.java +++ b/slice2java/cpp/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050971211607389929L; + private static final long serialVersionUID = 3050979207161554779L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java index 6cad8aa8b740..90f0bedfb345 100644 --- a/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4494782593443491301L; + private static final long serialVersionUID = 3133089486588143323L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/D.java b/slice2java/cpp/test/Ice/objects/Test/D.java index 2a0dc87b2092..d9311e06a668 100644 --- a/slice2java/cpp/test/Ice/objects/Test/D.java +++ b/slice2java/cpp/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4049013599474204151L; + private static final long serialVersionUID = 5663196230649018501L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/D1.java b/slice2java/cpp/test/Ice/objects/Test/D1.java index 55a4742ba4a9..63464ff20915 100644 --- a/slice2java/cpp/test/Ice/objects/Test/D1.java +++ b/slice2java/cpp/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7600248944947392323L; + private static final long serialVersionUID = 5336152557168363331L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Derived.java b/slice2java/cpp/test/Ice/objects/Test/Derived.java index ac96ff38317f..d63f7be3d855 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Derived.java +++ b/slice2java/cpp/test/Ice/objects/Test/Derived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1587930688528970112L; + private static final long serialVersionUID = -1587930566969696216L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/E.java b/slice2java/cpp/test/Ice/objects/Test/E.java index fbb7bc448852..22f05c7367f3 100644 --- a/slice2java/cpp/test/Ice/objects/Test/E.java +++ b/slice2java/cpp/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2186446479846740101L; + private static final long serialVersionUID = -1507334691528620347L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/EBase.java b/slice2java/cpp/test/Ice/objects/Test/EBase.java index 03b7891ad45e..c213da505be6 100644 --- a/slice2java/cpp/test/Ice/objects/Test/EBase.java +++ b/slice2java/cpp/test/Ice/objects/Test/EBase.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -3137245337158924210L; + private static final long serialVersionUID = 866894018618344398L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/EDerived.java b/slice2java/cpp/test/Ice/objects/Test/EDerived.java index 2cf0a2196e9b..420d4c3a0d8e 100644 --- a/slice2java/cpp/test/Ice/objects/Test/EDerived.java +++ b/slice2java/cpp/test/Ice/objects/Test/EDerived.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 8424179521508587474L; + private static final long serialVersionUID = 550318730924269522L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/EOneMember.java b/slice2java/cpp/test/Ice/objects/Test/EOneMember.java index a19a023d7529..9c2ec15c3e27 100644 --- a/slice2java/cpp/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/cpp/test/Ice/objects/Test/EOneMember.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6225292840847671514L; + private static final long serialVersionUID = -6225290217951916204L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java index 3f3766f0f817..123ccd811d74 100644 --- a/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 1270733720973559956L; + private static final long serialVersionUID = -3374095058606775596L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/F.java b/slice2java/cpp/test/Ice/objects/Test/F.java index d797f65af0e5..459f0883db33 100644 --- a/slice2java/cpp/test/Ice/objects/Test/F.java +++ b/slice2java/cpp/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8008930334918815983L; + private static final long serialVersionUID = 8991951278425897169L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/F1.java b/slice2java/cpp/test/Ice/objects/Test/F1.java index ad9017162988..8a20631e53ee 100644 --- a/slice2java/cpp/test/Ice/objects/Test/F1.java +++ b/slice2java/cpp/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192376348072157507L; + private static final long serialVersionUID = 6192376074145715544L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/F3.java b/slice2java/cpp/test/Ice/objects/Test/F3.java index 3e2ab56cc027..3d9d98ca0ffe 100644 --- a/slice2java/cpp/test/Ice/objects/Test/F3.java +++ b/slice2java/cpp/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3807066061704654977L; + private static final long serialVersionUID = -4564903792854448705L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Inner/A.java b/slice2java/cpp/test/Ice/objects/Test/Inner/A.java index 6c7acdd515f3..ef2e4378f304 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/cpp/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1425265727514774377L; + private static final long serialVersionUID = -1425257528023664731L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Inner/Ex.java b/slice2java/cpp/test/Ice/objects/Test/Inner/Ex.java index 34cef06b8d23..e5cedb8dbbb5 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/cpp/test/Ice/objects/Test/Inner/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2337233972989141213L; + private static final long serialVersionUID = -2337225690724454639L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/A.java b/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/A.java index bffa340bc754..7426a34b0e2b 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1298684287013614654L; + private static final long serialVersionUID = -1298675917243160720L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/Ex.java index ee2276153ce1..9f9f7dfbdd5c 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1842233662073857991L; + private static final long serialVersionUID = 1842241618575681077L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/K.java b/slice2java/cpp/test/Ice/objects/Test/K.java index d879aa91d14b..15dbf5695e87 100644 --- a/slice2java/cpp/test/Ice/objects/Test/K.java +++ b/slice2java/cpp/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645167721642833996L; + private static final long serialVersionUID = 4645159643430151998L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/L.java b/slice2java/cpp/test/Ice/objects/Test/L.java index 4c7db8638590..c6b4405f19b7 100644 --- a/slice2java/cpp/test/Ice/objects/Test/L.java +++ b/slice2java/cpp/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629744221611108561L; + private static final long serialVersionUID = 6629735856692611235L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/M.java b/slice2java/cpp/test/Ice/objects/Test/M.java index c6b2f8b01873..fb0c60b57340 100644 --- a/slice2java/cpp/test/Ice/objects/Test/M.java +++ b/slice2java/cpp/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088097920229822819L; + private static final long serialVersionUID = -8088100757351353809L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Recursive.java b/slice2java/cpp/test/Ice/objects/Test/Recursive.java index 3125409bf52d..86d960694c4f 100644 --- a/slice2java/cpp/test/Ice/objects/Test/Recursive.java +++ b/slice2java/cpp/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617883806743595802L; + private static final long serialVersionUID = 3617875728530737512L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/S.java b/slice2java/cpp/test/Ice/objects/Test/S.java index 64032844b94e..4c46f66372ba 100644 --- a/slice2java/cpp/test/Ice/objects/Test/S.java +++ b/slice2java/cpp/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481772701349717986L; + private static final long serialVersionUID = 481769995643926288L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/SOneMember.java b/slice2java/cpp/test/Ice/objects/Test/SOneMember.java index 3b554ec306ef..c984dc0b23ab 100644 --- a/slice2java/cpp/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/cpp/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227754027657113136L; + private static final long serialVersionUID = 6227751151633923522L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java index c53609c13544..cbf4796bcbd8 100644 --- a/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = 2953224397119979778L; + private static final long serialVersionUID = -3967260670254979006L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/StructKey.java b/slice2java/cpp/test/Ice/objects/Test/StructKey.java index 1b27519c69b3..06a1baea95d6 100644 --- a/slice2java/cpp/test/Ice/objects/Test/StructKey.java +++ b/slice2java/cpp/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = -2105228315199558967L; + private static final long serialVersionUID = -1218986883434852343L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java index 59b241774299..10e523168b55 100644 --- a/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723850574326308229L; + private static final long serialVersionUID = 2723846312495687919L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/MyClass1.java b/slice2java/cpp/test/Ice/operations/Test/MyClass1.java index 33808bd0d52f..a2a474777c8c 100644 --- a/slice2java/cpp/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/cpp/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6635087173421426049L; + private static final long serialVersionUID = 4706122473462486443L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct.java index 78058974cde3..c793cb807342 100644 --- a/slice2java/cpp/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/cpp/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = 1064445876687162845L; + private static final long serialVersionUID = -3834754720796015459L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java index 0d7cde8c8479..4eb2051baeb1 100644 --- a/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = -4294625552386607800L; + private static final long serialVersionUID = 4096202800206179362L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/Structure.java b/slice2java/cpp/test/Ice/operations/Test/Structure.java index 1ce302baee67..ac8ddb958ad5 100644 --- a/slice2java/cpp/test/Ice/operations/Test/Structure.java +++ b/slice2java/cpp/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = -3889724957572886633L; + private static final long serialVersionUID = 7520111284080477757L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/A.java b/slice2java/cpp/test/Ice/optional/Test/A.java index 6989baadc464..7e5791685e18 100644 --- a/slice2java/cpp/test/Ice/optional/Test/A.java +++ b/slice2java/cpp/test/Ice/optional/Test/A.java @@ -213,7 +213,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7896478402489303536L; + private static final long serialVersionUID = -5805113777185940080L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/B.java b/slice2java/cpp/test/Ice/optional/Test/B.java index aaa6db06a094..09b026cd165e 100644 --- a/slice2java/cpp/test/Ice/optional/Test/B.java +++ b/slice2java/cpp/test/Ice/optional/Test/B.java @@ -108,7 +108,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 406850144850841059L; + private static final long serialVersionUID = 891638080634363619L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/C.java b/slice2java/cpp/test/Ice/optional/Test/C.java index 76090c5873ee..82b9f6184beb 100644 --- a/slice2java/cpp/test/Ice/optional/Test/C.java +++ b/slice2java/cpp/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1190552898042676221L; + private static final long serialVersionUID = -6889863921435169731L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/DerivedException.java b/slice2java/cpp/test/Ice/optional/Test/DerivedException.java index 8b778dbadbc0..18e682a88b8d 100644 --- a/slice2java/cpp/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/cpp/test/Ice/optional/Test/DerivedException.java @@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4395493229446171032L; + private static final long serialVersionUID = 2951493725212995616L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/E.java b/slice2java/cpp/test/Ice/optional/Test/E.java index 0febb037dcee..f58456451476 100644 --- a/slice2java/cpp/test/Ice/optional/Test/E.java +++ b/slice2java/cpp/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850740717959131621L; + private static final long serialVersionUID = -1850731250380273453L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/F.java b/slice2java/cpp/test/Ice/optional/Test/F.java index 1995c47ff91a..7dfd90436e6f 100644 --- a/slice2java/cpp/test/Ice/optional/Test/F.java +++ b/slice2java/cpp/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430496707075395736L; + private static final long serialVersionUID = -6430490129465989600L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java b/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java index 0d97487846cf..acffd56ecd67 100644 --- a/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569605360611910196L; + private static final long serialVersionUID = 1569609373283896288L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/G.java b/slice2java/cpp/test/Ice/optional/Test/G.java index 2dd6ee0b9866..4350aab53c02 100644 --- a/slice2java/cpp/test/Ice/optional/Test/G.java +++ b/slice2java/cpp/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8378604108042431315L; + private static final long serialVersionUID = 2251326457270521171L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/G1.java b/slice2java/cpp/test/Ice/optional/Test/G1.java index 0de6c8d53de9..3ee0f41b6d7b 100644 --- a/slice2java/cpp/test/Ice/optional/Test/G1.java +++ b/slice2java/cpp/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339780616711267862L; + private static final long serialVersionUID = 7339787524745052142L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/G2.java b/slice2java/cpp/test/Ice/optional/Test/G2.java index e593b11235da..a9d9d13a07f0 100644 --- a/slice2java/cpp/test/Ice/optional/Test/G2.java +++ b/slice2java/cpp/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824549895367856497L; + private static final long serialVersionUID = 3824559362962779403L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java b/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java index 57a9efe0b649..245218bbfe8f 100644 --- a/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java @@ -1675,7 +1675,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -164847949080704094L; + private static final long serialVersionUID = -5796356671530338679L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/OneOptional.java b/slice2java/cpp/test/Ice/optional/Test/OneOptional.java index c28dd578821a..e66a758865e0 100644 --- a/slice2java/cpp/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/cpp/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219600516618639398L; + private static final long serialVersionUID = -7219607419599529586L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalException.java b/slice2java/cpp/test/Ice/optional/Test/OptionalException.java index f542988dc0da..43f25879b1ac 100644 --- a/slice2java/cpp/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/cpp/test/Ice/optional/Test/OptionalException.java @@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 974121417601580606L; + private static final long serialVersionUID = -1663394749915043162L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java index 29b70993d29c..269b2b23e9a3 100644 --- a/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7684150772319020155L; + private static final long serialVersionUID = 1142835911905206907L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/RequiredException.java b/slice2java/cpp/test/Ice/optional/Test/RequiredException.java index 90c69fd56849..851a7d38a153 100644 --- a/slice2java/cpp/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/cpp/test/Ice/optional/Test/RequiredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894242740104921055L; + private static final long serialVersionUID = 2894241302826145767L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java b/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java index bdf9730359a3..9325394226bf 100644 --- a/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700983706349869804L; + private static final long serialVersionUID = 6700996064474315576L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/VarStruct.java b/slice2java/cpp/test/Ice/optional/Test/VarStruct.java index 7a506987ba75..6e270fb745b7 100644 --- a/slice2java/cpp/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/cpp/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912288250872319586L; + private static final long serialVersionUID = -1912281342839109274L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/WD.java b/slice2java/cpp/test/Ice/optional/Test/WD.java index 070829707979..ce9eeb91c315 100644 --- a/slice2java/cpp/test/Ice/optional/Test/WD.java +++ b/slice2java/cpp/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1760296404381937972L; + private static final long serialVersionUID = -709342053722388128L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/C.java b/slice2java/cpp/test/Ice/scope/Test/C.java index bba65bbdb847..6896981cf1f1 100644 --- a/slice2java/cpp/test/Ice/scope/Test/C.java +++ b/slice2java/cpp/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190247365606850510L; + private static final long serialVersionUID = -5190250275348004871L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/C1.java b/slice2java/cpp/test/Ice/scope/Test/C1.java index aa9c3e23e9ae..51c2723f5349 100644 --- a/slice2java/cpp/test/Ice/scope/Test/C1.java +++ b/slice2java/cpp/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893232947555688270L; + private static final long serialVersionUID = 8893230242022010910L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/C2.java b/slice2java/cpp/test/Ice/scope/Test/C2.java index 0223f6e91447..0a5d0cdd10e3 100644 --- a/slice2java/cpp/test/Ice/scope/Test/C2.java +++ b/slice2java/cpp/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8067786232560966691L; + private static final long serialVersionUID = 227432137868434483L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/Inner/C.java b/slice2java/cpp/test/Ice/scope/Test/Inner/C.java index 283e892e4c1f..be23a4e95d47 100644 --- a/slice2java/cpp/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/cpp/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615623095623402895L; + private static final long serialVersionUID = 4615625840081474125L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/C.java index 545544310c0d..53e6513bfea7 100644 --- a/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672588618999439650L; + private static final long serialVersionUID = 672580618312883918L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/S.java index e6c2c9b2358d..07fa1baea4f1 100644 --- a/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654439356384162837L; + private static final long serialVersionUID = 8654442227227522912L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/Inner/S.java b/slice2java/cpp/test/Ice/scope/Test/Inner/S.java index 8c6c54a98c32..15a3a7373aed 100644 --- a/slice2java/cpp/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/cpp/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694621348386493913L; + private static final long serialVersionUID = 3694613143628700076L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/S.java b/slice2java/cpp/test/Ice/scope/Test/S.java index 722442e7c096..320334f518c1 100644 --- a/slice2java/cpp/test/Ice/scope/Test/S.java +++ b/slice2java/cpp/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159697536633797287L; + private static final long serialVersionUID = 2159705576083762834L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/S1.java b/slice2java/cpp/test/Ice/scope/Test/S1.java index c50506ed48f5..6904fc09d6fa 100644 --- a/slice2java/cpp/test/Ice/scope/Test/S1.java +++ b/slice2java/cpp/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241674667145430775L; + private static final long serialVersionUID = 1241671922693474215L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/S2.java b/slice2java/cpp/test/Ice/scope/Test/S2.java index eebfb88c3b8a..4bd183c8b5dc 100644 --- a/slice2java/cpp/test/Ice/scope/Test/S2.java +++ b/slice2java/cpp/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 3843641862933155748L; + private static final long serialVersionUID = 2913256256570966986L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java index a80ebfebc6ea..dd356eceea15 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477024261853883716L; + private static final long serialVersionUID = -477021052634878738L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java index 4867aae506be..dfe8468dd13c 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485214284185151834L; + private static final long serialVersionUID = 3485211717945168136L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 0625f84b46e2..7e5bc451d389 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717377527450406955L; + private static final long serialVersionUID = 1717375165415275769L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index f95a5cd73203..f841617285a2 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384918179589208270L; + private static final long serialVersionUID = -7384921262397543968L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java index eea22a81ecce..09687a165783 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3424368777087924326L; + private static final long serialVersionUID = 3424372328610797316L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index eebf53a05fe7..635fbb43d64f 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1172607984720207369L; + private static final long serialVersionUID = -1172605920968369067L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index d16fe56b8f3b..9f2999a4e9fe 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1126115330151775730L; + private static final long serialVersionUID = -1126117233770789972L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index 8167175ddd5d..e5a7076564c0 100644 --- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java +++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2097584960329751954L; + private static final long serialVersionUID = -2097581408787921652L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/B.java b/slice2java/cpp/test/Ice/slicing/objects/Test/B.java index ec6901ed1197..e173b035be65 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8826023961438152655L; + private static final long serialVersionUID = 2744262919521937179L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/cpp/test/Ice/slicing/objects/Test/BaseException.java index 4c436f1c616c..69c42473909e 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 6552119558547758723L; + private static final long serialVersionUID = 1514937447323947863L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java index 150afdce6f81..805d85b2b807 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6397006192627140783L; + private static final long serialVersionUID = -6397005948762417053L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPDerived.java index 73517fff4ecd..fb5490e87843 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066884651074411485L; + private static final long serialVersionUID = -9066880440730881550L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/D1.java b/slice2java/cpp/test/Ice/slicing/objects/Test/D1.java index 82d342dcc0eb..a942b783f3f8 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3100043105160701172L; + private static final long serialVersionUID = -1034687471697363976L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/D2.java b/slice2java/cpp/test/Ice/slicing/objects/Test/D2.java index 87c3fdbef17a..b19b8f614582 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/D2.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3296373349781097328L; + private static final long serialVersionUID = -4019872887755373872L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/D3.java b/slice2java/cpp/test/Ice/slicing/objects/Test/D3.java index 6704c8b6a6fb..c1fea5bc5d2d 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8172759112907982458L; + private static final long serialVersionUID = 8305713623061988170L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/D4.java b/slice2java/cpp/test/Ice/slicing/objects/Test/D4.java index 166d3b79f960..c2883ba82842 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/D4.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1980180990362347379L; + private static final long serialVersionUID = -7594122659804373517L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/cpp/test/Ice/slicing/objects/Test/DerivedException.java index 72630a742b21..8a82cde0c99c 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -6072192690386126830L; + private static final long serialVersionUID = 2854451806297831549L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java index b80347747bab..3d5123038a20 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655930669524022475L; + private static final long serialVersionUID = -7655923648976181528L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/cpp/test/Ice/slicing/objects/Test/Hidden.java index dba673b71d73..8a7a49d4e290 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271121355927713457L; + private static final long serialVersionUID = -2271128376200497429L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/MyClass.java b/slice2java/cpp/test/Ice/slicing/objects/Test/MyClass.java index 30b12d80309d..fd71244e73d8 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/MyClass.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4147528895919204487L; + private static final long serialVersionUID = 4147521091490729634L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PBase.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PBase.java index 8e8aaaa631d4..bdaaa1ea6882 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481709659686122892L; + private static final long serialVersionUID = 481713549488474134L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived.java index 6a887cf305e8..12af7da6bb67 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426891054453752687L; + private static final long serialVersionUID = -4426891140905833181L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived2.java index 1b4768682c08..b5bb248ffd80 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850542599428176590L; + private static final long serialVersionUID = 850542520731373915L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived3.java index 32274b639349..86c428960cda 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328900075023733553L; + private static final long serialVersionUID = -4328899983568547100L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PCUnknown.java index c1d1cb10f956..a4b21f9db5ac 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081814564389603233L; + private static final long serialVersionUID = -5081814653424491676L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PDerived.java index ecb7852df44f..dbb2c9996777 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643089773436539620L; + private static final long serialVersionUID = 643085563399565493L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PNode.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PNode.java index ac89e9b1f591..cdec1b3f8478 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2437998820306859840L; + private static final long serialVersionUID = -2438013940840367961L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown.java index 26fe0ba26af1..69282bef343f 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6562617839282600372L; + private static final long serialVersionUID = -7559152782185375799L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown2.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown2.java index 85b69781fb5e..67f12c4d2367 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown2.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8813709524748900271L; + private static final long serialVersionUID = -8813705096379260428L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java index 146e20bda601..ba79e968a3ec 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651536077478229940L; + private static final long serialVersionUID = 3651529057061182555L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SBSKnownDerived.java index 57d9e1db2596..bb265b791ecb 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804375657062028305L; + private static final long serialVersionUID = 8804382677494429822L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java index 63e5865f7fe9..dd866b7aa477 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4989067282460006587L; + private static final long serialVersionUID = -4989054022871028896L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SBase.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SBase.java index b645083eaa50..e3a2b731fc7b 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353757796053070169L; + private static final long serialVersionUID = -5353762006232125432L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SS1.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SS1.java index c5f89bb233b9..1315cf7b6549 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522143859947663306L; + private static final long serialVersionUID = -6522139649820103670L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SS2.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SS2.java index a8f6ebdf7320..ec2ab0a5eb74 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620281174236897909L; + private static final long serialVersionUID = 7620288194605514249L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SS3.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SS3.java index 512a1dd19d25..21c5c5da162e 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = 5901336788009611050L; + private static final long serialVersionUID = 870411908632924636L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java index 656073343303..2a5f79c7fb3d 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3351787202647977235L; + private static final long serialVersionUID = 3476493440086754611L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/UnknownDerivedException.java b/slice2java/cpp/test/Ice/slicing/objects/Test/UnknownDerivedException.java index fde9f2c26a33..f5ad84dfe9f2 100644 --- a/slice2java/cpp/test/Ice/slicing/objects/Test/UnknownDerivedException.java +++ b/slice2java/cpp/test/Ice/slicing/objects/Test/UnknownDerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -576246023560135964L; + private static final long serialVersionUID = -5596942029505443196L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java b/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java index 000e29e7f98e..17fbc07e04b6 100644 --- a/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java +++ b/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final ClassStruct _nullMarshalValue = new ClassStruct(); /** @hidden */ - private static final long serialVersionUID = 4995619200473389599L; + private static final long serialVersionUID = 4995617374351629337L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java b/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java index f4f7e1399bea..1a446802826c 100644 --- a/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java +++ b/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LargeStruct _nullMarshalValue = new LargeStruct(); /** @hidden */ - private static final long serialVersionUID = -1842417167663843393L; + private static final long serialVersionUID = 323552523533192895L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/MyClass.java b/slice2java/cpp/test/Ice/stream/Test/MyClass.java index 9fc728ab2cb2..41e96c22afb1 100644 --- a/slice2java/cpp/test/Ice/stream/Test/MyClass.java +++ b/slice2java/cpp/test/Ice/stream/Test/MyClass.java @@ -85,7 +85,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2318880936715799032L; + private static final long serialVersionUID = 5036545369282083592L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/stream/Test/MyException.java b/slice2java/cpp/test/Ice/stream/Test/MyException.java index 95cf3824886c..c1a7b0e72466 100644 --- a/slice2java/cpp/test/Ice/stream/Test/MyException.java +++ b/slice2java/cpp/test/Ice/stream/Test/MyException.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 5734225776110770174L; + private static final long serialVersionUID = 5734225272438270968L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java b/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java index 51a8f7f80b98..7d6cbb91d74a 100644 --- a/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java +++ b/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8942048997203017753L; + private static final long serialVersionUID = -1919484400607431385L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java index aec49edafa1d..6c139264e850 100644 --- a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java +++ b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1404710043449441609L; + private static final long serialVersionUID = -1404702441864232399L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java index f570c776bed2..ad83d1961c5d 100644 --- a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java +++ b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java @@ -227,5 +227,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final NestedStruct _nullMarshalValue = new NestedStruct(); /** @hidden */ - private static final long serialVersionUID = 218858410752471255L; + private static final long serialVersionUID = -3334265682813421423L; } diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java index 312d46352e8d..fcea21f54b04 100644 --- a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java +++ b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8562124654087644283L; + private static final long serialVersionUID = -8562123669974820861L; } diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java index 3100c648e36c..911e9c9dda8c 100644 --- a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java +++ b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java @@ -227,5 +227,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final NestedStruct2 _nullMarshalValue = new NestedStruct2(); /** @hidden */ - private static final long serialVersionUID = 8074857730117908245L; + private static final long serialVersionUID = -1769748847515445421L; } diff --git a/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java b/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java index 0dc86f0da3bc..4da390426297 100644 --- a/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java +++ b/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java @@ -58,5 +58,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 9139852970441585263L; + private static final long serialVersionUID = 7084677211386482932L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Base.java b/slice2java/csharp/test/Ice/defaultValue/Test/Base.java index 85cceeeac388..870b75dcab94 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5024134247012458911L; + private static final long serialVersionUID = 8934396885784113488L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java index d62e09d2502a..1cefd3068c89 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java @@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 587491716991716395L; + private static final long serialVersionUID = 7389670979426412388L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java index 623430f28959..8a60fcc445b0 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -55,7 +55,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6737678427883685584L; + private static final long serialVersionUID = -1283210896720287267L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 1b75733d7b16..0f0552bb3f93 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1172408738597349561L; + private static final long serialVersionUID = -7441311728562312740L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java index e9802424d0a5..957245021b3d 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2997374312958511363L; + private static final long serialVersionUID = -363412237216569140L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java b/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java index d1b3816c65d6..df27b8b9419e 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 53216545304634377L; + private static final long serialVersionUID = 5928216091537446735L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java index 4736144b8134..0dae7690d873 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java @@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -6751858591738068162L; + private static final long serialVersionUID = -3043439684347541640L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index c1977c8418c1..1ed15183be8f 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5902735747309302356L; + private static final long serialVersionUID = -3169910131615125127L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 130bec23c505..c43a0ee8e690 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -64,5 +64,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2628185542058628681L; + private static final long serialVersionUID = -3998467605830362772L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java index a0c2fe7be327..1e2bf5f90cd8 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java @@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 8027553950488163027L; + private static final long serialVersionUID = 7277099365452002204L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java index da4df19a49e3..5e0a9d942e7a 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - private static final long serialVersionUID = 5127389064911617736L; + private static final long serialVersionUID = 5127394733181416836L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java index 38cef5aa478b..b79f0be418e5 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final InnerStruct2 _nullMarshalValue = new InnerStruct2(); /** @hidden */ - private static final long serialVersionUID = -7135060881893692065L; + private static final long serialVersionUID = -7135056375962941651L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java index 96ed20f14b1a..5576130670a7 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = 8949072503314635126L; + private static final long serialVersionUID = 717909364614127583L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java index 33b91d407165..821cc33dfa3f 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = 6755448896754585024L; + private static final long serialVersionUID = 2017909739462770923L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java index 0b9ec4d3de0d..bc58d60c8132 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java @@ -367,5 +367,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct3 _nullMarshalValue = new Struct3(); /** @hidden */ - private static final long serialVersionUID = -1592002317391522133L; + private static final long serialVersionUID = 7091247318904414274L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java index 9d7bf2005046..3938ccfaa5e0 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java @@ -367,5 +367,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct4 _nullMarshalValue = new Struct4(); /** @hidden */ - private static final long serialVersionUID = 5844997788077098220L; + private static final long serialVersionUID = -8743490292102286651L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java index 58bef1611d3e..0b57ac781e2b 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -288,5 +288,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - private static final long serialVersionUID = -2696379260952473351L; + private static final long serialVersionUID = -4490453910158932569L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java index 09abd86a7981..d8b273cb64fe 100644 --- a/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java +++ b/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java @@ -311,5 +311,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final StructProperty _nullMarshalValue = new StructProperty(); /** @hidden */ - private static final long serialVersionUID = -141466380660644109L; + private static final long serialVersionUID = -2217084483377636292L; } diff --git a/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java b/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java index 93673c51576f..35584e2f06ad 100644 --- a/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java +++ b/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java @@ -152,5 +152,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final TEstNv _nullMarshalValue = new TEstNv(); /** @hidden */ - private static final long serialVersionUID = -8977309457765845484L; + private static final long serialVersionUID = 4837403127120171646L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/A.java b/slice2java/csharp/test/Ice/exceptions/Test/A.java index 13badbfa335b..626cd18ba568 100644 --- a/slice2java/csharp/test/Ice/exceptions/Test/A.java +++ b/slice2java/csharp/test/Ice/exceptions/Test/A.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7823746746639905343L; + private static final long serialVersionUID = 7823740716695383164L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/B.java b/slice2java/csharp/test/Ice/exceptions/Test/B.java index 881f9f884550..f188d4b37f29 100644 --- a/slice2java/csharp/test/Ice/exceptions/Test/B.java +++ b/slice2java/csharp/test/Ice/exceptions/Test/B.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3861409151872110081L; + private static final long serialVersionUID = -3861420802285233604L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/C.java b/slice2java/csharp/test/Ice/exceptions/Test/C.java index 8b83805745ea..fb9c88201961 100644 --- a/slice2java/csharp/test/Ice/exceptions/Test/C.java +++ b/slice2java/csharp/test/Ice/exceptions/Test/C.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1080700437842690623L; + private static final long serialVersionUID = 1080694407898168444L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/D.java b/slice2java/csharp/test/Ice/exceptions/Test/D.java index 3e53719dab9f..bfeecb7208fc 100644 --- a/slice2java/csharp/test/Ice/exceptions/Test/D.java +++ b/slice2java/csharp/test/Ice/exceptions/Test/D.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4780383116229968127L; + private static final long serialVersionUID = 4780371465816844604L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Color.java b/slice2java/csharp/test/Ice/hash/Test/Color.java index d1c602475b0c..798d096514da 100644 --- a/slice2java/csharp/test/Ice/hash/Test/Color.java +++ b/slice2java/csharp/test/Ice/hash/Test/Color.java @@ -168,5 +168,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Color _nullMarshalValue = new Color(); /** @hidden */ - private static final long serialVersionUID = -4895985573324333322L; + private static final long serialVersionUID = 5004346630930953718L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java b/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java index 78dae7e798fd..626391e4da96 100644 --- a/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java +++ b/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final ColorPalette _nullMarshalValue = new ColorPalette(); /** @hidden */ - private static final long serialVersionUID = -2820070666668116543L; + private static final long serialVersionUID = -2820066216002223830L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Draw.java b/slice2java/csharp/test/Ice/hash/Test/Draw.java index 022bcc1d51b8..846c493c8509 100644 --- a/slice2java/csharp/test/Ice/hash/Test/Draw.java +++ b/slice2java/csharp/test/Ice/hash/Test/Draw.java @@ -166,5 +166,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Draw _nullMarshalValue = new Draw(); /** @hidden */ - private static final long serialVersionUID = -8993466183083065853L; + private static final long serialVersionUID = -1990211509237083673L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java index 607245e7921c..cbc57f83ce4e 100644 --- a/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java +++ b/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java @@ -54,5 +54,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1224578172547540945L; + private static final long serialVersionUID = -1224574238582034497L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java index d89d656efbb0..605062b1655b 100644 --- a/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java +++ b/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java @@ -54,5 +54,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8727126819449912547L; + private static final long serialVersionUID = -8727128545000781555L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/OtherException.java b/slice2java/csharp/test/Ice/hash/Test/OtherException.java index c512c6a0b2ac..700e7d1dac2d 100644 --- a/slice2java/csharp/test/Ice/hash/Test/OtherException.java +++ b/slice2java/csharp/test/Ice/hash/Test/OtherException.java @@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -800124184741074921L; + private static final long serialVersionUID = -2276039104092386731L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Pen.java b/slice2java/csharp/test/Ice/hash/Test/Pen.java index 0f83a955ec05..d46294667942 100644 --- a/slice2java/csharp/test/Ice/hash/Test/Pen.java +++ b/slice2java/csharp/test/Ice/hash/Test/Pen.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8016251053187958603L; + private static final long serialVersionUID = 1089273520092973107L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/hash/Test/Point.java b/slice2java/csharp/test/Ice/hash/Test/Point.java index df86f7437d6d..eded047af0af 100644 --- a/slice2java/csharp/test/Ice/hash/Test/Point.java +++ b/slice2java/csharp/test/Ice/hash/Test/Point.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Point _nullMarshalValue = new Point(); /** @hidden */ - private static final long serialVersionUID = -7231186159997112400L; + private static final long serialVersionUID = 680780211549647536L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/PointD.java b/slice2java/csharp/test/Ice/hash/Test/PointD.java index 69a1da694df7..dc0d32f1da7d 100644 --- a/slice2java/csharp/test/Ice/hash/Test/PointD.java +++ b/slice2java/csharp/test/Ice/hash/Test/PointD.java @@ -158,5 +158,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final PointD _nullMarshalValue = new PointD(); /** @hidden */ - private static final long serialVersionUID = -7354910385003706939L; + private static final long serialVersionUID = 2986932153671027947L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/PointF.java b/slice2java/csharp/test/Ice/hash/Test/PointF.java index a144fc7b2e54..9de33ec9a856 100644 --- a/slice2java/csharp/test/Ice/hash/Test/PointF.java +++ b/slice2java/csharp/test/Ice/hash/Test/PointF.java @@ -158,5 +158,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final PointF _nullMarshalValue = new PointF(); /** @hidden */ - private static final long serialVersionUID = 4397565968278829227L; + private static final long serialVersionUID = 9005738797461645383L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Polyline.java b/slice2java/csharp/test/Ice/hash/Test/Polyline.java index cfca8f1eb05a..ee3a5b9a2aaa 100644 --- a/slice2java/csharp/test/Ice/hash/Test/Polyline.java +++ b/slice2java/csharp/test/Ice/hash/Test/Polyline.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final Polyline _nullMarshalValue = new Polyline(); /** @hidden */ - private static final long serialVersionUID = -345033362048901910L; + private static final long serialVersionUID = -345037091677647455L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java index a2c00ebe11df..31289ef98c66 100644 --- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java +++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2568818253690588468L; + private static final long serialVersionUID = 2568818238034133477L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java index e20d512b685a..01c2612b3bfb 100644 --- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java +++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6709847383354508423L; + private static final long serialVersionUID = -6709847199847606296L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java index 31bbf5f0313f..3e1bffe99887 100644 --- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java +++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 244432954302666843L; + private static final long serialVersionUID = 244432936067879946L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java index 977780b85b2a..942c7110d1a7 100644 --- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java +++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1207063517521294298L; + private static final long serialVersionUID = -1207063701028196425L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java index 3b2f49aa3707..124da5bbdc79 100644 --- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java +++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7599601168320483500L; + private static final long serialVersionUID = 7599601191560004989L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java index 0c5b8fc567f6..bc00a16e72aa 100644 --- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java +++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9211539988954294793L; + private static final long serialVersionUID = 9211536698441809054L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java index b83d403290f2..29f7d4a08c4b 100644 --- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java +++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 770571729203577997L; + private static final long serialVersionUID = 770569404494829896L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java index e71ba261d65d..0a1c823563a6 100644 --- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java +++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4823069768391151802L; + private static final long serialVersionUID = -4823067761444774703L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java index 244219e5f534..74ef54ab57d0 100644 --- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java +++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2279090427681151633L; + private static final long serialVersionUID = 2279087139662718804L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/A.java b/slice2java/csharp/test/Ice/objects/Test/A.java index 2788379abb04..abdf026598de 100644 --- a/slice2java/csharp/test/Ice/objects/Test/A.java +++ b/slice2java/csharp/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7892493372096224909L; + private static final long serialVersionUID = 439753118652559603L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/A1.java b/slice2java/csharp/test/Ice/objects/Test/A1.java index 9e3c248c7a51..79fac37f97b6 100644 --- a/slice2java/csharp/test/Ice/objects/Test/A1.java +++ b/slice2java/csharp/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926752302827419333L; + private static final long serialVersionUID = -5926739043237962466L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/B.java b/slice2java/csharp/test/Ice/objects/Test/B.java index 102d38e0af9f..45726dd380ae 100644 --- a/slice2java/csharp/test/Ice/objects/Test/B.java +++ b/slice2java/csharp/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890918012154242869L; + private static final long serialVersionUID = -8890911695651173202L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/B1.java b/slice2java/csharp/test/Ice/objects/Test/B1.java index 5fe8c749ee1a..abc59410e205 100644 --- a/slice2java/csharp/test/Ice/objects/Test/B1.java +++ b/slice2java/csharp/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7740984284559208316L; + private static final long serialVersionUID = -7955622774101959548L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/Base.java b/slice2java/csharp/test/Ice/objects/Test/Base.java index b481a5db07a6..49616bc174c2 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Base.java +++ b/slice2java/csharp/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1980831366200637289L; + private static final long serialVersionUID = 332071504378015415L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/C.java b/slice2java/csharp/test/Ice/objects/Test/C.java index 7c0d3c205b5b..8c2547f42884 100644 --- a/slice2java/csharp/test/Ice/objects/Test/C.java +++ b/slice2java/csharp/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -793497002275829332L; + private static final long serialVersionUID = 8713068064648169129L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/COneMember.java b/slice2java/csharp/test/Ice/objects/Test/COneMember.java index 2965049086aa..532fd7d0d21b 100644 --- a/slice2java/csharp/test/Ice/objects/Test/COneMember.java +++ b/slice2java/csharp/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050971082469176982L; + private static final long serialVersionUID = 3050964931282998131L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java index 5c86aba49fb7..95f57cdb0ec1 100644 --- a/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -661921178406725093L; + private static final long serialVersionUID = -1044582580988822885L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/D.java b/slice2java/csharp/test/Ice/objects/Test/D.java index 93ef84026b88..6b1bd4fc54fb 100644 --- a/slice2java/csharp/test/Ice/objects/Test/D.java +++ b/slice2java/csharp/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6006700077490962876L; + private static final long serialVersionUID = 8567402275926394873L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/D1.java b/slice2java/csharp/test/Ice/objects/Test/D1.java index 68dbfb997647..1aebc8e32d16 100644 --- a/slice2java/csharp/test/Ice/objects/Test/D1.java +++ b/slice2java/csharp/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4249367013532171709L; + private static final long serialVersionUID = 376212569067050307L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/E.java b/slice2java/csharp/test/Ice/objects/Test/E.java index abaf9a0ce592..654044233979 100644 --- a/slice2java/csharp/test/Ice/objects/Test/E.java +++ b/slice2java/csharp/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4625749494244351792L; + private static final long serialVersionUID = 6390053439067683856L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/EBase.java b/slice2java/csharp/test/Ice/objects/Test/EBase.java index cf38cf9240c7..1de0beb155b2 100644 --- a/slice2java/csharp/test/Ice/objects/Test/EBase.java +++ b/slice2java/csharp/test/Ice/objects/Test/EBase.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -1355585485755869874L; + private static final long serialVersionUID = 5733749642526859342L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/EDerived.java b/slice2java/csharp/test/Ice/objects/Test/EDerived.java index b474d1c6c545..be9d5bc1c6a7 100644 --- a/slice2java/csharp/test/Ice/objects/Test/EDerived.java +++ b/slice2java/csharp/test/Ice/objects/Test/EDerived.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1800199876430791598L; + private static final long serialVersionUID = 8944851369205181394L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/EOneMember.java b/slice2java/csharp/test/Ice/objects/Test/EOneMember.java index 5b78471316c2..73c122048b42 100644 --- a/slice2java/csharp/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/csharp/test/Ice/objects/Test/EOneMember.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6225293042473399655L; + private static final long serialVersionUID = -6225279948203760836L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java index 7f00d740eefd..478021697c41 100644 --- a/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 7030051708160722452L; + private static final long serialVersionUID = -5199346038102348012L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/F.java b/slice2java/csharp/test/Ice/objects/Test/F.java index 5f84daf8daa6..caf2b4b6a833 100644 --- a/slice2java/csharp/test/Ice/objects/Test/F.java +++ b/slice2java/csharp/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5479530366820114961L; + private static final long serialVersionUID = -6036134146491180975L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/F1.java b/slice2java/csharp/test/Ice/objects/Test/F1.java index 107c629f8b8d..a5d11859f6ea 100644 --- a/slice2java/csharp/test/Ice/objects/Test/F1.java +++ b/slice2java/csharp/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192372684120191238L; + private static final long serialVersionUID = 6192369272214280464L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/F3.java b/slice2java/csharp/test/Ice/objects/Test/F3.java index 0cb7e541740e..43e8375f82da 100644 --- a/slice2java/csharp/test/Ice/objects/Test/F3.java +++ b/slice2java/csharp/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7003866403833424877L; + private static final long serialVersionUID = 6429492161869065555L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/IBase.java b/slice2java/csharp/test/Ice/objects/Test/IBase.java index 27a72c6ceb09..347dbb2befb8 100644 --- a/slice2java/csharp/test/Ice/objects/Test/IBase.java +++ b/slice2java/csharp/test/Ice/objects/Test/IBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4060269109591636093L; + private static final long serialVersionUID = 4060270973248777176L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/IDerived.java b/slice2java/csharp/test/Ice/objects/Test/IDerived.java index b90cd2339a07..d9b1e61d22bd 100644 --- a/slice2java/csharp/test/Ice/objects/Test/IDerived.java +++ b/slice2java/csharp/test/Ice/objects/Test/IDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7299535394067731557L; + private static final long serialVersionUID = 7299535935261672384L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/Inner/A.java b/slice2java/csharp/test/Ice/objects/Test/Inner/A.java index 35bfe7491eed..5d0b73c9b5a6 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/csharp/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1425265934210087839L; + private static final long serialVersionUID = -1425253997086479676L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/Inner/Ex.java b/slice2java/csharp/test/Ice/objects/Test/Inner/Ex.java index e0657bff4e8b..4f87fb416b0d 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/csharp/test/Ice/objects/Test/Inner/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2337234096809206782L; + private static final long serialVersionUID = -2337225050144945753L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/A.java b/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/A.java index 3f95f3ac1f26..1e63a3b2e8d6 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1298683837723497135L; + private static final long serialVersionUID = -1298688916984227020L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/Ex.java index 5ab44ce99ae1..06e6da825627 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1842233532784747174L; + private static final long serialVersionUID = 1842226059123589443L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/K.java b/slice2java/csharp/test/Ice/objects/Test/K.java index f293ebb59a3f..c99797805faf 100644 --- a/slice2java/csharp/test/Ice/objects/Test/K.java +++ b/slice2java/csharp/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645167923115318054L; + private static final long serialVersionUID = 4645160284082070147L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/L.java b/slice2java/csharp/test/Ice/objects/Test/L.java index f3336ca4aa0c..bdd3fb0bfcad 100644 --- a/slice2java/csharp/test/Ice/objects/Test/L.java +++ b/slice2java/csharp/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629743777194042800L; + private static final long serialVersionUID = 6629743401459800021L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/M.java b/slice2java/csharp/test/Ice/objects/Test/M.java index 3a687bd21a7b..58ee9b4fbb6b 100644 --- a/slice2java/csharp/test/Ice/objects/Test/M.java +++ b/slice2java/csharp/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088097806418304263L; + private static final long serialVersionUID = -8088101397988362916L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/Recursive.java b/slice2java/csharp/test/Ice/objects/Test/Recursive.java index 144295c49650..469b2bcd6eeb 100644 --- a/slice2java/csharp/test/Ice/objects/Test/Recursive.java +++ b/slice2java/csharp/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617883687919635786L; + private static final long serialVersionUID = 3617887279489685743L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/S.java b/slice2java/csharp/test/Ice/objects/Test/S.java index ee586ea73302..94a8f5192f96 100644 --- a/slice2java/csharp/test/Ice/objects/Test/S.java +++ b/slice2java/csharp/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481772499880569859L; + private static final long serialVersionUID = 481773361225447782L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/S1.java b/slice2java/csharp/test/Ice/objects/Test/S1.java index 387201478edc..6beeb3ff5c64 100644 --- a/slice2java/csharp/test/Ice/objects/Test/S1.java +++ b/slice2java/csharp/test/Ice/objects/Test/S1.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 7211340563274228369L; + private static final long serialVersionUID = 7211338699911415796L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/SC1.java b/slice2java/csharp/test/Ice/objects/Test/SC1.java index 442629f8a72a..245c148a1f89 100644 --- a/slice2java/csharp/test/Ice/objects/Test/SC1.java +++ b/slice2java/csharp/test/Ice/objects/Test/SC1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SC1 _nullMarshalValue = new SC1(); /** @hidden */ - private static final long serialVersionUID = 186208315469675305L; + private static final long serialVersionUID = 186214797435230860L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/SOneMember.java b/slice2java/csharp/test/Ice/objects/Test/SOneMember.java index 1cbca2fb2d35..090d8bae70bb 100644 --- a/slice2java/csharp/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/csharp/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227754141463874319L; + private static final long serialVersionUID = 6227749227504153386L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java index cab23764c9aa..01627dbcd88b 100644 --- a/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = 8767428635720551810L; + private static final long serialVersionUID = 2866077362364176258L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/StructKey.java b/slice2java/csharp/test/Ice/objects/Test/StructKey.java index fe8616f75505..66b19dab3198 100644 --- a/slice2java/csharp/test/Ice/objects/Test/StructKey.java +++ b/slice2java/csharp/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = 2817432573532498684L; + private static final long serialVersionUID = -4037369713667300644L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java index 98dfe9e97d5e..cb31fd6e4397 100644 --- a/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723848458915452397L; + private static final long serialVersionUID = 2723846368109518685L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/MyClass1.java b/slice2java/csharp/test/Ice/operations/Test/MyClass1.java index d0cb32e0c380..44606af26481 100644 --- a/slice2java/csharp/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/csharp/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1275397613374386007L; + private static final long serialVersionUID = -7384578994387021927L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct.java index 0fed81f82f0d..62a902618115 100644 --- a/slice2java/csharp/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/csharp/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = 7481482012809302141L; + private static final long serialVersionUID = 5929191529821465661L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java index 6c079e04ea41..7749d606edea 100644 --- a/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = -3480888820879871328L; + private static final long serialVersionUID = -2252703127052220592L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/Structure.java b/slice2java/csharp/test/Ice/operations/Test/Structure.java index 3d858ce36c60..1e011f19e2fd 100644 --- a/slice2java/csharp/test/Ice/operations/Test/Structure.java +++ b/slice2java/csharp/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = 9160620054620908116L; + private static final long serialVersionUID = 4175909889829417700L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/A.java b/slice2java/csharp/test/Ice/optional/Test/A.java index e13368d2c4c6..ae58cf8d8803 100644 --- a/slice2java/csharp/test/Ice/optional/Test/A.java +++ b/slice2java/csharp/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8650066692468731280L; + private static final long serialVersionUID = 605051816762576656L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/B.java b/slice2java/csharp/test/Ice/optional/Test/B.java index 2237e98e4796..dbfb6af35b50 100644 --- a/slice2java/csharp/test/Ice/optional/Test/B.java +++ b/slice2java/csharp/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645669533083206371L; + private static final long serialVersionUID = 9059691829037439651L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/C.java b/slice2java/csharp/test/Ice/optional/Test/C.java index 985439268266..eeb7a99698cc 100644 --- a/slice2java/csharp/test/Ice/optional/Test/C.java +++ b/slice2java/csharp/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8462140412216351875L; + private static final long serialVersionUID = 7023798783749352701L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/DerivedException.java b/slice2java/csharp/test/Ice/optional/Test/DerivedException.java index 4be56c4ec077..1b0af834e719 100644 --- a/slice2java/csharp/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/csharp/test/Ice/optional/Test/DerivedException.java @@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7704798929545011981L; + private static final long serialVersionUID = 3384929911730896836L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/E.java b/slice2java/csharp/test/Ice/optional/Test/E.java index 18e9b7e2f1d1..e3b9fbdfd1c9 100644 --- a/slice2java/csharp/test/Ice/optional/Test/E.java +++ b/slice2java/csharp/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850732495256319568L; + private static final long serialVersionUID = -1850742921263689467L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/F.java b/slice2java/csharp/test/Ice/optional/Test/F.java index a0495ac27683..5698006dfcdc 100644 --- a/slice2java/csharp/test/Ice/optional/Test/F.java +++ b/slice2java/csharp/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430494019456822077L; + private static final long serialVersionUID = -6430489368903984394L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java b/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java index 9cd5f3ff7e4b..7483a6c74d93 100644 --- a/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569613914077964771L; + private static final long serialVersionUID = 1569604849347518272L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/G.java b/slice2java/csharp/test/Ice/optional/Test/G.java index 8d13217cfe7f..636a08486df1 100644 --- a/slice2java/csharp/test/Ice/optional/Test/G.java +++ b/slice2java/csharp/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6184255720414784813L; + private static final long serialVersionUID = 6193377307577450771L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/G1.java b/slice2java/csharp/test/Ice/optional/Test/G1.java index 044e3ca26035..36a47c83bab9 100644 --- a/slice2java/csharp/test/Ice/optional/Test/G1.java +++ b/slice2java/csharp/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339783304329659139L; + private static final long serialVersionUID = 7339781138552188490L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/G2.java b/slice2java/csharp/test/Ice/optional/Test/G2.java index efc1e6bdf4fe..b5c482577ba0 100644 --- a/slice2java/csharp/test/Ice/optional/Test/G2.java +++ b/slice2java/csharp/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824558118068536738L; + private static final long serialVersionUID = 3824547692073353453L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java b/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java index 134c2be4ad42..6bd35cd66fa7 100644 --- a/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java @@ -1603,7 +1603,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6628697614004423326L; + private static final long serialVersionUID = -8047506915184926692L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/OneOptional.java b/slice2java/csharp/test/Ice/optional/Test/OneOptional.java index 4b80df598831..6707ebe0303c 100644 --- a/slice2java/csharp/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/csharp/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219608819544614771L; + private static final long serialVersionUID = -7219601203688416530L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalException.java b/slice2java/csharp/test/Ice/optional/Test/OptionalException.java index 944b017ae72c..68989d79f9d7 100644 --- a/slice2java/csharp/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/csharp/test/Ice/optional/Test/OptionalException.java @@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4334121530397152909L; + private static final long serialVersionUID = 2540093136356959803L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java index 5303a9df4c9e..c5b94c042000 100644 --- a/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7709026078492448965L; + private static final long serialVersionUID = 1827641699927582651L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/RequiredException.java b/slice2java/csharp/test/Ice/optional/Test/RequiredException.java index 79ac66adbd19..9f352e5f8c35 100644 --- a/slice2java/csharp/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/csharp/test/Ice/optional/Test/RequiredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894245678263293514L; + private static final long serialVersionUID = 2894235246945691139L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java b/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java index 0a8a9df746b9..d2fdaa82f62e 100644 --- a/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700992009275876504L; + private static final long serialVersionUID = 6700991209922097213L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/VarStruct.java b/slice2java/csharp/test/Ice/optional/Test/VarStruct.java index f706d4f362c0..a0b69ff93fd8 100644 --- a/slice2java/csharp/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/csharp/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912285563253928309L; + private static final long serialVersionUID = -1912287729031972926L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/WD.java b/slice2java/csharp/test/Ice/optional/Test/WD.java index d06fc0906fd2..33c119f0d2a8 100644 --- a/slice2java/csharp/test/Ice/optional/Test/WD.java +++ b/slice2java/csharp/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5063668862738255854L; + private static final long serialVersionUID = 3320320525169091108L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/C.java b/slice2java/csharp/test/Ice/scope/Test/C.java index 4f42b1a727d1..da30e458f7c3 100644 --- a/slice2java/csharp/test/Ice/scope/Test/C.java +++ b/slice2java/csharp/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190250631641704650L; + private static final long serialVersionUID = -5190247205455581166L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/C1.java b/slice2java/csharp/test/Ice/scope/Test/C1.java index 7a4dafc1f9b1..0d406127e4f6 100644 --- a/slice2java/csharp/test/Ice/scope/Test/C1.java +++ b/slice2java/csharp/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893236539220443227L; + private static final long serialVersionUID = 8893233107706964657L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/C2.java b/slice2java/csharp/test/Ice/scope/Test/C2.java index 4b596c5ffe2f..6888c9803e6d 100644 --- a/slice2java/csharp/test/Ice/scope/Test/C2.java +++ b/slice2java/csharp/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3685211406242011947L; + private static final long serialVersionUID = 7824786615699342994L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/Inner/C.java b/slice2java/csharp/test/Ice/scope/Test/Inner/C.java index db9e932a9098..ebb869cf1966 100644 --- a/slice2java/csharp/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/csharp/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615626281682357305L; + private static final long serialVersionUID = 4615622935472066029L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/C.java index 429866e7dc4f..02fe36ede464 100644 --- a/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672586835362110160L; + private static final long serialVersionUID = 672588779150684086L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/S.java index 5e5eae6fc615..3c6b4abe4f75 100644 --- a/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654436095487010180L; + private static final long serialVersionUID = 8654439196232608034L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/Inner/S.java b/slice2java/csharp/test/Ice/scope/Test/Inner/S.java index eadbc4995bc4..4ae3c1341642 100644 --- a/slice2java/csharp/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/csharp/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694623697654503880L; + private static final long serialVersionUID = 3694621508538092142L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/S.java b/slice2java/csharp/test/Ice/scope/Test/S.java index 4b50025c5198..2f7948442013 100644 --- a/slice2java/csharp/test/Ice/scope/Test/S.java +++ b/slice2java/csharp/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159695107290103606L; + private static final long serialVersionUID = 2159697376482131664L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/S1.java b/slice2java/csharp/test/Ice/scope/Test/S1.java index c5535d4a0d66..29d48cd59446 100644 --- a/slice2java/csharp/test/Ice/scope/Test/S1.java +++ b/slice2java/csharp/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241676856100513762L; + private static final long serialVersionUID = 1241674827296902024L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/S2.java b/slice2java/csharp/test/Ice/scope/Test/S2.java index 265d6a10deaa..88fc989fff73 100644 --- a/slice2java/csharp/test/Ice/scope/Test/S2.java +++ b/slice2java/csharp/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = -8142263814341110228L; + private static final long serialVersionUID = -7319205627646131093L; } diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CR.java b/slice2java/csharp/test/Ice/seqMapping/Test/CR.java index 8c7e67879321..47a33ac736ed 100644 --- a/slice2java/csharp/test/Ice/seqMapping/Test/CR.java +++ b/slice2java/csharp/test/Ice/seqMapping/Test/CR.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2039940199513943118L; + private static final long serialVersionUID = 2039941505258941061L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CV.java b/slice2java/csharp/test/Ice/seqMapping/Test/CV.java index de18e7c1aedc..9aff01b66e1c 100644 --- a/slice2java/csharp/test/Ice/seqMapping/Test/CV.java +++ b/slice2java/csharp/test/Ice/seqMapping/Test/CV.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3369465633822448004L; + private static final long serialVersionUID = -3369461479289221090L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/S.java b/slice2java/csharp/test/Ice/seqMapping/Test/S.java index b2b3267d327b..c694b0c56e5d 100644 --- a/slice2java/csharp/test/Ice/seqMapping/Test/S.java +++ b/slice2java/csharp/test/Ice/seqMapping/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = -691296832901383469L; + private static final long serialVersionUID = -691295731574077903L; } diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/SD.java b/slice2java/csharp/test/Ice/seqMapping/Test/SD.java index 89582bf6d53d..fa50d8ddc17b 100644 --- a/slice2java/csharp/test/Ice/seqMapping/Test/SD.java +++ b/slice2java/csharp/test/Ice/seqMapping/Test/SD.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final SD _nullMarshalValue = new SD(); /** @hidden */ - private static final long serialVersionUID = 9219741319317910839L; + private static final long serialVersionUID = 9219737291238318357L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java index e7f47d12762f..3cf4b4b71b25 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477023718090959852L; + private static final long serialVersionUID = -477019957331769166L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java index 94c6aa0a708e..a58e7cb46972 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485214176895711410L; + private static final long serialVersionUID = 3485213309024771412L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index cc890a76f1a8..7d1a6971b509 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717377996312359747L; + private static final long serialVersionUID = 1717373904785431589L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index e39c2460e688..4877f69f64a4 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384918637968046182L; + private static final long serialVersionUID = -7384914386450757188L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java index 4c02072ad430..66cbf85f6325 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3424371622123243672L; + private static final long serialVersionUID = 3424376094535973329L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index ce2f34dacbf8..cea338abcd0d 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1172606542223880759L; + private static final long serialVersionUID = -1172593967297368064L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index f611e3661b47..663dd8469a5d 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1126117092941506512L; + private static final long serialVersionUID = -1126107842220480391L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index 0e4d2b99897b..fc75aef84c31 100644 --- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java +++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2097581433418336112L; + private static final long serialVersionUID = -2097577642862745639L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/B.java b/slice2java/csharp/test/Ice/slicing/objects/Test/B.java index 8cdb0a7e1550..71aceb18d3ca 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7223436895294495793L; + private static final long serialVersionUID = -707262232688693968L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/csharp/test/Ice/slicing/objects/Test/BaseException.java index 1b0976ce7b38..39f6649ccf8b 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6267519231504819581L; + private static final long serialVersionUID = -3121342643828027268L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java index dcfc576b77c5..253bb07b4a1d 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6396997041555444780L; + private static final long serialVersionUID = -6396991547490277721L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPDerived.java index 8ceff90d3260..4001cbc34333 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066879837734121805L; + private static final long serialVersionUID = -9066881866701135493L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/D1.java b/slice2java/csharp/test/Ice/slicing/objects/Test/D1.java index da0af021e1d6..d5afc005e8fc 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8423620266666939380L; + private static final long serialVersionUID = -6250687988806712109L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/D2.java b/slice2java/csharp/test/Ice/slicing/objects/Test/D2.java index a387c1dcc2ab..080b5afa454b 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/D2.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4641745154953012124L; + private static final long serialVersionUID = 6031728054500567954L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/D3.java b/slice2java/csharp/test/Ice/slicing/objects/Test/D3.java index 0484a781bdb0..9e0308f31760 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7918762161495294531L; + private static final long serialVersionUID = -6680537503709202413L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/D4.java b/slice2java/csharp/test/Ice/slicing/objects/Test/D4.java index db0f406feb30..d34429684b7f 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/D4.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2575252738521578765L; + private static final long serialVersionUID = 7812042740922502515L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/csharp/test/Ice/slicing/objects/Test/DerivedException.java index 6a15aca66103..90f3e1c30722 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3202731872495404398L; + private static final long serialVersionUID = 4346596385832551762L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java index b51a70cef59f..772770fbbc5c 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655919117395275900L; + private static final long serialVersionUID = -7655916768037809710L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Hidden.java index f382ece44e1e..1f9b7e26d520 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271132908068411809L; + private static final long serialVersionUID = -2271135091720214071L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/MyClass.java b/slice2java/csharp/test/Ice/slicing/objects/Test/MyClass.java index 201e2eaaa869..f84d69b97214 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/MyClass.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4147524460854583408L; + private static final long serialVersionUID = 4147521440203188344L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PBase.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PBase.java index a33e883fcfcd..98b17d9f2a19 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481704846309066524L; + private static final long serialVersionUID = 481706960453336555L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived.java index fea6ff833da5..1a0b5cad1edd 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426887688855101420L; + private static final long serialVersionUID = -4426882194794534041L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived2.java index 3650dfe274e5..aa9dc7669d1c 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850544689167976608L; + private static final long serialVersionUID = 850539029964645871L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived3.java index 711fc2a13eea..90514483053b 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328899341744932971L; + private static final long serialVersionUID = -4328904840813800854L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PCUnknown.java index 583f50de05b9..1aa397a80bec 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081817940120379175L; + private static final long serialVersionUID = -5081812358414529640L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PDerived.java index a3dcbf0e7c96..210db83d5836 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643078221294726132L; + private static final long serialVersionUID = 643075952262070460L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PNode.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PNode.java index 514d883e4ef6..148f4509fe28 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438003633647116720L; + private static final long serialVersionUID = -2438007225280649919L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown.java index e66a2dd09138..cb2e12f91eca 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2841583850895198980L; + private static final long serialVersionUID = -2887709656972517985L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown2.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown2.java index 53140086584c..e1f872b07f9f 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown2.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8813708465746734046L; + private static final long serialVersionUID = -8813704714033335489L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknownException.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknownException.java index 3d0c997fca6a..0bdb27b36301 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknownException.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknownException.java @@ -61,5 +61,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 4410703552469756272L; + private static final long serialVersionUID = 4410706982723844206L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java index 4cc1b763bde9..5f7632062fef 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651524525374298276L; + private static final long serialVersionUID = 3651522341577353207L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SBSKnownDerived.java index d7ad9b7e9cd6..adb901199a5b 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804375015279498753L; + private static final long serialVersionUID = 8804373066392366290L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java index 41afd5f52d1b..53556ad14e2f 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4989057392234989262L; + private static final long serialVersionUID = -4989054371564844172L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SBase.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SBase.java index f9809010480b..85728524a7e5 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353757154270540617L; + private static final long serialVersionUID = -5353755125288762524L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SS1.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SS1.java index 00b6acaac901..ef727811901c 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522133591408790746L; + private static final long serialVersionUID = -6522130330471426200L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SS2.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SS2.java index 1f72a6458cfb..4a6abdd20e9e 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620285987615069413L; + private static final long serialVersionUID = 7620289659094356395L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SS3.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SS3.java index 130ff5e17fe5..a50258e2199c 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = -6838911122787514326L; + private static final long serialVersionUID = -7047156691620847972L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java index f3245dd3cbb5..7b4d1448360c 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4272438363828800173L; + private static final long serialVersionUID = 8136329770507062012L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/UnknownDerivedException.java b/slice2java/csharp/test/Ice/slicing/objects/Test/UnknownDerivedException.java index c4ecf8141544..f98929f30cc6 100644 --- a/slice2java/csharp/test/Ice/slicing/objects/Test/UnknownDerivedException.java +++ b/slice2java/csharp/test/Ice/slicing/objects/Test/UnknownDerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 699345814548583338L; + private static final long serialVersionUID = -3647567447951547029L; } diff --git a/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java b/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java index e1fb9f2895c1..a3aba8bab4f7 100644 --- a/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java +++ b/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LargeStruct _nullMarshalValue = new LargeStruct(); /** @hidden */ - private static final long serialVersionUID = 4431576188722286754L; + private static final long serialVersionUID = -3383019935841955434L; } diff --git a/slice2java/csharp/test/Ice/stream/Test/MyClass.java b/slice2java/csharp/test/Ice/stream/Test/MyClass.java index 5f6a93fe3ea5..b136a0179d82 100644 --- a/slice2java/csharp/test/Ice/stream/Test/MyClass.java +++ b/slice2java/csharp/test/Ice/stream/Test/MyClass.java @@ -85,7 +85,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4609733094964901093L; + private static final long serialVersionUID = 7871651655134083967L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/stream/Test/MyException.java b/slice2java/csharp/test/Ice/stream/Test/MyException.java index 922976e8c43f..c50d9842a92a 100644 --- a/slice2java/csharp/test/Ice/stream/Test/MyException.java +++ b/slice2java/csharp/test/Ice/stream/Test/MyException.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 5734225116158582585L; + private static final long serialVersionUID = 5734225840531787478L; } diff --git a/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java b/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java index 4864beaacc6d..c5b67897e818 100644 --- a/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java +++ b/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3441897871236015499L; + private static final long serialVersionUID = 394367726459818477L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/escape/Clash/Cls.java b/slice2java/csharp/test/Slice/escape/Clash/Cls.java index 276ff363c7af..c9e007ccedc7 100644 --- a/slice2java/csharp/test/Slice/escape/Clash/Cls.java +++ b/slice2java/csharp/test/Slice/escape/Clash/Cls.java @@ -172,7 +172,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2015621619549772546L; + private static final long serialVersionUID = 5986533095311901786L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/escape/Clash/Ex.java b/slice2java/csharp/test/Slice/escape/Clash/Ex.java index 007135f3547d..49807d31f6a3 100644 --- a/slice2java/csharp/test/Slice/escape/Clash/Ex.java +++ b/slice2java/csharp/test/Slice/escape/Clash/Ex.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1676827697023377775L; + private static final long serialVersionUID = 4529911828247467463L; } diff --git a/slice2java/csharp/test/Slice/escape/Clash/St.java b/slice2java/csharp/test/Slice/escape/Clash/St.java index 82fedddbe309..20d69159b606 100644 --- a/slice2java/csharp/test/Slice/escape/Clash/St.java +++ b/slice2java/csharp/test/Slice/escape/Clash/St.java @@ -197,5 +197,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - private static final long serialVersionUID = 7449797553825800254L; + private static final long serialVersionUID = 6382805612369182232L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java b/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java index 08cbdddbcc9f..ceeb4fce0389 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java @@ -122,5 +122,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -5659970657926186251L; + private static final long serialVersionUID = 8933623750139956090L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/_break.java b/slice2java/csharp/test/Slice/escape/_abstract/_break.java index d948705c55aa..675385e7b98d 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/_break.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/_break.java @@ -138,5 +138,5 @@ static public java.util.Optional<_break> ice_read(com.zeroc.Ice.InputStream istr private static final _break _nullMarshalValue = new _break(); /** @hidden */ - private static final long serialVersionUID = 3009639658064537818L; + private static final long serialVersionUID = 3009636784619432149L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/delegate.java b/slice2java/csharp/test/Slice/escape/_abstract/delegate.java index 2efd1c459ecd..d07329888e2a 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/delegate.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/delegate.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7790580545877345509L; + private static final long serialVersionUID = 6426067576728138322L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/escape/_abstract/fixed.java b/slice2java/csharp/test/Slice/escape/_abstract/fixed.java index a6ea7d1cd5b1..101bb5906402 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/fixed.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/fixed.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8293833594683456818L; + private static final long serialVersionUID = -8293825596712295231L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/foreach.java b/slice2java/csharp/test/Slice/escape/_abstract/foreach.java index f3843deec242..b4b098fdc9da 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/foreach.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/foreach.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -5206564436515543805L; + private static final long serialVersionUID = -7432827422650929405L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java b/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java index ac6a76f4d468..3a77c1ae3d63 100644 --- a/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java +++ b/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java @@ -315,7 +315,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3273690149815188884L; + private static final long serialVersionUID = -8604989972565553817L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/macros/Test/Default.java b/slice2java/csharp/test/Slice/macros/Test/Default.java index 5e6c09f2bd17..6397a2dd217e 100644 --- a/slice2java/csharp/test/Slice/macros/Test/Default.java +++ b/slice2java/csharp/test/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1752557856788653214L; + private static final long serialVersionUID = -6796979846395327362L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/macros/Test/NoDefault.java b/slice2java/csharp/test/Slice/macros/Test/NoDefault.java index 1e035ad0cf53..88ca99b58659 100644 --- a/slice2java/csharp/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/csharp/test/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2253539014040274559L; + private static final long serialVersionUID = -662429314426450529L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/structure/Test/C.java b/slice2java/csharp/test/Slice/structure/Test/C.java index f44da953f030..d276f00d1b95 100644 --- a/slice2java/csharp/test/Slice/structure/Test/C.java +++ b/slice2java/csharp/test/Slice/structure/Test/C.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3172283035134153038L; + private static final long serialVersionUID = -3172273634614636000L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/structure/Test/S1.java b/slice2java/csharp/test/Slice/structure/Test/S1.java index a319f20303f5..3c3f313553ad 100644 --- a/slice2java/csharp/test/Slice/structure/Test/S1.java +++ b/slice2java/csharp/test/Slice/structure/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = -5542853615150251322L; + private static final long serialVersionUID = -5542866030107916972L; } diff --git a/slice2java/csharp/test/Slice/structure/Test/S2.java b/slice2java/csharp/test/Slice/structure/Test/S2.java index d0ce7120e9d3..95a19d28c61b 100644 --- a/slice2java/csharp/test/Slice/structure/Test/S2.java +++ b/slice2java/csharp/test/Slice/structure/Test/S2.java @@ -286,5 +286,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = -224891045208450093L; + private static final long serialVersionUID = 2687657137553745171L; } diff --git a/slice2java/java/test/src/main/java/test/Glacier2/router/test/Glacier2/router/Test/CallbackException.java b/slice2java/java/test/src/main/java/test/Glacier2/router/test/Glacier2/router/Test/CallbackException.java index ec9d6c331e13..b935b97aa51e 100644 --- a/slice2java/java/test/src/main/java/test/Glacier2/router/test/Glacier2/router/Test/CallbackException.java +++ b/slice2java/java/test/src/main/java/test/Glacier2/router/test/Glacier2/router/Test/CallbackException.java @@ -58,5 +58,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8495842224080853593L; + private static final long serialVersionUID = -4334757848869368995L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/classLoader/test/Ice/classLoader/Test/ConcreteClass.java b/slice2java/java/test/src/main/java/test/Ice/classLoader/test/Ice/classLoader/Test/ConcreteClass.java index c453c8f0ef20..07b45ec0cdbb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/classLoader/test/Ice/classLoader/Test/ConcreteClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/classLoader/test/Ice/classLoader/Test/ConcreteClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6434296851003193708L; + private static final long serialVersionUID = 6434297295259856109L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/A.java b/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/A.java index 15dc51f79967..06a63bf768c3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/A.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final A _nullMarshalValue = new A(); /** @hidden */ - private static final long serialVersionUID = 6384637358660991746L; + private static final long serialVersionUID = 6384634897122889868L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/S.java b/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/S.java index d4a59f0ae473..f754de1cee1a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/S.java +++ b/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = -2014564443585251498L; + private static final long serialVersionUID = -2014566905128223400L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Base.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Base.java index 90e988a78a99..92067ec4289a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4487468302327866720L; + private static final long serialVersionUID = 4088802138143052120L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/BaseEx.java index 4247033f296b..e2dd77aff675 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/BaseEx.java @@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 204855104918051028L; + private static final long serialVersionUID = -1243999922574714260L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaults.java index 4b2b29779f06..1647974fe2a7 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 402433992620812363L; + private static final long serialVersionUID = 6444134758710744604L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index a8ab86993644..8868cf5b0f67 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -157746393536974206L; + private static final long serialVersionUID = 2598475839790637795L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Derived.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Derived.java index 8a105e3f064f..21f1ce0d7d3f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7129200455908152149L; + private static final long serialVersionUID = -1194603756658401707L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/DerivedEx.java index 363acf5d964e..3650f6171105 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/DerivedEx.java @@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 312263212294978204L; + private static final long serialVersionUID = 2630740470501794914L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index 0114384ec862..0274c55b814b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -6688038214957311697L; + private static final long serialVersionUID = -7265411295892512776L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index d9121836e11b..db2cf978fee4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -64,5 +64,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8861001085014056526L; + private static final long serialVersionUID = 4320817600835722003L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/InnerStruct.java index a967c7e516a7..5e707ab729c5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - private static final long serialVersionUID = 5127388881563716721L; + private static final long serialVersionUID = 5127392376328347554L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct1.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct1.java index de3a19472103..2efa62ef6b70 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = -4838699948627858293L; + private static final long serialVersionUID = -1154322569322936371L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct2.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct2.java index d8c4012a3e73..68c87f34ef5a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = -5406401583001328695L; + private static final long serialVersionUID = 512879780263007906L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/StructNoDefaults.java index c407b711d13e..2d7f78563fe7 100644 --- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - private static final long serialVersionUID = 8109957217787164305L; + private static final long serialVersionUID = 3029397969814738277L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/A.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/A.java index 07a5ac2c3d16..78cd65629986 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/A.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7823746873099757133L; + private static final long serialVersionUID = 7823741933262761982L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/B.java index 405e4b60408c..45d26cab1574 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/B.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3861409025260460659L; + private static final long serialVersionUID = -3861419420409815362L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/C.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/C.java index f445791c9e40..7fa380630358 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/C.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1080700564302542413L; + private static final long serialVersionUID = 1080695624465547262L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/D.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/D.java index 6a20743c3db4..b22f2cc19379 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/D.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/D.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4780383242841617549L; + private static final long serialVersionUID = 4780372847692262846L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/A.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/A.java index 16cec27a533d..1d76ca34c1f5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/A.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7823738000909022736L; + private static final long serialVersionUID = 7823746629177952759L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/B.java index 6a8e5cb2cba2..c814686429a1 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/B.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3861417732446890544L; + private static final long serialVersionUID = -3861409269334062921L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/C.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/C.java index e0f876953a70..62700c89811b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/C.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1080691692111808016L; + private static final long serialVersionUID = 1080700320380738039L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/D.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/D.java index 70fe5cf2fbc0..72eb7b308c46 100644 --- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/D.java +++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/D.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4780374535655187664L; + private static final long serialVersionUID = 4780382998768015287L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Color.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Color.java index f1cd5ae5020e..f157c2736ea9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Color.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Color.java @@ -168,5 +168,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Color _nullMarshalValue = new Color(); /** @hidden */ - private static final long serialVersionUID = -6639884352337085322L; + private static final long serialVersionUID = 7021442379923335286L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/ColorPalette.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/ColorPalette.java index 0db0178d0ffa..a980d70de8c8 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/ColorPalette.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/ColorPalette.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final ColorPalette _nullMarshalValue = new ColorPalette(); /** @hidden */ - private static final long serialVersionUID = -2820066018638289435L; + private static final long serialVersionUID = -2820066598438123230L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Draw.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Draw.java index 8a8ded2d12aa..fda6e0183fd0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Draw.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Draw.java @@ -166,5 +166,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Draw _nullMarshalValue = new Draw(); /** @hidden */ - private static final long serialVersionUID = 8369921096074040443L; + private static final long serialVersionUID = 4786472050234308252L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Pen.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Pen.java index 0aed148fb587..0609bd270f02 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Pen.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Pen.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1443817939981471793L; + private static final long serialVersionUID = -752400149611797777L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Point.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Point.java index 840fafc4f53b..6d3029298b41 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Point.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Point.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Point _nullMarshalValue = new Point(); /** @hidden */ - private static final long serialVersionUID = -4887663544157731568L; + private static final long serialVersionUID = 2492625194446554288L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointD.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointD.java index b972beae3adc..f727befabf39 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointD.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointD.java @@ -158,5 +158,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final PointD _nullMarshalValue = new PointD(); /** @hidden */ - private static final long serialVersionUID = -3960441887096239299L; + private static final long serialVersionUID = 5397307758122757530L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointF.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointF.java index ad12dfb1a7e5..b8d186e2b581 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointF.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointF.java @@ -158,5 +158,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr private static final PointF _nullMarshalValue = new PointF(); /** @hidden */ - private static final long serialVersionUID = -6229444818311548438L; + private static final long serialVersionUID = 2172480662470729613L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Polyline.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Polyline.java index df4373dbcf37..12c845ea93c0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Polyline.java +++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Polyline.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final Polyline _nullMarshalValue = new Polyline(); /** @hidden */ - private static final long serialVersionUID = -345025738541679086L; + private static final long serialVersionUID = -345037236248433643L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A.java index 92ca927bf3dd..b3fe9636477a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6283704429504109512L; + private static final long serialVersionUID = 2353667151581290040L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A1.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A1.java index bc9fb3abc3fd..94d4e3d9b141 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A1.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926743360691814874L; + private static final long serialVersionUID = -5926743019762671314L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B.java index 6f8f8684588c..c18351060ad6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890910270991021681L; + private static final long serialVersionUID = -8890910611938564985L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B1.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B1.java index 66082cb587e1..94fee073372c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B1.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2278363555865684732L; + private static final long serialVersionUID = -6345321400085064956L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Base.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Base.java index d7465b3b6ae3..b3e906d05c77 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Base.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7849830181016403260L; + private static final long serialVersionUID = -6114413453791041596L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/C.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/C.java index 4ac1ec333175..0234935d9943 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 970851661352244148L; + private static final long serialVersionUID = 9131279243700777916L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/COneMember.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/COneMember.java index 8d6c94cd052f..a4f6d014a8d4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/COneMember.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050968791554319431L; + private static final long serialVersionUID = 3050969132501862735L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/CTwoMembers.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/CTwoMembers.java index 7a6f3ae37cf3..4e5a905e7cab 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1093668945348042203L; + private static final long serialVersionUID = -4079402751115340837L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D.java index 075883b325c3..722ecfff0f7d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7349401127485260109L; + private static final long serialVersionUID = -9067601040220142917L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D1.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D1.java index bdddc47b1bf7..607444fadc40 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D1.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9038671865743392707L; + private static final long serialVersionUID = 4971714021524012483L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/E.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/E.java index 2b594b95a903..97972c8e980d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/E.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1848678379216676659L; + private static final long serialVersionUID = -6178319554621517363L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EBase.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EBase.java index cd49f2dfc97b..9a041bd289c6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EBase.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -7163481793916500274L; + private static final long serialVersionUID = -3096523949697120050L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EDerived.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EDerived.java index e3c5e955aaa0..6532c85a2c1a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EDerived.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2866342282188388434L; + private static final long serialVersionUID = -1200615562030991790L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EOneMember.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EOneMember.java index e58f345c10e3..9487277a02a9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EOneMember.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6225283935036499384L; + private static final long serialVersionUID = -6225284275984042688L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/ETwoMembers.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/ETwoMembers.java index b2d7472dc796..795f266f4786 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/ETwoMembers.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 896887274991360852L; + private static final long serialVersionUID = 6069958971454743892L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F.java index 6df8d2a35bd1..121d657796ff 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -159631667987175087L; + private static final long serialVersionUID = 1017229250418567505L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F1.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F1.java index fc7001893a1b..772550601373 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F1.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192371325474559779L; + private static final long serialVersionUID = 6192372066786230245L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F3.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F3.java index 22723b7bd7d7..7e729afe1eb4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F3.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6090341910090535097L; + private static final long serialVersionUID = -917270213627152057L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/A.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/A.java index 41143493d5be..d2d9171c6074 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1425258353349896923L; + private static final long serialVersionUID = -1425258012402353619L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Ex.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Ex.java index f66a24a769da..0dcd00fb7c8e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2337226513472346977L; + private static final long serialVersionUID = -2337226854401490537L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/A.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/A.java index c9cbec1c97a8..bd4cd11167f0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1298687492519808077L; + private static final long serialVersionUID = -1298687151572264773L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/Ex.java index 67c5227891b4..f4027e814d6a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1842229880501943739L; + private static final long serialVersionUID = 1842229539572800179L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/K.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/K.java index a482a664d74e..8a31ba9a2550 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/K.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645158985921283636L; + private static final long serialVersionUID = 4645159326868826940L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/L.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/L.java index c679d16b75f4..ecb8a1507aca 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/L.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629747427032486573L; + private static final long serialVersionUID = 6629747086103343013L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/M.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/M.java index 3ef184817048..6648c38cc73d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/M.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088105549991968257L; + private static final long serialVersionUID = -8088105890939511561L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Recursive.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Recursive.java index afd0cd64f3fe..ce56c4b39b8f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Recursive.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617885981341889898L; + private static final long serialVersionUID = 3617885640394346594L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/S.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/S.java index 4540ffeb1d28..d3d244cf26be 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/S.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481774620473810206L; + private static final long serialVersionUID = 481774279544666646L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/SOneMember.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/SOneMember.java index 1d4411755a13..405923216acb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227745036455746910L; + private static final long serialVersionUID = 6227744695508203606L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/STwoMembers.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/STwoMembers.java index 3e97eee137ec..aaa860f14a9a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = -7168779583271875902L; + private static final long serialVersionUID = -1995707886808492862L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/StructKey.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/StructKey.java index c4591bd9126c..b009a51ad55f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/StructKey.java +++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = -1498305557315312383L; + private static final long serialVersionUID = 2831335618089528321L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/AnotherStruct.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/AnotherStruct.java index 7dc56a3a61fd..398950ec828e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/AnotherStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723846289245247733L; + private static final long serialVersionUID = 2723843561669636405L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyClass1.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyClass1.java index 5d16cb51b4dc..d3d705106a30 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyClass1.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8920997228167087633L; + private static final long serialVersionUID = 657795693319603759L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct.java index 346fed24c7dd..6757b69a1729 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = -5676811656570039779L; + private static final long serialVersionUID = -8721172269214737763L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct1.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct1.java index 10c1e9949359..d2529c2079e7 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct1.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = 5724206697387136934L; + private static final long serialVersionUID = 8229985701250888934L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/Structure.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/Structure.java index 711386a87105..8b81e4857936 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/Structure.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = -2716545133590888602L; + private static final long serialVersionUID = 1459602687793327654L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/AnotherStruct.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/AnotherStruct.java index d92fb9a1f01f..178ee633fe3f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723841331371644273L; + private static final long serialVersionUID = 2723847591050986491L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyClass1.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyClass1.java index 85a429ee0975..488cabc8150f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2425472581785511377L; + private static final long serialVersionUID = 7220178784381092414L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct.java index df77a23f9c41..20ccf217da14 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = -5178143839960994403L; + private static final long serialVersionUID = -3136009654365012515L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct1.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct1.java index d5abd1755d4b..0ca8144727dc 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = 96572920295207320L; + private static final long serialVersionUID = 3804098918719390615L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/Structure.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/Structure.java index 6040cb8952e3..1a531ed0cffa 100644 --- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/Structure.java +++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = -2272359359881665679L; + private static final long serialVersionUID = -6973126446867175070L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/A.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/A.java index bad84ea8f753..538e3ecfd681 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6306166850659052656L; + private static final long serialVersionUID = 8974366028246295696L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/B.java index 866a13a33496..e4dd0214446e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8176273309467124579L; + private static final long serialVersionUID = 7911534131358832227L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/C.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/C.java index 8a1f18534cad..944527e7f520 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8809245395447493507L; + private static final long serialVersionUID = -6626393662645059203L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/DerivedException.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/DerivedException.java index e1b9df4459ed..c1506576fc84 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/DerivedException.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/DerivedException.java @@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7782655125895849130L; + private static final long serialVersionUID = -6206036316894424947L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/E.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/E.java index 0ab2eff16e87..c8bafa3ff8b0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/E.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850740918224446233L; + private static final long serialVersionUID = -1850730689848297627L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/F.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/F.java index cfde243d8872..1f40143e9868 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/F.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430496827112845548L; + private static final long serialVersionUID = -6430490684988639594L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/FixedStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/FixedStruct.java index b80cc3d8888b..17b5d6cd0c31 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/FixedStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569605491118386695L; + private static final long serialVersionUID = 1569617075760688172L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G.java index e5c8f9e32bd1..fbaf23f811d3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4481238160812054099L; + private static final long serialVersionUID = 4565189308464637971L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G1.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G1.java index f849832f9afe..4cc29980e115 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G1.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339780496676715096L; + private static final long serialVersionUID = 7339779822468739459L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G2.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G2.java index 0a29daf263c0..51dce3a2bde0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G2.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824549695112512133L; + private static final long serialVersionUID = 3824559923492829494L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/MultiOptional.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/MultiOptional.java index fd0cb4374c04..3e112ef7f2b1 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/MultiOptional.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/MultiOptional.java @@ -1657,7 +1657,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5541499123266419344L; + private static final long serialVersionUID = 7416001685894197941L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OneOptional.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OneOptional.java index f78a0caea636..c6aac007a472 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OneOptional.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219600396581621719L; + private static final long serialVersionUID = -7219605167278994622L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalException.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalException.java index d97ffaacc4e2..63681d3d279f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalException.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalException.java @@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3116769819125438570L; + private static final long serialVersionUID = 2080729608384238770L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalWithCustom.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalWithCustom.java index 1aa36b168ebd..b3336a8cae2b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalWithCustom.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalWithCustom.java @@ -150,7 +150,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7316293369494023099L; + private static final long serialVersionUID = -3819522996581214661L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/RequiredException.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/RequiredException.java index c84116325045..3659c615a80e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/RequiredException.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/RequiredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894242870610047633L; + private static final long serialVersionUID = 2894242188660263370L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/SmallStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/SmallStruct.java index 0cbac1240f0c..13f3881bfdeb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/SmallStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700983586311235784L; + private static final long serialVersionUID = 6700995178584796179L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/VarStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/VarStruct.java index c2a027455728..044c9eb7d1c6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/VarStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912288370907446320L; + private static final long serialVersionUID = -1912289045115405557L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/WD.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/WD.java index 0d4604d75527..a26668d8c884 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/WD.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5268095167150588847L; + private static final long serialVersionUID = -7482135999377540159L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/A.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/A.java index d82b5d8e1b8b..77fe4e0ee9e1 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/A.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6161917427923899792L; + private static final long serialVersionUID = 7826805650865854096L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/B.java index 746b2c8969e1..5d610eb38c64 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8548771678821111965L; + private static final long serialVersionUID = -5411614624100612893L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/C.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/C.java index dd3d61511747..e8e7b6f7a9d2 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -971479749472026627L; + private static final long serialVersionUID = 117350595291026173L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/DerivedException.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/DerivedException.java index 37ab9301bdca..34f0704fce3d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/DerivedException.java @@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -734092599683864067L; + private static final long serialVersionUID = 4014513037862138944L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/E.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/E.java index c89ac89f2587..fecc4ecd2d71 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/E.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850739451166844556L; + private static final long serialVersionUID = -1850739434396678235L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/F.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/F.java index c06311ba53bc..6c99fac344ee 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/F.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430492833991220217L; + private static final long serialVersionUID = -6430492530472717354L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/FixedStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/FixedStruct.java index 55b952dfd57d..dcd78c1dccbf 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569601371510395373L; + private static final long serialVersionUID = 1569601514776648421L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G.java index 0836146599fd..ea6bbb7a3b8e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2783511561096582061L; + private static final long serialVersionUID = 427417373554100819L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G1.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G1.java index 53ce80e891ec..9dbb308aeaa0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G1.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339784616394548467L; + private static final long serialVersionUID = 7339784793312431566L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G2.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G2.java index 910919cfbb68..91d45c7fb337 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G2.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824551162174300951L; + private static final long serialVersionUID = 3824551178935197828L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/MultiOptional.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/MultiOptional.java index 17f9c382d562..80f8197fec6a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/MultiOptional.java @@ -1657,7 +1657,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4910388759982829497L; + private static final long serialVersionUID = 4317092372289043471L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OneOptional.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OneOptional.java index c1be916fc7dd..81f33d0adddc 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219599216194805885L; + private static final long serialVersionUID = -7219599233060532725L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalException.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalException.java index 1d50a3ed0407..2883b7ad48a2 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalException.java @@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4006639617367362809L; + private static final long serialVersionUID = 7467716473725198854L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalWithCustom.java index 870ed82666a3..f0749773d9b5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalWithCustom.java @@ -150,7 +150,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8853715578854720571L; + private static final long serialVersionUID = 5521958011688261755L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/RequiredException.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/RequiredException.java index bfc8f745531c..ed480dc367b8 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/RequiredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894238551883793658L; + private static final long serialVersionUID = 2894238894267698311L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/SmallStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/SmallStruct.java index a384e665c759..ab43181b7409 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700987904975142405L; + private static final long serialVersionUID = 6700987882952702296L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/VarStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/VarStruct.java index 18cbb7bd2289..733c8cbd1c85 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912284251189038981L; + private static final long serialVersionUID = -1912284074271729850L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/WD.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/WD.java index 93c688038f8a..59c3032e98f2 100644 --- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/WD.java +++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3531324457165114448L; + private static final long serialVersionUID = -6867173242873491867L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C1.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C1.java index 5e24c5d02543..bd33412deae0 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C1.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1894596163284352177L; + private static final long serialVersionUID = 1894608752367963212L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C2.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C2.java index b1d00f1cc75a..7e06191e4473 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C2.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2892575735283372530L; + private static final long serialVersionUID = 2892574727947590863L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E1.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E1.java index 76eacaf8dd66..a48017207623 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E1.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E1.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5787345276142132222L; + private static final long serialVersionUID = 5787332482691416771L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E2.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E2.java index c35af557cb96..470a8b68970e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E2.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E2.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4908749356270822824L; + private static final long serialVersionUID = 4908753248612644757L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/_notify.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/_notify.java index d530f32647cb..bc226de04711 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/_notify.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/_notify.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4322847653125693193L; + private static final long serialVersionUID = 4322854309520620980L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C1.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C1.java index 63f32d7121dc..75866c250f97 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C1.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5832356032306623161L; + private static final long serialVersionUID = 5832349602010308931L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C2.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C2.java index 4adcff67901a..30b5d769d6b5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C2.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2769372194232780216L; + private static final long serialVersionUID = 2769372833345317444L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E1.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E1.java index fd2a220fcaf3..0a1e36680586 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E1.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E1.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5344581441822048182L; + private static final long serialVersionUID = 5344586179989357580L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E2.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E2.java index 64d7b82f7184..3fb460dc01a5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E2.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E2.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8399045123836342048L; + private static final long serialVersionUID = -8399051301055979236L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C1.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C1.java index b847da804993..b6b108e4fa8d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C1.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -860912834196332744L; + private static final long serialVersionUID = -860919011525923070L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C2.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C2.java index 838ffe0be383..ae8b857c568b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C2.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 954149313772813016L; + private static final long serialVersionUID = 954149948179611364L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E1.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E1.java index 59a0fe1c5e1d..e79266ef9b58 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E1.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E1.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 6934983727471669399L; + private static final long serialVersionUID = 6934988548439987373L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E2.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E2.java index fae9e4b88894..8b2b9703fa4a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E2.java +++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E2.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5414542094173383105L; + private static final long serialVersionUID = 5414535999757124157L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C.java index 9864d8895f0c..083a1921c5fb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190250150000272674L; + private static final long serialVersionUID = -5190248135305214280L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C1.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C1.java index fa1c752c2a10..19043f24a995 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C1.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893230282133888495L; + private static final long serialVersionUID = 8893228417098026505L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C2.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C2.java index bca9467e8cf4..863d7146517a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C2.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 888946913958245751L; + private static final long serialVersionUID = 91387154348878033L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/C.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/C.java index ebf506002fd9..e755af432d00 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615625800046965754L; + private static final long serialVersionUID = 4615623537234073180L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/C.java index fbef0bb90c77..58e7cfa0079a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672580578273949093L; + private static final long serialVersionUID = 672584256218192003L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/S.java index 45650750fe23..662c00cef00d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654442352573727823L; + private static final long serialVersionUID = 8654444217458074793L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/S.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/S.java index 8dd6ccf8a24c..1e1813262cb8 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694613268974339715L; + private static final long serialVersionUID = 3694609833674142181L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S.java index 6a53d4b70fc8..3a8caeba597f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159705535970265597L; + private static final long serialVersionUID = 2159708723308613211L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S1.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S1.java index a44019a92ab1..f46cf70b30e4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S1.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241671882581457494L; + private static final long serialVersionUID = 1241668777888003760L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S2.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S2.java index 5bdd6c9b623e..f7f5a835364f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S2.java +++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = -4423619341459057522L; + private static final long serialVersionUID = -6100094146714643928L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Bar.java b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Bar.java index bc38f128e0f1..ab1957d88c9d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Bar.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Bar.java @@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5623106805874160631L; + private static final long serialVersionUID = 6893358779828827255L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Baz.java b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Baz.java index 0f7ffda5d50a..84d3046cbade 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Baz.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Baz.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1400240367201809482L; + private static final long serialVersionUID = -3995345053469873738L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Foo.java b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Foo.java index e53bd1ead688..e7307892f982 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Foo.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Foo.java @@ -152,5 +152,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final Foo _nullMarshalValue = new Foo(); /** @hidden */ - private static final long serialVersionUID = -8431030918812253888L; + private static final long serialVersionUID = 6524607019706839872L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Bar.java b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Bar.java index 990016923deb..e0ca2d0dcc72 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Bar.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Bar.java @@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3817214525573292898L; + private static final long serialVersionUID = -1656547319745358544L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Baz.java b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Baz.java index 4a19e104615c..2bd7332158ce 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Baz.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Baz.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7795394815273011619L; + private static final long serialVersionUID = 3669789347398853617L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Foo.java b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Foo.java index 958e58193b5a..6366c32c5b1d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Foo.java +++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Foo.java @@ -152,5 +152,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final Foo _nullMarshalValue = new Foo(); /** @hidden */ - private static final long serialVersionUID = 1721711888872567253L; + private static final long serialVersionUID = -302777205144985593L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Base.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Base.java index 18369aa07e62..f3468336a0a4 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Base.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477020152412740796L; + private static final long serialVersionUID = -477023861518116428L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownDerived.java index e013e4942dcc..509571948747 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485212783337068898L; + private static final long serialVersionUID = 3485214529383059410L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownIntermediate.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownIntermediate.java index b9635e8b5833..a6742fccb90a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownIntermediate.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717373583298329875L; + private static final long serialVersionUID = 1717377974279678883L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownMostDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownMostDerived.java index d469c2a652bf..ca14589f40aa 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownMostDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384914064958902966L; + private static final long serialVersionUID = -7384918455940670278L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreserved.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreserved.java index 220ffa7c492e..43c23aaaab26 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreserved.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreserved.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2733711022187701361L; + private static final long serialVersionUID = -2733707313072953793L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreservedDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreservedDerived.java index 507e94a20e04..fa87b216b634 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreservedDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreservedDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4528099567857375302L; + private static final long serialVersionUID = 4528095858761199542L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/Base.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/Base.java index 75ec758da44a..625bbb767765 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/Base.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477024583371863773L; + private static final long serialVersionUID = -477023082670671489L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownDerived.java index b54e651accf7..f19414dcf24d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485213967671745477L; + private static final long serialVersionUID = 3485209532624871065L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownIntermediate.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownIntermediate.java index bac3541e02cb..c9dfff4e49bb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownIntermediate.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717378696133426228L; + private static final long serialVersionUID = 1717377360910905832L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownMostDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownMostDerived.java index 4212a8a78460..4d6a8fa5a8d7 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownMostDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384919017651979987L; + private static final long serialVersionUID = -7384912376936727823L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownDerived.java index a21b87552d08..83d71034eeda 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3424382311663268128L; + private static final long serialVersionUID = 3424370347514739452L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownIntermediate.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownIntermediate.java index 47b0318d3947..cf3deada4ec5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownIntermediate.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1172594569117608271L; + private static final long serialVersionUID = -1172598479513108371L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived1.java index 64a5e40e7c86..4ef2c6c0b35a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived1.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1126112540419178552L; + private static final long serialVersionUID = -1126113759724977004L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived2.java index 19e47871faac..7cc592482620 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived2.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2097571425735450840L; + private static final long serialVersionUID = -2097583389902953228L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/Base.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/Base.java index 6903ed9f08ca..678c5b3a5e7b 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/Base.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477023817608027919L; + private static final long serialVersionUID = -477023138135954526L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownDerived.java index ce2188bd32f9..14a8d6f2cbb2 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485214402842645655L; + private static final long serialVersionUID = 3485209792296181060L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownIntermediate.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownIntermediate.java index d7e07d90839d..7d3dd6716ec3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownIntermediate.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717378095848245862L; + private static final long serialVersionUID = 1717377416376172213L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownMostDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownMostDerived.java index 5eaa7abaf5cb..4e9684c4a3da 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownMostDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384918412040208513L; + private static final long serialVersionUID = -7384912117265405908L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownDerived.java index dbc0490085ed..c2b9120b629a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3424372084612823666L; + private static final long serialVersionUID = 3424370121575690913L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownIntermediate.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownIntermediate.java index e0518188c592..984b4b3b6acb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownIntermediate.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1172606157382261789L; + private static final long serialVersionUID = -1172598579042400080L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived1.java index 2b8b213bcde5..2f4fe84fddb1 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived1.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1126117472787447014L; + private static final long serialVersionUID = -1126113985664013111L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived2.java index d21fcb7aa88d..2302dab2f1f6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived2.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2097581652804852614L; + private static final long serialVersionUID = -2097583615841985367L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/B.java index c87d6e09ac98..d49297969938 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9218014524873431088L; + private static final long serialVersionUID = -364365245894975635L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/BaseException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/BaseException.java index cda87628264a..90829c90e3d1 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/BaseException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -1388499134245109380L; + private static final long serialVersionUID = 6192248674848690977L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPCDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPCDerived.java index 79a41aa34394..21f9d306ab02 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPCDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6396996983243663096L; + private static final long serialVersionUID = -6396993168247552028L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPDerived.java index d0c762ff3562..2e5cc095baba 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066880720001891637L; + private static final long serialVersionUID = -9066889824851040091L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D1.java index 6fb93bda6603..5567e8119a5f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2125835009707317037L; + private static final long serialVersionUID = 116651639911066830L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D3.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D3.java index c48a7897590c..a517c3e046d3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D3.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4013416022545876753L; + private static final long serialVersionUID = 2351787788794023436L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/DerivedException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/DerivedException.java index 3317edc9a3e8..94c667c553fb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/DerivedException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2285527564055128391L; + private static final long serialVersionUID = 7706680281382618856L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Forward.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Forward.java index 3876d0f521ad..e753b0f7949c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Forward.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655923845439462374L; + private static final long serialVersionUID = -7655930945778683658L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Hidden.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Hidden.java index f8208126ba5d..5422511000cb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Hidden.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271128014425260081L; + private static final long serialVersionUID = -2271120913934540313L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PBase.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PBase.java index 23ce62975cac..f7720f4c1de6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481713911343281948L; + private static final long serialVersionUID = 481717044355289429L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived.java index 0106bee38ad3..81cd51e17996 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426887465235419448L; + private static final long serialVersionUID = -4426878360386507612L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived2.java index 2f1c7f507c27..d123e6562f1a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850544630985301825L; + private static final long serialVersionUID = 850536047969260936L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived3.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived3.java index 11a9a72656e1..a282e106d91f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived3.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328899531552204317L; + private static final long serialVersionUID = -4328906631898695326L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCUnknown.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCUnknown.java index 68be456a7a14..d6a5bbd7ce71 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCUnknown.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081817833012053346L; + private static final long serialVersionUID = -5081810567203739528L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PDerived.java index 83335e6043bb..7bffdc25187f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643085677059621068L; + private static final long serialVersionUID = 643087322389781474L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PNode.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PNode.java index 2089f74418c3..2be040ab86c5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PNode.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438013816833499439L; + private static final long serialVersionUID = -2438004717329618439L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Preserved.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Preserved.java index d4f55657f4ab..b6eed87071de 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Preserved.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651529418821324631L; + private static final long serialVersionUID = 3651537201197785713L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBSKnownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBSKnownDerived.java index 1cb852272db7..9d3852a8c60e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBSKnownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804382470851919218L; + private static final long serialVersionUID = 8804373887746198740L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBase.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBase.java index 7bc27cec5264..9e6d80bc75bb 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353761882258008316L; + private static final long serialVersionUID = -5353758072446006046L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS1.java index ed54c9d6f561..ce1488698ce7 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522139928864233025L; + private static final long serialVersionUID = -6522143061876392066L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS2.java index 9eea68d3e427..364287f75d77 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620287988040139388L; + private static final long serialVersionUID = 7620285025345630653L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS3.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS3.java index 2ce29d302061..6876af1b89aa 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS3.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = 1464117414868171357L; + private static final long serialVersionUID = 1581296328568760989L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/B.java index b36b0323e323..8f2bb1abd0dd 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1078535288561586669L; + private static final long serialVersionUID = -5546952155079811475L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/BaseException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/BaseException.java index 6ce44fb87753..1541e42cd6c8 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/BaseException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 3929105260667364257L; + private static final long serialVersionUID = 3362059197913157409L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/CompactPDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/CompactPDerived.java index 098f856bbfe8..fdd11d3fed77 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/CompactPDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066880440731694519L; + private static final long serialVersionUID = -9066889265443700967L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D1.java index 5bc637952326..bd3e86640a23 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5771641383086671410L; + private static final long serialVersionUID = 8960225538454889678L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D2.java index 243c9c9b1445..c426f3c15edf 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3578080600159540973L; + private static final long serialVersionUID = -136791096847748499L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D4.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D4.java index 09956f235bb1..566facd0e39c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D4.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4696578150467198579L; + private static final long serialVersionUID = 8284027297333634163L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/DerivedException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/DerivedException.java index b728fa34552e..eed3524eb09c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/DerivedException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -6459228378483903000L; + private static final long serialVersionUID = -1494035528040997400L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Forward.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Forward.java index 4f521b46cf94..a724a361aaa5 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Forward.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655923648972831243L; + private static final long serialVersionUID = -7655931189930271067L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Hidden.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Hidden.java index 5393b75942ae..7a078d8983a1 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Hidden.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271128376197746677L; + private static final long serialVersionUID = -2271120835433504165L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/MyClass.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/MyClass.java index cd61e4d19f82..befb783257af 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/MyClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4147528111977324598L; + private static final long serialVersionUID = 4147520570900286694L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PBase.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PBase.java index f7ebbb61e315..d3cf51fd4ae1 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481713549490748665L; + private static final long serialVersionUID = 481716919038708393L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PDerived.java index b34681bedee4..5f97ce093c4a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643085563400919758L; + private static final long serialVersionUID = 643087649010315422L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PNode.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PNode.java index 9119de22d69a..d48494abd6f3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PNode.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438013940842202667L; + private static final long serialVersionUID = -2438005116313915131L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown.java index ac8ac3472369..cef33ca66a3c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -818902304520343915L; + private static final long serialVersionUID = -5712149280706328379L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown2.java index 6b281dfbdac2..a332535f05d3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8813708986177978774L; + private static final long serialVersionUID = -8813712355729284166L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknownException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknownException.java index 0acbf8903781..13ae0406eeb3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknownException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknownException.java @@ -61,5 +61,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 4410691799909639174L; + private static final long serialVersionUID = 4410699340867078998L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Preserved.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Preserved.java index 2003431824e3..f96e16f71784 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Preserved.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651529057058457757L; + private static final long serialVersionUID = 3651536598021579853L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSKnownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSKnownDerived.java index 7df348b62b2f..16bb586a3815 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSKnownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804382677491713720L; + private static final long serialVersionUID = 8804373852972732648L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSUnknownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSUnknownDerived.java index f8bc4c6813bf..b48fbf14db52 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSUnknownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4989061043288940099L; + private static final long serialVersionUID = -4989058957486519059L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBase.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBase.java index ac141bc5c4c5..bd24026eed78 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353762006229409330L; + private static final long serialVersionUID = -5353758636871129314L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS1.java index 31fee1a8ad83..294c1f883510 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522139649822046958L; + private static final long serialVersionUID = -6522143019066583102L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS2.java index 1c5b7c3940a6..e0885219adad 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620288194603710353L; + private static final long serialVersionUID = 7620284825359174209L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS3.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS3.java index ba3e2b0107ab..4e903f397807 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS3.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = -7604362165827077731L; + private static final long serialVersionUID = 2415624991884390813L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SUnknown.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SUnknown.java index 6789f0840604..4f982abaf2da 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SUnknown.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3835566460657234437L; + private static final long serialVersionUID = -8455821338130299003L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/UnknownDerivedException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/UnknownDerivedException.java index dde24e416cb5..32ab108e492e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/UnknownDerivedException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/UnknownDerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5545407969868816582L; + private static final long serialVersionUID = 188130899198212038L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/B.java index b61c402adbe3..063d6c35fc03 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/B.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7413644507360069922L; + private static final long serialVersionUID = 2577311273537556163L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/BaseException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/BaseException.java index dd8ae069347f..8a4d184b1c89 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/BaseException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 7971974077014355182L; + private static final long serialVersionUID = -2964209987235229297L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D1.java index cf3471b0ca60..98c9c1a8aaf2 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6465842430765707809L; + private static final long serialVersionUID = -4265316428767098144L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D2.java index ec9cd4010b71..b7818405f99c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5643965781913306882L; + private static final long serialVersionUID = 5084408116604649923L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D4.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D4.java index a5af6092567f..c8d183ba02e8 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D4.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1906981235056262387L; + private static final long serialVersionUID = 3401097392576144243L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/DerivedException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/DerivedException.java index a3f79f567e04..193eb0dd7d6f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/DerivedException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3046574959379091623L; + private static final long serialVersionUID = -3395089924393345405L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Forward.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Forward.java index 4f9d12d6b4fc..f878dd864a15 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Forward.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655922524032322035L; + private static final long serialVersionUID = -7655927013325731854L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Hidden.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Hidden.java index 24b6e08771fa..80b56ec21cf7 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Hidden.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271129335681907721L; + private static final long serialVersionUID = -2271124846427660532L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/MyClass.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/MyClass.java index 746926033325..a13218c23966 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/MyClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4147529236869314683L; + private static final long serialVersionUID = 4147524747567208568L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PBase.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PBase.java index 613a5e7156ef..ac1b1539b242 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481708622706770356L; + private static final long serialVersionUID = 481712907793602615L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PDerived.java index a2cecae2872e..d690685351ad 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643078898063516148L; + private static final long serialVersionUID = 643086200135051133L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PNode.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PNode.java index 3436729b50ed..eec4b88924b9 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PNode.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438007526018814321L; + private static final long serialVersionUID = -2438000939862849833L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown.java index 9fef5c64de31..1119e6b1cc7e 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2999163406208716143L; + private static final long serialVersionUID = -6751793230376426252L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown2.java index db4ac5c74fa4..bb583033573f 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8813709865747937648L; + private static final long serialVersionUID = -8813708179122017255L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknownException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknownException.java index f2a4cb7435c8..bc4e3dd25918 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknownException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknownException.java @@ -61,5 +61,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 4410691602392579464L; + private static final long serialVersionUID = 4410703517477200746L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Preserved.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Preserved.java index 2795458ce6b1..80db7b6b5a36 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Preserved.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651528779456271556L; + private static final long serialVersionUID = 3651532586878494789L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSKnownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSKnownDerived.java index 80605aa63ac7..6f23f0b0ccec 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSKnownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804376694043742433L; + private static final long serialVersionUID = 8804372403945630560L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSUnknownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSUnknownDerived.java index 7afe074b0244..ff1205145ba6 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSUnknownDerived.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4989066941516129436L; + private static final long serialVersionUID = -4989057673928470555L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBase.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBase.java index 5de59718d56a..b71fc10f770d 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBase.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353760881300628585L; + private static final long serialVersionUID = -5353754460268362730L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS1.java index 73adec490fbb..6c6e9a70dba3 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS1.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522134637662934258L; + private static final long serialVersionUID = -6522141735502292896L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS2.java index 555a0654f4f8..005f16e0a963 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS2.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620287831677668493L; + private static final long serialVersionUID = 7620283376179624483L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS3.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS3.java index 9329061c4b7b..6e105b8d3b0c 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS3.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = 1895112006446351919L; + private static final long serialVersionUID = -3280936176648607505L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SUnknown.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SUnknown.java index d34e09e99fc5..81ee4ddffd36 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SUnknown.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2643637091199682313L; + private static final long serialVersionUID = 7172123598338319300L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/UnknownDerivedException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/UnknownDerivedException.java index 541c1ea332c3..f342ded1aa83 100644 --- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/UnknownDerivedException.java +++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/UnknownDerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4443491788977336058L; + private static final long serialVersionUID = 156628504071664604L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/LargeStruct.java b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/LargeStruct.java index 15680d92a3b7..5210eafe8e59 100644 --- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/LargeStruct.java +++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/LargeStruct.java @@ -253,5 +253,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LargeStruct _nullMarshalValue = new LargeStruct(); /** @hidden */ - private static final long serialVersionUID = -3022715657779564141L; + private static final long serialVersionUID = -8450413993819757246L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyClass.java b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyClass.java index 78b31a2b603c..2068c68fec56 100644 --- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyClass.java @@ -88,7 +88,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4680070420794880672L; + private static final long serialVersionUID = -1795427465711045230L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyException.java b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyException.java index c2b3d7fd349a..f36df818e294 100644 --- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyException.java +++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyException.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 5734229083482206934L; + private static final long serialVersionUID = 5734226062727963829L; } diff --git a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/OptionalClass.java b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/OptionalClass.java index dd82da416b4d..e13cd280e60a 100644 --- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/OptionalClass.java +++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/OptionalClass.java @@ -726,7 +726,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6424148464868651885L; + private static final long serialVersionUID = 5078209282883870581L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/Point.java b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/Point.java index c2340b04d264..dc2673eca2ee 100644 --- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/Point.java +++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/Point.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Point _nullMarshalValue = new Point(); /** @hidden */ - private static final long serialVersionUID = -6860473936860005808L; + private static final long serialVersionUID = -275268321301282960L; } diff --git a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Cls.java b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Cls.java index 7622d3d51912..5df3b28e268b 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Cls.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Cls.java @@ -172,7 +172,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5125776369370994376L; + private static final long serialVersionUID = 7669169425298389455L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Ex.java b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Ex.java index d362a8e48c21..633ac45048a2 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Ex.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Ex.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4720812857589071246L; + private static final long serialVersionUID = -6951254115466124550L; } diff --git a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/St.java b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/St.java index e55b704571cc..bb5ae7e583d2 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/St.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/St.java @@ -197,5 +197,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - private static final long serialVersionUID = -8610715095368625300L; + private static final long serialVersionUID = 8423950953420153841L; } diff --git a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_break.java b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_break.java index f39f8679bf4a..fee5c0f537bb 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_break.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_break.java @@ -138,5 +138,5 @@ static public java.util.Optional<_break> ice_read(com.zeroc.Ice.InputStream istr private static final _break _nullMarshalValue = new _break(); /** @hidden */ - private static final long serialVersionUID = -943489300012699289L; + private static final long serialVersionUID = -943482740705576400L; } diff --git a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_else.java b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_else.java index b35a643be566..005224ed0ec4 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_else.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_else.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5068435668287948570L; + private static final long serialVersionUID = -4081197087107906526L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_hashCode.java b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_hashCode.java index 8cad34ba5cf4..9598c1ec6f79 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_hashCode.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_hashCode.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2944658468164429284L; + private static final long serialVersionUID = -2944659252007824309L; } diff --git a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_import.java b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_import.java index c26d5b6894d1..2bbc164d16b2 100644 --- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_import.java +++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_import.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1861144913865532471L; + private static final long serialVersionUID = -5457175461753669321L; } diff --git a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/Default.java b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/Default.java index e185fd4aff06..4f065a3ed520 100644 --- a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/Default.java +++ b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/Default.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5825014423066462178L; + private static final long serialVersionUID = -7801153840596255234L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/JavaOnly.java b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/JavaOnly.java index d455ddf61242..0811ae9993df 100644 --- a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/JavaOnly.java +++ b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/JavaOnly.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4525991136989929296L; + private static final long serialVersionUID = -3776879985385614992L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/NoDefault.java b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/NoDefault.java index 08ecd6e07afd..72125a8e9da5 100644 --- a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/NoDefault.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8471026512348937729L; + private static final long serialVersionUID = 955305907386482847L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/C.java b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/C.java index 0e0796e3177f..ad16372d5c83 100644 --- a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/C.java +++ b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/C.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3172275516204193656L; + private static final long serialVersionUID = -3172283033917514101L; /** @hidden */ @Override diff --git a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S1.java b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S1.java index e14c3bc66fc3..939d8153006f 100644 --- a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S1.java +++ b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = -5542862456526050762L; + private static final long serialVersionUID = -5542853618927866059L; } diff --git a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S2.java b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S2.java index e48a8ad1643e..59b099652793 100644 --- a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S2.java +++ b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S2.java @@ -289,5 +289,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = -6851116423853285761L; + private static final long serialVersionUID = 5250607093177835999L; } diff --git a/slice2java/js/test/Glacier2/router/Test/CallbackException.java b/slice2java/js/test/Glacier2/router/Test/CallbackException.java index 62b286153200..940e5f9f2923 100644 --- a/slice2java/js/test/Glacier2/router/Test/CallbackException.java +++ b/slice2java/js/test/Glacier2/router/Test/CallbackException.java @@ -58,5 +58,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 6481977529208623284L; + private static final long serialVersionUID = 7668495090505678004L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Base.java b/slice2java/js/test/Ice/defaultValue/Test/Base.java index a0e58b48797d..957284a57ce7 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/js/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3446507943155281078L; + private static final long serialVersionUID = 3202661087285093354L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java index f2c0fa606843..ac092dd1ca37 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java @@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -6182084072198799874L; + private static final long serialVersionUID = -4319549659010023138L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java index 82e2a3ab0046..24345468f291 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5416384447784055824L; + private static final long serialVersionUID = 580213565697087664L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index ab50f39cea20..86a2827030b3 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8848604444116894080L; + private static final long serialVersionUID = -3013198702945248059L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/Derived.java b/slice2java/js/test/Ice/defaultValue/Test/Derived.java index 09c1949c6649..e822a6ecb5c4 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/js/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6352829950816160028L; + private static final long serialVersionUID = 8715449285851157988L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java index ce23f1eaa301..bf2afece9771 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java @@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5248092926912665171L; + private static final long serialVersionUID = 8335698384774538195L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index 1b4e4d4f7e15..7bce5134bc02 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 839847532903059284L; + private static final long serialVersionUID = 6943302185015221268L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index fefd483b87f5..a494f3544154 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -64,5 +64,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -5584228073268333136L; + private static final long serialVersionUID = -6791451790185548555L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java index f140361379bb..558ce4ce8025 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - private static final long serialVersionUID = 5127387535818091653L; + private static final long serialVersionUID = 5127388699352186560L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct1.java b/slice2java/js/test/Ice/defaultValue/Test/Struct1.java index 39b2a61ca5ec..adf2275d927f 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/js/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = -3605994085561802898L; + private static final long serialVersionUID = -7934892833797060626L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct2.java b/slice2java/js/test/Ice/defaultValue/Test/Struct2.java index df4df13dc56d..537ba1eeb97a 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/js/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = 7976912437135228495L; + private static final long serialVersionUID = 8733274556912685551L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct3.java b/slice2java/js/test/Ice/defaultValue/Test/Struct3.java index 8895c7cca6d9..d137a99b7dd3 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/Struct3.java +++ b/slice2java/js/test/Ice/defaultValue/Test/Struct3.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct3 _nullMarshalValue = new Struct3(); /** @hidden */ - private static final long serialVersionUID = 4285424518489628268L; + private static final long serialVersionUID = -4776828504730669588L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java index 1d067c81a8c9..98b383be53cd 100644 --- a/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - private static final long serialVersionUID = 7023074550017673898L; + private static final long serialVersionUID = 788849903056722415L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/A.java b/slice2java/js/test/Ice/exceptions/Test/A.java index baabee78a734..882bf334e524 100644 --- a/slice2java/js/test/Ice/exceptions/Test/A.java +++ b/slice2java/js/test/Ice/exceptions/Test/A.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7823738752391654168L; + private static final long serialVersionUID = 7823744520049649839L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/B.java b/slice2java/js/test/Ice/exceptions/Test/B.java index 70c78a5fc5b5..9926e9664336 100644 --- a/slice2java/js/test/Ice/exceptions/Test/B.java +++ b/slice2java/js/test/Ice/exceptions/Test/B.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3861417311276463400L; + private static final long serialVersionUID = -3861406088457766673L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/C.java b/slice2java/js/test/Ice/exceptions/Test/C.java index 6020dff8d0d6..ba45e242f1a2 100644 --- a/slice2java/js/test/Ice/exceptions/Test/C.java +++ b/slice2java/js/test/Ice/exceptions/Test/C.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1080692443594439448L; + private static final long serialVersionUID = 1080698211252435119L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/D.java b/slice2java/js/test/Ice/exceptions/Test/D.java index 84c48226d34f..508af24b5705 100644 --- a/slice2java/js/test/Ice/exceptions/Test/D.java +++ b/slice2java/js/test/Ice/exceptions/Test/D.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4780374956825614808L; + private static final long serialVersionUID = 4780386179644311535L; } diff --git a/slice2java/js/test/Ice/inheritance/Test/MC/A.java b/slice2java/js/test/Ice/inheritance/Test/MC/A.java index b34ee39dfe3c..1bfe71a9e4e1 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MC/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/MC/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 954225597128846398L; + private static final long serialVersionUID = 954225443356406523L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MC/B.java b/slice2java/js/test/Ice/inheritance/Test/MC/B.java index 794f39178695..36ec766f73ef 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MC/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/MC/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1339629184224986148L; + private static final long serialVersionUID = 1339629025286678753L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MC/C.java b/slice2java/js/test/Ice/inheritance/Test/MC/C.java index db4b0b2cb973..bd5b09865f46 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MC/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/MC/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2729310936915190874L; + private static final long serialVersionUID = -2729311090687630749L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MC/D.java b/slice2java/js/test/Ice/inheritance/Test/MC/D.java index 7b4469dd8098..39b5ffe218fa 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MC/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/MC/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3435402995374864352L; + private static final long serialVersionUID = -3435402834019357979L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MD/A.java b/slice2java/js/test/Ice/inheritance/Test/MD/A.java index 7bb811198bd3..da93bfc122a5 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MD/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/MD/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -836177020884423559L; + private static final long serialVersionUID = -836176867111983684L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MD/B.java b/slice2java/js/test/Ice/inheritance/Test/MD/B.java index 2ab3909e6743..0b8153e2325e 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MD/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/MD/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1132523441739884228L; + private static final long serialVersionUID = 1132523277796841985L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MD/C.java b/slice2java/js/test/Ice/inheritance/Test/MD/C.java index 202204363c9c..e105cbbf340d 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MD/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/MD/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6335554319554259898L; + private static final long serialVersionUID = -6335554478331434621L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MD/D.java b/slice2java/js/test/Ice/inheritance/Test/MD/D.java index 384ed4ed7f5c..4cc904818fe0 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MD/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/MD/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4007409241478506048L; + private static final long serialVersionUID = -4007409085127734523L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/ME/A.java b/slice2java/js/test/Ice/inheritance/Test/ME/A.java index 5cc55e0ebaaf..418857767b40 100644 --- a/slice2java/js/test/Ice/inheritance/Test/ME/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/ME/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 991424559952183480L; + private static final long serialVersionUID = 991424721307689853L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/ME/B.java b/slice2java/js/test/Ice/inheritance/Test/ME/B.java index 63f5c31ebdf0..e971da905eaa 100644 --- a/slice2java/js/test/Ice/inheritance/Test/ME/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/ME/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2880338927908125596L; + private static final long serialVersionUID = -2880339086846433247L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/ME/C.java b/slice2java/js/test/Ice/inheritance/Test/ME/C.java index 75bc5a61ed28..0f3cf03d5f98 100644 --- a/slice2java/js/test/Ice/inheritance/Test/ME/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/ME/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8808272264441725978L; + private static final long serialVersionUID = -8808272418214166109L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/ME/D.java b/slice2java/js/test/Ice/inheritance/Test/ME/D.java index 0d11a254f9a7..4c6ac9ffa502 100644 --- a/slice2java/js/test/Ice/inheritance/Test/ME/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/ME/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -771857906950530720L; + private static final long serialVersionUID = -771857745595024603L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MF/A.java b/slice2java/js/test/Ice/inheritance/Test/MF/A.java index 9cb6554d1669..2088a9083019 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MF/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/MF/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6566358865418629883L; + private static final long serialVersionUID = 6566359024356937278L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MF/B.java b/slice2java/js/test/Ice/inheritance/Test/MF/B.java index 21ca47e0fcdc..9ab0939f226c 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MF/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/MF/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6983800191560336132L; + private static final long serialVersionUID = 6983800027617294145L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MF/C.java b/slice2java/js/test/Ice/inheritance/Test/MF/C.java index 7e9661578ede..7968876dc631 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MF/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/MF/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1175218664097499770L; + private static final long serialVersionUID = -1175218822874674237L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MF/D.java b/slice2java/js/test/Ice/inheritance/Test/MF/D.java index 6c2f6db4a5f6..fad0e48cae91 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MF/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/MF/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3279717704675030784L; + private static final long serialVersionUID = -3279717548324259003L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MG/A.java b/slice2java/js/test/Ice/inheritance/Test/MG/A.java index d14348b98ea6..a14d544d459d 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MG/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/MG/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4359175813264021958L; + private static final long serialVersionUID = -4359175646742648065L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MG/B.java b/slice2java/js/test/Ice/inheritance/Test/MG/B.java index 085af4de97be..c80ff59f4c9b 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MG/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/MG/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5904685971776374180L; + private static final long serialVersionUID = 5904685812838066785L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MG/C.java b/slice2java/js/test/Ice/inheritance/Test/MG/C.java index b257fc4f7f5a..c7b67179c340 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MG/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/MG/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1835745850636197158L; + private static final long serialVersionUID = 1835745696863757283L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MG/D.java b/slice2java/js/test/Ice/inheritance/Test/MG/D.java index 2b882f25a7d6..4d1362111ebc 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MG/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/MG/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2252403648605181536L; + private static final long serialVersionUID = -2252403487249675163L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MH/A.java b/slice2java/js/test/Ice/inheritance/Test/MH/A.java index e4e916864d81..dcdb195e2b45 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MH/A.java +++ b/slice2java/js/test/Ice/inheritance/Test/MH/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1203535453538104203L; + private static final long serialVersionUID = -1203535620059478096L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MH/B.java b/slice2java/js/test/Ice/inheritance/Test/MH/B.java index 4044c1553f3c..44ac556be35d 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MH/B.java +++ b/slice2java/js/test/Ice/inheritance/Test/MH/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7537768589847400892L; + private static final long serialVersionUID = -7537768753790443135L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MH/C.java b/slice2java/js/test/Ice/inheritance/Test/MH/C.java index 1d1ecb34fd79..aeb6f52a6252 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MH/C.java +++ b/slice2java/js/test/Ice/inheritance/Test/MH/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3440897722568006598L; + private static final long serialVersionUID = 3440897563790831875L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/inheritance/Test/MH/D.java b/slice2java/js/test/Ice/inheritance/Test/MH/D.java index df0ac82b32b9..c685728e2796 100644 --- a/slice2java/js/test/Ice/inheritance/Test/MH/D.java +++ b/slice2java/js/test/Ice/inheritance/Test/MH/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9151100241425465664L; + private static final long serialVersionUID = 9151100397776237189L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/A.java b/slice2java/js/test/Ice/objects/Test/A.java index bfcc97e22557..b13c6a89ea45 100644 --- a/slice2java/js/test/Ice/objects/Test/A.java +++ b/slice2java/js/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6073933114263393261L; + private static final long serialVersionUID = -1445849024504557250L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/A1.java b/slice2java/js/test/Ice/objects/Test/A1.java index a5813f31cca8..283a6998af54 100644 --- a/slice2java/js/test/Ice/objects/Test/A1.java +++ b/slice2java/js/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926739324930045367L; + private static final long serialVersionUID = -5926744016768662911L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/B.java b/slice2java/js/test/Ice/objects/Test/B.java index fa848afdd73a..fc8a271677be 100644 --- a/slice2java/js/test/Ice/objects/Test/B.java +++ b/slice2java/js/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890911816988429407L; + private static final long serialVersionUID = -8890915225161324854L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/B1.java b/slice2java/js/test/Ice/objects/Test/B1.java index 08ffccb196b3..8be6b5612d32 100644 --- a/slice2java/js/test/Ice/objects/Test/B1.java +++ b/slice2java/js/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1731008144489521788L; + private static final long serialVersionUID = -5093162762112899324L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/Base.java b/slice2java/js/test/Ice/objects/Test/Base.java index d2589792a222..8dc8ef6d661f 100644 --- a/slice2java/js/test/Ice/objects/Test/Base.java +++ b/slice2java/js/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -195017965294604001L; + private static final long serialVersionUID = -7700478368908882632L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/C.java b/slice2java/js/test/Ice/objects/Test/C.java index 330e91644dec..d2a88d4db66b 100644 --- a/slice2java/js/test/Ice/objects/Test/C.java +++ b/slice2java/js/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3999165970924495512L; + private static final long serialVersionUID = 5165135725773455680L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/COneMember.java b/slice2java/js/test/Ice/objects/Test/COneMember.java index cfe06e6da55c..df54551d3f88 100644 --- a/slice2java/js/test/Ice/objects/Test/COneMember.java +++ b/slice2java/js/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050965047518099142L; + private static final long serialVersionUID = 3050979366097610497L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/CTwoMembers.java b/slice2java/js/test/Ice/objects/Test/CTwoMembers.java index 36f6ca63e3f9..e2fd433a7c4e 100644 --- a/slice2java/js/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/js/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5018547277871486619L; + private static final long serialVersionUID = 8513368451525778267L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/D.java b/slice2java/js/test/Ice/objects/Test/D.java index 174673394c35..b42856d31e28 100644 --- a/slice2java/js/test/Ice/objects/Test/D.java +++ b/slice2java/js/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3828113785137393482L; + private static final long serialVersionUID = -8347960899387076144L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/D1.java b/slice2java/js/test/Ice/objects/Test/D1.java index 1080b3886ba4..3b43f427a679 100644 --- a/slice2java/js/test/Ice/objects/Test/D1.java +++ b/slice2java/js/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4725637266175620419L; + private static final long serialVersionUID = -647679422207499581L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/E.java b/slice2java/js/test/Ice/objects/Test/E.java index 3fd4435283a9..30a3e0b4ef3a 100644 --- a/slice2java/js/test/Ice/objects/Test/E.java +++ b/slice2java/js/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3064360621474023412L; + private static final long serialVersionUID = -7951097201423965009L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/EBase.java b/slice2java/js/test/Ice/objects/Test/EBase.java index e7de2f6e3d5f..307f22909e1c 100644 --- a/slice2java/js/test/Ice/objects/Test/EBase.java +++ b/slice2java/js/test/Ice/objects/Test/EBase.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 3417045132580741454L; + private static final long serialVersionUID = 2357830438426897358L; } diff --git a/slice2java/js/test/Ice/objects/Test/EDerived.java b/slice2java/js/test/Ice/objects/Test/EDerived.java index ae2f064e6a44..03e3f6d474db 100644 --- a/slice2java/js/test/Ice/objects/Test/EDerived.java +++ b/slice2java/js/test/Ice/objects/Test/EDerived.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4441237572899206190L; + private static final long serialVersionUID = 5998730304661151954L; } diff --git a/slice2java/js/test/Ice/objects/Test/EOneMember.java b/slice2java/js/test/Ice/objects/Test/EOneMember.java index ca5c7ffb86a3..1a8d82120188 100644 --- a/slice2java/js/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/js/test/Ice/objects/Test/EOneMember.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6225280229901937847L; + private static final long serialVersionUID = -6225290376882289906L; } diff --git a/slice2java/js/test/Ice/objects/Test/ETwoMembers.java b/slice2java/js/test/Ice/objects/Test/ETwoMembers.java index 47d1c630d7dd..0cf236525e3a 100644 --- a/slice2java/js/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/js/test/Ice/objects/Test/ETwoMembers.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -1455601348042685932L; + private static final long serialVersionUID = -7200602523395891372L; } diff --git a/slice2java/js/test/Ice/objects/Test/F.java b/slice2java/js/test/Ice/objects/Test/F.java index 8af1f673944a..e6098b3c9069 100644 --- a/slice2java/js/test/Ice/objects/Test/F.java +++ b/slice2java/js/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 789168727056216081L; + private static final long serialVersionUID = -4818819219455084463L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/F1.java b/slice2java/js/test/Ice/objects/Test/F1.java index 0afe3b51dd0a..91fa86c90ad4 100644 --- a/slice2java/js/test/Ice/objects/Test/F1.java +++ b/slice2java/js/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192372812053875516L; + private static final long serialVersionUID = 6192372812036862517L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/F3.java b/slice2java/js/test/Ice/objects/Test/F3.java index bead4867d05d..4895dc020649 100644 --- a/slice2java/js/test/Ice/objects/Test/F3.java +++ b/slice2java/js/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4080955609516978717L; + private static final long serialVersionUID = 7611675600889841683L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/Inner/A.java b/slice2java/js/test/Ice/objects/Test/Inner/A.java index 18b8a9b32e36..b9da91a2d721 100644 --- a/slice2java/js/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/js/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1425254278878129333L; + private static final long serialVersionUID = -1425257687047003296L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/Inner/Ex.java b/slice2java/js/test/Ice/objects/Test/Inner/Ex.java index eb87f6115b5c..dfc0ecc72ad7 100644 --- a/slice2java/js/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/js/test/Ice/objects/Test/Inner/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2337225083741675792L; + private static final long serialVersionUID = -2337225847068777672L; } diff --git a/slice2java/js/test/Ice/objects/Test/Inner/Sub/A.java b/slice2java/js/test/Ice/objects/Test/Inner/Sub/A.java index 83145beec387..a24b7c1277f4 100644 --- a/slice2java/js/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/js/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1298688718043365744L; + private static final long serialVersionUID = -1298675760836102058L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/js/test/Ice/objects/Test/Inner/Sub/Ex.java index 0b4c33583feb..e81806b83c09 100644 --- a/slice2java/js/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/js/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1842226175356109460L; + private static final long serialVersionUID = 1842241777520589660L; } diff --git a/slice2java/js/test/Ice/objects/Test/K.java b/slice2java/js/test/Ice/objects/Test/K.java index e6a0cb2c996c..552b456bc317 100644 --- a/slice2java/js/test/Ice/objects/Test/K.java +++ b/slice2java/js/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645160570635653908L; + private static final long serialVersionUID = 4645159807298091862L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/L.java b/slice2java/js/test/Ice/objects/Test/L.java index 15f144ba145d..8fd8ffb45d7f 100644 --- a/slice2java/js/test/Ice/objects/Test/L.java +++ b/slice2java/js/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629743197398617218L; + private static final long serialVersionUID = 6629735695340212554L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/M.java b/slice2java/js/test/Ice/objects/Test/M.java index d337e27bdd4f..d9ec066d98d3 100644 --- a/slice2java/js/test/Ice/objects/Test/M.java +++ b/slice2java/js/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088101359241524729L; + private static final long serialVersionUID = -8088100595909720545L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/Recursive.java b/slice2java/js/test/Ice/objects/Test/Recursive.java index 748a03183f88..3b83e326ab69 100644 --- a/slice2java/js/test/Ice/objects/Test/Recursive.java +++ b/slice2java/js/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617887245756858827L; + private static final long serialVersionUID = 3617875572108343308L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/S.java b/slice2java/js/test/Ice/objects/Test/S.java index 4ce4cc5526d2..69959356b0f0 100644 --- a/slice2java/js/test/Ice/objects/Test/S.java +++ b/slice2java/js/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481773239970108849L; + private static final long serialVersionUID = 481769831712006777L; } diff --git a/slice2java/js/test/Ice/objects/Test/SOneMember.java b/slice2java/js/test/Ice/objects/Test/SOneMember.java index 6ba02a676c04..323d43769eec 100644 --- a/slice2java/js/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/js/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227749266102750175L; + private static final long serialVersionUID = 6227751312996006808L; } diff --git a/slice2java/js/test/Ice/objects/Test/STwoMembers.java b/slice2java/js/test/Ice/objects/Test/STwoMembers.java index c6876fdecd3e..ace6ab496627 100644 --- a/slice2java/js/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/js/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = 943059073618620802L; + private static final long serialVersionUID = -5085426901680163646L; } diff --git a/slice2java/js/test/Ice/objects/Test/StructKey.java b/slice2java/js/test/Ice/objects/Test/StructKey.java index 1f575b86b337..1a65aa7985ef 100644 --- a/slice2java/js/test/Ice/objects/Test/StructKey.java +++ b/slice2java/js/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = 6944036306317578680L; + private static final long serialVersionUID = -377316031674508829L; } diff --git a/slice2java/js/test/Ice/operations/Test/AnotherStruct.java b/slice2java/js/test/Ice/operations/Test/AnotherStruct.java index 187acde03829..877b0d0ba19c 100644 --- a/slice2java/js/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/js/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723846145962640533L; + private static final long serialVersionUID = 2723850578133380923L; } diff --git a/slice2java/js/test/Ice/operations/Test/MyClass1.java b/slice2java/js/test/Ice/operations/Test/MyClass1.java index 262fc24c18b0..8b327c81b835 100644 --- a/slice2java/js/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/js/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6346402990270352129L; + private static final long serialVersionUID = -7629466466587641647L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct.java b/slice2java/js/test/Ice/operations/Test/MyStruct.java index 6ebd77403eb5..8dd8425fa91d 100644 --- a/slice2java/js/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/js/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = 1474869533251222045L; + private static final long serialVersionUID = -7692516374169623203L; } diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct1.java b/slice2java/js/test/Ice/operations/Test/MyStruct1.java index 3ebe47324d29..8871ad5b1514 100644 --- a/slice2java/js/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/js/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = -7736631921846226634L; + private static final long serialVersionUID = -7150501430830579624L; } diff --git a/slice2java/js/test/Ice/operations/Test/Structure.java b/slice2java/js/test/Ice/operations/Test/Structure.java index 7d33d8ba5856..c0c88602a07e 100644 --- a/slice2java/js/test/Ice/operations/Test/Structure.java +++ b/slice2java/js/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = 5210261974773828783L; + private static final long serialVersionUID = -4612909073055193087L; } diff --git a/slice2java/js/test/Ice/optional/Test/A.java b/slice2java/js/test/Ice/optional/Test/A.java index 513cfc9ff7cf..d957a7b9871a 100644 --- a/slice2java/js/test/Ice/optional/Test/A.java +++ b/slice2java/js/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4143721306910650480L; + private static final long serialVersionUID = 1121349092393401104L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/B.java b/slice2java/js/test/Ice/optional/Test/B.java index 4a7d16d9a4fb..5eedf36156e1 100644 --- a/slice2java/js/test/Ice/optional/Test/B.java +++ b/slice2java/js/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3179552211277512093L; + private static final long serialVersionUID = 6822883554256583139L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/C.java b/slice2java/js/test/Ice/optional/Test/C.java index 9d8855a1e789..fdbb9614e236 100644 --- a/slice2java/js/test/Ice/optional/Test/C.java +++ b/slice2java/js/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2717543493328677635L; + private static final long serialVersionUID = -5351496282136685571L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/DerivedException.java b/slice2java/js/test/Ice/optional/Test/DerivedException.java index 7756857c3c38..5997ec399e47 100644 --- a/slice2java/js/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/js/test/Ice/optional/Test/DerivedException.java @@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1727277821869961241L; + private static final long serialVersionUID = 304818762380450826L; } diff --git a/slice2java/js/test/Ice/optional/Test/E.java b/slice2java/js/test/Ice/optional/Test/E.java index a9857543a487..bf1edb49dba4 100644 --- a/slice2java/js/test/Ice/optional/Test/E.java +++ b/slice2java/js/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850730236626359834L; + private static final long serialVersionUID = -1850730689851356051L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/F.java b/slice2java/js/test/Ice/optional/Test/F.java index 1195cef74b9a..a169a3a91d95 100644 --- a/slice2java/js/test/Ice/optional/Test/F.java +++ b/slice2java/js/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430490817935437675L; + private static final long serialVersionUID = -6430490684989328354L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/FixedStruct.java b/slice2java/js/test/Ice/optional/Test/FixedStruct.java index f80681c2483c..15b48cad27c1 100644 --- a/slice2java/js/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/js/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569617198369341355L; + private static final long serialVersionUID = 1569617075758056124L; } diff --git a/slice2java/js/test/Ice/optional/Test/G.java b/slice2java/js/test/Ice/optional/Test/G.java index 6e5748dbb34e..cd879e669ad7 100644 --- a/slice2java/js/test/Ice/optional/Test/G.java +++ b/slice2java/js/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6870138995081086957L; + private static final long serialVersionUID = -6859788053078557293L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/G1.java b/slice2java/js/test/Ice/optional/Test/G1.java index 73ca689fa18f..a49857ab702a 100644 --- a/slice2java/js/test/Ice/optional/Test/G1.java +++ b/slice2java/js/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339780019837260777L; + private static final long serialVersionUID = 7339779822467342212L; } diff --git a/slice2java/js/test/Ice/optional/Test/G2.java b/slice2java/js/test/Ice/optional/Test/G2.java index b83f2c19fdc3..621b17d77e8e 100644 --- a/slice2java/js/test/Ice/optional/Test/G2.java +++ b/slice2java/js/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824560376717287738L; + private static final long serialVersionUID = 3824559923496998049L; } diff --git a/slice2java/js/test/Ice/optional/Test/MultiOptional.java b/slice2java/js/test/Ice/optional/Test/MultiOptional.java index 9ef52e755b8e..e55f080a53f3 100644 --- a/slice2java/js/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/js/test/Ice/optional/Test/MultiOptional.java @@ -1675,7 +1675,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2907906010998917693L; + private static final long serialVersionUID = 373467741865112192L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/OneOptional.java b/slice2java/js/test/Ice/optional/Test/OneOptional.java index b985097d36ae..2a45e5a0956a 100644 --- a/slice2java/js/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/js/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219605535276950971L; + private static final long serialVersionUID = -7219605167282044846L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/OptionalException.java b/slice2java/js/test/Ice/optional/Test/OptionalException.java index b5c094ecb638..8d27c4645b21 100644 --- a/slice2java/js/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/js/test/Ice/optional/Test/OptionalException.java @@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -9047431183843223560L; + private static final long serialVersionUID = -8143188904594560141L; } diff --git a/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java index 43260a5fad01..9ca84752d6df 100644 --- a/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1511253590080912773L; + private static final long serialVersionUID = -4781657722711164613L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/RequiredException.java b/slice2java/js/test/Ice/optional/Test/RequiredException.java index 9c51c573559a..01720299cbab 100644 --- a/slice2java/js/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/js/test/Ice/optional/Test/RequiredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894242140801645536L; + private static final long serialVersionUID = 2894242188665829325L; } diff --git a/slice2java/js/test/Ice/optional/Test/SmallStruct.java b/slice2java/js/test/Ice/optional/Test/SmallStruct.java index 3463f7906d8a..81008920736c 100644 --- a/slice2java/js/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/js/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700995546514925396L; + private static final long serialVersionUID = 6700995178519906004L; } diff --git a/slice2java/js/test/Ice/optional/Test/VarStruct.java b/slice2java/js/test/Ice/optional/Test/VarStruct.java index b6edb49d9ae3..aef82f20012b 100644 --- a/slice2java/js/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/js/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912288847746900639L; + private static final long serialVersionUID = -1912289045116802804L; } diff --git a/slice2java/js/test/Ice/optional/Test/WD.java b/slice2java/js/test/Ice/optional/Test/WD.java index 78c82d4b4b57..3748e491ef49 100644 --- a/slice2java/js/test/Ice/optional/Test/WD.java +++ b/slice2java/js/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3421412024286840500L; + private static final long serialVersionUID = -1836187239925758506L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/C.java b/slice2java/js/test/Ice/scope/Test/C.java index b5d5770c47cc..5fb880fd900c 100644 --- a/slice2java/js/test/Ice/scope/Test/C.java +++ b/slice2java/js/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190249807689983209L; + private static final long serialVersionUID = -5190250036351019086L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/C1.java b/slice2java/js/test/Ice/scope/Test/C1.java index 1f2efa3b4cf8..f478b26769d6 100644 --- a/slice2java/js/test/Ice/scope/Test/C1.java +++ b/slice2java/js/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893230585548389419L; + private static final long serialVersionUID = 8893230483441805106L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/C2.java b/slice2java/js/test/Ice/scope/Test/C2.java index 646fbd039045..b9756c98e626 100644 --- a/slice2java/js/test/Ice/scope/Test/C2.java +++ b/slice2java/js/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8750191528455531576L; + private static final long serialVersionUID = -4258881080017687957L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/Inner/C.java b/slice2java/js/test/Ice/scope/Test/Inner/C.java index 4cf28149c09f..59767c5d2ba7 100644 --- a/slice2java/js/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/js/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615625457782578026L; + private static final long serialVersionUID = 4615625603596603661L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/js/test/Ice/scope/Test/Inner/Inner2/C.java index 9df8dcbcdf7a..0235df20d22e 100644 --- a/slice2java/js/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/js/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672580721454449607L; + private static final long serialVersionUID = 672580702274397391L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/js/test/Ice/scope/Test/Inner/Inner2/S.java index bb3cd8d698f3..f2c946eda242 100644 --- a/slice2java/js/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/js/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654442049159207600L; + private static final long serialVersionUID = 8654441985803151706L; } diff --git a/slice2java/js/test/Ice/scope/Test/Inner/S.java b/slice2java/js/test/Ice/scope/Test/Inner/S.java index 6356a28ab8da..c832fb8f07bb 100644 --- a/slice2java/js/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/js/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694613451142592636L; + private static final long serialVersionUID = 3694613222483498774L; } diff --git a/slice2java/js/test/Ice/scope/Test/S.java b/slice2java/js/test/Ice/scope/Test/S.java index dafc734bf159..cfcb04145f50 100644 --- a/slice2java/js/test/Ice/scope/Test/S.java +++ b/slice2java/js/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159705353802084674L; + private static final long serialVersionUID = 2159705499807228392L; } diff --git a/slice2java/js/test/Ice/scope/Test/S1.java b/slice2java/js/test/Ice/scope/Test/S1.java index a33ae71a08d8..5695ac4a02da 100644 --- a/slice2java/js/test/Ice/scope/Test/S1.java +++ b/slice2java/js/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241672224910859410L; + private static final long serialVersionUID = 1241672166713991051L; } diff --git a/slice2java/js/test/Ice/scope/Test/S2.java b/slice2java/js/test/Ice/scope/Test/S2.java index cfe88a18d388..9d12a8932808 100644 --- a/slice2java/js/test/Ice/scope/Test/S2.java +++ b/slice2java/js/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 8060376323426263233L; + private static final long serialVersionUID = 2606607519517237778L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java index df917df3eecd..3796eaae0def 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477021132717232059L; + private static final long serialVersionUID = -477020025841173425L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java index 1547cc2f178e..87a3c0ea4135 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485211798027990883L; + private static final long serialVersionUID = 3485212739435007977L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 435627ef1a74..d270ce594c24 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717375245497333778L; + private static final long serialVersionUID = 1717373622205434136L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 65da20dc9803..0e676446ec56 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384921182313868597L; + private static final long serialVersionUID = -7384913938410913599L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java index bf4f90a193c6..824a891e469a 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2733699131560692850L; + private static final long serialVersionUID = -2733710983289255804L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index d5d131282065..4cf6cbcb93ca 100644 --- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4528104042718324423L; + private static final long serialVersionUID = 4528099694433538253L; } diff --git a/slice2java/js/test/Ice/slicing/objects/Test/B.java b/slice2java/js/test/Ice/slicing/objects/Test/B.java index f5dc39ea7396..413a4ea40651 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5315247679398225817L; + private static final long serialVersionUID = -313723196781368487L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/js/test/Ice/slicing/objects/Test/BaseException.java index e20a7a762082..d8a077108188 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 7315733363558904533L; + private static final long serialVersionUID = 235324319164603029L; } diff --git a/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java index 2f7c5c1ed8b6..ad918b5a387b 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6397002158357925590L; + private static final long serialVersionUID = -6396991585022262481L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/CompactPDerived.java index 344751b229b1..566bd3477de9 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066881082550209565L; + private static final long serialVersionUID = -9066886198147195098L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/D1.java b/slice2java/js/test/Ice/slicing/objects/Test/D1.java index 47b32f4aa164..473c1876df0c 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -81558182858370086L; + private static final long serialVersionUID = 6379788061455505402L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/D3.java b/slice2java/js/test/Ice/slicing/objects/Test/D3.java index b4d927fce255..27a11e781232 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2153572180248085400L; + private static final long serialVersionUID = 8614924210338462008L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/js/test/Ice/slicing/objects/Test/DerivedException.java index e254cff331e0..670fd0b01c17 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8383869727451759587L; + private static final long serialVersionUID = 2860253745083836349L; } diff --git a/slice2java/js/test/Ice/slicing/objects/Test/Forward.java b/slice2java/js/test/Ice/slicing/objects/Test/Forward.java index 8ccb0a1b985e..d67e9793a9fe 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655923007196655054L; + private static final long serialVersionUID = -7655929447825902921L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/js/test/Ice/slicing/objects/Test/Hidden.java index f1fb87dd4b40..9d4d080e366f 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271129018019748701L; + private static final long serialVersionUID = -2271122742689488474L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/PBase.java b/slice2java/js/test/Ice/slicing/objects/Test/PBase.java index 1991ac66a67c..8a419f2ce3be 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481708736148181255L; + private static final long serialVersionUID = 481719309475003970L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived.java index a2eb587b9231..8854e86f9e84 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426887185184380950L; + private static final long serialVersionUID = -4426882232317318929L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived2.java index 13f320375098..d0452100a9f4 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850538570100876506L; + private static final long serialVersionUID = 850539237711255967L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived3.java index 6abd51b5e6b4..1ffb06f794c7 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328898523006571311L; + private static final long serialVersionUID = -4328904803258769580L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/js/test/Ice/slicing/objects/Test/PCUnknown.java index 09ab3fa8e047..a3ab62354236 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081818758925390463L; + private static final long serialVersionUID = -5081812481177720124L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/PDerived.java index 73f908751b24..2a29f4680ac9 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643079466419534372L; + private static final long serialVersionUID = 643091194332521185L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/PNode.java b/slice2java/js/test/Ice/slicing/objects/Test/PNode.java index a39a078f971d..527407711ce7 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438007843896099985L; + private static final long serialVersionUID = -2438008343691688342L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/js/test/Ice/slicing/objects/Test/Preserved.java index dc128a87491c..1804ac11b746 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651528415277538888L; + private static final long serialVersionUID = 3651534690599084813L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/SBSKnownDerived.java index 900d5d461ae6..6965123ddc55 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804376580550082925L; + private static final long serialVersionUID = 8804377077847982248L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/SBase.java b/slice2java/js/test/Ice/slicing/objects/Test/SBase.java index 2db2e62654fd..8f3a20f44337 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353761364448481765L; + private static final long serialVersionUID = -5353756574471911714L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/SS1.java b/slice2java/js/test/Ice/slicing/objects/Test/SS1.java index 678de7c1a4ff..9217964aa56a 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522134836478702053L; + private static final long serialVersionUID = -6522145241912105698L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/SS2.java b/slice2java/js/test/Ice/slicing/objects/Test/SS2.java index fba27ab1be67..9c68d0f7811f 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620287552786221208L; + private static final long serialVersionUID = 7620282760224548253L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/slicing/objects/Test/SS3.java b/slice2java/js/test/Ice/slicing/objects/Test/SS3.java index dc15bfeb860d..1c81b01b919a 100644 --- a/slice2java/js/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/js/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = -1915393149534830564L; + private static final long serialVersionUID = -4186550940555851172L; } diff --git a/slice2java/js/test/Ice/stream/Test/LargeStruct.java b/slice2java/js/test/Ice/stream/Test/LargeStruct.java index 394333734ed2..c0de551851ec 100644 --- a/slice2java/js/test/Ice/stream/Test/LargeStruct.java +++ b/slice2java/js/test/Ice/stream/Test/LargeStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LargeStruct _nullMarshalValue = new LargeStruct(); /** @hidden */ - private static final long serialVersionUID = -669323939373390789L; + private static final long serialVersionUID = 5109783653526507195L; } diff --git a/slice2java/js/test/Ice/stream/Test/MyClass.java b/slice2java/js/test/Ice/stream/Test/MyClass.java index df015d080f99..537a654113be 100644 --- a/slice2java/js/test/Ice/stream/Test/MyClass.java +++ b/slice2java/js/test/Ice/stream/Test/MyClass.java @@ -85,7 +85,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4869606275354573805L; + private static final long serialVersionUID = 726684406993604589L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/stream/Test/MyException.java b/slice2java/js/test/Ice/stream/Test/MyException.java index 040b333d9a90..4725531027fb 100644 --- a/slice2java/js/test/Ice/stream/Test/MyException.java +++ b/slice2java/js/test/Ice/stream/Test/MyException.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 5734224613855699146L; + private static final long serialVersionUID = 5734225135646627583L; } diff --git a/slice2java/js/test/Ice/stream/Test/OptionalClass.java b/slice2java/js/test/Ice/stream/Test/OptionalClass.java index 5ca00e8c4e40..ec746d3b0167 100644 --- a/slice2java/js/test/Ice/stream/Test/OptionalClass.java +++ b/slice2java/js/test/Ice/stream/Test/OptionalClass.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1321004376725650012L; + private static final long serialVersionUID = -6643349885621277124L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/Clash/Cls.java b/slice2java/js/test/Slice/escape/Clash/Cls.java index af2ede68e3d2..0e2bac7a4f34 100644 --- a/slice2java/js/test/Slice/escape/Clash/Cls.java +++ b/slice2java/js/test/Slice/escape/Clash/Cls.java @@ -172,7 +172,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3734977831509805483L; + private static final long serialVersionUID = 6618147189893005661L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/Clash/Ex.java b/slice2java/js/test/Slice/escape/Clash/Ex.java index ecbfc15615cb..8400388f1825 100644 --- a/slice2java/js/test/Slice/escape/Clash/Ex.java +++ b/slice2java/js/test/Slice/escape/Clash/Ex.java @@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1503071138238528047L; + private static final long serialVersionUID = -5576150391488249369L; } diff --git a/slice2java/js/test/Slice/escape/Clash/St.java b/slice2java/js/test/Slice/escape/Clash/St.java index 53dcff74a6ad..6d6cfcaed98e 100644 --- a/slice2java/js/test/Slice/escape/Clash/St.java +++ b/slice2java/js/test/Slice/escape/Clash/St.java @@ -197,5 +197,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - private static final long serialVersionUID = 1281335636270423494L; + private static final long serialVersionUID = -7867353898832860794L; } diff --git a/slice2java/js/test/Slice/escape/await/BaseMethods.java b/slice2java/js/test/Slice/escape/await/BaseMethods.java index 28cb173f59c7..24349166c7eb 100644 --- a/slice2java/js/test/Slice/escape/await/BaseMethods.java +++ b/slice2java/js/test/Slice/escape/await/BaseMethods.java @@ -122,5 +122,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -5609168335681081894L; + private static final long serialVersionUID = 1571102614014602103L; } diff --git a/slice2java/js/test/Slice/escape/await/_break.java b/slice2java/js/test/Slice/escape/await/_break.java index ea6e60b0d1d0..533287364ccf 100644 --- a/slice2java/js/test/Slice/escape/await/_break.java +++ b/slice2java/js/test/Slice/escape/await/_break.java @@ -195,5 +195,5 @@ static public java.util.Optional<_break> ice_read(com.zeroc.Ice.InputStream istr private static final _break _nullMarshalValue = new _break(); /** @hidden */ - private static final long serialVersionUID = -5519226996271167633L; + private static final long serialVersionUID = 4819281159673579298L; } diff --git a/slice2java/js/test/Slice/escape/await/_package.java b/slice2java/js/test/Slice/escape/await/_package.java index eb5a59a35197..ccdbdebfd05f 100644 --- a/slice2java/js/test/Slice/escape/await/_package.java +++ b/slice2java/js/test/Slice/escape/await/_package.java @@ -369,7 +369,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5557236559842550591L; + private static final long serialVersionUID = -594822041897069887L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/await/delete.java b/slice2java/js/test/Slice/escape/await/delete.java index 7816f34e6292..2878fe9ad95d 100644 --- a/slice2java/js/test/Slice/escape/await/delete.java +++ b/slice2java/js/test/Slice/escape/await/delete.java @@ -67,7 +67,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6432930297588676269L; + private static final long serialVersionUID = -1467551395898971234L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/await/fixed.java b/slice2java/js/test/Slice/escape/await/fixed.java index fb527b421fa9..bd17fa66386d 100644 --- a/slice2java/js/test/Slice/escape/await/fixed.java +++ b/slice2java/js/test/Slice/escape/await/fixed.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3808658907378071841L; + private static final long serialVersionUID = 3808655555961480076L; } diff --git a/slice2java/js/test/Slice/escape/await/foreach.java b/slice2java/js/test/Slice/escape/await/foreach.java index 1c78aa284c2e..ccb05d51c401 100644 --- a/slice2java/js/test/Slice/escape/await/foreach.java +++ b/slice2java/js/test/Slice/escape/await/foreach.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4588605871607987063L; + private static final long serialVersionUID = -4302735254602957623L; } diff --git a/slice2java/js/test/Slice/macros/Test/Default.java b/slice2java/js/test/Slice/macros/Test/Default.java index d09ed1844dbb..e22888f2be31 100644 --- a/slice2java/js/test/Slice/macros/Test/Default.java +++ b/slice2java/js/test/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1945849680094356034L; + private static final long serialVersionUID = 8833915899684948574L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/macros/Test/NoDefault.java b/slice2java/js/test/Slice/macros/Test/NoDefault.java index 7a95caf45f56..e624760df0ee 100644 --- a/slice2java/js/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/js/test/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3039444457752365089L; + private static final long serialVersionUID = 8648888894763483583L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Base.java b/slice2java/matlab/test/Ice/defaultValue/Test/Base.java index 35b08249e112..08272a83d99a 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7104853964647648775L; + private static final long serialVersionUID = -4833134411884318973L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java index ec4e777f3bc2..6cf25e8c4558 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3062845336669499577L; + private static final long serialVersionUID = -1236131342536736740L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 215fa9d15bae..b5873a4df7b3 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6973435407614576366L; + private static final long serialVersionUID = -4208242537584489090L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java b/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java index 235bac2c1631..bba5802f4eb4 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7840053383771936335L; + private static final long serialVersionUID = -8430509217801518081L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java index d43769cf52cd..7c576b409056 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - private static final long serialVersionUID = 5127390367962346977L; + private static final long serialVersionUID = 5127390707755420701L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java index d3d89dc17b4c..c4142806fe86 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = -1096912499021207448L; + private static final long serialVersionUID = 3414438727401667420L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java index eb1116f0fde3..5f5df67f8aad 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = 3794005500035503003L; + private static final long serialVersionUID = 1440869206077332535L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java index 5d6a5febb9b2..23e83b70bb1b 100644 --- a/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - private static final long serialVersionUID = 7861893845529216755L; + private static final long serialVersionUID = -5874272388230059576L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/A.java b/slice2java/matlab/test/Ice/exceptions/Test/A.java index 81db6e3dc0e2..7d11cfb24be4 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/A.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/A.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7823737082499922810L; + private static final long serialVersionUID = 7823744728054137561L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/B.java b/slice2java/matlab/test/Ice/exceptions/Test/B.java index 22421b9f0d90..7ff01e014f98 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/B.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/B.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3861418816012092870L; + private static final long serialVersionUID = -3861405880453139815L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/C.java b/slice2java/matlab/test/Ice/exceptions/Test/C.java index 50b401e50418..4492c8864160 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/C.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/C.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1080690773702708090L; + private static final long serialVersionUID = 1080698419256922841L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/D.java b/slice2java/matlab/test/Ice/exceptions/Test/D.java index eac0194f03a4..09e6885dbb38 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/D.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/D.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4780373452089985338L; + private static final long serialVersionUID = 4780386387648938393L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/E.java b/slice2java/matlab/test/Ice/exceptions/Test/E.java index c19587bf8837..fa5343a12eba 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/E.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/E.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1876976129410835189L; + private static final long serialVersionUID = -1876975587051946278L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/F.java b/slice2java/matlab/test/Ice/exceptions/Test/F.java index fd66dd87acb8..6ab232001410 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/F.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/F.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 733472725244872200L; + private static final long serialVersionUID = 733476150174557913L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java b/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java index 43454b34f07d..6406535bbfd3 100644 --- a/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java +++ b/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4641410872534012434L; + private static final long serialVersionUID = -4641415459737915571L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/C1.java b/slice2java/matlab/test/Ice/objects/LocalTest/C1.java index 01f862f25233..6e7c540df86f 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/C1.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8471300439047087400L; + private static final long serialVersionUID = -8471300415819998701L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java index 3047270249ac..09d9f35aa020 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8898651856825539031L; + private static final long serialVersionUID = 8898651794689288171L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java index 650c40e7d1c6..e4a609a460df 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4040525703743305050L; + private static final long serialVersionUID = 4040526011176569917L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java index 94c37660931d..34c14b0b6bea 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5383251434562082829L; + private static final long serialVersionUID = 5383251457910268954L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java index 6dd89aa50991..f3750ae9fac9 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4057364205556356068L; + private static final long serialVersionUID = 4057364063284071309L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java index bed6b23fb79d..74fc2c2a500d 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1044055621437937796L; + private static final long serialVersionUID = -1044055644470532382L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java index 632883fed1b6..a061998efce4 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1862551044781704281L; + private static final long serialVersionUID = -1862551148194003896L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java index aed977825c92..4444b20f340d 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2187164568636186806L; + private static final long serialVersionUID = -2187164630525176293L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java index 49a7c42edf55..4e091e6bb46f 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java @@ -52,7 +52,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2195999223732303745L; + private static final long serialVersionUID = 556764630972854842L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S1.java b/slice2java/matlab/test/Ice/objects/LocalTest/S1.java index b04c6b7c20b2..47e078582d37 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S1.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S1.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = -5145825229546287412L; + private static final long serialVersionUID = -5145825206316354062L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S2.java b/slice2java/matlab/test/Ice/objects/LocalTest/S2.java index bfed83e31ed6..759e3c1c3247 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S2.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S2.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 3347995256565913455L; + private static final long serialVersionUID = 3347995398768867987L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S3.java b/slice2java/matlab/test/Ice/objects/LocalTest/S3.java index a097beb3aba8..244f4722b86d 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S3.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S3.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S3 _nullMarshalValue = new S3(); /** @hidden */ - private static final long serialVersionUID = -9162150105247314880L; + private static final long serialVersionUID = -9162150001986944345L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S4.java b/slice2java/matlab/test/Ice/objects/LocalTest/S4.java index 71de65adaac4..eb81250cd21d 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S4.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S4.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S4 _nullMarshalValue = new S4(); /** @hidden */ - private static final long serialVersionUID = -2752861122049078095L; + private static final long serialVersionUID = -2752861060158073946L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S5.java b/slice2java/matlab/test/Ice/objects/LocalTest/S5.java index 40480caca65d..34c9ef96e33b 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S5.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S5.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S5 _nullMarshalValue = new S5(); /** @hidden */ - private static final long serialVersionUID = -6601217338382345986L; + private static final long serialVersionUID = -6601217276482306025L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S6.java b/slice2java/matlab/test/Ice/objects/LocalTest/S6.java index 504bf384023b..424798843bf2 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S6.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S6.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S6 _nullMarshalValue = new S6(); /** @hidden */ - private static final long serialVersionUID = 3216394379556740612L; + private static final long serialVersionUID = 3216394317364382490L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S7.java b/slice2java/matlab/test/Ice/objects/LocalTest/S7.java index 5c96a315c63f..540f9818494e 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S7.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S7.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S7 _nullMarshalValue = new S7(); /** @hidden */ - private static final long serialVersionUID = -3218143050935558275L; + private static final long serialVersionUID = -3218143193051592302L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S8.java b/slice2java/matlab/test/Ice/objects/LocalTest/S8.java index f32895dc8547..ad3b7d776ca6 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/S8.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/S8.java @@ -139,5 +139,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S8 _nullMarshalValue = new S8(); /** @hidden */ - private static final long serialVersionUID = 4560073066210343742L; + private static final long serialVersionUID = 4560072877711014767L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java b/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java index cc055b0c2775..6e5d894b56f4 100644 --- a/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java +++ b/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = 3037182753729557683L; + private static final long serialVersionUID = 3272584480989560467L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/A.java b/slice2java/matlab/test/Ice/objects/Test/A.java index 7cd0411aa8fa..e9abff999715 100644 --- a/slice2java/matlab/test/Ice/objects/Test/A.java +++ b/slice2java/matlab/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8868355322540502255L; + private static final long serialVersionUID = 6832651374377816081L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/A1.java b/slice2java/matlab/test/Ice/objects/Test/A1.java index 949588aa1367..0cb89e076e60 100644 --- a/slice2java/matlab/test/Ice/objects/Test/A1.java +++ b/slice2java/matlab/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926741608110378047L; + private static final long serialVersionUID = -5926745966724012953L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/B.java b/slice2java/matlab/test/Ice/objects/Test/B.java index 8d3be94596ce..0271e3ddf179 100644 --- a/slice2java/matlab/test/Ice/objects/Test/B.java +++ b/slice2java/matlab/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890920276226119767L; + private static final long serialVersionUID = -8890918492722355424L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/B1.java b/slice2java/matlab/test/Ice/objects/Test/B1.java index e0cbf6e0a4b3..d4f1c777592f 100644 --- a/slice2java/matlab/test/Ice/objects/Test/B1.java +++ b/slice2java/matlab/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8922292599792664444L; + private static final long serialVersionUID = 6452303300280399364L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/Base.java b/slice2java/matlab/test/Ice/objects/Test/Base.java index d682054d2f73..bd3ce4313ab6 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Base.java +++ b/slice2java/matlab/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7408465683425024860L; + private static final long serialVersionUID = 9152151246471917324L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/C.java b/slice2java/matlab/test/Ice/objects/Test/C.java index fe4291b52ab5..36045645ef16 100644 --- a/slice2java/matlab/test/Ice/objects/Test/C.java +++ b/slice2java/matlab/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3740269066150770015L; + private static final long serialVersionUID = -5449934280201927095L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/COneMember.java b/slice2java/matlab/test/Ice/objects/Test/COneMember.java index cd1c5774bfc6..1688eb172598 100644 --- a/slice2java/matlab/test/Ice/objects/Test/COneMember.java +++ b/slice2java/matlab/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050973676950479732L; + private static final long serialVersionUID = 3050977348824599495L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java index 20ec92207e13..c23f69d66fac 100644 --- a/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4061269568007859227L; + private static final long serialVersionUID = -1316371568726489381L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/D.java b/slice2java/matlab/test/Ice/objects/Test/D.java index 5e874bd2b065..9fc77a13750c 100644 --- a/slice2java/matlab/test/Ice/objects/Test/D.java +++ b/slice2java/matlab/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2126347498581457988L; + private static final long serialVersionUID = -3886636898454062379L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/D1.java b/slice2java/matlab/test/Ice/objects/Test/D1.java index fa9623c5881c..53262e364386 100644 --- a/slice2java/matlab/test/Ice/objects/Test/D1.java +++ b/slice2java/matlab/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3409398845207238845L; + private static final long serialVersionUID = 7117006058269957187L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/E.java b/slice2java/matlab/test/Ice/objects/Test/E.java index 1e7a5f14be84..29d4aa969a7d 100644 --- a/slice2java/matlab/test/Ice/objects/Test/E.java +++ b/slice2java/matlab/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3821580496646386179L; + private static final long serialVersionUID = 3477515862148913323L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/EBase.java b/slice2java/matlab/test/Ice/objects/Test/EBase.java index 6ae416625ebe..ea9f88245141 100644 --- a/slice2java/matlab/test/Ice/objects/Test/EBase.java +++ b/slice2java/matlab/test/Ice/objects/Test/EBase.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 2299528142046909006L; + private static final long serialVersionUID = -610665233403830578L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/EDerived.java b/slice2java/matlab/test/Ice/objects/Test/EDerived.java index 490ee91b8dd1..881590b4bcaf 100644 --- a/slice2java/matlab/test/Ice/objects/Test/EDerived.java +++ b/slice2java/matlab/test/Ice/objects/Test/EDerived.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5204966836600475090L; + private static final long serialVersionUID = 6136834165919876050L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/EOneMember.java b/slice2java/matlab/test/Ice/objects/Test/EOneMember.java index d8daf870a776..a2f1adde9e34 100644 --- a/slice2java/matlab/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/matlab/test/Ice/objects/Test/EOneMember.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6225288820438481477L; + private static final long serialVersionUID = -6225292161539181496L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java index 8a952b1b940f..cc64aa3fc1b5 100644 --- a/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -589693442936264556L; + private static final long serialVersionUID = -3923436329220721836L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/F.java b/slice2java/matlab/test/Ice/objects/Test/F.java index 9fc7005551a4..9c51f8e6595e 100644 --- a/slice2java/matlab/test/Ice/objects/Test/F.java +++ b/slice2java/matlab/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4698581950625013201L; + private static final long serialVersionUID = -2824695791968034991L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/F1.java b/slice2java/matlab/test/Ice/objects/Test/F1.java index b3d13289ed7f..caa942955b78 100644 --- a/slice2java/matlab/test/Ice/objects/Test/F1.java +++ b/slice2java/matlab/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192374138296162193L; + private static final long serialVersionUID = 6192369481277683934L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/F3.java b/slice2java/matlab/test/Ice/objects/Test/F3.java index dd9fccd4f4c8..94f6c5e4745f 100644 --- a/slice2java/matlab/test/Ice/objects/Test/F3.java +++ b/slice2java/matlab/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9005351406617951796L; + private static final long serialVersionUID = -7608601165750553356L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/Inner/A.java b/slice2java/matlab/test/Ice/objects/Test/Inner/A.java index f1bfcaa88028..5014cbb5f23d 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/matlab/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1425256600900182205L; + private static final long serialVersionUID = -1425260959460801846L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/Inner/Ex.java b/slice2java/matlab/test/Ice/objects/Test/Inner/Ex.java index 06078ffc35b5..59da3f8fcfbc 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/matlab/test/Ice/objects/Test/Inner/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2337228090253425160L; + private static final long serialVersionUID = -2337229202288336546L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/A.java b/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/A.java index a2e32ada17d7..b34399b56d98 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1298680290153946210L; + private static final long serialVersionUID = -1298679513845126829L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/Ex.java index 07f0e4cacd3f..37f7a4d2e969 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1842234084170631964L; + private static final long serialVersionUID = 1842238437765601786L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/K.java b/slice2java/matlab/test/Ice/objects/Test/K.java index d643b5e2f014..ea8400d9a662 100644 --- a/slice2java/matlab/test/Ice/objects/Test/K.java +++ b/slice2java/matlab/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645163696065212345L; + private static final long serialVersionUID = 4645161587097156993L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/L.java b/slice2java/matlab/test/Ice/objects/Test/L.java index d1c34d23e3df..60aa27a7bb9b 100644 --- a/slice2java/matlab/test/Ice/objects/Test/L.java +++ b/slice2java/matlab/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629734774461391498L; + private static final long serialVersionUID = 6629739453521335148L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/M.java b/slice2java/matlab/test/Ice/objects/Test/M.java index 894077a6d52f..af78dfbb2296 100644 --- a/slice2java/matlab/test/Ice/objects/Test/M.java +++ b/slice2java/matlab/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088093579369578252L; + private static final long serialVersionUID = -8088097245841950467L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/Recursive.java b/slice2java/matlab/test/Ice/objects/Test/Recursive.java index bb01ada88ea7..a741153dcadc 100644 --- a/slice2java/matlab/test/Ice/objects/Test/Recursive.java +++ b/slice2java/matlab/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617878778971265713L; + private static final long serialVersionUID = 3617877672182576586L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/S.java b/slice2java/matlab/test/Ice/objects/Test/S.java index b0880e86e819..d2aa18052bc3 100644 --- a/slice2java/matlab/test/Ice/objects/Test/S.java +++ b/slice2java/matlab/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481770241041563065L; + private static final long serialVersionUID = 481772019311824991L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/SOneMember.java b/slice2java/matlab/test/Ice/objects/Test/SOneMember.java index 218a85833cd1..0905b69f7cf4 100644 --- a/slice2java/matlab/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/matlab/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227757007005121965L; + private static final long serialVersionUID = 6227753340752546654L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java index cf44bfaf06fa..fc56cfd74688 100644 --- a/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = -451167002093345790L; + private static final long serialVersionUID = 3031852034864702146L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/StructKey.java b/slice2java/matlab/test/Ice/objects/Test/StructKey.java index 876169c49db9..2ac0d74b0373 100644 --- a/slice2java/matlab/test/Ice/objects/Test/StructKey.java +++ b/slice2java/matlab/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = 5770008161541099599L; + private static final long serialVersionUID = 5367008329781168871L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java b/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java index a5395af3f5d3..71a175a8a71c 100644 --- a/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723850073255208571L; + private static final long serialVersionUID = 2723843641740570913L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/MyClass1.java b/slice2java/matlab/test/Ice/operations/Test/MyClass1.java index e4052aa300d0..f7f4392a238f 100644 --- a/slice2java/matlab/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/matlab/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2315459649879862247L; + private static final long serialVersionUID = 5617050866084179341L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct.java index aed2cdb492c8..1eb26626ee1c 100644 --- a/slice2java/matlab/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/matlab/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = 3775243633755975165L; + private static final long serialVersionUID = 5584599359397251581L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java index 9d2d0a232f80..3624e39cd8db 100644 --- a/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = 2922749248216350992L; + private static final long serialVersionUID = 5044333517486156356L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/Structure.java b/slice2java/matlab/test/Ice/operations/Test/Structure.java index 6f4da7fe3698..ad56693e1798 100644 --- a/slice2java/matlab/test/Ice/operations/Test/Structure.java +++ b/slice2java/matlab/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = 1986930999765422458L; + private static final long serialVersionUID = -454387229903663997L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/A.java b/slice2java/matlab/test/Ice/optional/Test/A.java index ed300413f138..d211aa946d2b 100644 --- a/slice2java/matlab/test/Ice/optional/Test/A.java +++ b/slice2java/matlab/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4459318271367988112L; + private static final long serialVersionUID = -3352710255433268976L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/B.java b/slice2java/matlab/test/Ice/optional/Test/B.java index c12431047ecc..a9f573464299 100644 --- a/slice2java/matlab/test/Ice/optional/Test/B.java +++ b/slice2java/matlab/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 764079493430663523L; + private static final long serialVersionUID = 6121901327348677859L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/C.java b/slice2java/matlab/test/Ice/optional/Test/C.java index 52389cb4557d..8b0ca72e6af8 100644 --- a/slice2java/matlab/test/Ice/optional/Test/C.java +++ b/slice2java/matlab/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7963839022442749949L; + private static final long serialVersionUID = -7664920544668677699L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/DerivedException.java b/slice2java/matlab/test/Ice/optional/Test/DerivedException.java index 7fa2e8678bf1..b5309c2978c6 100644 --- a/slice2java/matlab/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/matlab/test/Ice/optional/Test/DerivedException.java @@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5192853988885680437L; + private static final long serialVersionUID = 5106668180701369378L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/E.java b/slice2java/matlab/test/Ice/optional/Test/E.java index bd5869881fcc..e21474a876f0 100644 --- a/slice2java/matlab/test/Ice/optional/Test/E.java +++ b/slice2java/matlab/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850734413229084457L; + private static final long serialVersionUID = -1850742820719814144L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/F.java b/slice2java/matlab/test/Ice/optional/Test/F.java index a90c737655e3..81883f739a9b 100644 --- a/slice2java/matlab/test/Ice/optional/Test/F.java +++ b/slice2java/matlab/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430497556654245596L; + private static final long serialVersionUID = -6430489464438237709L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java b/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java index 74206ac7f5ed..f7d4d20814a4 100644 --- a/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569602116601702589L; + private static final long serialVersionUID = 1569604740871382762L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/G.java b/slice2java/matlab/test/Ice/optional/Test/G.java index bf0a4dba5858..9f54d8f35163 100644 --- a/slice2java/matlab/test/Ice/optional/Test/G.java +++ b/slice2java/matlab/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2326348899610793235L; + private static final long serialVersionUID = 5387951974662315219L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/G1.java b/slice2java/matlab/test/Ice/optional/Test/G1.java index e389b5bc5c83..2dbded7e093e 100644 --- a/slice2java/matlab/test/Ice/optional/Test/G1.java +++ b/slice2java/matlab/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339784191430793403L; + private static final long serialVersionUID = 7339781246843420140L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/G2.java b/slice2java/matlab/test/Ice/optional/Test/G2.java index 9cf6ab6b4720..560eac248a78 100644 --- a/slice2java/matlab/test/Ice/optional/Test/G2.java +++ b/slice2java/matlab/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824556200114559852L; + private static final long serialVersionUID = 3824547792621007739L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java b/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java index aa5012abb0fc..d455fa02fad2 100644 --- a/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java @@ -1675,7 +1675,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6388163691820146035L; + private static final long serialVersionUID = -4450415714534788166L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/OneOptional.java b/slice2java/matlab/test/Ice/optional/Test/OneOptional.java index 920fcf21cfbf..58ee9809c6ba 100644 --- a/slice2java/matlab/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/matlab/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219598801558161325L; + private static final long serialVersionUID = -7219601301994249596L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalException.java b/slice2java/matlab/test/Ice/optional/Test/OptionalException.java index d8fd3c3f6193..a0c03a72842b 100644 --- a/slice2java/matlab/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/matlab/test/Ice/optional/Test/OptionalException.java @@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4074803181747952732L; + private static final long serialVersionUID = 1241249750687280467L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java index 372ec8701a5b..b3214bc7fe31 100644 --- a/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2248446572855415429L; + private static final long serialVersionUID = 1476648749919069755L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/RequiredException.java b/slice2java/matlab/test/Ice/optional/Test/RequiredException.java index c8e11e1a2bc3..faba192e78ef 100644 --- a/slice2java/matlab/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/matlab/test/Ice/optional/Test/RequiredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894237969511884978L; + private static final long serialVersionUID = 2894235182635689189L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java b/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java index f1c40509182a..c207cdceb2aa 100644 --- a/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700988807791378151L; + private static final long serialVersionUID = 6700991274336390064L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/VarStruct.java b/slice2java/matlab/test/Ice/optional/Test/VarStruct.java index 5cc188cee610..d30a3c3b6ae7 100644 --- a/slice2java/matlab/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/matlab/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912284676153368013L; + private static final long serialVersionUID = -1912287620740741276L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/WD.java b/slice2java/matlab/test/Ice/optional/Test/WD.java index bc3d25fb96ab..65eee9e4ea1e 100644 --- a/slice2java/matlab/test/Ice/optional/Test/WD.java +++ b/slice2java/matlab/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2595136749889517880L; + private static final long serialVersionUID = 5212524209907093416L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Base.java index d91c515ccf84..fcb5fdcec89a 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477021090023207622L; + private static final long serialVersionUID = -477021815675480550L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java index b3661b57000b..aa66afc8d51c 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8435644651474029314L; + private static final long serialVersionUID = -8435639921970479906L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownDerived.java index 8b5be0217644..7623569f411d 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485211675257843932L; + private static final long serialVersionUID = 3485211114747311420L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 3769b51c6970..134bd77424ae 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717375368263441709L; + private static final long serialVersionUID = 1717376093897454413L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 4a62e60a5bbc..060bb75daa65 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384921139625031116L; + private static final long serialVersionUID = -7384921705121750508L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java index 3cd98395a243..7c2faf5cae60 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2733699008796232527L; + private static final long serialVersionUID = -2733710477021884975L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index 7274fe2f2e7a..e65761f266f5 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4528104085407744568L; + private static final long serialVersionUID = 4528092609580701976L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java index ea3a6896dc8b..022a3e1139c4 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java @@ -62,5 +62,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 6137366340281686603L; + private static final long serialVersionUID = 6137356155708246572L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java index 416c4bb3bf68..3626155ebd35 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 751748563692503531L; + private static final long serialVersionUID = 751743829279773644L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java index 6bf7fc9b4b0f..cd0eb6349d9a 100644 --- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java +++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4272726460902661056L; + private static final long serialVersionUID = -4272736648140575840L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/B.java b/slice2java/matlab/test/Ice/slicing/objects/Test/B.java index 065d82d9decd..9ebe6f4ff651 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8104903216136410115L; + private static final long serialVersionUID = -9145482342308769405L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/matlab/test/Ice/slicing/objects/Test/BaseException.java index 2efed50d93a2..db51e3a769c6 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -2647808071281048625L; + private static final long serialVersionUID = 1277411237936070991L; } diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java index 86de625e4d3b..3bf2fe51b72e 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6397006192625967102L; + private static final long serialVersionUID = -6397002221442609215L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPDerived.java index cc77c562e11d..c30014ab8992 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066879690628862658L; + private static final long serialVersionUID = -9066881019466529795L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/D1.java b/slice2java/matlab/test/Ice/slicing/objects/Test/D1.java index 81061edaeacf..19211bead6d8 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6419516845429620544L; + private static final long serialVersionUID = -2547088471115026208L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/D3.java b/slice2java/matlab/test/Ice/slicing/objects/Test/D3.java index aad52b09eef8..1bc278edb9d3 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3792301936488852606L; + private static final long serialVersionUID = 3592168011142484130L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/matlab/test/Ice/slicing/objects/Test/DerivedException.java index 8af43e15c2e8..78356a36a364 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 263573896917143702L; + private static final long serialVersionUID = 2606344670332121526L; } diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java b/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java index 719139ffd6ac..f5460028d17f 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655918934059357468L; + private static final long serialVersionUID = -7655922905090989209L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/matlab/test/Ice/slicing/objects/Test/Hidden.java index cc9038a45962..175d1f02438d 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271132926111348877L; + private static final long serialVersionUID = -2271128954925549584L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/PBase.java b/slice2java/matlab/test/Ice/slicing/objects/Test/PBase.java index 83ea8466a5ed..35410a1f6a54 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481704701813888444L; + private static final long serialVersionUID = 481708672995094207L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived.java index ad12f05f6a59..7c58aeb5fd91 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426891054452718142L; + private static final long serialVersionUID = -4426887083269360511L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived2.java index 5dda6106d12b..28d8cdf3bbed 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850542599430155681L; + private static final long serialVersionUID = 850538468097721890L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived3.java index 173e40adddc0..34a1c6b54bfe 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328900075020424084L; + private static final long serialVersionUID = -4328898586033752785L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/matlab/test/Ice/slicing/objects/Test/PCUnknown.java index fe0e62beffde..122efbe0041e 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081814564389564231L; + private static final long serialVersionUID = -5081818695712937542L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/PDerived.java index ee2b4537287a..cb90dea44ab3 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643078200675038713L; + private static final long serialVersionUID = 643079529512705850L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/PNode.java b/slice2java/matlab/test/Ice/slicing/objects/Test/PNode.java index f90acaf98092..c7bff34382c6 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438003935898981840L; + private static final long serialVersionUID = -2438007907075581261L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/matlab/test/Ice/slicing/objects/Test/Preserved.java index ddc3bec9d52e..1ed965416fc0 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651524507280958640L; + private static final long serialVersionUID = 3651528478471224883L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/SBSKnownDerived.java index 1fe4eab80974..6e085c4cd881 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804375314915578261L; + private static final long serialVersionUID = 8804376643753040662L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/SBase.java b/slice2java/matlab/test/Ice/slicing/objects/Test/SBase.java index 60421efeb45a..2ea9aa5f62aa 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353757291172314589L; + private static final long serialVersionUID = -5353761262362580832L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/SS1.java b/slice2java/matlab/test/Ice/slicing/objects/Test/SS1.java index 02939a98e768..841e0df49046 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522133609644386316L; + private static final long serialVersionUID = -6522134938477449417L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/SS2.java b/slice2java/matlab/test/Ice/slicing/objects/Test/SS2.java index 32ae035e6e36..7fe94f57c525 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620286121947646135L; + private static final long serialVersionUID = 7620287450780709236L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/SS3.java b/slice2java/matlab/test/Ice/slicing/objects/Test/SS3.java index dc7196463d6d..6f5637a2705d 100644 --- a/slice2java/matlab/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = -3763080872393805846L; + private static final long serialVersionUID = 8002214736633970666L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java b/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java index cc6e2f538333..9a907079b5d8 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2243424941097942957L; + private static final long serialVersionUID = 34619873814980909L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/bitor.java b/slice2java/matlab/test/Slice/escape/classdef/_break/bitor.java index 149b3727eb99..95de71e3e42f 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/bitor.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/bitor.java @@ -176,5 +176,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final bitor _nullMarshalValue = new bitor(); /** @hidden */ - private static final long serialVersionUID = -2229072403411353228L; + private static final long serialVersionUID = 322089229999026243L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/global.java b/slice2java/matlab/test/Slice/escape/classdef/_break/global.java index dccdce562454..5ab7c995b5fa 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/global.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/global.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2421492518392666305L; + private static final long serialVersionUID = 2421484596523719210L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java b/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java index 33e3de7917a5..3d496faea4fe 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2526300218572926242L; + private static final long serialVersionUID = -3621532938584238199L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/persistent.java b/slice2java/matlab/test/Slice/escape/classdef/_break/persistent.java index e5e6324b659d..f150886e25bb 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/persistent.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/persistent.java @@ -89,5 +89,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 889117580536990490L; + private static final long serialVersionUID = 1623780925124275658L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java b/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java index d0287c794103..be46e76aa45e 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8958346031013668136L; + private static final long serialVersionUID = 6849933214221751549L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/xor.java b/slice2java/matlab/test/Slice/escape/classdef/_break/xor.java index b992970c4e07..02fd359f5f59 100644 --- a/slice2java/matlab/test/Slice/escape/classdef/_break/xor.java +++ b/slice2java/matlab/test/Slice/escape/classdef/_break/xor.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1008947530156734240L; + private static final long serialVersionUID = -1008955452025474421L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/Base.java b/slice2java/php/test/Ice/defaultValue/Test/Base.java index 13ecfe498a56..3743555895b4 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/php/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2290332486727812810L; + private static final long serialVersionUID = 8591374322460140906L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java index 0c7f6e978745..faffce472a33 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3500617978954829131L; + private static final long serialVersionUID = 384387215774332875L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 93adc508f1cf..94b6e0c0f2d4 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6822283400462413586L; + private static final long serialVersionUID = 1644085204095926227L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/Derived.java b/slice2java/php/test/Ice/defaultValue/Test/Derived.java index d7b8c11bad68..8d65dc5ea1f6 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/php/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1738619858388899612L; + private static final long serialVersionUID = -1729392015562048540L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java index 80ae0956a5fb..8560e971649e 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - private static final long serialVersionUID = 5127391406458862417L; + private static final long serialVersionUID = 5127390085208863504L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct1.java b/slice2java/php/test/Ice/defaultValue/Test/Struct1.java index e7369cdb9c4a..6196f6264484 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/php/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = -7332838824279243922L; + private static final long serialVersionUID = 1233183970464665454L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct2.java b/slice2java/php/test/Ice/defaultValue/Test/Struct2.java index 1c7eac0aed47..9039ffd82d39 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/php/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = -6331427859275475377L; + private static final long serialVersionUID = -4729784252074421009L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java index 22ec256e048a..76ff69e1463b 100644 --- a/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - private static final long serialVersionUID = -958493861822122735L; + private static final long serialVersionUID = 1249619921963005648L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/A.java b/slice2java/php/test/Ice/exceptions/Test/A.java index 4e8cb7dbb6ea..6c3a83e8d389 100644 --- a/slice2java/php/test/Ice/exceptions/Test/A.java +++ b/slice2java/php/test/Ice/exceptions/Test/A.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7823746650910392220L; + private static final long serialVersionUID = 7823741979838962009L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/B.java b/slice2java/php/test/Ice/exceptions/Test/B.java index 7717798937b1..b683ffcc68cc 100644 --- a/slice2java/php/test/Ice/exceptions/Test/B.java +++ b/slice2java/php/test/Ice/exceptions/Test/B.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3861409412909662628L; + private static final long serialVersionUID = -3861419373985552615L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/C.java b/slice2java/php/test/Ice/exceptions/Test/C.java index 146b7ebf4510..f8bfda08777d 100644 --- a/slice2java/php/test/Ice/exceptions/Test/C.java +++ b/slice2java/php/test/Ice/exceptions/Test/C.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1080700342113177500L; + private static final long serialVersionUID = 1080695671041747289L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/D.java b/slice2java/php/test/Ice/exceptions/Test/D.java index d9b8d9d9c061..30c50a17e6bd 100644 --- a/slice2java/php/test/Ice/exceptions/Test/D.java +++ b/slice2java/php/test/Ice/exceptions/Test/D.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4780382855192415580L; + private static final long serialVersionUID = 4780372894116525593L; } diff --git a/slice2java/php/test/Ice/objects/Test/A.java b/slice2java/php/test/Ice/objects/Test/A.java index 9f2b813fd910..9b8c0daf000f 100644 --- a/slice2java/php/test/Ice/objects/Test/A.java +++ b/slice2java/php/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1564800432133355539L; + private static final long serialVersionUID = 4756011399016740499L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/A1.java b/slice2java/php/test/Ice/objects/Test/A1.java index 0efcb9be902a..ce2e99da4de9 100644 --- a/slice2java/php/test/Ice/objects/Test/A1.java +++ b/slice2java/php/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926739349235565959L; + private static final long serialVersionUID = -5926741751365988419L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/B.java b/slice2java/php/test/Ice/objects/Test/B.java index f79813cebed8..67e0fd219aba 100644 --- a/slice2java/php/test/Ice/objects/Test/B.java +++ b/slice2java/php/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890911709993241519L; + private static final long serialVersionUID = -8890919897748367211L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/B1.java b/slice2java/php/test/Ice/objects/Test/B1.java index 19bc9f5b84cd..e48e7a07cf26 100644 --- a/slice2java/php/test/Ice/objects/Test/B1.java +++ b/slice2java/php/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8880277987909465468L; + private static final long serialVersionUID = 8587743456087338756L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/Base.java b/slice2java/php/test/Ice/objects/Test/Base.java index b623509e37f1..ff9a06d33f7a 100644 --- a/slice2java/php/test/Ice/objects/Test/Base.java +++ b/slice2java/php/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1586873867428579615L; + private static final long serialVersionUID = -558151180124824289L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/C.java b/slice2java/php/test/Ice/objects/Test/C.java index e35d09cf7f71..e07e6de53471 100644 --- a/slice2java/php/test/Ice/objects/Test/C.java +++ b/slice2java/php/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4574193527306436072L; + private static final long serialVersionUID = -474668024335106212L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/COneMember.java b/slice2java/php/test/Ice/objects/Test/COneMember.java index a61020e9efbe..333af8b74b5e 100644 --- a/slice2java/php/test/Ice/objects/Test/COneMember.java +++ b/slice2java/php/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050965110871497559L; + private static final long serialVersionUID = 3050972968162342035L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/CTwoMembers.java b/slice2java/php/test/Ice/objects/Test/CTwoMembers.java index e7acf3e7cf7e..4290ae8fadc2 100644 --- a/slice2java/php/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/php/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6970356195317491109L; + private static final long serialVersionUID = 660262988652453851L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/D.java b/slice2java/php/test/Ice/objects/Test/D.java index 860e98d283d8..3db9d2186084 100644 --- a/slice2java/php/test/Ice/objects/Test/D.java +++ b/slice2java/php/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6396785719190170182L; + private static final long serialVersionUID = -4863085364249362430L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/D1.java b/slice2java/php/test/Ice/objects/Test/D1.java index 7237d625b5ca..46b61fe815fe 100644 --- a/slice2java/php/test/Ice/objects/Test/D1.java +++ b/slice2java/php/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1084258293341566147L; + private static final long serialVersionUID = 2821693378756347075L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/E.java b/slice2java/php/test/Ice/objects/Test/E.java index ace103a67c2b..cc0b8528e432 100644 --- a/slice2java/php/test/Ice/objects/Test/E.java +++ b/slice2java/php/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6418050502914339980L; + private static final long serialVersionUID = -5630694621674495756L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/EBase.java b/slice2java/php/test/Ice/objects/Test/EBase.java index 9c9050db2693..6e5905d33b4e 100644 --- a/slice2java/php/test/Ice/objects/Test/EBase.java +++ b/slice2java/php/test/Ice/objects/Test/EBase.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 6286276710658577230L; + private static final long serialVersionUID = -3023548794058876466L; } diff --git a/slice2java/php/test/Ice/objects/Test/EDerived.java b/slice2java/php/test/Ice/objects/Test/EDerived.java index 0021aec99bc6..c6738898066c 100644 --- a/slice2java/php/test/Ice/objects/Test/EDerived.java +++ b/slice2java/php/test/Ice/objects/Test/EDerived.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2455866101464493138L; + private static final long serialVersionUID = 4268259309528898642L; } diff --git a/slice2java/php/test/Ice/objects/Test/EOneMember.java b/slice2java/php/test/Ice/objects/Test/EOneMember.java index e6d0956eedf3..9f3293c169aa 100644 --- a/slice2java/php/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/php/test/Ice/objects/Test/EOneMember.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6225279923591761832L; + private static final long serialVersionUID = -6225288111498406628L; } diff --git a/slice2java/php/test/Ice/objects/Test/ETwoMembers.java b/slice2java/php/test/Ice/objects/Test/ETwoMembers.java index 37a691f3552d..7e271e364a02 100644 --- a/slice2java/php/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/php/test/Ice/objects/Test/ETwoMembers.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -5533931343085070380L; + private static final long serialVersionUID = 5282193546654536276L; } diff --git a/slice2java/php/test/Ice/objects/Test/F.java b/slice2java/php/test/Ice/objects/Test/F.java index 4f2a00dee036..9096a2bda97e 100644 --- a/slice2java/php/test/Ice/objects/Test/F.java +++ b/slice2java/php/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5773709840760174639L; + private static final long serialVersionUID = -4839014462774448943L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/F1.java b/slice2java/php/test/Ice/objects/Test/F1.java index b6351c4b76d2..ac070f1d4977 100644 --- a/slice2java/php/test/Ice/objects/Test/F1.java +++ b/slice2java/php/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192365845857563910L; + private static final long serialVersionUID = 6192365950401972921L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/F3.java b/slice2java/php/test/Ice/objects/Test/F3.java index 39aec5cf4832..834a694ec45d 100644 --- a/slice2java/php/test/Ice/objects/Test/F3.java +++ b/slice2java/php/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3181488277913070262L; + private static final long serialVersionUID = 4822250869981489462L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/K.java b/slice2java/php/test/Ice/objects/Test/K.java index fefef1148b2a..93251584d7a6 100644 --- a/slice2java/php/test/Ice/objects/Test/K.java +++ b/slice2java/php/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645160424771108359L; + private static final long serialVersionUID = 4645163157521791427L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/L.java b/slice2java/php/test/Ice/objects/Test/L.java index 42b96192ea2f..c382bbf62bf6 100644 --- a/slice2java/php/test/Ice/objects/Test/L.java +++ b/slice2java/php/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629743426059672946L; + private static final long serialVersionUID = 6629735238152749366L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/Recursive.java b/slice2java/php/test/Ice/objects/Test/Recursive.java index e98a7c7b8dc7..6bd045dfe3f6 100644 --- a/slice2java/php/test/Ice/objects/Test/Recursive.java +++ b/slice2java/php/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617887099902658780L; + private static final long serialVersionUID = 3617879242611683352L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/S.java b/slice2java/php/test/Ice/objects/Test/S.java index d532dcd25dae..9062d3b64805 100644 --- a/slice2java/php/test/Ice/objects/Test/S.java +++ b/slice2java/php/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481773181621679553L; + private static final long serialVersionUID = 481770448875457029L; } diff --git a/slice2java/php/test/Ice/objects/Test/SOneMember.java b/slice2java/php/test/Ice/objects/Test/SOneMember.java index e677bf8c7e63..1f88d07495bc 100644 --- a/slice2java/php/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/php/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227749368200128590L; + private static final long serialVersionUID = 6227757225490973066L; } diff --git a/slice2java/php/test/Ice/objects/Test/STwoMembers.java b/slice2java/php/test/Ice/objects/Test/STwoMembers.java index a8a755a50064..713ed7085d38 100644 --- a/slice2java/php/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/php/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = -4412525643941753022L; + private static final long serialVersionUID = -3667736502317985342L; } diff --git a/slice2java/php/test/Ice/operations/Test/AnotherStruct.java b/slice2java/php/test/Ice/operations/Test/AnotherStruct.java index 4cbaf6f4a11c..1a7aa1d0a360 100644 --- a/slice2java/php/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/php/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723843003754868371L; + private static final long serialVersionUID = 2723846168010259972L; } diff --git a/slice2java/php/test/Ice/operations/Test/MyClass1.java b/slice2java/php/test/Ice/operations/Test/MyClass1.java index ede91b06a1dd..1d1e1a4ebbd8 100644 --- a/slice2java/php/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/php/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5223460825509364649L; + private static final long serialVersionUID = 6148461219503417568L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/operations/Test/MyStruct1.java b/slice2java/php/test/Ice/operations/Test/MyStruct1.java index e0d7d69f889a..2d39cec0c733 100644 --- a/slice2java/php/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/php/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = 5510423937962626846L; + private static final long serialVersionUID = -5109376130187685399L; } diff --git a/slice2java/php/test/Ice/operations/Test/Structure.java b/slice2java/php/test/Ice/operations/Test/Structure.java index 2dbf8763f5c4..cf2218ea1750 100644 --- a/slice2java/php/test/Ice/operations/Test/Structure.java +++ b/slice2java/php/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = 3843899123507132349L; + private static final long serialVersionUID = 1206210365170648138L; } diff --git a/slice2java/php/test/Ice/optional/Test/A.java b/slice2java/php/test/Ice/optional/Test/A.java index d6a143bf7923..e853e2e15e57 100644 --- a/slice2java/php/test/Ice/optional/Test/A.java +++ b/slice2java/php/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5608785877218978800L; + private static final long serialVersionUID = 4268999544152214032L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/B.java b/slice2java/php/test/Ice/optional/Test/B.java index 6a3f22abd9d4..bfeb9f575c25 100644 --- a/slice2java/php/test/Ice/optional/Test/B.java +++ b/slice2java/php/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1994677355585596189L; + private static final long serialVersionUID = -417977765692773149L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/C.java b/slice2java/php/test/Ice/optional/Test/C.java index ce5c5d42ed48..fd3b7550b720 100644 --- a/slice2java/php/test/Ice/optional/Test/C.java +++ b/slice2java/php/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6314817115434240771L; + private static final long serialVersionUID = -1978318083833330755L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/DerivedException.java b/slice2java/php/test/Ice/optional/Test/DerivedException.java index 4f8b477ce2fb..80885f1b28c6 100644 --- a/slice2java/php/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/php/test/Ice/optional/Test/DerivedException.java @@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3750004216994194239L; + private static final long serialVersionUID = 8549148775168828404L; } diff --git a/slice2java/php/test/Ice/optional/Test/E.java b/slice2java/php/test/Ice/optional/Test/E.java index 9ae2b6a87f0d..b664b83c004b 100644 --- a/slice2java/php/test/Ice/optional/Test/E.java +++ b/slice2java/php/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850739390277431005L; + private static final long serialVersionUID = -1850740694929282474L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/F.java b/slice2java/php/test/Ice/optional/Test/F.java index 316f617a268b..6d34ce46eae4 100644 --- a/slice2java/php/test/Ice/optional/Test/F.java +++ b/slice2java/php/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430492899889951152L; + private static final long serialVersionUID = -6430496730114744411L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/FixedStruct.java b/slice2java/php/test/Ice/optional/Test/FixedStruct.java index 90a334533f1c..c2453bdf8ee7 100644 --- a/slice2java/php/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/php/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569601233087833993L; + private static final long serialVersionUID = 1569605588067602236L; } diff --git a/slice2java/php/test/Ice/optional/Test/G.java b/slice2java/php/test/Ice/optional/Test/G.java index 6ad46b59d162..13124c45314a 100644 --- a/slice2java/php/test/Ice/optional/Test/G.java +++ b/slice2java/php/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4796962704354882989L; + private static final long serialVersionUID = 5944078650831115859L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/G1.java b/slice2java/php/test/Ice/optional/Test/G1.java index acad27e6a0ea..808690d1425d 100644 --- a/slice2java/php/test/Ice/optional/Test/G1.java +++ b/slice2java/php/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339784424011166543L; + private static final long serialVersionUID = 7339780719964891706L; } diff --git a/slice2java/php/test/Ice/optional/Test/G2.java b/slice2java/php/test/Ice/optional/Test/G2.java index 78648470521e..1c2c3cfac499 100644 --- a/slice2java/php/test/Ice/optional/Test/G2.java +++ b/slice2java/php/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824551223059069594L; + private static final long serialVersionUID = 3824549918414361839L; } diff --git a/slice2java/php/test/Ice/optional/Test/MultiOptional.java b/slice2java/php/test/Ice/optional/Test/MultiOptional.java index d58118656a3f..a6f68035541e 100644 --- a/slice2java/php/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/php/test/Ice/optional/Test/MultiOptional.java @@ -1675,7 +1675,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8172187693065252997L; + private static final long serialVersionUID = -4799571477820987346L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/OneOptional.java b/slice2java/php/test/Ice/optional/Test/OneOptional.java index f8f368f8a204..4d47a17d0847 100644 --- a/slice2java/php/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/php/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219599034019953369L; + private static final long serialVersionUID = -7219600619945058478L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/OptionalException.java b/slice2java/php/test/Ice/optional/Test/OptionalException.java index aa56d51d76b2..a663e52b85e0 100644 --- a/slice2java/php/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/php/test/Ice/optional/Test/OptionalException.java @@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7415098765380808176L; + private static final long serialVersionUID = -2188394677309886203L; } diff --git a/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java index cb24f40cc7ba..aed67032f63d 100644 --- a/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5049076655297100741L; + private static final long serialVersionUID = 8221707186576044859L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/RequiredException.java b/slice2java/php/test/Ice/optional/Test/RequiredException.java index ec5d30d94b6c..fda9d2a80fc6 100644 --- a/slice2java/php/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/php/test/Ice/optional/Test/RequiredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894238447319520006L; + private static final long serialVersionUID = 2894242928748886963L; } diff --git a/slice2java/php/test/Ice/optional/Test/SmallStruct.java b/slice2java/php/test/Ice/optional/Test/SmallStruct.java index d5e7d0b46c06..811d85386b64 100644 --- a/slice2java/php/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/php/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700987678894163217L; + private static final long serialVersionUID = 6700983848554373988L; } diff --git a/slice2java/php/test/Ice/optional/Test/VarStruct.java b/slice2java/php/test/Ice/optional/Test/VarStruct.java index 35d9fade1218..07fcfa1c82d4 100644 --- a/slice2java/php/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/php/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912284443572994873L; + private static final long serialVersionUID = -1912288147619269710L; } diff --git a/slice2java/php/test/Ice/optional/Test/WD.java b/slice2java/php/test/Ice/optional/Test/WD.java index 70556bff969c..fa4f1505f959 100644 --- a/slice2java/php/test/Ice/optional/Test/WD.java +++ b/slice2java/php/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9068370300581663480L; + private static final long serialVersionUID = 7804448982233092840L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/C.java b/slice2java/php/test/Ice/scope/Test/C.java index 753e889a17f5..2063eaa74b7c 100644 --- a/slice2java/php/test/Ice/scope/Test/C.java +++ b/slice2java/php/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190250149999643368L; + private static final long serialVersionUID = -5190247927307021091L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/C1.java b/slice2java/php/test/Ice/scope/Test/C1.java index cf6dcf68ed98..ac0a7dc43bf8 100644 --- a/slice2java/php/test/Ice/scope/Test/C1.java +++ b/slice2java/php/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893230282133416895L; + private static final long serialVersionUID = 8893228379725343418L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/C2.java b/slice2java/php/test/Ice/scope/Test/C2.java index bee65aa1c70b..f5c98b0de219 100644 --- a/slice2java/php/test/Ice/scope/Test/C2.java +++ b/slice2java/php/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3517076865152292718L; + private static final long serialVersionUID = -3408369561537474153L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/Inner/C.java b/slice2java/php/test/Ice/scope/Test/Inner/C.java index de8f8e55f2f3..ca8271ee62e9 100644 --- a/slice2java/php/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/php/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615625800043597420L; + private static final long serialVersionUID = 4615623574846377513L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/php/test/Ice/scope/Test/Inner/Inner2/C.java index 05035791f28b..e893642155eb 100644 --- a/slice2java/php/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/php/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672580578275005039L; + private static final long serialVersionUID = 672583963210467370L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/php/test/Ice/scope/Test/Inner/Inner2/S.java index cca0f03ba6cd..64e2fdea4a16 100644 --- a/slice2java/php/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/php/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654442352573512577L; + private static final long serialVersionUID = 8654444254988767044L; } diff --git a/slice2java/php/test/Ice/scope/Test/Inner/S.java b/slice2java/php/test/Ice/scope/Test/Inner/S.java index da70123747ea..80b35edc8703 100644 --- a/slice2java/php/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/php/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694613268974689997L; + private static final long serialVersionUID = 3694609871205416840L; } diff --git a/slice2java/php/test/Ice/scope/Test/S.java b/slice2java/php/test/Ice/scope/Test/S.java index f27e74d6f478..8a0443d072af 100644 --- a/slice2java/php/test/Ice/scope/Test/S.java +++ b/slice2java/php/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159705535969915315L; + private static final long serialVersionUID = 2159708931160996214L; } diff --git a/slice2java/php/test/Ice/scope/Test/S1.java b/slice2java/php/test/Ice/scope/Test/S1.java index f909b6a0e086..9ea459c69caa 100644 --- a/slice2java/php/test/Ice/scope/Test/S1.java +++ b/slice2java/php/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241671882582068230L; + private static final long serialVersionUID = 1241668655123398019L; } diff --git a/slice2java/php/test/Ice/scope/Test/S2.java b/slice2java/php/test/Ice/scope/Test/S2.java index fc72cbe2c2c4..84252281fa62 100644 --- a/slice2java/php/test/Ice/scope/Test/S2.java +++ b/slice2java/php/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 6657765259591694187L; + private static final long serialVersionUID = -6835095176498344722L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java index 473c68ccd947..1692e4374e71 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477024478841704761L; + private static final long serialVersionUID = -477019604841446143L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java index 4388051cd9f3..341b030fa295 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485213906903077729L; + private static final long serialVersionUID = 3485213000292419623L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index b136c116e078..c91140b05602 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717378757063104656L; + private static final long serialVersionUID = 1717373883062846038L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 58a0befcc751..98842a37091c 100644 --- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384918907960684087L; + private static final long serialVersionUID = -7384914359410641137L; } diff --git a/slice2java/php/test/Ice/slicing/objects/Test/B.java b/slice2java/php/test/Ice/slicing/objects/Test/B.java index e9c27f474415..6a11e3ef1471 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4199030629327009765L; + private static final long serialVersionUID = 4550893354970433307L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/php/test/Ice/slicing/objects/Test/BaseException.java index bf861891a79c..6f534da99762 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6205841195217430441L; + private static final long serialVersionUID = -2629943906117365417L; } diff --git a/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java index 00e177e4f66f..c6914f89dbf2 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6396997866723639056L; + private static final long serialVersionUID = -6397001131560883069L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/CompactPDerived.java index f10fcd2ab804..a571381ddd22 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066887954652814924L; + private static final long serialVersionUID = -9066879798987447422L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/D1.java b/slice2java/php/test/Ice/slicing/objects/Test/D1.java index 24fd9436d0e6..cd6a9c88b950 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2709561519632648520L; + private static final long serialVersionUID = -4764631192272677640L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/D3.java b/slice2java/php/test/Ice/slicing/objects/Test/D3.java index cd4109f138dd..2bc9553026c8 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4233569777151776426L; + private static final long serialVersionUID = 5048018970930391441L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/php/test/Ice/slicing/objects/Test/DerivedException.java index 59b4a1205b4d..785b9d455589 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4463876852053419197L; + private static final long serialVersionUID = 4012672903127024893L; } diff --git a/slice2java/php/test/Ice/slicing/objects/Test/Forward.java b/slice2java/php/test/Ice/slicing/objects/Test/Forward.java index 817234b002b7..e61ef967de65 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655927195502742375L; + private static final long serialVersionUID = -7655918830588873681L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/php/test/Ice/slicing/objects/Test/Hidden.java index dcdcb85d5319..fc4fab137b0d 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271124664664013267L; + private static final long serialVersionUID = -2271133029314426725L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/PBase.java b/slice2java/php/test/Ice/slicing/objects/Test/PBase.java index 08eef0df242b..15d35ecf5200 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481712963314101712L; + private static final long serialVersionUID = 481704725156868518L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived.java index 9e318f6e86f1..46d522638cd6 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426882893549955280L; + private static final long serialVersionUID = -4426880868539276733L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived2.java index 74f9213f3ef0..9ace4d2c6a49 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850539733741161736L; + private static final long serialVersionUID = 850537703695933507L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived3.java index f8d22119f4b7..cdfe6ef94e18 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328908274751174331L; + private static final long serialVersionUID = -4328906162060871882L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/php/test/Ice/slicing/objects/Test/PCUnknown.java index c890db64de61..7393702128eb 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081806364785296905L; + private static final long serialVersionUID = -5081802774333885766L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/PDerived.java index 3afc9bec0dfc..cd4323e87cc2 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643086464701901811L; + private static final long serialVersionUID = 643078017245415685L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/PNode.java b/slice2java/php/test/Ice/slicing/objects/Test/PNode.java index a48ef6386842..96be0338f06d 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438000966753146911L; + private static final long serialVersionUID = -2438003667440412649L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/php/test/Ice/slicing/objects/Test/Preserved.java index c56a9c0d5cab..5fa75b5ed5ca 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651532768740682909L; + private static final long serialVersionUID = 3651524404134428267L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/SBSKnownDerived.java index 461e8d1fb697..448e7d9b6871 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804372348333613624L; + private static final long serialVersionUID = 8804375131527766478L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/SBase.java b/slice2java/php/test/Ice/slicing/objects/Test/SBase.java index 0cd057a363e4..9f7fabce58b7 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353754321997709746L; + private static final long serialVersionUID = -5353757187845951880L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/SS1.java b/slice2java/php/test/Ice/slicing/objects/Test/SS1.java index ec2ec636d266..7314ba9906c8 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522141873581040052L; + private static final long serialVersionUID = -6522133552911479238L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/SS2.java b/slice2java/php/test/Ice/slicing/objects/Test/SS2.java index 820ff493f70e..591206ad109c 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620283155453892815L; + private static final long serialVersionUID = 7620286103910819705L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/slicing/objects/Test/SS3.java b/slice2java/php/test/Ice/slicing/objects/Test/SS3.java index 2e87dc60016c..fe38f4519089 100644 --- a/slice2java/php/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/php/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = -1186426889236309412L; + private static final long serialVersionUID = 3033108273368095644L; } diff --git a/slice2java/php/test/Slice/escape/Clash/Cls.java b/slice2java/php/test/Slice/escape/Clash/Cls.java index 935591f4719c..60bc6fb71a57 100644 --- a/slice2java/php/test/Slice/escape/Clash/Cls.java +++ b/slice2java/php/test/Slice/escape/Clash/Cls.java @@ -164,7 +164,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6179356948685802734L; + private static final long serialVersionUID = -7459031322877904517L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/escape/Clash/Ex.java b/slice2java/php/test/Slice/escape/Clash/Ex.java index e98f29a8fb61..278e79b8939d 100644 --- a/slice2java/php/test/Slice/escape/Clash/Ex.java +++ b/slice2java/php/test/Slice/escape/Clash/Ex.java @@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 8308291024655071391L; + private static final long serialVersionUID = -1210775175356382570L; } diff --git a/slice2java/php/test/Slice/escape/Clash/St.java b/slice2java/php/test/Slice/escape/Clash/St.java index 1a5c44f81433..9c83c3ce5a41 100644 --- a/slice2java/php/test/Slice/escape/Clash/St.java +++ b/slice2java/php/test/Slice/escape/Clash/St.java @@ -187,5 +187,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - private static final long serialVersionUID = 2185130121386750932L; + private static final long serialVersionUID = 8165924803680303750L; } diff --git a/slice2java/php/test/Slice/escape/and/echo.java b/slice2java/php/test/Slice/escape/and/echo.java index d19c9b43f4c4..05cbc689b39f 100644 --- a/slice2java/php/test/Slice/escape/and/echo.java +++ b/slice2java/php/test/Slice/escape/and/echo.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3536241495144407778L; + private static final long serialVersionUID = 276623293872272688L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/escape/and/endif.java b/slice2java/php/test/Slice/escape/and/endif.java index 3b3ef2bc92f3..3930bf8d636a 100644 --- a/slice2java/php/test/Slice/escape/and/endif.java +++ b/slice2java/php/test/Slice/escape/and/endif.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3766561409709823371L; + private static final long serialVersionUID = -3766561542629609590L; } diff --git a/slice2java/php/test/Slice/escape/and/endwhile.java b/slice2java/php/test/Slice/escape/and/endwhile.java index 1709fa99650d..104972890505 100644 --- a/slice2java/php/test/Slice/escape/and/endwhile.java +++ b/slice2java/php/test/Slice/escape/and/endwhile.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3314438890113169234L; + private static final long serialVersionUID = -8052106490323132242L; } diff --git a/slice2java/php/test/Slice/escape/and/xor.java b/slice2java/php/test/Slice/escape/and/xor.java index aee271ebb2f4..8caf6006e54f 100644 --- a/slice2java/php/test/Slice/escape/and/xor.java +++ b/slice2java/php/test/Slice/escape/and/xor.java @@ -218,5 +218,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final xor _nullMarshalValue = new xor(); /** @hidden */ - private static final long serialVersionUID = -3721262801939001546L; + private static final long serialVersionUID = -9039073478534482071L; } diff --git a/slice2java/php/test/Slice/macros/Test/Default.java b/slice2java/php/test/Slice/macros/Test/Default.java index cc83faf6469b..e616e03930e6 100644 --- a/slice2java/php/test/Slice/macros/Test/Default.java +++ b/slice2java/php/test/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8287720065954084194L; + private static final long serialVersionUID = -8344715016853369506L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/macros/Test/NoDefault.java b/slice2java/php/test/Slice/macros/Test/NoDefault.java index d01f0db6450e..950d58ba89bb 100644 --- a/slice2java/php/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/php/test/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8663042312177582591L; + private static final long serialVersionUID = -8242966187460348609L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/structure/Test/C.java b/slice2java/php/test/Slice/structure/Test/C.java index 4a3e3eaef1ee..617117cb1f43 100644 --- a/slice2java/php/test/Slice/structure/Test/C.java +++ b/slice2java/php/test/Slice/structure/Test/C.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3172278245143295439L; + private static final long serialVersionUID = -3172278263230960346L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/structure/Test/S1.java b/slice2java/php/test/Slice/structure/Test/S1.java index c822a697b433..2add0403a050 100644 --- a/slice2java/php/test/Slice/structure/Test/S1.java +++ b/slice2java/php/test/Slice/structure/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = -5542860060779146566L; + private static final long serialVersionUID = -5542859913701441939L; } diff --git a/slice2java/php/test/Slice/structure/Test/S2.java b/slice2java/php/test/Slice/structure/Test/S2.java index c323d0cc9068..4929c1f86c20 100644 --- a/slice2java/php/test/Slice/structure/Test/S2.java +++ b/slice2java/php/test/Slice/structure/Test/S2.java @@ -276,5 +276,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 816853839293455356L; + private static final long serialVersionUID = 6880366244190434219L; } diff --git a/slice2java/python/test/Ice/custom/Test/C.java b/slice2java/python/test/Ice/custom/Test/C.java index 0d2f42a6b0d5..f546f809ae58 100644 --- a/slice2java/python/test/Ice/custom/Test/C.java +++ b/slice2java/python/test/Ice/custom/Test/C.java @@ -66,7 +66,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2567916342372495977L; + private static final long serialVersionUID = -7428586264253004521L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/custom/Test/D.java b/slice2java/python/test/Ice/custom/Test/D.java index 977c60a4a9dd..2f7dd628bcde 100644 --- a/slice2java/python/test/Ice/custom/Test/D.java +++ b/slice2java/python/test/Ice/custom/Test/D.java @@ -546,7 +546,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1429836247344907513L; + private static final long serialVersionUID = -7287900369313880514L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/custom/Test/NumPy/D.java b/slice2java/python/test/Ice/custom/Test/NumPy/D.java index 06836406862e..820b4567e23c 100644 --- a/slice2java/python/test/Ice/custom/Test/NumPy/D.java +++ b/slice2java/python/test/Ice/custom/Test/NumPy/D.java @@ -546,7 +546,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2170071981181860624L; + private static final long serialVersionUID = 7498991130562455601L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/custom/Test/S.java b/slice2java/python/test/Ice/custom/Test/S.java index 248ffa4391ae..ec83047096f7 100644 --- a/slice2java/python/test/Ice/custom/Test/S.java +++ b/slice2java/python/test/Ice/custom/Test/S.java @@ -209,5 +209,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = -4206800763429329106L; + private static final long serialVersionUID = 7010246272404524206L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/Base.java b/slice2java/python/test/Ice/defaultValue/Test/Base.java index c1a1a452c129..620e570bf0f7 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/python/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4678945926770512761L; + private static final long serialVersionUID = -7402640202916181753L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java index e17e65af9ecc..bcaedfd01301 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java @@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 6879054205143902771L; + private static final long serialVersionUID = -1793997493010135629L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java index d34b112279f7..eb0ee7ec9344 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1615573142876592963L; + private static final long serialVersionUID = 4217703680331873085L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index e4cb2d88c53d..5bbbe7371f6b 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1008046794357915003L; + private static final long serialVersionUID = 4489937297621555905L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/Derived.java b/slice2java/python/test/Ice/defaultValue/Test/Derived.java index b1028276c165..b54622a06dc8 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/python/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7047308274215649201L; + private static final long serialVersionUID = -2765071699749319473L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java index 58dae2015e2f..94710a4e6ec9 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java @@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7647354768274422280L; + private static final long serialVersionUID = 2626156340183771384L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index 66cafdc4548a..3916abeae6b4 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java +++ b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -6909207122469394919L; + private static final long serialVersionUID = 1011522549917147289L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 01e9c85328d9..c5f4dc1b3293 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java +++ b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java @@ -64,5 +64,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2283269525712136117L; + private static final long serialVersionUID = 5357833648950326513L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java index 09b5fd3715ef..9e2550d0accd 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - private static final long serialVersionUID = 5127389064911450609L; + private static final long serialVersionUID = 5127393450888322997L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct1.java b/slice2java/python/test/Ice/defaultValue/Test/Struct1.java index 2fade2f11467..641363d0b1c5 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/python/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = 4067442858874789992L; + private static final long serialVersionUID = 760302754770302184L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct2.java b/slice2java/python/test/Ice/defaultValue/Test/Struct2.java index 8a57aeebddbe..c094560dc321 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/python/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = 6779555808701294363L; + private static final long serialVersionUID = 1103472520844712347L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java index 6ee56b02abda..0de1e4341a88 100644 --- a/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - private static final long serialVersionUID = -143731516029409591L; + private static final long serialVersionUID = -7285852807364286835L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/A.java b/slice2java/python/test/Ice/exceptions/Test/A.java index 9023d0fb5b0a..b9239bbd2dcb 100644 --- a/slice2java/python/test/Ice/exceptions/Test/A.java +++ b/slice2java/python/test/Ice/exceptions/Test/A.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7823744582073354335L; + private static final long serialVersionUID = 7823737903781079565L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/B.java b/slice2java/python/test/Ice/exceptions/Test/B.java index 90456462ef61..51928fdc0047 100644 --- a/slice2java/python/test/Ice/exceptions/Test/B.java +++ b/slice2java/python/test/Ice/exceptions/Test/B.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3861405861429758177L; + private static final long serialVersionUID = -3861412704726336947L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/C.java b/slice2java/python/test/Ice/exceptions/Test/C.java index 16946c910fc2..ddac20ac8550 100644 --- a/slice2java/python/test/Ice/exceptions/Test/C.java +++ b/slice2java/python/test/Ice/exceptions/Test/C.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1080698273276139615L; + private static final long serialVersionUID = 1080691594983864845L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/D.java b/slice2java/python/test/Ice/exceptions/Test/D.java index fe46a22d3749..06733f02df6f 100644 --- a/slice2java/python/test/Ice/exceptions/Test/D.java +++ b/slice2java/python/test/Ice/exceptions/Test/D.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4780386406672320031L; + private static final long serialVersionUID = 4780379563375741261L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/Mod/A.java b/slice2java/python/test/Ice/exceptions/Test/Mod/A.java index fc45c6c8a973..8188243f6485 100644 --- a/slice2java/python/test/Ice/exceptions/Test/Mod/A.java +++ b/slice2java/python/test/Ice/exceptions/Test/Mod/A.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4641415887178180149L; + private static final long serialVersionUID = -4641411693973594983L; } diff --git a/slice2java/python/test/Ice/objects/Test/A.java b/slice2java/python/test/Ice/objects/Test/A.java index ce76d290fe46..81932c2adee2 100644 --- a/slice2java/python/test/Ice/objects/Test/A.java +++ b/slice2java/python/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7434753360241023203L; + private static final long serialVersionUID = 1414710340873187101L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/A1.java b/slice2java/python/test/Ice/objects/Test/A1.java index 45d9de13695b..1659565ec840 100644 --- a/slice2java/python/test/Ice/objects/Test/A1.java +++ b/slice2java/python/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926742195801683008L; + private static final long serialVersionUID = -5926744200157501039L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/B.java b/slice2java/python/test/Ice/objects/Test/B.java index fced5f03d2df..e75e99568e4e 100644 --- a/slice2java/python/test/Ice/objects/Test/B.java +++ b/slice2java/python/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890920021674895032L; + private static final long serialVersionUID = -8890915204493661991L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/B1.java b/slice2java/python/test/Ice/objects/Test/B1.java index 6a00ab708805..fcc69baaea8c 100644 --- a/slice2java/python/test/Ice/objects/Test/B1.java +++ b/slice2java/python/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6802830039051509828L; + private static final long serialVersionUID = -1603075834553472124L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/Base.java b/slice2java/python/test/Ice/objects/Test/Base.java index 867e401e16af..322fa2149d45 100644 --- a/slice2java/python/test/Ice/objects/Test/Base.java +++ b/slice2java/python/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1677402619845239222L; + private static final long serialVersionUID = 6287534157935739114L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/C.java b/slice2java/python/test/Ice/objects/Test/C.java index f84b5396bac1..b7a8deba879e 100644 --- a/slice2java/python/test/Ice/objects/Test/C.java +++ b/slice2java/python/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -178860988544045635L; + private static final long serialVersionUID = 5934275333197753420L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/COneMember.java b/slice2java/python/test/Ice/objects/Test/COneMember.java index 3dab9ce38937..25c16164d8e1 100644 --- a/slice2java/python/test/Ice/objects/Test/COneMember.java +++ b/slice2java/python/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050971083767202457L; + private static final long serialVersionUID = 3050973615034791804L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/CTwoMembers.java b/slice2java/python/test/Ice/objects/Test/CTwoMembers.java index ba0ff2d425fc..36fb39e78cb1 100644 --- a/slice2java/python/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/python/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4003009601985605541L; + private static final long serialVersionUID = 4848910682003290907L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/D.java b/slice2java/python/test/Ice/objects/Test/D.java index b52668dddb4c..242ad94ca531 100644 --- a/slice2java/python/test/Ice/objects/Test/D.java +++ b/slice2java/python/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7106195474327979889L; + private static final long serialVersionUID = 8846727609579533760L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/D1.java b/slice2java/python/test/Ice/objects/Test/D1.java index 37b91b9a9623..feb3bcba7c95 100644 --- a/slice2java/python/test/Ice/objects/Test/D1.java +++ b/slice2java/python/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8567728900253260419L; + private static final long serialVersionUID = -6970101423324772797L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/E.java b/slice2java/python/test/Ice/objects/Test/E.java index 7d0672f599d4..c8619ce88d1f 100644 --- a/slice2java/python/test/Ice/objects/Test/E.java +++ b/slice2java/python/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6806925453082914715L; + private static final long serialVersionUID = -1356889520969870651L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/EBase.java b/slice2java/python/test/Ice/objects/Test/EBase.java index 559293acc68a..e50f2058d748 100644 --- a/slice2java/python/test/Ice/objects/Test/EBase.java +++ b/slice2java/python/test/Ice/objects/Test/EBase.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -2549091918400723954L; + private static final long serialVersionUID = -905407892777308082L; } diff --git a/slice2java/python/test/Ice/objects/Test/EDerived.java b/slice2java/python/test/Ice/objects/Test/EDerived.java index 740d68b5fa8b..c58d1536a3e1 100644 --- a/slice2java/python/test/Ice/objects/Test/EDerived.java +++ b/slice2java/python/test/Ice/objects/Test/EDerived.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4847601776625740306L; + private static final long serialVersionUID = 1938688026493943378L; } diff --git a/slice2java/python/test/Ice/objects/Test/EOneMember.java b/slice2java/python/test/Ice/objects/Test/EOneMember.java index 59c7b70605d8..b2fa12a8d4dd 100644 --- a/slice2java/python/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/python/test/Ice/objects/Test/EOneMember.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6225293043774770538L; + private static final long serialVersionUID = -6225288631959039309L; } diff --git a/slice2java/python/test/Ice/objects/Test/ETwoMembers.java b/slice2java/python/test/Ice/objects/Test/ETwoMembers.java index 8f90fc5c9597..e1733ed1431f 100644 --- a/slice2java/python/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/python/test/Ice/objects/Test/ETwoMembers.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 8780039317202630740L; + private static final long serialVersionUID = 4451860177743517588L; } diff --git a/slice2java/python/test/Ice/objects/Test/F.java b/slice2java/python/test/Ice/objects/Test/F.java index eea02b69795d..2584ead00b83 100644 --- a/slice2java/python/test/Ice/objects/Test/F.java +++ b/slice2java/python/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1338458045449885871L; + private static final long serialVersionUID = -3124231301632675119L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/F1.java b/slice2java/python/test/Ice/objects/Test/F1.java index 13eec4868d9b..8855f1886ee1 100644 --- a/slice2java/python/test/Ice/objects/Test/F1.java +++ b/slice2java/python/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192369556166010305L; + private static final long serialVersionUID = 6192365766999641568L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/F3.java b/slice2java/python/test/Ice/objects/Test/F3.java index 73c68b63683a..c3508161588c 100644 --- a/slice2java/python/test/Ice/objects/Test/F3.java +++ b/slice2java/python/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7278903149847308864L; + private static final long serialVersionUID = 6107097731399111552L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/Inner/A.java b/slice2java/python/test/Ice/objects/Test/Inner/A.java index bac0a19b3e1b..856ee0fcd9b1 100644 --- a/slice2java/python/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/python/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1425257188542179358L; + private static final long serialVersionUID = -1425257831540173325L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/Inner/Ex.java b/slice2java/python/test/Ice/objects/Test/Inner/Ex.java index 1e119de851d1..98ea5c70ad0f 100644 --- a/slice2java/python/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/python/test/Ice/objects/Test/Inner/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2337227993490285575L; + private static final long serialVersionUID = -2337225994138923608L; } diff --git a/slice2java/python/test/Ice/objects/Test/Inner/Sub/A.java b/slice2java/python/test/Ice/objects/Test/Inner/Sub/A.java index cab87abc049a..60f5c00dd8e5 100644 --- a/slice2java/python/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/python/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1298680552186905097L; + private static final long serialVersionUID = -1298675735047171930L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/python/test/Ice/objects/Test/Inner/Sub/Ex.java index 9ba2db656b66..6e0d4de59cdd 100644 --- a/slice2java/python/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/python/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1842234175938236829L; + private static final long serialVersionUID = 1842241635454755916L; } diff --git a/slice2java/python/test/Ice/objects/Test/K.java b/slice2java/python/test/Ice/objects/Test/K.java index dd1c6af807da..d6076c187249 100644 --- a/slice2java/python/test/Ice/objects/Test/K.java +++ b/slice2java/python/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645163276181043523L; + private static final long serialVersionUID = 4645159820445270866L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/L.java b/slice2java/python/test/Ice/objects/Test/L.java index c7bef9c2000b..222249ebe1ec 100644 --- a/slice2java/python/test/Ice/objects/Test/L.java +++ b/slice2java/python/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629735031527696523L; + private static final long serialVersionUID = 6629735674524403418L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/M.java b/slice2java/python/test/Ice/objects/Test/M.java index 3a550c7ffb98..6183e477ecba 100644 --- a/slice2java/python/test/Ice/objects/Test/M.java +++ b/slice2java/python/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088093154479271625L; + private static final long serialVersionUID = -8088100614076459482L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/Recursive.java b/slice2java/python/test/Ice/objects/Test/Recursive.java index 3b368e5b81bb..abf1856ca8af 100644 --- a/slice2java/python/test/Ice/objects/Test/Recursive.java +++ b/slice2java/python/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617879040986730011L; + private static final long serialVersionUID = 3617875585254269962L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/S.java b/slice2java/python/test/Ice/objects/Test/S.java index 76bccc6db665..974b683878cd 100644 --- a/slice2java/python/test/Ice/objects/Test/S.java +++ b/slice2java/python/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481770330221636408L; + private static final long serialVersionUID = 481769692229385577L; } diff --git a/slice2java/python/test/Ice/objects/Test/SOneMember.java b/slice2java/python/test/Ice/objects/Test/SOneMember.java index 027dbe1d2c9a..7cd9088e2275 100644 --- a/slice2java/python/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/python/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227754145175183488L; + private static final long serialVersionUID = 6227757229371316901L; } diff --git a/slice2java/python/test/Ice/objects/Test/STwoMembers.java b/slice2java/python/test/Ice/objects/Test/STwoMembers.java index 6371d9833312..5a39cb9b5b26 100644 --- a/slice2java/python/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/python/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = 8299620583839678146L; + private static final long serialVersionUID = -6511059173150330110L; } diff --git a/slice2java/python/test/Ice/objects/Test/StructKey.java b/slice2java/python/test/Ice/objects/Test/StructKey.java index 1cdd787a8a67..f2ac85505617 100644 --- a/slice2java/python/test/Ice/objects/Test/StructKey.java +++ b/slice2java/python/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = -2177549517988239447L; + private static final long serialVersionUID = 5773241772383434761L; } diff --git a/slice2java/python/test/Ice/operations/Test/AnotherStruct.java b/slice2java/python/test/Ice/operations/Test/AnotherStruct.java index c31c163b64ec..8bf3f4455d21 100644 --- a/slice2java/python/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/python/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723850899782496052L; + private static final long serialVersionUID = 2723851202152258044L; } diff --git a/slice2java/python/test/Ice/operations/Test/MyClass1.java b/slice2java/python/test/Ice/operations/Test/MyClass1.java index 6dd90ee6ca32..9bfcf4e7aa85 100644 --- a/slice2java/python/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/python/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5893574021357441976L; + private static final long serialVersionUID = -919221816050942226L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct.java b/slice2java/python/test/Ice/operations/Test/MyStruct.java index 75c0d64455a0..349db17c357f 100644 --- a/slice2java/python/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/python/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = 436172379494740573L; + private static final long serialVersionUID = -3523753885594300707L; } diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct1.java b/slice2java/python/test/Ice/operations/Test/MyStruct1.java index 3a40343b55e9..f670755a5bed 100644 --- a/slice2java/python/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/python/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = 5354904977595320241L; + private static final long serialVersionUID = 3046986701135277479L; } diff --git a/slice2java/python/test/Ice/operations/Test/Structure.java b/slice2java/python/test/Ice/operations/Test/Structure.java index 03b9479a4422..c44af9042c08 100644 --- a/slice2java/python/test/Ice/operations/Test/Structure.java +++ b/slice2java/python/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = 3946873100286876982L; + private static final long serialVersionUID = -1288180368005443143L; } diff --git a/slice2java/python/test/Ice/optional/Test/A.java b/slice2java/python/test/Ice/optional/Test/A.java index b7c34d60e698..2aa7944b4b69 100644 --- a/slice2java/python/test/Ice/optional/Test/A.java +++ b/slice2java/python/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3794223979145330800L; + private static final long serialVersionUID = -3569842296255278320L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/B.java b/slice2java/python/test/Ice/optional/Test/B.java index e31a1f99ac45..9a3c58db9645 100644 --- a/slice2java/python/test/Ice/optional/Test/B.java +++ b/slice2java/python/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2104697862530712419L; + private static final long serialVersionUID = 8881678407491188195L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/C.java b/slice2java/python/test/Ice/optional/Test/C.java index 58a516dccdce..ba5853d609bc 100644 --- a/slice2java/python/test/Ice/optional/Test/C.java +++ b/slice2java/python/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4787121009102678659L; + private static final long serialVersionUID = -3605008554093058819L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/DerivedException.java b/slice2java/python/test/Ice/optional/Test/DerivedException.java index a53dbd902d93..1104d1845218 100644 --- a/slice2java/python/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/python/test/Ice/optional/Test/DerivedException.java @@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7668696580927775711L; + private static final long serialVersionUID = 1208894160711249601L; } diff --git a/slice2java/python/test/Ice/optional/Test/E.java b/slice2java/python/test/Ice/optional/Test/E.java index e2c698d5a95f..02e4b790c855 100644 --- a/slice2java/python/test/Ice/optional/Test/E.java +++ b/slice2java/python/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850732671064201929L; + private static final long serialVersionUID = -1850742775449647453L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/F.java b/slice2java/python/test/Ice/optional/Test/F.java index 59045d3cadf0..1a82b02a3f04 100644 --- a/slice2java/python/test/Ice/optional/Test/F.java +++ b/slice2java/python/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430494158947236156L; + private static final long serialVersionUID = -6430489509717604272L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/FixedStruct.java b/slice2java/python/test/Ice/optional/Test/FixedStruct.java index 379ca2edad92..e12d1a9c3686 100644 --- a/slice2java/python/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/python/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569613606859072641L; + private static final long serialVersionUID = 1569604620686586377L; } diff --git a/slice2java/python/test/Ice/optional/Test/G.java b/slice2java/python/test/Ice/optional/Test/G.java index 1331bb7ae1d7..096ac2998aa7 100644 --- a/slice2java/python/test/Ice/optional/Test/G.java +++ b/slice2java/python/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4044626407141785389L; + private static final long serialVersionUID = 686078993027025427L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/G1.java b/slice2java/python/test/Ice/optional/Test/G1.java index 363e2448d476..bc069fc496cb 100644 --- a/slice2java/python/test/Ice/optional/Test/G1.java +++ b/slice2java/python/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339783291251594031L; + private static final long serialVersionUID = 7339781201570885967L; } diff --git a/slice2java/python/test/Ice/optional/Test/G2.java b/slice2java/python/test/Ice/optional/Test/G2.java index b5857838e85b..e3b81a595fc0 100644 --- a/slice2java/python/test/Ice/optional/Test/G2.java +++ b/slice2java/python/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824557942276788038L; + private static final long serialVersionUID = 3824547837893751000L; } diff --git a/slice2java/python/test/Ice/optional/Test/MultiOptional.java b/slice2java/python/test/Ice/optional/Test/MultiOptional.java index ed9c13253196..b889f7f05a0c 100644 --- a/slice2java/python/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/python/test/Ice/optional/Test/MultiOptional.java @@ -1675,7 +1675,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5818611013647867389L; + private static final long serialVersionUID = 3092626731400946045L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/OneOptional.java b/slice2java/python/test/Ice/optional/Test/OneOptional.java index 1f58e3975c80..0b1f9d2129f2 100644 --- a/slice2java/python/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/python/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219608641318312913L; + private static final long serialVersionUID = -7219601096577171673L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/OptionalException.java b/slice2java/python/test/Ice/optional/Test/OptionalException.java index 96e7359f4b96..ee04cc7a1e87 100644 --- a/slice2java/python/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/python/test/Ice/optional/Test/OptionalException.java @@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 8391298806730581159L; + private static final long serialVersionUID = 2218240507787179984L; } diff --git a/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java index 77a22a4635a5..071a2fe15b6f 100644 --- a/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3578379485368160315L; + private static final long serialVersionUID = 5857427326174213819L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/RequiredException.java b/slice2java/python/test/Ice/optional/Test/RequiredException.java index 871bd2633d31..d6a5aacf4b49 100644 --- a/slice2java/python/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/python/test/Ice/optional/Test/RequiredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894245492293894950L; + private static final long serialVersionUID = 2894235222448103558L; } diff --git a/slice2java/python/test/Ice/optional/Test/SmallStruct.java b/slice2java/python/test/Ice/optional/Test/SmallStruct.java index 71ea65bd175b..932df83569d2 100644 --- a/slice2java/python/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/python/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700991874947986843L; + private static final long serialVersionUID = 6700991068919314323L; } diff --git a/slice2java/python/test/Ice/optional/Test/VarStruct.java b/slice2java/python/test/Ice/optional/Test/VarStruct.java index 1fcb8f847ad0..8cab1370243f 100644 --- a/slice2java/python/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/python/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912285576332567385L; + private static final long serialVersionUID = -1912287666013275449L; } diff --git a/slice2java/python/test/Ice/optional/Test/WD.java b/slice2java/python/test/Ice/optional/Test/WD.java index d4281bf9b46d..e9059538d695 100644 --- a/slice2java/python/test/Ice/optional/Test/WD.java +++ b/slice2java/python/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7967518695395228768L; + private static final long serialVersionUID = -1482094205121138552L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test1/C1.java b/slice2java/python/test/Ice/packagemd/Test1/C1.java index 347934bb80b3..562da1820143 100644 --- a/slice2java/python/test/Ice/packagemd/Test1/C1.java +++ b/slice2java/python/test/Ice/packagemd/Test1/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1894596159503771706L; + private static final long serialVersionUID = 1894596541610751210L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test1/C2.java b/slice2java/python/test/Ice/packagemd/Test1/C2.java index 7f3099f7144e..08067c98d203 100644 --- a/slice2java/python/test/Ice/packagemd/Test1/C2.java +++ b/slice2java/python/test/Ice/packagemd/Test1/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2892575739174467346L; + private static final long serialVersionUID = 2892575873389889128L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test1/E1.java b/slice2java/python/test/Ice/packagemd/Test1/E1.java index 3cc7daf24e57..32788f0fbe0b 100644 --- a/slice2java/python/test/Ice/packagemd/Test1/E1.java +++ b/slice2java/python/test/Ice/packagemd/Test1/E1.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5787345279916997621L; + private static final long serialVersionUID = 5787344732356002469L; } diff --git a/slice2java/python/test/Ice/packagemd/Test1/E2.java b/slice2java/python/test/Ice/packagemd/Test1/E2.java index b3abbfae6c6d..c6846b637dd3 100644 --- a/slice2java/python/test/Ice/packagemd/Test1/E2.java +++ b/slice2java/python/test/Ice/packagemd/Test1/E2.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4908749359978896200L; + private static final long serialVersionUID = 4908748972633522354L; } diff --git a/slice2java/python/test/Ice/packagemd/Test1/def.java b/slice2java/python/test/Ice/packagemd/Test1/def.java index d3efa2f47ea0..ad56444749a3 100644 --- a/slice2java/python/test/Ice/packagemd/Test1/def.java +++ b/slice2java/python/test/Ice/packagemd/Test1/def.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7298389476151534950L; + private static final long serialVersionUID = 7298389176385918902L; } diff --git a/slice2java/python/test/Ice/packagemd/Test2/C1.java b/slice2java/python/test/Ice/packagemd/Test2/C1.java index 598074e590c9..09323a2fdfd9 100644 --- a/slice2java/python/test/Ice/packagemd/Test2/C1.java +++ b/slice2java/python/test/Ice/packagemd/Test2/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -860918968835555220L; + private static final long serialVersionUID = -860919168913977964L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test2/C2.java b/slice2java/python/test/Ice/packagemd/Test2/C2.java index 7e01b93beb22..75a8523d8969 100644 --- a/slice2java/python/test/Ice/packagemd/Test2/C2.java +++ b/slice2java/python/test/Ice/packagemd/Test2/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 954149990568246315L; + private static final long serialVersionUID = 954149756919486675L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test2/E1.java b/slice2java/python/test/Ice/packagemd/Test2/E1.java index 97befe56420c..53702243e777 100644 --- a/slice2java/python/test/Ice/packagemd/Test2/E1.java +++ b/slice2java/python/test/Ice/packagemd/Test2/E1.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 6934988505750591299L; + private static final long serialVersionUID = 6934988905028164155L; } diff --git a/slice2java/python/test/Ice/packagemd/Test2/E2.java b/slice2java/python/test/Ice/packagemd/Test2/E2.java index 53c98547735b..71472fcbaa38 100644 --- a/slice2java/python/test/Ice/packagemd/Test2/E2.java +++ b/slice2java/python/test/Ice/packagemd/Test2/E2.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5414535957065324658L; + private static final long serialVersionUID = 5414536521633619658L; } diff --git a/slice2java/python/test/Ice/packagemd/Test3/C1.java b/slice2java/python/test/Ice/packagemd/Test3/C1.java index aeade8498a63..3e7f6ae28b8e 100644 --- a/slice2java/python/test/Ice/packagemd/Test3/C1.java +++ b/slice2java/python/test/Ice/packagemd/Test3/C1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5832349890084336493L; + private static final long serialVersionUID = 5832349447048789973L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test3/C2.java b/slice2java/python/test/Ice/packagemd/Test3/C2.java index 6d854e4bf218..e4760a0f57b7 100644 --- a/slice2java/python/test/Ice/packagemd/Test3/C2.java +++ b/slice2java/python/test/Ice/packagemd/Test3/C2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2769372876037543947L; + private static final long serialVersionUID = 2769372471772422835L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test3/E1.java b/slice2java/python/test/Ice/packagemd/Test3/E1.java index dfcd464289d2..f5190f4664ae 100644 --- a/slice2java/python/test/Ice/packagemd/Test3/E1.java +++ b/slice2java/python/test/Ice/packagemd/Test3/E1.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5344586222683903842L; + private static final long serialVersionUID = 5344586539155868186L; } diff --git a/slice2java/python/test/Ice/packagemd/Test3/E2.java b/slice2java/python/test/Ice/packagemd/Test3/E2.java index 8e7a33a261aa..b826fef5ae12 100644 --- a/slice2java/python/test/Ice/packagemd/Test3/E2.java +++ b/slice2java/python/test/Ice/packagemd/Test3/E2.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8399051258363768877L; + private static final long serialVersionUID = -8399050776601361173L; } diff --git a/slice2java/python/test/Ice/scope/Test/C.java b/slice2java/python/test/Ice/scope/Test/C.java index b1fc28577533..f38caab9a905 100644 --- a/slice2java/python/test/Ice/scope/Test/C.java +++ b/slice2java/python/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190247308770827545L; + private static final long serialVersionUID = -5190248630020760858L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/scope/Test/C1.java b/slice2java/python/test/Ice/scope/Test/C1.java index 1b1ffaf1f8c7..0ed9cb4f0f91 100644 --- a/slice2java/python/test/Ice/scope/Test/C1.java +++ b/slice2java/python/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893233211022337115L; + private static final long serialVersionUID = 8893234532272342170L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/scope/Test/C2.java b/slice2java/python/test/Ice/scope/Test/C2.java index 210f5ffa91ee..0294df4a8441 100644 --- a/slice2java/python/test/Ice/scope/Test/C2.java +++ b/slice2java/python/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2847174186691131000L; + private static final long serialVersionUID = 2255247722004551433L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/scope/Test/Inner/C.java b/slice2java/python/test/Ice/scope/Test/Inner/C.java index 830b1228d00a..440da0e9b6ad 100644 --- a/slice2java/python/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/python/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615622876172677210L; + private static final long serialVersionUID = 4615627005074112475L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/python/test/Ice/scope/Test/Inner/Inner2/C.java index b2092a23d52d..10f90695ef13 100644 --- a/slice2java/python/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/python/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672588884863765815L; + private static final long serialVersionUID = 672593013762764022L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/python/test/Ice/scope/Test/Inner/Inner2/S.java index 62c83d84661b..c3db85a78dd9 100644 --- a/slice2java/python/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/python/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654439258225701504L; + private static final long serialVersionUID = 8654437936975696449L; } diff --git a/slice2java/python/test/Ice/scope/Test/Inner/S.java b/slice2java/python/test/Ice/scope/Test/Inner/S.java index 8f9ec54391e2..c939f8d038f3 100644 --- a/slice2java/python/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/python/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694621405222588620L; + private static final long serialVersionUID = 3694620083972583309L; } diff --git a/slice2java/python/test/Ice/scope/Test/S.java b/slice2java/python/test/Ice/scope/Test/S.java index d8d3b0430a8a..d19f90eafe6b 100644 --- a/slice2java/python/test/Ice/scope/Test/S.java +++ b/slice2java/python/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159697317068138546L; + private static final long serialVersionUID = 2159701445974108403L; } diff --git a/slice2java/python/test/Ice/scope/Test/S1.java b/slice2java/python/test/Ice/scope/Test/S1.java index 5158418ddcfc..17fc4926e1d9 100644 --- a/slice2java/python/test/Ice/scope/Test/S1.java +++ b/slice2java/python/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241674894294439138L; + private static final long serialVersionUID = 1241679023200408739L; } diff --git a/slice2java/python/test/Ice/scope/Test/S2.java b/slice2java/python/test/Ice/scope/Test/S2.java index 15b6cb5bd81d..4e3f935f3cfd 100644 --- a/slice2java/python/test/Ice/scope/Test/S2.java +++ b/slice2java/python/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 2076652332577113969L; + private static final long serialVersionUID = 5162141418115003888L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java index 97369e044f17..46f5d4f47c76 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477016695075731235L; + private static final long serialVersionUID = -477021916569246846L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java index 49e4a2681d45..9cd51ef383b4 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485210294750530939L; + private static final long serialVersionUID = 3485211014014821668L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 30586dcce9a7..2be841371ef7 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717370973316104842L; + private static final long serialVersionUID = 1717376194790646741L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index d740c10ef99c..3dbcb012a7f3 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384917064971503533L; + private static final long serialVersionUID = -7384921800848935924L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java index c761872aacee..15ec5b7b7602 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3424367271229569039L; + private static final long serialVersionUID = 3424370734955870473L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index f41beff7a85a..b9d76e18acbc 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1172601509463158050L; + private static final long serialVersionUID = -1172599368200056872L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index abcd9ff1b64f..8d667a8cb265 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1126116670550588761L; + private static final long serialVersionUID = -1126113041516387295L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index 5f3764ffc641..5c900fc8ef5b 100644 --- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java +++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2097586466188123641L; + private static final long serialVersionUID = -2097583002461822207L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/B.java b/slice2java/python/test/Ice/slicing/objects/Test/B.java index 7916213b5f99..4f7c09c68d4b 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8430008335305024591L; + private static final long serialVersionUID = 4679357146888816289L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/python/test/Ice/slicing/objects/Test/BaseException.java index ce95f5f56d23..ef9e57249c68 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 2022303081336799491L; + private static final long serialVersionUID = -7304700778926611091L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java index 671eca0fc885..27fc9086b810 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6396997786500736826L; + private static final long serialVersionUID = -6396993850262913184L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/CompactPDerived.java index 52277995f400..4618cf043e76 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066880116661430354L; + private static final long serialVersionUID = -9066880640996029475L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/D1.java b/slice2java/python/test/Ice/slicing/objects/Test/D1.java index 205f045b9d60..5145619e0157 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4411465135489183124L; + private static final long serialVersionUID = -620847003263726366L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/D2.java b/slice2java/python/test/Ice/slicing/objects/Test/D2.java index 25ff00e2666a..e45681aafe80 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/D2.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9014730041839750766L; + private static final long serialVersionUID = 220266318219087036L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/D3.java b/slice2java/python/test/Ice/slicing/objects/Test/D3.java index cb3525ebe6c1..d9c377134e39 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4517221422683103565L; + private static final long serialVersionUID = 8944922906502201011L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/D4.java b/slice2java/python/test/Ice/slicing/objects/Test/D4.java index e74a8847400d..9a128a83ef8d 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/D4.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2204930962031926669L; + private static final long serialVersionUID = -7378061623362262477L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/python/test/Ice/slicing/objects/Test/DerivedException.java index be02f8b6584d..41d5f0aefe90 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -5138676883769283342L; + private static final long serialVersionUID = -6031257478195786316L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/Forward.java b/slice2java/python/test/Ice/slicing/objects/Test/Forward.java index b5a484bae5ac..fc7eee50738f 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655918678253125121L; + private static final long serialVersionUID = -7655923769006688322L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/python/test/Ice/slicing/objects/Test/Hidden.java index 23e05baaace8..ccddd70eec59 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271133512285913150L; + private static final long serialVersionUID = -2271128090855026178L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/MyClass.java b/slice2java/python/test/Ice/slicing/objects/Test/MyClass.java index 37aaf614f7c6..2fa549465998 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/MyClass.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4147529200534917120L; + private static final long serialVersionUID = 4147521075838837555L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PBase.java b/slice2java/python/test/Ice/slicing/objects/Test/PBase.java index 188672c0758a..964d771776d7 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481704446098720385L; + private static final long serialVersionUID = 481713835133161644L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived.java index 0f1ef435605c..9a05411c39c7 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426882813630788218L; + private static final long serialVersionUID = -4426878877098568672L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived2.java index bd9dbd96904f..0cc2897fe816 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850539813812175950L; + private static final long serialVersionUID = 850535882740080424L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived3.java index 841b925eb698..f46afb2d2922 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328908354675057983L; + private static final long serialVersionUID = -4328906831032646361L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/python/test/Ice/slicing/objects/Test/PCUnknown.java index 4c3411b64c6c..0b0d8045983f 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081806284714270407L; + private static final long serialVersionUID = -5081810536070574561L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/PDerived.java index 7d7243ffa670..506bbc55da80 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643077614500299113L; + private static final long serialVersionUID = 643085598053373530L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PNode.java b/slice2java/python/test/Ice/slicing/objects/Test/PNode.java index 20efe0ddc8af..5820890135bf 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438003349719707059L; + private static final long serialVersionUID = -2438013740660192324L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown.java b/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown.java index 9f51f6bd604c..d636dcef1d25 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3083991600946036876L; + private static final long serialVersionUID = -7952118475947770954L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown2.java b/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown2.java index 1126fbc6a150..2f9295ca8751 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown2.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8813709907217009593L; + private static final long serialVersionUID = -8813704912996550175L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java index 1b24290fbb3a..8745be2b2cfe 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651524602849447417L; + private static final long serialVersionUID = 3651529342549149570L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/SBSKnownDerived.java index 961b728fbf67..ef878de35a30 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804375410484069212L; + private static final long serialVersionUID = 8804382392006138791L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SBSUnknownDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/SBSUnknownDerived.java index dc7101b5418f..9ddcef047541 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SBSUnknownDerived.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4989066900195137972L; + private static final long serialVersionUID = -4989054002214302031L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SBase.java b/slice2java/python/test/Ice/slicing/objects/Test/SBase.java index 5df528fd1c7e..55d26092815e 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353757035461516566L; + private static final long serialVersionUID = -5353761805976624687L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SS1.java b/slice2java/python/test/Ice/slicing/objects/Test/SS1.java index 262db847abb4..c5e2518035c8 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522133023313319365L; + private static final long serialVersionUID = -6522139850073638817L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SS2.java b/slice2java/python/test/Ice/slicing/objects/Test/SS2.java index 4eed15a4c39e..f755713b4904 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620286548127474552L; + private static final long serialVersionUID = 7620287909266969308L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SS3.java b/slice2java/python/test/Ice/slicing/objects/Test/SS3.java index a80a451b54b4..a6bb003b8dc4 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = 329756166829966378L; + private static final long serialVersionUID = 3153206607319425116L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java index e6f6a3ba1452..d4251eb99d41 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2334471549900231572L; + private static final long serialVersionUID = -328874138343667119L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/slicing/objects/Test/UnknownDerivedException.java b/slice2java/python/test/Ice/slicing/objects/Test/UnknownDerivedException.java index 1b9fbcf270d9..f40c1d20ebfe 100644 --- a/slice2java/python/test/Ice/slicing/objects/Test/UnknownDerivedException.java +++ b/slice2java/python/test/Ice/slicing/objects/Test/UnknownDerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -579221215645802374L; + private static final long serialVersionUID = -1591622122168018650L; } diff --git a/slice2java/python/test/Slice/escape/Clash/Cls.java b/slice2java/python/test/Slice/escape/Clash/Cls.java index fef87969d6be..6f47e1aff174 100644 --- a/slice2java/python/test/Slice/escape/Clash/Cls.java +++ b/slice2java/python/test/Slice/escape/Clash/Cls.java @@ -164,7 +164,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3910005118816073890L; + private static final long serialVersionUID = -1355535034485164967L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/escape/Clash/Ex.java b/slice2java/python/test/Slice/escape/Clash/Ex.java index c6afa0685a95..325d341227e6 100644 --- a/slice2java/python/test/Slice/escape/Clash/Ex.java +++ b/slice2java/python/test/Slice/escape/Clash/Ex.java @@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -844886783656891360L; + private static final long serialVersionUID = -4608221385654179296L; } diff --git a/slice2java/python/test/Slice/escape/Clash/St.java b/slice2java/python/test/Slice/escape/Clash/St.java index a7acda4ff41e..cbe7214cc5a1 100644 --- a/slice2java/python/test/Slice/escape/Clash/St.java +++ b/slice2java/python/test/Slice/escape/Clash/St.java @@ -187,5 +187,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - private static final long serialVersionUID = 8126430232153470229L; + private static final long serialVersionUID = -1711224040976879470L; } diff --git a/slice2java/python/test/Slice/escape/and/_continue.java b/slice2java/python/test/Slice/escape/and/_continue.java index c484db38f0df..690e4710c377 100644 --- a/slice2java/python/test/Slice/escape/and/_continue.java +++ b/slice2java/python/test/Slice/escape/and/_continue.java @@ -138,5 +138,5 @@ static public java.util.Optional<_continue> ice_read(com.zeroc.Ice.InputStream i private static final _continue _nullMarshalValue = new _continue(); /** @hidden */ - private static final long serialVersionUID = 1201380676413825697L; + private static final long serialVersionUID = 1201381912282969522L; } diff --git a/slice2java/python/test/Slice/escape/and/_for.java b/slice2java/python/test/Slice/escape/and/_for.java index a5ec5a8f700e..c6498a0c7608 100644 --- a/slice2java/python/test/Slice/escape/and/_for.java +++ b/slice2java/python/test/Slice/escape/and/_for.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5408444781023659053L; + private static final long serialVersionUID = -238211148741982551L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/escape/and/is.java b/slice2java/python/test/Slice/escape/and/is.java index bcb91a11610e..ee96de35123a 100644 --- a/slice2java/python/test/Slice/escape/and/is.java +++ b/slice2java/python/test/Slice/escape/and/is.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4585939638062705830L; + private static final long serialVersionUID = -4585935424084078903L; } diff --git a/slice2java/python/test/Slice/escape/and/not.java b/slice2java/python/test/Slice/escape/and/not.java index eb993d64b346..de64a6b29018 100644 --- a/slice2java/python/test/Slice/escape/and/not.java +++ b/slice2java/python/test/Slice/escape/and/not.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5394203288086857913L; + private static final long serialVersionUID = 9050402060204508025L; } diff --git a/slice2java/python/test/Slice/macros/Test/Default.java b/slice2java/python/test/Slice/macros/Test/Default.java index c94b4dabb628..0a27a9a10894 100644 --- a/slice2java/python/test/Slice/macros/Test/Default.java +++ b/slice2java/python/test/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3931251993468604190L; + private static final long serialVersionUID = 917514672409101374L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/macros/Test/NoDefault.java b/slice2java/python/test/Slice/macros/Test/NoDefault.java index 336783ca2fad..507eed256381 100644 --- a/slice2java/python/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/python/test/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6299972204451945857L; + private static final long serialVersionUID = 3028858279255033695L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/structure/Test/C.java b/slice2java/python/test/Slice/structure/Test/C.java index 0318019b7811..960b54a16856 100644 --- a/slice2java/python/test/Slice/structure/Test/C.java +++ b/slice2java/python/test/Slice/structure/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1667150778140742347L; + private static final long serialVersionUID = 1667159163725412270L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/structure/Test/S1.java b/slice2java/python/test/Slice/structure/Test/S1.java index 596fc815ad9f..c758b8aa21b3 100644 --- a/slice2java/python/test/Slice/structure/Test/S1.java +++ b/slice2java/python/test/Slice/structure/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = -5542861961820368989L; + private static final long serialVersionUID = -5542853741695396858L; } diff --git a/slice2java/python/test/Slice/structure/Test/S2.java b/slice2java/python/test/Slice/structure/Test/S2.java index dd0090f81d28..3499bc95d9ef 100644 --- a/slice2java/python/test/Slice/structure/Test/S2.java +++ b/slice2java/python/test/Slice/structure/Test/S2.java @@ -217,5 +217,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = -5128611378593904023L; + private static final long serialVersionUID = -2204900459612354999L; } diff --git a/slice2java/python/test/Slice/structure/Test/S3.java b/slice2java/python/test/Slice/structure/Test/S3.java index 532dc5e53487..32fb482be3ef 100644 --- a/slice2java/python/test/Slice/structure/Test/S3.java +++ b/slice2java/python/test/Slice/structure/Test/S3.java @@ -168,5 +168,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S3 _nullMarshalValue = new S3(); /** @hidden */ - private static final long serialVersionUID = 8212341739151389846L; + private static final long serialVersionUID = 2787825558825598515L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Base.java b/slice2java/ruby/test/Ice/defaultValue/Test/Base.java index 4521dcaeb215..32620927ff37 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5967238473439492899L; + private static final long serialVersionUID = 4897203565794212301L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java index de67942863b5..37ed4623a30e 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5481349286702675228L; + private static final long serialVersionUID = -931337522864885429L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index b32e3e31d4ff..32d7f504820d 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3810894814473515589L; + private static final long serialVersionUID = -4521367500600951905L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java b/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java index 8fcd600ac828..6e0142ed6956 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1579796819161234753L; + private static final long serialVersionUID = 7761866933143478281L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java index 5594fade158a..afc07f38a4dd 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final InnerStruct _nullMarshalValue = new InnerStruct(); /** @hidden */ - private static final long serialVersionUID = 5127387906480548504L; + private static final long serialVersionUID = 5127392354240035897L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java index 046705bf457b..da6e23a61d66 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = 1341662006372899612L; + private static final long serialVersionUID = 1870547621867352708L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java index 04d3c308fd73..307d0049cb04 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = 2161410946359145239L; + private static final long serialVersionUID = 1855554647678054340L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java index ed15816ba583..3e1679d65ac8 100644 --- a/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java +++ b/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java @@ -274,5 +274,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults(); /** @hidden */ - private static final long serialVersionUID = -3698646295152161203L; + private static final long serialVersionUID = -1747747139983173995L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/A.java b/slice2java/ruby/test/Ice/exceptions/Test/A.java index dda7676d98f7..e37acee2cf51 100644 --- a/slice2java/ruby/test/Ice/exceptions/Test/A.java +++ b/slice2java/ruby/test/Ice/exceptions/Test/A.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7823737162575489866L; + private static final long serialVersionUID = 7823741921701643695L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/B.java b/slice2java/ruby/test/Ice/exceptions/Test/B.java index b291f68cc43a..64003a165fa7 100644 --- a/slice2java/ruby/test/Ice/exceptions/Test/B.java +++ b/slice2java/ruby/test/Ice/exceptions/Test/B.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3861418735936386422L; + private static final long serialVersionUID = -3861419597279112209L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/C.java b/slice2java/ruby/test/Ice/exceptions/Test/C.java index cb76b23cb640..74ead1043e61 100644 --- a/slice2java/ruby/test/Ice/exceptions/Test/C.java +++ b/slice2java/ruby/test/Ice/exceptions/Test/C.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1080690853778275146L; + private static final long serialVersionUID = 1080695612904428975L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/D.java b/slice2java/ruby/test/Ice/exceptions/Test/D.java index f642da75f9ee..88df5bb29780 100644 --- a/slice2java/ruby/test/Ice/exceptions/Test/D.java +++ b/slice2java/ruby/test/Ice/exceptions/Test/D.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4780373532165691786L; + private static final long serialVersionUID = 4780372670822965999L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java b/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java index b39a8d5c15e6..2715b69adf81 100644 --- a/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java +++ b/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4641411112760877346L; + private static final long serialVersionUID = -4641407355795450309L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/A.java b/slice2java/ruby/test/Ice/objects/Test/A.java index a35256b10018..91bc340e18d3 100644 --- a/slice2java/ruby/test/Ice/objects/Test/A.java +++ b/slice2java/ruby/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9044297342393814631L; + private static final long serialVersionUID = -6446181449746893991L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/A1.java b/slice2java/ruby/test/Ice/objects/Test/A1.java index f1f446f2c112..c0549d1f0a19 100644 --- a/slice2java/ruby/test/Ice/objects/Test/A1.java +++ b/slice2java/ruby/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926742035650364003L; + private static final long serialVersionUID = -5926742978265596043L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/B.java b/slice2java/ruby/test/Ice/objects/Test/B.java index 46037ea101f7..731aa80f555e 100644 --- a/slice2java/ruby/test/Ice/objects/Test/B.java +++ b/slice2java/ruby/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890919861523664818L; + private static final long serialVersionUID = -8890910570850297690L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/B1.java b/slice2java/ruby/test/Ice/objects/Test/B1.java index 656c2478ccba..fcda188585f1 100644 --- a/slice2java/ruby/test/Ice/objects/Test/B1.java +++ b/slice2java/ruby/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6724130629523384060L; + private static final long serialVersionUID = -6814131753132521212L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/Base.java b/slice2java/ruby/test/Ice/objects/Test/Base.java index dd7189744173..97cdfbd69f74 100644 --- a/slice2java/ruby/test/Ice/objects/Test/Base.java +++ b/slice2java/ruby/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 53609326979342231L; + private static final long serialVersionUID = -5090222093835473129L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/C.java b/slice2java/ruby/test/Ice/objects/Test/C.java index 634ee3f5fad5..6a5ece4b1239 100644 --- a/slice2java/ruby/test/Ice/objects/Test/C.java +++ b/slice2java/ruby/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1352139211645288191L; + private static final long serialVersionUID = 1937081264000966999L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/COneMember.java b/slice2java/ruby/test/Ice/objects/Test/COneMember.java index 6def0fcba7af..079f03a6de6e 100644 --- a/slice2java/ruby/test/Ice/objects/Test/COneMember.java +++ b/slice2java/ruby/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050969744572164512L; + private static final long serialVersionUID = 3050973719705549473L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java index 0b9352541973..7a7039f4b46c 100644 --- a/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7294808783997997925L; + private static final long serialVersionUID = -6635135160390982757L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/D.java b/slice2java/ruby/test/Ice/objects/Test/D.java index db073800ec96..1559853d0c1b 100644 --- a/slice2java/ruby/test/Ice/objects/Test/D.java +++ b/slice2java/ruby/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1817417502429446579L; + private static final long serialVersionUID = -4837384134135343525L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/D1.java b/slice2java/ruby/test/Ice/objects/Test/D1.java index df9d4a177694..dc0e41523353 100644 --- a/slice2java/ruby/test/Ice/objects/Test/D1.java +++ b/slice2java/ruby/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3144227828947062467L; + private static final long serialVersionUID = 3068425448734633539L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/E.java b/slice2java/ruby/test/Ice/objects/Test/E.java index 5be247ea1e98..5cd9faf08b84 100644 --- a/slice2java/ruby/test/Ice/objects/Test/E.java +++ b/slice2java/ruby/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8216778538715126130L; + private static final long serialVersionUID = -1898376807140494606L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/EBase.java b/slice2java/ruby/test/Ice/objects/Test/EBase.java index 9f1023ae5b07..1942125e0a37 100644 --- a/slice2java/ruby/test/Ice/objects/Test/EBase.java +++ b/slice2java/ruby/test/Ice/objects/Test/EBase.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -8711719457043510578L; + private static final long serialVersionUID = 5861133321847077582L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/EDerived.java b/slice2java/ruby/test/Ice/objects/Test/EDerived.java index c09a84392114..3c575066a847 100644 --- a/slice2java/ruby/test/Ice/objects/Test/EDerived.java +++ b/slice2java/ruby/test/Ice/objects/Test/EDerived.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2743389419509488046L; + private static final long serialVersionUID = -2833385087957924142L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/EOneMember.java b/slice2java/ruby/test/Ice/objects/Test/EOneMember.java index b64811e43b0f..df9f9f88907b 100644 --- a/slice2java/ruby/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/ruby/test/Ice/objects/Test/EOneMember.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6225291500224402449L; + private static final long serialVersionUID = -6225288532425986066L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java index 43ed78e42094..411004604934 100644 --- a/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 9031758814578748692L; + private static final long serialVersionUID = 446330244006589972L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/F.java b/slice2java/ruby/test/Ice/objects/Test/F.java index 965b590626b6..0cb919d3a9c9 100644 --- a/slice2java/ruby/test/Ice/objects/Test/F.java +++ b/slice2java/ruby/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2515512757202860625L; + private static final long serialVersionUID = 187948636488216209L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/F1.java b/slice2java/ruby/test/Ice/objects/Test/F1.java index e12d7c1c41ad..1e67addf8b45 100644 --- a/slice2java/ruby/test/Ice/objects/Test/F1.java +++ b/slice2java/ruby/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192372703561962432L; + private static final long serialVersionUID = 6192373607422721252L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/F3.java b/slice2java/ruby/test/Ice/objects/Test/F3.java index 81c72a79ec28..4b694dda410f 100644 --- a/slice2java/ruby/test/Ice/objects/Test/F3.java +++ b/slice2java/ruby/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7592992674851581888L; + private static final long serialVersionUID = -4945136718332723648L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/K.java b/slice2java/ruby/test/Ice/objects/Test/K.java index 5f377a21e5cc..29c4c2e1ea94 100644 --- a/slice2java/ruby/test/Ice/objects/Test/K.java +++ b/slice2java/ruby/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645163116246393571L; + private static final long serialVersionUID = 4645159280586803851L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/L.java b/slice2java/ruby/test/Ice/objects/Test/L.java index dd82640fc647..417b3078913c 100644 --- a/slice2java/ruby/test/Ice/objects/Test/L.java +++ b/slice2java/ruby/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629735191678866390L; + private static final long serialVersionUID = 6629747375382959230L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/M.java b/slice2java/ruby/test/Ice/objects/Test/M.java index 480100360235..4f9da5c92d72 100644 --- a/slice2java/ruby/test/Ice/objects/Test/M.java +++ b/slice2java/ruby/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088093314615835766L; + private static final long serialVersionUID = -8088105849603942174L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/Recursive.java b/slice2java/ruby/test/Ice/objects/Test/Recursive.java index 4918ac881624..24af4e4f5d6e 100644 --- a/slice2java/ruby/test/Ice/objects/Test/Recursive.java +++ b/slice2java/ruby/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617879201339781263L; + private static final long serialVersionUID = 3617885594110832551L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/S.java b/slice2java/ruby/test/Ice/objects/Test/S.java index 54ee4a1da802..fc0bbcecef89 100644 --- a/slice2java/ruby/test/Ice/objects/Test/S.java +++ b/slice2java/ruby/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481770490372771301L; + private static final long serialVersionUID = 481774325876254029L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/SOneMember.java b/slice2java/ruby/test/Ice/objects/Test/SOneMember.java index f9fd95196cd6..f907d91379ad 100644 --- a/slice2java/ruby/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/ruby/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227760779531488121L; + private static final long serialVersionUID = 6227757295164856824L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java index 1537236d85c7..fa84b8447ead 100644 --- a/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = 5406797375590303874L; + private static final long serialVersionUID = -8344927030813914238L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/StructKey.java b/slice2java/ruby/test/Ice/objects/Test/StructKey.java index 2b97db2b6abb..3ea069308d74 100644 --- a/slice2java/ruby/test/Ice/objects/Test/StructKey.java +++ b/slice2java/ruby/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = -8340473067357832642L; + private static final long serialVersionUID = 5643101088288884414L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java b/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java index 088daff5efda..a2fc51a8cb9b 100644 --- a/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723841394590401353L; + private static final long serialVersionUID = 2723846328152142910L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/MyClass1.java b/slice2java/ruby/test/Ice/operations/Test/MyClass1.java index d23fe1c104b2..9ce84a6fe108 100644 --- a/slice2java/ruby/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/ruby/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2761782608911742909L; + private static final long serialVersionUID = -172587867197783532L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct.java index a97bdc6b2566..0e10c7f3adbb 100644 --- a/slice2java/ruby/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/ruby/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = 1960177506531022365L; + private static final long serialVersionUID = 3764402313462700349L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java index b6069074782b..ddbb6f3eda1e 100644 --- a/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = 525824029398330954L; + private static final long serialVersionUID = 784459251912261021L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/Structure.java b/slice2java/ruby/test/Ice/operations/Test/Structure.java index 99e2fafb7351..ab823321e95e 100644 --- a/slice2java/ruby/test/Ice/operations/Test/Structure.java +++ b/slice2java/ruby/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = 2441937444796182487L; + private static final long serialVersionUID = 7557672603370444160L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/A.java b/slice2java/ruby/test/Ice/optional/Test/A.java index 085ce3355287..58ba6625fbda 100644 --- a/slice2java/ruby/test/Ice/optional/Test/A.java +++ b/slice2java/ruby/test/Ice/optional/Test/A.java @@ -212,7 +212,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3062335168321433744L; + private static final long serialVersionUID = 577688666459366672L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/B.java b/slice2java/ruby/test/Ice/optional/Test/B.java index e46949a7f9eb..4194694a2f85 100644 --- a/slice2java/ruby/test/Ice/optional/Test/B.java +++ b/slice2java/ruby/test/Ice/optional/Test/B.java @@ -107,7 +107,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4237157754621533405L; + private static final long serialVersionUID = 799877187735829987L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/C.java b/slice2java/ruby/test/Ice/optional/Test/C.java index c534adccd2d9..f7a71da23834 100644 --- a/slice2java/ruby/test/Ice/optional/Test/C.java +++ b/slice2java/ruby/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6396465019329753981L; + private static final long serialVersionUID = 6149222069738043389L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/DerivedException.java b/slice2java/ruby/test/Ice/optional/Test/DerivedException.java index cd26b4ec4a5f..6768556ba9c2 100644 --- a/slice2java/ruby/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/ruby/test/Ice/optional/Test/DerivedException.java @@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1027926369372168880L; + private static final long serialVersionUID = 975974422762057929L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/E.java b/slice2java/ruby/test/Ice/optional/Test/E.java index 626537caf016..df5d6d7d3076 100644 --- a/slice2java/ruby/test/Ice/optional/Test/E.java +++ b/slice2java/ruby/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850742883732683086L; + private static final long serialVersionUID = -1850739068839983585L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/F.java b/slice2java/ruby/test/Ice/optional/Test/F.java index 0846c6b579b9..f84747be7a48 100644 --- a/slice2java/ruby/test/Ice/optional/Test/F.java +++ b/slice2java/ruby/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430489406434703295L; + private static final long serialVersionUID = -6430492539441803540L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java b/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java index 609651224089..569c7833ca91 100644 --- a/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569604556111027356L; + private static final long serialVersionUID = 1569601593467487337L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/G.java b/slice2java/ruby/test/Ice/optional/Test/G.java index 58675c3ff903..776920b8e330 100644 --- a/slice2java/ruby/test/Ice/optional/Test/G.java +++ b/slice2java/ruby/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3152009011423051373L; + private static final long serialVersionUID = 257522977137534867L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/G1.java b/slice2java/ruby/test/Ice/optional/Test/G1.java index f881b24dbcfc..9051626d6f39 100644 --- a/slice2java/ruby/test/Ice/optional/Test/G1.java +++ b/slice2java/ruby/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339781101019231838L; + private static final long serialVersionUID = 7339784228862079559L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/G2.java b/slice2java/ruby/test/Ice/optional/Test/G2.java index 09a9817232ee..bdc292968840 100644 --- a/slice2java/ruby/test/Ice/optional/Test/G2.java +++ b/slice2java/ruby/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824547729608240905L; + private static final long serialVersionUID = 3824550862620154030L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java b/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java index b21394176094..7c319949efd4 100644 --- a/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java @@ -1675,7 +1675,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6170383086385744991L; + private static final long serialVersionUID = -7150154082906829724L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/OneOptional.java b/slice2java/ruby/test/Ice/optional/Test/OneOptional.java index 08a6acf047ef..c5167e2094bd 100644 --- a/slice2java/ruby/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/ruby/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219600995683967822L; + private static final long serialVersionUID = -7219599355502478073L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalException.java b/slice2java/ruby/test/Ice/optional/Test/OptionalException.java index 92083d4daaec..afe35fcc14ed 100644 --- a/slice2java/ruby/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/ruby/test/Ice/optional/Test/OptionalException.java @@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1580537366150678495L; + private static final long serialVersionUID = 4638639731410303567L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java index e1f6bfa05352..e96c630a031a 100644 --- a/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6533686034459372101L; + private static final long serialVersionUID = -1842292271713403909L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/RequiredException.java b/slice2java/ruby/test/Ice/optional/Test/RequiredException.java index 001ffea0a075..d227d9ca0f70 100644 --- a/slice2java/ruby/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/ruby/test/Ice/optional/Test/RequiredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894235124327578903L; + private static final long serialVersionUID = 2894238934063149966L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java b/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java index 307274f528c9..558223054e12 100644 --- a/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700991001917330306L; + private static final long serialVersionUID = 6700987357397636019L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/VarStruct.java b/slice2java/ruby/test/Ice/optional/Test/VarStruct.java index 1747c400f220..7e705ba06b21 100644 --- a/slice2java/ruby/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/ruby/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912287766564929578L; + private static final long serialVersionUID = -1912283956826995249L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/WD.java b/slice2java/ruby/test/Ice/optional/Test/WD.java index bd5d1b53c7ae..2a902d21d9d1 100644 --- a/slice2java/ruby/test/Ice/optional/Test/WD.java +++ b/slice2java/ruby/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -988886312069775252L; + private static final long serialVersionUID = -6646636169309607840L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/C.java b/slice2java/ruby/test/Ice/scope/Test/C.java index c61bb00ab6fd..db3de23e8590 100644 --- a/slice2java/ruby/test/Ice/scope/Test/C.java +++ b/slice2java/ruby/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190248871441663672L; + private static final long serialVersionUID = -5190248001011467519L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/C1.java b/slice2java/ruby/test/Ice/scope/Test/C1.java index d8d7f64c915d..98d5ffdb0a69 100644 --- a/slice2java/ruby/test/Ice/scope/Test/C1.java +++ b/slice2java/ruby/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893234293276515464L; + private static final long serialVersionUID = 8893228298424953917L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/C2.java b/slice2java/ruby/test/Ice/scope/Test/C2.java index 9dd904b01a9b..e6e3c9f02779 100644 --- a/slice2java/ruby/test/Ice/scope/Test/C2.java +++ b/slice2java/ruby/test/Ice/scope/Test/C2.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2974001123425101514L; + private static final long serialVersionUID = 7608722464917213486L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/Inner/C.java b/slice2java/ruby/test/Ice/scope/Test/Inner/C.java index f121b3664759..bd82fe3ae967 100644 --- a/slice2java/ruby/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/ruby/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615627248919015327L; + private static final long serialVersionUID = 4615623651062658556L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/C.java index f1adf6e498a9..ae2804bf9235 100644 --- a/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672592937471729857L; + private static final long serialVersionUID = 672584049602811345L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/S.java index 12ba864c05de..75c78a90521a 100644 --- a/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654438175971541409L; + private static final long serialVersionUID = 8654444336282355622L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/Inner/S.java b/slice2java/ruby/test/Ice/scope/Test/Inner/S.java index f0e8eea6c89d..a3205fd7e972 100644 --- a/slice2java/ruby/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/ruby/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694620002689102829L; + private static final long serialVersionUID = 3694609962802583530L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/S.java b/slice2java/ruby/test/Ice/scope/Test/S.java index 2f3e0c1821c7..153d7345880a 100644 --- a/slice2java/ruby/test/Ice/scope/Test/S.java +++ b/slice2java/ruby/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159701529833483475L; + private static final long serialVersionUID = 2159708842142093780L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/S1.java b/slice2java/ruby/test/Ice/scope/Test/S1.java index 4450e529cc02..7b240f944831 100644 --- a/slice2java/ruby/test/Ice/scope/Test/S1.java +++ b/slice2java/ruby/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241678786769706417L; + private static final long serialVersionUID = 1241668576428247172L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/S2.java b/slice2java/ruby/test/Ice/scope/Test/S2.java index a4414463e2f4..01f9fad75aa4 100644 --- a/slice2java/ruby/test/Ice/scope/Test/S2.java +++ b/slice2java/ruby/test/Ice/scope/Test/S2.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = 8880501953859054031L; + private static final long serialVersionUID = -341168939617066409L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java index 903c99a7e3aa..667c1a01f403 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477021393582422042L; + private static final long serialVersionUID = -477016946841316329L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java index 10316e0b2d5e..4df1ccec2205 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485211376997624832L; + private static final long serialVersionUID = 3485210213302171825L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 2c39f4e5c8f0..0eb5d00d4973 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717374824467732465L; + private static final long serialVersionUID = 1717371225062716224L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index c2546ac2369f..2a8642321620 100644 --- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384920921450000664L; + private static final long serialVersionUID = -7384917151405619303L; } diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/B.java b/slice2java/ruby/test/Ice/slicing/objects/Test/B.java index 71d6b19d314f..9c5b91618121 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7204021703140010806L; + private static final long serialVersionUID = -79612084955617073L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/ruby/test/Ice/slicing/objects/Test/BaseException.java index 0a55ff1c3cf6..5e11afec86fc 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 1554119425914843258L; + private static final long serialVersionUID = 7862381866414651779L; } diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java index 0cc2ad07868d..f59f256b0c06 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6396997063161952922L; + private static final long serialVersionUID = -6396997059365248203L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPDerived.java index bfd493c2ab9c..f3bc6d0634f3 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066880338823445795L; + private static final long serialVersionUID = -9066883146470602187L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/D1.java b/slice2java/ruby/test/Ice/slicing/objects/Test/D1.java index c47cd5ae17f8..b17d66b03786 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7216901100612529205L; + private static final long serialVersionUID = -8686637240355701172L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/D3.java b/slice2java/ruby/test/Ice/slicing/objects/Test/D3.java index d949e7f00f88..2ea4c66bb059 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2583849871483454275L; + private static final long serialVersionUID = -29389794131615000L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/ruby/test/Ice/slicing/objects/Test/DerivedException.java index ffc7156aee9f..d0ef3c53d837 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2494557731291059502L; + private static final long serialVersionUID = -6276251572434634158L; } diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java b/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java index fe816224b156..0feee2ddbf45 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655923582111498755L; + private static final long serialVersionUID = -7655926393516604670L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/ruby/test/Ice/slicing/objects/Test/Hidden.java index ab1a60c75ef2..233e901d9ecb 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271128274284283826L; + private static final long serialVersionUID = -2271125466630113831L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/PBase.java b/slice2java/ruby/test/Ice/slicing/objects/Test/PBase.java index d15a04ac3fcd..d6c54db1582d 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481713447476359484L; + private static final long serialVersionUID = 481705344810967578L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived.java index 8823cdf3f24b..ded66b87c306 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426887545457305306L; + private static final long serialVersionUID = -4426887541656000395L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived2.java index 759b59438424..ac2c3373925d 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850544550900228626L; + private static final long serialVersionUID = 850544547122603775L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived3.java index 72e3dbac30ac..6d896d33b4ba 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328899451318452249L; + private static final long serialVersionUID = -4328899450106911434L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/ruby/test/Ice/slicing/objects/Test/PCUnknown.java index d25152299c2b..acaa870d352a 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081817913080399445L; + private static final long serialVersionUID = -5081817916885620717L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/PDerived.java index e0065283232a..4e09abe68158 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643085665316007386L; + private static final long serialVersionUID = 643077562650805618L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/PNode.java b/slice2java/ruby/test/Ice/slicing/objects/Test/PNode.java index 045183a2b6d1..2c41f4d1e874 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438014042879055822L; + private static final long serialVersionUID = -2438005940218257322L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/ruby/test/Ice/slicing/objects/Test/Preserved.java index 5251db09a66a..9ab427360260 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651529159152138560L; + private static final long serialVersionUID = 3651531966798800802L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/SBSKnownDerived.java index 20260967f5ab..65f458f3409b 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804382779594304741L; + private static final long serialVersionUID = 8804374676919913351L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/SBase.java b/slice2java/ruby/test/Ice/slicing/objects/Test/SBase.java index c24417444cc1..5f854727db64 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353761943043076205L; + private static final long serialVersionUID = -5353764750690156751L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/SS1.java b/slice2java/ruby/test/Ice/slicing/objects/Test/SS1.java index aa2ed1deada2..c0192fd1b62a 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522139712957513402L; + private static final long serialVersionUID = -6522131610296643168L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/SS2.java b/slice2java/ruby/test/Ice/slicing/objects/Test/SS2.java index 2abd2a5ce083..e23d29f69141 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620288131461274309L; + private static final long serialVersionUID = 7620290939112754275L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/SS3.java b/slice2java/ruby/test/Ice/slicing/objects/Test/SS3.java index af6ced28b46d..1ce9ed0f39c5 100644 --- a/slice2java/ruby/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = -6422309346030245345L; + private static final long serialVersionUID = 8043449728579142058L; } diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/and.java b/slice2java/ruby/test/Slice/escape/BEGIN/and.java index 61987304bf3c..8b01583a729a 100644 --- a/slice2java/ruby/test/Slice/escape/BEGIN/and.java +++ b/slice2java/ruby/test/Slice/escape/BEGIN/and.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final and _nullMarshalValue = new and(); /** @hidden */ - private static final long serialVersionUID = 1440109279673250921L; + private static final long serialVersionUID = 1440101739024277213L; } diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/display.java b/slice2java/ruby/test/Slice/escape/BEGIN/display.java index 870322e9d802..5ba9842553eb 100644 --- a/slice2java/ruby/test/Slice/escape/BEGIN/display.java +++ b/slice2java/ruby/test/Slice/escape/BEGIN/display.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8529410910884410632L; + private static final long serialVersionUID = -921519896344658168L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/next.java b/slice2java/ruby/test/Slice/escape/BEGIN/next.java index 1a78b4d43784..78170917e7ca 100644 --- a/slice2java/ruby/test/Slice/escape/BEGIN/next.java +++ b/slice2java/ruby/test/Slice/escape/BEGIN/next.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3375550793356518846L; + private static final long serialVersionUID = 3375553044304628938L; } diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/nil.java b/slice2java/ruby/test/Slice/escape/BEGIN/nil.java index 2819e2a450f4..17091465295d 100644 --- a/slice2java/ruby/test/Slice/escape/BEGIN/nil.java +++ b/slice2java/ruby/test/Slice/escape/BEGIN/nil.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 647067697770908143L; + private static final long serialVersionUID = 8085786169424243247L; } diff --git a/slice2java/ruby/test/Slice/escape/Clash/Cls.java b/slice2java/ruby/test/Slice/escape/Clash/Cls.java index bf37a690f617..60bc6fb71a57 100644 --- a/slice2java/ruby/test/Slice/escape/Clash/Cls.java +++ b/slice2java/ruby/test/Slice/escape/Clash/Cls.java @@ -164,7 +164,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8086582977829248806L; + private static final long serialVersionUID = -7459031322877904517L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/escape/Clash/Ex.java b/slice2java/ruby/test/Slice/escape/Clash/Ex.java index 51c6259238dc..278e79b8939d 100644 --- a/slice2java/ruby/test/Slice/escape/Clash/Ex.java +++ b/slice2java/ruby/test/Slice/escape/Clash/Ex.java @@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3280564116719675489L; + private static final long serialVersionUID = -1210775175356382570L; } diff --git a/slice2java/ruby/test/Slice/escape/Clash/St.java b/slice2java/ruby/test/Slice/escape/Clash/St.java index 5b930f3988e5..9c83c3ce5a41 100644 --- a/slice2java/ruby/test/Slice/escape/Clash/St.java +++ b/slice2java/ruby/test/Slice/escape/Clash/St.java @@ -187,5 +187,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - private static final long serialVersionUID = 2580592038233616796L; + private static final long serialVersionUID = 8165924803680303750L; } diff --git a/slice2java/ruby/test/Slice/macros/Test/Default.java b/slice2java/ruby/test/Slice/macros/Test/Default.java index 0c87f4a0905a..6a9fd232cf52 100644 --- a/slice2java/ruby/test/Slice/macros/Test/Default.java +++ b/slice2java/ruby/test/Slice/macros/Test/Default.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1893984549464134690L; + private static final long serialVersionUID = -2954202298992707458L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/macros/Test/NoDefault.java b/slice2java/ruby/test/Slice/macros/Test/NoDefault.java index 869ee52b36d2..be98d5d8e3c3 100644 --- a/slice2java/ruby/test/Slice/macros/Test/NoDefault.java +++ b/slice2java/ruby/test/Slice/macros/Test/NoDefault.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6727159718143537985L; + private static final long serialVersionUID = -7906755213365745121L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/structure/Test/C.java b/slice2java/ruby/test/Slice/structure/Test/C.java index 3580f944d0c7..3e39ac9cd3f4 100644 --- a/slice2java/ruby/test/Slice/structure/Test/C.java +++ b/slice2java/ruby/test/Slice/structure/Test/C.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3172275614514874748L; + private static final long serialVersionUID = -3172273930284092702L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/structure/Test/S1.java b/slice2java/ruby/test/Slice/structure/Test/S1.java index 5e2333986a42..ab3670b6db43 100644 --- a/slice2java/ruby/test/Slice/structure/Test/S1.java +++ b/slice2java/ruby/test/Slice/structure/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = -5542862565016391904L; + private static final long serialVersionUID = -5542856066505978490L; } diff --git a/slice2java/ruby/test/Slice/structure/Test/S2.java b/slice2java/ruby/test/Slice/structure/Test/S2.java index 6cbe388f65c2..f0be0e1bfbdf 100644 --- a/slice2java/ruby/test/Slice/structure/Test/S2.java +++ b/slice2java/ruby/test/Slice/structure/Test/S2.java @@ -276,5 +276,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = -3603664752951840358L; + private static final long serialVersionUID = -3527588377538369156L; } diff --git a/slice2java/scripts/Test/Common/Config.java b/slice2java/scripts/Test/Common/Config.java index 44cdc182526a..d4fe1cc7df8f 100644 --- a/slice2java/scripts/Test/Common/Config.java +++ b/slice2java/scripts/Test/Common/Config.java @@ -493,7 +493,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -617235740469107650L; + private static final long serialVersionUID = -8901133866759496170L; /** @hidden */ @Override diff --git a/slice2java/scripts/Test/Common/OptionOverrides.java b/slice2java/scripts/Test/Common/OptionOverrides.java index 8f2b52e8023d..8421601d4883 100644 --- a/slice2java/scripts/Test/Common/OptionOverrides.java +++ b/slice2java/scripts/Test/Common/OptionOverrides.java @@ -402,7 +402,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4641594524520177152L; + private static final long serialVersionUID = -5763304005608651766L; /** @hidden */ @Override diff --git a/slice2java/scripts/Test/Common/ProcessFailedException.java b/slice2java/scripts/Test/Common/ProcessFailedException.java index 7f506d4cc714..325cddd24b1b 100644 --- a/slice2java/scripts/Test/Common/ProcessFailedException.java +++ b/slice2java/scripts/Test/Common/ProcessFailedException.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5103738052279745244L; + private static final long serialVersionUID = 5103744206039827412L; } diff --git a/slice2java/scripts/Test/Common/TestCaseFailedException.java b/slice2java/scripts/Test/Common/TestCaseFailedException.java index ca8d67af9336..1a4b5c0019ae 100644 --- a/slice2java/scripts/Test/Common/TestCaseFailedException.java +++ b/slice2java/scripts/Test/Common/TestCaseFailedException.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7577600108699485390L; + private static final long serialVersionUID = 7577593869527078214L; } diff --git a/slice2java/scripts/Test/Common/TestCaseNotExistException.java b/slice2java/scripts/Test/Common/TestCaseNotExistException.java index 6cb9099492b0..dfdd33d8a376 100644 --- a/slice2java/scripts/Test/Common/TestCaseNotExistException.java +++ b/slice2java/scripts/Test/Common/TestCaseNotExistException.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8656780515761884336L; + private static final long serialVersionUID = -8656774361973628584L; } diff --git a/slice2java/slice/DataStorm/DataStorm/SampleEvent.java b/slice2java/slice/DataStorm/DataStorm/SampleEvent.java new file mode 100644 index 000000000000..9100c63f2328 --- /dev/null +++ b/slice2java/slice/DataStorm/DataStorm/SampleEvent.java @@ -0,0 +1,133 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Sample.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStorm; + +/** + * The sample event. + * + * The sample event matches the operation used by the DataWriter to update + * the data element. It also provides information on what to expect from + * the sample. A sample with the Add or Update event always provide a value + * while a sample with the Remove type doesn't. + **/ +public enum SampleEvent +{ + /** + * The element has been added. + **/ + Add(0), + /** + * The element has been updated. + **/ + Update(1), + /** + * The element has been partially updated. + **/ + PartialUpdate(2), + /** + * The element has been removed. + **/ + Remove(3); + + public int value() + { + return _value; + } + + public static SampleEvent valueOf(int v) + { + switch(v) + { + case 0: + return Add; + case 1: + return Update; + case 2: + return PartialUpdate; + case 3: + return Remove; + } + return null; + } + + private SampleEvent(int v) + { + _value = v; + } + + public void ice_write(com.zeroc.Ice.OutputStream ostr) + { + ostr.writeEnum(_value, 3); + } + + public static void ice_write(com.zeroc.Ice.OutputStream ostr, SampleEvent v) + { + if(v == null) + { + ostr.writeEnum(DataStorm.SampleEvent.Add.value(), 3); + } + else + { + ostr.writeEnum(v.value(), 3); + } + } + + public static SampleEvent ice_read(com.zeroc.Ice.InputStream istr) + { + int v = istr.readEnum(3); + return validate(v); + } + + public static void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + ice_write(ostr, tag, v.get()); + } + } + + public static void ice_write(com.zeroc.Ice.OutputStream ostr, int tag, SampleEvent v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.Size)) + { + ice_write(ostr, v); + } + } + + public static java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.Size)) + { + return java.util.Optional.of(ice_read(istr)); + } + else + { + return java.util.Optional.empty(); + } + } + + private static SampleEvent validate(int v) + { + final SampleEvent e = valueOf(v); + if(e == null) + { + throw new com.zeroc.Ice.MarshalException("enumerator value " + v + " is out of range"); + } + return e; + } + + private final int _value; +} diff --git a/slice2java/slice/DataStorm/DataStorm/SampleEventSeqHelper.java b/slice2java/slice/DataStorm/DataStorm/SampleEventSeqHelper.java new file mode 100644 index 000000000000..ffe7deba2aad --- /dev/null +++ b/slice2java/slice/DataStorm/DataStorm/SampleEventSeqHelper.java @@ -0,0 +1,83 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Sample.ice' +// +// Warning: do not edit this file. +// +// +// + +package DataStorm; + +/** + * Helper class for marshaling/unmarshaling SampleEventSeq. + **/ +public final class SampleEventSeqHelper +{ + public static void write(com.zeroc.Ice.OutputStream ostr, SampleEvent[] v) + { + if(v == null) + { + ostr.writeSize(0); + } + else + { + ostr.writeSize(v.length); + for(int i0 = 0; i0 < v.length; i0++) + { + SampleEvent.ice_write(ostr, v[i0]); + } + } + } + + public static SampleEvent[] read(com.zeroc.Ice.InputStream istr) + { + final SampleEvent[] v; + final int len0 = istr.readAndCheckSeqSize(1); + v = new SampleEvent[len0]; + for(int i0 = 0; i0 < len0; i0++) + { + v[i0] = SampleEvent.ice_read(istr); + } + return v; + } + + public static void write(com.zeroc.Ice.OutputStream ostr, int tag, java.util.Optional v) + { + if(v != null && v.isPresent()) + { + write(ostr, tag, v.get()); + } + } + + public static void write(com.zeroc.Ice.OutputStream ostr, int tag, SampleEvent[] v) + { + if(ostr.writeOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + int pos = ostr.startSize(); + SampleEventSeqHelper.write(ostr, v); + ostr.endSize(pos); + } + } + + public static java.util.Optional read(com.zeroc.Ice.InputStream istr, int tag) + { + if(istr.readOptional(tag, com.zeroc.Ice.OptionalFormat.FSize)) + { + istr.skip(4); + SampleEvent[] v; + v = SampleEventSeqHelper.read(istr); + return java.util.Optional.of(v); + } + else + { + return java.util.Optional.empty(); + } + } +} diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java index 03fc6644e114..134cd54dc2bc 100644 --- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java +++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 8990432093981914893L; + private static final long serialVersionUID = 8990436763881793581L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java index 08cfda62d0b6..e869905930f1 100644 --- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java +++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8982736213689862417L; + private static final long serialVersionUID = 7961631737952136929L; /** @hidden */ @Override diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java index be7123ee0875..b2de4a1596c0 100644 --- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java +++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -5089371766356937942L; + private static final long serialVersionUID = -5089374598197162286L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java index caeb008f7ab6..5d1271177567 100644 --- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java +++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java @@ -224,5 +224,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final SSLInfo _nullMarshalValue = new SSLInfo(); /** @hidden */ - private static final long serialVersionUID = -6016445406954596122L; + private static final long serialVersionUID = 7001520423322517798L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java index 0d2a14221992..b5f1fadb50e6 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java @@ -151,5 +151,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputSt private static final EncodingVersion _nullMarshalValue = new EncodingVersion(); /** @hidden */ - private static final long serialVersionUID = -2615699648703110095L; + private static final long serialVersionUID = -8971596553002401327L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java index 374306a53d15..6c6ace53c805 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java @@ -64,7 +64,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3119628604960629786L; + private static final long serialVersionUID = -134655395887100454L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ConnectionMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ConnectionMetrics.java index fe11655bf5d3..171b82ace24d 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ConnectionMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ConnectionMetrics.java @@ -61,7 +61,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2005449614446788297L; + private static final long serialVersionUID = -5944309548991248905L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/DispatchMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/DispatchMetrics.java index 9b7d1623515f..50aac103724b 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/DispatchMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/DispatchMetrics.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5276983564778783837L; + private static final long serialVersionUID = -8071818491749993129L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/InvocationMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/InvocationMetrics.java index 2b9dea09c208..27d58ff2f4d1 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/InvocationMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/InvocationMetrics.java @@ -77,7 +77,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7480038786314252783L; + private static final long serialVersionUID = 2721110861574026223L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/Metrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/Metrics.java index 4a480cd3aad3..3c644ff88a02 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/Metrics.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/Metrics.java @@ -83,7 +83,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6499248095876095141L; + private static final long serialVersionUID = -2976018450709567295L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/MetricsFailures.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/MetricsFailures.java index 896d46182927..758d02753f67 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/MetricsFailures.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/MetricsFailures.java @@ -165,5 +165,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputSt private static final MetricsFailures _nullMarshalValue = new MetricsFailures(); /** @hidden */ - private static final long serialVersionUID = -1818857373862375461L; + private static final long serialVersionUID = 8100687937957568756L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java index 3ba97cbb449e..46d8577f2cff 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java @@ -69,7 +69,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4813243850033735717L; + private static final long serialVersionUID = -6536843615988903087L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/Identity.java b/slice2java/slice/Ice/com/zeroc/Ice/Identity.java index a5d4c3e44ab7..0c86b85db4dc 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/Identity.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/Identity.java @@ -171,5 +171,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final Identity _nullMarshalValue = new Identity(); /** @hidden */ - private static final long serialVersionUID = 2543305410113257189L; + private static final long serialVersionUID = -8581183063023599899L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java b/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java index 96e502a33e61..de4dd0ece2ef 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java @@ -197,5 +197,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LogMessage _nullMarshalValue = new LogMessage(); /** @hidden */ - private static final long serialVersionUID = 4151415132865895354L; + private static final long serialVersionUID = 8998500365572196855L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java index 53b8c918aa91..a35041413634 100644 --- a/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java +++ b/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java @@ -151,5 +151,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputSt private static final ProtocolVersion _nullMarshalValue = new ProtocolVersion(); /** @hidden */ - private static final long serialVersionUID = -6386775977725080924L; + private static final long serialVersionUID = 6259542177946054788L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java index ce0be7026461..8a010e4462a1 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5447244251457188361L; + private static final long serialVersionUID = 5447244452922091959L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java index 66f1e441903d..04353aabdc4b 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java @@ -278,5 +278,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Input private static final AdapterDescriptor _nullMarshalValue = new AdapterDescriptor(); /** @hidden */ - private static final long serialVersionUID = -5242618225410549444L; + private static final long serialVersionUID = 6828693425414715062L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java index 04143d4847ad..d8960302fe9e 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java @@ -165,5 +165,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Inpu private static final AdapterDynamicInfo _nullMarshalValue = new AdapterDynamicInfo(); /** @hidden */ - private static final long serialVersionUID = -5512489564861546581L; + private static final long serialVersionUID = -3786470159462312024L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java index f5b699539491..431441d04a7a 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java @@ -182,5 +182,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final AdapterInfo _nullMarshalValue = new AdapterInfo(); /** @hidden */ - private static final long serialVersionUID = 3040006583226405646L; + private static final long serialVersionUID = 8777826886633355484L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java index f20f4ed9e054..5daa0cac8762 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -243190801692343551L; + private static final long serialVersionUID = -243190600208466241L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java index 1440e2c74d77..c24847a91021 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java @@ -55,7 +55,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7644446648153049539L; + private static final long serialVersionUID = 7644438546706324425L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java index a1f000c224ee..d1a7d13ec717 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4699852325860486857L; + private static final long serialVersionUID = 4699852527320790519L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java index f22a091c2416..8530195c2187 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java @@ -288,5 +288,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.I private static final ApplicationDescriptor _nullMarshalValue = new ApplicationDescriptor(); /** @hidden */ - private static final long serialVersionUID = -3820887659361280366L; + private static final long serialVersionUID = 7496482158172516009L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java index a6cab5290343..28af3341be6c 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java @@ -239,5 +239,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputSt private static final ApplicationInfo _nullMarshalValue = new ApplicationInfo(); /** @hidden */ - private static final long serialVersionUID = -1848693051337276476L; + private static final long serialVersionUID = -451875875822969273L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java index 7c4f5c8fe646..0e8d681ba153 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7270577938652272762L; + private static final long serialVersionUID = -7270578139962000136L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java index 4096665d37c8..d6fa305b9b70 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java @@ -364,5 +364,5 @@ static public java.util.Optional ice_read(com.zeroc private static final ApplicationUpdateDescriptor _nullMarshalValue = new ApplicationUpdateDescriptor(); /** @hidden */ - private static final long serialVersionUID = 3608033840434211695L; + private static final long serialVersionUID = -1083973642628844692L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java index e6908bb757f8..2122efd6e40a 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java @@ -192,5 +192,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.I private static final ApplicationUpdateInfo _nullMarshalValue = new ApplicationUpdateInfo(); /** @hidden */ - private static final long serialVersionUID = -4984456087897239567L; + private static final long serialVersionUID = 312248395937586552L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java index 0ae4206bcf80..7367194433c2 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4463357202601399392L; + private static final long serialVersionUID = 4463357321277298526L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java index 443edfb3bf8e..f68180b3e3d7 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java @@ -52,7 +52,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1971528341554895145L; + private static final long serialVersionUID = -1971530825202568351L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java index 2bedf8df89a5..54e9c4683383 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java @@ -52,7 +52,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2108813541163374492L; + private static final long serialVersionUID = -2108805434694199826L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java index 3d201e0c83ff..32fb13b3762e 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java @@ -71,7 +71,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8903793433819243735L; + private static final long serialVersionUID = -3402206474872362641L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java index 22488651b470..82eb14504da6 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -6801509005246591232L; + private static final long serialVersionUID = -6801508891428368002L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java index 03d43aa4d2c8..8fa2831b38b5 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java @@ -185,5 +185,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice. private static final DistributionDescriptor _nullMarshalValue = new DistributionDescriptor(); /** @hidden */ - private static final long serialVersionUID = 3791090638291846328L; + private static final long serialVersionUID = -1863328080460497707L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java index 012af10e02c0..0bce9bd40b73 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java @@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8985150234578879053L; + private static final long serialVersionUID = -8985150363714049075L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java index 869966866422..a4b0b1f49c5f 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2337759471831519602L; + private static final long serialVersionUID = 2337756988291793605L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java index b2bd8b1f420e..7f27ea5a7b95 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java @@ -52,7 +52,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6003732202212001866L; + private static final long serialVersionUID = -6003729711049049924L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java index 0553808b217c..efeeb35042d8 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final LoadInfo _nullMarshalValue = new LoadInfo(); /** @hidden */ - private static final long serialVersionUID = 3783398277560787343L; + private static final long serialVersionUID = 6561169258089781015L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java index 635bf8c1959e..1709e85a17e8 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java @@ -239,5 +239,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final NodeDescriptor _nullMarshalValue = new NodeDescriptor(); /** @hidden */ - private static final long serialVersionUID = -6584477989095597643L; + private static final long serialVersionUID = -1599318341360713593L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java index 14ead213186c..719dbc311088 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java @@ -181,5 +181,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputSt private static final NodeDynamicInfo _nullMarshalValue = new NodeDynamicInfo(); /** @hidden */ - private static final long serialVersionUID = 7580661110418929126L; + private static final long serialVersionUID = -2539809885700175920L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java index adf394c12ee8..42232eefb6fd 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java @@ -265,5 +265,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final NodeInfo _nullMarshalValue = new NodeInfo(); /** @hidden */ - private static final long serialVersionUID = -7699200831279752432L; + private static final long serialVersionUID = 3461416245048525421L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java index a74acdb79f25..0b535c475122 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -5774525444600525604L; + private static final long serialVersionUID = -5774525320473607774L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java index 305498acd930..499d22f64d61 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java @@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -5998446612172447196L; + private static final long serialVersionUID = -7979034411556403612L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java index d5599d857687..794b8d70eadf 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java @@ -293,5 +293,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.In private static final NodeUpdateDescriptor _nullMarshalValue = new NodeUpdateDescriptor(); /** @hidden */ - private static final long serialVersionUID = -402487701840066605L; + private static final long serialVersionUID = 1634507730675933484L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java index d630cf7022e9..6ad8db1a3d6b 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java @@ -184,5 +184,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputS private static final ObjectDescriptor _nullMarshalValue = new ObjectDescriptor(); /** @hidden */ - private static final long serialVersionUID = 4437403305966873920L; + private static final long serialVersionUID = -3038765942445076154L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java index 1c6d5cc59b98..df08fe5be000 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 6991432003156956679L; + private static final long serialVersionUID = 6991431548570290803L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java index b9a23216c484..ba59e48a98ce 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java @@ -165,5 +165,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final ObjectInfo _nullMarshalValue = new ObjectInfo(); /** @hidden */ - private static final long serialVersionUID = -4448604631101037975L; + private static final long serialVersionUID = -2895754015212628022L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java index 9c7e29ead818..16f7afa5750a 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7672370210057155034L; + private static final long serialVersionUID = 7672370328719694830L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java index 15f9aa438c77..deb17b364456 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2733098057526226068L; + private static final long serialVersionUID = 2733097861075176992L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java index d99ad2cd4a28..aa1cab163dc3 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -5694239033533308129L; + private static final long serialVersionUID = -5694236606943049040L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java index 874b9b24d2f9..708721705ea7 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7526798490361895701L; + private static final long serialVersionUID = 7526798371553041579L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java index 756587697e3a..115582b09819 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java @@ -166,5 +166,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Inpu private static final PropertyDescriptor _nullMarshalValue = new PropertyDescriptor(); /** @hidden */ - private static final long serialVersionUID = 6040894937224139908L; + private static final long serialVersionUID = 6351396986008139972L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java index 4923cb860257..f6755ed1fae4 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java @@ -161,5 +161,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.I private static final PropertySetDescriptor _nullMarshalValue = new PropertySetDescriptor(); /** @hidden */ - private static final long serialVersionUID = 7933495803566746671L; + private static final long serialVersionUID = 8317140660491465912L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java index 192f958fa507..ace4cf9bb90d 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java @@ -166,5 +166,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final RegistryInfo _nullMarshalValue = new RegistryInfo(); /** @hidden */ - private static final long serialVersionUID = 2080678698503476071L; + private static final long serialVersionUID = -8128306962388555929L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java index e5d5fb82144f..a165a4d4ee5e 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 8544191962735036841L; + private static final long serialVersionUID = 8544191828423147479L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java index 1511c5470588..07a6bbd481b3 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java @@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 5214270438210580721L; + private static final long serialVersionUID = -8322043134817080783L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java index 4b4aae1325ba..e39a609f5eec 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java @@ -232,5 +232,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice. private static final ReplicaGroupDescriptor _nullMarshalValue = new ReplicaGroupDescriptor(); /** @hidden */ - private static final long serialVersionUID = 2050004888446872077L; + private static final long serialVersionUID = 823411965378783189L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java index a45c358ccd7d..aa55cb30ee5e 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java @@ -136,7 +136,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2779679235122448105L; + private static final long serialVersionUID = 1407731704599301985L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java index 97b0d0b8f190..7a594d747cd2 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java @@ -192,5 +192,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Input private static final ServerDynamicInfo _nullMarshalValue = new ServerDynamicInfo(); /** @hidden */ - private static final long serialVersionUID = -7660259594428610582L; + private static final long serialVersionUID = -2288756649500072522L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java index e488ed750e7c..19ca315c3cae 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java @@ -229,5 +229,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final ServerInfo _nullMarshalValue = new ServerInfo(); /** @hidden */ - private static final long serialVersionUID = 7416082164198260949L; + private static final long serialVersionUID = 2381473627535933428L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java index 7230951974b3..8a32c5ea781d 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java @@ -199,5 +199,5 @@ static public java.util.Optional ice_read(com.zeroc.Ic private static final ServerInstanceDescriptor _nullMarshalValue = new ServerInstanceDescriptor(); /** @hidden */ - private static final long serialVersionUID = -3887652473079290684L; + private static final long serialVersionUID = 2688619230017489376L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java index 70f9c27565df..1cab30f2beec 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2699422063459363469L; + private static final long serialVersionUID = -2699421861974133747L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java index b217a4b4cbf1..5322cfa79693 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java @@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4648418839108588793L; + private static final long serialVersionUID = 5883958290155494087L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java index 62d3b0b1cf96..48c5b247860b 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java @@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1764326771516258561L; + private static final long serialVersionUID = -4163382685001225921L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java index dfa3c83b48b8..ea0468b4c5dc 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java @@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 8734500554009128801L; + private static final long serialVersionUID = 6113707072650934433L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java index c98a8a5de146..ff463352cfeb 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java @@ -61,7 +61,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5271517193968807257L; + private static final long serialVersionUID = 8450627724824383513L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java index cf2810b8aabf..787f0b7816fa 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java @@ -198,5 +198,5 @@ static public java.util.Optional ice_read(com.zeroc.I private static final ServiceInstanceDescriptor _nullMarshalValue = new ServiceInstanceDescriptor(); /** @hidden */ - private static final long serialVersionUID = -4714791606819515851L; + private static final long serialVersionUID = 5639799686803420788L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java index 9edf67cd40e7..2cccf43238f3 100644 --- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java +++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java @@ -198,5 +198,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.Inpu private static final TemplateDescriptor _nullMarshalValue = new TemplateDescriptor(); /** @hidden */ - private static final long serialVersionUID = 2596282137082379702L; + private static final long serialVersionUID = 5368686544456206023L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java index 687fad50325f..91adc1244793 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7896656691880417939L; + private static final long serialVersionUID = 7896660400988752262L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java index 1a5ffa337df7..fcbc4ce92086 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4148952470679859512L; + private static final long serialVersionUID = 7153683031555305576L; /** @hidden */ @Override diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/TopicMetrics.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/TopicMetrics.java index b34a995d27f4..8cd574d938d6 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/TopicMetrics.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/TopicMetrics.java @@ -61,7 +61,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4415572165889315455L; + private static final long serialVersionUID = -9043999657952393215L; /** @hidden */ @Override diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java index 308d434d2fef..231c46ae79c2 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1090058365676664270L; + private static final long serialVersionUID = -1090057301501562841L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java index 965508d833a5..3caba96484c6 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 243158590040562138L; + private static final long serialVersionUID = 243154880940271055L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java index 2b43abe5b903..d08147804ea2 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java @@ -178,5 +178,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final LinkInfo _nullMarshalValue = new LinkInfo(); /** @hidden */ - private static final long serialVersionUID = 3944842554225741512L; + private static final long serialVersionUID = -3043137089482406938L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java index f62a6212bf3a..7e9692ff27bb 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8653878772410710538L; + private static final long serialVersionUID = -8653877708240200349L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java index 71b51b3ce976..3a9946eca928 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -6283747709572683945L; + private static final long serialVersionUID = -6283744000478140734L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java index a60ad876936b..8cc7a118b766 100644 --- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java +++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java @@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3979365657897821627L; + private static final long serialVersionUID = 3979364593721563566L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Base.java b/slice2java/swift/test/Ice/defaultValue/Test/Base.java index 0aa1e5f88c17..9ef00e67b387 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/Base.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/Base.java @@ -106,7 +106,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3722151627741277350L; + private static final long serialVersionUID = -8790262701857063976L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java index bb60cddfb732..2185ccc29e36 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java @@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7561895983726728622L; + private static final long serialVersionUID = -3376741836314758804L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Derived.java b/slice2java/swift/test/Ice/defaultValue/Test/Derived.java index 542c75ee131e..7508c595d57d 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/Derived.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/Derived.java @@ -68,7 +68,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1187389745393364875L; + private static final long serialVersionUID = 7553546275185398272L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java index 841c702b0d49..194ca635ea02 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java @@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 9048875081713511612L; + private static final long serialVersionUID = -2501718378470410313L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java index 68eb1b15b309..0e0cf2b352a5 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct1 _nullMarshalValue = new Struct1(); /** @hidden */ - private static final long serialVersionUID = 4786835840693416365L; + private static final long serialVersionUID = -7289484945378833352L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java index a460b44007e9..63d25cee5c99 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java @@ -370,5 +370,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct2 _nullMarshalValue = new Struct2(); /** @hidden */ - private static final long serialVersionUID = -1761399221638739442L; + private static final long serialVersionUID = 834197552087834137L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java index 9d640657571d..13ec76234a29 100644 --- a/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java +++ b/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java @@ -395,5 +395,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream ist private static final Struct3 _nullMarshalValue = new Struct3(); /** @hidden */ - private static final long serialVersionUID = 5273346058102830767L; + private static final long serialVersionUID = -1866503674013893446L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/A.java b/slice2java/swift/test/Ice/exceptions/Test/A.java index 9a18a1fc0c1d..1236e92f33d4 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/A.java +++ b/slice2java/swift/test/Ice/exceptions/Test/A.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 7823745123272134620L; + private static final long serialVersionUID = 7823742037848079530L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/B.java b/slice2java/swift/test/Ice/exceptions/Test/B.java index 3dd6658eda43..cfc4e66f05b1 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/B.java +++ b/slice2java/swift/test/Ice/exceptions/Test/B.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3861410610083778916L; + private static final long serialVersionUID = -3861419480980739094L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/C.java b/slice2java/swift/test/Ice/exceptions/Test/C.java index adc833edfdd4..126a01e8687a 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/C.java +++ b/slice2java/swift/test/Ice/exceptions/Test/C.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1080698814474919900L; + private static final long serialVersionUID = 1080695729050864810L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/D.java b/slice2java/swift/test/Ice/exceptions/Test/D.java index f337a27469e5..afdf9ce84efd 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/D.java +++ b/slice2java/swift/test/Ice/exceptions/Test/D.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4780381658018299292L; + private static final long serialVersionUID = 4780372787121339114L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/E.java b/slice2java/swift/test/Ice/exceptions/Test/E.java index c2a3b11b3100..052af1d0dab0 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/E.java +++ b/slice2java/swift/test/Ice/exceptions/Test/E.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1876968050079054829L; + private static final long serialVersionUID = -1876977946646753435L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/F.java b/slice2java/swift/test/Ice/exceptions/Test/F.java index 1b4920fcc2d8..ff0a0f12b5e3 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/F.java +++ b/slice2java/swift/test/Ice/exceptions/Test/F.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 733475429648035216L; + private static final long serialVersionUID = 733479160659972262L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java b/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java index 1feafbd67d14..a23e0f256a81 100644 --- a/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java +++ b/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java @@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4641413703232134584L; + private static final long serialVersionUID = -4641407559906603714L; } diff --git a/slice2java/swift/test/Ice/inheritance/Test/MC/A.java b/slice2java/swift/test/Ice/inheritance/Test/MC/A.java index f867090437ae..ccf80a7f2acd 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MC/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MC/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 954223348723157066L; + private static final long serialVersionUID = 954225453820546538L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MC/B.java b/slice2java/swift/test/Ice/inheritance/Test/MC/B.java index 7faa897ad821..965f9292f1db 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MC/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MC/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1339631024526527312L; + private static final long serialVersionUID = 1339629162234316016L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MC/C.java b/slice2java/swift/test/Ice/inheritance/Test/MC/C.java index 93a10f0a6aea..3fcf8db2327a 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MC/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MC/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2729314546608622638L; + private static final long serialVersionUID = -2729311119048032910L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MC/D.java b/slice2java/swift/test/Ice/inheritance/Test/MC/D.java index 180e502127e7..95234ac88c5c 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MC/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MC/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3435401155082252972L; + private static final long serialVersionUID = -3435403017374464268L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MD/A.java b/slice2java/swift/test/Ice/inheritance/Test/MD/A.java index c22998e70720..c929ce8b67c3 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MD/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MD/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -836179196967353395L; + private static final long serialVersionUID = -836177004059481555L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MD/B.java b/slice2java/swift/test/Ice/inheritance/Test/MD/B.java index 0b37d35fd7c8..58780ce6a120 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MD/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MD/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1132525607652351344L; + private static final long serialVersionUID = 1132523419749213840L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MD/C.java b/slice2java/swift/test/Ice/inheritance/Test/MD/C.java index 4009280b1bb8..7c1e9581b6ba 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MD/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MD/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6335557603636765710L; + private static final long serialVersionUID = -6335554501687102190L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MD/D.java b/slice2java/swift/test/Ice/inheritance/Test/MD/D.java index eed764a86ab8..28fbaa7c84cc 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MD/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MD/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4007407075574968716L; + private static final long serialVersionUID = -4007409263478106220L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/ME/A.java b/slice2java/swift/test/Ice/inheritance/Test/ME/A.java index 8b7d154d8244..ec70a5b6281d 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/ME/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/ME/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 991427761532537292L; + private static final long serialVersionUID = 991424576777125740L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/ME/B.java b/slice2java/swift/test/Ice/inheritance/Test/ME/B.java index 120cf0f8ca50..151d2929d0b0 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/ME/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/ME/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2880342212455081456L; + private static final long serialVersionUID = -2880338784590895952L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/ME/C.java b/slice2java/swift/test/Ice/inheritance/Test/ME/C.java index 6d1bf7e52b2d..885986359648 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/ME/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/ME/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8808270088662252654L; + private static final long serialVersionUID = -8808272281266668238L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/ME/D.java b/slice2java/swift/test/Ice/inheritance/Test/ME/D.java index 9c3a45b1864b..9aec0027da69 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/ME/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/ME/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -771861191506416364L; + private static final long serialVersionUID = -771857763642230860L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MF/A.java b/slice2java/swift/test/Ice/inheritance/Test/MF/A.java index bec18c223c89..6676ac5c430d 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MF/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MF/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6566362149662129231L; + private static final long serialVersionUID = 6566358722101399983L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MF/B.java b/slice2java/swift/test/Ice/inheritance/Test/MF/B.java index 38aeb2eff8c3..59d713568006 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MF/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MF/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6983796902312102192L; + private static final long serialVersionUID = 6983800334877566032L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MF/C.java b/slice2java/swift/test/Ice/inheritance/Test/MF/C.java index 92b7b9eaa8de..eaa09a4f7813 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MF/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MF/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1175216493019304526L; + private static final long serialVersionUID = -1175218680922441774L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MF/D.java b/slice2java/swift/test/Ice/inheritance/Test/MF/D.java index c8bb8135456d..6d604170b80a 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MF/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MF/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3279720993932194508L; + private static final long serialVersionUID = -3279717561366730668L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MG/A.java b/slice2java/swift/test/Ice/inheritance/Test/MG/A.java index 2ba513091362..06932a102668 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MG/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MG/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4359178061678641074L; + private static final long serialVersionUID = -4359175956581251602L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MG/B.java b/slice2java/swift/test/Ice/inheritance/Test/MG/B.java index f400f43dd19b..21cd221fe2ff 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MG/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MG/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5904687812077915344L; + private static final long serialVersionUID = 5904685949785704048L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MG/C.java b/slice2java/swift/test/Ice/inheritance/Test/MG/C.java index 67f2319c5380..51362b72545e 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MG/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MG/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1835742240942765394L; + private static final long serialVersionUID = 1835745668503355122L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MG/D.java b/slice2java/swift/test/Ice/inheritance/Test/MG/D.java index 31c84ba4ad0d..205d11a9dc19 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MG/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MG/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2252401808312570156L; + private static final long serialVersionUID = -2252403670604781452L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MH/A.java b/slice2java/swift/test/Ice/inheritance/Test/MH/A.java index bb55cba1e56b..3d8e42808b50 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MH/A.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MH/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1203537629612104255L; + private static final long serialVersionUID = -1203535436704232415L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MH/B.java b/slice2java/swift/test/Ice/inheritance/Test/MH/B.java index 49692ccf0bd1..36aa69a15b22 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MH/B.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MH/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7537766423934933776L; + private static final long serialVersionUID = -7537768611838071280L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MH/C.java b/slice2java/swift/test/Ice/inheritance/Test/MH/C.java index 867aff0cd61c..dfd472a3dabd 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MH/C.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MH/C.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3440894438485500786L; + private static final long serialVersionUID = 3440897540435164306L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/inheritance/Test/MH/D.java b/slice2java/swift/test/Ice/inheritance/Test/MH/D.java index ac022362a460..7e3f518bbaf1 100644 --- a/slice2java/swift/test/Ice/inheritance/Test/MH/D.java +++ b/slice2java/swift/test/Ice/inheritance/Test/MH/D.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 9151102407329002996L; + private static final long serialVersionUID = 9151100219425865492L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/A.java b/slice2java/swift/test/Ice/objects/Test/A.java index ad04a0d3afa1..80405c6e3a6f 100644 --- a/slice2java/swift/test/Ice/objects/Test/A.java +++ b/slice2java/swift/test/Ice/objects/Test/A.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 912354462527177528L; + private static final long serialVersionUID = 2678438547804762133L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/A1.java b/slice2java/swift/test/Ice/objects/Test/A1.java index 4747c889f001..255313d91cc3 100644 --- a/slice2java/swift/test/Ice/objects/Test/A1.java +++ b/slice2java/swift/test/Ice/objects/Test/A1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5926745922963858529L; + private static final long serialVersionUID = -5926751996670761312L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/B.java b/slice2java/swift/test/Ice/objects/Test/B.java index 18e610deb81a..6162ce58d929 100644 --- a/slice2java/swift/test/Ice/objects/Test/B.java +++ b/slice2java/swift/test/Ice/objects/Test/B.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8890918288580136353L; + private static final long serialVersionUID = -8890917915357930162L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/B1.java b/slice2java/swift/test/Ice/objects/Test/B1.java index 3da4bbffd427..7372546a2044 100644 --- a/slice2java/swift/test/Ice/objects/Test/B1.java +++ b/slice2java/swift/test/Ice/objects/Test/B1.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1698734090458985468L; + private static final long serialVersionUID = 1363479331535164740L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Base.java b/slice2java/swift/test/Ice/objects/Test/Base.java index 5ef2c886a3b2..3499bf8fd19b 100644 --- a/slice2java/swift/test/Ice/objects/Test/Base.java +++ b/slice2java/swift/test/Ice/objects/Test/Base.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4110875155378524251L; + private static final long serialVersionUID = 5388307781201902740L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/BaseEx.java b/slice2java/swift/test/Ice/objects/Test/BaseEx.java index 9ed5216bc85e..98bb0bf35a33 100644 --- a/slice2java/swift/test/Ice/objects/Test/BaseEx.java +++ b/slice2java/swift/test/Ice/objects/Test/BaseEx.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3897763621745413197L; + private static final long serialVersionUID = 3897764325661194354L; } diff --git a/slice2java/swift/test/Ice/objects/Test/C.java b/slice2java/swift/test/Ice/objects/Test/C.java index 91d8667e7f3b..a3a10dca3aee 100644 --- a/slice2java/swift/test/Ice/objects/Test/C.java +++ b/slice2java/swift/test/Ice/objects/Test/C.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3780860264394527733L; + private static final long serialVersionUID = 281732736107568553L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/COneMember.java b/slice2java/swift/test/Ice/objects/Test/COneMember.java index d7dee71c56cc..9941eb0658a9 100644 --- a/slice2java/swift/test/Ice/objects/Test/COneMember.java +++ b/slice2java/swift/test/Ice/objects/Test/COneMember.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3050977139600636693L; + private static final long serialVersionUID = 3050971145978695524L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java b/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java index 7a30e70c9c69..d082c1c7428f 100644 --- a/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java +++ b/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4269216157833593637L; + private static final long serialVersionUID = -2802999292226614757L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/D.java b/slice2java/swift/test/Ice/objects/Test/D.java index 33ae435ac452..2d6e1a047c58 100644 --- a/slice2java/swift/test/Ice/objects/Test/D.java +++ b/slice2java/swift/test/Ice/objects/Test/D.java @@ -57,7 +57,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2126513979253767197L; + private static final long serialVersionUID = 6045924938554449087L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/D1.java b/slice2java/swift/test/Ice/objects/Test/D1.java index 19b554c43a54..6419fc6aa297 100644 --- a/slice2java/swift/test/Ice/objects/Test/D1.java +++ b/slice2java/swift/test/Ice/objects/Test/D1.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -39187652056856765L; + private static final long serialVersionUID = 5777312690767235843L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Derived.java b/slice2java/swift/test/Ice/objects/Test/Derived.java index a031c46da281..a6f99855b91e 100644 --- a/slice2java/swift/test/Ice/objects/Test/Derived.java +++ b/slice2java/swift/test/Ice/objects/Test/Derived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1587931790227134620L; + private static final long serialVersionUID = -1587923932936011360L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/E.java b/slice2java/swift/test/Ice/objects/Test/E.java index 92610bdd33f7..d888b9abe948 100644 --- a/slice2java/swift/test/Ice/objects/Test/E.java +++ b/slice2java/swift/test/Ice/objects/Test/E.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2466249629639797350L; + private static final long serialVersionUID = 8494496312693802632L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/EBase.java b/slice2java/swift/test/Ice/objects/Test/EBase.java index c8132eaeea42..a7900140c6c8 100644 --- a/slice2java/swift/test/Ice/objects/Test/EBase.java +++ b/slice2java/swift/test/Ice/objects/Test/EBase.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 1622079299713929166L; + private static final long serialVersionUID = -7836119802155934450L; } diff --git a/slice2java/swift/test/Ice/objects/Test/EDerived.java b/slice2java/swift/test/Ice/objects/Test/EDerived.java index 6acf4c51ae80..df7de2d85710 100644 --- a/slice2java/swift/test/Ice/objects/Test/EDerived.java +++ b/slice2java/swift/test/Ice/objects/Test/EDerived.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3053903892849213138L; + private static final long serialVersionUID = -4743689157936336110L; } diff --git a/slice2java/swift/test/Ice/objects/Test/EOneMember.java b/slice2java/swift/test/Ice/objects/Test/EOneMember.java index af459edb3a43..1306c5814b8c 100644 --- a/slice2java/swift/test/Ice/objects/Test/EOneMember.java +++ b/slice2java/swift/test/Ice/objects/Test/EOneMember.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6225292283088499174L; + private static final long serialVersionUID = -6225292901634418261L; } diff --git a/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java b/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java index 9078f03c1e4e..70fcfd3d303b 100644 --- a/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java +++ b/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java @@ -64,5 +64,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = -6790376170165209772L; + private static final long serialVersionUID = 7849770455123579540L; } diff --git a/slice2java/swift/test/Ice/objects/Test/F.java b/slice2java/swift/test/Ice/objects/Test/F.java index 680cc55021e1..a380ace65d39 100644 --- a/slice2java/swift/test/Ice/objects/Test/F.java +++ b/slice2java/swift/test/Ice/objects/Test/F.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3060912964517458129L; + private static final long serialVersionUID = -3977579649617888303L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/F1.java b/slice2java/swift/test/Ice/objects/Test/F1.java index 6eec024cb3fc..85bb9bea4826 100644 --- a/slice2java/swift/test/Ice/objects/Test/F1.java +++ b/slice2java/swift/test/Ice/objects/Test/F1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6192376257688285691L; + private static final long serialVersionUID = 6192366030473005641L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/F3.java b/slice2java/swift/test/Ice/objects/Test/F3.java index f653a4734da3..3a211ac4e6b7 100644 --- a/slice2java/swift/test/Ice/objects/Test/F3.java +++ b/slice2java/swift/test/Ice/objects/Test/F3.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -3589951355230318313L; + private static final long serialVersionUID = 2168609687729881416L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Inner/A.java b/slice2java/swift/test/Ice/objects/Test/Inner/A.java index 085182daba98..2ee61ca480f0 100644 --- a/slice2java/swift/test/Ice/objects/Test/Inner/A.java +++ b/slice2java/swift/test/Ice/objects/Test/Inner/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1425260915769110667L; + private static final long serialVersionUID = -1425265666944751132L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Inner/Ex.java b/slice2java/swift/test/Ice/objects/Test/Inner/Ex.java index 539c0ca839e3..ba5d92cdb280 100644 --- a/slice2java/swift/test/Ice/objects/Test/Inner/Ex.java +++ b/slice2java/swift/test/Ice/objects/Test/Inner/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2337229075745064922L; + private static final long serialVersionUID = -2337233912354820583L; } diff --git a/slice2java/swift/test/Ice/objects/Test/Inner/Sub/A.java b/slice2java/swift/test/Ice/objects/Test/Inner/Sub/A.java index de9fffb1ee4e..b751a6b7854e 100644 --- a/slice2java/swift/test/Ice/objects/Test/Inner/Sub/A.java +++ b/slice2java/swift/test/Ice/objects/Test/Inner/Sub/A.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1298679475081888681L; + private static final long serialVersionUID = -1298684226496222827L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/swift/test/Ice/objects/Test/Inner/Sub/Ex.java index 0c78dc309b11..8c18f55709e1 100644 --- a/slice2java/swift/test/Ice/objects/Test/Inner/Sub/Ex.java +++ b/slice2java/swift/test/Ice/objects/Test/Inner/Sub/Ex.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1842238228550488642L; + private static final long serialVersionUID = 1842233557391082813L; } diff --git a/slice2java/swift/test/Ice/objects/Test/K.java b/slice2java/swift/test/Ice/objects/Test/K.java index b44082ae26fd..527aae2a9fbf 100644 --- a/slice2java/swift/test/Ice/objects/Test/K.java +++ b/slice2java/swift/test/Ice/objects/Test/K.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4645161878808109718L; + private static final long serialVersionUID = 4645167787427526435L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/L.java b/slice2java/swift/test/Ice/objects/Test/L.java index f7bc37868174..321f98412bb6 100644 --- a/slice2java/swift/test/Ice/objects/Test/L.java +++ b/slice2java/swift/test/Ice/objects/Test/L.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6629739409599239892L; + private static final long serialVersionUID = 6629744161004891691L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/M.java b/slice2java/swift/test/Ice/objects/Test/M.java index 3f1e701ad1ad..948e9da5e3ce 100644 --- a/slice2java/swift/test/Ice/objects/Test/M.java +++ b/slice2java/swift/test/Ice/objects/Test/M.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8088097532557123445L; + private static final long serialVersionUID = -8088097986011240195L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Recursive.java b/slice2java/swift/test/Ice/objects/Test/Recursive.java index 911f536e5db6..ae4e10bfd29b 100644 --- a/slice2java/swift/test/Ice/objects/Test/Recursive.java +++ b/slice2java/swift/test/Ice/objects/Test/Recursive.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3617877963906935996L; + private static final long serialVersionUID = 3617883872522037066L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/S.java b/slice2java/swift/test/Ice/objects/Test/S.java index 26ad1016e7dd..382c755b12da 100644 --- a/slice2java/swift/test/Ice/objects/Test/S.java +++ b/slice2java/swift/test/Ice/objects/Test/S.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 481772058201020519L; + private static final long serialVersionUID = 481772596680951704L; } diff --git a/slice2java/swift/test/Ice/objects/Test/SOneMember.java b/slice2java/swift/test/Ice/objects/Test/SOneMember.java index 839c7f321121..9b0b8cbb7749 100644 --- a/slice2java/swift/test/Ice/objects/Test/SOneMember.java +++ b/slice2java/swift/test/Ice/objects/Test/SOneMember.java @@ -142,5 +142,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SOneMember _nullMarshalValue = new SOneMember(); /** @hidden */ - private static final long serialVersionUID = 6227753053891946380L; + private static final long serialVersionUID = 6227753923129705661L; } diff --git a/slice2java/swift/test/Ice/objects/Test/STwoMembers.java b/slice2java/swift/test/Ice/objects/Test/STwoMembers.java index dced70ab3eba..f80406e37799 100644 --- a/slice2java/swift/test/Ice/objects/Test/STwoMembers.java +++ b/slice2java/swift/test/Ice/objects/Test/STwoMembers.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final STwoMembers _nullMarshalValue = new STwoMembers(); /** @hidden */ - private static final long serialVersionUID = 508060077482356674L; + private static final long serialVersionUID = 7391583161311470594L; } diff --git a/slice2java/swift/test/Ice/objects/Test/StructKey.java b/slice2java/swift/test/Ice/objects/Test/StructKey.java index aa857ef5d801..54f2a92a00b5 100644 --- a/slice2java/swift/test/Ice/objects/Test/StructKey.java +++ b/slice2java/swift/test/Ice/objects/Test/StructKey.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final StructKey _nullMarshalValue = new StructKey(); /** @hidden */ - private static final long serialVersionUID = -6124597867419686486L; + private static final long serialVersionUID = -2395926986554519868L; } diff --git a/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java b/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java index 41e62f3ab55e..07b7aca845e3 100644 --- a/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java +++ b/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final AnotherStruct _nullMarshalValue = new AnotherStruct(); /** @hidden */ - private static final long serialVersionUID = 2723843743846032210L; + private static final long serialVersionUID = 2723842798337817166L; } diff --git a/slice2java/swift/test/Ice/operations/Test/MyClass1.java b/slice2java/swift/test/Ice/operations/Test/MyClass1.java index d23b403bae14..f6e339f72418 100644 --- a/slice2java/swift/test/Ice/operations/Test/MyClass1.java +++ b/slice2java/swift/test/Ice/operations/Test/MyClass1.java @@ -53,7 +53,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3100226526347106634L; + private static final long serialVersionUID = 2640199569642347597L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct.java b/slice2java/swift/test/Ice/operations/Test/MyStruct.java index fc3c7d423657..4b35a53f66a0 100644 --- a/slice2java/swift/test/Ice/operations/Test/MyStruct.java +++ b/slice2java/swift/test/Ice/operations/Test/MyStruct.java @@ -148,5 +148,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream is private static final MyStruct _nullMarshalValue = new MyStruct(); /** @hidden */ - private static final long serialVersionUID = -1277398111786875395L; + private static final long serialVersionUID = -9148343699921833443L; } diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct1.java b/slice2java/swift/test/Ice/operations/Test/MyStruct1.java index 93600708d838..0462f56f64d6 100644 --- a/slice2java/swift/test/Ice/operations/Test/MyStruct1.java +++ b/slice2java/swift/test/Ice/operations/Test/MyStruct1.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final MyStruct1 _nullMarshalValue = new MyStruct1(); /** @hidden */ - private static final long serialVersionUID = 3860236727474427907L; + private static final long serialVersionUID = 7208516654919631652L; } diff --git a/slice2java/swift/test/Ice/operations/Test/Structure.java b/slice2java/swift/test/Ice/operations/Test/Structure.java index 24a7525d52a6..356350ee9bfd 100644 --- a/slice2java/swift/test/Ice/operations/Test/Structure.java +++ b/slice2java/swift/test/Ice/operations/Test/Structure.java @@ -170,5 +170,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final Structure _nullMarshalValue = new Structure(); /** @hidden */ - private static final long serialVersionUID = -6716113849720658789L; + private static final long serialVersionUID = 524230493340535962L; } diff --git a/slice2java/swift/test/Ice/optional/Test/A.java b/slice2java/swift/test/Ice/optional/Test/A.java index f6e5b4aa680c..6634d4a5ae01 100644 --- a/slice2java/swift/test/Ice/optional/Test/A.java +++ b/slice2java/swift/test/Ice/optional/Test/A.java @@ -213,7 +213,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5224896647109330704L; + private static final long serialVersionUID = 4765266316295130768L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/B.java b/slice2java/swift/test/Ice/optional/Test/B.java index 9173937995ac..e5ecc306c34e 100644 --- a/slice2java/swift/test/Ice/optional/Test/B.java +++ b/slice2java/swift/test/Ice/optional/Test/B.java @@ -108,7 +108,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5285769840459939357L; + private static final long serialVersionUID = -5957786302884961821L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/C.java b/slice2java/swift/test/Ice/optional/Test/C.java index 3c51d78e0bb7..f32c9a8198dd 100644 --- a/slice2java/swift/test/Ice/optional/Test/C.java +++ b/slice2java/swift/test/Ice/optional/Test/C.java @@ -110,7 +110,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7315800475298379133L; + private static final long serialVersionUID = 783723272657279229L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/DerivedException.java b/slice2java/swift/test/Ice/optional/Test/DerivedException.java index b92e8c00e77e..828e7045f816 100644 --- a/slice2java/swift/test/Ice/optional/Test/DerivedException.java +++ b/slice2java/swift/test/Ice/optional/Test/DerivedException.java @@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4040046050419735292L; + private static final long serialVersionUID = 6218856902418185691L; } diff --git a/slice2java/swift/test/Ice/optional/Test/E.java b/slice2java/swift/test/Ice/optional/Test/E.java index 61c340404d8d..4f4f0cd3014c 100644 --- a/slice2java/swift/test/Ice/optional/Test/E.java +++ b/slice2java/swift/test/Ice/optional/Test/E.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1850744024064350155L; + private static final long serialVersionUID = -1850740632727131438L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/F.java b/slice2java/swift/test/Ice/optional/Test/F.java index ce40a3bee194..daa2e1350235 100644 --- a/slice2java/swift/test/Ice/optional/Test/F.java +++ b/slice2java/swift/test/Ice/optional/Test/F.java @@ -105,7 +105,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6430498856140099002L; + private static final long serialVersionUID = -6430497112610430431L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/FixedStruct.java b/slice2java/swift/test/Ice/optional/Test/FixedStruct.java index f958f9d5d04c..1b0b09005c75 100644 --- a/slice2java/swift/test/Ice/optional/Test/FixedStruct.java +++ b/slice2java/swift/test/Ice/optional/Test/FixedStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FixedStruct _nullMarshalValue = new FixedStruct(); /** @hidden */ - private static final long serialVersionUID = 1569603376924641328L; + private static final long serialVersionUID = 1569605445839476545L; } diff --git a/slice2java/swift/test/Ice/optional/Test/G.java b/slice2java/swift/test/Ice/optional/Test/G.java index 3b34c40a65a8..12ecd3b3dfeb 100644 --- a/slice2java/swift/test/Ice/optional/Test/G.java +++ b/slice2java/swift/test/Ice/optional/Test/G.java @@ -168,7 +168,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7345557597609452141L; + private static final long serialVersionUID = -7103393171711802349L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/G1.java b/slice2java/swift/test/Ice/optional/Test/G1.java index e2553c2dcf54..0fff7ad1cf62 100644 --- a/slice2java/swift/test/Ice/optional/Test/G1.java +++ b/slice2java/swift/test/Ice/optional/Test/G1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G1 _nullMarshalValue = new G1(); /** @hidden */ - private static final long serialVersionUID = 7339782765766515210L; + private static final long serialVersionUID = 7339780541791895893L; } diff --git a/slice2java/swift/test/Ice/optional/Test/G2.java b/slice2java/swift/test/Ice/optional/Test/G2.java index dfe91079cfa3..df85f75215d6 100644 --- a/slice2java/swift/test/Ice/optional/Test/G2.java +++ b/slice2java/swift/test/Ice/optional/Test/G2.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final G2 _nullMarshalValue = new G2(); /** @hidden */ - private static final long serialVersionUID = 3824546589278284781L; + private static final long serialVersionUID = 3824549980604455988L; } diff --git a/slice2java/swift/test/Ice/optional/Test/MultiOptional.java b/slice2java/swift/test/Ice/optional/Test/MultiOptional.java index 34f5966c7b89..eb160f3d81e7 100644 --- a/slice2java/swift/test/Ice/optional/Test/MultiOptional.java +++ b/slice2java/swift/test/Ice/optional/Test/MultiOptional.java @@ -1675,7 +1675,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4996765137132760048L; + private static final long serialVersionUID = 5593390954787877226L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/OneOptional.java b/slice2java/swift/test/Ice/optional/Test/OneOptional.java index 8bea52d3b42b..ab55c01c5949 100644 --- a/slice2java/swift/test/Ice/optional/Test/OneOptional.java +++ b/slice2java/swift/test/Ice/optional/Test/OneOptional.java @@ -96,7 +96,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7219602665627756194L; + private static final long serialVersionUID = -7219600601846449681L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalException.java b/slice2java/swift/test/Ice/optional/Test/OptionalException.java index 7fdc0ca855ef..f490f7630a9c 100644 --- a/slice2java/swift/test/Ice/optional/Test/OptionalException.java +++ b/slice2java/swift/test/Ice/optional/Test/OptionalException.java @@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 6639908511848370747L; + private static final long serialVersionUID = 4803606293640611931L; } diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java index 7d8f6efd9cfb..f03f35ab2338 100644 --- a/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java +++ b/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java @@ -186,7 +186,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5708262028586534597L; + private static final long serialVersionUID = 4354522264116056635L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/RequiredException.java b/slice2java/swift/test/Ice/optional/Test/RequiredException.java index 82517602e088..618780b1afc5 100644 --- a/slice2java/swift/test/Ice/optional/Test/RequiredException.java +++ b/slice2java/swift/test/Ice/optional/Test/RequiredException.java @@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 2894244889161964099L; + private static final long serialVersionUID = 2894242665185555228L; } diff --git a/slice2java/swift/test/Ice/optional/Test/SmallStruct.java b/slice2java/swift/test/Ice/optional/Test/SmallStruct.java index 16d85f747497..c8b3a8c3d2c7 100644 --- a/slice2java/swift/test/Ice/optional/Test/SmallStruct.java +++ b/slice2java/swift/test/Ice/optional/Test/SmallStruct.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final SmallStruct _nullMarshalValue = new SmallStruct(); /** @hidden */ - private static final long serialVersionUID = 6700981722644294151L; + private static final long serialVersionUID = 6700983791577635952L; } diff --git a/slice2java/swift/test/Ice/optional/Test/VarStruct.java b/slice2java/swift/test/Ice/optional/Test/VarStruct.java index 6f54042d4f20..2479ac7256a7 100644 --- a/slice2java/swift/test/Ice/optional/Test/VarStruct.java +++ b/slice2java/swift/test/Ice/optional/Test/VarStruct.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final VarStruct _nullMarshalValue = new VarStruct(); /** @hidden */ - private static final long serialVersionUID = -1912286101817646206L; + private static final long serialVersionUID = -1912288325791691555L; } diff --git a/slice2java/swift/test/Ice/optional/Test/WD.java b/slice2java/swift/test/Ice/optional/Test/WD.java index 4e9b281757c7..7c0511dc62fa 100644 --- a/slice2java/swift/test/Ice/optional/Test/WD.java +++ b/slice2java/swift/test/Ice/optional/Test/WD.java @@ -152,7 +152,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -176678486270921900L; + private static final long serialVersionUID = 1280046252030134874L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/C.java b/slice2java/swift/test/Ice/scope/Test/C.java index ad4ac8483a48..1e6547d655f2 100644 --- a/slice2java/swift/test/Ice/scope/Test/C.java +++ b/slice2java/swift/test/Ice/scope/Test/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5190247450834691231L; + private static final long serialVersionUID = -5190247346154258174L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/C1.java b/slice2java/swift/test/Ice/scope/Test/C1.java index 5107a420589e..79e8e45b8eb8 100644 --- a/slice2java/swift/test/Ice/scope/Test/C1.java +++ b/slice2java/swift/test/Ice/scope/Test/C1.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8893233192943692769L; + private static final long serialVersionUID = 8893233093562793854L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/C2.java b/slice2java/swift/test/Ice/scope/Test/C2.java index 2a752fa03fbe..894be0ecffb2 100644 --- a/slice2java/swift/test/Ice/scope/Test/C2.java +++ b/slice2java/swift/test/Ice/scope/Test/C2.java @@ -59,7 +59,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3318553968880330269L; + private static final long serialVersionUID = 1259378075076650886L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/Inner/C.java b/slice2java/swift/test/Ice/scope/Test/Inner/C.java index 1f526ef2dffd..f834ac85fc09 100644 --- a/slice2java/swift/test/Ice/scope/Test/Inner/C.java +++ b/slice2java/swift/test/Ice/scope/Test/Inner/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4615622850256600826L; + private static final long serialVersionUID = 4615624396105826524L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/C.java index c90adb05c4aa..baff99ef4172 100644 --- a/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/C.java +++ b/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/C.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 672589024398117783L; + private static final long serialVersionUID = 672590084647009507L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/S.java index 689c013df5f4..624abe67dbca 100644 --- a/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/S.java +++ b/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 8654439441610030921L; + private static final long serialVersionUID = 8654439541144515941L; } diff --git a/slice2java/swift/test/Ice/scope/Test/Inner/S.java b/slice2java/swift/test/Ice/scope/Test/Inner/S.java index 17c65caba99c..adb85e109284 100644 --- a/slice2java/swift/test/Ice/scope/Test/Inner/S.java +++ b/slice2java/swift/test/Ice/scope/Test/Inner/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 3694621423303880069L; + private static final long serialVersionUID = 3694621367838946729L; } diff --git a/slice2java/swift/test/Ice/scope/Test/S.java b/slice2java/swift/test/Ice/scope/Test/S.java index 63b92db0e940..542a67a73d1a 100644 --- a/slice2java/swift/test/Ice/scope/Test/S.java +++ b/slice2java/swift/test/Ice/scope/Test/S.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, int private static final S _nullMarshalValue = new S(); /** @hidden */ - private static final long serialVersionUID = 2159697131105211003L; + private static final long serialVersionUID = 2159697434527394327L; } diff --git a/slice2java/swift/test/Ice/scope/Test/S1.java b/slice2java/swift/test/Ice/scope/Test/S1.java index c3e2c5e68bf0..e3524258a456 100644 --- a/slice2java/swift/test/Ice/scope/Test/S1.java +++ b/slice2java/swift/test/Ice/scope/Test/S1.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S1 _nullMarshalValue = new S1(); /** @hidden */ - private static final long serialVersionUID = 1241674912533662936L; + private static final long serialVersionUID = 1241674691450951367L; } diff --git a/slice2java/swift/test/Ice/scope/Test/S2.java b/slice2java/swift/test/Ice/scope/Test/S2.java index d005ba374cd1..d0129a49fd88 100644 --- a/slice2java/swift/test/Ice/scope/Test/S2.java +++ b/slice2java/swift/test/Ice/scope/Test/S2.java @@ -193,5 +193,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final S2 _nullMarshalValue = new S2(); /** @hidden */ - private static final long serialVersionUID = -9189456167799127324L; + private static final long serialVersionUID = 9012467372543348735L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java index a052ac1b86e3..7b075e9d455e 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -477024225551942972L; + private static final long serialVersionUID = -477021959260936337L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java index 586651bbf079..9ec40016b497 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3485213999898869858L; + private static final long serialVersionUID = 3485211302090738697L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 56dca3ef3f17..56e88743f384 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 1717377821897229971L; + private static final long serialVersionUID = 1717375906715172984L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index e8af17592d51..d415f7f91b06 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7384918138088905270L; + private static final long serialVersionUID = -7384921843541330079L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java index c4077f11b764..8482c35a7739 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 3424372203264857812L; + private static final long serialVersionUID = 3424372328610917173L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index 8607b79380cf..6112b438cc05 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1172605961081988091L; + private static final long serialVersionUID = -1172605920968349660L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index e032dcb68bad..72a8abb95ccd 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1126117193657031556L; + private static final long serialVersionUID = -1126117233770669987L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index ff9d228be73a..057bd75b8c5f 100644 --- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java +++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java @@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -2097581534133861156L; + private static final long serialVersionUID = -2097581408787801795L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/B.java b/slice2java/swift/test/Ice/slicing/objects/Test/B.java index ad5863f9de50..cbeafd5f6121 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/B.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/B.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6029554003346020758L; + private static final long serialVersionUID = -7908133330463155786L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/swift/test/Ice/slicing/objects/Test/BaseException.java index 5ee17d672e56..acf5f4441c95 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/BaseException.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/BaseException.java @@ -65,5 +65,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 213795691698091226L; + private static final long serialVersionUID = -921782990724981254L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java index d710de1ef8a1..d8fe76b72ded 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6397005549594621799L; + private static final long serialVersionUID = -6397005948762230703L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPDerived.java index 741cab6ccf7b..a3ef60afd29f 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9066889425596961578L; + private static final long serialVersionUID = -9066883146470385796L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/D1.java b/slice2java/swift/test/Ice/slicing/objects/Test/D1.java index 7f66f82d1198..2501fcd0d065 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/D1.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/D1.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5888812156535085451L; + private static final long serialVersionUID = 8671709525928027989L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/D2.java b/slice2java/swift/test/Ice/slicing/objects/Test/D2.java index 6da2b92c6aec..aa5f003b8065 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/D2.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/D2.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1061961398862219153L; + private static final long serialVersionUID = 5954398345085270592L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/D3.java b/slice2java/swift/test/Ice/slicing/objects/Test/D3.java index 0535a812e658..1f8d0d9de94c 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/D3.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/D3.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7232230539426244159L; + private static final long serialVersionUID = -1209049068920741074L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/D4.java b/slice2java/swift/test/Ice/slicing/objects/Test/D4.java index 94c23692b1c5..5f73b8c2e4d4 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/D4.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/D4.java @@ -50,7 +50,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -9017948943171844109L; + private static final long serialVersionUID = 9119766722763570995L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/swift/test/Ice/slicing/objects/Test/DerivedException.java index 9f8cc2caaee1..77015e9eb1a7 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/DerivedException.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/DerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -4699657686830577745L; + private static final long serialVersionUID = -8866527328369405646L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java b/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java index 5386eb87f8d7..7c07551c8b0b 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7655931350078762253L; + private static final long serialVersionUID = -7655926393521867677L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/swift/test/Ice/slicing/objects/Test/Hidden.java index 0aa6d62b44d7..008b42d641d7 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/Hidden.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/Hidden.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2271120675279378310L; + private static final long serialVersionUID = -2271125466630193004L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/MyClass.java b/slice2java/swift/test/Ice/slicing/objects/Test/MyClass.java index 865fb67b86b6..4537bc5b8990 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/MyClass.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/MyClass.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 4147534752655096526L; + private static final long serialVersionUID = 4147524663702403174L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PBase.java b/slice2java/swift/test/Ice/slicing/objects/Test/PBase.java index cd82dbca4b70..eb07ce7b0d4d 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PBase.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PBase.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 481717079183597544L; + private static final long serialVersionUID = 481705344810753241L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived.java index d2846904b0d6..89f964b34000 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4426884956260671783L; + private static final long serialVersionUID = -4426891140905786223L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived2.java index bf85d42c57e0..b7c410cb3a58 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived2.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 850536501270303317L; + private static final long serialVersionUID = 850542520731109037L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived3.java index 9e0b161394a0..25881f4de668 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived3.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived3.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4328902074339415280L; + private static final long serialVersionUID = -4328899983568278254L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/swift/test/Ice/slicing/objects/Test/PCUnknown.java index 0989a70f2bec..1acbf91d606b 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PCUnknown.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PCUnknown.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5081815207383449265L; + private static final long serialVersionUID = -5081814653424398157L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/PDerived.java index efd7a102d846..641d4e2c305b 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PDerived.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 643087809157705425L; + private static final long serialVersionUID = 643077562650605627L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PNode.java b/slice2java/swift/test/Ice/slicing/objects/Test/PNode.java index 9e35ad07cbdd..1fd3b4df021d 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PNode.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PNode.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2438004956173279174L; + private static final long serialVersionUID = -2438005940218051561L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown.java b/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown.java index e43bebb6db4a..ed49b619e678 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown.java @@ -54,7 +54,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1545675911392013301L; + private static final long serialVersionUID = 5607768626513605582L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown2.java b/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown2.java index ac44ac7f6934..7774879f3be5 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown2.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown2.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8813707766925909515L; + private static final long serialVersionUID = -8813708102765664301L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java index 2de70edd65ca..84083fa45062 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 3651536758163758283L; + private static final long serialVersionUID = 3651531966798871651L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/SBSKnownDerived.java index fe4d24260e09..34da6f499f51 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SBSKnownDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SBSKnownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 8804373692830558574L; + private static final long serialVersionUID = 8804374676919707590L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SBSUnknownDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/SBSUnknownDerived.java index 2093ce30ea50..a7144462f39f 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SBSUnknownDerived.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SBSUnknownDerived.java @@ -48,7 +48,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -4989067684016455829L; + private static final long serialVersionUID = -4989057595082744761L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SBase.java b/slice2java/swift/test/Ice/slicing/objects/Test/SBase.java index a2c4206006ac..1e48cad5eea2 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SBase.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SBase.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -5353758476728955240L; + private static final long serialVersionUID = -5353764750689948560L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SS1.java b/slice2java/swift/test/Ice/slicing/objects/Test/SS1.java index d898f0ce7337..1cfbb30f04d0 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SS1.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SS1.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6522143179208669038L; + private static final long serialVersionUID = -6522131610296853273L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SS2.java b/slice2java/swift/test/Ice/slicing/objects/Test/SS2.java index d7bc33075fcd..351f6acd66f1 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SS2.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SS2.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7620284665217088273L; + private static final long serialVersionUID = 7620290939112676900L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SS3.java b/slice2java/swift/test/Ice/slicing/objects/Test/SS3.java index 0a6edaf10bde..15c31fad5c03 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SS3.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SS3.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, i private static final SS3 _nullMarshalValue = new SS3(); /** @hidden */ - private static final long serialVersionUID = 7281786241246543324L; + private static final long serialVersionUID = 1083287819769028582L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java index 2718c7da69dd..97c4935daa3f 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java @@ -49,7 +49,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -6215730622032025309L; + private static final long serialVersionUID = -6642236226451708583L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/UnknownDerivedException.java b/slice2java/swift/test/Ice/slicing/objects/Test/UnknownDerivedException.java index c03b26d20aa3..3aa24d2c8aca 100644 --- a/slice2java/swift/test/Ice/slicing/objects/Test/UnknownDerivedException.java +++ b/slice2java/swift/test/Ice/slicing/objects/Test/UnknownDerivedException.java @@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -3285534905418960123L; + private static final long serialVersionUID = -542544412676166679L; } diff --git a/slice2java/swift/test/Ice/stream/Test/LargeStruct.java b/slice2java/swift/test/Ice/stream/Test/LargeStruct.java index 75f485e5b0bb..aedc8f76f762 100644 --- a/slice2java/swift/test/Ice/stream/Test/LargeStruct.java +++ b/slice2java/swift/test/Ice/stream/Test/LargeStruct.java @@ -240,5 +240,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final LargeStruct _nullMarshalValue = new LargeStruct(); /** @hidden */ - private static final long serialVersionUID = 2179125975587229084L; + private static final long serialVersionUID = -3593652649162424420L; } diff --git a/slice2java/swift/test/Ice/stream/Test/MyClass.java b/slice2java/swift/test/Ice/stream/Test/MyClass.java index 1c72f05e27fb..950d27619fd5 100644 --- a/slice2java/swift/test/Ice/stream/Test/MyClass.java +++ b/slice2java/swift/test/Ice/stream/Test/MyClass.java @@ -85,7 +85,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 5984524495000145920L; + private static final long serialVersionUID = -1251955260685150526L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/stream/Test/MyException.java b/slice2java/swift/test/Ice/stream/Test/MyException.java index 5ad538a7d3f3..0b9ca3c69802 100644 --- a/slice2java/swift/test/Ice/stream/Test/MyException.java +++ b/slice2java/swift/test/Ice/stream/Test/MyException.java @@ -59,5 +59,5 @@ public boolean _usesClasses() } /** @hidden */ - private static final long serialVersionUID = 5734226885474509213L; + private static final long serialVersionUID = 5734224695076222553L; } diff --git a/slice2java/swift/test/Ice/stream/Test/OptionalClass.java b/slice2java/swift/test/Ice/stream/Test/OptionalClass.java index 63165813f9fd..a1291c5c839b 100644 --- a/slice2java/swift/test/Ice/stream/Test/OptionalClass.java +++ b/slice2java/swift/test/Ice/stream/Test/OptionalClass.java @@ -162,7 +162,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -8837651994864390829L; + private static final long serialVersionUID = 3940033490486431175L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java b/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java index 8245846a7cbc..ed7353e36e53 100644 --- a/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java +++ b/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -1404703724312657806L; + private static final long serialVersionUID = -1404708642123752464L; } diff --git a/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java index 54ecd05d30f1..4abb283ee090 100644 --- a/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java +++ b/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java @@ -227,5 +227,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStrea private static final NestedStruct _nullMarshalValue = new NestedStruct(); /** @hidden */ - private static final long serialVersionUID = 2648373621155105900L; + private static final long serialVersionUID = 5351252005156304085L; } diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java index 47df2d0e5537..85cfce1861e1 100644 --- a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java +++ b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java @@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8562125277841258176L; + private static final long serialVersionUID = -8562128542766406078L; } diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java index 5ad2a00b3d11..8d2f02ea02ed 100644 --- a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java +++ b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java @@ -227,5 +227,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStre private static final NestedStruct2 _nullMarshalValue = new NestedStruct2(); /** @hidden */ - private static final long serialVersionUID = 8957143534138048188L; + private static final long serialVersionUID = 3501940281886179655L; } diff --git a/slice2java/swift/test/Slice/escape/Clash/Cls.java b/slice2java/swift/test/Slice/escape/Clash/Cls.java index cc2d2ffe4948..63006284c957 100644 --- a/slice2java/swift/test/Slice/escape/Clash/Cls.java +++ b/slice2java/swift/test/Slice/escape/Clash/Cls.java @@ -164,7 +164,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 7399352886208350500L; + private static final long serialVersionUID = 298301087899569037L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Slice/escape/Clash/Ex.java b/slice2java/swift/test/Slice/escape/Clash/Ex.java index c25aacb0546d..59b201a9e288 100644 --- a/slice2java/swift/test/Slice/escape/Clash/Ex.java +++ b/slice2java/swift/test/Slice/escape/Clash/Ex.java @@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = 4478636317243307296L; + private static final long serialVersionUID = 1232911619240041504L; } diff --git a/slice2java/swift/test/Slice/escape/Clash/St.java b/slice2java/swift/test/Slice/escape/Clash/St.java index ce6750d9d3cc..7cc9c6c99cf3 100644 --- a/slice2java/swift/test/Slice/escape/Clash/St.java +++ b/slice2java/swift/test/Slice/escape/Clash/St.java @@ -173,5 +173,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, in private static final St _nullMarshalValue = new St(); /** @hidden */ - private static final long serialVersionUID = 6558775252887054177L; + private static final long serialVersionUID = -922314235702721343L; } diff --git a/slice2java/swift/test/Slice/escape/and/_return.java b/slice2java/swift/test/Slice/escape/and/_return.java index 25668806acb3..b618d9e3a0fb 100644 --- a/slice2java/swift/test/Slice/escape/and/_return.java +++ b/slice2java/swift/test/Slice/escape/and/_return.java @@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -8206180495221594526L; + private static final long serialVersionUID = -8206178912016957605L; } diff --git a/slice2java/swift/test/Slice/escape/and/_switch.java b/slice2java/swift/test/Slice/escape/and/_switch.java index 90dcd2badd88..f41f2636331e 100644 --- a/slice2java/swift/test/Slice/escape/and/_switch.java +++ b/slice2java/swift/test/Slice/escape/and/_switch.java @@ -51,7 +51,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -1441731158788394653L; + private static final long serialVersionUID = 4917335625916694298L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Slice/escape/and/as.java b/slice2java/swift/test/Slice/escape/and/as.java index f49943ce20fe..aec0e0591a29 100644 --- a/slice2java/swift/test/Slice/escape/and/as.java +++ b/slice2java/swift/test/Slice/escape/and/as.java @@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -7794388894384894984L; + private static final long serialVersionUID = -3527628753184184200L; } diff --git a/slice2java/swift/test/Slice/escape/and/defer.java b/slice2java/swift/test/Slice/escape/and/defer.java index 900bd3449b0f..ec8f0cadd94e 100644 --- a/slice2java/swift/test/Slice/escape/and/defer.java +++ b/slice2java/swift/test/Slice/escape/and/defer.java @@ -143,5 +143,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final defer _nullMarshalValue = new defer(); /** @hidden */ - private static final long serialVersionUID = 8824792615991431707L; + private static final long serialVersionUID = 8824790350874997538L; } diff --git a/slice2java/swift/test/Slice/escape/and/guard.java b/slice2java/swift/test/Slice/escape/and/guard.java index d6db83b0c115..63ac59dcff03 100644 --- a/slice2java/swift/test/Slice/escape/and/guard.java +++ b/slice2java/swift/test/Slice/escape/and/guard.java @@ -138,5 +138,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final guard _nullMarshalValue = new guard(); /** @hidden */ - private static final long serialVersionUID = 6403706298920995476L; + private static final long serialVersionUID = 6403709243636262765L; } diff --git a/slice2js/cpp/src/DataStorm/Contract.js b/slice2js/cpp/src/DataStorm/Contract.js new file mode 100644 index 000000000000..059d95e157e8 --- /dev/null +++ b/slice2js/cpp/src/DataStorm/Contract.js @@ -0,0 +1,591 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +/* eslint-disable */ +/* jshint ignore: start */ + +import { Ice } from "ice"; + +import { + DataStorm as DataStorm_______slice_DataStorm_Sample, } from "../../../slice/DataStorm/Sample.js" + +const DataStorm = { + ...DataStorm_______slice_DataStorm_Sample, +}; + +export const DataStormContract = {}; + +DataStormContract.ClearHistoryPolicy = Ice.defineEnum([ + ['OnAdd', 0], ['OnRemove', 1], ['OnAll', 2], ['OnAllExceptPartialUpdate', 3], ['Never', 4]]); + +DataStormContract.ByteSeqHelper = Ice.StreamHelpers.generateSeqHelper(Ice.ByteHelper, true); + +DataStormContract.LongSeqHelper = Ice.StreamHelpers.generateSeqHelper(Ice.LongHelper, true); + +DataStormContract.StringSeqHelper = Ice.StreamHelpers.generateSeqHelper(Ice.StringHelper, false); + +[DataStormContract.LongLongDict, DataStormContract.LongLongDictHelper] = Ice.defineDictionary(Ice.LongHelper, Ice.LongHelper, true, Ice.HashMap.compareEquals); + +DataStormContract.DataSample = class +{ + constructor(id = new Ice.Long(0, 0), keyId = new Ice.Long(0, 0), keyValue = null, timestamp = new Ice.Long(0, 0), tag = new Ice.Long(0, 0), event = DataStorm.SampleEvent.Add, value = null) + { + this.id = id; + this.keyId = keyId; + this.keyValue = keyValue; + this.timestamp = timestamp; + this.tag = tag; + this.event = event; + this.value = value; + } + + _write(ostr) + { + ostr.writeLong(this.id); + ostr.writeLong(this.keyId); + DataStormContract.ByteSeqHelper.write(ostr, this.keyValue); + ostr.writeLong(this.timestamp); + ostr.writeLong(this.tag); + DataStorm.SampleEvent._write(ostr, this.event); + DataStormContract.ByteSeqHelper.write(ostr, this.value); + } + + _read(istr) + { + this.id = istr.readLong(); + this.keyId = istr.readLong(); + this.keyValue = DataStormContract.ByteSeqHelper.read(istr); + this.timestamp = istr.readLong(); + this.tag = istr.readLong(); + this.event = DataStorm.SampleEvent._read(istr); + this.value = DataStormContract.ByteSeqHelper.read(istr); + } + + static get minWireSize() + { + return 35; + } +}; + +Ice.defineStruct(DataStormContract.DataSample, false, true); + +DataStormContract.DataSampleSeqHelper = Ice.StreamHelpers.generateSeqHelper(DataStormContract.DataSample, false); + +DataStormContract.DataSamples = class +{ + constructor(id = new Ice.Long(0, 0), samples = null) + { + this.id = id; + this.samples = samples; + } + + _write(ostr) + { + ostr.writeLong(this.id); + DataStormContract.DataSampleSeqHelper.write(ostr, this.samples); + } + + _read(istr) + { + this.id = istr.readLong(); + this.samples = DataStormContract.DataSampleSeqHelper.read(istr); + } + + static get minWireSize() + { + return 9; + } +}; + +Ice.defineStruct(DataStormContract.DataSamples, false, true); + +DataStormContract.DataSamplesSeqHelper = Ice.StreamHelpers.generateSeqHelper(DataStormContract.DataSamples, false); + +DataStormContract.ElementInfo = class +{ + constructor(id = new Ice.Long(0, 0), name = "", value = null) + { + this.id = id; + this.name = name; + this.value = value; + } + + _write(ostr) + { + ostr.writeLong(this.id); + ostr.writeString(this.name); + DataStormContract.ByteSeqHelper.write(ostr, this.value); + } + + _read(istr) + { + this.id = istr.readLong(); + this.name = istr.readString(); + this.value = DataStormContract.ByteSeqHelper.read(istr); + } + + static get minWireSize() + { + return 10; + } +}; + +Ice.defineStruct(DataStormContract.ElementInfo, false, true); + +DataStormContract.ElementInfoSeqHelper = Ice.StreamHelpers.generateSeqHelper(DataStormContract.ElementInfo, false); + +DataStormContract.TopicInfo = class +{ + constructor(name = "", ids = null) + { + this.name = name; + this.ids = ids; + } + + _write(ostr) + { + ostr.writeString(this.name); + DataStormContract.LongSeqHelper.write(ostr, this.ids); + } + + _read(istr) + { + this.name = istr.readString(); + this.ids = DataStormContract.LongSeqHelper.read(istr); + } + + static get minWireSize() + { + return 2; + } +}; + +Ice.defineStruct(DataStormContract.TopicInfo, false, true); + +DataStormContract.TopicInfoSeqHelper = Ice.StreamHelpers.generateSeqHelper(DataStormContract.TopicInfo, false); + +DataStormContract.TopicSpec = class +{ + constructor(id = new Ice.Long(0, 0), name = "", elements = null, tags = null) + { + this.id = id; + this.name = name; + this.elements = elements; + this.tags = tags; + } + + _write(ostr) + { + ostr.writeLong(this.id); + ostr.writeString(this.name); + DataStormContract.ElementInfoSeqHelper.write(ostr, this.elements); + DataStormContract.ElementInfoSeqHelper.write(ostr, this.tags); + } + + _read(istr) + { + this.id = istr.readLong(); + this.name = istr.readString(); + this.elements = DataStormContract.ElementInfoSeqHelper.read(istr); + this.tags = DataStormContract.ElementInfoSeqHelper.read(istr); + } + + static get minWireSize() + { + return 11; + } +}; + +Ice.defineStruct(DataStormContract.TopicSpec, false, true); + +DataStormContract.FilterInfo = class +{ + constructor(name = "", criteria = null) + { + this.name = name; + this.criteria = criteria; + } + + _write(ostr) + { + ostr.writeString(this.name); + DataStormContract.ByteSeqHelper.write(ostr, this.criteria); + } + + _read(istr) + { + this.name = istr.readString(); + this.criteria = DataStormContract.ByteSeqHelper.read(istr); + } + + static get minWireSize() + { + return 2; + } +}; + +Ice.defineStruct(DataStormContract.FilterInfo, false, true); + +DataStormContract.ElementConfig = class extends Ice.Value +{ + constructor(facet = undefined, sampleFilter = undefined, name = undefined, priority = undefined, sampleCount = undefined, sampleLifetime = undefined, clearHistory = undefined) + { + super(); + this.facet = facet; + this.sampleFilter = sampleFilter; + this.name = name; + this.priority = priority; + this.sampleCount = sampleCount; + this.sampleLifetime = sampleLifetime; + this.clearHistory = clearHistory; + } + + static get _iceCompactId() + { + return 1; + } + + _iceWriteMemberImpl(ostr) + { + Ice.StringHelper.writeOptional(ostr, 1, this.facet); + DataStormContract.FilterInfo.writeOptional(ostr, 2, this.sampleFilter); + Ice.StringHelper.writeOptional(ostr, 3, this.name); + Ice.IntHelper.writeOptional(ostr, 4, this.priority); + Ice.IntHelper.writeOptional(ostr, 10, this.sampleCount); + Ice.IntHelper.writeOptional(ostr, 11, this.sampleLifetime); + DataStormContract.ClearHistoryPolicy._writeOpt(ostr, 12, this.clearHistory); + } + + _iceReadMemberImpl(istr) + { + this.facet = Ice.StringHelper.readOptional(istr, 1); + this.sampleFilter = DataStormContract.FilterInfo.readOptional(istr, 2); + this.name = Ice.StringHelper.readOptional(istr, 3); + this.priority = Ice.IntHelper.readOptional(istr, 4); + this.sampleCount = Ice.IntHelper.readOptional(istr, 10); + this.sampleLifetime = Ice.IntHelper.readOptional(istr, 11); + this.clearHistory = DataStormContract.ClearHistoryPolicy._readOpt(istr, 12); + } +}; + +Ice.defineValue(DataStormContract.ElementConfig, "::DataStormContract::ElementConfig", 1); +Ice.TypeRegistry.declareValueType("DataStormContract.ElementConfig", DataStormContract.ElementConfig); + +DataStormContract.ElementData = class +{ + constructor(id = new Ice.Long(0, 0), config = null, lastIds = null) + { + this.id = id; + this.config = config; + this.lastIds = lastIds; + } + + _write(ostr) + { + ostr.writeLong(this.id); + ostr.writeValue(this.config); + DataStormContract.LongLongDictHelper.write(ostr, this.lastIds); + } + + _read(istr) + { + this.id = istr.readLong(); + istr.readValue(obj => this.config = obj, Ice.TypeRegistry.getValueType("DataStormContract.ElementConfig")); + this.lastIds = DataStormContract.LongLongDictHelper.read(istr); + } + + static get minWireSize() + { + return 10; + } +}; + +Ice.defineStruct(DataStormContract.ElementData, false, true); + +DataStormContract.ElementDataSeqHelper = Ice.StreamHelpers.generateSeqHelper(DataStormContract.ElementData, false); + +DataStormContract.ElementSpec = class +{ + constructor(elements = null, id = new Ice.Long(0, 0), name = "", value = null, peerId = new Ice.Long(0, 0), peerName = "") + { + this.elements = elements; + this.id = id; + this.name = name; + this.value = value; + this.peerId = peerId; + this.peerName = peerName; + } + + _write(ostr) + { + DataStormContract.ElementDataSeqHelper.write(ostr, this.elements); + ostr.writeLong(this.id); + ostr.writeString(this.name); + DataStormContract.ByteSeqHelper.write(ostr, this.value); + ostr.writeLong(this.peerId); + ostr.writeString(this.peerName); + } + + _read(istr) + { + this.elements = DataStormContract.ElementDataSeqHelper.read(istr); + this.id = istr.readLong(); + this.name = istr.readString(); + this.value = DataStormContract.ByteSeqHelper.read(istr); + this.peerId = istr.readLong(); + this.peerName = istr.readString(); + } + + static get minWireSize() + { + return 20; + } +}; + +Ice.defineStruct(DataStormContract.ElementSpec, false, true); + +DataStormContract.ElementSpecSeqHelper = Ice.StreamHelpers.generateSeqHelper(DataStormContract.ElementSpec, false); + +DataStormContract.ElementDataAck = class +{ + constructor(id = new Ice.Long(0, 0), config = null, lastIds = null, samples = null, peerId = new Ice.Long(0, 0)) + { + this.id = id; + this.config = config; + this.lastIds = lastIds; + this.samples = samples; + this.peerId = peerId; + } + + _write(ostr) + { + ostr.writeLong(this.id); + ostr.writeValue(this.config); + DataStormContract.LongLongDictHelper.write(ostr, this.lastIds); + DataStormContract.DataSampleSeqHelper.write(ostr, this.samples); + ostr.writeLong(this.peerId); + } + + _read(istr) + { + this.id = istr.readLong(); + istr.readValue(obj => this.config = obj, Ice.TypeRegistry.getValueType("DataStormContract.ElementConfig")); + this.lastIds = DataStormContract.LongLongDictHelper.read(istr); + this.samples = DataStormContract.DataSampleSeqHelper.read(istr); + this.peerId = istr.readLong(); + } + + static get minWireSize() + { + return 19; + } +}; + +Ice.defineStruct(DataStormContract.ElementDataAck, false, true); + +DataStormContract.ElementDataAckSeqHelper = Ice.StreamHelpers.generateSeqHelper(DataStormContract.ElementDataAck, false); + +DataStormContract.ElementSpecAck = class +{ + constructor(elements = null, id = new Ice.Long(0, 0), name = "", value = null, peerId = new Ice.Long(0, 0), peerName = "") + { + this.elements = elements; + this.id = id; + this.name = name; + this.value = value; + this.peerId = peerId; + this.peerName = peerName; + } + + _write(ostr) + { + DataStormContract.ElementDataAckSeqHelper.write(ostr, this.elements); + ostr.writeLong(this.id); + ostr.writeString(this.name); + DataStormContract.ByteSeqHelper.write(ostr, this.value); + ostr.writeLong(this.peerId); + ostr.writeString(this.peerName); + } + + _read(istr) + { + this.elements = DataStormContract.ElementDataAckSeqHelper.read(istr); + this.id = istr.readLong(); + this.name = istr.readString(); + this.value = DataStormContract.ByteSeqHelper.read(istr); + this.peerId = istr.readLong(); + this.peerName = istr.readString(); + } + + static get minWireSize() + { + return 20; + } +}; + +Ice.defineStruct(DataStormContract.ElementSpecAck, false, true); + +DataStormContract.ElementSpecAckSeqHelper = Ice.StreamHelpers.generateSeqHelper(DataStormContract.ElementSpecAck, false); + +const iceC_DataStormContract_Session_ids = [ + "::DataStormContract::Session", + "::Ice::Object" +]; + +DataStormContract.Session = class extends Ice.Object +{ +}; + +DataStormContract.SessionPrx = class extends Ice.ObjectPrx +{ +}; +Ice.TypeRegistry.declareProxyType("DataStormContract.SessionPrx", DataStormContract.SessionPrx); + +Ice.defineOperations( + DataStormContract.Session, + DataStormContract.SessionPrx, + iceC_DataStormContract_Session_ids, + "::DataStormContract::Session", + { + "announceTopics": [, , , , [[DataStormContract.TopicInfoSeqHelper], [1]], , , , ], + "attachTopic": [, , , , [[DataStormContract.TopicSpec]], , , , ], + "detachTopic": [, , , , [[4]], , , , ], + "attachTags": [, , , , [[4], [DataStormContract.ElementInfoSeqHelper], [1]], , , , ], + "detachTags": [, , , , [[4], [DataStormContract.LongSeqHelper]], , , , ], + "announceElements": [, , , , [[4], [DataStormContract.ElementInfoSeqHelper]], , , , ], + "attachElements": [, , , , [[4], [DataStormContract.ElementSpecSeqHelper], [1]], , , true, ], + "attachElementsAck": [, , , , [[4], [DataStormContract.ElementSpecAckSeqHelper]], , , true, ], + "detachElements": [, , , , [[4], [DataStormContract.LongSeqHelper]], , , , ], + "initSamples": [, , , , [[4], [DataStormContract.DataSamplesSeqHelper]], , , , ], + "disconnected": [, , , , , , , , ] + }); + +const iceC_DataStormContract_PublisherSession_ids = [ + "::DataStormContract::PublisherSession", + "::DataStormContract::Session", + "::Ice::Object" +]; + +DataStormContract.PublisherSession = class extends Ice.Object +{ + static get _iceImplements() + { + return [ + DataStormContract.Session + ]; + } +}; + +DataStormContract.PublisherSessionPrx = class extends Ice.ObjectPrx +{ + static get _implements() + { + return [ + DataStormContract.SessionPrx]; + } +}; +Ice.TypeRegistry.declareProxyType("DataStormContract.PublisherSessionPrx", DataStormContract.PublisherSessionPrx); + +Ice.defineOperations( + DataStormContract.PublisherSession, + DataStormContract.PublisherSessionPrx, + iceC_DataStormContract_PublisherSession_ids, + "::DataStormContract::PublisherSession"); + +const iceC_DataStormContract_SubscriberSession_ids = [ + "::DataStormContract::Session", + "::DataStormContract::SubscriberSession", + "::Ice::Object" +]; + +DataStormContract.SubscriberSession = class extends Ice.Object +{ + static get _iceImplements() + { + return [ + DataStormContract.Session + ]; + } +}; + +DataStormContract.SubscriberSessionPrx = class extends Ice.ObjectPrx +{ + static get _implements() + { + return [ + DataStormContract.SessionPrx]; + } +}; +Ice.TypeRegistry.declareProxyType("DataStormContract.SubscriberSessionPrx", DataStormContract.SubscriberSessionPrx); + +Ice.defineOperations( + DataStormContract.SubscriberSession, + DataStormContract.SubscriberSessionPrx, + iceC_DataStormContract_SubscriberSession_ids, + "::DataStormContract::SubscriberSession", + { + "s": [, , , , [[4], [4], [DataStormContract.DataSample]], , , , ] + }); + +const iceC_DataStormContract_Node_ids = [ + "::DataStormContract::Node", + "::Ice::Object" +]; + +DataStormContract.Node = class extends Ice.Object +{ +}; + +DataStormContract.NodePrx = class extends Ice.ObjectPrx +{ +}; +Ice.TypeRegistry.declareProxyType("DataStormContract.NodePrx", DataStormContract.NodePrx); + +Ice.defineOperations( + DataStormContract.Node, + DataStormContract.NodePrx, + iceC_DataStormContract_Node_ids, + "::DataStormContract::Node", + { + "initiateCreateSession": [, , , , [["DataStormContract.NodePrx"]], , , , ], + "createSession": [, , , , [["DataStormContract.NodePrx"], ["DataStormContract.SubscriberSessionPrx"], [1]], , , , ], + "confirmCreateSession": [, , , , [["DataStormContract.NodePrx"], ["DataStormContract.PublisherSessionPrx"]], , , , ] + }); + +const iceC_DataStormContract_Lookup_ids = [ + "::DataStormContract::Lookup", + "::Ice::Object" +]; + +DataStormContract.Lookup = class extends Ice.Object +{ +}; + +DataStormContract.LookupPrx = class extends Ice.ObjectPrx +{ +}; +Ice.TypeRegistry.declareProxyType("DataStormContract.LookupPrx", DataStormContract.LookupPrx); + +Ice.defineOperations( + DataStormContract.Lookup, + DataStormContract.LookupPrx, + iceC_DataStormContract_Lookup_ids, + "::DataStormContract::Lookup", + { + "announceTopicReader": [, 2, , , [[7], ["DataStormContract.NodePrx"]], , , , ], + "announceTopicWriter": [, 2, , , [[7], ["DataStormContract.NodePrx"]], , , , ], + "announceTopics": [, 2, , , [[DataStormContract.StringSeqHelper], [DataStormContract.StringSeqHelper], ["DataStormContract.NodePrx"]], , , , ], + "createSession": [, , , ["DataStormContract.NodePrx"], [["DataStormContract.NodePrx"]], , , , ] + }); diff --git a/slice2js/cpp/test/DataStorm/api/Test.js b/slice2js/cpp/test/DataStorm/api/Test.js new file mode 100644 index 000000000000..bb70e3042b9f --- /dev/null +++ b/slice2js/cpp/test/DataStorm/api/Test.js @@ -0,0 +1,69 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +/* eslint-disable */ +/* jshint ignore: start */ + +import { Ice } from "ice"; + + +export const Test = {}; + +Test.StructKey = class +{ + constructor(value = 0) + { + this.value = value; + } + + _write(ostr) + { + ostr.writeInt(this.value); + } + + _read(istr) + { + this.value = istr.readInt(); + } + + static get minWireSize() + { + return 4; + } +}; + +Ice.defineStruct(Test.StructKey, true, false); + +Test.ClassKey = class extends Ice.Value +{ + constructor(value = 0) + { + super(); + this.value = value; + } + + _iceWriteMemberImpl(ostr) + { + ostr.writeInt(this.value); + } + + _iceReadMemberImpl(istr) + { + this.value = istr.readInt(); + } +}; + +Ice.defineValue(Test.ClassKey, "::Test::ClassKey"); +Ice.TypeRegistry.declareValueType("Test.ClassKey", Test.ClassKey); diff --git a/slice2js/cpp/test/DataStorm/events/Test.js b/slice2js/cpp/test/DataStorm/events/Test.js new file mode 100644 index 000000000000..ed6c5b657ec4 --- /dev/null +++ b/slice2js/cpp/test/DataStorm/events/Test.js @@ -0,0 +1,97 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +/* eslint-disable */ +/* jshint ignore: start */ + +import { Ice } from "ice"; + + +export const Test = {}; + +Test.StructValue = class +{ + constructor(firstName = "", lastName = "", age = 0) + { + this.firstName = firstName; + this.lastName = lastName; + this.age = age; + } + + _write(ostr) + { + ostr.writeString(this.firstName); + ostr.writeString(this.lastName); + ostr.writeInt(this.age); + } + + _read(istr) + { + this.firstName = istr.readString(); + this.lastName = istr.readString(); + this.age = istr.readInt(); + } + + static get minWireSize() + { + return 6; + } +}; + +Ice.defineStruct(Test.StructValue, true, true); + +Test.Base = class extends Ice.Value +{ + constructor(b = "") + { + super(); + this.b = b; + } + + _iceWriteMemberImpl(ostr) + { + ostr.writeString(this.b); + } + + _iceReadMemberImpl(istr) + { + this.b = istr.readString(); + } +}; + +Ice.defineValue(Test.Base, "::Test::Base"); +Ice.TypeRegistry.declareValueType("Test.Base", Test.Base); + +Test.Extended = class extends Test.Base +{ + constructor(b, e = 0) + { + super(b); + this.e = e; + } + + _iceWriteMemberImpl(ostr) + { + ostr.writeInt(this.e); + } + + _iceReadMemberImpl(istr) + { + this.e = istr.readInt(); + } +}; + +Ice.defineValue(Test.Extended, "::Test::Extended"); +Ice.TypeRegistry.declareValueType("Test.Extended", Test.Extended); diff --git a/slice2js/cpp/test/DataStorm/partial/Test.js b/slice2js/cpp/test/DataStorm/partial/Test.js new file mode 100644 index 000000000000..f8585f753c9d --- /dev/null +++ b/slice2js/cpp/test/DataStorm/partial/Test.js @@ -0,0 +1,53 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +/* eslint-disable */ +/* jshint ignore: start */ + +import { Ice } from "ice"; + + +export const Test = {}; + +Test.Stock = class +{ + constructor(price = 0.0, lastBid = 0.0, laskAsk = 0.0) + { + this.price = price; + this.lastBid = lastBid; + this.laskAsk = laskAsk; + } + + _write(ostr) + { + ostr.writeFloat(this.price); + ostr.writeFloat(this.lastBid); + ostr.writeFloat(this.laskAsk); + } + + _read(istr) + { + this.price = istr.readFloat(); + this.lastBid = istr.readFloat(); + this.laskAsk = istr.readFloat(); + } + + static get minWireSize() + { + return 12; + } +}; + +Ice.defineStruct(Test.Stock, false, false); diff --git a/slice2js/cpp/test/DataStorm/types/Test.js b/slice2js/cpp/test/DataStorm/types/Test.js new file mode 100644 index 000000000000..ed6c5b657ec4 --- /dev/null +++ b/slice2js/cpp/test/DataStorm/types/Test.js @@ -0,0 +1,97 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +/* eslint-disable */ +/* jshint ignore: start */ + +import { Ice } from "ice"; + + +export const Test = {}; + +Test.StructValue = class +{ + constructor(firstName = "", lastName = "", age = 0) + { + this.firstName = firstName; + this.lastName = lastName; + this.age = age; + } + + _write(ostr) + { + ostr.writeString(this.firstName); + ostr.writeString(this.lastName); + ostr.writeInt(this.age); + } + + _read(istr) + { + this.firstName = istr.readString(); + this.lastName = istr.readString(); + this.age = istr.readInt(); + } + + static get minWireSize() + { + return 6; + } +}; + +Ice.defineStruct(Test.StructValue, true, true); + +Test.Base = class extends Ice.Value +{ + constructor(b = "") + { + super(); + this.b = b; + } + + _iceWriteMemberImpl(ostr) + { + ostr.writeString(this.b); + } + + _iceReadMemberImpl(istr) + { + this.b = istr.readString(); + } +}; + +Ice.defineValue(Test.Base, "::Test::Base"); +Ice.TypeRegistry.declareValueType("Test.Base", Test.Base); + +Test.Extended = class extends Test.Base +{ + constructor(b, e = 0) + { + super(b); + this.e = e; + } + + _iceWriteMemberImpl(ostr) + { + ostr.writeInt(this.e); + } + + _iceReadMemberImpl(istr) + { + this.e = istr.readInt(); + } +}; + +Ice.defineValue(Test.Extended, "::Test::Extended"); +Ice.TypeRegistry.declareValueType("Test.Extended", Test.Extended); diff --git a/slice2js/cpp/test/Ice/exceptions/TestAMD.js b/slice2js/cpp/test/Ice/exceptions/TestAMD.js index 3b8d7f1d0c13..178ca806f786 100644 --- a/slice2js/cpp/test/Ice/exceptions/TestAMD.js +++ b/slice2js/cpp/test/Ice/exceptions/TestAMD.js @@ -331,8 +331,8 @@ Ice.defineOperations( ], , ], "throwAorDasAorD": [, , , , [[3]], , [ - Test.D, - Test.A + Test.A, + Test.D ], , ], "throwBasA": [, , , , [[3], [3]], , [ diff --git a/slice2js/python/test/Ice/exceptions/Test.js b/slice2js/python/test/Ice/exceptions/Test.js index 1e6390f85fc2..df7b49e54f87 100644 --- a/slice2js/python/test/Ice/exceptions/Test.js +++ b/slice2js/python/test/Ice/exceptions/Test.js @@ -257,8 +257,8 @@ Ice.defineOperations( ], , ], "throwAorDasAorD": [, , , , [[3]], , [ - Test.A, - Test.D + Test.D, + Test.A ], , ], "throwBasA": [, , , , [[3], [3]], , [ diff --git a/slice2js/slice/DataStorm/Sample.js b/slice2js/slice/DataStorm/Sample.js new file mode 100644 index 000000000000..f9486ce3a5e4 --- /dev/null +++ b/slice2js/slice/DataStorm/Sample.js @@ -0,0 +1,36 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Sample.ice' +// +// Warning: do not edit this file. +// +// +// + +/* eslint-disable */ +/* jshint ignore: start */ + +import { Ice } from "ice"; + + +export const DataStorm = {}; + +/** + * The sample event. + * + * The sample event matches the operation used by the DataWriter to update + * the data element. It also provides information on what to expect from + * the sample. A sample with the Add or Update event always provide a value + * while a sample with the Remove type doesn't. + * + **/ +DataStorm.SampleEvent = Ice.defineEnum([ + ['Add', 0], ['Update', 1], ['PartialUpdate', 2], ['Remove', 3]]); + +DataStorm.SampleEventSeqHelper = Ice.StreamHelpers.generateSeqHelper(DataStorm.SampleEvent._helper, false); diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/ClearHistoryPolicy.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ClearHistoryPolicy.m new file mode 100644 index 000000000000..a09795694cca --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ClearHistoryPolicy.m @@ -0,0 +1,62 @@ +% ClearHistoryPolicy Summary of ClearHistoryPolicy +% +% ClearHistoryPolicy Properties: +% OnAdd +% OnRemove +% OnAll +% OnAllExceptPartialUpdate +% Never + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef ClearHistoryPolicy < uint8 + enumeration + OnAdd (0) + OnRemove (1) + OnAll (2) + OnAllExceptPartialUpdate (3) + Never (4) + end + methods(Static) + function ice_write(os, v) + if isempty(v) + os.writeEnum(int32(DataStormContract.ClearHistoryPolicy.OnAdd), 4); + else + os.writeEnum(int32(v), 4); + end + end + function r = ice_read(is) + v = is.readEnum(4); + r = DataStormContract.ClearHistoryPolicy.ice_getValue(v); + end + function ice_writeOpt(os, tag, v) + if v ~= Ice.Unset && os.writeOptional(tag, Ice.OptionalFormat.Size) + DataStormContract.ClearHistoryPolicy.ice_write(os, v); + end + end + function r = ice_readOpt(is, tag) + if is.readOptional(tag, Ice.OptionalFormat.Size) + r = DataStormContract.ClearHistoryPolicy.ice_read(is); + else + r = Ice.Unset; + end + end + function r = ice_getValue(v) + switch v + case 0 + r = DataStormContract.ClearHistoryPolicy.OnAdd; + case 1 + r = DataStormContract.ClearHistoryPolicy.OnRemove; + case 2 + r = DataStormContract.ClearHistoryPolicy.OnAll; + case 3 + r = DataStormContract.ClearHistoryPolicy.OnAllExceptPartialUpdate; + case 4 + r = DataStormContract.ClearHistoryPolicy.Never; + otherwise + throw(Ice.MarshalException(sprintf('enumerator value %d is out of range', v))); + end + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/DataSample.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/DataSample.m new file mode 100644 index 000000000000..40daef1de577 --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/DataSample.m @@ -0,0 +1,98 @@ +% DataSample Summary of DataSample +% +% DataSample Properties: +% id - The sample id. +% keyId - The key id. +% keyValue - The key value if the key ID <= 0. +% timestamp - The timestamp of the sample (write time). +% tag - The update tag if the sample event is PartialUpdate. +% event - The sample event. +% value - The value of the sample. + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef DataSample + properties + % id - The sample id. + id int64 + % keyId - The key id. + keyId int64 + % keyValue - The key value if the key ID <= 0. + keyValue + % timestamp - The timestamp of the sample (write time). + timestamp int64 + % tag - The update tag if the sample event is PartialUpdate. + tag int64 + % event - The sample event. + event DataStorm.SampleEvent + % value - The value of the sample. + value + end + methods + function obj = DataSample(id, keyId, keyValue, timestamp, tag, event, value) + if nargin == 0 + obj.id = 0; + obj.keyId = 0; + obj.keyValue = []; + obj.timestamp = 0; + obj.tag = 0; + obj.event = DataStorm.SampleEvent.Add; + obj.value = []; + elseif ne(id, IceInternal.NoInit.Instance) + obj.id = id; + obj.keyId = keyId; + obj.keyValue = keyValue; + obj.timestamp = timestamp; + obj.tag = tag; + obj.event = event; + obj.value = value; + end + end + function r = eq(obj, other) + r = isequal(obj, other); + end + function r = ne(obj, other) + r = ~isequal(obj, other); + end + end + methods(Static) + function r = ice_read(is) + r = DataStormContract.DataSample(IceInternal.NoInit.Instance); + r.id = is.readLong(); + r.keyId = is.readLong(); + r.keyValue = is.readByteSeq(); + r.timestamp = is.readLong(); + r.tag = is.readLong(); + r.event = DataStorm.SampleEvent.ice_read(is); + r.value = is.readByteSeq(); + end + function ice_write(os, v) + if isempty(v) + v = DataStormContract.DataSample(); + end + os.writeLong(v.id); + os.writeLong(v.keyId); + os.writeByteSeq(v.keyValue); + os.writeLong(v.timestamp); + os.writeLong(v.tag); + DataStorm.SampleEvent.ice_write(os, v.event); + os.writeByteSeq(v.value); + end + function r = ice_readOpt(is, tag) + if is.readOptional(tag, Ice.OptionalFormat.FSize) + is.skip(4); + r = DataStormContract.DataSample.ice_read(is); + else + r = Ice.Unset; + end + end + function ice_writeOpt(os, tag, v) + if v ~= Ice.Unset && os.writeOptional(tag, Ice.OptionalFormat.FSize) + pos = os.startSize(); + DataStormContract.DataSample.ice_write(os, v); + os.endSize(pos); + end + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/DataSampleSeq.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/DataSampleSeq.m new file mode 100644 index 000000000000..9ce3b2dfe21c --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/DataSampleSeq.m @@ -0,0 +1,46 @@ + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef DataSampleSeq + methods(Static) + function write(os, seq) + sz = length(seq); + os.writeSize(sz); + for i = 1:sz + DataStormContract.DataSample.ice_write(os, seq(i)); + end + end + function r = read(is) + sz = is.readSize(); + r = DataStormContract.DataSample.empty(); + if sz > 0 + r(1, sz) = DataStormContract.DataSample(); + for i = 1:sz + r(i).id = is.readLong(); + r(i).keyId = is.readLong(); + r(i).keyValue = is.readByteSeq(); + r(i).timestamp = is.readLong(); + r(i).tag = is.readLong(); + r(i).event = DataStorm.SampleEvent.ice_read(is); + r(i).value = is.readByteSeq(); + end + end + end + function writeOpt(os, tag, seq) + if seq ~= Ice.Unset && os.writeOptional(tag, Ice.OptionalFormat.FSize) + pos = os.startSize(); + DataStormContract.DataSampleSeq.write(os, seq); + os.endSize(pos); + end + end + function r = readOpt(is, tag) + if is.readOptional(tag, Ice.OptionalFormat.FSize) + is.skip(4); + r = DataStormContract.DataSampleSeq.read(is); + else + r = Ice.Unset; + end + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/DataSamples.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/DataSamples.m new file mode 100644 index 000000000000..4ed1f54dabf3 --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/DataSamples.m @@ -0,0 +1,63 @@ +% DataSamples Summary of DataSamples +% +% DataSamples Properties: +% id - The id of the writer or reader. +% samples - The samples. + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef DataSamples + properties + % id - The id of the writer or reader. + id int64 + % samples - The samples. + samples + end + methods + function obj = DataSamples(id, samples) + if nargin == 0 + obj.id = 0; + obj.samples = []; + elseif ne(id, IceInternal.NoInit.Instance) + obj.id = id; + obj.samples = samples; + end + end + function r = eq(obj, other) + r = isequal(obj, other); + end + function r = ne(obj, other) + r = ~isequal(obj, other); + end + end + methods(Static) + function r = ice_read(is) + r = DataStormContract.DataSamples(IceInternal.NoInit.Instance); + r.id = is.readLong(); + r.samples = DataStormContract.DataSampleSeq.read(is); + end + function ice_write(os, v) + if isempty(v) + v = DataStormContract.DataSamples(); + end + os.writeLong(v.id); + DataStormContract.DataSampleSeq.write(os, v.samples); + end + function r = ice_readOpt(is, tag) + if is.readOptional(tag, Ice.OptionalFormat.FSize) + is.skip(4); + r = DataStormContract.DataSamples.ice_read(is); + else + r = Ice.Unset; + end + end + function ice_writeOpt(os, tag, v) + if v ~= Ice.Unset && os.writeOptional(tag, Ice.OptionalFormat.FSize) + pos = os.startSize(); + DataStormContract.DataSamples.ice_write(os, v); + os.endSize(pos); + end + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/DataSamplesSeq.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/DataSamplesSeq.m new file mode 100644 index 000000000000..5fb7b14d8da7 --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/DataSamplesSeq.m @@ -0,0 +1,41 @@ + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef DataSamplesSeq + methods(Static) + function write(os, seq) + sz = length(seq); + os.writeSize(sz); + for i = 1:sz + DataStormContract.DataSamples.ice_write(os, seq(i)); + end + end + function r = read(is) + sz = is.readSize(); + r = DataStormContract.DataSamples.empty(); + if sz > 0 + r(1, sz) = DataStormContract.DataSamples(); + for i = 1:sz + r(i).id = is.readLong(); + r(i).samples = DataStormContract.DataSampleSeq.read(is); + end + end + end + function writeOpt(os, tag, seq) + if seq ~= Ice.Unset && os.writeOptional(tag, Ice.OptionalFormat.FSize) + pos = os.startSize(); + DataStormContract.DataSamplesSeq.write(os, seq); + os.endSize(pos); + end + end + function r = readOpt(is, tag) + if is.readOptional(tag, Ice.OptionalFormat.FSize) + is.skip(4); + r = DataStormContract.DataSamplesSeq.read(is); + else + r = Ice.Unset; + end + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementConfig.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementConfig.m new file mode 100644 index 000000000000..8002c33d12b1 --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementConfig.m @@ -0,0 +1,78 @@ +% ElementConfig Summary of ElementConfig +% +% ElementConfig Properties: +% facet +% sampleFilter +% name +% priority +% sampleCount +% sampleLifetime +% clearHistory + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef ElementConfig < Ice.Value + properties + facet + sampleFilter + name + priority + sampleCount + sampleLifetime + clearHistory + end + methods + function obj = ElementConfig(facet, sampleFilter, name, priority, sampleCount, sampleLifetime, clearHistory) + if nargin == 0 + obj.facet = IceInternal.UnsetI.Instance; + obj.sampleFilter = IceInternal.UnsetI.Instance; + obj.name = IceInternal.UnsetI.Instance; + obj.priority = IceInternal.UnsetI.Instance; + obj.sampleCount = IceInternal.UnsetI.Instance; + obj.sampleLifetime = IceInternal.UnsetI.Instance; + obj.clearHistory = IceInternal.UnsetI.Instance; + elseif ne(facet, IceInternal.NoInit.Instance) + obj.facet = facet; + obj.sampleFilter = sampleFilter; + obj.name = name; + obj.priority = priority; + obj.sampleCount = sampleCount; + obj.sampleLifetime = sampleLifetime; + obj.clearHistory = clearHistory; + end; + end + function id = ice_id(obj) + id = obj.ice_staticId(); + end + end + methods(Access=protected) + function iceWriteImpl(obj, os) + os.startSlice('::DataStormContract::ElementConfig', 1, true); + os.writeStringOpt(1, obj.facet); + DataStormContract.FilterInfo.ice_writeOpt(os, 2, obj.sampleFilter); + os.writeStringOpt(3, obj.name); + os.writeIntOpt(4, obj.priority); + os.writeIntOpt(10, obj.sampleCount); + os.writeIntOpt(11, obj.sampleLifetime); + DataStormContract.ClearHistoryPolicy.ice_writeOpt(os, 12, obj.clearHistory); + os.endSlice(); + end + function iceReadImpl(obj, is) + is.startSlice(); + obj.facet = is.readStringOpt(1); + obj.sampleFilter = DataStormContract.FilterInfo.ice_readOpt(is, 2); + obj.name = is.readStringOpt(3); + obj.priority = is.readIntOpt(4); + obj.sampleCount = is.readIntOpt(10); + obj.sampleLifetime = is.readIntOpt(11); + obj.clearHistory = DataStormContract.ClearHistoryPolicy.ice_readOpt(is, 12); + is.endSlice(); + end + end + methods(Static) + function id = ice_staticId() + id = '::DataStormContract::ElementConfig'; + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementData.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementData.m new file mode 100644 index 000000000000..3401ad064ce6 --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementData.m @@ -0,0 +1,60 @@ +% ElementData Summary of ElementData +% +% ElementData Properties: +% id - The id of the writer or reader +% config - The config of the writer or reader +% lastIds - The lastIds received by the reader. + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef ElementData + properties + % id - The id of the writer or reader + id int64 + % config - The config of the writer or reader + config + % lastIds - The lastIds received by the reader. + lastIds containers.Map + end + methods + function obj = ElementData(id, config, lastIds) + if nargin == 0 + obj.id = 0; + obj.config = []; + obj.lastIds = containers.Map('KeyType', 'int64', 'ValueType', 'int64'); + elseif ne(id, IceInternal.NoInit.Instance) + obj.id = id; + obj.config = config; + obj.lastIds = lastIds; + end + end + function r = eq(obj, other) + r = isequal(obj, other); + end + function r = ne(obj, other) + r = ~isequal(obj, other); + end + function obj = ice_convert(obj) + obj.config = obj.config.value; + end + end + methods(Static) + function r = ice_read(is) + r = DataStormContract.ElementData(IceInternal.NoInit.Instance); + r.id = is.readLong(); + config_ = IceInternal.ValueHolder(); + r.config = config_; + is.readValue(@(v_) config_.set(v_), 'DataStormContract.ElementConfig'); + r.lastIds = DataStormContract.LongLongDict.read(is); + end + function ice_write(os, v) + if isempty(v) + v = DataStormContract.ElementData(); + end + os.writeLong(v.id); + os.writeValue(v.config); + DataStormContract.LongLongDict.write(os, v.lastIds); + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementDataAck.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementDataAck.m new file mode 100644 index 000000000000..e2081e0c5320 --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementDataAck.m @@ -0,0 +1,74 @@ +% ElementDataAck Summary of ElementDataAck +% +% ElementDataAck Properties: +% id - The id of the writer or filter. +% config - The config of the writer or reader +% lastIds - The lastIds received by the reader. +% samples - The samples of the writer or reader +% peerId - The id of the writer or reader on the peer. + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef ElementDataAck + properties + % id - The id of the writer or filter. + id int64 + % config - The config of the writer or reader + config + % lastIds - The lastIds received by the reader. + lastIds containers.Map + % samples - The samples of the writer or reader + samples + % peerId - The id of the writer or reader on the peer. + peerId int64 + end + methods + function obj = ElementDataAck(id, config, lastIds, samples, peerId) + if nargin == 0 + obj.id = 0; + obj.config = []; + obj.lastIds = containers.Map('KeyType', 'int64', 'ValueType', 'int64'); + obj.samples = []; + obj.peerId = 0; + elseif ne(id, IceInternal.NoInit.Instance) + obj.id = id; + obj.config = config; + obj.lastIds = lastIds; + obj.samples = samples; + obj.peerId = peerId; + end + end + function r = eq(obj, other) + r = isequal(obj, other); + end + function r = ne(obj, other) + r = ~isequal(obj, other); + end + function obj = ice_convert(obj) + obj.config = obj.config.value; + end + end + methods(Static) + function r = ice_read(is) + r = DataStormContract.ElementDataAck(IceInternal.NoInit.Instance); + r.id = is.readLong(); + config_ = IceInternal.ValueHolder(); + r.config = config_; + is.readValue(@(v_) config_.set(v_), 'DataStormContract.ElementConfig'); + r.lastIds = DataStormContract.LongLongDict.read(is); + r.samples = DataStormContract.DataSampleSeq.read(is); + r.peerId = is.readLong(); + end + function ice_write(os, v) + if isempty(v) + v = DataStormContract.ElementDataAck(); + end + os.writeLong(v.id); + os.writeValue(v.config); + DataStormContract.LongLongDict.write(os, v.lastIds); + DataStormContract.DataSampleSeq.write(os, v.samples); + os.writeLong(v.peerId); + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementDataAckSeq.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementDataAckSeq.m new file mode 100644 index 000000000000..e4c9cf5a2a75 --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementDataAckSeq.m @@ -0,0 +1,37 @@ + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef ElementDataAckSeq + methods(Static) + function write(os, seq) + sz = length(seq); + os.writeSize(sz); + for i = 1:sz + DataStormContract.ElementDataAck.ice_write(os, seq(i)); + end + end + function r = read(is) + sz = is.readSize(); + r = DataStormContract.ElementDataAck.empty(); + if sz > 0 + r(1, sz) = DataStormContract.ElementDataAck(); + for i = 1:sz + r(i).id = is.readLong(); + config_ = IceInternal.ValueHolder(); + r(i).config = config_; + is.readValue(@(v_) config_.set(v_), 'DataStormContract.ElementConfig'); + r(i).lastIds = DataStormContract.LongLongDict.read(is); + r(i).samples = DataStormContract.DataSampleSeq.read(is); + r(i).peerId = is.readLong(); + end + end + end + function r = convert(seq) + r = seq; + for i = 1:length(seq) + r(i).config = r(i).config.value; + end + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementDataSeq.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementDataSeq.m new file mode 100644 index 000000000000..428aff877975 --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementDataSeq.m @@ -0,0 +1,35 @@ + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef ElementDataSeq + methods(Static) + function write(os, seq) + sz = length(seq); + os.writeSize(sz); + for i = 1:sz + DataStormContract.ElementData.ice_write(os, seq(i)); + end + end + function r = read(is) + sz = is.readSize(); + r = DataStormContract.ElementData.empty(); + if sz > 0 + r(1, sz) = DataStormContract.ElementData(); + for i = 1:sz + r(i).id = is.readLong(); + config_ = IceInternal.ValueHolder(); + r(i).config = config_; + is.readValue(@(v_) config_.set(v_), 'DataStormContract.ElementConfig'); + r(i).lastIds = DataStormContract.LongLongDict.read(is); + end + end + end + function r = convert(seq) + r = seq; + for i = 1:length(seq) + r(i).config = r(i).config.value; + end + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementInfo.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementInfo.m new file mode 100644 index 000000000000..056d6f7fb06c --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementInfo.m @@ -0,0 +1,70 @@ +% ElementInfo Summary of ElementInfo +% +% ElementInfo Properties: +% id - The key or filter id. +% name - The filter name. +% value - The key or filter value. + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef ElementInfo + properties + % id - The key or filter id. + id int64 + % name - The filter name. + name char + % value - The key or filter value. + value + end + methods + function obj = ElementInfo(id, name, value) + if nargin == 0 + obj.id = 0; + obj.name = ''; + obj.value = []; + elseif ne(id, IceInternal.NoInit.Instance) + obj.id = id; + obj.name = name; + obj.value = value; + end + end + function r = eq(obj, other) + r = isequal(obj, other); + end + function r = ne(obj, other) + r = ~isequal(obj, other); + end + end + methods(Static) + function r = ice_read(is) + r = DataStormContract.ElementInfo(IceInternal.NoInit.Instance); + r.id = is.readLong(); + r.name = is.readString(); + r.value = is.readByteSeq(); + end + function ice_write(os, v) + if isempty(v) + v = DataStormContract.ElementInfo(); + end + os.writeLong(v.id); + os.writeString(v.name); + os.writeByteSeq(v.value); + end + function r = ice_readOpt(is, tag) + if is.readOptional(tag, Ice.OptionalFormat.FSize) + is.skip(4); + r = DataStormContract.ElementInfo.ice_read(is); + else + r = Ice.Unset; + end + end + function ice_writeOpt(os, tag, v) + if v ~= Ice.Unset && os.writeOptional(tag, Ice.OptionalFormat.FSize) + pos = os.startSize(); + DataStormContract.ElementInfo.ice_write(os, v); + os.endSize(pos); + end + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementInfoSeq.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementInfoSeq.m new file mode 100644 index 000000000000..e833bc8f1310 --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementInfoSeq.m @@ -0,0 +1,42 @@ + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef ElementInfoSeq + methods(Static) + function write(os, seq) + sz = length(seq); + os.writeSize(sz); + for i = 1:sz + DataStormContract.ElementInfo.ice_write(os, seq(i)); + end + end + function r = read(is) + sz = is.readSize(); + r = DataStormContract.ElementInfo.empty(); + if sz > 0 + r(1, sz) = DataStormContract.ElementInfo(); + for i = 1:sz + r(i).id = is.readLong(); + r(i).name = is.readString(); + r(i).value = is.readByteSeq(); + end + end + end + function writeOpt(os, tag, seq) + if seq ~= Ice.Unset && os.writeOptional(tag, Ice.OptionalFormat.FSize) + pos = os.startSize(); + DataStormContract.ElementInfoSeq.write(os, seq); + os.endSize(pos); + end + end + function r = readOpt(is, tag) + if is.readOptional(tag, Ice.OptionalFormat.FSize) + is.skip(4); + r = DataStormContract.ElementInfoSeq.read(is); + else + r = Ice.Unset; + end + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementSpec.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementSpec.m new file mode 100644 index 000000000000..6e07d195104f --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementSpec.m @@ -0,0 +1,79 @@ +% ElementSpec Summary of ElementSpec +% +% ElementSpec Properties: +% elements - The readers and writers associated with the key or filter. +% id - The id of the key or filter +% name - The name of the filter. +% value - The value of the key or filter. +% peerId - The id of the key or filter from the peer. +% peerName - The name of the filter from the peer. + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef ElementSpec + properties + % elements - The readers and writers associated with the key or filter. + elements + % id - The id of the key or filter + id int64 + % name - The name of the filter. + name char + % value - The value of the key or filter. + value + % peerId - The id of the key or filter from the peer. + peerId int64 + % peerName - The name of the filter from the peer. + peerName char + end + methods + function obj = ElementSpec(elements, id, name, value, peerId, peerName) + if nargin == 0 + obj.elements = []; + obj.id = 0; + obj.name = ''; + obj.value = []; + obj.peerId = 0; + obj.peerName = ''; + elseif ne(elements, IceInternal.NoInit.Instance) + obj.elements = elements; + obj.id = id; + obj.name = name; + obj.value = value; + obj.peerId = peerId; + obj.peerName = peerName; + end + end + function r = eq(obj, other) + r = isequal(obj, other); + end + function r = ne(obj, other) + r = ~isequal(obj, other); + end + function obj = ice_convert(obj) + obj.elements = DataStormContract.ElementDataSeq.convert(obj.elements); + end + end + methods(Static) + function r = ice_read(is) + r = DataStormContract.ElementSpec(IceInternal.NoInit.Instance); + r.elements = DataStormContract.ElementDataSeq.read(is); + r.id = is.readLong(); + r.name = is.readString(); + r.value = is.readByteSeq(); + r.peerId = is.readLong(); + r.peerName = is.readString(); + end + function ice_write(os, v) + if isempty(v) + v = DataStormContract.ElementSpec(); + end + DataStormContract.ElementDataSeq.write(os, v.elements); + os.writeLong(v.id); + os.writeString(v.name); + os.writeByteSeq(v.value); + os.writeLong(v.peerId); + os.writeString(v.peerName); + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementSpecAck.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementSpecAck.m new file mode 100644 index 000000000000..1439228d34a3 --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementSpecAck.m @@ -0,0 +1,79 @@ +% ElementSpecAck Summary of ElementSpecAck +% +% ElementSpecAck Properties: +% elements - The readers or writers associated with the key or filter. +% id - The id of the key or filter. +% name - The name of the filter. +% value - The key or filter value. +% peerId - The id of the key or filter on the peer. +% peerName - The name of the filter on the peer. + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef ElementSpecAck + properties + % elements - The readers or writers associated with the key or filter. + elements + % id - The id of the key or filter. + id int64 + % name - The name of the filter. + name char + % value - The key or filter value. + value + % peerId - The id of the key or filter on the peer. + peerId int64 + % peerName - The name of the filter on the peer. + peerName char + end + methods + function obj = ElementSpecAck(elements, id, name, value, peerId, peerName) + if nargin == 0 + obj.elements = []; + obj.id = 0; + obj.name = ''; + obj.value = []; + obj.peerId = 0; + obj.peerName = ''; + elseif ne(elements, IceInternal.NoInit.Instance) + obj.elements = elements; + obj.id = id; + obj.name = name; + obj.value = value; + obj.peerId = peerId; + obj.peerName = peerName; + end + end + function r = eq(obj, other) + r = isequal(obj, other); + end + function r = ne(obj, other) + r = ~isequal(obj, other); + end + function obj = ice_convert(obj) + obj.elements = DataStormContract.ElementDataAckSeq.convert(obj.elements); + end + end + methods(Static) + function r = ice_read(is) + r = DataStormContract.ElementSpecAck(IceInternal.NoInit.Instance); + r.elements = DataStormContract.ElementDataAckSeq.read(is); + r.id = is.readLong(); + r.name = is.readString(); + r.value = is.readByteSeq(); + r.peerId = is.readLong(); + r.peerName = is.readString(); + end + function ice_write(os, v) + if isempty(v) + v = DataStormContract.ElementSpecAck(); + end + DataStormContract.ElementDataAckSeq.write(os, v.elements); + os.writeLong(v.id); + os.writeString(v.name); + os.writeByteSeq(v.value); + os.writeLong(v.peerId); + os.writeString(v.peerName); + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementSpecAckSeq.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementSpecAckSeq.m new file mode 100644 index 000000000000..e987381982c5 --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementSpecAckSeq.m @@ -0,0 +1,36 @@ + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef ElementSpecAckSeq + methods(Static) + function write(os, seq) + sz = length(seq); + os.writeSize(sz); + for i = 1:sz + DataStormContract.ElementSpecAck.ice_write(os, seq(i)); + end + end + function r = read(is) + sz = is.readSize(); + r = DataStormContract.ElementSpecAck.empty(); + if sz > 0 + r(1, sz) = DataStormContract.ElementSpecAck(); + for i = 1:sz + r(i).elements = DataStormContract.ElementDataAckSeq.read(is); + r(i).id = is.readLong(); + r(i).name = is.readString(); + r(i).value = is.readByteSeq(); + r(i).peerId = is.readLong(); + r(i).peerName = is.readString(); + end + end + end + function r = convert(seq) + r = seq; + for i = 1:length(seq) + r(i).elements = DataStormContract.ElementDataAckSeq.convert(r(i).elements); + end + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementSpecSeq.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementSpecSeq.m new file mode 100644 index 000000000000..b70b95764909 --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/ElementSpecSeq.m @@ -0,0 +1,36 @@ + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef ElementSpecSeq + methods(Static) + function write(os, seq) + sz = length(seq); + os.writeSize(sz); + for i = 1:sz + DataStormContract.ElementSpec.ice_write(os, seq(i)); + end + end + function r = read(is) + sz = is.readSize(); + r = DataStormContract.ElementSpec.empty(); + if sz > 0 + r(1, sz) = DataStormContract.ElementSpec(); + for i = 1:sz + r(i).elements = DataStormContract.ElementDataSeq.read(is); + r(i).id = is.readLong(); + r(i).name = is.readString(); + r(i).value = is.readByteSeq(); + r(i).peerId = is.readLong(); + r(i).peerName = is.readString(); + end + end + end + function r = convert(seq) + r = seq; + for i = 1:length(seq) + r(i).elements = DataStormContract.ElementDataSeq.convert(r(i).elements); + end + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/FilterInfo.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/FilterInfo.m new file mode 100644 index 000000000000..4bb833422e83 --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/FilterInfo.m @@ -0,0 +1,61 @@ +% FilterInfo Summary of FilterInfo +% +% FilterInfo Properties: +% name +% criteria + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef FilterInfo + properties + name char + criteria + end + methods + function obj = FilterInfo(name, criteria) + if nargin == 0 + obj.name = ''; + obj.criteria = []; + elseif ne(name, IceInternal.NoInit.Instance) + obj.name = name; + obj.criteria = criteria; + end + end + function r = eq(obj, other) + r = isequal(obj, other); + end + function r = ne(obj, other) + r = ~isequal(obj, other); + end + end + methods(Static) + function r = ice_read(is) + r = DataStormContract.FilterInfo(IceInternal.NoInit.Instance); + r.name = is.readString(); + r.criteria = is.readByteSeq(); + end + function ice_write(os, v) + if isempty(v) + v = DataStormContract.FilterInfo(); + end + os.writeString(v.name); + os.writeByteSeq(v.criteria); + end + function r = ice_readOpt(is, tag) + if is.readOptional(tag, Ice.OptionalFormat.FSize) + is.skip(4); + r = DataStormContract.FilterInfo.ice_read(is); + else + r = Ice.Unset; + end + end + function ice_writeOpt(os, tag, v) + if v ~= Ice.Unset && os.writeOptional(tag, Ice.OptionalFormat.FSize) + pos = os.startSize(); + DataStormContract.FilterInfo.ice_write(os, v); + os.endSize(pos); + end + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/LongLongDict.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/LongLongDict.m new file mode 100644 index 000000000000..b92415d46d7a --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/LongLongDict.m @@ -0,0 +1,56 @@ + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef LongLongDict + methods(Access=private) + function obj = LongLongDict() + end + end + methods(Static) + function write(os, d) + if isempty(d) + os.writeSize(0); + else + sz = d.Count; + os.writeSize(sz); + keys = d.keys(); + values = d.values(); + for i = 1:sz + k = keys{i}; + v = values{i}; + os.writeLong(k); + os.writeLong(v); + end + end + end + function r = read(is) + sz = is.readSize(); + r = containers.Map('KeyType', 'int64', 'ValueType', 'int64'); + for i = 1:sz + k = is.readLong(); + v = is.readLong(); + r(k) = v; + end + end + function writeOpt(os, tag, d) + if d ~= Ice.Unset && os.writeOptional(tag, Ice.OptionalFormat.VSize) + len = length(d); + if len > 254 + os.writeSize(len * 16 + 5); + else + os.writeSize(len * 16 + 1); + end + DataStormContract.LongLongDict.write(os, d); + end + end + function r = readOpt(is, tag) + if is.readOptional(tag, Ice.OptionalFormat.VSize) + is.skipSize(); + r = DataStormContract.LongLongDict.read(is); + else + r = Ice.Unset; + end + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/LookupPrx.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/LookupPrx.m new file mode 100644 index 000000000000..837aa6faaef6 --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/LookupPrx.m @@ -0,0 +1,184 @@ +% LookupPrx Summary of LookupPrx +% +% LookupPrx Methods: +% announceTopicReader +% announceTopicReaderAsync +% announceTopicWriter +% announceTopicWriterAsync +% announceTopics +% announceTopicsAsync +% createSession +% createSessionAsync +% checkedCast - Contacts the remote server to verify that the object implements this type. +% uncheckedCast - Downcasts the given proxy to this type without contacting the remote server. + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef LookupPrx < Ice.ObjectPrx + methods + function announceTopicReader(obj, topic, node, varargin) + % announceTopicReader + % + % Parameters: + % topic (char) + % node (DataStormContract.NodePrx) + % context (containers.Map) - Optional request context. + + os_ = obj.iceStartWriteParams([]); + os_.writeString(topic); + os_.writeProxy(node); + obj.iceEndWriteParams(os_); + obj.iceInvoke('announceTopicReader', 2, false, os_, false, {}, varargin{:}); + end + function r_ = announceTopicReaderAsync(obj, topic, node, varargin) + % announceTopicReaderAsync + % + % Parameters: + % topic (char) + % node (DataStormContract.NodePrx) + % context (containers.Map) - Optional request context. + % + % Returns (Ice.Future) - A future that will be completed with the results of the invocation. + + os_ = obj.iceStartWriteParams([]); + os_.writeString(topic); + os_.writeProxy(node); + obj.iceEndWriteParams(os_); + r_ = obj.iceInvokeAsync('announceTopicReader', 2, false, os_, 0, [], {}, varargin{:}); + end + function announceTopicWriter(obj, topic, node, varargin) + % announceTopicWriter + % + % Parameters: + % topic (char) + % node (DataStormContract.NodePrx) + % context (containers.Map) - Optional request context. + + os_ = obj.iceStartWriteParams([]); + os_.writeString(topic); + os_.writeProxy(node); + obj.iceEndWriteParams(os_); + obj.iceInvoke('announceTopicWriter', 2, false, os_, false, {}, varargin{:}); + end + function r_ = announceTopicWriterAsync(obj, topic, node, varargin) + % announceTopicWriterAsync + % + % Parameters: + % topic (char) + % node (DataStormContract.NodePrx) + % context (containers.Map) - Optional request context. + % + % Returns (Ice.Future) - A future that will be completed with the results of the invocation. + + os_ = obj.iceStartWriteParams([]); + os_.writeString(topic); + os_.writeProxy(node); + obj.iceEndWriteParams(os_); + r_ = obj.iceInvokeAsync('announceTopicWriter', 2, false, os_, 0, [], {}, varargin{:}); + end + function announceTopics(obj, readers, writers, node, varargin) + % announceTopics + % + % Parameters: + % readers (DataStormContract.StringSeq) + % writers (DataStormContract.StringSeq) + % node (DataStormContract.NodePrx) + % context (containers.Map) - Optional request context. + + os_ = obj.iceStartWriteParams([]); + os_.writeStringSeq(readers); + os_.writeStringSeq(writers); + os_.writeProxy(node); + obj.iceEndWriteParams(os_); + obj.iceInvoke('announceTopics', 2, false, os_, false, {}, varargin{:}); + end + function r_ = announceTopicsAsync(obj, readers, writers, node, varargin) + % announceTopicsAsync + % + % Parameters: + % readers (DataStormContract.StringSeq) + % writers (DataStormContract.StringSeq) + % node (DataStormContract.NodePrx) + % context (containers.Map) - Optional request context. + % + % Returns (Ice.Future) - A future that will be completed with the results of the invocation. + + os_ = obj.iceStartWriteParams([]); + os_.writeStringSeq(readers); + os_.writeStringSeq(writers); + os_.writeProxy(node); + obj.iceEndWriteParams(os_); + r_ = obj.iceInvokeAsync('announceTopics', 2, false, os_, 0, [], {}, varargin{:}); + end + function result = createSession(obj, node, varargin) + % createSession + % + % Parameters: + % node (DataStormContract.NodePrx) + % context (containers.Map) - Optional request context. + % + % Returns (DataStormContract.NodePrx) + + os_ = obj.iceStartWriteParams([]); + os_.writeProxy(node); + obj.iceEndWriteParams(os_); + is_ = obj.iceInvoke('createSession', 0, true, os_, true, {}, varargin{:}); + is_.startEncapsulation(); + result = DataStormContract.NodePrx.ice_read(is_); + is_.endEncapsulation(); + end + function r_ = createSessionAsync(obj, node, varargin) + % createSessionAsync + % + % Parameters: + % node (DataStormContract.NodePrx) + % context (containers.Map) - Optional request context. + % + % Returns (Ice.Future) - A future that will be completed with the results of the invocation. + + os_ = obj.iceStartWriteParams([]); + os_.writeProxy(node); + obj.iceEndWriteParams(os_); + function varargout = unmarshal(is_) + is_.startEncapsulation(); + result = DataStormContract.NodePrx.ice_read(is_); + is_.endEncapsulation(); + varargout{1} = result; + end + r_ = obj.iceInvokeAsync('createSession', 0, true, os_, 1, @unmarshal, {}, varargin{:}); + end + end + methods(Static) + function id = ice_staticId() + id = '::DataStormContract::Lookup'; + end + function r = ice_read(is) + r = is.readProxy('DataStormContract.LookupPrx'); + end + function r = checkedCast(p, varargin) + % checkedCast Contacts the remote server to verify that the object implements this type. + % Raises a local exception if a communication error occurs. You can optionally supply a + % facet name and a context map. + % + % Parameters: + % p - The proxy to be cast. + % facet - The optional name of the desired facet. + % context - The optional context map to send with the invocation. + % + % Returns (DataStormContract.LookupPrx) - A proxy for this type, or an empty array if the object does not support this type. + r = Ice.ObjectPrx.iceCheckedCast(p, DataStormContract.LookupPrx.ice_staticId(), 'DataStormContract.LookupPrx', varargin{:}); + end + function r = uncheckedCast(p, varargin) + % uncheckedCast Downcasts the given proxy to this type without contacting the remote server. + % You can optionally specify a facet name. + % + % Parameters: + % p - The proxy to be cast. + % facet - The optional name of the desired facet. + % + % Returns (DataStormContract.LookupPrx) - A proxy for this type. + r = Ice.ObjectPrx.iceUncheckedCast(p, 'DataStormContract.LookupPrx', varargin{:}); + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/NodePrx.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/NodePrx.m new file mode 100644 index 000000000000..afec75273cbb --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/NodePrx.m @@ -0,0 +1,141 @@ +% NodePrx Summary of NodePrx +% +% NodePrx Methods: +% initiateCreateSession +% initiateCreateSessionAsync +% createSession +% createSessionAsync +% confirmCreateSession +% confirmCreateSessionAsync +% checkedCast - Contacts the remote server to verify that the object implements this type. +% uncheckedCast - Downcasts the given proxy to this type without contacting the remote server. + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef NodePrx < Ice.ObjectPrx + methods + function initiateCreateSession(obj, publisher, varargin) + % initiateCreateSession + % + % Parameters: + % publisher (DataStormContract.NodePrx) + % context (containers.Map) - Optional request context. + + os_ = obj.iceStartWriteParams([]); + os_.writeProxy(publisher); + obj.iceEndWriteParams(os_); + obj.iceInvoke('initiateCreateSession', 0, false, os_, false, {}, varargin{:}); + end + function r_ = initiateCreateSessionAsync(obj, publisher, varargin) + % initiateCreateSessionAsync + % + % Parameters: + % publisher (DataStormContract.NodePrx) + % context (containers.Map) - Optional request context. + % + % Returns (Ice.Future) - A future that will be completed with the results of the invocation. + + os_ = obj.iceStartWriteParams([]); + os_.writeProxy(publisher); + obj.iceEndWriteParams(os_); + r_ = obj.iceInvokeAsync('initiateCreateSession', 0, false, os_, 0, [], {}, varargin{:}); + end + function createSession(obj, subscriber, session, fromRelay, varargin) + % createSession + % + % Parameters: + % subscriber (DataStormContract.NodePrx) + % session (DataStormContract.SubscriberSessionPrx) + % fromRelay (logical) + % context (containers.Map) - Optional request context. + + os_ = obj.iceStartWriteParams([]); + os_.writeProxy(subscriber); + os_.writeProxy(session); + os_.writeBool(fromRelay); + obj.iceEndWriteParams(os_); + obj.iceInvoke('createSession', 0, false, os_, false, {}, varargin{:}); + end + function r_ = createSessionAsync(obj, subscriber, session, fromRelay, varargin) + % createSessionAsync + % + % Parameters: + % subscriber (DataStormContract.NodePrx) + % session (DataStormContract.SubscriberSessionPrx) + % fromRelay (logical) + % context (containers.Map) - Optional request context. + % + % Returns (Ice.Future) - A future that will be completed with the results of the invocation. + + os_ = obj.iceStartWriteParams([]); + os_.writeProxy(subscriber); + os_.writeProxy(session); + os_.writeBool(fromRelay); + obj.iceEndWriteParams(os_); + r_ = obj.iceInvokeAsync('createSession', 0, false, os_, 0, [], {}, varargin{:}); + end + function confirmCreateSession(obj, publisher, session, varargin) + % confirmCreateSession + % + % Parameters: + % publisher (DataStormContract.NodePrx) + % session (DataStormContract.PublisherSessionPrx) + % context (containers.Map) - Optional request context. + + os_ = obj.iceStartWriteParams([]); + os_.writeProxy(publisher); + os_.writeProxy(session); + obj.iceEndWriteParams(os_); + obj.iceInvoke('confirmCreateSession', 0, false, os_, false, {}, varargin{:}); + end + function r_ = confirmCreateSessionAsync(obj, publisher, session, varargin) + % confirmCreateSessionAsync + % + % Parameters: + % publisher (DataStormContract.NodePrx) + % session (DataStormContract.PublisherSessionPrx) + % context (containers.Map) - Optional request context. + % + % Returns (Ice.Future) - A future that will be completed with the results of the invocation. + + os_ = obj.iceStartWriteParams([]); + os_.writeProxy(publisher); + os_.writeProxy(session); + obj.iceEndWriteParams(os_); + r_ = obj.iceInvokeAsync('confirmCreateSession', 0, false, os_, 0, [], {}, varargin{:}); + end + end + methods(Static) + function id = ice_staticId() + id = '::DataStormContract::Node'; + end + function r = ice_read(is) + r = is.readProxy('DataStormContract.NodePrx'); + end + function r = checkedCast(p, varargin) + % checkedCast Contacts the remote server to verify that the object implements this type. + % Raises a local exception if a communication error occurs. You can optionally supply a + % facet name and a context map. + % + % Parameters: + % p - The proxy to be cast. + % facet - The optional name of the desired facet. + % context - The optional context map to send with the invocation. + % + % Returns (DataStormContract.NodePrx) - A proxy for this type, or an empty array if the object does not support this type. + r = Ice.ObjectPrx.iceCheckedCast(p, DataStormContract.NodePrx.ice_staticId(), 'DataStormContract.NodePrx', varargin{:}); + end + function r = uncheckedCast(p, varargin) + % uncheckedCast Downcasts the given proxy to this type without contacting the remote server. + % You can optionally specify a facet name. + % + % Parameters: + % p - The proxy to be cast. + % facet - The optional name of the desired facet. + % + % Returns (DataStormContract.NodePrx) - A proxy for this type. + r = Ice.ObjectPrx.iceUncheckedCast(p, 'DataStormContract.NodePrx', varargin{:}); + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/PublisherSessionPrx.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/PublisherSessionPrx.m new file mode 100644 index 000000000000..8aa7f8bafe6b --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/PublisherSessionPrx.m @@ -0,0 +1,45 @@ +% PublisherSessionPrx Summary of PublisherSessionPrx +% +% PublisherSessionPrx Methods: +% checkedCast - Contacts the remote server to verify that the object implements this type. +% uncheckedCast - Downcasts the given proxy to this type without contacting the remote server. + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef PublisherSessionPrx < DataStormContract.SessionPrx + methods + end + methods(Static) + function id = ice_staticId() + id = '::DataStormContract::PublisherSession'; + end + function r = ice_read(is) + r = is.readProxy('DataStormContract.PublisherSessionPrx'); + end + function r = checkedCast(p, varargin) + % checkedCast Contacts the remote server to verify that the object implements this type. + % Raises a local exception if a communication error occurs. You can optionally supply a + % facet name and a context map. + % + % Parameters: + % p - The proxy to be cast. + % facet - The optional name of the desired facet. + % context - The optional context map to send with the invocation. + % + % Returns (DataStormContract.PublisherSessionPrx) - A proxy for this type, or an empty array if the object does not support this type. + r = Ice.ObjectPrx.iceCheckedCast(p, DataStormContract.PublisherSessionPrx.ice_staticId(), 'DataStormContract.PublisherSessionPrx', varargin{:}); + end + function r = uncheckedCast(p, varargin) + % uncheckedCast Downcasts the given proxy to this type without contacting the remote server. + % You can optionally specify a facet name. + % + % Parameters: + % p - The proxy to be cast. + % facet - The optional name of the desired facet. + % + % Returns (DataStormContract.PublisherSessionPrx) - A proxy for this type. + r = Ice.ObjectPrx.iceUncheckedCast(p, 'DataStormContract.PublisherSessionPrx', varargin{:}); + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/SessionPrx.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/SessionPrx.m new file mode 100644 index 000000000000..54e32552914a --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/SessionPrx.m @@ -0,0 +1,389 @@ +% SessionPrx Summary of SessionPrx +% +% SessionPrx Methods: +% announceTopics +% announceTopicsAsync +% attachTopic +% attachTopicAsync +% detachTopic +% detachTopicAsync +% attachTags +% attachTagsAsync +% detachTags +% detachTagsAsync +% announceElements +% announceElementsAsync +% attachElements +% attachElementsAsync +% attachElementsAck +% attachElementsAckAsync +% detachElements +% detachElementsAsync +% initSamples +% initSamplesAsync +% disconnected +% disconnectedAsync +% checkedCast - Contacts the remote server to verify that the object implements this type. +% uncheckedCast - Downcasts the given proxy to this type without contacting the remote server. + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef SessionPrx < Ice.ObjectPrx + methods + function announceTopics(obj, topics, initialize, varargin) + % announceTopics + % + % Parameters: + % topics (DataStormContract.TopicInfoSeq) + % initialize (logical) + % context (containers.Map) - Optional request context. + + os_ = obj.iceStartWriteParams([]); + DataStormContract.TopicInfoSeq.write(os_, topics); + os_.writeBool(initialize); + obj.iceEndWriteParams(os_); + obj.iceInvoke('announceTopics', 0, false, os_, false, {}, varargin{:}); + end + function r_ = announceTopicsAsync(obj, topics, initialize, varargin) + % announceTopicsAsync + % + % Parameters: + % topics (DataStormContract.TopicInfoSeq) + % initialize (logical) + % context (containers.Map) - Optional request context. + % + % Returns (Ice.Future) - A future that will be completed with the results of the invocation. + + os_ = obj.iceStartWriteParams([]); + DataStormContract.TopicInfoSeq.write(os_, topics); + os_.writeBool(initialize); + obj.iceEndWriteParams(os_); + r_ = obj.iceInvokeAsync('announceTopics', 0, false, os_, 0, [], {}, varargin{:}); + end + function attachTopic(obj, topic, varargin) + % attachTopic + % + % Parameters: + % topic (DataStormContract.TopicSpec) + % context (containers.Map) - Optional request context. + + os_ = obj.iceStartWriteParams([]); + DataStormContract.TopicSpec.ice_write(os_, topic); + obj.iceEndWriteParams(os_); + obj.iceInvoke('attachTopic', 0, false, os_, false, {}, varargin{:}); + end + function r_ = attachTopicAsync(obj, topic, varargin) + % attachTopicAsync + % + % Parameters: + % topic (DataStormContract.TopicSpec) + % context (containers.Map) - Optional request context. + % + % Returns (Ice.Future) - A future that will be completed with the results of the invocation. + + os_ = obj.iceStartWriteParams([]); + DataStormContract.TopicSpec.ice_write(os_, topic); + obj.iceEndWriteParams(os_); + r_ = obj.iceInvokeAsync('attachTopic', 0, false, os_, 0, [], {}, varargin{:}); + end + function detachTopic(obj, topic, varargin) + % detachTopic + % + % Parameters: + % topic (int64) + % context (containers.Map) - Optional request context. + + os_ = obj.iceStartWriteParams([]); + os_.writeLong(topic); + obj.iceEndWriteParams(os_); + obj.iceInvoke('detachTopic', 0, false, os_, false, {}, varargin{:}); + end + function r_ = detachTopicAsync(obj, topic, varargin) + % detachTopicAsync + % + % Parameters: + % topic (int64) + % context (containers.Map) - Optional request context. + % + % Returns (Ice.Future) - A future that will be completed with the results of the invocation. + + os_ = obj.iceStartWriteParams([]); + os_.writeLong(topic); + obj.iceEndWriteParams(os_); + r_ = obj.iceInvokeAsync('detachTopic', 0, false, os_, 0, [], {}, varargin{:}); + end + function attachTags(obj, topic, tags, initialize, varargin) + % attachTags + % + % Parameters: + % topic (int64) + % tags (DataStormContract.ElementInfoSeq) + % initialize (logical) + % context (containers.Map) - Optional request context. + + os_ = obj.iceStartWriteParams([]); + os_.writeLong(topic); + DataStormContract.ElementInfoSeq.write(os_, tags); + os_.writeBool(initialize); + obj.iceEndWriteParams(os_); + obj.iceInvoke('attachTags', 0, false, os_, false, {}, varargin{:}); + end + function r_ = attachTagsAsync(obj, topic, tags, initialize, varargin) + % attachTagsAsync + % + % Parameters: + % topic (int64) + % tags (DataStormContract.ElementInfoSeq) + % initialize (logical) + % context (containers.Map) - Optional request context. + % + % Returns (Ice.Future) - A future that will be completed with the results of the invocation. + + os_ = obj.iceStartWriteParams([]); + os_.writeLong(topic); + DataStormContract.ElementInfoSeq.write(os_, tags); + os_.writeBool(initialize); + obj.iceEndWriteParams(os_); + r_ = obj.iceInvokeAsync('attachTags', 0, false, os_, 0, [], {}, varargin{:}); + end + function detachTags(obj, topic, tags, varargin) + % detachTags + % + % Parameters: + % topic (int64) + % tags (DataStormContract.LongSeq) + % context (containers.Map) - Optional request context. + + os_ = obj.iceStartWriteParams([]); + os_.writeLong(topic); + os_.writeLongSeq(tags); + obj.iceEndWriteParams(os_); + obj.iceInvoke('detachTags', 0, false, os_, false, {}, varargin{:}); + end + function r_ = detachTagsAsync(obj, topic, tags, varargin) + % detachTagsAsync + % + % Parameters: + % topic (int64) + % tags (DataStormContract.LongSeq) + % context (containers.Map) - Optional request context. + % + % Returns (Ice.Future) - A future that will be completed with the results of the invocation. + + os_ = obj.iceStartWriteParams([]); + os_.writeLong(topic); + os_.writeLongSeq(tags); + obj.iceEndWriteParams(os_); + r_ = obj.iceInvokeAsync('detachTags', 0, false, os_, 0, [], {}, varargin{:}); + end + function announceElements(obj, topic, keys, varargin) + % announceElements + % + % Parameters: + % topic (int64) + % keys (DataStormContract.ElementInfoSeq) + % context (containers.Map) - Optional request context. + + os_ = obj.iceStartWriteParams([]); + os_.writeLong(topic); + DataStormContract.ElementInfoSeq.write(os_, keys); + obj.iceEndWriteParams(os_); + obj.iceInvoke('announceElements', 0, false, os_, false, {}, varargin{:}); + end + function r_ = announceElementsAsync(obj, topic, keys, varargin) + % announceElementsAsync + % + % Parameters: + % topic (int64) + % keys (DataStormContract.ElementInfoSeq) + % context (containers.Map) - Optional request context. + % + % Returns (Ice.Future) - A future that will be completed with the results of the invocation. + + os_ = obj.iceStartWriteParams([]); + os_.writeLong(topic); + DataStormContract.ElementInfoSeq.write(os_, keys); + obj.iceEndWriteParams(os_); + r_ = obj.iceInvokeAsync('announceElements', 0, false, os_, 0, [], {}, varargin{:}); + end + function attachElements(obj, topic, elements, initialize, varargin) + % attachElements + % + % Parameters: + % topic (int64) + % elements (DataStormContract.ElementSpecSeq) + % initialize (logical) + % context (containers.Map) - Optional request context. + + os_ = obj.iceStartWriteParams([]); + os_.writeLong(topic); + DataStormContract.ElementSpecSeq.write(os_, elements); + os_.writeBool(initialize); + os_.writePendingValues(); + obj.iceEndWriteParams(os_); + obj.iceInvoke('attachElements', 0, false, os_, false, {}, varargin{:}); + end + function r_ = attachElementsAsync(obj, topic, elements, initialize, varargin) + % attachElementsAsync + % + % Parameters: + % topic (int64) + % elements (DataStormContract.ElementSpecSeq) + % initialize (logical) + % context (containers.Map) - Optional request context. + % + % Returns (Ice.Future) - A future that will be completed with the results of the invocation. + + os_ = obj.iceStartWriteParams([]); + os_.writeLong(topic); + DataStormContract.ElementSpecSeq.write(os_, elements); + os_.writeBool(initialize); + os_.writePendingValues(); + obj.iceEndWriteParams(os_); + r_ = obj.iceInvokeAsync('attachElements', 0, false, os_, 0, [], {}, varargin{:}); + end + function attachElementsAck(obj, topic, elements, varargin) + % attachElementsAck + % + % Parameters: + % topic (int64) + % elements (DataStormContract.ElementSpecAckSeq) + % context (containers.Map) - Optional request context. + + os_ = obj.iceStartWriteParams([]); + os_.writeLong(topic); + DataStormContract.ElementSpecAckSeq.write(os_, elements); + os_.writePendingValues(); + obj.iceEndWriteParams(os_); + obj.iceInvoke('attachElementsAck', 0, false, os_, false, {}, varargin{:}); + end + function r_ = attachElementsAckAsync(obj, topic, elements, varargin) + % attachElementsAckAsync + % + % Parameters: + % topic (int64) + % elements (DataStormContract.ElementSpecAckSeq) + % context (containers.Map) - Optional request context. + % + % Returns (Ice.Future) - A future that will be completed with the results of the invocation. + + os_ = obj.iceStartWriteParams([]); + os_.writeLong(topic); + DataStormContract.ElementSpecAckSeq.write(os_, elements); + os_.writePendingValues(); + obj.iceEndWriteParams(os_); + r_ = obj.iceInvokeAsync('attachElementsAck', 0, false, os_, 0, [], {}, varargin{:}); + end + function detachElements(obj, topic, keys, varargin) + % detachElements + % + % Parameters: + % topic (int64) + % keys (DataStormContract.LongSeq) + % context (containers.Map) - Optional request context. + + os_ = obj.iceStartWriteParams([]); + os_.writeLong(topic); + os_.writeLongSeq(keys); + obj.iceEndWriteParams(os_); + obj.iceInvoke('detachElements', 0, false, os_, false, {}, varargin{:}); + end + function r_ = detachElementsAsync(obj, topic, keys, varargin) + % detachElementsAsync + % + % Parameters: + % topic (int64) + % keys (DataStormContract.LongSeq) + % context (containers.Map) - Optional request context. + % + % Returns (Ice.Future) - A future that will be completed with the results of the invocation. + + os_ = obj.iceStartWriteParams([]); + os_.writeLong(topic); + os_.writeLongSeq(keys); + obj.iceEndWriteParams(os_); + r_ = obj.iceInvokeAsync('detachElements', 0, false, os_, 0, [], {}, varargin{:}); + end + function initSamples(obj, topic, samples, varargin) + % initSamples + % + % Parameters: + % topic (int64) + % samples (DataStormContract.DataSamplesSeq) + % context (containers.Map) - Optional request context. + + os_ = obj.iceStartWriteParams([]); + os_.writeLong(topic); + DataStormContract.DataSamplesSeq.write(os_, samples); + obj.iceEndWriteParams(os_); + obj.iceInvoke('initSamples', 0, false, os_, false, {}, varargin{:}); + end + function r_ = initSamplesAsync(obj, topic, samples, varargin) + % initSamplesAsync + % + % Parameters: + % topic (int64) + % samples (DataStormContract.DataSamplesSeq) + % context (containers.Map) - Optional request context. + % + % Returns (Ice.Future) - A future that will be completed with the results of the invocation. + + os_ = obj.iceStartWriteParams([]); + os_.writeLong(topic); + DataStormContract.DataSamplesSeq.write(os_, samples); + obj.iceEndWriteParams(os_); + r_ = obj.iceInvokeAsync('initSamples', 0, false, os_, 0, [], {}, varargin{:}); + end + function disconnected(obj, varargin) + % disconnected + % + % Parameters: + % context (containers.Map) - Optional request context. + + obj.iceInvoke('disconnected', 0, false, [], false, {}, varargin{:}); + end + function r_ = disconnectedAsync(obj, varargin) + % disconnectedAsync + % + % Parameters: + % context (containers.Map) - Optional request context. + % + % Returns (Ice.Future) - A future that will be completed with the results of the invocation. + + r_ = obj.iceInvokeAsync('disconnected', 0, false, [], 0, [], {}, varargin{:}); + end + end + methods(Static) + function id = ice_staticId() + id = '::DataStormContract::Session'; + end + function r = ice_read(is) + r = is.readProxy('DataStormContract.SessionPrx'); + end + function r = checkedCast(p, varargin) + % checkedCast Contacts the remote server to verify that the object implements this type. + % Raises a local exception if a communication error occurs. You can optionally supply a + % facet name and a context map. + % + % Parameters: + % p - The proxy to be cast. + % facet - The optional name of the desired facet. + % context - The optional context map to send with the invocation. + % + % Returns (DataStormContract.SessionPrx) - A proxy for this type, or an empty array if the object does not support this type. + r = Ice.ObjectPrx.iceCheckedCast(p, DataStormContract.SessionPrx.ice_staticId(), 'DataStormContract.SessionPrx', varargin{:}); + end + function r = uncheckedCast(p, varargin) + % uncheckedCast Downcasts the given proxy to this type without contacting the remote server. + % You can optionally specify a facet name. + % + % Parameters: + % p - The proxy to be cast. + % facet - The optional name of the desired facet. + % + % Returns (DataStormContract.SessionPrx) - A proxy for this type. + r = Ice.ObjectPrx.iceUncheckedCast(p, 'DataStormContract.SessionPrx', varargin{:}); + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/SubscriberSessionPrx.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/SubscriberSessionPrx.m new file mode 100644 index 000000000000..76afd751dc3c --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/SubscriberSessionPrx.m @@ -0,0 +1,81 @@ +% SubscriberSessionPrx Summary of SubscriberSessionPrx +% +% SubscriberSessionPrx Methods: +% s +% sAsync +% checkedCast - Contacts the remote server to verify that the object implements this type. +% uncheckedCast - Downcasts the given proxy to this type without contacting the remote server. + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef SubscriberSessionPrx < DataStormContract.SessionPrx + methods + function s(obj, topicId, elementId, sample, varargin) + % s + % + % Parameters: + % topicId (int64) + % elementId (int64) + % sample (DataStormContract.DataSample) + % context (containers.Map) - Optional request context. + + os_ = obj.iceStartWriteParams([]); + os_.writeLong(topicId); + os_.writeLong(elementId); + DataStormContract.DataSample.ice_write(os_, sample); + obj.iceEndWriteParams(os_); + obj.iceInvoke('s', 0, false, os_, false, {}, varargin{:}); + end + function r_ = sAsync(obj, topicId, elementId, sample, varargin) + % sAsync + % + % Parameters: + % topicId (int64) + % elementId (int64) + % sample (DataStormContract.DataSample) + % context (containers.Map) - Optional request context. + % + % Returns (Ice.Future) - A future that will be completed with the results of the invocation. + + os_ = obj.iceStartWriteParams([]); + os_.writeLong(topicId); + os_.writeLong(elementId); + DataStormContract.DataSample.ice_write(os_, sample); + obj.iceEndWriteParams(os_); + r_ = obj.iceInvokeAsync('s', 0, false, os_, 0, [], {}, varargin{:}); + end + end + methods(Static) + function id = ice_staticId() + id = '::DataStormContract::SubscriberSession'; + end + function r = ice_read(is) + r = is.readProxy('DataStormContract.SubscriberSessionPrx'); + end + function r = checkedCast(p, varargin) + % checkedCast Contacts the remote server to verify that the object implements this type. + % Raises a local exception if a communication error occurs. You can optionally supply a + % facet name and a context map. + % + % Parameters: + % p - The proxy to be cast. + % facet - The optional name of the desired facet. + % context - The optional context map to send with the invocation. + % + % Returns (DataStormContract.SubscriberSessionPrx) - A proxy for this type, or an empty array if the object does not support this type. + r = Ice.ObjectPrx.iceCheckedCast(p, DataStormContract.SubscriberSessionPrx.ice_staticId(), 'DataStormContract.SubscriberSessionPrx', varargin{:}); + end + function r = uncheckedCast(p, varargin) + % uncheckedCast Downcasts the given proxy to this type without contacting the remote server. + % You can optionally specify a facet name. + % + % Parameters: + % p - The proxy to be cast. + % facet - The optional name of the desired facet. + % + % Returns (DataStormContract.SubscriberSessionPrx) - A proxy for this type. + r = Ice.ObjectPrx.iceUncheckedCast(p, 'DataStormContract.SubscriberSessionPrx', varargin{:}); + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/TopicInfo.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/TopicInfo.m new file mode 100644 index 000000000000..33ef6d9d57b1 --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/TopicInfo.m @@ -0,0 +1,63 @@ +% TopicInfo Summary of TopicInfo +% +% TopicInfo Properties: +% name - The topic name. +% ids - The id of topic writers or readers. + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef TopicInfo + properties + % name - The topic name. + name char + % ids - The id of topic writers or readers. + ids + end + methods + function obj = TopicInfo(name, ids) + if nargin == 0 + obj.name = ''; + obj.ids = []; + elseif ne(name, IceInternal.NoInit.Instance) + obj.name = name; + obj.ids = ids; + end + end + function r = eq(obj, other) + r = isequal(obj, other); + end + function r = ne(obj, other) + r = ~isequal(obj, other); + end + end + methods(Static) + function r = ice_read(is) + r = DataStormContract.TopicInfo(IceInternal.NoInit.Instance); + r.name = is.readString(); + r.ids = is.readLongSeq(); + end + function ice_write(os, v) + if isempty(v) + v = DataStormContract.TopicInfo(); + end + os.writeString(v.name); + os.writeLongSeq(v.ids); + end + function r = ice_readOpt(is, tag) + if is.readOptional(tag, Ice.OptionalFormat.FSize) + is.skip(4); + r = DataStormContract.TopicInfo.ice_read(is); + else + r = Ice.Unset; + end + end + function ice_writeOpt(os, tag, v) + if v ~= Ice.Unset && os.writeOptional(tag, Ice.OptionalFormat.FSize) + pos = os.startSize(); + DataStormContract.TopicInfo.ice_write(os, v); + os.endSize(pos); + end + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/TopicInfoSeq.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/TopicInfoSeq.m new file mode 100644 index 000000000000..e8d6c63940a3 --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/TopicInfoSeq.m @@ -0,0 +1,41 @@ + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef TopicInfoSeq + methods(Static) + function write(os, seq) + sz = length(seq); + os.writeSize(sz); + for i = 1:sz + DataStormContract.TopicInfo.ice_write(os, seq(i)); + end + end + function r = read(is) + sz = is.readSize(); + r = DataStormContract.TopicInfo.empty(); + if sz > 0 + r(1, sz) = DataStormContract.TopicInfo(); + for i = 1:sz + r(i).name = is.readString(); + r(i).ids = is.readLongSeq(); + end + end + end + function writeOpt(os, tag, seq) + if seq ~= Ice.Unset && os.writeOptional(tag, Ice.OptionalFormat.FSize) + pos = os.startSize(); + DataStormContract.TopicInfoSeq.write(os, seq); + os.endSize(pos); + end + end + function r = readOpt(is, tag) + if is.readOptional(tag, Ice.OptionalFormat.FSize) + is.skip(4); + r = DataStormContract.TopicInfoSeq.read(is); + else + r = Ice.Unset; + end + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+DataStormContract/TopicSpec.m b/slice2matlab/cpp/src/DataStorm/+DataStormContract/TopicSpec.m new file mode 100644 index 000000000000..29bc814a5d38 --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+DataStormContract/TopicSpec.m @@ -0,0 +1,77 @@ +% TopicSpec Summary of TopicSpec +% +% TopicSpec Properties: +% id - The id of the topic. +% name - The name of the topic. +% elements - The topic keys or filters. +% tags - The topic update tags. + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Contract.ice by slice2matlab version 3.8.0-alpha.0 + +classdef TopicSpec + properties + % id - The id of the topic. + id int64 + % name - The name of the topic. + name char + % elements - The topic keys or filters. + elements + % tags - The topic update tags. + tags + end + methods + function obj = TopicSpec(id, name, elements, tags) + if nargin == 0 + obj.id = 0; + obj.name = ''; + obj.elements = []; + obj.tags = []; + elseif ne(id, IceInternal.NoInit.Instance) + obj.id = id; + obj.name = name; + obj.elements = elements; + obj.tags = tags; + end + end + function r = eq(obj, other) + r = isequal(obj, other); + end + function r = ne(obj, other) + r = ~isequal(obj, other); + end + end + methods(Static) + function r = ice_read(is) + r = DataStormContract.TopicSpec(IceInternal.NoInit.Instance); + r.id = is.readLong(); + r.name = is.readString(); + r.elements = DataStormContract.ElementInfoSeq.read(is); + r.tags = DataStormContract.ElementInfoSeq.read(is); + end + function ice_write(os, v) + if isempty(v) + v = DataStormContract.TopicSpec(); + end + os.writeLong(v.id); + os.writeString(v.name); + DataStormContract.ElementInfoSeq.write(os, v.elements); + DataStormContract.ElementInfoSeq.write(os, v.tags); + end + function r = ice_readOpt(is, tag) + if is.readOptional(tag, Ice.OptionalFormat.FSize) + is.skip(4); + r = DataStormContract.TopicSpec.ice_read(is); + else + r = Ice.Unset; + end + end + function ice_writeOpt(os, tag, v) + if v ~= Ice.Unset && os.writeOptional(tag, Ice.OptionalFormat.FSize) + pos = os.startSize(); + DataStormContract.TopicSpec.ice_write(os, v); + os.endSize(pos); + end + end + end +end diff --git a/slice2matlab/cpp/src/DataStorm/+IceCompactId/TypeId_1.m b/slice2matlab/cpp/src/DataStorm/+IceCompactId/TypeId_1.m new file mode 100644 index 000000000000..88335560bbed --- /dev/null +++ b/slice2matlab/cpp/src/DataStorm/+IceCompactId/TypeId_1.m @@ -0,0 +1,6 @@ + +classdef TypeId_1 + properties(Constant) + typeId = '::DataStormContract::ElementConfig' + end +end diff --git a/slice2matlab/cpp/test/DataStorm/api/+Test/ClassKey.m b/slice2matlab/cpp/test/DataStorm/api/+Test/ClassKey.m new file mode 100644 index 000000000000..0c4ea84a9eb6 --- /dev/null +++ b/slice2matlab/cpp/test/DataStorm/api/+Test/ClassKey.m @@ -0,0 +1,42 @@ +% ClassKey Summary of ClassKey +% +% ClassKey Properties: +% value + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Test.ice by slice2matlab version 3.8.0-alpha.0 + +classdef ClassKey < Ice.Value + properties + value int32 + end + methods + function obj = ClassKey(value) + if nargin == 0 + obj.value = 0; + elseif ne(value, IceInternal.NoInit.Instance) + obj.value = value; + end; + end + function id = ice_id(obj) + id = obj.ice_staticId(); + end + end + methods(Access=protected) + function iceWriteImpl(obj, os) + os.startSlice('::Test::ClassKey', -1, true); + os.writeInt(obj.value); + os.endSlice(); + end + function iceReadImpl(obj, is) + is.startSlice(); + obj.value = is.readInt(); + is.endSlice(); + end + end + methods(Static) + function id = ice_staticId() + id = '::Test::ClassKey'; + end + end +end diff --git a/slice2matlab/cpp/test/DataStorm/api/+Test/StructKey.m b/slice2matlab/cpp/test/DataStorm/api/+Test/StructKey.m new file mode 100644 index 000000000000..2108f442387f --- /dev/null +++ b/slice2matlab/cpp/test/DataStorm/api/+Test/StructKey.m @@ -0,0 +1,54 @@ +% StructKey Summary of StructKey +% +% StructKey Properties: +% value + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Test.ice by slice2matlab version 3.8.0-alpha.0 + +classdef StructKey + properties + value int32 + end + methods + function obj = StructKey(value) + if nargin == 0 + obj.value = 0; + elseif ne(value, IceInternal.NoInit.Instance) + obj.value = value; + end + end + function r = eq(obj, other) + r = isequal(obj, other); + end + function r = ne(obj, other) + r = ~isequal(obj, other); + end + end + methods(Static) + function r = ice_read(is) + r = Test.StructKey(IceInternal.NoInit.Instance); + r.value = is.readInt(); + end + function ice_write(os, v) + if isempty(v) + v = Test.StructKey(); + end + os.writeInt(v.value); + end + function r = ice_readOpt(is, tag) + if is.readOptional(tag, Ice.OptionalFormat.VSize) + is.skipSize(); + r = Test.StructKey.ice_read(is); + else + r = Ice.Unset; + end + end + function ice_writeOpt(os, tag, v) + if v ~= Ice.Unset && os.writeOptional(tag, Ice.OptionalFormat.VSize) + os.writeSize(4); + Test.StructKey.ice_write(os, v); + end + end + end +end diff --git a/slice2matlab/cpp/test/DataStorm/events/+Test/Base.m b/slice2matlab/cpp/test/DataStorm/events/+Test/Base.m new file mode 100644 index 000000000000..46a11e057951 --- /dev/null +++ b/slice2matlab/cpp/test/DataStorm/events/+Test/Base.m @@ -0,0 +1,42 @@ +% Base Summary of Base +% +% Base Properties: +% b + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Test.ice by slice2matlab version 3.8.0-alpha.0 + +classdef Base < Ice.Value + properties + b char + end + methods + function obj = Base(b) + if nargin == 0 + obj.b = ''; + elseif ne(b, IceInternal.NoInit.Instance) + obj.b = b; + end; + end + function id = ice_id(obj) + id = obj.ice_staticId(); + end + end + methods(Access=protected) + function iceWriteImpl(obj, os) + os.startSlice('::Test::Base', -1, true); + os.writeString(obj.b); + os.endSlice(); + end + function iceReadImpl(obj, is) + is.startSlice(); + obj.b = is.readString(); + is.endSlice(); + end + end + methods(Static) + function id = ice_staticId() + id = '::Test::Base'; + end + end +end diff --git a/slice2matlab/cpp/test/DataStorm/events/+Test/Extended.m b/slice2matlab/cpp/test/DataStorm/events/+Test/Extended.m new file mode 100644 index 000000000000..7dfb7981c37c --- /dev/null +++ b/slice2matlab/cpp/test/DataStorm/events/+Test/Extended.m @@ -0,0 +1,52 @@ +% Extended Summary of Extended +% +% Extended Properties: +% e + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Test.ice by slice2matlab version 3.8.0-alpha.0 + +classdef Extended < Test.Base + properties + e int32 + end + methods + function obj = Extended(b, e) + if nargin == 0 + b = ''; + e = 0; + v = { b }; + elseif eq(b, IceInternal.NoInit.Instance) + v = { IceInternal.NoInit.Instance }; + else + v = { b }; + end; + obj = obj@Test.Base(v{:}); + if ne(b, IceInternal.NoInit.Instance) + obj.e = e; + end + end + function id = ice_id(obj) + id = obj.ice_staticId(); + end + end + methods(Access=protected) + function iceWriteImpl(obj, os) + os.startSlice('::Test::Extended', -1, false); + os.writeInt(obj.e); + os.endSlice(); + iceWriteImpl@Test.Base(obj, os); + end + function iceReadImpl(obj, is) + is.startSlice(); + obj.e = is.readInt(); + is.endSlice(); + iceReadImpl@Test.Base(obj, is); + end + end + methods(Static) + function id = ice_staticId() + id = '::Test::Extended'; + end + end +end diff --git a/slice2matlab/cpp/test/DataStorm/events/+Test/StructValue.m b/slice2matlab/cpp/test/DataStorm/events/+Test/StructValue.m new file mode 100644 index 000000000000..05b766f567da --- /dev/null +++ b/slice2matlab/cpp/test/DataStorm/events/+Test/StructValue.m @@ -0,0 +1,67 @@ +% StructValue Summary of StructValue +% +% StructValue Properties: +% firstName +% lastName +% age + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Test.ice by slice2matlab version 3.8.0-alpha.0 + +classdef StructValue + properties + firstName char + lastName char + age int32 + end + methods + function obj = StructValue(firstName, lastName, age) + if nargin == 0 + obj.firstName = ''; + obj.lastName = ''; + obj.age = 0; + elseif ne(firstName, IceInternal.NoInit.Instance) + obj.firstName = firstName; + obj.lastName = lastName; + obj.age = age; + end + end + function r = eq(obj, other) + r = isequal(obj, other); + end + function r = ne(obj, other) + r = ~isequal(obj, other); + end + end + methods(Static) + function r = ice_read(is) + r = Test.StructValue(IceInternal.NoInit.Instance); + r.firstName = is.readString(); + r.lastName = is.readString(); + r.age = is.readInt(); + end + function ice_write(os, v) + if isempty(v) + v = Test.StructValue(); + end + os.writeString(v.firstName); + os.writeString(v.lastName); + os.writeInt(v.age); + end + function r = ice_readOpt(is, tag) + if is.readOptional(tag, Ice.OptionalFormat.FSize) + is.skip(4); + r = Test.StructValue.ice_read(is); + else + r = Ice.Unset; + end + end + function ice_writeOpt(os, tag, v) + if v ~= Ice.Unset && os.writeOptional(tag, Ice.OptionalFormat.FSize) + pos = os.startSize(); + Test.StructValue.ice_write(os, v); + os.endSize(pos); + end + end + end +end diff --git a/slice2matlab/cpp/test/DataStorm/partial/+Test/Stock.m b/slice2matlab/cpp/test/DataStorm/partial/+Test/Stock.m new file mode 100644 index 000000000000..c92e4dd9fdc7 --- /dev/null +++ b/slice2matlab/cpp/test/DataStorm/partial/+Test/Stock.m @@ -0,0 +1,66 @@ +% Stock Summary of Stock +% +% Stock Properties: +% price +% lastBid +% laskAsk + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Test.ice by slice2matlab version 3.8.0-alpha.0 + +classdef Stock + properties + price single + lastBid single + laskAsk single + end + methods + function obj = Stock(price, lastBid, laskAsk) + if nargin == 0 + obj.price = 0; + obj.lastBid = 0; + obj.laskAsk = 0; + elseif ne(price, IceInternal.NoInit.Instance) + obj.price = price; + obj.lastBid = lastBid; + obj.laskAsk = laskAsk; + end + end + function r = eq(obj, other) + r = isequal(obj, other); + end + function r = ne(obj, other) + r = ~isequal(obj, other); + end + end + methods(Static) + function r = ice_read(is) + r = Test.Stock(IceInternal.NoInit.Instance); + r.price = is.readFloat(); + r.lastBid = is.readFloat(); + r.laskAsk = is.readFloat(); + end + function ice_write(os, v) + if isempty(v) + v = Test.Stock(); + end + os.writeFloat(v.price); + os.writeFloat(v.lastBid); + os.writeFloat(v.laskAsk); + end + function r = ice_readOpt(is, tag) + if is.readOptional(tag, Ice.OptionalFormat.VSize) + is.skipSize(); + r = Test.Stock.ice_read(is); + else + r = Ice.Unset; + end + end + function ice_writeOpt(os, tag, v) + if v ~= Ice.Unset && os.writeOptional(tag, Ice.OptionalFormat.VSize) + os.writeSize(12); + Test.Stock.ice_write(os, v); + end + end + end +end diff --git a/slice2matlab/cpp/test/DataStorm/types/+Test/Base.m b/slice2matlab/cpp/test/DataStorm/types/+Test/Base.m new file mode 100644 index 000000000000..46a11e057951 --- /dev/null +++ b/slice2matlab/cpp/test/DataStorm/types/+Test/Base.m @@ -0,0 +1,42 @@ +% Base Summary of Base +% +% Base Properties: +% b + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Test.ice by slice2matlab version 3.8.0-alpha.0 + +classdef Base < Ice.Value + properties + b char + end + methods + function obj = Base(b) + if nargin == 0 + obj.b = ''; + elseif ne(b, IceInternal.NoInit.Instance) + obj.b = b; + end; + end + function id = ice_id(obj) + id = obj.ice_staticId(); + end + end + methods(Access=protected) + function iceWriteImpl(obj, os) + os.startSlice('::Test::Base', -1, true); + os.writeString(obj.b); + os.endSlice(); + end + function iceReadImpl(obj, is) + is.startSlice(); + obj.b = is.readString(); + is.endSlice(); + end + end + methods(Static) + function id = ice_staticId() + id = '::Test::Base'; + end + end +end diff --git a/slice2matlab/cpp/test/DataStorm/types/+Test/Extended.m b/slice2matlab/cpp/test/DataStorm/types/+Test/Extended.m new file mode 100644 index 000000000000..7dfb7981c37c --- /dev/null +++ b/slice2matlab/cpp/test/DataStorm/types/+Test/Extended.m @@ -0,0 +1,52 @@ +% Extended Summary of Extended +% +% Extended Properties: +% e + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Test.ice by slice2matlab version 3.8.0-alpha.0 + +classdef Extended < Test.Base + properties + e int32 + end + methods + function obj = Extended(b, e) + if nargin == 0 + b = ''; + e = 0; + v = { b }; + elseif eq(b, IceInternal.NoInit.Instance) + v = { IceInternal.NoInit.Instance }; + else + v = { b }; + end; + obj = obj@Test.Base(v{:}); + if ne(b, IceInternal.NoInit.Instance) + obj.e = e; + end + end + function id = ice_id(obj) + id = obj.ice_staticId(); + end + end + methods(Access=protected) + function iceWriteImpl(obj, os) + os.startSlice('::Test::Extended', -1, false); + os.writeInt(obj.e); + os.endSlice(); + iceWriteImpl@Test.Base(obj, os); + end + function iceReadImpl(obj, is) + is.startSlice(); + obj.e = is.readInt(); + is.endSlice(); + iceReadImpl@Test.Base(obj, is); + end + end + methods(Static) + function id = ice_staticId() + id = '::Test::Extended'; + end + end +end diff --git a/slice2matlab/cpp/test/DataStorm/types/+Test/StructValue.m b/slice2matlab/cpp/test/DataStorm/types/+Test/StructValue.m new file mode 100644 index 000000000000..05b766f567da --- /dev/null +++ b/slice2matlab/cpp/test/DataStorm/types/+Test/StructValue.m @@ -0,0 +1,67 @@ +% StructValue Summary of StructValue +% +% StructValue Properties: +% firstName +% lastName +% age + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Test.ice by slice2matlab version 3.8.0-alpha.0 + +classdef StructValue + properties + firstName char + lastName char + age int32 + end + methods + function obj = StructValue(firstName, lastName, age) + if nargin == 0 + obj.firstName = ''; + obj.lastName = ''; + obj.age = 0; + elseif ne(firstName, IceInternal.NoInit.Instance) + obj.firstName = firstName; + obj.lastName = lastName; + obj.age = age; + end + end + function r = eq(obj, other) + r = isequal(obj, other); + end + function r = ne(obj, other) + r = ~isequal(obj, other); + end + end + methods(Static) + function r = ice_read(is) + r = Test.StructValue(IceInternal.NoInit.Instance); + r.firstName = is.readString(); + r.lastName = is.readString(); + r.age = is.readInt(); + end + function ice_write(os, v) + if isempty(v) + v = Test.StructValue(); + end + os.writeString(v.firstName); + os.writeString(v.lastName); + os.writeInt(v.age); + end + function r = ice_readOpt(is, tag) + if is.readOptional(tag, Ice.OptionalFormat.FSize) + is.skip(4); + r = Test.StructValue.ice_read(is); + else + r = Ice.Unset; + end + end + function ice_writeOpt(os, tag, v) + if v ~= Ice.Unset && os.writeOptional(tag, Ice.OptionalFormat.FSize) + pos = os.startSize(); + Test.StructValue.ice_write(os, v); + os.endSize(pos); + end + end + end +end diff --git a/slice2matlab/slice/DataStorm/+DataStorm/SampleEvent.m b/slice2matlab/slice/DataStorm/+DataStorm/SampleEvent.m new file mode 100644 index 000000000000..a58820e40728 --- /dev/null +++ b/slice2matlab/slice/DataStorm/+DataStorm/SampleEvent.m @@ -0,0 +1,69 @@ +% SampleEvent Summary of SampleEvent +% +% The sample event. +% +% The sample event matches the operation used by the DataWriter to update +% the data element. It also provides information on what to expect from +% the sample. A sample with the Add or Update event always provide a value +% while a sample with the Remove type doesn't. +% +% SampleEvent Properties: +% Add - The element has been added. +% Update - The element has been updated. +% PartialUpdate - The element has been partially updated. +% Remove - The element has been removed. + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Sample.ice by slice2matlab version 3.8.0-alpha.0 + +classdef SampleEvent < uint8 + enumeration + % The element has been added. + Add (0) + % The element has been updated. + Update (1) + % The element has been partially updated. + PartialUpdate (2) + % The element has been removed. + Remove (3) + end + methods(Static) + function ice_write(os, v) + if isempty(v) + os.writeEnum(int32(DataStorm.SampleEvent.Add), 3); + else + os.writeEnum(int32(v), 3); + end + end + function r = ice_read(is) + v = is.readEnum(3); + r = DataStorm.SampleEvent.ice_getValue(v); + end + function ice_writeOpt(os, tag, v) + if v ~= Ice.Unset && os.writeOptional(tag, Ice.OptionalFormat.Size) + DataStorm.SampleEvent.ice_write(os, v); + end + end + function r = ice_readOpt(is, tag) + if is.readOptional(tag, Ice.OptionalFormat.Size) + r = DataStorm.SampleEvent.ice_read(is); + else + r = Ice.Unset; + end + end + function r = ice_getValue(v) + switch v + case 0 + r = DataStorm.SampleEvent.Add; + case 1 + r = DataStorm.SampleEvent.Update; + case 2 + r = DataStorm.SampleEvent.PartialUpdate; + case 3 + r = DataStorm.SampleEvent.Remove; + otherwise + throw(Ice.MarshalException(sprintf('enumerator value %d is out of range', v))); + end + end + end +end diff --git a/slice2matlab/slice/DataStorm/+DataStorm/SampleEventSeq.m b/slice2matlab/slice/DataStorm/+DataStorm/SampleEventSeq.m new file mode 100644 index 000000000000..97f72786d132 --- /dev/null +++ b/slice2matlab/slice/DataStorm/+DataStorm/SampleEventSeq.m @@ -0,0 +1,40 @@ + +% Copyright (c) ZeroC, Inc. All rights reserved. +% Generated from Sample.ice by slice2matlab version 3.8.0-alpha.0 + +classdef SampleEventSeq + methods(Static) + function write(os, seq) + sz = length(seq); + os.writeSize(sz); + for i = 1:sz + DataStorm.SampleEvent.ice_write(os, seq(i)); + end + end + function r = read(is) + sz = is.readSize(); + r = DataStorm.SampleEvent.empty(); + if sz > 0 + r(1, sz) = DataStorm.SampleEvent.Add; + for i = 1:sz + r(i) = DataStorm.SampleEvent.ice_read(is); + end + end + end + function writeOpt(os, tag, seq) + if seq ~= Ice.Unset && os.writeOptional(tag, Ice.OptionalFormat.FSize) + pos = os.startSize(); + DataStorm.SampleEventSeq.write(os, seq); + os.endSize(pos); + end + end + function r = readOpt(is, tag) + if is.readOptional(tag, Ice.OptionalFormat.FSize) + is.skip(4); + r = DataStorm.SampleEventSeq.read(is); + else + r = Ice.Unset; + end + end + end +end diff --git a/slice2php/cpp/src/DataStorm/Contract.php b/slice2php/cpp/src/DataStorm/Contract.php new file mode 100644 index 000000000000..c949e2d0db18 --- /dev/null +++ b/slice2php/cpp/src/DataStorm/Contract.php @@ -0,0 +1,778 @@ + +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + + +namespace +{ + require_once 'Ice/Identity.php'; + require_once 'DataStorm/Sample.php'; +} + +namespace DataStormContract +{ + global $DataStormContract__t_ClearHistoryPolicy; + class ClearHistoryPolicy + { + const OnAdd = 0; + const OnRemove = 1; + const OnAll = 2; + const OnAllExceptPartialUpdate = 3; + const Never = 4; + } + + $DataStormContract__t_ClearHistoryPolicy = IcePHP_defineEnum('::DataStormContract::ClearHistoryPolicy', array('OnAdd', 0, 'OnRemove', 1, 'OnAll', 2, 'OnAllExceptPartialUpdate', 3, 'Never', 4)); +} + +namespace DataStormContract +{ + global $DataStormContract__t_ByteSeq; + + if(!isset($DataStormContract__t_ByteSeq)) + { + global $IcePHP__t_byte; + $DataStormContract__t_ByteSeq = IcePHP_defineSequence('::DataStormContract::ByteSeq', $IcePHP__t_byte); + } +} + +namespace DataStormContract +{ + global $DataStormContract__t_LongSeq; + + if(!isset($DataStormContract__t_LongSeq)) + { + global $IcePHP__t_long; + $DataStormContract__t_LongSeq = IcePHP_defineSequence('::DataStormContract::LongSeq', $IcePHP__t_long); + } +} + +namespace DataStormContract +{ + global $DataStormContract__t_StringSeq; + + if(!isset($DataStormContract__t_StringSeq)) + { + global $IcePHP__t_string; + $DataStormContract__t_StringSeq = IcePHP_defineSequence('::DataStormContract::StringSeq', $IcePHP__t_string); + } +} + +namespace DataStormContract +{ + global $DataStormContract__t_LongLongDict; + + if(!isset($DataStormContract__t_LongLongDict)) + { + global $IcePHP__t_long; + global $IcePHP__t_long; + $DataStormContract__t_LongLongDict = IcePHP_defineDictionary('::DataStormContract::LongLongDict', $IcePHP__t_long, $IcePHP__t_long); + } +} + +namespace DataStormContract +{ + global $DataStormContract__t_DataSample; + class DataSample + { + public function __construct($id=0, $keyId=0, $keyValue=null, $timestamp=0, $tag=0, $event=\DataStorm\SampleEvent::Add, $value=null) + { + $this->id = $id; + $this->keyId = $keyId; + $this->keyValue = $keyValue; + $this->timestamp = $timestamp; + $this->tag = $tag; + $this->event = $event; + $this->value = $value; + } + + public function __toString(): string + { + global $DataStormContract__t_DataSample; + return IcePHP_stringify($this, $DataStormContract__t_DataSample); + } + + public $id; + public $keyId; + public $keyValue; + public $timestamp; + public $tag; + public $event; + public $value; + } + + global $IcePHP__t_long; + global $DataStormContract__t_ByteSeq; + global $DataStorm__t_SampleEvent; + $DataStormContract__t_DataSample = IcePHP_defineStruct('::DataStormContract::DataSample', '\\DataStormContract\\DataSample', array( + array('id', $IcePHP__t_long), + array('keyId', $IcePHP__t_long), + array('keyValue', $DataStormContract__t_ByteSeq), + array('timestamp', $IcePHP__t_long), + array('tag', $IcePHP__t_long), + array('event', $DataStorm__t_SampleEvent), + array('value', $DataStormContract__t_ByteSeq))); +} + +namespace DataStormContract +{ + global $DataStormContract__t_DataSampleSeq; + + if(!isset($DataStormContract__t_DataSampleSeq)) + { + global $DataStormContract__t_DataSample; + $DataStormContract__t_DataSampleSeq = IcePHP_defineSequence('::DataStormContract::DataSampleSeq', $DataStormContract__t_DataSample); + } +} + +namespace DataStormContract +{ + global $DataStormContract__t_DataSamples; + class DataSamples + { + public function __construct($id=0, $samples=null) + { + $this->id = $id; + $this->samples = $samples; + } + + public function __toString(): string + { + global $DataStormContract__t_DataSamples; + return IcePHP_stringify($this, $DataStormContract__t_DataSamples); + } + + public $id; + public $samples; + } + + global $IcePHP__t_long; + global $DataStormContract__t_DataSampleSeq; + $DataStormContract__t_DataSamples = IcePHP_defineStruct('::DataStormContract::DataSamples', '\\DataStormContract\\DataSamples', array( + array('id', $IcePHP__t_long), + array('samples', $DataStormContract__t_DataSampleSeq))); +} + +namespace DataStormContract +{ + global $DataStormContract__t_DataSamplesSeq; + + if(!isset($DataStormContract__t_DataSamplesSeq)) + { + global $DataStormContract__t_DataSamples; + $DataStormContract__t_DataSamplesSeq = IcePHP_defineSequence('::DataStormContract::DataSamplesSeq', $DataStormContract__t_DataSamples); + } +} + +namespace DataStormContract +{ + global $DataStormContract__t_ElementInfo; + class ElementInfo + { + public function __construct($id=0, $name='', $value=null) + { + $this->id = $id; + $this->name = $name; + $this->value = $value; + } + + public function __toString(): string + { + global $DataStormContract__t_ElementInfo; + return IcePHP_stringify($this, $DataStormContract__t_ElementInfo); + } + + public $id; + public $name; + public $value; + } + + global $IcePHP__t_long; + global $IcePHP__t_string; + global $DataStormContract__t_ByteSeq; + $DataStormContract__t_ElementInfo = IcePHP_defineStruct('::DataStormContract::ElementInfo', '\\DataStormContract\\ElementInfo', array( + array('id', $IcePHP__t_long), + array('name', $IcePHP__t_string), + array('value', $DataStormContract__t_ByteSeq))); +} + +namespace DataStormContract +{ + global $DataStormContract__t_ElementInfoSeq; + + if(!isset($DataStormContract__t_ElementInfoSeq)) + { + global $DataStormContract__t_ElementInfo; + $DataStormContract__t_ElementInfoSeq = IcePHP_defineSequence('::DataStormContract::ElementInfoSeq', $DataStormContract__t_ElementInfo); + } +} + +namespace DataStormContract +{ + global $DataStormContract__t_TopicInfo; + class TopicInfo + { + public function __construct($name='', $ids=null) + { + $this->name = $name; + $this->ids = $ids; + } + + public function __toString(): string + { + global $DataStormContract__t_TopicInfo; + return IcePHP_stringify($this, $DataStormContract__t_TopicInfo); + } + + public $name; + public $ids; + } + + global $IcePHP__t_string; + global $DataStormContract__t_LongSeq; + $DataStormContract__t_TopicInfo = IcePHP_defineStruct('::DataStormContract::TopicInfo', '\\DataStormContract\\TopicInfo', array( + array('name', $IcePHP__t_string), + array('ids', $DataStormContract__t_LongSeq))); +} + +namespace DataStormContract +{ + global $DataStormContract__t_TopicInfoSeq; + + if(!isset($DataStormContract__t_TopicInfoSeq)) + { + global $DataStormContract__t_TopicInfo; + $DataStormContract__t_TopicInfoSeq = IcePHP_defineSequence('::DataStormContract::TopicInfoSeq', $DataStormContract__t_TopicInfo); + } +} + +namespace DataStormContract +{ + global $DataStormContract__t_TopicSpec; + class TopicSpec + { + public function __construct($id=0, $name='', $elements=null, $tags=null) + { + $this->id = $id; + $this->name = $name; + $this->elements = $elements; + $this->tags = $tags; + } + + public function __toString(): string + { + global $DataStormContract__t_TopicSpec; + return IcePHP_stringify($this, $DataStormContract__t_TopicSpec); + } + + public $id; + public $name; + public $elements; + public $tags; + } + + global $IcePHP__t_long; + global $IcePHP__t_string; + global $DataStormContract__t_ElementInfoSeq; + $DataStormContract__t_TopicSpec = IcePHP_defineStruct('::DataStormContract::TopicSpec', '\\DataStormContract\\TopicSpec', array( + array('id', $IcePHP__t_long), + array('name', $IcePHP__t_string), + array('elements', $DataStormContract__t_ElementInfoSeq), + array('tags', $DataStormContract__t_ElementInfoSeq))); +} + +namespace DataStormContract +{ + global $DataStormContract__t_FilterInfo; + class FilterInfo + { + public function __construct($name='', $criteria=null) + { + $this->name = $name; + $this->criteria = $criteria; + } + + public function __toString(): string + { + global $DataStormContract__t_FilterInfo; + return IcePHP_stringify($this, $DataStormContract__t_FilterInfo); + } + + public $name; + public $criteria; + } + + global $IcePHP__t_string; + global $DataStormContract__t_ByteSeq; + $DataStormContract__t_FilterInfo = IcePHP_defineStruct('::DataStormContract::FilterInfo', '\\DataStormContract\\FilterInfo', array( + array('name', $IcePHP__t_string), + array('criteria', $DataStormContract__t_ByteSeq))); +} + +namespace DataStormContract +{ + global $DataStormContract__t_ElementConfig; + class ElementConfig extends \Ice\Value + { + public function __construct($facet=\Ice\None, $sampleFilter=\Ice\None, $name=\Ice\None, $priority=\Ice\None, $sampleCount=\Ice\None, $sampleLifetime=\Ice\None, $clearHistory=\Ice\None) + { + $this->facet = $facet; + $this->sampleFilter = is_null($sampleFilter) ? new \DataStormContract\FilterInfo : $sampleFilter; + $this->name = $name; + $this->priority = $priority; + $this->sampleCount = $sampleCount; + $this->sampleLifetime = $sampleLifetime; + $this->clearHistory = $clearHistory; + } + + public function ice_id() + { + return '::DataStormContract::ElementConfig'; + } + + public static function ice_staticId() + { + return '::DataStormContract::ElementConfig'; + } + + public function __toString(): string + { + global $DataStormContract__t_ElementConfig; + return IcePHP_stringify($this, $DataStormContract__t_ElementConfig); + } + + public $facet; + public $sampleFilter; + public $name; + public $priority; + public $sampleCount; + public $sampleLifetime; + public $clearHistory; + } + + global $Ice__t_Value; + global $IcePHP__t_string; + global $DataStormContract__t_FilterInfo; + global $IcePHP__t_int; + global $DataStormContract__t_ClearHistoryPolicy; + $DataStormContract__t_ElementConfig = IcePHP_defineClass('::DataStormContract::ElementConfig', '\\DataStormContract\\ElementConfig', 1, false, $Ice__t_Value, array( + array('facet', $IcePHP__t_string, true, 1), + array('sampleFilter', $DataStormContract__t_FilterInfo, true, 2), + array('name', $IcePHP__t_string, true, 3), + array('priority', $IcePHP__t_int, true, 4), + array('sampleCount', $IcePHP__t_int, true, 10), + array('sampleLifetime', $IcePHP__t_int, true, 11), + array('clearHistory', $DataStormContract__t_ClearHistoryPolicy, true, 12))); +} + +namespace DataStormContract +{ + global $DataStormContract__t_ElementData; + class ElementData + { + public function __construct($id=0, $config=null, $lastIds=null) + { + $this->id = $id; + $this->config = $config; + $this->lastIds = $lastIds; + } + + public function __toString(): string + { + global $DataStormContract__t_ElementData; + return IcePHP_stringify($this, $DataStormContract__t_ElementData); + } + + public $id; + public $config; + public $lastIds; + } + + global $IcePHP__t_long; + global $DataStormContract__t_ElementConfig; + global $DataStormContract__t_LongLongDict; + $DataStormContract__t_ElementData = IcePHP_defineStruct('::DataStormContract::ElementData', '\\DataStormContract\\ElementData', array( + array('id', $IcePHP__t_long), + array('config', $DataStormContract__t_ElementConfig), + array('lastIds', $DataStormContract__t_LongLongDict))); +} + +namespace DataStormContract +{ + global $DataStormContract__t_ElementDataSeq; + + if(!isset($DataStormContract__t_ElementDataSeq)) + { + global $DataStormContract__t_ElementData; + $DataStormContract__t_ElementDataSeq = IcePHP_defineSequence('::DataStormContract::ElementDataSeq', $DataStormContract__t_ElementData); + } +} + +namespace DataStormContract +{ + global $DataStormContract__t_ElementSpec; + class ElementSpec + { + public function __construct($elements=null, $id=0, $name='', $value=null, $peerId=0, $peerName='') + { + $this->elements = $elements; + $this->id = $id; + $this->name = $name; + $this->value = $value; + $this->peerId = $peerId; + $this->peerName = $peerName; + } + + public function __toString(): string + { + global $DataStormContract__t_ElementSpec; + return IcePHP_stringify($this, $DataStormContract__t_ElementSpec); + } + + public $elements; + public $id; + public $name; + public $value; + public $peerId; + public $peerName; + } + + global $DataStormContract__t_ElementDataSeq; + global $IcePHP__t_long; + global $IcePHP__t_string; + global $DataStormContract__t_ByteSeq; + $DataStormContract__t_ElementSpec = IcePHP_defineStruct('::DataStormContract::ElementSpec', '\\DataStormContract\\ElementSpec', array( + array('elements', $DataStormContract__t_ElementDataSeq), + array('id', $IcePHP__t_long), + array('name', $IcePHP__t_string), + array('value', $DataStormContract__t_ByteSeq), + array('peerId', $IcePHP__t_long), + array('peerName', $IcePHP__t_string))); +} + +namespace DataStormContract +{ + global $DataStormContract__t_ElementSpecSeq; + + if(!isset($DataStormContract__t_ElementSpecSeq)) + { + global $DataStormContract__t_ElementSpec; + $DataStormContract__t_ElementSpecSeq = IcePHP_defineSequence('::DataStormContract::ElementSpecSeq', $DataStormContract__t_ElementSpec); + } +} + +namespace DataStormContract +{ + global $DataStormContract__t_ElementDataAck; + class ElementDataAck + { + public function __construct($id=0, $config=null, $lastIds=null, $samples=null, $peerId=0) + { + $this->id = $id; + $this->config = $config; + $this->lastIds = $lastIds; + $this->samples = $samples; + $this->peerId = $peerId; + } + + public function __toString(): string + { + global $DataStormContract__t_ElementDataAck; + return IcePHP_stringify($this, $DataStormContract__t_ElementDataAck); + } + + public $id; + public $config; + public $lastIds; + public $samples; + public $peerId; + } + + global $IcePHP__t_long; + global $DataStormContract__t_ElementConfig; + global $DataStormContract__t_LongLongDict; + global $DataStormContract__t_DataSampleSeq; + $DataStormContract__t_ElementDataAck = IcePHP_defineStruct('::DataStormContract::ElementDataAck', '\\DataStormContract\\ElementDataAck', array( + array('id', $IcePHP__t_long), + array('config', $DataStormContract__t_ElementConfig), + array('lastIds', $DataStormContract__t_LongLongDict), + array('samples', $DataStormContract__t_DataSampleSeq), + array('peerId', $IcePHP__t_long))); +} + +namespace DataStormContract +{ + global $DataStormContract__t_ElementDataAckSeq; + + if(!isset($DataStormContract__t_ElementDataAckSeq)) + { + global $DataStormContract__t_ElementDataAck; + $DataStormContract__t_ElementDataAckSeq = IcePHP_defineSequence('::DataStormContract::ElementDataAckSeq', $DataStormContract__t_ElementDataAck); + } +} + +namespace DataStormContract +{ + global $DataStormContract__t_ElementSpecAck; + class ElementSpecAck + { + public function __construct($elements=null, $id=0, $name='', $value=null, $peerId=0, $peerName='') + { + $this->elements = $elements; + $this->id = $id; + $this->name = $name; + $this->value = $value; + $this->peerId = $peerId; + $this->peerName = $peerName; + } + + public function __toString(): string + { + global $DataStormContract__t_ElementSpecAck; + return IcePHP_stringify($this, $DataStormContract__t_ElementSpecAck); + } + + public $elements; + public $id; + public $name; + public $value; + public $peerId; + public $peerName; + } + + global $DataStormContract__t_ElementDataAckSeq; + global $IcePHP__t_long; + global $IcePHP__t_string; + global $DataStormContract__t_ByteSeq; + $DataStormContract__t_ElementSpecAck = IcePHP_defineStruct('::DataStormContract::ElementSpecAck', '\\DataStormContract\\ElementSpecAck', array( + array('elements', $DataStormContract__t_ElementDataAckSeq), + array('id', $IcePHP__t_long), + array('name', $IcePHP__t_string), + array('value', $DataStormContract__t_ByteSeq), + array('peerId', $IcePHP__t_long), + array('peerName', $IcePHP__t_string))); +} + +namespace DataStormContract +{ + global $DataStormContract__t_ElementSpecAckSeq; + + if(!isset($DataStormContract__t_ElementSpecAckSeq)) + { + global $DataStormContract__t_ElementSpecAck; + $DataStormContract__t_ElementSpecAckSeq = IcePHP_defineSequence('::DataStormContract::ElementSpecAckSeq', $DataStormContract__t_ElementSpecAck); + } +} + +namespace DataStormContract +{ + global $DataStormContract__t_Session; + global $DataStormContract__t_SessionPrx; + + class SessionPrxHelper + { + public static function createProxy($communicator, $proxyString) + { + return $communicator->stringToProxy($proxyString, '::DataStormContract::Session'); + } + + public static function checkedCast($proxy, ...$args) + { + return $proxy->ice_checkedCast('::DataStormContract::Session', ...$args); + } + + public static function uncheckedCast($proxy, $facet=null) + { + return $proxy->ice_uncheckedCast('::DataStormContract::Session', $facet); + } + + public static function ice_staticId() + { + return '::DataStormContract::Session'; + } + } + + global $Ice__t_ObjectPrx; + $DataStormContract__t_SessionPrx = IcePHP_defineProxy('::DataStormContract::Session', $Ice__t_ObjectPrx, null); + + global $DataStormContract__t_TopicInfoSeq; + global $IcePHP__t_bool; + global $DataStormContract__t_TopicSpec; + global $IcePHP__t_long; + global $DataStormContract__t_ElementInfoSeq; + global $DataStormContract__t_LongSeq; + global $DataStormContract__t_ElementSpecSeq; + global $DataStormContract__t_ElementSpecAckSeq; + global $DataStormContract__t_DataSamplesSeq; + IcePHP_defineOperation($DataStormContract__t_SessionPrx, 'announceTopics', 0, -1, array(array($DataStormContract__t_TopicInfoSeq), array($IcePHP__t_bool)), null, null, null); + IcePHP_defineOperation($DataStormContract__t_SessionPrx, 'attachTopic', 0, -1, array(array($DataStormContract__t_TopicSpec)), null, null, null); + IcePHP_defineOperation($DataStormContract__t_SessionPrx, 'detachTopic', 0, -1, array(array($IcePHP__t_long)), null, null, null); + IcePHP_defineOperation($DataStormContract__t_SessionPrx, 'attachTags', 0, -1, array(array($IcePHP__t_long), array($DataStormContract__t_ElementInfoSeq), array($IcePHP__t_bool)), null, null, null); + IcePHP_defineOperation($DataStormContract__t_SessionPrx, 'detachTags', 0, -1, array(array($IcePHP__t_long), array($DataStormContract__t_LongSeq)), null, null, null); + IcePHP_defineOperation($DataStormContract__t_SessionPrx, 'announceElements', 0, -1, array(array($IcePHP__t_long), array($DataStormContract__t_ElementInfoSeq)), null, null, null); + IcePHP_defineOperation($DataStormContract__t_SessionPrx, 'attachElements', 0, -1, array(array($IcePHP__t_long), array($DataStormContract__t_ElementSpecSeq), array($IcePHP__t_bool)), null, null, null); + IcePHP_defineOperation($DataStormContract__t_SessionPrx, 'attachElementsAck', 0, -1, array(array($IcePHP__t_long), array($DataStormContract__t_ElementSpecAckSeq)), null, null, null); + IcePHP_defineOperation($DataStormContract__t_SessionPrx, 'detachElements', 0, -1, array(array($IcePHP__t_long), array($DataStormContract__t_LongSeq)), null, null, null); + IcePHP_defineOperation($DataStormContract__t_SessionPrx, 'initSamples', 0, -1, array(array($IcePHP__t_long), array($DataStormContract__t_DataSamplesSeq)), null, null, null); + IcePHP_defineOperation($DataStormContract__t_SessionPrx, 'disconnected', 0, -1, null, null, null, null); +} + +namespace DataStormContract +{ + global $DataStormContract__t_PublisherSession; + global $DataStormContract__t_PublisherSessionPrx; + + class PublisherSessionPrxHelper + { + public static function createProxy($communicator, $proxyString) + { + return $communicator->stringToProxy($proxyString, '::DataStormContract::PublisherSession'); + } + + public static function checkedCast($proxy, ...$args) + { + return $proxy->ice_checkedCast('::DataStormContract::PublisherSession', ...$args); + } + + public static function uncheckedCast($proxy, $facet=null) + { + return $proxy->ice_uncheckedCast('::DataStormContract::PublisherSession', $facet); + } + + public static function ice_staticId() + { + return '::DataStormContract::PublisherSession'; + } + } + + global $Ice__t_ObjectPrx; + $DataStormContract__t_PublisherSessionPrx = IcePHP_defineProxy('::DataStormContract::PublisherSession', $Ice__t_ObjectPrx, array($DataStormContract__t_SessionPrx)); +} + +namespace DataStormContract +{ + global $DataStormContract__t_SubscriberSession; + global $DataStormContract__t_SubscriberSessionPrx; + + class SubscriberSessionPrxHelper + { + public static function createProxy($communicator, $proxyString) + { + return $communicator->stringToProxy($proxyString, '::DataStormContract::SubscriberSession'); + } + + public static function checkedCast($proxy, ...$args) + { + return $proxy->ice_checkedCast('::DataStormContract::SubscriberSession', ...$args); + } + + public static function uncheckedCast($proxy, $facet=null) + { + return $proxy->ice_uncheckedCast('::DataStormContract::SubscriberSession', $facet); + } + + public static function ice_staticId() + { + return '::DataStormContract::SubscriberSession'; + } + } + + global $Ice__t_ObjectPrx; + $DataStormContract__t_SubscriberSessionPrx = IcePHP_defineProxy('::DataStormContract::SubscriberSession', $Ice__t_ObjectPrx, array($DataStormContract__t_SessionPrx)); + + global $IcePHP__t_long; + global $DataStormContract__t_DataSample; + IcePHP_defineOperation($DataStormContract__t_SubscriberSessionPrx, 's', 0, -1, array(array($IcePHP__t_long), array($IcePHP__t_long), array($DataStormContract__t_DataSample)), null, null, null); +} + +namespace DataStormContract +{ + global $DataStormContract__t_Node; + global $DataStormContract__t_NodePrx; + + class NodePrxHelper + { + public static function createProxy($communicator, $proxyString) + { + return $communicator->stringToProxy($proxyString, '::DataStormContract::Node'); + } + + public static function checkedCast($proxy, ...$args) + { + return $proxy->ice_checkedCast('::DataStormContract::Node', ...$args); + } + + public static function uncheckedCast($proxy, $facet=null) + { + return $proxy->ice_uncheckedCast('::DataStormContract::Node', $facet); + } + + public static function ice_staticId() + { + return '::DataStormContract::Node'; + } + } + + global $Ice__t_ObjectPrx; + $DataStormContract__t_NodePrx = IcePHP_defineProxy('::DataStormContract::Node', $Ice__t_ObjectPrx, null); + + global $DataStormContract__t_NodePrx; + global $DataStormContract__t_SubscriberSessionPrx; + global $IcePHP__t_bool; + global $DataStormContract__t_PublisherSessionPrx; + IcePHP_defineOperation($DataStormContract__t_NodePrx, 'initiateCreateSession', 0, -1, array(array($DataStormContract__t_NodePrx)), null, null, null); + IcePHP_defineOperation($DataStormContract__t_NodePrx, 'createSession', 0, -1, array(array($DataStormContract__t_NodePrx), array($DataStormContract__t_SubscriberSessionPrx), array($IcePHP__t_bool)), null, null, null); + IcePHP_defineOperation($DataStormContract__t_NodePrx, 'confirmCreateSession', 0, -1, array(array($DataStormContract__t_NodePrx), array($DataStormContract__t_PublisherSessionPrx)), null, null, null); +} + +namespace DataStormContract +{ + global $DataStormContract__t_Lookup; + global $DataStormContract__t_LookupPrx; + + class LookupPrxHelper + { + public static function createProxy($communicator, $proxyString) + { + return $communicator->stringToProxy($proxyString, '::DataStormContract::Lookup'); + } + + public static function checkedCast($proxy, ...$args) + { + return $proxy->ice_checkedCast('::DataStormContract::Lookup', ...$args); + } + + public static function uncheckedCast($proxy, $facet=null) + { + return $proxy->ice_uncheckedCast('::DataStormContract::Lookup', $facet); + } + + public static function ice_staticId() + { + return '::DataStormContract::Lookup'; + } + } + + global $Ice__t_ObjectPrx; + $DataStormContract__t_LookupPrx = IcePHP_defineProxy('::DataStormContract::Lookup', $Ice__t_ObjectPrx, null); + + global $IcePHP__t_string; + global $DataStormContract__t_NodePrx; + global $DataStormContract__t_StringSeq; + IcePHP_defineOperation($DataStormContract__t_LookupPrx, 'announceTopicReader', 2, -1, array(array($IcePHP__t_string), array($DataStormContract__t_NodePrx)), null, null, null); + IcePHP_defineOperation($DataStormContract__t_LookupPrx, 'announceTopicWriter', 2, -1, array(array($IcePHP__t_string), array($DataStormContract__t_NodePrx)), null, null, null); + IcePHP_defineOperation($DataStormContract__t_LookupPrx, 'announceTopics', 2, -1, array(array($DataStormContract__t_StringSeq), array($DataStormContract__t_StringSeq), array($DataStormContract__t_NodePrx)), null, null, null); + IcePHP_defineOperation($DataStormContract__t_LookupPrx, 'createSession', 0, -1, array(array($DataStormContract__t_NodePrx)), null, array($DataStormContract__t_NodePrx), null); +} +?> diff --git a/slice2php/cpp/test/DataStorm/api/Test.php b/slice2php/cpp/test/DataStorm/api/Test.php new file mode 100644 index 000000000000..79ae3543462f --- /dev/null +++ b/slice2php/cpp/test/DataStorm/api/Test.php @@ -0,0 +1,76 @@ + +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + + +namespace Test +{ + global $Test__t_StructKey; + class StructKey + { + public function __construct($value=0) + { + $this->value = $value; + } + + public function __toString(): string + { + global $Test__t_StructKey; + return IcePHP_stringify($this, $Test__t_StructKey); + } + + public $value; + } + + global $IcePHP__t_int; + $Test__t_StructKey = IcePHP_defineStruct('::Test::StructKey', '\\Test\\StructKey', array( + array('value', $IcePHP__t_int))); +} + +namespace Test +{ + global $Test__t_ClassKey; + class ClassKey extends \Ice\Value + { + public function __construct($value=0) + { + $this->value = $value; + } + + public function ice_id() + { + return '::Test::ClassKey'; + } + + public static function ice_staticId() + { + return '::Test::ClassKey'; + } + + public function __toString(): string + { + global $Test__t_ClassKey; + return IcePHP_stringify($this, $Test__t_ClassKey); + } + + public $value; + } + + global $Ice__t_Value; + global $IcePHP__t_int; + $Test__t_ClassKey = IcePHP_defineClass('::Test::ClassKey', '\\Test\\ClassKey', -1, false, $Ice__t_Value, array( + array('value', $IcePHP__t_int, false, 0))); +} +?> diff --git a/slice2php/cpp/test/DataStorm/events/Test.php b/slice2php/cpp/test/DataStorm/events/Test.php new file mode 100644 index 000000000000..4b72e7e03b47 --- /dev/null +++ b/slice2php/cpp/test/DataStorm/events/Test.php @@ -0,0 +1,119 @@ + +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + + +namespace Test +{ + global $Test__t_StructValue; + class StructValue + { + public function __construct($firstName='', $lastName='', $age=0) + { + $this->firstName = $firstName; + $this->lastName = $lastName; + $this->age = $age; + } + + public function __toString(): string + { + global $Test__t_StructValue; + return IcePHP_stringify($this, $Test__t_StructValue); + } + + public $firstName; + public $lastName; + public $age; + } + + global $IcePHP__t_string; + global $IcePHP__t_int; + $Test__t_StructValue = IcePHP_defineStruct('::Test::StructValue', '\\Test\\StructValue', array( + array('firstName', $IcePHP__t_string), + array('lastName', $IcePHP__t_string), + array('age', $IcePHP__t_int))); +} + +namespace Test +{ + global $Test__t_Base; + class Base extends \Ice\Value + { + public function __construct($b='') + { + $this->b = $b; + } + + public function ice_id() + { + return '::Test::Base'; + } + + public static function ice_staticId() + { + return '::Test::Base'; + } + + public function __toString(): string + { + global $Test__t_Base; + return IcePHP_stringify($this, $Test__t_Base); + } + + public $b; + } + + global $Ice__t_Value; + global $IcePHP__t_string; + $Test__t_Base = IcePHP_defineClass('::Test::Base', '\\Test\\Base', -1, false, $Ice__t_Value, array( + array('b', $IcePHP__t_string, false, 0))); +} + +namespace Test +{ + global $Test__t_Extended; + class Extended extends \Test\Base + { + public function __construct($b='', $e=0) + { + parent::__construct($b); + $this->e = $e; + } + + public function ice_id() + { + return '::Test::Extended'; + } + + public static function ice_staticId() + { + return '::Test::Extended'; + } + + public function __toString(): string + { + global $Test__t_Extended; + return IcePHP_stringify($this, $Test__t_Extended); + } + + public $e; + } + + global $Test__t_Base; + global $IcePHP__t_int; + $Test__t_Extended = IcePHP_defineClass('::Test::Extended', '\\Test\\Extended', -1, false, $Test__t_Base, array( + array('e', $IcePHP__t_int, false, 0))); +} +?> diff --git a/slice2php/cpp/test/DataStorm/partial/Test.php b/slice2php/cpp/test/DataStorm/partial/Test.php new file mode 100644 index 000000000000..4ce85a0d33e9 --- /dev/null +++ b/slice2php/cpp/test/DataStorm/partial/Test.php @@ -0,0 +1,47 @@ + +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + + +namespace Test +{ + global $Test__t_Stock; + class Stock + { + public function __construct($price=0.0, $lastBid=0.0, $laskAsk=0.0) + { + $this->price = $price; + $this->lastBid = $lastBid; + $this->laskAsk = $laskAsk; + } + + public function __toString(): string + { + global $Test__t_Stock; + return IcePHP_stringify($this, $Test__t_Stock); + } + + public $price; + public $lastBid; + public $laskAsk; + } + + global $IcePHP__t_float; + $Test__t_Stock = IcePHP_defineStruct('::Test::Stock', '\\Test\\Stock', array( + array('price', $IcePHP__t_float), + array('lastBid', $IcePHP__t_float), + array('laskAsk', $IcePHP__t_float))); +} +?> diff --git a/slice2php/cpp/test/DataStorm/types/Test.php b/slice2php/cpp/test/DataStorm/types/Test.php new file mode 100644 index 000000000000..4b72e7e03b47 --- /dev/null +++ b/slice2php/cpp/test/DataStorm/types/Test.php @@ -0,0 +1,119 @@ + +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + + +namespace Test +{ + global $Test__t_StructValue; + class StructValue + { + public function __construct($firstName='', $lastName='', $age=0) + { + $this->firstName = $firstName; + $this->lastName = $lastName; + $this->age = $age; + } + + public function __toString(): string + { + global $Test__t_StructValue; + return IcePHP_stringify($this, $Test__t_StructValue); + } + + public $firstName; + public $lastName; + public $age; + } + + global $IcePHP__t_string; + global $IcePHP__t_int; + $Test__t_StructValue = IcePHP_defineStruct('::Test::StructValue', '\\Test\\StructValue', array( + array('firstName', $IcePHP__t_string), + array('lastName', $IcePHP__t_string), + array('age', $IcePHP__t_int))); +} + +namespace Test +{ + global $Test__t_Base; + class Base extends \Ice\Value + { + public function __construct($b='') + { + $this->b = $b; + } + + public function ice_id() + { + return '::Test::Base'; + } + + public static function ice_staticId() + { + return '::Test::Base'; + } + + public function __toString(): string + { + global $Test__t_Base; + return IcePHP_stringify($this, $Test__t_Base); + } + + public $b; + } + + global $Ice__t_Value; + global $IcePHP__t_string; + $Test__t_Base = IcePHP_defineClass('::Test::Base', '\\Test\\Base', -1, false, $Ice__t_Value, array( + array('b', $IcePHP__t_string, false, 0))); +} + +namespace Test +{ + global $Test__t_Extended; + class Extended extends \Test\Base + { + public function __construct($b='', $e=0) + { + parent::__construct($b); + $this->e = $e; + } + + public function ice_id() + { + return '::Test::Extended'; + } + + public static function ice_staticId() + { + return '::Test::Extended'; + } + + public function __toString(): string + { + global $Test__t_Extended; + return IcePHP_stringify($this, $Test__t_Extended); + } + + public $e; + } + + global $Test__t_Base; + global $IcePHP__t_int; + $Test__t_Extended = IcePHP_defineClass('::Test::Extended', '\\Test\\Extended', -1, false, $Test__t_Base, array( + array('e', $IcePHP__t_int, false, 0))); +} +?> diff --git a/slice2php/slice/DataStorm/Sample.php b/slice2php/slice/DataStorm/Sample.php new file mode 100644 index 000000000000..3178a0506c2d --- /dev/null +++ b/slice2php/slice/DataStorm/Sample.php @@ -0,0 +1,42 @@ + +// +// Generated from file `Sample.ice' +// +// Warning: do not edit this file. +// +// +// + + +namespace DataStorm +{ + global $DataStorm__t_SampleEvent; + class SampleEvent + { + const Add = 0; + const Update = 1; + const PartialUpdate = 2; + const Remove = 3; + } + + $DataStorm__t_SampleEvent = IcePHP_defineEnum('::DataStorm::SampleEvent', array('Add', 0, 'Update', 1, 'PartialUpdate', 2, 'Remove', 3)); +} + +namespace DataStorm +{ + global $DataStorm__t_SampleEventSeq; + + if(!isset($DataStorm__t_SampleEventSeq)) + { + global $DataStorm__t_SampleEvent; + $DataStorm__t_SampleEventSeq = IcePHP_defineSequence('::DataStorm::SampleEventSeq', $DataStorm__t_SampleEvent); + } +} +?> diff --git a/slice2py/cpp/src/DataStorm/Contract_ice.py b/slice2py/cpp/src/DataStorm/Contract_ice.py new file mode 100644 index 000000000000..502d6967ee5a --- /dev/null +++ b/slice2py/cpp/src/DataStorm/Contract_ice.py @@ -0,0 +1,1066 @@ +# -*- coding: utf-8 -*- +# +# Copyright (c) ZeroC, Inc. All rights reserved. +# +# +# Ice version 3.8.0-alpha.0 +# +# +# +# Generated from file `Contract.ice' +# +# Warning: do not edit this file. +# +# +# + +import Ice +import IcePy +import builtins as _builtins +import Ice.Identity_ice +import DataStorm_Sample_ice + +# Included module Ice +_M_Ice = Ice.openModule('Ice') + +# Included module DataStorm +_M_DataStorm = Ice.openModule('DataStorm') + +# Start of module DataStormContract +_M_DataStormContract = Ice.openModule('DataStormContract') +__name__ = 'DataStormContract' + +if 'ClearHistoryPolicy' not in _M_DataStormContract.__dict__: + _M_DataStormContract.ClearHistoryPolicy = None + class ClearHistoryPolicy(Ice.EnumBase): + + def __init__(self, _n, _v): + Ice.EnumBase.__init__(self, _n, _v) + + def valueOf(self, _n): + if _n in self._enumerators: + return self._enumerators[_n] + return None + valueOf = classmethod(valueOf) + + ClearHistoryPolicy.OnAdd = ClearHistoryPolicy("OnAdd", 0) + ClearHistoryPolicy.OnRemove = ClearHistoryPolicy("OnRemove", 1) + ClearHistoryPolicy.OnAll = ClearHistoryPolicy("OnAll", 2) + ClearHistoryPolicy.OnAllExceptPartialUpdate = ClearHistoryPolicy("OnAllExceptPartialUpdate", 3) + ClearHistoryPolicy.Never = ClearHistoryPolicy("Never", 4) + ClearHistoryPolicy._enumerators = { 0:ClearHistoryPolicy.OnAdd, 1:ClearHistoryPolicy.OnRemove, 2:ClearHistoryPolicy.OnAll, 3:ClearHistoryPolicy.OnAllExceptPartialUpdate, 4:ClearHistoryPolicy.Never } + + _M_DataStormContract._t_ClearHistoryPolicy = IcePy.defineEnum('::DataStormContract::ClearHistoryPolicy', ClearHistoryPolicy, (), ClearHistoryPolicy._enumerators) + + _M_DataStormContract.ClearHistoryPolicy = ClearHistoryPolicy + del ClearHistoryPolicy + +if '_t_ByteSeq' not in _M_DataStormContract.__dict__: + _M_DataStormContract._t_ByteSeq = IcePy.defineSequence('::DataStormContract::ByteSeq', (), IcePy._t_byte) + +if '_t_LongSeq' not in _M_DataStormContract.__dict__: + _M_DataStormContract._t_LongSeq = IcePy.defineSequence('::DataStormContract::LongSeq', (), IcePy._t_long) + +if '_t_StringSeq' not in _M_DataStormContract.__dict__: + _M_DataStormContract._t_StringSeq = IcePy.defineSequence('::DataStormContract::StringSeq', (), IcePy._t_string) + +if '_t_LongLongDict' not in _M_DataStormContract.__dict__: + _M_DataStormContract._t_LongLongDict = IcePy.defineDictionary('::DataStormContract::LongLongDict', (), IcePy._t_long, IcePy._t_long) + +if 'DataSample' not in _M_DataStormContract.__dict__: + _M_DataStormContract.DataSample = None + class DataSample(object): + def __init__(self, id=0, keyId=0, keyValue=None, timestamp=0, tag=0, event=_M_DataStorm.SampleEvent.Add, value=None): + self.id = id + self.keyId = keyId + self.keyValue = keyValue + self.timestamp = timestamp + self.tag = tag + self.event = event + self.value = value + + def __eq__(self, other): + if other is None: + return False + elif not isinstance(other, _M_DataStormContract.DataSample): + return NotImplemented + else: + if self.id != other.id: + return False + if self.keyId != other.keyId: + return False + if self.keyValue != other.keyValue: + return False + if self.timestamp != other.timestamp: + return False + if self.tag != other.tag: + return False + if self.event != other.event: + return False + if self.value != other.value: + return False + return True + + def __ne__(self, other): + return not self.__eq__(other) + + def __str__(self): + return IcePy.stringify(self, _M_DataStormContract._t_DataSample) + + __repr__ = __str__ + + _M_DataStormContract._t_DataSample = IcePy.defineStruct('::DataStormContract::DataSample', DataSample, (), ( + ('id', (), IcePy._t_long), + ('keyId', (), IcePy._t_long), + ('keyValue', (), _M_DataStormContract._t_ByteSeq), + ('timestamp', (), IcePy._t_long), + ('tag', (), IcePy._t_long), + ('event', (), _M_DataStorm._t_SampleEvent), + ('value', (), _M_DataStormContract._t_ByteSeq) + )) + + _M_DataStormContract.DataSample = DataSample + del DataSample + +if '_t_DataSampleSeq' not in _M_DataStormContract.__dict__: + _M_DataStormContract._t_DataSampleSeq = IcePy.defineSequence('::DataStormContract::DataSampleSeq', (), _M_DataStormContract._t_DataSample) + +if 'DataSamples' not in _M_DataStormContract.__dict__: + _M_DataStormContract.DataSamples = None + class DataSamples(object): + def __init__(self, id=0, samples=None): + self.id = id + self.samples = samples + + def __eq__(self, other): + if other is None: + return False + elif not isinstance(other, _M_DataStormContract.DataSamples): + return NotImplemented + else: + if self.id != other.id: + return False + if self.samples != other.samples: + return False + return True + + def __ne__(self, other): + return not self.__eq__(other) + + def __str__(self): + return IcePy.stringify(self, _M_DataStormContract._t_DataSamples) + + __repr__ = __str__ + + _M_DataStormContract._t_DataSamples = IcePy.defineStruct('::DataStormContract::DataSamples', DataSamples, (), ( + ('id', (), IcePy._t_long), + ('samples', (), _M_DataStormContract._t_DataSampleSeq) + )) + + _M_DataStormContract.DataSamples = DataSamples + del DataSamples + +if '_t_DataSamplesSeq' not in _M_DataStormContract.__dict__: + _M_DataStormContract._t_DataSamplesSeq = IcePy.defineSequence('::DataStormContract::DataSamplesSeq', (), _M_DataStormContract._t_DataSamples) + +if 'ElementInfo' not in _M_DataStormContract.__dict__: + _M_DataStormContract.ElementInfo = None + class ElementInfo(object): + def __init__(self, id=0, name='', value=None): + self.id = id + self.name = name + self.value = value + + def __eq__(self, other): + if other is None: + return False + elif not isinstance(other, _M_DataStormContract.ElementInfo): + return NotImplemented + else: + if self.id != other.id: + return False + if self.name != other.name: + return False + if self.value != other.value: + return False + return True + + def __ne__(self, other): + return not self.__eq__(other) + + def __str__(self): + return IcePy.stringify(self, _M_DataStormContract._t_ElementInfo) + + __repr__ = __str__ + + _M_DataStormContract._t_ElementInfo = IcePy.defineStruct('::DataStormContract::ElementInfo', ElementInfo, (), ( + ('id', (), IcePy._t_long), + ('name', (), IcePy._t_string), + ('value', (), _M_DataStormContract._t_ByteSeq) + )) + + _M_DataStormContract.ElementInfo = ElementInfo + del ElementInfo + +if '_t_ElementInfoSeq' not in _M_DataStormContract.__dict__: + _M_DataStormContract._t_ElementInfoSeq = IcePy.defineSequence('::DataStormContract::ElementInfoSeq', (), _M_DataStormContract._t_ElementInfo) + +if 'TopicInfo' not in _M_DataStormContract.__dict__: + _M_DataStormContract.TopicInfo = None + class TopicInfo(object): + def __init__(self, name='', ids=None): + self.name = name + self.ids = ids + + def __eq__(self, other): + if other is None: + return False + elif not isinstance(other, _M_DataStormContract.TopicInfo): + return NotImplemented + else: + if self.name != other.name: + return False + if self.ids != other.ids: + return False + return True + + def __ne__(self, other): + return not self.__eq__(other) + + def __str__(self): + return IcePy.stringify(self, _M_DataStormContract._t_TopicInfo) + + __repr__ = __str__ + + _M_DataStormContract._t_TopicInfo = IcePy.defineStruct('::DataStormContract::TopicInfo', TopicInfo, (), ( + ('name', (), IcePy._t_string), + ('ids', (), _M_DataStormContract._t_LongSeq) + )) + + _M_DataStormContract.TopicInfo = TopicInfo + del TopicInfo + +if '_t_TopicInfoSeq' not in _M_DataStormContract.__dict__: + _M_DataStormContract._t_TopicInfoSeq = IcePy.defineSequence('::DataStormContract::TopicInfoSeq', (), _M_DataStormContract._t_TopicInfo) + +if 'TopicSpec' not in _M_DataStormContract.__dict__: + _M_DataStormContract.TopicSpec = None + class TopicSpec(object): + def __init__(self, id=0, name='', elements=None, tags=None): + self.id = id + self.name = name + self.elements = elements + self.tags = tags + + def __eq__(self, other): + if other is None: + return False + elif not isinstance(other, _M_DataStormContract.TopicSpec): + return NotImplemented + else: + if self.id != other.id: + return False + if self.name != other.name: + return False + if self.elements != other.elements: + return False + if self.tags != other.tags: + return False + return True + + def __ne__(self, other): + return not self.__eq__(other) + + def __str__(self): + return IcePy.stringify(self, _M_DataStormContract._t_TopicSpec) + + __repr__ = __str__ + + _M_DataStormContract._t_TopicSpec = IcePy.defineStruct('::DataStormContract::TopicSpec', TopicSpec, (), ( + ('id', (), IcePy._t_long), + ('name', (), IcePy._t_string), + ('elements', (), _M_DataStormContract._t_ElementInfoSeq), + ('tags', (), _M_DataStormContract._t_ElementInfoSeq) + )) + + _M_DataStormContract.TopicSpec = TopicSpec + del TopicSpec + +if 'FilterInfo' not in _M_DataStormContract.__dict__: + _M_DataStormContract.FilterInfo = None + class FilterInfo(object): + def __init__(self, name='', criteria=None): + self.name = name + self.criteria = criteria + + def __eq__(self, other): + if other is None: + return False + elif not isinstance(other, _M_DataStormContract.FilterInfo): + return NotImplemented + else: + if self.name != other.name: + return False + if self.criteria != other.criteria: + return False + return True + + def __ne__(self, other): + return not self.__eq__(other) + + def __str__(self): + return IcePy.stringify(self, _M_DataStormContract._t_FilterInfo) + + __repr__ = __str__ + + _M_DataStormContract._t_FilterInfo = IcePy.defineStruct('::DataStormContract::FilterInfo', FilterInfo, (), ( + ('name', (), IcePy._t_string), + ('criteria', (), _M_DataStormContract._t_ByteSeq) + )) + + _M_DataStormContract.FilterInfo = FilterInfo + del FilterInfo + +if 'ElementConfig' not in _M_DataStormContract.__dict__: + _M_DataStormContract.ElementConfig = None + class ElementConfig(Ice.Value): + def __init__(self, facet=None, sampleFilter=None, name=None, priority=None, sampleCount=None, sampleLifetime=None, clearHistory=None): + self.facet = facet + self.sampleFilter = sampleFilter + self.name = name + self.priority = priority + self.sampleCount = sampleCount + self.sampleLifetime = sampleLifetime + self.clearHistory = clearHistory + + def ice_id(self): + return '::DataStormContract::ElementConfig' + + @staticmethod + def ice_staticId(): + return '::DataStormContract::ElementConfig' + + def __str__(self): + return IcePy.stringify(self, _M_DataStormContract._t_ElementConfig) + + __repr__ = __str__ + + _M_DataStormContract._t_ElementConfig = IcePy.defineValue('::DataStormContract::ElementConfig', ElementConfig, 1, (), False, None, ( + ('facet', (), IcePy._t_string, True, 1), + ('sampleFilter', (), _M_DataStormContract._t_FilterInfo, True, 2), + ('name', (), IcePy._t_string, True, 3), + ('priority', (), IcePy._t_int, True, 4), + ('sampleCount', (), IcePy._t_int, True, 10), + ('sampleLifetime', (), IcePy._t_int, True, 11), + ('clearHistory', (), _M_DataStormContract._t_ClearHistoryPolicy, True, 12) + )) + ElementConfig._ice_type = _M_DataStormContract._t_ElementConfig + + _M_DataStormContract.ElementConfig = ElementConfig + del ElementConfig + +if 'ElementData' not in _M_DataStormContract.__dict__: + _M_DataStormContract.ElementData = None + class ElementData(object): + def __init__(self, id=0, config=None, lastIds=None): + self.id = id + self.config = config + self.lastIds = lastIds + + def __eq__(self, other): + if other is None: + return False + elif not isinstance(other, _M_DataStormContract.ElementData): + return NotImplemented + else: + if self.id != other.id: + return False + if self.config != other.config: + return False + if self.lastIds != other.lastIds: + return False + return True + + def __ne__(self, other): + return not self.__eq__(other) + + def __str__(self): + return IcePy.stringify(self, _M_DataStormContract._t_ElementData) + + __repr__ = __str__ + + _M_DataStormContract._t_ElementData = IcePy.defineStruct('::DataStormContract::ElementData', ElementData, (), ( + ('id', (), IcePy._t_long), + ('config', (), _M_DataStormContract._t_ElementConfig), + ('lastIds', (), _M_DataStormContract._t_LongLongDict) + )) + + _M_DataStormContract.ElementData = ElementData + del ElementData + +if '_t_ElementDataSeq' not in _M_DataStormContract.__dict__: + _M_DataStormContract._t_ElementDataSeq = IcePy.defineSequence('::DataStormContract::ElementDataSeq', (), _M_DataStormContract._t_ElementData) + +if 'ElementSpec' not in _M_DataStormContract.__dict__: + _M_DataStormContract.ElementSpec = None + class ElementSpec(object): + def __init__(self, elements=None, id=0, name='', value=None, peerId=0, peerName=''): + self.elements = elements + self.id = id + self.name = name + self.value = value + self.peerId = peerId + self.peerName = peerName + + def __eq__(self, other): + if other is None: + return False + elif not isinstance(other, _M_DataStormContract.ElementSpec): + return NotImplemented + else: + if self.elements != other.elements: + return False + if self.id != other.id: + return False + if self.name != other.name: + return False + if self.value != other.value: + return False + if self.peerId != other.peerId: + return False + if self.peerName != other.peerName: + return False + return True + + def __ne__(self, other): + return not self.__eq__(other) + + def __str__(self): + return IcePy.stringify(self, _M_DataStormContract._t_ElementSpec) + + __repr__ = __str__ + + _M_DataStormContract._t_ElementSpec = IcePy.defineStruct('::DataStormContract::ElementSpec', ElementSpec, (), ( + ('elements', (), _M_DataStormContract._t_ElementDataSeq), + ('id', (), IcePy._t_long), + ('name', (), IcePy._t_string), + ('value', (), _M_DataStormContract._t_ByteSeq), + ('peerId', (), IcePy._t_long), + ('peerName', (), IcePy._t_string) + )) + + _M_DataStormContract.ElementSpec = ElementSpec + del ElementSpec + +if '_t_ElementSpecSeq' not in _M_DataStormContract.__dict__: + _M_DataStormContract._t_ElementSpecSeq = IcePy.defineSequence('::DataStormContract::ElementSpecSeq', (), _M_DataStormContract._t_ElementSpec) + +if 'ElementDataAck' not in _M_DataStormContract.__dict__: + _M_DataStormContract.ElementDataAck = None + class ElementDataAck(object): + def __init__(self, id=0, config=None, lastIds=None, samples=None, peerId=0): + self.id = id + self.config = config + self.lastIds = lastIds + self.samples = samples + self.peerId = peerId + + def __eq__(self, other): + if other is None: + return False + elif not isinstance(other, _M_DataStormContract.ElementDataAck): + return NotImplemented + else: + if self.id != other.id: + return False + if self.config != other.config: + return False + if self.lastIds != other.lastIds: + return False + if self.samples != other.samples: + return False + if self.peerId != other.peerId: + return False + return True + + def __ne__(self, other): + return not self.__eq__(other) + + def __str__(self): + return IcePy.stringify(self, _M_DataStormContract._t_ElementDataAck) + + __repr__ = __str__ + + _M_DataStormContract._t_ElementDataAck = IcePy.defineStruct('::DataStormContract::ElementDataAck', ElementDataAck, (), ( + ('id', (), IcePy._t_long), + ('config', (), _M_DataStormContract._t_ElementConfig), + ('lastIds', (), _M_DataStormContract._t_LongLongDict), + ('samples', (), _M_DataStormContract._t_DataSampleSeq), + ('peerId', (), IcePy._t_long) + )) + + _M_DataStormContract.ElementDataAck = ElementDataAck + del ElementDataAck + +if '_t_ElementDataAckSeq' not in _M_DataStormContract.__dict__: + _M_DataStormContract._t_ElementDataAckSeq = IcePy.defineSequence('::DataStormContract::ElementDataAckSeq', (), _M_DataStormContract._t_ElementDataAck) + +if 'ElementSpecAck' not in _M_DataStormContract.__dict__: + _M_DataStormContract.ElementSpecAck = None + class ElementSpecAck(object): + def __init__(self, elements=None, id=0, name='', value=None, peerId=0, peerName=''): + self.elements = elements + self.id = id + self.name = name + self.value = value + self.peerId = peerId + self.peerName = peerName + + def __eq__(self, other): + if other is None: + return False + elif not isinstance(other, _M_DataStormContract.ElementSpecAck): + return NotImplemented + else: + if self.elements != other.elements: + return False + if self.id != other.id: + return False + if self.name != other.name: + return False + if self.value != other.value: + return False + if self.peerId != other.peerId: + return False + if self.peerName != other.peerName: + return False + return True + + def __ne__(self, other): + return not self.__eq__(other) + + def __str__(self): + return IcePy.stringify(self, _M_DataStormContract._t_ElementSpecAck) + + __repr__ = __str__ + + _M_DataStormContract._t_ElementSpecAck = IcePy.defineStruct('::DataStormContract::ElementSpecAck', ElementSpecAck, (), ( + ('elements', (), _M_DataStormContract._t_ElementDataAckSeq), + ('id', (), IcePy._t_long), + ('name', (), IcePy._t_string), + ('value', (), _M_DataStormContract._t_ByteSeq), + ('peerId', (), IcePy._t_long), + ('peerName', (), IcePy._t_string) + )) + + _M_DataStormContract.ElementSpecAck = ElementSpecAck + del ElementSpecAck + +if '_t_ElementSpecAckSeq' not in _M_DataStormContract.__dict__: + _M_DataStormContract._t_ElementSpecAckSeq = IcePy.defineSequence('::DataStormContract::ElementSpecAckSeq', (), _M_DataStormContract._t_ElementSpecAck) + +if 'SessionPrx' not in _M_DataStormContract.__dict__: + _M_DataStormContract.SessionPrx = None + class SessionPrx(Ice.ObjectPrx): + + def __init__(self, communicator, proxyString): + """ + Creates a new SessionPrx proxy + + Parameters + ---------- + communicator : Ice.Communicator + The communicator of the new proxy. + proxyString : str + The string representation of the proxy. + + Raises + ------ + ParseException + Thrown when proxyString is not a valid proxy string. + """ + super().__init__(communicator, proxyString) + + def announceTopics(self, topics, initialize, context=None): + return _M_DataStormContract.Session._op_announceTopics.invoke(self, ((topics, initialize), context)) + + def announceTopicsAsync(self, topics, initialize, context=None): + return _M_DataStormContract.Session._op_announceTopics.invokeAsync(self, ((topics, initialize), context)) + + def attachTopic(self, topic, context=None): + return _M_DataStormContract.Session._op_attachTopic.invoke(self, ((topic, ), context)) + + def attachTopicAsync(self, topic, context=None): + return _M_DataStormContract.Session._op_attachTopic.invokeAsync(self, ((topic, ), context)) + + def detachTopic(self, topic, context=None): + return _M_DataStormContract.Session._op_detachTopic.invoke(self, ((topic, ), context)) + + def detachTopicAsync(self, topic, context=None): + return _M_DataStormContract.Session._op_detachTopic.invokeAsync(self, ((topic, ), context)) + + def attachTags(self, topic, tags, initialize, context=None): + return _M_DataStormContract.Session._op_attachTags.invoke(self, ((topic, tags, initialize), context)) + + def attachTagsAsync(self, topic, tags, initialize, context=None): + return _M_DataStormContract.Session._op_attachTags.invokeAsync(self, ((topic, tags, initialize), context)) + + def detachTags(self, topic, tags, context=None): + return _M_DataStormContract.Session._op_detachTags.invoke(self, ((topic, tags), context)) + + def detachTagsAsync(self, topic, tags, context=None): + return _M_DataStormContract.Session._op_detachTags.invokeAsync(self, ((topic, tags), context)) + + def announceElements(self, topic, keys, context=None): + return _M_DataStormContract.Session._op_announceElements.invoke(self, ((topic, keys), context)) + + def announceElementsAsync(self, topic, keys, context=None): + return _M_DataStormContract.Session._op_announceElements.invokeAsync(self, ((topic, keys), context)) + + def attachElements(self, topic, elements, initialize, context=None): + return _M_DataStormContract.Session._op_attachElements.invoke(self, ((topic, elements, initialize), context)) + + def attachElementsAsync(self, topic, elements, initialize, context=None): + return _M_DataStormContract.Session._op_attachElements.invokeAsync(self, ((topic, elements, initialize), context)) + + def attachElementsAck(self, topic, elements, context=None): + return _M_DataStormContract.Session._op_attachElementsAck.invoke(self, ((topic, elements), context)) + + def attachElementsAckAsync(self, topic, elements, context=None): + return _M_DataStormContract.Session._op_attachElementsAck.invokeAsync(self, ((topic, elements), context)) + + def detachElements(self, topic, keys, context=None): + return _M_DataStormContract.Session._op_detachElements.invoke(self, ((topic, keys), context)) + + def detachElementsAsync(self, topic, keys, context=None): + return _M_DataStormContract.Session._op_detachElements.invokeAsync(self, ((topic, keys), context)) + + def initSamples(self, topic, samples, context=None): + return _M_DataStormContract.Session._op_initSamples.invoke(self, ((topic, samples), context)) + + def initSamplesAsync(self, topic, samples, context=None): + return _M_DataStormContract.Session._op_initSamples.invokeAsync(self, ((topic, samples), context)) + + def disconnected(self, context=None): + return _M_DataStormContract.Session._op_disconnected.invoke(self, ((), context)) + + def disconnectedAsync(self, context=None): + return _M_DataStormContract.Session._op_disconnected.invokeAsync(self, ((), context)) + + @staticmethod + def checkedCast(proxy, facetOrContext=None, context=None): + return _M_DataStormContract.SessionPrx.ice_checkedCast(proxy, '::DataStormContract::Session', facetOrContext, context) + + @staticmethod + def uncheckedCast(proxy, facet=None): + return _M_DataStormContract.SessionPrx.ice_uncheckedCast(proxy, facet) + + @staticmethod + def ice_staticId(): + return '::DataStormContract::Session' + _M_DataStormContract._t_SessionPrx = IcePy.defineProxy('::DataStormContract::Session', SessionPrx) + + _M_DataStormContract.SessionPrx = SessionPrx + del SessionPrx + + _M_DataStormContract.Session = None + class Session(Ice.Object): + + def ice_ids(self, current=None): + return ('::DataStormContract::Session', '::Ice::Object') + + def ice_id(self, current=None): + return '::DataStormContract::Session' + + @staticmethod + def ice_staticId(): + return '::DataStormContract::Session' + + def announceTopics(self, topics, initialize, current=None): + raise NotImplementedError("servant method 'announceTopics' not implemented") + + def attachTopic(self, topic, current=None): + raise NotImplementedError("servant method 'attachTopic' not implemented") + + def detachTopic(self, topic, current=None): + raise NotImplementedError("servant method 'detachTopic' not implemented") + + def attachTags(self, topic, tags, initialize, current=None): + raise NotImplementedError("servant method 'attachTags' not implemented") + + def detachTags(self, topic, tags, current=None): + raise NotImplementedError("servant method 'detachTags' not implemented") + + def announceElements(self, topic, keys, current=None): + raise NotImplementedError("servant method 'announceElements' not implemented") + + def attachElements(self, topic, elements, initialize, current=None): + raise NotImplementedError("servant method 'attachElements' not implemented") + + def attachElementsAck(self, topic, elements, current=None): + raise NotImplementedError("servant method 'attachElementsAck' not implemented") + + def detachElements(self, topic, keys, current=None): + raise NotImplementedError("servant method 'detachElements' not implemented") + + def initSamples(self, topic, samples, current=None): + raise NotImplementedError("servant method 'initSamples' not implemented") + + def disconnected(self, current=None): + raise NotImplementedError("servant method 'disconnected' not implemented") + + def __str__(self): + return IcePy.stringify(self, _M_DataStormContract._t_SessionDisp) + + __repr__ = __str__ + + _M_DataStormContract._t_SessionDisp = IcePy.defineClass('::DataStormContract::Session', Session, (), None, ()) + Session._ice_type = _M_DataStormContract._t_SessionDisp + + Session._op_announceTopics = IcePy.Operation('announceTopics', Ice.OperationMode.Normal, False, None, (), (((), _M_DataStormContract._t_TopicInfoSeq, False, 0), ((), IcePy._t_bool, False, 0)), (), None, ()) + Session._op_attachTopic = IcePy.Operation('attachTopic', Ice.OperationMode.Normal, False, None, (), (((), _M_DataStormContract._t_TopicSpec, False, 0),), (), None, ()) + Session._op_detachTopic = IcePy.Operation('detachTopic', Ice.OperationMode.Normal, False, None, (), (((), IcePy._t_long, False, 0),), (), None, ()) + Session._op_attachTags = IcePy.Operation('attachTags', Ice.OperationMode.Normal, False, None, (), (((), IcePy._t_long, False, 0), ((), _M_DataStormContract._t_ElementInfoSeq, False, 0), ((), IcePy._t_bool, False, 0)), (), None, ()) + Session._op_detachTags = IcePy.Operation('detachTags', Ice.OperationMode.Normal, False, None, (), (((), IcePy._t_long, False, 0), ((), _M_DataStormContract._t_LongSeq, False, 0)), (), None, ()) + Session._op_announceElements = IcePy.Operation('announceElements', Ice.OperationMode.Normal, False, None, (), (((), IcePy._t_long, False, 0), ((), _M_DataStormContract._t_ElementInfoSeq, False, 0)), (), None, ()) + Session._op_attachElements = IcePy.Operation('attachElements', Ice.OperationMode.Normal, False, None, (), (((), IcePy._t_long, False, 0), ((), _M_DataStormContract._t_ElementSpecSeq, False, 0), ((), IcePy._t_bool, False, 0)), (), None, ()) + Session._op_attachElementsAck = IcePy.Operation('attachElementsAck', Ice.OperationMode.Normal, False, None, (), (((), IcePy._t_long, False, 0), ((), _M_DataStormContract._t_ElementSpecAckSeq, False, 0)), (), None, ()) + Session._op_detachElements = IcePy.Operation('detachElements', Ice.OperationMode.Normal, False, None, (), (((), IcePy._t_long, False, 0), ((), _M_DataStormContract._t_LongSeq, False, 0)), (), None, ()) + Session._op_initSamples = IcePy.Operation('initSamples', Ice.OperationMode.Normal, False, None, (), (((), IcePy._t_long, False, 0), ((), _M_DataStormContract._t_DataSamplesSeq, False, 0)), (), None, ()) + Session._op_disconnected = IcePy.Operation('disconnected', Ice.OperationMode.Normal, False, None, (), (), (), None, ()) + + _M_DataStormContract.Session = Session + del Session + +if 'PublisherSessionPrx' not in _M_DataStormContract.__dict__: + _M_DataStormContract.PublisherSessionPrx = None + class PublisherSessionPrx(_M_DataStormContract.SessionPrx): + + def __init__(self, communicator, proxyString): + """ + Creates a new PublisherSessionPrx proxy + + Parameters + ---------- + communicator : Ice.Communicator + The communicator of the new proxy. + proxyString : str + The string representation of the proxy. + + Raises + ------ + ParseException + Thrown when proxyString is not a valid proxy string. + """ + super().__init__(communicator, proxyString) + + @staticmethod + def checkedCast(proxy, facetOrContext=None, context=None): + return _M_DataStormContract.PublisherSessionPrx.ice_checkedCast(proxy, '::DataStormContract::PublisherSession', facetOrContext, context) + + @staticmethod + def uncheckedCast(proxy, facet=None): + return _M_DataStormContract.PublisherSessionPrx.ice_uncheckedCast(proxy, facet) + + @staticmethod + def ice_staticId(): + return '::DataStormContract::PublisherSession' + _M_DataStormContract._t_PublisherSessionPrx = IcePy.defineProxy('::DataStormContract::PublisherSession', PublisherSessionPrx) + + _M_DataStormContract.PublisherSessionPrx = PublisherSessionPrx + del PublisherSessionPrx + + _M_DataStormContract.PublisherSession = None + class PublisherSession(_M_DataStormContract.Session): + + def ice_ids(self, current=None): + return ('::DataStormContract::PublisherSession', '::DataStormContract::Session', '::Ice::Object') + + def ice_id(self, current=None): + return '::DataStormContract::PublisherSession' + + @staticmethod + def ice_staticId(): + return '::DataStormContract::PublisherSession' + + def __str__(self): + return IcePy.stringify(self, _M_DataStormContract._t_PublisherSessionDisp) + + __repr__ = __str__ + + _M_DataStormContract._t_PublisherSessionDisp = IcePy.defineClass('::DataStormContract::PublisherSession', PublisherSession, (), None, (_M_DataStormContract._t_SessionDisp,)) + PublisherSession._ice_type = _M_DataStormContract._t_PublisherSessionDisp + + _M_DataStormContract.PublisherSession = PublisherSession + del PublisherSession + +if 'SubscriberSessionPrx' not in _M_DataStormContract.__dict__: + _M_DataStormContract.SubscriberSessionPrx = None + class SubscriberSessionPrx(_M_DataStormContract.SessionPrx): + + def __init__(self, communicator, proxyString): + """ + Creates a new SubscriberSessionPrx proxy + + Parameters + ---------- + communicator : Ice.Communicator + The communicator of the new proxy. + proxyString : str + The string representation of the proxy. + + Raises + ------ + ParseException + Thrown when proxyString is not a valid proxy string. + """ + super().__init__(communicator, proxyString) + + def s(self, topicId, elementId, sample, context=None): + return _M_DataStormContract.SubscriberSession._op_s.invoke(self, ((topicId, elementId, sample), context)) + + def sAsync(self, topicId, elementId, sample, context=None): + return _M_DataStormContract.SubscriberSession._op_s.invokeAsync(self, ((topicId, elementId, sample), context)) + + @staticmethod + def checkedCast(proxy, facetOrContext=None, context=None): + return _M_DataStormContract.SubscriberSessionPrx.ice_checkedCast(proxy, '::DataStormContract::SubscriberSession', facetOrContext, context) + + @staticmethod + def uncheckedCast(proxy, facet=None): + return _M_DataStormContract.SubscriberSessionPrx.ice_uncheckedCast(proxy, facet) + + @staticmethod + def ice_staticId(): + return '::DataStormContract::SubscriberSession' + _M_DataStormContract._t_SubscriberSessionPrx = IcePy.defineProxy('::DataStormContract::SubscriberSession', SubscriberSessionPrx) + + _M_DataStormContract.SubscriberSessionPrx = SubscriberSessionPrx + del SubscriberSessionPrx + + _M_DataStormContract.SubscriberSession = None + class SubscriberSession(_M_DataStormContract.Session): + + def ice_ids(self, current=None): + return ('::DataStormContract::Session', '::DataStormContract::SubscriberSession', '::Ice::Object') + + def ice_id(self, current=None): + return '::DataStormContract::SubscriberSession' + + @staticmethod + def ice_staticId(): + return '::DataStormContract::SubscriberSession' + + def s(self, topicId, elementId, sample, current=None): + raise NotImplementedError("servant method 's' not implemented") + + def __str__(self): + return IcePy.stringify(self, _M_DataStormContract._t_SubscriberSessionDisp) + + __repr__ = __str__ + + _M_DataStormContract._t_SubscriberSessionDisp = IcePy.defineClass('::DataStormContract::SubscriberSession', SubscriberSession, (), None, (_M_DataStormContract._t_SessionDisp,)) + SubscriberSession._ice_type = _M_DataStormContract._t_SubscriberSessionDisp + + SubscriberSession._op_s = IcePy.Operation('s', Ice.OperationMode.Normal, False, None, (), (((), IcePy._t_long, False, 0), ((), IcePy._t_long, False, 0), ((), _M_DataStormContract._t_DataSample, False, 0)), (), None, ()) + + _M_DataStormContract.SubscriberSession = SubscriberSession + del SubscriberSession + +if 'NodePrx' not in _M_DataStormContract.__dict__: + _M_DataStormContract.NodePrx = None + class NodePrx(Ice.ObjectPrx): + + def __init__(self, communicator, proxyString): + """ + Creates a new NodePrx proxy + + Parameters + ---------- + communicator : Ice.Communicator + The communicator of the new proxy. + proxyString : str + The string representation of the proxy. + + Raises + ------ + ParseException + Thrown when proxyString is not a valid proxy string. + """ + super().__init__(communicator, proxyString) + + def initiateCreateSession(self, publisher, context=None): + return _M_DataStormContract.Node._op_initiateCreateSession.invoke(self, ((publisher, ), context)) + + def initiateCreateSessionAsync(self, publisher, context=None): + return _M_DataStormContract.Node._op_initiateCreateSession.invokeAsync(self, ((publisher, ), context)) + + def createSession(self, subscriber, session, fromRelay, context=None): + return _M_DataStormContract.Node._op_createSession.invoke(self, ((subscriber, session, fromRelay), context)) + + def createSessionAsync(self, subscriber, session, fromRelay, context=None): + return _M_DataStormContract.Node._op_createSession.invokeAsync(self, ((subscriber, session, fromRelay), context)) + + def confirmCreateSession(self, publisher, session, context=None): + return _M_DataStormContract.Node._op_confirmCreateSession.invoke(self, ((publisher, session), context)) + + def confirmCreateSessionAsync(self, publisher, session, context=None): + return _M_DataStormContract.Node._op_confirmCreateSession.invokeAsync(self, ((publisher, session), context)) + + @staticmethod + def checkedCast(proxy, facetOrContext=None, context=None): + return _M_DataStormContract.NodePrx.ice_checkedCast(proxy, '::DataStormContract::Node', facetOrContext, context) + + @staticmethod + def uncheckedCast(proxy, facet=None): + return _M_DataStormContract.NodePrx.ice_uncheckedCast(proxy, facet) + + @staticmethod + def ice_staticId(): + return '::DataStormContract::Node' + _M_DataStormContract._t_NodePrx = IcePy.defineProxy('::DataStormContract::Node', NodePrx) + + _M_DataStormContract.NodePrx = NodePrx + del NodePrx + + _M_DataStormContract.Node = None + class Node(Ice.Object): + + def ice_ids(self, current=None): + return ('::DataStormContract::Node', '::Ice::Object') + + def ice_id(self, current=None): + return '::DataStormContract::Node' + + @staticmethod + def ice_staticId(): + return '::DataStormContract::Node' + + def initiateCreateSession(self, publisher, current=None): + raise NotImplementedError("servant method 'initiateCreateSession' not implemented") + + def createSession(self, subscriber, session, fromRelay, current=None): + raise NotImplementedError("servant method 'createSession' not implemented") + + def confirmCreateSession(self, publisher, session, current=None): + raise NotImplementedError("servant method 'confirmCreateSession' not implemented") + + def __str__(self): + return IcePy.stringify(self, _M_DataStormContract._t_NodeDisp) + + __repr__ = __str__ + + _M_DataStormContract._t_NodeDisp = IcePy.defineClass('::DataStormContract::Node', Node, (), None, ()) + Node._ice_type = _M_DataStormContract._t_NodeDisp + + Node._op_initiateCreateSession = IcePy.Operation('initiateCreateSession', Ice.OperationMode.Normal, False, None, (), (((), _M_DataStormContract._t_NodePrx, False, 0),), (), None, ()) + Node._op_createSession = IcePy.Operation('createSession', Ice.OperationMode.Normal, False, None, (), (((), _M_DataStormContract._t_NodePrx, False, 0), ((), _M_DataStormContract._t_SubscriberSessionPrx, False, 0), ((), IcePy._t_bool, False, 0)), (), None, ()) + Node._op_confirmCreateSession = IcePy.Operation('confirmCreateSession', Ice.OperationMode.Normal, False, None, (), (((), _M_DataStormContract._t_NodePrx, False, 0), ((), _M_DataStormContract._t_PublisherSessionPrx, False, 0)), (), None, ()) + + _M_DataStormContract.Node = Node + del Node + +if 'LookupPrx' not in _M_DataStormContract.__dict__: + _M_DataStormContract.LookupPrx = None + class LookupPrx(Ice.ObjectPrx): + + def __init__(self, communicator, proxyString): + """ + Creates a new LookupPrx proxy + + Parameters + ---------- + communicator : Ice.Communicator + The communicator of the new proxy. + proxyString : str + The string representation of the proxy. + + Raises + ------ + ParseException + Thrown when proxyString is not a valid proxy string. + """ + super().__init__(communicator, proxyString) + + def announceTopicReader(self, topic, node, context=None): + return _M_DataStormContract.Lookup._op_announceTopicReader.invoke(self, ((topic, node), context)) + + def announceTopicReaderAsync(self, topic, node, context=None): + return _M_DataStormContract.Lookup._op_announceTopicReader.invokeAsync(self, ((topic, node), context)) + + def announceTopicWriter(self, topic, node, context=None): + return _M_DataStormContract.Lookup._op_announceTopicWriter.invoke(self, ((topic, node), context)) + + def announceTopicWriterAsync(self, topic, node, context=None): + return _M_DataStormContract.Lookup._op_announceTopicWriter.invokeAsync(self, ((topic, node), context)) + + def announceTopics(self, readers, writers, node, context=None): + return _M_DataStormContract.Lookup._op_announceTopics.invoke(self, ((readers, writers, node), context)) + + def announceTopicsAsync(self, readers, writers, node, context=None): + return _M_DataStormContract.Lookup._op_announceTopics.invokeAsync(self, ((readers, writers, node), context)) + + def createSession(self, node, context=None): + return _M_DataStormContract.Lookup._op_createSession.invoke(self, ((node, ), context)) + + def createSessionAsync(self, node, context=None): + return _M_DataStormContract.Lookup._op_createSession.invokeAsync(self, ((node, ), context)) + + @staticmethod + def checkedCast(proxy, facetOrContext=None, context=None): + return _M_DataStormContract.LookupPrx.ice_checkedCast(proxy, '::DataStormContract::Lookup', facetOrContext, context) + + @staticmethod + def uncheckedCast(proxy, facet=None): + return _M_DataStormContract.LookupPrx.ice_uncheckedCast(proxy, facet) + + @staticmethod + def ice_staticId(): + return '::DataStormContract::Lookup' + _M_DataStormContract._t_LookupPrx = IcePy.defineProxy('::DataStormContract::Lookup', LookupPrx) + + _M_DataStormContract.LookupPrx = LookupPrx + del LookupPrx + + _M_DataStormContract.Lookup = None + class Lookup(Ice.Object): + + def ice_ids(self, current=None): + return ('::DataStormContract::Lookup', '::Ice::Object') + + def ice_id(self, current=None): + return '::DataStormContract::Lookup' + + @staticmethod + def ice_staticId(): + return '::DataStormContract::Lookup' + + def announceTopicReader(self, topic, node, current=None): + raise NotImplementedError("servant method 'announceTopicReader' not implemented") + + def announceTopicWriter(self, topic, node, current=None): + raise NotImplementedError("servant method 'announceTopicWriter' not implemented") + + def announceTopics(self, readers, writers, node, current=None): + raise NotImplementedError("servant method 'announceTopics' not implemented") + + def createSession(self, node, current=None): + raise NotImplementedError("servant method 'createSession' not implemented") + + def __str__(self): + return IcePy.stringify(self, _M_DataStormContract._t_LookupDisp) + + __repr__ = __str__ + + _M_DataStormContract._t_LookupDisp = IcePy.defineClass('::DataStormContract::Lookup', Lookup, (), None, ()) + Lookup._ice_type = _M_DataStormContract._t_LookupDisp + + Lookup._op_announceTopicReader = IcePy.Operation('announceTopicReader', Ice.OperationMode.Idempotent, False, None, (), (((), IcePy._t_string, False, 0), ((), _M_DataStormContract._t_NodePrx, False, 0)), (), None, ()) + Lookup._op_announceTopicWriter = IcePy.Operation('announceTopicWriter', Ice.OperationMode.Idempotent, False, None, (), (((), IcePy._t_string, False, 0), ((), _M_DataStormContract._t_NodePrx, False, 0)), (), None, ()) + Lookup._op_announceTopics = IcePy.Operation('announceTopics', Ice.OperationMode.Idempotent, False, None, (), (((), _M_DataStormContract._t_StringSeq, False, 0), ((), _M_DataStormContract._t_StringSeq, False, 0), ((), _M_DataStormContract._t_NodePrx, False, 0)), (), None, ()) + Lookup._op_createSession = IcePy.Operation('createSession', Ice.OperationMode.Normal, False, None, (), (((), _M_DataStormContract._t_NodePrx, False, 0),), (), ((), _M_DataStormContract._t_NodePrx, False, 0), ()) + + _M_DataStormContract.Lookup = Lookup + del Lookup + +# End of module DataStormContract diff --git a/slice2py/cpp/src/DataStorm/DataStormContract/__init__.py b/slice2py/cpp/src/DataStorm/DataStormContract/__init__.py new file mode 100644 index 000000000000..123c004af9a2 --- /dev/null +++ b/slice2py/cpp/src/DataStorm/DataStormContract/__init__.py @@ -0,0 +1,10 @@ +# Generated by slice2py - DO NOT EDIT! +# + +import Ice +Ice.updateModule("DataStormContract") + +# Modules: +import Contract_ice + +# Submodules: diff --git a/slice2py/cpp/test/DataStorm/api/Test/__init__.py b/slice2py/cpp/test/DataStorm/api/Test/__init__.py new file mode 100644 index 000000000000..d829444630ec --- /dev/null +++ b/slice2py/cpp/test/DataStorm/api/Test/__init__.py @@ -0,0 +1,10 @@ +# Generated by slice2py - DO NOT EDIT! +# + +import Ice +Ice.updateModule("Test") + +# Modules: +import Test_ice + +# Submodules: diff --git a/slice2py/cpp/test/DataStorm/api/Test_ice.py b/slice2py/cpp/test/DataStorm/api/Test_ice.py new file mode 100644 index 000000000000..3043736f212d --- /dev/null +++ b/slice2py/cpp/test/DataStorm/api/Test_ice.py @@ -0,0 +1,128 @@ +# -*- coding: utf-8 -*- +# +# Copyright (c) ZeroC, Inc. All rights reserved. +# +# +# Ice version 3.8.0-alpha.0 +# +# +# +# Generated from file `Test.ice' +# +# Warning: do not edit this file. +# +# +# + +import Ice +import IcePy +import builtins as _builtins + +# Start of module Test +_M_Test = Ice.openModule('Test') +__name__ = 'Test' + +if 'StructKey' not in _M_Test.__dict__: + _M_Test.StructKey = None + class StructKey(object): + def __init__(self, value=0): + self.value = value + + def __hash__(self): + _h = 0 + _h = 5 * _h + _builtins.hash(self.value) + return _h % 0x7fffffff + + def __compare(self, other): + if other is None: + return 1 + elif not isinstance(other, _M_Test.StructKey): + return NotImplemented + else: + if self.value is None or other.value is None: + if self.value != other.value: + return (-1 if self.value is None else 1) + else: + if self.value < other.value: + return -1 + elif self.value > other.value: + return 1 + return 0 + + def __lt__(self, other): + r = self.__compare(other) + if r is NotImplemented: + return r + else: + return r < 0 + + def __le__(self, other): + r = self.__compare(other) + if r is NotImplemented: + return r + else: + return r <= 0 + + def __gt__(self, other): + r = self.__compare(other) + if r is NotImplemented: + return r + else: + return r > 0 + + def __ge__(self, other): + r = self.__compare(other) + if r is NotImplemented: + return r + else: + return r >= 0 + + def __eq__(self, other): + r = self.__compare(other) + if r is NotImplemented: + return r + else: + return r == 0 + + def __ne__(self, other): + r = self.__compare(other) + if r is NotImplemented: + return r + else: + return r != 0 + + def __str__(self): + return IcePy.stringify(self, _M_Test._t_StructKey) + + __repr__ = __str__ + + _M_Test._t_StructKey = IcePy.defineStruct('::Test::StructKey', StructKey, (), (('value', (), IcePy._t_int),)) + + _M_Test.StructKey = StructKey + del StructKey + +if 'ClassKey' not in _M_Test.__dict__: + _M_Test.ClassKey = None + class ClassKey(Ice.Value): + def __init__(self, value=0): + self.value = value + + def ice_id(self): + return '::Test::ClassKey' + + @staticmethod + def ice_staticId(): + return '::Test::ClassKey' + + def __str__(self): + return IcePy.stringify(self, _M_Test._t_ClassKey) + + __repr__ = __str__ + + _M_Test._t_ClassKey = IcePy.defineValue('::Test::ClassKey', ClassKey, -1, (), False, None, (('value', (), IcePy._t_int, False, 0),)) + ClassKey._ice_type = _M_Test._t_ClassKey + + _M_Test.ClassKey = ClassKey + del ClassKey + +# End of module Test diff --git a/slice2py/cpp/test/DataStorm/events/Test/__init__.py b/slice2py/cpp/test/DataStorm/events/Test/__init__.py new file mode 100644 index 000000000000..d829444630ec --- /dev/null +++ b/slice2py/cpp/test/DataStorm/events/Test/__init__.py @@ -0,0 +1,10 @@ +# Generated by slice2py - DO NOT EDIT! +# + +import Ice +Ice.updateModule("Test") + +# Modules: +import Test_ice + +# Submodules: diff --git a/slice2py/cpp/test/DataStorm/events/Test_ice.py b/slice2py/cpp/test/DataStorm/events/Test_ice.py new file mode 100644 index 000000000000..86718dcf35e4 --- /dev/null +++ b/slice2py/cpp/test/DataStorm/events/Test_ice.py @@ -0,0 +1,177 @@ +# -*- coding: utf-8 -*- +# +# Copyright (c) ZeroC, Inc. All rights reserved. +# +# +# Ice version 3.8.0-alpha.0 +# +# +# +# Generated from file `Test.ice' +# +# Warning: do not edit this file. +# +# +# + +import Ice +import IcePy +import builtins as _builtins + +# Start of module Test +_M_Test = Ice.openModule('Test') +__name__ = 'Test' + +if 'StructValue' not in _M_Test.__dict__: + _M_Test.StructValue = None + class StructValue(object): + def __init__(self, firstName='', lastName='', age=0): + self.firstName = firstName + self.lastName = lastName + self.age = age + + def __hash__(self): + _h = 0 + _h = 5 * _h + _builtins.hash(self.firstName) + _h = 5 * _h + _builtins.hash(self.lastName) + _h = 5 * _h + _builtins.hash(self.age) + return _h % 0x7fffffff + + def __compare(self, other): + if other is None: + return 1 + elif not isinstance(other, _M_Test.StructValue): + return NotImplemented + else: + if self.firstName is None or other.firstName is None: + if self.firstName != other.firstName: + return (-1 if self.firstName is None else 1) + else: + if self.firstName < other.firstName: + return -1 + elif self.firstName > other.firstName: + return 1 + if self.lastName is None or other.lastName is None: + if self.lastName != other.lastName: + return (-1 if self.lastName is None else 1) + else: + if self.lastName < other.lastName: + return -1 + elif self.lastName > other.lastName: + return 1 + if self.age is None or other.age is None: + if self.age != other.age: + return (-1 if self.age is None else 1) + else: + if self.age < other.age: + return -1 + elif self.age > other.age: + return 1 + return 0 + + def __lt__(self, other): + r = self.__compare(other) + if r is NotImplemented: + return r + else: + return r < 0 + + def __le__(self, other): + r = self.__compare(other) + if r is NotImplemented: + return r + else: + return r <= 0 + + def __gt__(self, other): + r = self.__compare(other) + if r is NotImplemented: + return r + else: + return r > 0 + + def __ge__(self, other): + r = self.__compare(other) + if r is NotImplemented: + return r + else: + return r >= 0 + + def __eq__(self, other): + r = self.__compare(other) + if r is NotImplemented: + return r + else: + return r == 0 + + def __ne__(self, other): + r = self.__compare(other) + if r is NotImplemented: + return r + else: + return r != 0 + + def __str__(self): + return IcePy.stringify(self, _M_Test._t_StructValue) + + __repr__ = __str__ + + _M_Test._t_StructValue = IcePy.defineStruct('::Test::StructValue', StructValue, (), ( + ('firstName', (), IcePy._t_string), + ('lastName', (), IcePy._t_string), + ('age', (), IcePy._t_int) + )) + + _M_Test.StructValue = StructValue + del StructValue + +if 'Base' not in _M_Test.__dict__: + _M_Test.Base = None + class Base(Ice.Value): + def __init__(self, b=''): + self.b = b + + def ice_id(self): + return '::Test::Base' + + @staticmethod + def ice_staticId(): + return '::Test::Base' + + def __str__(self): + return IcePy.stringify(self, _M_Test._t_Base) + + __repr__ = __str__ + + _M_Test._t_Base = IcePy.defineValue('::Test::Base', Base, -1, (), False, None, (('b', (), IcePy._t_string, False, 0),)) + Base._ice_type = _M_Test._t_Base + + _M_Test.Base = Base + del Base + +if 'Extended' not in _M_Test.__dict__: + _M_Test.Extended = None + class Extended(_M_Test.Base): + def __init__(self, b='', e=0): + _M_Test.Base.__init__(self, b) + self.e = e + + def ice_id(self): + return '::Test::Extended' + + @staticmethod + def ice_staticId(): + return '::Test::Extended' + + def __str__(self): + return IcePy.stringify(self, _M_Test._t_Extended) + + __repr__ = __str__ + + _M_Test._t_Extended = IcePy.defineValue('::Test::Extended', Extended, -1, (), False, _M_Test._t_Base, (('e', (), IcePy._t_int, False, 0),)) + Extended._ice_type = _M_Test._t_Extended + + _M_Test.Extended = Extended + del Extended + +# End of module Test diff --git a/slice2py/cpp/test/DataStorm/partial/Test/__init__.py b/slice2py/cpp/test/DataStorm/partial/Test/__init__.py new file mode 100644 index 000000000000..d829444630ec --- /dev/null +++ b/slice2py/cpp/test/DataStorm/partial/Test/__init__.py @@ -0,0 +1,10 @@ +# Generated by slice2py - DO NOT EDIT! +# + +import Ice +Ice.updateModule("Test") + +# Modules: +import Test_ice + +# Submodules: diff --git a/slice2py/cpp/test/DataStorm/partial/Test_ice.py b/slice2py/cpp/test/DataStorm/partial/Test_ice.py new file mode 100644 index 000000000000..160b6ca89d1e --- /dev/null +++ b/slice2py/cpp/test/DataStorm/partial/Test_ice.py @@ -0,0 +1,64 @@ +# -*- coding: utf-8 -*- +# +# Copyright (c) ZeroC, Inc. All rights reserved. +# +# +# Ice version 3.8.0-alpha.0 +# +# +# +# Generated from file `Test.ice' +# +# Warning: do not edit this file. +# +# +# + +import Ice +import IcePy +import builtins as _builtins + +# Start of module Test +_M_Test = Ice.openModule('Test') +__name__ = 'Test' + +if 'Stock' not in _M_Test.__dict__: + _M_Test.Stock = None + class Stock(object): + def __init__(self, price=0.0, lastBid=0.0, laskAsk=0.0): + self.price = price + self.lastBid = lastBid + self.laskAsk = laskAsk + + def __eq__(self, other): + if other is None: + return False + elif not isinstance(other, _M_Test.Stock): + return NotImplemented + else: + if self.price != other.price: + return False + if self.lastBid != other.lastBid: + return False + if self.laskAsk != other.laskAsk: + return False + return True + + def __ne__(self, other): + return not self.__eq__(other) + + def __str__(self): + return IcePy.stringify(self, _M_Test._t_Stock) + + __repr__ = __str__ + + _M_Test._t_Stock = IcePy.defineStruct('::Test::Stock', Stock, (), ( + ('price', (), IcePy._t_float), + ('lastBid', (), IcePy._t_float), + ('laskAsk', (), IcePy._t_float) + )) + + _M_Test.Stock = Stock + del Stock + +# End of module Test diff --git a/slice2py/cpp/test/DataStorm/types/Test/__init__.py b/slice2py/cpp/test/DataStorm/types/Test/__init__.py new file mode 100644 index 000000000000..d829444630ec --- /dev/null +++ b/slice2py/cpp/test/DataStorm/types/Test/__init__.py @@ -0,0 +1,10 @@ +# Generated by slice2py - DO NOT EDIT! +# + +import Ice +Ice.updateModule("Test") + +# Modules: +import Test_ice + +# Submodules: diff --git a/slice2py/cpp/test/DataStorm/types/Test_ice.py b/slice2py/cpp/test/DataStorm/types/Test_ice.py new file mode 100644 index 000000000000..86718dcf35e4 --- /dev/null +++ b/slice2py/cpp/test/DataStorm/types/Test_ice.py @@ -0,0 +1,177 @@ +# -*- coding: utf-8 -*- +# +# Copyright (c) ZeroC, Inc. All rights reserved. +# +# +# Ice version 3.8.0-alpha.0 +# +# +# +# Generated from file `Test.ice' +# +# Warning: do not edit this file. +# +# +# + +import Ice +import IcePy +import builtins as _builtins + +# Start of module Test +_M_Test = Ice.openModule('Test') +__name__ = 'Test' + +if 'StructValue' not in _M_Test.__dict__: + _M_Test.StructValue = None + class StructValue(object): + def __init__(self, firstName='', lastName='', age=0): + self.firstName = firstName + self.lastName = lastName + self.age = age + + def __hash__(self): + _h = 0 + _h = 5 * _h + _builtins.hash(self.firstName) + _h = 5 * _h + _builtins.hash(self.lastName) + _h = 5 * _h + _builtins.hash(self.age) + return _h % 0x7fffffff + + def __compare(self, other): + if other is None: + return 1 + elif not isinstance(other, _M_Test.StructValue): + return NotImplemented + else: + if self.firstName is None or other.firstName is None: + if self.firstName != other.firstName: + return (-1 if self.firstName is None else 1) + else: + if self.firstName < other.firstName: + return -1 + elif self.firstName > other.firstName: + return 1 + if self.lastName is None or other.lastName is None: + if self.lastName != other.lastName: + return (-1 if self.lastName is None else 1) + else: + if self.lastName < other.lastName: + return -1 + elif self.lastName > other.lastName: + return 1 + if self.age is None or other.age is None: + if self.age != other.age: + return (-1 if self.age is None else 1) + else: + if self.age < other.age: + return -1 + elif self.age > other.age: + return 1 + return 0 + + def __lt__(self, other): + r = self.__compare(other) + if r is NotImplemented: + return r + else: + return r < 0 + + def __le__(self, other): + r = self.__compare(other) + if r is NotImplemented: + return r + else: + return r <= 0 + + def __gt__(self, other): + r = self.__compare(other) + if r is NotImplemented: + return r + else: + return r > 0 + + def __ge__(self, other): + r = self.__compare(other) + if r is NotImplemented: + return r + else: + return r >= 0 + + def __eq__(self, other): + r = self.__compare(other) + if r is NotImplemented: + return r + else: + return r == 0 + + def __ne__(self, other): + r = self.__compare(other) + if r is NotImplemented: + return r + else: + return r != 0 + + def __str__(self): + return IcePy.stringify(self, _M_Test._t_StructValue) + + __repr__ = __str__ + + _M_Test._t_StructValue = IcePy.defineStruct('::Test::StructValue', StructValue, (), ( + ('firstName', (), IcePy._t_string), + ('lastName', (), IcePy._t_string), + ('age', (), IcePy._t_int) + )) + + _M_Test.StructValue = StructValue + del StructValue + +if 'Base' not in _M_Test.__dict__: + _M_Test.Base = None + class Base(Ice.Value): + def __init__(self, b=''): + self.b = b + + def ice_id(self): + return '::Test::Base' + + @staticmethod + def ice_staticId(): + return '::Test::Base' + + def __str__(self): + return IcePy.stringify(self, _M_Test._t_Base) + + __repr__ = __str__ + + _M_Test._t_Base = IcePy.defineValue('::Test::Base', Base, -1, (), False, None, (('b', (), IcePy._t_string, False, 0),)) + Base._ice_type = _M_Test._t_Base + + _M_Test.Base = Base + del Base + +if 'Extended' not in _M_Test.__dict__: + _M_Test.Extended = None + class Extended(_M_Test.Base): + def __init__(self, b='', e=0): + _M_Test.Base.__init__(self, b) + self.e = e + + def ice_id(self): + return '::Test::Extended' + + @staticmethod + def ice_staticId(): + return '::Test::Extended' + + def __str__(self): + return IcePy.stringify(self, _M_Test._t_Extended) + + __repr__ = __str__ + + _M_Test._t_Extended = IcePy.defineValue('::Test::Extended', Extended, -1, (), False, _M_Test._t_Base, (('e', (), IcePy._t_int, False, 0),)) + Extended._ice_type = _M_Test._t_Extended + + _M_Test.Extended = Extended + del Extended + +# End of module Test diff --git a/slice2py/slice/DataStorm/DataStorm/__init__.py b/slice2py/slice/DataStorm/DataStorm/__init__.py new file mode 100644 index 000000000000..d5ae719837fa --- /dev/null +++ b/slice2py/slice/DataStorm/DataStorm/__init__.py @@ -0,0 +1,10 @@ +# Generated by slice2py - DO NOT EDIT! +# + +import Ice +Ice.updateModule("DataStorm") + +# Modules: +import Sample_ice + +# Submodules: diff --git a/slice2py/slice/DataStorm/Sample_ice.py b/slice2py/slice/DataStorm/Sample_ice.py new file mode 100644 index 000000000000..d11d62696458 --- /dev/null +++ b/slice2py/slice/DataStorm/Sample_ice.py @@ -0,0 +1,64 @@ +# -*- coding: utf-8 -*- +# +# Copyright (c) ZeroC, Inc. All rights reserved. +# +# +# Ice version 3.8.0-alpha.0 +# +# +# +# Generated from file `Sample.ice' +# +# Warning: do not edit this file. +# +# +# + +import Ice +import IcePy +import builtins as _builtins + +# Start of module DataStorm +_M_DataStorm = Ice.openModule('DataStorm') +__name__ = 'DataStorm' + +if 'SampleEvent' not in _M_DataStorm.__dict__: + _M_DataStorm.SampleEvent = None + class SampleEvent(Ice.EnumBase): + """ + The sample event. + The sample event matches the operation used by the DataWriter to update + the data element. It also provides information on what to expect from + the sample. A sample with the Add or Update event always provide a value + while a sample with the Remove type doesn't. + Enumerators: + Add -- The element has been added. + Update -- The element has been updated. + PartialUpdate -- The element has been partially updated. + Remove -- The element has been removed. + """ + + def __init__(self, _n, _v): + Ice.EnumBase.__init__(self, _n, _v) + + def valueOf(self, _n): + if _n in self._enumerators: + return self._enumerators[_n] + return None + valueOf = classmethod(valueOf) + + SampleEvent.Add = SampleEvent("Add", 0) + SampleEvent.Update = SampleEvent("Update", 1) + SampleEvent.PartialUpdate = SampleEvent("PartialUpdate", 2) + SampleEvent.Remove = SampleEvent("Remove", 3) + SampleEvent._enumerators = { 0:SampleEvent.Add, 1:SampleEvent.Update, 2:SampleEvent.PartialUpdate, 3:SampleEvent.Remove } + + _M_DataStorm._t_SampleEvent = IcePy.defineEnum('::DataStorm::SampleEvent', SampleEvent, (), SampleEvent._enumerators) + + _M_DataStorm.SampleEvent = SampleEvent + del SampleEvent + +if '_t_SampleEventSeq' not in _M_DataStorm.__dict__: + _M_DataStorm._t_SampleEventSeq = IcePy.defineSequence('::DataStorm::SampleEventSeq', (), _M_DataStorm._t_SampleEvent) + +# End of module DataStorm diff --git a/slice2rb/cpp/src/DataStorm/Contract.rb b/slice2rb/cpp/src/DataStorm/Contract.rb new file mode 100644 index 000000000000..9fe37dddd5ea --- /dev/null +++ b/slice2rb/cpp/src/DataStorm/Contract.rb @@ -0,0 +1,764 @@ +# encoding: utf-8 +# +# Copyright (c) ZeroC, Inc. All rights reserved. +# +# +# Ice version 3.8.0-alpha.0 +# +# +# +# Generated from file `Contract.ice' +# +# Warning: do not edit this file. +# +# +# + +require 'Ice' +require 'Ice/Identity.rb' +require 'DataStorm/Sample.rb' + +module ::DataStormContract + + if not defined?(::DataStormContract::ClearHistoryPolicy) + class ClearHistoryPolicy + include Comparable + + def initialize(name, value) + @name = name + @value = value + end + + def ClearHistoryPolicy.from_int(val) + @@_enumerators[val] + end + + def to_s + @name + end + + def to_i + @value + end + + def <=>(other) + other.is_a?(ClearHistoryPolicy) or raise ArgumentError, "value must be a ClearHistoryPolicy" + @value <=> other.to_i + end + + def hash + @value.hash + end + + def ClearHistoryPolicy.each(&block) + @@_enumerators.each_value(&block) + end + + OnAdd = ClearHistoryPolicy.new("OnAdd", 0) + OnRemove = ClearHistoryPolicy.new("OnRemove", 1) + OnAll = ClearHistoryPolicy.new("OnAll", 2) + OnAllExceptPartialUpdate = ClearHistoryPolicy.new("OnAllExceptPartialUpdate", 3) + Never = ClearHistoryPolicy.new("Never", 4) + + @@_enumerators = {0=>OnAdd, 1=>OnRemove, 2=>OnAll, 3=>OnAllExceptPartialUpdate, 4=>Never} + + def ClearHistoryPolicy._enumerators + @@_enumerators + end + + private_class_method :new + end + + T_ClearHistoryPolicy = ::Ice::__defineEnum('::DataStormContract::ClearHistoryPolicy', ClearHistoryPolicy, ClearHistoryPolicy::_enumerators) + end + + if not defined?(::DataStormContract::T_ByteSeq) + T_ByteSeq = ::Ice::__defineSequence('::DataStormContract::ByteSeq', ::Ice::T_byte) + end + + if not defined?(::DataStormContract::T_LongSeq) + T_LongSeq = ::Ice::__defineSequence('::DataStormContract::LongSeq', ::Ice::T_long) + end + + if not defined?(::DataStormContract::T_StringSeq) + T_StringSeq = ::Ice::__defineSequence('::DataStormContract::StringSeq', ::Ice::T_string) + end + + if not defined?(::DataStormContract::T_LongLongDict) + T_LongLongDict = ::Ice::__defineDictionary('::DataStormContract::LongLongDict', ::Ice::T_long, ::Ice::T_long) + end + + if not defined?(::DataStormContract::DataSample) + class DataSample + include ::Ice::Inspect_mixin + def initialize(id=0, keyId=0, keyValue=nil, timestamp=0, tag=0, event=::DataStorm::SampleEvent::Add, value=nil) + @id = id + @keyId = keyId + @keyValue = keyValue + @timestamp = timestamp + @tag = tag + @event = event + @value = value + end + + def hash + _h = 0 + _h = 5 * _h + @id.hash + _h = 5 * _h + @keyId.hash + _h = 5 * _h + @keyValue.hash + _h = 5 * _h + @timestamp.hash + _h = 5 * _h + @tag.hash + _h = 5 * _h + @event.hash + _h = 5 * _h + @value.hash + _h % 0x7fffffff + end + + def ==(other) + return false if !other.is_a? ::DataStormContract::DataSample or + @id != other.id or + @keyId != other.keyId or + @keyValue != other.keyValue or + @timestamp != other.timestamp or + @tag != other.tag or + @event != other.event or + @value != other.value + true + end + + def eql?(other) + return other.class == self.class && other == self + end + + attr_accessor :id, :keyId, :keyValue, :timestamp, :tag, :event, :value + end + + T_DataSample = ::Ice::__defineStruct('::DataStormContract::DataSample', DataSample, [ + ["id", ::Ice::T_long], + ["keyId", ::Ice::T_long], + ["keyValue", ::DataStormContract::T_ByteSeq], + ["timestamp", ::Ice::T_long], + ["tag", ::Ice::T_long], + ["event", ::DataStorm::T_SampleEvent], + ["value", ::DataStormContract::T_ByteSeq] + ]) + end + + if not defined?(::DataStormContract::T_DataSampleSeq) + T_DataSampleSeq = ::Ice::__defineSequence('::DataStormContract::DataSampleSeq', ::DataStormContract::T_DataSample) + end + + if not defined?(::DataStormContract::DataSamples) + class DataSamples + include ::Ice::Inspect_mixin + def initialize(id=0, samples=nil) + @id = id + @samples = samples + end + + def hash + _h = 0 + _h = 5 * _h + @id.hash + _h = 5 * _h + @samples.hash + _h % 0x7fffffff + end + + def ==(other) + return false if !other.is_a? ::DataStormContract::DataSamples or + @id != other.id or + @samples != other.samples + true + end + + def eql?(other) + return other.class == self.class && other == self + end + + attr_accessor :id, :samples + end + + T_DataSamples = ::Ice::__defineStruct('::DataStormContract::DataSamples', DataSamples, [ + ["id", ::Ice::T_long], + ["samples", ::DataStormContract::T_DataSampleSeq] + ]) + end + + if not defined?(::DataStormContract::T_DataSamplesSeq) + T_DataSamplesSeq = ::Ice::__defineSequence('::DataStormContract::DataSamplesSeq', ::DataStormContract::T_DataSamples) + end + + if not defined?(::DataStormContract::ElementInfo) + class ElementInfo + include ::Ice::Inspect_mixin + def initialize(id=0, name='', value=nil) + @id = id + @name = name + @value = value + end + + def hash + _h = 0 + _h = 5 * _h + @id.hash + _h = 5 * _h + @name.hash + _h = 5 * _h + @value.hash + _h % 0x7fffffff + end + + def ==(other) + return false if !other.is_a? ::DataStormContract::ElementInfo or + @id != other.id or + @name != other.name or + @value != other.value + true + end + + def eql?(other) + return other.class == self.class && other == self + end + + attr_accessor :id, :name, :value + end + + T_ElementInfo = ::Ice::__defineStruct('::DataStormContract::ElementInfo', ElementInfo, [ + ["id", ::Ice::T_long], + ["name", ::Ice::T_string], + ["value", ::DataStormContract::T_ByteSeq] + ]) + end + + if not defined?(::DataStormContract::T_ElementInfoSeq) + T_ElementInfoSeq = ::Ice::__defineSequence('::DataStormContract::ElementInfoSeq', ::DataStormContract::T_ElementInfo) + end + + if not defined?(::DataStormContract::TopicInfo) + class TopicInfo + include ::Ice::Inspect_mixin + def initialize(name='', ids=nil) + @name = name + @ids = ids + end + + def hash + _h = 0 + _h = 5 * _h + @name.hash + _h = 5 * _h + @ids.hash + _h % 0x7fffffff + end + + def ==(other) + return false if !other.is_a? ::DataStormContract::TopicInfo or + @name != other.name or + @ids != other.ids + true + end + + def eql?(other) + return other.class == self.class && other == self + end + + attr_accessor :name, :ids + end + + T_TopicInfo = ::Ice::__defineStruct('::DataStormContract::TopicInfo', TopicInfo, [ + ["name", ::Ice::T_string], + ["ids", ::DataStormContract::T_LongSeq] + ]) + end + + if not defined?(::DataStormContract::T_TopicInfoSeq) + T_TopicInfoSeq = ::Ice::__defineSequence('::DataStormContract::TopicInfoSeq', ::DataStormContract::T_TopicInfo) + end + + if not defined?(::DataStormContract::TopicSpec) + class TopicSpec + include ::Ice::Inspect_mixin + def initialize(id=0, name='', elements=nil, tags=nil) + @id = id + @name = name + @elements = elements + @tags = tags + end + + def hash + _h = 0 + _h = 5 * _h + @id.hash + _h = 5 * _h + @name.hash + _h = 5 * _h + @elements.hash + _h = 5 * _h + @tags.hash + _h % 0x7fffffff + end + + def ==(other) + return false if !other.is_a? ::DataStormContract::TopicSpec or + @id != other.id or + @name != other.name or + @elements != other.elements or + @tags != other.tags + true + end + + def eql?(other) + return other.class == self.class && other == self + end + + attr_accessor :id, :name, :elements, :tags + end + + T_TopicSpec = ::Ice::__defineStruct('::DataStormContract::TopicSpec', TopicSpec, [ + ["id", ::Ice::T_long], + ["name", ::Ice::T_string], + ["elements", ::DataStormContract::T_ElementInfoSeq], + ["tags", ::DataStormContract::T_ElementInfoSeq] + ]) + end + + if not defined?(::DataStormContract::FilterInfo) + class FilterInfo + include ::Ice::Inspect_mixin + def initialize(name='', criteria=nil) + @name = name + @criteria = criteria + end + + def hash + _h = 0 + _h = 5 * _h + @name.hash + _h = 5 * _h + @criteria.hash + _h % 0x7fffffff + end + + def ==(other) + return false if !other.is_a? ::DataStormContract::FilterInfo or + @name != other.name or + @criteria != other.criteria + true + end + + def eql?(other) + return other.class == self.class && other == self + end + + attr_accessor :name, :criteria + end + + T_FilterInfo = ::Ice::__defineStruct('::DataStormContract::FilterInfo', FilterInfo, [ + ["name", ::Ice::T_string], + ["criteria", ::DataStormContract::T_ByteSeq] + ]) + end + + if not defined?(::DataStormContract::ElementConfig) + class ElementConfig < ::Ice::Value + + def initialize(facet=::Ice::Unset, sampleFilter=::Ice::Unset, name=::Ice::Unset, priority=::Ice::Unset, sampleCount=::Ice::Unset, sampleLifetime=::Ice::Unset, clearHistory=::Ice::Unset) + @facet = facet + @sampleFilter = sampleFilter + @name = name + @priority = priority + @sampleCount = sampleCount + @sampleLifetime = sampleLifetime + @clearHistory = clearHistory + end + + attr_accessor :facet, :sampleFilter, :name, :priority, :sampleCount, :sampleLifetime, :clearHistory + end + + if not defined?(::DataStormContract::T_ElementConfig) + T_ElementConfig = ::Ice::__declareClass('::DataStormContract::ElementConfig') + end + + T_ElementConfig.defineClass(ElementConfig, 1, false, nil, [ + ['facet', ::Ice::T_string, true, 1], + ['sampleFilter', ::DataStormContract::T_FilterInfo, true, 2], + ['name', ::Ice::T_string, true, 3], + ['priority', ::Ice::T_int, true, 4], + ['sampleCount', ::Ice::T_int, true, 10], + ['sampleLifetime', ::Ice::T_int, true, 11], + ['clearHistory', ::DataStormContract::T_ClearHistoryPolicy, true, 12] + ]) + end + + if not defined?(::DataStormContract::ElementData) + class ElementData + include ::Ice::Inspect_mixin + def initialize(id=0, config=nil, lastIds=nil) + @id = id + @config = config + @lastIds = lastIds + end + + def hash + _h = 0 + _h = 5 * _h + @id.hash + _h = 5 * _h + @config.hash + _h = 5 * _h + @lastIds.hash + _h % 0x7fffffff + end + + def ==(other) + return false if !other.is_a? ::DataStormContract::ElementData or + @id != other.id or + @config != other.config or + @lastIds != other.lastIds + true + end + + def eql?(other) + return other.class == self.class && other == self + end + + attr_accessor :id, :config, :lastIds + end + + T_ElementData = ::Ice::__defineStruct('::DataStormContract::ElementData', ElementData, [ + ["id", ::Ice::T_long], + ["config", ::DataStormContract::T_ElementConfig], + ["lastIds", ::DataStormContract::T_LongLongDict] + ]) + end + + if not defined?(::DataStormContract::T_ElementDataSeq) + T_ElementDataSeq = ::Ice::__defineSequence('::DataStormContract::ElementDataSeq', ::DataStormContract::T_ElementData) + end + + if not defined?(::DataStormContract::ElementSpec) + class ElementSpec + include ::Ice::Inspect_mixin + def initialize(elements=nil, id=0, name='', value=nil, peerId=0, peerName='') + @elements = elements + @id = id + @name = name + @value = value + @peerId = peerId + @peerName = peerName + end + + def hash + _h = 0 + _h = 5 * _h + @elements.hash + _h = 5 * _h + @id.hash + _h = 5 * _h + @name.hash + _h = 5 * _h + @value.hash + _h = 5 * _h + @peerId.hash + _h = 5 * _h + @peerName.hash + _h % 0x7fffffff + end + + def ==(other) + return false if !other.is_a? ::DataStormContract::ElementSpec or + @elements != other.elements or + @id != other.id or + @name != other.name or + @value != other.value or + @peerId != other.peerId or + @peerName != other.peerName + true + end + + def eql?(other) + return other.class == self.class && other == self + end + + attr_accessor :elements, :id, :name, :value, :peerId, :peerName + end + + T_ElementSpec = ::Ice::__defineStruct('::DataStormContract::ElementSpec', ElementSpec, [ + ["elements", ::DataStormContract::T_ElementDataSeq], + ["id", ::Ice::T_long], + ["name", ::Ice::T_string], + ["value", ::DataStormContract::T_ByteSeq], + ["peerId", ::Ice::T_long], + ["peerName", ::Ice::T_string] + ]) + end + + if not defined?(::DataStormContract::T_ElementSpecSeq) + T_ElementSpecSeq = ::Ice::__defineSequence('::DataStormContract::ElementSpecSeq', ::DataStormContract::T_ElementSpec) + end + + if not defined?(::DataStormContract::ElementDataAck) + class ElementDataAck + include ::Ice::Inspect_mixin + def initialize(id=0, config=nil, lastIds=nil, samples=nil, peerId=0) + @id = id + @config = config + @lastIds = lastIds + @samples = samples + @peerId = peerId + end + + def hash + _h = 0 + _h = 5 * _h + @id.hash + _h = 5 * _h + @config.hash + _h = 5 * _h + @lastIds.hash + _h = 5 * _h + @samples.hash + _h = 5 * _h + @peerId.hash + _h % 0x7fffffff + end + + def ==(other) + return false if !other.is_a? ::DataStormContract::ElementDataAck or + @id != other.id or + @config != other.config or + @lastIds != other.lastIds or + @samples != other.samples or + @peerId != other.peerId + true + end + + def eql?(other) + return other.class == self.class && other == self + end + + attr_accessor :id, :config, :lastIds, :samples, :peerId + end + + T_ElementDataAck = ::Ice::__defineStruct('::DataStormContract::ElementDataAck', ElementDataAck, [ + ["id", ::Ice::T_long], + ["config", ::DataStormContract::T_ElementConfig], + ["lastIds", ::DataStormContract::T_LongLongDict], + ["samples", ::DataStormContract::T_DataSampleSeq], + ["peerId", ::Ice::T_long] + ]) + end + + if not defined?(::DataStormContract::T_ElementDataAckSeq) + T_ElementDataAckSeq = ::Ice::__defineSequence('::DataStormContract::ElementDataAckSeq', ::DataStormContract::T_ElementDataAck) + end + + if not defined?(::DataStormContract::ElementSpecAck) + class ElementSpecAck + include ::Ice::Inspect_mixin + def initialize(elements=nil, id=0, name='', value=nil, peerId=0, peerName='') + @elements = elements + @id = id + @name = name + @value = value + @peerId = peerId + @peerName = peerName + end + + def hash + _h = 0 + _h = 5 * _h + @elements.hash + _h = 5 * _h + @id.hash + _h = 5 * _h + @name.hash + _h = 5 * _h + @value.hash + _h = 5 * _h + @peerId.hash + _h = 5 * _h + @peerName.hash + _h % 0x7fffffff + end + + def ==(other) + return false if !other.is_a? ::DataStormContract::ElementSpecAck or + @elements != other.elements or + @id != other.id or + @name != other.name or + @value != other.value or + @peerId != other.peerId or + @peerName != other.peerName + true + end + + def eql?(other) + return other.class == self.class && other == self + end + + attr_accessor :elements, :id, :name, :value, :peerId, :peerName + end + + T_ElementSpecAck = ::Ice::__defineStruct('::DataStormContract::ElementSpecAck', ElementSpecAck, [ + ["elements", ::DataStormContract::T_ElementDataAckSeq], + ["id", ::Ice::T_long], + ["name", ::Ice::T_string], + ["value", ::DataStormContract::T_ByteSeq], + ["peerId", ::Ice::T_long], + ["peerName", ::Ice::T_string] + ]) + end + + if not defined?(::DataStormContract::T_ElementSpecAckSeq) + T_ElementSpecAckSeq = ::Ice::__defineSequence('::DataStormContract::ElementSpecAckSeq', ::DataStormContract::T_ElementSpecAck) + end + + if not defined?(::DataStormContract::SessionPrx) + module SessionPrx_mixin + + def announceTopics(topics, initialize, context=nil) + SessionPrx_mixin::OP_announceTopics.invoke(self, [topics, initialize], context) + end + + def attachTopic(topic, context=nil) + SessionPrx_mixin::OP_attachTopic.invoke(self, [topic], context) + end + + def detachTopic(topic, context=nil) + SessionPrx_mixin::OP_detachTopic.invoke(self, [topic], context) + end + + def attachTags(topic, tags, initialize, context=nil) + SessionPrx_mixin::OP_attachTags.invoke(self, [topic, tags, initialize], context) + end + + def detachTags(topic, tags, context=nil) + SessionPrx_mixin::OP_detachTags.invoke(self, [topic, tags], context) + end + + def announceElements(topic, keys, context=nil) + SessionPrx_mixin::OP_announceElements.invoke(self, [topic, keys], context) + end + + def attachElements(topic, elements, initialize, context=nil) + SessionPrx_mixin::OP_attachElements.invoke(self, [topic, elements, initialize], context) + end + + def attachElementsAck(topic, elements, context=nil) + SessionPrx_mixin::OP_attachElementsAck.invoke(self, [topic, elements], context) + end + + def detachElements(topic, keys, context=nil) + SessionPrx_mixin::OP_detachElements.invoke(self, [topic, keys], context) + end + + def initSamples(topic, samples, context=nil) + SessionPrx_mixin::OP_initSamples.invoke(self, [topic, samples], context) + end + + def disconnected(context=nil) + SessionPrx_mixin::OP_disconnected.invoke(self, [], context) + end + end + + class SessionPrx < ::Ice::ObjectPrx + include ::Ice::Proxy_mixin + include SessionPrx_mixin + end + + if not defined?(::DataStormContract::T_SessionPrx) + T_SessionPrx = ::Ice::__declareProxy('::DataStormContract::Session') + end + + T_SessionPrx.defineProxy(SessionPrx, nil, []) + + SessionPrx_mixin::OP_announceTopics = ::Ice::__defineOperation('announceTopics', ::Ice::OperationMode::Normal, false, nil, [[::DataStormContract::T_TopicInfoSeq, false, 0], [::Ice::T_bool, false, 0]], [], nil, []) + SessionPrx_mixin::OP_attachTopic = ::Ice::__defineOperation('attachTopic', ::Ice::OperationMode::Normal, false, nil, [[::DataStormContract::T_TopicSpec, false, 0]], [], nil, []) + SessionPrx_mixin::OP_detachTopic = ::Ice::__defineOperation('detachTopic', ::Ice::OperationMode::Normal, false, nil, [[::Ice::T_long, false, 0]], [], nil, []) + SessionPrx_mixin::OP_attachTags = ::Ice::__defineOperation('attachTags', ::Ice::OperationMode::Normal, false, nil, [[::Ice::T_long, false, 0], [::DataStormContract::T_ElementInfoSeq, false, 0], [::Ice::T_bool, false, 0]], [], nil, []) + SessionPrx_mixin::OP_detachTags = ::Ice::__defineOperation('detachTags', ::Ice::OperationMode::Normal, false, nil, [[::Ice::T_long, false, 0], [::DataStormContract::T_LongSeq, false, 0]], [], nil, []) + SessionPrx_mixin::OP_announceElements = ::Ice::__defineOperation('announceElements', ::Ice::OperationMode::Normal, false, nil, [[::Ice::T_long, false, 0], [::DataStormContract::T_ElementInfoSeq, false, 0]], [], nil, []) + SessionPrx_mixin::OP_attachElements = ::Ice::__defineOperation('attachElements', ::Ice::OperationMode::Normal, false, nil, [[::Ice::T_long, false, 0], [::DataStormContract::T_ElementSpecSeq, false, 0], [::Ice::T_bool, false, 0]], [], nil, []) + SessionPrx_mixin::OP_attachElementsAck = ::Ice::__defineOperation('attachElementsAck', ::Ice::OperationMode::Normal, false, nil, [[::Ice::T_long, false, 0], [::DataStormContract::T_ElementSpecAckSeq, false, 0]], [], nil, []) + SessionPrx_mixin::OP_detachElements = ::Ice::__defineOperation('detachElements', ::Ice::OperationMode::Normal, false, nil, [[::Ice::T_long, false, 0], [::DataStormContract::T_LongSeq, false, 0]], [], nil, []) + SessionPrx_mixin::OP_initSamples = ::Ice::__defineOperation('initSamples', ::Ice::OperationMode::Normal, false, nil, [[::Ice::T_long, false, 0], [::DataStormContract::T_DataSamplesSeq, false, 0]], [], nil, []) + SessionPrx_mixin::OP_disconnected = ::Ice::__defineOperation('disconnected', ::Ice::OperationMode::Normal, false, nil, [], [], nil, []) + end + + if not defined?(::DataStormContract::PublisherSessionPrx) + module PublisherSessionPrx_mixin + include ::DataStormContract::SessionPrx_mixin + end + + class PublisherSessionPrx < ::Ice::ObjectPrx + include ::Ice::Proxy_mixin + include PublisherSessionPrx_mixin + end + + if not defined?(::DataStormContract::T_PublisherSessionPrx) + T_PublisherSessionPrx = ::Ice::__declareProxy('::DataStormContract::PublisherSession') + end + + T_PublisherSessionPrx.defineProxy(PublisherSessionPrx, nil, [::DataStormContract::T_SessionPrx]) + end + + if not defined?(::DataStormContract::SubscriberSessionPrx) + module SubscriberSessionPrx_mixin + include ::DataStormContract::SessionPrx_mixin + + def s(topicId, elementId, sample, context=nil) + SubscriberSessionPrx_mixin::OP_s.invoke(self, [topicId, elementId, sample], context) + end + end + + class SubscriberSessionPrx < ::Ice::ObjectPrx + include ::Ice::Proxy_mixin + include SubscriberSessionPrx_mixin + end + + if not defined?(::DataStormContract::T_SubscriberSessionPrx) + T_SubscriberSessionPrx = ::Ice::__declareProxy('::DataStormContract::SubscriberSession') + end + + T_SubscriberSessionPrx.defineProxy(SubscriberSessionPrx, nil, [::DataStormContract::T_SessionPrx]) + + SubscriberSessionPrx_mixin::OP_s = ::Ice::__defineOperation('s', ::Ice::OperationMode::Normal, false, nil, [[::Ice::T_long, false, 0], [::Ice::T_long, false, 0], [::DataStormContract::T_DataSample, false, 0]], [], nil, []) + end + + if not defined?(::DataStormContract::NodePrx) + module NodePrx_mixin + + def initiateCreateSession(publisher, context=nil) + NodePrx_mixin::OP_initiateCreateSession.invoke(self, [publisher], context) + end + + def createSession(subscriber, session, fromRelay, context=nil) + NodePrx_mixin::OP_createSession.invoke(self, [subscriber, session, fromRelay], context) + end + + def confirmCreateSession(publisher, session, context=nil) + NodePrx_mixin::OP_confirmCreateSession.invoke(self, [publisher, session], context) + end + end + + class NodePrx < ::Ice::ObjectPrx + include ::Ice::Proxy_mixin + include NodePrx_mixin + end + + if not defined?(::DataStormContract::T_NodePrx) + T_NodePrx = ::Ice::__declareProxy('::DataStormContract::Node') + end + + T_NodePrx.defineProxy(NodePrx, nil, []) + + NodePrx_mixin::OP_initiateCreateSession = ::Ice::__defineOperation('initiateCreateSession', ::Ice::OperationMode::Normal, false, nil, [[::DataStormContract::T_NodePrx, false, 0]], [], nil, []) + NodePrx_mixin::OP_createSession = ::Ice::__defineOperation('createSession', ::Ice::OperationMode::Normal, false, nil, [[::DataStormContract::T_NodePrx, false, 0], [::DataStormContract::T_SubscriberSessionPrx, false, 0], [::Ice::T_bool, false, 0]], [], nil, []) + NodePrx_mixin::OP_confirmCreateSession = ::Ice::__defineOperation('confirmCreateSession', ::Ice::OperationMode::Normal, false, nil, [[::DataStormContract::T_NodePrx, false, 0], [::DataStormContract::T_PublisherSessionPrx, false, 0]], [], nil, []) + end + + if not defined?(::DataStormContract::LookupPrx) + module LookupPrx_mixin + + def announceTopicReader(topic, node, context=nil) + LookupPrx_mixin::OP_announceTopicReader.invoke(self, [topic, node], context) + end + + def announceTopicWriter(topic, node, context=nil) + LookupPrx_mixin::OP_announceTopicWriter.invoke(self, [topic, node], context) + end + + def announceTopics(readers, writers, node, context=nil) + LookupPrx_mixin::OP_announceTopics.invoke(self, [readers, writers, node], context) + end + + def createSession(node, context=nil) + LookupPrx_mixin::OP_createSession.invoke(self, [node], context) + end + end + + class LookupPrx < ::Ice::ObjectPrx + include ::Ice::Proxy_mixin + include LookupPrx_mixin + end + + if not defined?(::DataStormContract::T_LookupPrx) + T_LookupPrx = ::Ice::__declareProxy('::DataStormContract::Lookup') + end + + T_LookupPrx.defineProxy(LookupPrx, nil, []) + + LookupPrx_mixin::OP_announceTopicReader = ::Ice::__defineOperation('announceTopicReader', ::Ice::OperationMode::Idempotent, false, nil, [[::Ice::T_string, false, 0], [::DataStormContract::T_NodePrx, false, 0]], [], nil, []) + LookupPrx_mixin::OP_announceTopicWriter = ::Ice::__defineOperation('announceTopicWriter', ::Ice::OperationMode::Idempotent, false, nil, [[::Ice::T_string, false, 0], [::DataStormContract::T_NodePrx, false, 0]], [], nil, []) + LookupPrx_mixin::OP_announceTopics = ::Ice::__defineOperation('announceTopics', ::Ice::OperationMode::Idempotent, false, nil, [[::DataStormContract::T_StringSeq, false, 0], [::DataStormContract::T_StringSeq, false, 0], [::DataStormContract::T_NodePrx, false, 0]], [], nil, []) + LookupPrx_mixin::OP_createSession = ::Ice::__defineOperation('createSession', ::Ice::OperationMode::Normal, false, nil, [[::DataStormContract::T_NodePrx, false, 0]], [], [::DataStormContract::T_NodePrx, false, 0], []) + end +end diff --git a/slice2rb/cpp/test/DataStorm/api/Test.rb b/slice2rb/cpp/test/DataStorm/api/Test.rb new file mode 100644 index 000000000000..1526927aaa6d --- /dev/null +++ b/slice2rb/cpp/test/DataStorm/api/Test.rb @@ -0,0 +1,66 @@ +# encoding: utf-8 +# +# Copyright (c) ZeroC, Inc. All rights reserved. +# +# +# Ice version 3.8.0-alpha.0 +# +# +# +# Generated from file `Test.ice' +# +# Warning: do not edit this file. +# +# +# + +require 'Ice' + +module ::Test + + if not defined?(::Test::StructKey) + class StructKey + include ::Ice::Inspect_mixin + def initialize(value=0) + @value = value + end + + def hash + _h = 0 + _h = 5 * _h + @value.hash + _h % 0x7fffffff + end + + def ==(other) + return false if !other.is_a? ::Test::StructKey or + @value != other.value + true + end + + def eql?(other) + return other.class == self.class && other == self + end + + attr_accessor :value + end + + T_StructKey = ::Ice::__defineStruct('::Test::StructKey', StructKey, [["value", ::Ice::T_int]]) + end + + if not defined?(::Test::ClassKey) + class ClassKey < ::Ice::Value + + def initialize(value=0) + @value = value + end + + attr_accessor :value + end + + if not defined?(::Test::T_ClassKey) + T_ClassKey = ::Ice::__declareClass('::Test::ClassKey') + end + + T_ClassKey.defineClass(ClassKey, -1, false, nil, [['value', ::Ice::T_int, false, 0]]) + end +end diff --git a/slice2rb/cpp/test/DataStorm/events/Test.rb b/slice2rb/cpp/test/DataStorm/events/Test.rb new file mode 100644 index 000000000000..6cb5ea1481af --- /dev/null +++ b/slice2rb/cpp/test/DataStorm/events/Test.rb @@ -0,0 +1,94 @@ +# encoding: utf-8 +# +# Copyright (c) ZeroC, Inc. All rights reserved. +# +# +# Ice version 3.8.0-alpha.0 +# +# +# +# Generated from file `Test.ice' +# +# Warning: do not edit this file. +# +# +# + +require 'Ice' + +module ::Test + + if not defined?(::Test::StructValue) + class StructValue + include ::Ice::Inspect_mixin + def initialize(firstName='', lastName='', age=0) + @firstName = firstName + @lastName = lastName + @age = age + end + + def hash + _h = 0 + _h = 5 * _h + @firstName.hash + _h = 5 * _h + @lastName.hash + _h = 5 * _h + @age.hash + _h % 0x7fffffff + end + + def ==(other) + return false if !other.is_a? ::Test::StructValue or + @firstName != other.firstName or + @lastName != other.lastName or + @age != other.age + true + end + + def eql?(other) + return other.class == self.class && other == self + end + + attr_accessor :firstName, :lastName, :age + end + + T_StructValue = ::Ice::__defineStruct('::Test::StructValue', StructValue, [ + ["firstName", ::Ice::T_string], + ["lastName", ::Ice::T_string], + ["age", ::Ice::T_int] + ]) + end + + if not defined?(::Test::Base) + class Base < ::Ice::Value + + def initialize(b='') + @b = b + end + + attr_accessor :b + end + + if not defined?(::Test::T_Base) + T_Base = ::Ice::__declareClass('::Test::Base') + end + + T_Base.defineClass(Base, -1, false, nil, [['b', ::Ice::T_string, false, 0]]) + end + + if not defined?(::Test::Extended) + class Extended < ::Test::Base + + def initialize(b='', e=0) + super(b) + @e = e + end + + attr_accessor :e + end + + if not defined?(::Test::T_Extended) + T_Extended = ::Ice::__declareClass('::Test::Extended') + end + + T_Extended.defineClass(Extended, -1, false, ::Test::T_Base, [['e', ::Ice::T_int, false, 0]]) + end +end diff --git a/slice2rb/cpp/test/DataStorm/partial/Test.rb b/slice2rb/cpp/test/DataStorm/partial/Test.rb new file mode 100644 index 000000000000..2e3b15f00277 --- /dev/null +++ b/slice2rb/cpp/test/DataStorm/partial/Test.rb @@ -0,0 +1,59 @@ +# encoding: utf-8 +# +# Copyright (c) ZeroC, Inc. All rights reserved. +# +# +# Ice version 3.8.0-alpha.0 +# +# +# +# Generated from file `Test.ice' +# +# Warning: do not edit this file. +# +# +# + +require 'Ice' + +module ::Test + + if not defined?(::Test::Stock) + class Stock + include ::Ice::Inspect_mixin + def initialize(price=0.0, lastBid=0.0, laskAsk=0.0) + @price = price + @lastBid = lastBid + @laskAsk = laskAsk + end + + def hash + _h = 0 + _h = 5 * _h + @price.hash + _h = 5 * _h + @lastBid.hash + _h = 5 * _h + @laskAsk.hash + _h % 0x7fffffff + end + + def ==(other) + return false if !other.is_a? ::Test::Stock or + @price != other.price or + @lastBid != other.lastBid or + @laskAsk != other.laskAsk + true + end + + def eql?(other) + return other.class == self.class && other == self + end + + attr_accessor :price, :lastBid, :laskAsk + end + + T_Stock = ::Ice::__defineStruct('::Test::Stock', Stock, [ + ["price", ::Ice::T_float], + ["lastBid", ::Ice::T_float], + ["laskAsk", ::Ice::T_float] + ]) + end +end diff --git a/slice2rb/cpp/test/DataStorm/types/Test.rb b/slice2rb/cpp/test/DataStorm/types/Test.rb new file mode 100644 index 000000000000..6cb5ea1481af --- /dev/null +++ b/slice2rb/cpp/test/DataStorm/types/Test.rb @@ -0,0 +1,94 @@ +# encoding: utf-8 +# +# Copyright (c) ZeroC, Inc. All rights reserved. +# +# +# Ice version 3.8.0-alpha.0 +# +# +# +# Generated from file `Test.ice' +# +# Warning: do not edit this file. +# +# +# + +require 'Ice' + +module ::Test + + if not defined?(::Test::StructValue) + class StructValue + include ::Ice::Inspect_mixin + def initialize(firstName='', lastName='', age=0) + @firstName = firstName + @lastName = lastName + @age = age + end + + def hash + _h = 0 + _h = 5 * _h + @firstName.hash + _h = 5 * _h + @lastName.hash + _h = 5 * _h + @age.hash + _h % 0x7fffffff + end + + def ==(other) + return false if !other.is_a? ::Test::StructValue or + @firstName != other.firstName or + @lastName != other.lastName or + @age != other.age + true + end + + def eql?(other) + return other.class == self.class && other == self + end + + attr_accessor :firstName, :lastName, :age + end + + T_StructValue = ::Ice::__defineStruct('::Test::StructValue', StructValue, [ + ["firstName", ::Ice::T_string], + ["lastName", ::Ice::T_string], + ["age", ::Ice::T_int] + ]) + end + + if not defined?(::Test::Base) + class Base < ::Ice::Value + + def initialize(b='') + @b = b + end + + attr_accessor :b + end + + if not defined?(::Test::T_Base) + T_Base = ::Ice::__declareClass('::Test::Base') + end + + T_Base.defineClass(Base, -1, false, nil, [['b', ::Ice::T_string, false, 0]]) + end + + if not defined?(::Test::Extended) + class Extended < ::Test::Base + + def initialize(b='', e=0) + super(b) + @e = e + end + + attr_accessor :e + end + + if not defined?(::Test::T_Extended) + T_Extended = ::Ice::__declareClass('::Test::Extended') + end + + T_Extended.defineClass(Extended, -1, false, ::Test::T_Base, [['e', ::Ice::T_int, false, 0]]) + end +end diff --git a/slice2rb/slice/DataStorm/Sample.rb b/slice2rb/slice/DataStorm/Sample.rb new file mode 100644 index 000000000000..3790676b2f11 --- /dev/null +++ b/slice2rb/slice/DataStorm/Sample.rb @@ -0,0 +1,75 @@ +# encoding: utf-8 +# +# Copyright (c) ZeroC, Inc. All rights reserved. +# +# +# Ice version 3.8.0-alpha.0 +# +# +# +# Generated from file `Sample.ice' +# +# Warning: do not edit this file. +# +# +# + +require 'Ice' + +module ::DataStorm + + if not defined?(::DataStorm::SampleEvent) + class SampleEvent + include Comparable + + def initialize(name, value) + @name = name + @value = value + end + + def SampleEvent.from_int(val) + @@_enumerators[val] + end + + def to_s + @name + end + + def to_i + @value + end + + def <=>(other) + other.is_a?(SampleEvent) or raise ArgumentError, "value must be a SampleEvent" + @value <=> other.to_i + end + + def hash + @value.hash + end + + def SampleEvent.each(&block) + @@_enumerators.each_value(&block) + end + + Add = SampleEvent.new("Add", 0) + Update = SampleEvent.new("Update", 1) + PartialUpdate = SampleEvent.new("PartialUpdate", 2) + Remove = SampleEvent.new("Remove", 3) + + @@_enumerators = {0=>Add, 1=>Update, 2=>PartialUpdate, 3=>Remove} + + def SampleEvent._enumerators + @@_enumerators + end + + private_class_method :new + end + + T_SampleEvent = ::Ice::__defineEnum('::DataStorm::SampleEvent', SampleEvent, SampleEvent::_enumerators) + end + + if not defined?(::DataStorm::T_SampleEventSeq) + T_SampleEventSeq = ::Ice::__defineSequence('::DataStorm::SampleEventSeq', ::DataStorm::T_SampleEvent) + end +end diff --git a/slice2swift/cpp/src/DataStorm/Contract.swift b/slice2swift/cpp/src/DataStorm/Contract.swift new file mode 100644 index 000000000000..d3e33b0bdbee --- /dev/null +++ b/slice2swift/cpp/src/DataStorm/Contract.swift @@ -0,0 +1,3101 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Contract.ice' +// +// Warning: do not edit this file. +// +// +// + +import Foundation +import Ice +import DataStorm + +public enum ClearHistoryPolicy: Swift.UInt8 { + /// OnAdd + case OnAdd = 0 + /// OnRemove + case OnRemove = 1 + /// OnAll + case OnAll = 2 + /// OnAllExceptPartialUpdate + case OnAllExceptPartialUpdate = 3 + /// Never + case Never = 4 + public init() { + self = .OnAdd + } +} + +/// An `Ice.InputStream` extension to read `ClearHistoryPolicy` enumerated values from the stream. +public extension Ice.InputStream { + /// Read an enumerated value. + /// + /// - returns: `ClearHistoryPolicy` - The enumarated value. + func read() throws -> ClearHistoryPolicy { + let rawValue: Swift.UInt8 = try read(enumMaxValue: 4) + guard let val = ClearHistoryPolicy(rawValue: rawValue) else { + throw Ice.MarshalException("invalid enum value") + } + return val + } + + /// Read an optional enumerated value from the stream. + /// + /// - parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// - returns: `ClearHistoryPolicy` - The enumerated value. + func read(tag: Swift.Int32) throws -> ClearHistoryPolicy? { + guard try readOptional(tag: tag, expectedFormat: .Size) else { + return nil + } + return try read() as ClearHistoryPolicy + } +} + +/// An `Ice.OutputStream` extension to write `ClearHistoryPolicy` enumerated values to the stream. +public extension Ice.OutputStream { + /// Writes an enumerated value to the stream. + /// + /// parameter _: `ClearHistoryPolicy` - The enumerator to write. + func write(_ v: ClearHistoryPolicy) { + write(enum: v.rawValue, maxValue: 4) + } + + /// Writes an optional enumerated value to the stream. + /// + /// parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// parameter _: `ClearHistoryPolicy` - The enumerator to write. + func write(tag: Swift.Int32, value: ClearHistoryPolicy?) { + guard let v = value else { + return + } + write(tag: tag, val: v.rawValue, maxValue: 4) + } +} + +/// A sequence of bytes use to hold the encoded key or value +public typealias ByteSeq = Foundation.Data + +/// A sequence of long +public typealias LongSeq = [Swift.Int64] + +/// A sequence of strings +public typealias StringSeq = [Swift.String] + +/// A dictionary of +public typealias LongLongDict = [Swift.Int64: Swift.Int64] + +/// Helper class to read and write `LongLongDict` dictionary values from +/// `Ice.InputStream` and `Ice.OutputStream`. +public struct LongLongDictHelper { + /// Read a `LongLongDict` dictionary from the stream. + /// + /// - parameter istr: `Ice.InputStream` - The stream to read from. + /// + /// - returns: `LongLongDict` - The dictionary read from the stream. + public static func read(from istr: Ice.InputStream) throws -> LongLongDict { + let sz = try Swift.Int(istr.readSize()) + var v = LongLongDict() + for _ in 0 ..< sz { + let key: Swift.Int64 = try istr.read() + let value: Swift.Int64 = try istr.read() + v[key] = value + } + return v + } + /// Read an optional `LongLongDict?` dictionary from the stream. + /// + /// - parameter istr: `Ice.InputStream` - The stream to read from. + /// + /// - parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// - returns: `LongLongDict` - The dictionary read from the stream. + public static func read(from istr: Ice.InputStream, tag: Swift.Int32) throws -> LongLongDict? { + guard try istr.readOptional(tag: tag, expectedFormat: .VSize) else { + return nil + } + try istr.skipSize() + return try read(from: istr) + } + + /// Wite a `LongLongDict` dictionary to the stream. + /// + /// - parameter ostr: `Ice.OuputStream` - The stream to write to. + /// + /// - parameter value: `LongLongDict` - The dictionary value to write to the stream. + public static func write(to ostr: Ice.OutputStream, value v: LongLongDict) { + ostr.write(size: v.count) + for (key, value) in v { + ostr.write(key) + ostr.write(value) + } + } + + /// Wite an optional `LongLongDict?` dictionary to the stream. + /// + /// - parameter ostr: `Ice.OuputStream` - The stream to write to. + /// + /// - parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `LongLongDict` - The dictionary value to write to the stream. + public static func write(to ostr: Ice.OutputStream, tag: Swift.Int32, value v: LongLongDict?) { + guard let val = v else { + return + } + if ostr.writeOptionalVSize(tag: tag, len: val.count, elemSize: 16) { + write(to: ostr, value: val) + } + } +} + +public struct DataSample { + /// The sample id. + public var id: Swift.Int64 = 0 + /// The key id. + public var keyId: Swift.Int64 = 0 + /// The key value if the key ID <= 0. + public var keyValue: ByteSeq = ByteSeq() + /// The timestamp of the sample (write time). + public var timestamp: Swift.Int64 = 0 + /// The update tag if the sample event is PartialUpdate. + public var tag: Swift.Int64 = 0 + /// The sample event. + public var event: DataStorm.SampleEvent = .Add + /// The value of the sample. + public var value: ByteSeq = ByteSeq() + + public init() {} + + public init(id: Swift.Int64, keyId: Swift.Int64, keyValue: ByteSeq, timestamp: Swift.Int64, tag: Swift.Int64, event: DataStorm.SampleEvent, value: ByteSeq) { + self.id = id + self.keyId = keyId + self.keyValue = keyValue + self.timestamp = timestamp + self.tag = tag + self.event = event + self.value = value + } +} + +/// An `Ice.InputStream` extension to read `DataSample` structured values from the stream. +public extension Ice.InputStream { + /// Read a `DataSample` structured value from the stream. + /// + /// - returns: `DataSample` - The structured value read from the stream. + func read() throws -> DataSample { + var v = DataSample() + v.id = try self.read() + v.keyId = try self.read() + v.keyValue = try self.read() + v.timestamp = try self.read() + v.tag = try self.read() + v.event = try self.read() + v.value = try self.read() + return v + } + + /// Read an optional `DataSample?` structured value from the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `DataSample?` - The structured value read from the stream. + func read(tag: Swift.Int32) throws -> DataSample? { + guard try readOptional(tag: tag, expectedFormat: .FSize) else { + return nil + } + try skip(4) + return try read() as DataSample + } +} + +/// An `Ice.OutputStream` extension to write `DataSample` structured values from the stream. +public extension Ice.OutputStream { + /// Write a `DataSample` structured value to the stream. + /// + /// - parameter _: `DataSample` - The value to write to the stream. + func write(_ v: DataSample) { + self.write(v.id) + self.write(v.keyId) + self.write(v.keyValue) + self.write(v.timestamp) + self.write(v.tag) + self.write(v.event) + self.write(v.value) + } + + /// Write an optional `DataSample?` structured value to the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `DataSample?` - The value to write to the stream. + func write(tag: Swift.Int32, value: DataSample?) { + if let v = value { + if writeOptional(tag: tag, format: .FSize) { + let pos = startSize() + write(v) + endSize(position: pos) + } + } + } +} + +public typealias DataSampleSeq = [DataSample] + +/// Helper class to read and write `DataSampleSeq` sequence values from +/// `Ice.InputStream` and `Ice.OutputStream`. +public struct DataSampleSeqHelper { + /// Read a `DataSampleSeq` sequence from the stream. + /// + /// - parameter istr: `Ice.InputStream` - The stream to read from. + /// + /// - returns: `DataSampleSeq` - The sequence read from the stream. + public static func read(from istr: Ice.InputStream) throws -> DataSampleSeq { + let sz = try istr.readAndCheckSeqSize(minSize: 35) + var v = DataSampleSeq() + v.reserveCapacity(sz) + for _ in 0 ..< sz { + let j: DataSample = try istr.read() + v.append(j) + } + return v + } + /// Read an optional `DataSampleSeq?` sequence from the stream. + /// + /// - parameter istr: `Ice.InputStream` - The stream to read from. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `DataSampleSeq` - The sequence read from the stream. + public static func read(from istr: Ice.InputStream, tag: Swift.Int32) throws -> DataSampleSeq? { + guard try istr.readOptional(tag: tag, expectedFormat: .FSize) else { + return nil + } + try istr.skip(4) + return try read(from: istr) + } + + /// Wite a `DataSampleSeq` sequence to the stream. + /// + /// - parameter ostr: `Ice.OuputStream` - The stream to write to. + /// + /// - parameter value: `DataSampleSeq` - The sequence value to write to the stream. + public static func write(to ostr: Ice.OutputStream, value v: DataSampleSeq) { + ostr.write(size: v.count) + for item in v { + ostr.write(item) + } + } + + /// Wite an optional `DataSampleSeq?` sequence to the stream. + /// + /// - parameter ostr: `Ice.OuputStream` - The stream to write to. + /// + /// - parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `DataSampleSeq` The sequence value to write to the stream. + public static func write(to ostr: Ice.OutputStream, tag: Swift.Int32, value v: DataSampleSeq?) { + guard let val = v else { + return + } + if ostr.writeOptional(tag: tag, format: .FSize) { + let pos = ostr.startSize() + write(to: ostr, value: val) + ostr.endSize(position: pos) + } + } +} + +public struct DataSamples { + /// The id of the writer or reader. + public var id: Swift.Int64 = 0 + /// The samples. + public var samples: DataSampleSeq = DataSampleSeq() + + public init() {} + + public init(id: Swift.Int64, samples: DataSampleSeq) { + self.id = id + self.samples = samples + } +} + +/// An `Ice.InputStream` extension to read `DataSamples` structured values from the stream. +public extension Ice.InputStream { + /// Read a `DataSamples` structured value from the stream. + /// + /// - returns: `DataSamples` - The structured value read from the stream. + func read() throws -> DataSamples { + var v = DataSamples() + v.id = try self.read() + v.samples = try DataSampleSeqHelper.read(from: self) + return v + } + + /// Read an optional `DataSamples?` structured value from the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `DataSamples?` - The structured value read from the stream. + func read(tag: Swift.Int32) throws -> DataSamples? { + guard try readOptional(tag: tag, expectedFormat: .FSize) else { + return nil + } + try skip(4) + return try read() as DataSamples + } +} + +/// An `Ice.OutputStream` extension to write `DataSamples` structured values from the stream. +public extension Ice.OutputStream { + /// Write a `DataSamples` structured value to the stream. + /// + /// - parameter _: `DataSamples` - The value to write to the stream. + func write(_ v: DataSamples) { + self.write(v.id) + DataSampleSeqHelper.write(to: self, value: v.samples) + } + + /// Write an optional `DataSamples?` structured value to the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `DataSamples?` - The value to write to the stream. + func write(tag: Swift.Int32, value: DataSamples?) { + if let v = value { + if writeOptional(tag: tag, format: .FSize) { + let pos = startSize() + write(v) + endSize(position: pos) + } + } + } +} + +public typealias DataSamplesSeq = [DataSamples] + +/// Helper class to read and write `DataSamplesSeq` sequence values from +/// `Ice.InputStream` and `Ice.OutputStream`. +public struct DataSamplesSeqHelper { + /// Read a `DataSamplesSeq` sequence from the stream. + /// + /// - parameter istr: `Ice.InputStream` - The stream to read from. + /// + /// - returns: `DataSamplesSeq` - The sequence read from the stream. + public static func read(from istr: Ice.InputStream) throws -> DataSamplesSeq { + let sz = try istr.readAndCheckSeqSize(minSize: 9) + var v = DataSamplesSeq() + v.reserveCapacity(sz) + for _ in 0 ..< sz { + let j: DataSamples = try istr.read() + v.append(j) + } + return v + } + /// Read an optional `DataSamplesSeq?` sequence from the stream. + /// + /// - parameter istr: `Ice.InputStream` - The stream to read from. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `DataSamplesSeq` - The sequence read from the stream. + public static func read(from istr: Ice.InputStream, tag: Swift.Int32) throws -> DataSamplesSeq? { + guard try istr.readOptional(tag: tag, expectedFormat: .FSize) else { + return nil + } + try istr.skip(4) + return try read(from: istr) + } + + /// Wite a `DataSamplesSeq` sequence to the stream. + /// + /// - parameter ostr: `Ice.OuputStream` - The stream to write to. + /// + /// - parameter value: `DataSamplesSeq` - The sequence value to write to the stream. + public static func write(to ostr: Ice.OutputStream, value v: DataSamplesSeq) { + ostr.write(size: v.count) + for item in v { + ostr.write(item) + } + } + + /// Wite an optional `DataSamplesSeq?` sequence to the stream. + /// + /// - parameter ostr: `Ice.OuputStream` - The stream to write to. + /// + /// - parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `DataSamplesSeq` The sequence value to write to the stream. + public static func write(to ostr: Ice.OutputStream, tag: Swift.Int32, value v: DataSamplesSeq?) { + guard let val = v else { + return + } + if ostr.writeOptional(tag: tag, format: .FSize) { + let pos = ostr.startSize() + write(to: ostr, value: val) + ostr.endSize(position: pos) + } + } +} + +public struct ElementInfo { + /// The key or filter id. + public var id: Swift.Int64 = 0 + /// The filter name. + public var name: Swift.String = "" + /// The key or filter value. + public var value: ByteSeq = ByteSeq() + + public init() {} + + public init(id: Swift.Int64, name: Swift.String, value: ByteSeq) { + self.id = id + self.name = name + self.value = value + } +} + +/// An `Ice.InputStream` extension to read `ElementInfo` structured values from the stream. +public extension Ice.InputStream { + /// Read a `ElementInfo` structured value from the stream. + /// + /// - returns: `ElementInfo` - The structured value read from the stream. + func read() throws -> ElementInfo { + var v = ElementInfo() + v.id = try self.read() + v.name = try self.read() + v.value = try self.read() + return v + } + + /// Read an optional `ElementInfo?` structured value from the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `ElementInfo?` - The structured value read from the stream. + func read(tag: Swift.Int32) throws -> ElementInfo? { + guard try readOptional(tag: tag, expectedFormat: .FSize) else { + return nil + } + try skip(4) + return try read() as ElementInfo + } +} + +/// An `Ice.OutputStream` extension to write `ElementInfo` structured values from the stream. +public extension Ice.OutputStream { + /// Write a `ElementInfo` structured value to the stream. + /// + /// - parameter _: `ElementInfo` - The value to write to the stream. + func write(_ v: ElementInfo) { + self.write(v.id) + self.write(v.name) + self.write(v.value) + } + + /// Write an optional `ElementInfo?` structured value to the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `ElementInfo?` - The value to write to the stream. + func write(tag: Swift.Int32, value: ElementInfo?) { + if let v = value { + if writeOptional(tag: tag, format: .FSize) { + let pos = startSize() + write(v) + endSize(position: pos) + } + } + } +} + +public typealias ElementInfoSeq = [ElementInfo] + +/// Helper class to read and write `ElementInfoSeq` sequence values from +/// `Ice.InputStream` and `Ice.OutputStream`. +public struct ElementInfoSeqHelper { + /// Read a `ElementInfoSeq` sequence from the stream. + /// + /// - parameter istr: `Ice.InputStream` - The stream to read from. + /// + /// - returns: `ElementInfoSeq` - The sequence read from the stream. + public static func read(from istr: Ice.InputStream) throws -> ElementInfoSeq { + let sz = try istr.readAndCheckSeqSize(minSize: 10) + var v = ElementInfoSeq() + v.reserveCapacity(sz) + for _ in 0 ..< sz { + let j: ElementInfo = try istr.read() + v.append(j) + } + return v + } + /// Read an optional `ElementInfoSeq?` sequence from the stream. + /// + /// - parameter istr: `Ice.InputStream` - The stream to read from. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `ElementInfoSeq` - The sequence read from the stream. + public static func read(from istr: Ice.InputStream, tag: Swift.Int32) throws -> ElementInfoSeq? { + guard try istr.readOptional(tag: tag, expectedFormat: .FSize) else { + return nil + } + try istr.skip(4) + return try read(from: istr) + } + + /// Wite a `ElementInfoSeq` sequence to the stream. + /// + /// - parameter ostr: `Ice.OuputStream` - The stream to write to. + /// + /// - parameter value: `ElementInfoSeq` - The sequence value to write to the stream. + public static func write(to ostr: Ice.OutputStream, value v: ElementInfoSeq) { + ostr.write(size: v.count) + for item in v { + ostr.write(item) + } + } + + /// Wite an optional `ElementInfoSeq?` sequence to the stream. + /// + /// - parameter ostr: `Ice.OuputStream` - The stream to write to. + /// + /// - parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `ElementInfoSeq` The sequence value to write to the stream. + public static func write(to ostr: Ice.OutputStream, tag: Swift.Int32, value v: ElementInfoSeq?) { + guard let val = v else { + return + } + if ostr.writeOptional(tag: tag, format: .FSize) { + let pos = ostr.startSize() + write(to: ostr, value: val) + ostr.endSize(position: pos) + } + } +} + +public struct TopicInfo { + /// The topic name. + public var name: Swift.String = "" + /// The id of topic writers or readers. + public var ids: LongSeq = LongSeq() + + public init() {} + + public init(name: Swift.String, ids: LongSeq) { + self.name = name + self.ids = ids + } +} + +/// An `Ice.InputStream` extension to read `TopicInfo` structured values from the stream. +public extension Ice.InputStream { + /// Read a `TopicInfo` structured value from the stream. + /// + /// - returns: `TopicInfo` - The structured value read from the stream. + func read() throws -> TopicInfo { + var v = TopicInfo() + v.name = try self.read() + v.ids = try self.read() + return v + } + + /// Read an optional `TopicInfo?` structured value from the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `TopicInfo?` - The structured value read from the stream. + func read(tag: Swift.Int32) throws -> TopicInfo? { + guard try readOptional(tag: tag, expectedFormat: .FSize) else { + return nil + } + try skip(4) + return try read() as TopicInfo + } +} + +/// An `Ice.OutputStream` extension to write `TopicInfo` structured values from the stream. +public extension Ice.OutputStream { + /// Write a `TopicInfo` structured value to the stream. + /// + /// - parameter _: `TopicInfo` - The value to write to the stream. + func write(_ v: TopicInfo) { + self.write(v.name) + self.write(v.ids) + } + + /// Write an optional `TopicInfo?` structured value to the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `TopicInfo?` - The value to write to the stream. + func write(tag: Swift.Int32, value: TopicInfo?) { + if let v = value { + if writeOptional(tag: tag, format: .FSize) { + let pos = startSize() + write(v) + endSize(position: pos) + } + } + } +} + +public typealias TopicInfoSeq = [TopicInfo] + +/// Helper class to read and write `TopicInfoSeq` sequence values from +/// `Ice.InputStream` and `Ice.OutputStream`. +public struct TopicInfoSeqHelper { + /// Read a `TopicInfoSeq` sequence from the stream. + /// + /// - parameter istr: `Ice.InputStream` - The stream to read from. + /// + /// - returns: `TopicInfoSeq` - The sequence read from the stream. + public static func read(from istr: Ice.InputStream) throws -> TopicInfoSeq { + let sz = try istr.readAndCheckSeqSize(minSize: 2) + var v = TopicInfoSeq() + v.reserveCapacity(sz) + for _ in 0 ..< sz { + let j: TopicInfo = try istr.read() + v.append(j) + } + return v + } + /// Read an optional `TopicInfoSeq?` sequence from the stream. + /// + /// - parameter istr: `Ice.InputStream` - The stream to read from. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `TopicInfoSeq` - The sequence read from the stream. + public static func read(from istr: Ice.InputStream, tag: Swift.Int32) throws -> TopicInfoSeq? { + guard try istr.readOptional(tag: tag, expectedFormat: .FSize) else { + return nil + } + try istr.skip(4) + return try read(from: istr) + } + + /// Wite a `TopicInfoSeq` sequence to the stream. + /// + /// - parameter ostr: `Ice.OuputStream` - The stream to write to. + /// + /// - parameter value: `TopicInfoSeq` - The sequence value to write to the stream. + public static func write(to ostr: Ice.OutputStream, value v: TopicInfoSeq) { + ostr.write(size: v.count) + for item in v { + ostr.write(item) + } + } + + /// Wite an optional `TopicInfoSeq?` sequence to the stream. + /// + /// - parameter ostr: `Ice.OuputStream` - The stream to write to. + /// + /// - parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `TopicInfoSeq` The sequence value to write to the stream. + public static func write(to ostr: Ice.OutputStream, tag: Swift.Int32, value v: TopicInfoSeq?) { + guard let val = v else { + return + } + if ostr.writeOptional(tag: tag, format: .FSize) { + let pos = ostr.startSize() + write(to: ostr, value: val) + ostr.endSize(position: pos) + } + } +} + +public struct TopicSpec { + /// The id of the topic. + public var id: Swift.Int64 = 0 + /// The name of the topic. + public var name: Swift.String = "" + /// The topic keys or filters. + public var elements: ElementInfoSeq = ElementInfoSeq() + /// The topic update tags. + public var tags: ElementInfoSeq = ElementInfoSeq() + + public init() {} + + public init(id: Swift.Int64, name: Swift.String, elements: ElementInfoSeq, tags: ElementInfoSeq) { + self.id = id + self.name = name + self.elements = elements + self.tags = tags + } +} + +/// An `Ice.InputStream` extension to read `TopicSpec` structured values from the stream. +public extension Ice.InputStream { + /// Read a `TopicSpec` structured value from the stream. + /// + /// - returns: `TopicSpec` - The structured value read from the stream. + func read() throws -> TopicSpec { + var v = TopicSpec() + v.id = try self.read() + v.name = try self.read() + v.elements = try ElementInfoSeqHelper.read(from: self) + v.tags = try ElementInfoSeqHelper.read(from: self) + return v + } + + /// Read an optional `TopicSpec?` structured value from the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `TopicSpec?` - The structured value read from the stream. + func read(tag: Swift.Int32) throws -> TopicSpec? { + guard try readOptional(tag: tag, expectedFormat: .FSize) else { + return nil + } + try skip(4) + return try read() as TopicSpec + } +} + +/// An `Ice.OutputStream` extension to write `TopicSpec` structured values from the stream. +public extension Ice.OutputStream { + /// Write a `TopicSpec` structured value to the stream. + /// + /// - parameter _: `TopicSpec` - The value to write to the stream. + func write(_ v: TopicSpec) { + self.write(v.id) + self.write(v.name) + ElementInfoSeqHelper.write(to: self, value: v.elements) + ElementInfoSeqHelper.write(to: self, value: v.tags) + } + + /// Write an optional `TopicSpec?` structured value to the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `TopicSpec?` - The value to write to the stream. + func write(tag: Swift.Int32, value: TopicSpec?) { + if let v = value { + if writeOptional(tag: tag, format: .FSize) { + let pos = startSize() + write(v) + endSize(position: pos) + } + } + } +} + +public struct FilterInfo { + public var name: Swift.String = "" + public var criteria: ByteSeq = ByteSeq() + + public init() {} + + public init(name: Swift.String, criteria: ByteSeq) { + self.name = name + self.criteria = criteria + } +} + +/// An `Ice.InputStream` extension to read `FilterInfo` structured values from the stream. +public extension Ice.InputStream { + /// Read a `FilterInfo` structured value from the stream. + /// + /// - returns: `FilterInfo` - The structured value read from the stream. + func read() throws -> FilterInfo { + var v = FilterInfo() + v.name = try self.read() + v.criteria = try self.read() + return v + } + + /// Read an optional `FilterInfo?` structured value from the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `FilterInfo?` - The structured value read from the stream. + func read(tag: Swift.Int32) throws -> FilterInfo? { + guard try readOptional(tag: tag, expectedFormat: .FSize) else { + return nil + } + try skip(4) + return try read() as FilterInfo + } +} + +/// An `Ice.OutputStream` extension to write `FilterInfo` structured values from the stream. +public extension Ice.OutputStream { + /// Write a `FilterInfo` structured value to the stream. + /// + /// - parameter _: `FilterInfo` - The value to write to the stream. + func write(_ v: FilterInfo) { + self.write(v.name) + self.write(v.criteria) + } + + /// Write an optional `FilterInfo?` structured value to the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `FilterInfo?` - The value to write to the stream. + func write(tag: Swift.Int32, value: FilterInfo?) { + if let v = value { + if writeOptional(tag: tag, format: .FSize) { + let pos = startSize() + write(v) + endSize(position: pos) + } + } + } +} + +public class ElementData { + /// The id of the writer or reader + public var id: Swift.Int64 = 0 + /// The config of the writer or reader + public var config: ElementConfig? = nil + /// The lastIds received by the reader. + public var lastIds: LongLongDict = LongLongDict() + + public init() {} + + public init(id: Swift.Int64, config: ElementConfig?, lastIds: LongLongDict) { + self.id = id + self.config = config + self.lastIds = lastIds + } +} + +/// An `Ice.InputStream` extension to read `ElementData` structured values from the stream. +public extension Ice.InputStream { + /// Read a `ElementData` structured value from the stream. + /// + /// - returns: `ElementData` - The structured value read from the stream. + func read() throws -> ElementData { + let v = ElementData() + v.id = try self.read() + try self.read(ElementConfig.self) { v.config = $0 } + v.lastIds = try LongLongDictHelper.read(from: self) + return v + } + + /// Read an optional `ElementData?` structured value from the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `ElementData?` - The structured value read from the stream. + func read(tag: Swift.Int32) throws -> ElementData? { + guard try readOptional(tag: tag, expectedFormat: .FSize) else { + return nil + } + try skip(4) + return try read() as ElementData + } +} + +/// An `Ice.OutputStream` extension to write `ElementData` structured values from the stream. +public extension Ice.OutputStream { + /// Write a `ElementData` structured value to the stream. + /// + /// - parameter _: `ElementData` - The value to write to the stream. + func write(_ v: ElementData) { + self.write(v.id) + self.write(v.config) + LongLongDictHelper.write(to: self, value: v.lastIds) + } + + /// Write an optional `ElementData?` structured value to the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `ElementData?` - The value to write to the stream. + func write(tag: Swift.Int32, value: ElementData?) { + if let v = value { + if writeOptional(tag: tag, format: .FSize) { + let pos = startSize() + write(v) + endSize(position: pos) + } + } + } +} + +public typealias ElementDataSeq = [ElementData] + +/// Helper class to read and write `ElementDataSeq` sequence values from +/// `Ice.InputStream` and `Ice.OutputStream`. +public struct ElementDataSeqHelper { + /// Read a `ElementDataSeq` sequence from the stream. + /// + /// - parameter istr: `Ice.InputStream` - The stream to read from. + /// + /// - returns: `ElementDataSeq` - The sequence read from the stream. + public static func read(from istr: Ice.InputStream) throws -> ElementDataSeq { + let sz = try istr.readAndCheckSeqSize(minSize: 10) + var v = ElementDataSeq() + v.reserveCapacity(sz) + for _ in 0 ..< sz { + let j: ElementData = try istr.read() + v.append(j) + } + return v + } + /// Read an optional `ElementDataSeq?` sequence from the stream. + /// + /// - parameter istr: `Ice.InputStream` - The stream to read from. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `ElementDataSeq` - The sequence read from the stream. + public static func read(from istr: Ice.InputStream, tag: Swift.Int32) throws -> ElementDataSeq? { + guard try istr.readOptional(tag: tag, expectedFormat: .FSize) else { + return nil + } + try istr.skip(4) + return try read(from: istr) + } + + /// Wite a `ElementDataSeq` sequence to the stream. + /// + /// - parameter ostr: `Ice.OuputStream` - The stream to write to. + /// + /// - parameter value: `ElementDataSeq` - The sequence value to write to the stream. + public static func write(to ostr: Ice.OutputStream, value v: ElementDataSeq) { + ostr.write(size: v.count) + for item in v { + ostr.write(item) + } + } + + /// Wite an optional `ElementDataSeq?` sequence to the stream. + /// + /// - parameter ostr: `Ice.OuputStream` - The stream to write to. + /// + /// - parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `ElementDataSeq` The sequence value to write to the stream. + public static func write(to ostr: Ice.OutputStream, tag: Swift.Int32, value v: ElementDataSeq?) { + guard let val = v else { + return + } + if ostr.writeOptional(tag: tag, format: .FSize) { + let pos = ostr.startSize() + write(to: ostr, value: val) + ostr.endSize(position: pos) + } + } +} + +public class ElementSpec { + /// The readers and writers associated with the key or filter. + public var elements: ElementDataSeq = ElementDataSeq() + /// The id of the key or filter + public var id: Swift.Int64 = 0 + /// The name of the filter. + public var name: Swift.String = "" + /// The value of the key or filter. + public var value: ByteSeq = ByteSeq() + /// The id of the key or filter from the peer. + public var peerId: Swift.Int64 = 0 + /// The name of the filter from the peer. + public var peerName: Swift.String = "" + + public init() {} + + public init(elements: ElementDataSeq, id: Swift.Int64, name: Swift.String, value: ByteSeq, peerId: Swift.Int64, peerName: Swift.String) { + self.elements = elements + self.id = id + self.name = name + self.value = value + self.peerId = peerId + self.peerName = peerName + } +} + +/// An `Ice.InputStream` extension to read `ElementSpec` structured values from the stream. +public extension Ice.InputStream { + /// Read a `ElementSpec` structured value from the stream. + /// + /// - returns: `ElementSpec` - The structured value read from the stream. + func read() throws -> ElementSpec { + let v = ElementSpec() + v.elements = try ElementDataSeqHelper.read(from: self) + v.id = try self.read() + v.name = try self.read() + v.value = try self.read() + v.peerId = try self.read() + v.peerName = try self.read() + return v + } + + /// Read an optional `ElementSpec?` structured value from the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `ElementSpec?` - The structured value read from the stream. + func read(tag: Swift.Int32) throws -> ElementSpec? { + guard try readOptional(tag: tag, expectedFormat: .FSize) else { + return nil + } + try skip(4) + return try read() as ElementSpec + } +} + +/// An `Ice.OutputStream` extension to write `ElementSpec` structured values from the stream. +public extension Ice.OutputStream { + /// Write a `ElementSpec` structured value to the stream. + /// + /// - parameter _: `ElementSpec` - The value to write to the stream. + func write(_ v: ElementSpec) { + ElementDataSeqHelper.write(to: self, value: v.elements) + self.write(v.id) + self.write(v.name) + self.write(v.value) + self.write(v.peerId) + self.write(v.peerName) + } + + /// Write an optional `ElementSpec?` structured value to the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `ElementSpec?` - The value to write to the stream. + func write(tag: Swift.Int32, value: ElementSpec?) { + if let v = value { + if writeOptional(tag: tag, format: .FSize) { + let pos = startSize() + write(v) + endSize(position: pos) + } + } + } +} + +public typealias ElementSpecSeq = [ElementSpec] + +/// Helper class to read and write `ElementSpecSeq` sequence values from +/// `Ice.InputStream` and `Ice.OutputStream`. +public struct ElementSpecSeqHelper { + /// Read a `ElementSpecSeq` sequence from the stream. + /// + /// - parameter istr: `Ice.InputStream` - The stream to read from. + /// + /// - returns: `ElementSpecSeq` - The sequence read from the stream. + public static func read(from istr: Ice.InputStream) throws -> ElementSpecSeq { + let sz = try istr.readAndCheckSeqSize(minSize: 20) + var v = ElementSpecSeq() + v.reserveCapacity(sz) + for _ in 0 ..< sz { + let j: ElementSpec = try istr.read() + v.append(j) + } + return v + } + /// Read an optional `ElementSpecSeq?` sequence from the stream. + /// + /// - parameter istr: `Ice.InputStream` - The stream to read from. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `ElementSpecSeq` - The sequence read from the stream. + public static func read(from istr: Ice.InputStream, tag: Swift.Int32) throws -> ElementSpecSeq? { + guard try istr.readOptional(tag: tag, expectedFormat: .FSize) else { + return nil + } + try istr.skip(4) + return try read(from: istr) + } + + /// Wite a `ElementSpecSeq` sequence to the stream. + /// + /// - parameter ostr: `Ice.OuputStream` - The stream to write to. + /// + /// - parameter value: `ElementSpecSeq` - The sequence value to write to the stream. + public static func write(to ostr: Ice.OutputStream, value v: ElementSpecSeq) { + ostr.write(size: v.count) + for item in v { + ostr.write(item) + } + } + + /// Wite an optional `ElementSpecSeq?` sequence to the stream. + /// + /// - parameter ostr: `Ice.OuputStream` - The stream to write to. + /// + /// - parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `ElementSpecSeq` The sequence value to write to the stream. + public static func write(to ostr: Ice.OutputStream, tag: Swift.Int32, value v: ElementSpecSeq?) { + guard let val = v else { + return + } + if ostr.writeOptional(tag: tag, format: .FSize) { + let pos = ostr.startSize() + write(to: ostr, value: val) + ostr.endSize(position: pos) + } + } +} + +public class ElementDataAck { + /// The id of the writer or filter. + public var id: Swift.Int64 = 0 + /// The config of the writer or reader + public var config: ElementConfig? = nil + /// The lastIds received by the reader. + public var lastIds: LongLongDict = LongLongDict() + /// The samples of the writer or reader + public var samples: DataSampleSeq = DataSampleSeq() + /// The id of the writer or reader on the peer. + public var peerId: Swift.Int64 = 0 + + public init() {} + + public init(id: Swift.Int64, config: ElementConfig?, lastIds: LongLongDict, samples: DataSampleSeq, peerId: Swift.Int64) { + self.id = id + self.config = config + self.lastIds = lastIds + self.samples = samples + self.peerId = peerId + } +} + +/// An `Ice.InputStream` extension to read `ElementDataAck` structured values from the stream. +public extension Ice.InputStream { + /// Read a `ElementDataAck` structured value from the stream. + /// + /// - returns: `ElementDataAck` - The structured value read from the stream. + func read() throws -> ElementDataAck { + let v = ElementDataAck() + v.id = try self.read() + try self.read(ElementConfig.self) { v.config = $0 } + v.lastIds = try LongLongDictHelper.read(from: self) + v.samples = try DataSampleSeqHelper.read(from: self) + v.peerId = try self.read() + return v + } + + /// Read an optional `ElementDataAck?` structured value from the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `ElementDataAck?` - The structured value read from the stream. + func read(tag: Swift.Int32) throws -> ElementDataAck? { + guard try readOptional(tag: tag, expectedFormat: .FSize) else { + return nil + } + try skip(4) + return try read() as ElementDataAck + } +} + +/// An `Ice.OutputStream` extension to write `ElementDataAck` structured values from the stream. +public extension Ice.OutputStream { + /// Write a `ElementDataAck` structured value to the stream. + /// + /// - parameter _: `ElementDataAck` - The value to write to the stream. + func write(_ v: ElementDataAck) { + self.write(v.id) + self.write(v.config) + LongLongDictHelper.write(to: self, value: v.lastIds) + DataSampleSeqHelper.write(to: self, value: v.samples) + self.write(v.peerId) + } + + /// Write an optional `ElementDataAck?` structured value to the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `ElementDataAck?` - The value to write to the stream. + func write(tag: Swift.Int32, value: ElementDataAck?) { + if let v = value { + if writeOptional(tag: tag, format: .FSize) { + let pos = startSize() + write(v) + endSize(position: pos) + } + } + } +} + +public typealias ElementDataAckSeq = [ElementDataAck] + +/// Helper class to read and write `ElementDataAckSeq` sequence values from +/// `Ice.InputStream` and `Ice.OutputStream`. +public struct ElementDataAckSeqHelper { + /// Read a `ElementDataAckSeq` sequence from the stream. + /// + /// - parameter istr: `Ice.InputStream` - The stream to read from. + /// + /// - returns: `ElementDataAckSeq` - The sequence read from the stream. + public static func read(from istr: Ice.InputStream) throws -> ElementDataAckSeq { + let sz = try istr.readAndCheckSeqSize(minSize: 19) + var v = ElementDataAckSeq() + v.reserveCapacity(sz) + for _ in 0 ..< sz { + let j: ElementDataAck = try istr.read() + v.append(j) + } + return v + } + /// Read an optional `ElementDataAckSeq?` sequence from the stream. + /// + /// - parameter istr: `Ice.InputStream` - The stream to read from. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `ElementDataAckSeq` - The sequence read from the stream. + public static func read(from istr: Ice.InputStream, tag: Swift.Int32) throws -> ElementDataAckSeq? { + guard try istr.readOptional(tag: tag, expectedFormat: .FSize) else { + return nil + } + try istr.skip(4) + return try read(from: istr) + } + + /// Wite a `ElementDataAckSeq` sequence to the stream. + /// + /// - parameter ostr: `Ice.OuputStream` - The stream to write to. + /// + /// - parameter value: `ElementDataAckSeq` - The sequence value to write to the stream. + public static func write(to ostr: Ice.OutputStream, value v: ElementDataAckSeq) { + ostr.write(size: v.count) + for item in v { + ostr.write(item) + } + } + + /// Wite an optional `ElementDataAckSeq?` sequence to the stream. + /// + /// - parameter ostr: `Ice.OuputStream` - The stream to write to. + /// + /// - parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `ElementDataAckSeq` The sequence value to write to the stream. + public static func write(to ostr: Ice.OutputStream, tag: Swift.Int32, value v: ElementDataAckSeq?) { + guard let val = v else { + return + } + if ostr.writeOptional(tag: tag, format: .FSize) { + let pos = ostr.startSize() + write(to: ostr, value: val) + ostr.endSize(position: pos) + } + } +} + +public class ElementSpecAck { + /// The readers or writers associated with the key or filter. + public var elements: ElementDataAckSeq = ElementDataAckSeq() + /// The id of the key or filter. + public var id: Swift.Int64 = 0 + /// The name of the filter. + public var name: Swift.String = "" + /// The key or filter value. + public var value: ByteSeq = ByteSeq() + /// The id of the key or filter on the peer. + public var peerId: Swift.Int64 = 0 + /// The name of the filter on the peer. + public var peerName: Swift.String = "" + + public init() {} + + public init(elements: ElementDataAckSeq, id: Swift.Int64, name: Swift.String, value: ByteSeq, peerId: Swift.Int64, peerName: Swift.String) { + self.elements = elements + self.id = id + self.name = name + self.value = value + self.peerId = peerId + self.peerName = peerName + } +} + +/// An `Ice.InputStream` extension to read `ElementSpecAck` structured values from the stream. +public extension Ice.InputStream { + /// Read a `ElementSpecAck` structured value from the stream. + /// + /// - returns: `ElementSpecAck` - The structured value read from the stream. + func read() throws -> ElementSpecAck { + let v = ElementSpecAck() + v.elements = try ElementDataAckSeqHelper.read(from: self) + v.id = try self.read() + v.name = try self.read() + v.value = try self.read() + v.peerId = try self.read() + v.peerName = try self.read() + return v + } + + /// Read an optional `ElementSpecAck?` structured value from the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `ElementSpecAck?` - The structured value read from the stream. + func read(tag: Swift.Int32) throws -> ElementSpecAck? { + guard try readOptional(tag: tag, expectedFormat: .FSize) else { + return nil + } + try skip(4) + return try read() as ElementSpecAck + } +} + +/// An `Ice.OutputStream` extension to write `ElementSpecAck` structured values from the stream. +public extension Ice.OutputStream { + /// Write a `ElementSpecAck` structured value to the stream. + /// + /// - parameter _: `ElementSpecAck` - The value to write to the stream. + func write(_ v: ElementSpecAck) { + ElementDataAckSeqHelper.write(to: self, value: v.elements) + self.write(v.id) + self.write(v.name) + self.write(v.value) + self.write(v.peerId) + self.write(v.peerName) + } + + /// Write an optional `ElementSpecAck?` structured value to the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `ElementSpecAck?` - The value to write to the stream. + func write(tag: Swift.Int32, value: ElementSpecAck?) { + if let v = value { + if writeOptional(tag: tag, format: .FSize) { + let pos = startSize() + write(v) + endSize(position: pos) + } + } + } +} + +public typealias ElementSpecAckSeq = [ElementSpecAck] + +/// Helper class to read and write `ElementSpecAckSeq` sequence values from +/// `Ice.InputStream` and `Ice.OutputStream`. +public struct ElementSpecAckSeqHelper { + /// Read a `ElementSpecAckSeq` sequence from the stream. + /// + /// - parameter istr: `Ice.InputStream` - The stream to read from. + /// + /// - returns: `ElementSpecAckSeq` - The sequence read from the stream. + public static func read(from istr: Ice.InputStream) throws -> ElementSpecAckSeq { + let sz = try istr.readAndCheckSeqSize(minSize: 20) + var v = ElementSpecAckSeq() + v.reserveCapacity(sz) + for _ in 0 ..< sz { + let j: ElementSpecAck = try istr.read() + v.append(j) + } + return v + } + /// Read an optional `ElementSpecAckSeq?` sequence from the stream. + /// + /// - parameter istr: `Ice.InputStream` - The stream to read from. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `ElementSpecAckSeq` - The sequence read from the stream. + public static func read(from istr: Ice.InputStream, tag: Swift.Int32) throws -> ElementSpecAckSeq? { + guard try istr.readOptional(tag: tag, expectedFormat: .FSize) else { + return nil + } + try istr.skip(4) + return try read(from: istr) + } + + /// Wite a `ElementSpecAckSeq` sequence to the stream. + /// + /// - parameter ostr: `Ice.OuputStream` - The stream to write to. + /// + /// - parameter value: `ElementSpecAckSeq` - The sequence value to write to the stream. + public static func write(to ostr: Ice.OutputStream, value v: ElementSpecAckSeq) { + ostr.write(size: v.count) + for item in v { + ostr.write(item) + } + } + + /// Wite an optional `ElementSpecAckSeq?` sequence to the stream. + /// + /// - parameter ostr: `Ice.OuputStream` - The stream to write to. + /// + /// - parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `ElementSpecAckSeq` The sequence value to write to the stream. + public static func write(to ostr: Ice.OutputStream, tag: Swift.Int32, value v: ElementSpecAckSeq?) { + guard let val = v else { + return + } + if ostr.writeOptional(tag: tag, format: .FSize) { + let pos = ostr.startSize() + write(to: ostr, value: val) + ostr.endSize(position: pos) + } + } +} + +/// Traits for Slice interface`Session`. +public struct SessionTraits: Ice.SliceTraits { + public static let staticIds = ["::DataStormContract::Session", "::Ice::Object"] + public static let staticId = "::DataStormContract::Session" +} + +/// Traits for Slice interface`PublisherSession`. +public struct PublisherSessionTraits: Ice.SliceTraits { + public static let staticIds = ["::DataStormContract::PublisherSession", "::DataStormContract::Session", "::Ice::Object"] + public static let staticId = "::DataStormContract::PublisherSession" +} + +/// Traits for Slice interface`SubscriberSession`. +public struct SubscriberSessionTraits: Ice.SliceTraits { + public static let staticIds = ["::DataStormContract::Session", "::DataStormContract::SubscriberSession", "::Ice::Object"] + public static let staticId = "::DataStormContract::SubscriberSession" +} + +/// Traits for Slice interface`Node`. +public struct NodeTraits: Ice.SliceTraits { + public static let staticIds = ["::DataStormContract::Node", "::Ice::Object"] + public static let staticId = "::DataStormContract::Node" +} + +/// Traits for Slice interface`Lookup`. +public struct LookupTraits: Ice.SliceTraits { + public static let staticIds = ["::DataStormContract::Lookup", "::Ice::Object"] + public static let staticId = "::DataStormContract::Lookup" +} + +/// SessionPrx overview. +/// +/// SessionPrx Methods: +/// +/// - announceTopics: +/// +/// - announceTopicsAsync: +/// +/// - attachTopic: +/// +/// - attachTopicAsync: +/// +/// - detachTopic: +/// +/// - detachTopicAsync: +/// +/// - attachTags: +/// +/// - attachTagsAsync: +/// +/// - detachTags: +/// +/// - detachTagsAsync: +/// +/// - announceElements: +/// +/// - announceElementsAsync: +/// +/// - attachElements: +/// +/// - attachElementsAsync: +/// +/// - attachElementsAck: +/// +/// - attachElementsAckAsync: +/// +/// - detachElements: +/// +/// - detachElementsAsync: +/// +/// - initSamples: +/// +/// - initSamplesAsync: +/// +/// - disconnected: +/// +/// - disconnectedAsync: +public protocol SessionPrx: Ice.ObjectPrx {} + +private final class SessionPrxI: Ice.ObjectPrxI, SessionPrx { + public override class func ice_staticId() -> Swift.String { + return SessionTraits.staticId + } +} + +/// Makes a new proxy from a communicator and a proxy string. +/// +/// - Parameters: +/// - communicator: The communicator of the new proxy. +/// - proxyString: The proxy string to parse. +/// - type: The type of the new proxy. +/// - Throws: `Ice.ParseException` if the proxy string is invalid. +/// - Returns: A new proxy with the requested type. +public func makeProxy(communicator: Ice.Communicator, proxyString: String, type: SessionPrx.Protocol) throws -> SessionPrx { + try communicator.makeProxyImpl(proxyString) as SessionPrxI +} + +/// Casts a proxy to the requested type. This call contacts the server and verifies that the object +/// implements this type. +/// +/// It will throw a local exception if a communication error occurs. You can optionally supply a +/// facet name and a context map. +/// +/// - parameter prx: `Ice.ObjectPrx` - The proxy to be cast. +/// +/// - parameter type: `SessionPrx.Protocol` - The proxy type to cast to. +/// +/// - parameter facet: `String` - The optional name of the desired facet. +/// +/// - parameter context: `Ice.Context` The optional context dictionary for the remote invocation. +/// +/// - returns: `SessionPrx` - A proxy with the requested type or nil if the objet does not +/// support this type. +/// +/// - throws: `Ice.LocalException` if a communication error occurs. +public func checkedCast(prx: Ice.ObjectPrx, type: SessionPrx.Protocol, facet: Swift.String? = nil, context: Ice.Context? = nil) async throws -> SessionPrx? { + return try await SessionPrxI.checkedCast(prx: prx, facet: facet, context: context) as SessionPrxI? +} + +/// Downcasts the given proxy to this type without contacting the remote server. +/// +/// - parameter prx: `Ice.ObjectPrx` The proxy to be cast. +/// +/// - parameter type: `SessionPrx.Protocol` - The proxy type to cast to. +/// +/// - parameter facet: `String` - The optional name of the desired facet +/// +/// - returns: `SessionPrx` - A proxy with the requested type +public func uncheckedCast(prx: Ice.ObjectPrx, type: SessionPrx.Protocol, facet: Swift.String? = nil) -> SessionPrx { + return SessionPrxI.uncheckedCast(prx: prx, facet: facet) as SessionPrxI +} + +/// Returns the Slice type id of the interface associated with this proxy type. +/// +/// parameter type: `SessionPrx.Protocol` - The proxy type to retrieve the type id. +/// +/// returns: `String` - The type id of the interface associated with this proxy type. +public func ice_staticId(_ type: SessionPrx.Protocol) -> Swift.String { + return SessionTraits.staticId +} + +/// Extension to `Ice.InputStream` class to support reading proxy of type +/// `SessionPrx`. +public extension Ice.InputStream { + /// Extracts a proxy from the stream. The stream must have been initialized with a communicator. + /// + /// - parameter type: `SessionPrx.Protocol` - The type of the proxy to be extracted. + /// + /// - returns: `SessionPrx?` - The extracted proxy + func read(_ type: SessionPrx.Protocol) throws -> SessionPrx? { + return try read() as SessionPrxI? + } + /// Extracts a proxy from the stream. The stream must have been initialized with a communicator. + /// + /// - parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// - parameter type: `SessionPrx.Protocol` - The type of the proxy to be extracted. + /// + /// - returns: `SessionPrx` - The extracted proxy. + func read(tag: Swift.Int32, type: SessionPrx.Protocol) throws -> SessionPrx? { + return try read(tag: tag) as SessionPrxI? + } +} + +/// SessionPrx overview. +/// +/// SessionPrx Methods: +/// +/// - announceTopics: +/// +/// - announceTopicsAsync: +/// +/// - attachTopic: +/// +/// - attachTopicAsync: +/// +/// - detachTopic: +/// +/// - detachTopicAsync: +/// +/// - attachTags: +/// +/// - attachTagsAsync: +/// +/// - detachTags: +/// +/// - detachTagsAsync: +/// +/// - announceElements: +/// +/// - announceElementsAsync: +/// +/// - attachElements: +/// +/// - attachElementsAsync: +/// +/// - attachElementsAck: +/// +/// - attachElementsAckAsync: +/// +/// - detachElements: +/// +/// - detachElementsAsync: +/// +/// - initSamples: +/// +/// - initSamplesAsync: +/// +/// - disconnected: +/// +/// - disconnectedAsync: +public extension SessionPrx { + /// + /// - parameter topics: `TopicInfoSeq` + /// + /// - parameter initialize: `Swift.Bool` + /// + /// - parameter context: `Ice.Context` - Optional request context. + func announceTopics(topics iceP_topics: TopicInfoSeq, initialize iceP_initialize: Swift.Bool, context: Ice.Context? = nil) async throws -> Swift.Void { + return try await _impl._invoke(operation: "announceTopics", + mode: .Normal, + write: { ostr in + TopicInfoSeqHelper.write(to: ostr, value: iceP_topics) + ostr.write(iceP_initialize) + }, + context: context) + } + + /// + /// - parameter _: `TopicSpec` + /// + /// - parameter context: `Ice.Context` - Optional request context. + func attachTopic(_ iceP_topic: TopicSpec, context: Ice.Context? = nil) async throws -> Swift.Void { + return try await _impl._invoke(operation: "attachTopic", + mode: .Normal, + write: { ostr in + ostr.write(iceP_topic) + }, + context: context) + } + + /// + /// - parameter _: `Swift.Int64` + /// + /// - parameter context: `Ice.Context` - Optional request context. + func detachTopic(_ iceP_topic: Swift.Int64, context: Ice.Context? = nil) async throws -> Swift.Void { + return try await _impl._invoke(operation: "detachTopic", + mode: .Normal, + write: { ostr in + ostr.write(iceP_topic) + }, + context: context) + } + + /// + /// - parameter topic: `Swift.Int64` + /// + /// - parameter tags: `ElementInfoSeq` + /// + /// - parameter initialize: `Swift.Bool` + /// + /// - parameter context: `Ice.Context` - Optional request context. + func attachTags(topic iceP_topic: Swift.Int64, tags iceP_tags: ElementInfoSeq, initialize iceP_initialize: Swift.Bool, context: Ice.Context? = nil) async throws -> Swift.Void { + return try await _impl._invoke(operation: "attachTags", + mode: .Normal, + write: { ostr in + ostr.write(iceP_topic) + ElementInfoSeqHelper.write(to: ostr, value: iceP_tags) + ostr.write(iceP_initialize) + }, + context: context) + } + + /// + /// - parameter topic: `Swift.Int64` + /// + /// - parameter tags: `LongSeq` + /// + /// - parameter context: `Ice.Context` - Optional request context. + func detachTags(topic iceP_topic: Swift.Int64, tags iceP_tags: LongSeq, context: Ice.Context? = nil) async throws -> Swift.Void { + return try await _impl._invoke(operation: "detachTags", + mode: .Normal, + write: { ostr in + ostr.write(iceP_topic) + ostr.write(iceP_tags) + }, + context: context) + } + + /// + /// - parameter topic: `Swift.Int64` + /// + /// - parameter keys: `ElementInfoSeq` + /// + /// - parameter context: `Ice.Context` - Optional request context. + func announceElements(topic iceP_topic: Swift.Int64, keys iceP_keys: ElementInfoSeq, context: Ice.Context? = nil) async throws -> Swift.Void { + return try await _impl._invoke(operation: "announceElements", + mode: .Normal, + write: { ostr in + ostr.write(iceP_topic) + ElementInfoSeqHelper.write(to: ostr, value: iceP_keys) + }, + context: context) + } + + /// + /// - parameter topic: `Swift.Int64` + /// + /// - parameter elements: `ElementSpecSeq` + /// + /// - parameter initialize: `Swift.Bool` + /// + /// - parameter context: `Ice.Context` - Optional request context. + func attachElements(topic iceP_topic: Swift.Int64, elements iceP_elements: ElementSpecSeq, initialize iceP_initialize: Swift.Bool, context: Ice.Context? = nil) async throws -> Swift.Void { + return try await _impl._invoke(operation: "attachElements", + mode: .Normal, + write: { ostr in + ostr.write(iceP_topic) + ElementSpecSeqHelper.write(to: ostr, value: iceP_elements) + ostr.write(iceP_initialize) + ostr.writePendingValues() + }, + context: context) + } + + /// + /// - parameter topic: `Swift.Int64` + /// + /// - parameter elements: `ElementSpecAckSeq` + /// + /// - parameter context: `Ice.Context` - Optional request context. + func attachElementsAck(topic iceP_topic: Swift.Int64, elements iceP_elements: ElementSpecAckSeq, context: Ice.Context? = nil) async throws -> Swift.Void { + return try await _impl._invoke(operation: "attachElementsAck", + mode: .Normal, + write: { ostr in + ostr.write(iceP_topic) + ElementSpecAckSeqHelper.write(to: ostr, value: iceP_elements) + ostr.writePendingValues() + }, + context: context) + } + + /// + /// - parameter topic: `Swift.Int64` + /// + /// - parameter keys: `LongSeq` + /// + /// - parameter context: `Ice.Context` - Optional request context. + func detachElements(topic iceP_topic: Swift.Int64, keys iceP_keys: LongSeq, context: Ice.Context? = nil) async throws -> Swift.Void { + return try await _impl._invoke(operation: "detachElements", + mode: .Normal, + write: { ostr in + ostr.write(iceP_topic) + ostr.write(iceP_keys) + }, + context: context) + } + + /// + /// - parameter topic: `Swift.Int64` + /// + /// - parameter samples: `DataSamplesSeq` + /// + /// - parameter context: `Ice.Context` - Optional request context. + func initSamples(topic iceP_topic: Swift.Int64, samples iceP_samples: DataSamplesSeq, context: Ice.Context? = nil) async throws -> Swift.Void { + return try await _impl._invoke(operation: "initSamples", + mode: .Normal, + write: { ostr in + ostr.write(iceP_topic) + DataSamplesSeqHelper.write(to: ostr, value: iceP_samples) + }, + context: context) + } + + /// + /// - parameter context: `Ice.Context` - Optional request context. + func disconnected(context: Ice.Context? = nil) async throws -> Swift.Void { + return try await _impl._invoke(operation: "disconnected", + mode: .Normal, + context: context) + } +} + +/// PublisherSessionPrx overview. +public protocol PublisherSessionPrx: SessionPrx {} + +private final class PublisherSessionPrxI: Ice.ObjectPrxI, PublisherSessionPrx { + public override class func ice_staticId() -> Swift.String { + return PublisherSessionTraits.staticId + } +} + +/// Makes a new proxy from a communicator and a proxy string. +/// +/// - Parameters: +/// - communicator: The communicator of the new proxy. +/// - proxyString: The proxy string to parse. +/// - type: The type of the new proxy. +/// - Throws: `Ice.ParseException` if the proxy string is invalid. +/// - Returns: A new proxy with the requested type. +public func makeProxy(communicator: Ice.Communicator, proxyString: String, type: PublisherSessionPrx.Protocol) throws -> PublisherSessionPrx { + try communicator.makeProxyImpl(proxyString) as PublisherSessionPrxI +} + +/// Casts a proxy to the requested type. This call contacts the server and verifies that the object +/// implements this type. +/// +/// It will throw a local exception if a communication error occurs. You can optionally supply a +/// facet name and a context map. +/// +/// - parameter prx: `Ice.ObjectPrx` - The proxy to be cast. +/// +/// - parameter type: `PublisherSessionPrx.Protocol` - The proxy type to cast to. +/// +/// - parameter facet: `String` - The optional name of the desired facet. +/// +/// - parameter context: `Ice.Context` The optional context dictionary for the remote invocation. +/// +/// - returns: `PublisherSessionPrx` - A proxy with the requested type or nil if the objet does not +/// support this type. +/// +/// - throws: `Ice.LocalException` if a communication error occurs. +public func checkedCast(prx: Ice.ObjectPrx, type: PublisherSessionPrx.Protocol, facet: Swift.String? = nil, context: Ice.Context? = nil) async throws -> PublisherSessionPrx? { + return try await PublisherSessionPrxI.checkedCast(prx: prx, facet: facet, context: context) as PublisherSessionPrxI? +} + +/// Downcasts the given proxy to this type without contacting the remote server. +/// +/// - parameter prx: `Ice.ObjectPrx` The proxy to be cast. +/// +/// - parameter type: `PublisherSessionPrx.Protocol` - The proxy type to cast to. +/// +/// - parameter facet: `String` - The optional name of the desired facet +/// +/// - returns: `PublisherSessionPrx` - A proxy with the requested type +public func uncheckedCast(prx: Ice.ObjectPrx, type: PublisherSessionPrx.Protocol, facet: Swift.String? = nil) -> PublisherSessionPrx { + return PublisherSessionPrxI.uncheckedCast(prx: prx, facet: facet) as PublisherSessionPrxI +} + +/// Returns the Slice type id of the interface associated with this proxy type. +/// +/// parameter type: `PublisherSessionPrx.Protocol` - The proxy type to retrieve the type id. +/// +/// returns: `String` - The type id of the interface associated with this proxy type. +public func ice_staticId(_ type: PublisherSessionPrx.Protocol) -> Swift.String { + return PublisherSessionTraits.staticId +} + +/// Extension to `Ice.InputStream` class to support reading proxy of type +/// `PublisherSessionPrx`. +public extension Ice.InputStream { + /// Extracts a proxy from the stream. The stream must have been initialized with a communicator. + /// + /// - parameter type: `PublisherSessionPrx.Protocol` - The type of the proxy to be extracted. + /// + /// - returns: `PublisherSessionPrx?` - The extracted proxy + func read(_ type: PublisherSessionPrx.Protocol) throws -> PublisherSessionPrx? { + return try read() as PublisherSessionPrxI? + } + /// Extracts a proxy from the stream. The stream must have been initialized with a communicator. + /// + /// - parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// - parameter type: `PublisherSessionPrx.Protocol` - The type of the proxy to be extracted. + /// + /// - returns: `PublisherSessionPrx` - The extracted proxy. + func read(tag: Swift.Int32, type: PublisherSessionPrx.Protocol) throws -> PublisherSessionPrx? { + return try read(tag: tag) as PublisherSessionPrxI? + } +} + +/// PublisherSessionPrx overview. +public extension PublisherSessionPrx {} + +/// SubscriberSessionPrx overview. +/// +/// SubscriberSessionPrx Methods: +/// +/// - s: +/// +/// - sAsync: +public protocol SubscriberSessionPrx: SessionPrx {} + +private final class SubscriberSessionPrxI: Ice.ObjectPrxI, SubscriberSessionPrx { + public override class func ice_staticId() -> Swift.String { + return SubscriberSessionTraits.staticId + } +} + +/// Makes a new proxy from a communicator and a proxy string. +/// +/// - Parameters: +/// - communicator: The communicator of the new proxy. +/// - proxyString: The proxy string to parse. +/// - type: The type of the new proxy. +/// - Throws: `Ice.ParseException` if the proxy string is invalid. +/// - Returns: A new proxy with the requested type. +public func makeProxy(communicator: Ice.Communicator, proxyString: String, type: SubscriberSessionPrx.Protocol) throws -> SubscriberSessionPrx { + try communicator.makeProxyImpl(proxyString) as SubscriberSessionPrxI +} + +/// Casts a proxy to the requested type. This call contacts the server and verifies that the object +/// implements this type. +/// +/// It will throw a local exception if a communication error occurs. You can optionally supply a +/// facet name and a context map. +/// +/// - parameter prx: `Ice.ObjectPrx` - The proxy to be cast. +/// +/// - parameter type: `SubscriberSessionPrx.Protocol` - The proxy type to cast to. +/// +/// - parameter facet: `String` - The optional name of the desired facet. +/// +/// - parameter context: `Ice.Context` The optional context dictionary for the remote invocation. +/// +/// - returns: `SubscriberSessionPrx` - A proxy with the requested type or nil if the objet does not +/// support this type. +/// +/// - throws: `Ice.LocalException` if a communication error occurs. +public func checkedCast(prx: Ice.ObjectPrx, type: SubscriberSessionPrx.Protocol, facet: Swift.String? = nil, context: Ice.Context? = nil) async throws -> SubscriberSessionPrx? { + return try await SubscriberSessionPrxI.checkedCast(prx: prx, facet: facet, context: context) as SubscriberSessionPrxI? +} + +/// Downcasts the given proxy to this type without contacting the remote server. +/// +/// - parameter prx: `Ice.ObjectPrx` The proxy to be cast. +/// +/// - parameter type: `SubscriberSessionPrx.Protocol` - The proxy type to cast to. +/// +/// - parameter facet: `String` - The optional name of the desired facet +/// +/// - returns: `SubscriberSessionPrx` - A proxy with the requested type +public func uncheckedCast(prx: Ice.ObjectPrx, type: SubscriberSessionPrx.Protocol, facet: Swift.String? = nil) -> SubscriberSessionPrx { + return SubscriberSessionPrxI.uncheckedCast(prx: prx, facet: facet) as SubscriberSessionPrxI +} + +/// Returns the Slice type id of the interface associated with this proxy type. +/// +/// parameter type: `SubscriberSessionPrx.Protocol` - The proxy type to retrieve the type id. +/// +/// returns: `String` - The type id of the interface associated with this proxy type. +public func ice_staticId(_ type: SubscriberSessionPrx.Protocol) -> Swift.String { + return SubscriberSessionTraits.staticId +} + +/// Extension to `Ice.InputStream` class to support reading proxy of type +/// `SubscriberSessionPrx`. +public extension Ice.InputStream { + /// Extracts a proxy from the stream. The stream must have been initialized with a communicator. + /// + /// - parameter type: `SubscriberSessionPrx.Protocol` - The type of the proxy to be extracted. + /// + /// - returns: `SubscriberSessionPrx?` - The extracted proxy + func read(_ type: SubscriberSessionPrx.Protocol) throws -> SubscriberSessionPrx? { + return try read() as SubscriberSessionPrxI? + } + /// Extracts a proxy from the stream. The stream must have been initialized with a communicator. + /// + /// - parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// - parameter type: `SubscriberSessionPrx.Protocol` - The type of the proxy to be extracted. + /// + /// - returns: `SubscriberSessionPrx` - The extracted proxy. + func read(tag: Swift.Int32, type: SubscriberSessionPrx.Protocol) throws -> SubscriberSessionPrx? { + return try read(tag: tag) as SubscriberSessionPrxI? + } +} + +/// SubscriberSessionPrx overview. +/// +/// SubscriberSessionPrx Methods: +/// +/// - s: +/// +/// - sAsync: +public extension SubscriberSessionPrx { + /// + /// - parameter topicId: `Swift.Int64` + /// + /// - parameter elementId: `Swift.Int64` + /// + /// - parameter sample: `DataSample` + /// + /// - parameter context: `Ice.Context` - Optional request context. + func s(topicId iceP_topicId: Swift.Int64, elementId iceP_elementId: Swift.Int64, sample iceP_sample: DataSample, context: Ice.Context? = nil) async throws -> Swift.Void { + return try await _impl._invoke(operation: "s", + mode: .Normal, + write: { ostr in + ostr.write(iceP_topicId) + ostr.write(iceP_elementId) + ostr.write(iceP_sample) + }, + context: context) + } +} + +/// NodePrx overview. +/// +/// NodePrx Methods: +/// +/// - initiateCreateSession: +/// +/// - initiateCreateSessionAsync: +/// +/// - createSession: +/// +/// - createSessionAsync: +/// +/// - confirmCreateSession: +/// +/// - confirmCreateSessionAsync: +public protocol NodePrx: Ice.ObjectPrx {} + +private final class NodePrxI: Ice.ObjectPrxI, NodePrx { + public override class func ice_staticId() -> Swift.String { + return NodeTraits.staticId + } +} + +/// Makes a new proxy from a communicator and a proxy string. +/// +/// - Parameters: +/// - communicator: The communicator of the new proxy. +/// - proxyString: The proxy string to parse. +/// - type: The type of the new proxy. +/// - Throws: `Ice.ParseException` if the proxy string is invalid. +/// - Returns: A new proxy with the requested type. +public func makeProxy(communicator: Ice.Communicator, proxyString: String, type: NodePrx.Protocol) throws -> NodePrx { + try communicator.makeProxyImpl(proxyString) as NodePrxI +} + +/// Casts a proxy to the requested type. This call contacts the server and verifies that the object +/// implements this type. +/// +/// It will throw a local exception if a communication error occurs. You can optionally supply a +/// facet name and a context map. +/// +/// - parameter prx: `Ice.ObjectPrx` - The proxy to be cast. +/// +/// - parameter type: `NodePrx.Protocol` - The proxy type to cast to. +/// +/// - parameter facet: `String` - The optional name of the desired facet. +/// +/// - parameter context: `Ice.Context` The optional context dictionary for the remote invocation. +/// +/// - returns: `NodePrx` - A proxy with the requested type or nil if the objet does not +/// support this type. +/// +/// - throws: `Ice.LocalException` if a communication error occurs. +public func checkedCast(prx: Ice.ObjectPrx, type: NodePrx.Protocol, facet: Swift.String? = nil, context: Ice.Context? = nil) async throws -> NodePrx? { + return try await NodePrxI.checkedCast(prx: prx, facet: facet, context: context) as NodePrxI? +} + +/// Downcasts the given proxy to this type without contacting the remote server. +/// +/// - parameter prx: `Ice.ObjectPrx` The proxy to be cast. +/// +/// - parameter type: `NodePrx.Protocol` - The proxy type to cast to. +/// +/// - parameter facet: `String` - The optional name of the desired facet +/// +/// - returns: `NodePrx` - A proxy with the requested type +public func uncheckedCast(prx: Ice.ObjectPrx, type: NodePrx.Protocol, facet: Swift.String? = nil) -> NodePrx { + return NodePrxI.uncheckedCast(prx: prx, facet: facet) as NodePrxI +} + +/// Returns the Slice type id of the interface associated with this proxy type. +/// +/// parameter type: `NodePrx.Protocol` - The proxy type to retrieve the type id. +/// +/// returns: `String` - The type id of the interface associated with this proxy type. +public func ice_staticId(_ type: NodePrx.Protocol) -> Swift.String { + return NodeTraits.staticId +} + +/// Extension to `Ice.InputStream` class to support reading proxy of type +/// `NodePrx`. +public extension Ice.InputStream { + /// Extracts a proxy from the stream. The stream must have been initialized with a communicator. + /// + /// - parameter type: `NodePrx.Protocol` - The type of the proxy to be extracted. + /// + /// - returns: `NodePrx?` - The extracted proxy + func read(_ type: NodePrx.Protocol) throws -> NodePrx? { + return try read() as NodePrxI? + } + /// Extracts a proxy from the stream. The stream must have been initialized with a communicator. + /// + /// - parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// - parameter type: `NodePrx.Protocol` - The type of the proxy to be extracted. + /// + /// - returns: `NodePrx` - The extracted proxy. + func read(tag: Swift.Int32, type: NodePrx.Protocol) throws -> NodePrx? { + return try read(tag: tag) as NodePrxI? + } +} + +/// NodePrx overview. +/// +/// NodePrx Methods: +/// +/// - initiateCreateSession: +/// +/// - initiateCreateSessionAsync: +/// +/// - createSession: +/// +/// - createSessionAsync: +/// +/// - confirmCreateSession: +/// +/// - confirmCreateSessionAsync: +public extension NodePrx { + /// + /// - parameter _: `NodePrx?` + /// + /// - parameter context: `Ice.Context` - Optional request context. + func initiateCreateSession(_ iceP_publisher: NodePrx?, context: Ice.Context? = nil) async throws -> Swift.Void { + return try await _impl._invoke(operation: "initiateCreateSession", + mode: .Normal, + write: { ostr in + ostr.write(iceP_publisher) + }, + context: context) + } + + /// + /// - parameter subscriber: `NodePrx?` + /// + /// - parameter session: `SubscriberSessionPrx?` + /// + /// - parameter fromRelay: `Swift.Bool` + /// + /// - parameter context: `Ice.Context` - Optional request context. + func createSession(subscriber iceP_subscriber: NodePrx?, session iceP_session: SubscriberSessionPrx?, fromRelay iceP_fromRelay: Swift.Bool, context: Ice.Context? = nil) async throws -> Swift.Void { + return try await _impl._invoke(operation: "createSession", + mode: .Normal, + write: { ostr in + ostr.write(iceP_subscriber) + ostr.write(iceP_session) + ostr.write(iceP_fromRelay) + }, + context: context) + } + + /// + /// - parameter publisher: `NodePrx?` + /// + /// - parameter session: `PublisherSessionPrx?` + /// + /// - parameter context: `Ice.Context` - Optional request context. + func confirmCreateSession(publisher iceP_publisher: NodePrx?, session iceP_session: PublisherSessionPrx?, context: Ice.Context? = nil) async throws -> Swift.Void { + return try await _impl._invoke(operation: "confirmCreateSession", + mode: .Normal, + write: { ostr in + ostr.write(iceP_publisher) + ostr.write(iceP_session) + }, + context: context) + } +} + +/// LookupPrx overview. +/// +/// LookupPrx Methods: +/// +/// - announceTopicReader: +/// +/// - announceTopicReaderAsync: +/// +/// - announceTopicWriter: +/// +/// - announceTopicWriterAsync: +/// +/// - announceTopics: +/// +/// - announceTopicsAsync: +/// +/// - createSession: +/// +/// - createSessionAsync: +public protocol LookupPrx: Ice.ObjectPrx {} + +private final class LookupPrxI: Ice.ObjectPrxI, LookupPrx { + public override class func ice_staticId() -> Swift.String { + return LookupTraits.staticId + } +} + +/// Makes a new proxy from a communicator and a proxy string. +/// +/// - Parameters: +/// - communicator: The communicator of the new proxy. +/// - proxyString: The proxy string to parse. +/// - type: The type of the new proxy. +/// - Throws: `Ice.ParseException` if the proxy string is invalid. +/// - Returns: A new proxy with the requested type. +public func makeProxy(communicator: Ice.Communicator, proxyString: String, type: LookupPrx.Protocol) throws -> LookupPrx { + try communicator.makeProxyImpl(proxyString) as LookupPrxI +} + +/// Casts a proxy to the requested type. This call contacts the server and verifies that the object +/// implements this type. +/// +/// It will throw a local exception if a communication error occurs. You can optionally supply a +/// facet name and a context map. +/// +/// - parameter prx: `Ice.ObjectPrx` - The proxy to be cast. +/// +/// - parameter type: `LookupPrx.Protocol` - The proxy type to cast to. +/// +/// - parameter facet: `String` - The optional name of the desired facet. +/// +/// - parameter context: `Ice.Context` The optional context dictionary for the remote invocation. +/// +/// - returns: `LookupPrx` - A proxy with the requested type or nil if the objet does not +/// support this type. +/// +/// - throws: `Ice.LocalException` if a communication error occurs. +public func checkedCast(prx: Ice.ObjectPrx, type: LookupPrx.Protocol, facet: Swift.String? = nil, context: Ice.Context? = nil) async throws -> LookupPrx? { + return try await LookupPrxI.checkedCast(prx: prx, facet: facet, context: context) as LookupPrxI? +} + +/// Downcasts the given proxy to this type without contacting the remote server. +/// +/// - parameter prx: `Ice.ObjectPrx` The proxy to be cast. +/// +/// - parameter type: `LookupPrx.Protocol` - The proxy type to cast to. +/// +/// - parameter facet: `String` - The optional name of the desired facet +/// +/// - returns: `LookupPrx` - A proxy with the requested type +public func uncheckedCast(prx: Ice.ObjectPrx, type: LookupPrx.Protocol, facet: Swift.String? = nil) -> LookupPrx { + return LookupPrxI.uncheckedCast(prx: prx, facet: facet) as LookupPrxI +} + +/// Returns the Slice type id of the interface associated with this proxy type. +/// +/// parameter type: `LookupPrx.Protocol` - The proxy type to retrieve the type id. +/// +/// returns: `String` - The type id of the interface associated with this proxy type. +public func ice_staticId(_ type: LookupPrx.Protocol) -> Swift.String { + return LookupTraits.staticId +} + +/// Extension to `Ice.InputStream` class to support reading proxy of type +/// `LookupPrx`. +public extension Ice.InputStream { + /// Extracts a proxy from the stream. The stream must have been initialized with a communicator. + /// + /// - parameter type: `LookupPrx.Protocol` - The type of the proxy to be extracted. + /// + /// - returns: `LookupPrx?` - The extracted proxy + func read(_ type: LookupPrx.Protocol) throws -> LookupPrx? { + return try read() as LookupPrxI? + } + /// Extracts a proxy from the stream. The stream must have been initialized with a communicator. + /// + /// - parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// - parameter type: `LookupPrx.Protocol` - The type of the proxy to be extracted. + /// + /// - returns: `LookupPrx` - The extracted proxy. + func read(tag: Swift.Int32, type: LookupPrx.Protocol) throws -> LookupPrx? { + return try read(tag: tag) as LookupPrxI? + } +} + +/// LookupPrx overview. +/// +/// LookupPrx Methods: +/// +/// - announceTopicReader: +/// +/// - announceTopicReaderAsync: +/// +/// - announceTopicWriter: +/// +/// - announceTopicWriterAsync: +/// +/// - announceTopics: +/// +/// - announceTopicsAsync: +/// +/// - createSession: +/// +/// - createSessionAsync: +public extension LookupPrx { + /// + /// - parameter topic: `Swift.String` + /// + /// - parameter node: `NodePrx?` + /// + /// - parameter context: `Ice.Context` - Optional request context. + func announceTopicReader(topic iceP_topic: Swift.String, node iceP_node: NodePrx?, context: Ice.Context? = nil) async throws -> Swift.Void { + return try await _impl._invoke(operation: "announceTopicReader", + mode: .Idempotent, + write: { ostr in + ostr.write(iceP_topic) + ostr.write(iceP_node) + }, + context: context) + } + + /// + /// - parameter topic: `Swift.String` + /// + /// - parameter node: `NodePrx?` + /// + /// - parameter context: `Ice.Context` - Optional request context. + func announceTopicWriter(topic iceP_topic: Swift.String, node iceP_node: NodePrx?, context: Ice.Context? = nil) async throws -> Swift.Void { + return try await _impl._invoke(operation: "announceTopicWriter", + mode: .Idempotent, + write: { ostr in + ostr.write(iceP_topic) + ostr.write(iceP_node) + }, + context: context) + } + + /// + /// - parameter readers: `StringSeq` + /// + /// - parameter writers: `StringSeq` + /// + /// - parameter node: `NodePrx?` + /// + /// - parameter context: `Ice.Context` - Optional request context. + func announceTopics(readers iceP_readers: StringSeq, writers iceP_writers: StringSeq, node iceP_node: NodePrx?, context: Ice.Context? = nil) async throws -> Swift.Void { + return try await _impl._invoke(operation: "announceTopics", + mode: .Idempotent, + write: { ostr in + ostr.write(iceP_readers) + ostr.write(iceP_writers) + ostr.write(iceP_node) + }, + context: context) + } + + /// + /// - parameter _: `NodePrx?` + /// + /// - parameter context: `Ice.Context` - Optional request context. + /// + /// - returns: `NodePrx?` + func createSession(_ iceP_node: NodePrx?, context: Ice.Context? = nil) async throws -> NodePrx? { + return try await _impl._invoke(operation: "createSession", + mode: .Normal, + write: { ostr in + ostr.write(iceP_node) + }, + read: { istr in + let iceP_returnValue: NodePrx? = try istr.read(NodePrx.self) + return iceP_returnValue + }, + context: context) + } +} + +/// :nodoc: +public class ElementConfig_TypeResolver: Ice.ValueTypeResolver { + public override func type() -> Ice.Value.Type { + return ElementConfig.self + } +} + +public extension Ice.TypeIdResolver { + @objc static func TypeId_1() -> Swift.String { + return "::DataStormContract::ElementConfig" + } +} + +public extension Ice.ClassResolver { + @objc static func DataStormContract_ElementConfig() -> Ice.ValueTypeResolver { + return ElementConfig_TypeResolver() + } +} + +open class ElementConfig: Ice.Value { + public var facet: Swift.String? = nil + public var sampleFilter: FilterInfo? = nil + public var name: Swift.String? = nil + public var priority: Swift.Int32? = nil + public var sampleCount: Swift.Int32? = nil + public var sampleLifetime: Swift.Int32? = nil + public var clearHistory: ClearHistoryPolicy? = nil + + public required init() {} + + public init(facet: Swift.String?, sampleFilter: FilterInfo?, name: Swift.String?, priority: Swift.Int32?, sampleCount: Swift.Int32?, sampleLifetime: Swift.Int32?, clearHistory: ClearHistoryPolicy?) { + self.facet = facet + self.sampleFilter = sampleFilter + self.name = name + self.priority = priority + self.sampleCount = sampleCount + self.sampleLifetime = sampleLifetime + self.clearHistory = clearHistory + } + + /// Returns the Slice type ID of the interface supported by this object. + /// + /// - returns: `String` - The Slice type ID of the interface supported by this object. + open override class func ice_staticId() -> Swift.String { "::DataStormContract::ElementConfig" } + + open override func _iceReadImpl(from istr: Ice.InputStream) throws { + _ = try istr.startSlice() + self.facet = try istr.read(tag: 1) + self.sampleFilter = try istr.read(tag: 2) + self.name = try istr.read(tag: 3) + self.priority = try istr.read(tag: 4) + self.sampleCount = try istr.read(tag: 10) + self.sampleLifetime = try istr.read(tag: 11) + self.clearHistory = try istr.read(tag: 12) + try istr.endSlice() + } + + open override func _iceWriteImpl(to ostr: Ice.OutputStream) { + ostr.startSlice(typeId: ElementConfig.ice_staticId(), compactId: 1, last: true) + ostr.write(tag: 1, value: self.facet) + ostr.write(tag: 2, value: self.sampleFilter) + ostr.write(tag: 3, value: self.name) + ostr.write(tag: 4, value: self.priority) + ostr.write(tag: 10, value: self.sampleCount) + ostr.write(tag: 11, value: self.sampleLifetime) + ostr.write(tag: 12, value: self.clearHistory) + ostr.endSlice() + } +} + + +/// Dispatcher for `Session` servants. +public struct SessionDisp: Ice.Dispatcher { + public let servant: Session + private static let defaultObject = Ice.ObjectI() + + public init(_ servant: Session) { + self.servant = servant + } + + public func dispatch(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + switch request.current.operation { + case "announceElements": + try await servant._iceD_announceElements(request) + case "announceTopics": + try await servant._iceD_announceTopics(request) + case "attachElements": + try await servant._iceD_attachElements(request) + case "attachElementsAck": + try await servant._iceD_attachElementsAck(request) + case "attachTags": + try await servant._iceD_attachTags(request) + case "attachTopic": + try await servant._iceD_attachTopic(request) + case "detachElements": + try await servant._iceD_detachElements(request) + case "detachTags": + try await servant._iceD_detachTags(request) + case "detachTopic": + try await servant._iceD_detachTopic(request) + case "disconnected": + try await servant._iceD_disconnected(request) + case "ice_id": + try await (servant as? Ice.Object ?? SessionDisp.defaultObject)._iceD_ice_id(request) + case "ice_ids": + try await (servant as? Ice.Object ?? SessionDisp.defaultObject)._iceD_ice_ids(request) + case "ice_isA": + try await (servant as? Ice.Object ?? SessionDisp.defaultObject)._iceD_ice_isA(request) + case "ice_ping": + try await (servant as? Ice.Object ?? SessionDisp.defaultObject)._iceD_ice_ping(request) + case "initSamples": + try await servant._iceD_initSamples(request) + default: + throw Ice.OperationNotExistException() + } + } +} + +public protocol Session { + /// + /// - parameter topics: `TopicInfoSeq` + /// + /// - parameter initialize: `Swift.Bool` + /// + /// - parameter current: `Ice.Current` - The Current object for the dispatch. + func announceTopics(topics: TopicInfoSeq, initialize: Swift.Bool, current: Ice.Current) async throws + + /// + /// - parameter topic: `TopicSpec` + /// + /// - parameter current: `Ice.Current` - The Current object for the dispatch. + func attachTopic(topic: TopicSpec, current: Ice.Current) async throws + + /// + /// - parameter topic: `Swift.Int64` + /// + /// - parameter current: `Ice.Current` - The Current object for the dispatch. + func detachTopic(topic: Swift.Int64, current: Ice.Current) async throws + + /// + /// - parameter topic: `Swift.Int64` + /// + /// - parameter tags: `ElementInfoSeq` + /// + /// - parameter initialize: `Swift.Bool` + /// + /// - parameter current: `Ice.Current` - The Current object for the dispatch. + func attachTags(topic: Swift.Int64, tags: ElementInfoSeq, initialize: Swift.Bool, current: Ice.Current) async throws + + /// + /// - parameter topic: `Swift.Int64` + /// + /// - parameter tags: `LongSeq` + /// + /// - parameter current: `Ice.Current` - The Current object for the dispatch. + func detachTags(topic: Swift.Int64, tags: LongSeq, current: Ice.Current) async throws + + /// + /// - parameter topic: `Swift.Int64` + /// + /// - parameter keys: `ElementInfoSeq` + /// + /// - parameter current: `Ice.Current` - The Current object for the dispatch. + func announceElements(topic: Swift.Int64, keys: ElementInfoSeq, current: Ice.Current) async throws + + /// + /// - parameter topic: `Swift.Int64` + /// + /// - parameter elements: `ElementSpecSeq` + /// + /// - parameter initialize: `Swift.Bool` + /// + /// - parameter current: `Ice.Current` - The Current object for the dispatch. + func attachElements(topic: Swift.Int64, elements: ElementSpecSeq, initialize: Swift.Bool, current: Ice.Current) async throws + + /// + /// - parameter topic: `Swift.Int64` + /// + /// - parameter elements: `ElementSpecAckSeq` + /// + /// - parameter current: `Ice.Current` - The Current object for the dispatch. + func attachElementsAck(topic: Swift.Int64, elements: ElementSpecAckSeq, current: Ice.Current) async throws + + /// + /// - parameter topic: `Swift.Int64` + /// + /// - parameter keys: `LongSeq` + /// + /// - parameter current: `Ice.Current` - The Current object for the dispatch. + func detachElements(topic: Swift.Int64, keys: LongSeq, current: Ice.Current) async throws + + /// + /// - parameter topic: `Swift.Int64` + /// + /// - parameter samples: `DataSamplesSeq` + /// + /// - parameter current: `Ice.Current` - The Current object for the dispatch. + func initSamples(topic: Swift.Int64, samples: DataSamplesSeq, current: Ice.Current) async throws + + /// + /// - parameter current: `Ice.Current` - The Current object for the dispatch. + func disconnected(current: Ice.Current) async throws +} + + +/// Dispatcher for `PublisherSession` servants. +public struct PublisherSessionDisp: Ice.Dispatcher { + public let servant: PublisherSession + private static let defaultObject = Ice.ObjectI() + + public init(_ servant: PublisherSession) { + self.servant = servant + } + + public func dispatch(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + switch request.current.operation { + case "announceElements": + try await servant._iceD_announceElements(request) + case "announceTopics": + try await servant._iceD_announceTopics(request) + case "attachElements": + try await servant._iceD_attachElements(request) + case "attachElementsAck": + try await servant._iceD_attachElementsAck(request) + case "attachTags": + try await servant._iceD_attachTags(request) + case "attachTopic": + try await servant._iceD_attachTopic(request) + case "detachElements": + try await servant._iceD_detachElements(request) + case "detachTags": + try await servant._iceD_detachTags(request) + case "detachTopic": + try await servant._iceD_detachTopic(request) + case "disconnected": + try await servant._iceD_disconnected(request) + case "ice_id": + try await (servant as? Ice.Object ?? PublisherSessionDisp.defaultObject)._iceD_ice_id(request) + case "ice_ids": + try await (servant as? Ice.Object ?? PublisherSessionDisp.defaultObject)._iceD_ice_ids(request) + case "ice_isA": + try await (servant as? Ice.Object ?? PublisherSessionDisp.defaultObject)._iceD_ice_isA(request) + case "ice_ping": + try await (servant as? Ice.Object ?? PublisherSessionDisp.defaultObject)._iceD_ice_ping(request) + case "initSamples": + try await servant._iceD_initSamples(request) + default: + throw Ice.OperationNotExistException() + } + } +} + +public protocol PublisherSession: Session {} + + +/// Dispatcher for `SubscriberSession` servants. +public struct SubscriberSessionDisp: Ice.Dispatcher { + public let servant: SubscriberSession + private static let defaultObject = Ice.ObjectI() + + public init(_ servant: SubscriberSession) { + self.servant = servant + } + + public func dispatch(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + switch request.current.operation { + case "announceElements": + try await servant._iceD_announceElements(request) + case "announceTopics": + try await servant._iceD_announceTopics(request) + case "attachElements": + try await servant._iceD_attachElements(request) + case "attachElementsAck": + try await servant._iceD_attachElementsAck(request) + case "attachTags": + try await servant._iceD_attachTags(request) + case "attachTopic": + try await servant._iceD_attachTopic(request) + case "detachElements": + try await servant._iceD_detachElements(request) + case "detachTags": + try await servant._iceD_detachTags(request) + case "detachTopic": + try await servant._iceD_detachTopic(request) + case "disconnected": + try await servant._iceD_disconnected(request) + case "ice_id": + try await (servant as? Ice.Object ?? SubscriberSessionDisp.defaultObject)._iceD_ice_id(request) + case "ice_ids": + try await (servant as? Ice.Object ?? SubscriberSessionDisp.defaultObject)._iceD_ice_ids(request) + case "ice_isA": + try await (servant as? Ice.Object ?? SubscriberSessionDisp.defaultObject)._iceD_ice_isA(request) + case "ice_ping": + try await (servant as? Ice.Object ?? SubscriberSessionDisp.defaultObject)._iceD_ice_ping(request) + case "initSamples": + try await servant._iceD_initSamples(request) + case "s": + try await servant._iceD_s(request) + default: + throw Ice.OperationNotExistException() + } + } +} + +public protocol SubscriberSession: Session { + /// + /// - parameter topicId: `Swift.Int64` + /// + /// - parameter elementId: `Swift.Int64` + /// + /// - parameter sample: `DataSample` + /// + /// - parameter current: `Ice.Current` - The Current object for the dispatch. + func s(topicId: Swift.Int64, elementId: Swift.Int64, sample: DataSample, current: Ice.Current) async throws +} + + +/// Dispatcher for `Node` servants. +public struct NodeDisp: Ice.Dispatcher { + public let servant: Node + private static let defaultObject = Ice.ObjectI() + + public init(_ servant: Node) { + self.servant = servant + } + + public func dispatch(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + switch request.current.operation { + case "confirmCreateSession": + try await servant._iceD_confirmCreateSession(request) + case "createSession": + try await servant._iceD_createSession(request) + case "ice_id": + try await (servant as? Ice.Object ?? NodeDisp.defaultObject)._iceD_ice_id(request) + case "ice_ids": + try await (servant as? Ice.Object ?? NodeDisp.defaultObject)._iceD_ice_ids(request) + case "ice_isA": + try await (servant as? Ice.Object ?? NodeDisp.defaultObject)._iceD_ice_isA(request) + case "ice_ping": + try await (servant as? Ice.Object ?? NodeDisp.defaultObject)._iceD_ice_ping(request) + case "initiateCreateSession": + try await servant._iceD_initiateCreateSession(request) + default: + throw Ice.OperationNotExistException() + } + } +} + +public protocol Node { + /// + /// - parameter publisher: `NodePrx?` + /// + /// - parameter current: `Ice.Current` - The Current object for the dispatch. + func initiateCreateSession(publisher: NodePrx?, current: Ice.Current) async throws + + /// + /// - parameter subscriber: `NodePrx?` + /// + /// - parameter session: `SubscriberSessionPrx?` + /// + /// - parameter fromRelay: `Swift.Bool` + /// + /// - parameter current: `Ice.Current` - The Current object for the dispatch. + func createSession(subscriber: NodePrx?, session: SubscriberSessionPrx?, fromRelay: Swift.Bool, current: Ice.Current) async throws + + /// + /// - parameter publisher: `NodePrx?` + /// + /// - parameter session: `PublisherSessionPrx?` + /// + /// - parameter current: `Ice.Current` - The Current object for the dispatch. + func confirmCreateSession(publisher: NodePrx?, session: PublisherSessionPrx?, current: Ice.Current) async throws +} + + +/// Dispatcher for `Lookup` servants. +public struct LookupDisp: Ice.Dispatcher { + public let servant: Lookup + private static let defaultObject = Ice.ObjectI() + + public init(_ servant: Lookup) { + self.servant = servant + } + + public func dispatch(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + switch request.current.operation { + case "announceTopicReader": + try await servant._iceD_announceTopicReader(request) + case "announceTopicWriter": + try await servant._iceD_announceTopicWriter(request) + case "announceTopics": + try await servant._iceD_announceTopics(request) + case "createSession": + try await servant._iceD_createSession(request) + case "ice_id": + try await (servant as? Ice.Object ?? LookupDisp.defaultObject)._iceD_ice_id(request) + case "ice_ids": + try await (servant as? Ice.Object ?? LookupDisp.defaultObject)._iceD_ice_ids(request) + case "ice_isA": + try await (servant as? Ice.Object ?? LookupDisp.defaultObject)._iceD_ice_isA(request) + case "ice_ping": + try await (servant as? Ice.Object ?? LookupDisp.defaultObject)._iceD_ice_ping(request) + default: + throw Ice.OperationNotExistException() + } + } +} + +public protocol Lookup { + /// + /// - parameter topic: `Swift.String` + /// + /// - parameter node: `NodePrx?` + /// + /// - parameter current: `Ice.Current` - The Current object for the dispatch. + func announceTopicReader(topic: Swift.String, node: NodePrx?, current: Ice.Current) async throws + + /// + /// - parameter topic: `Swift.String` + /// + /// - parameter node: `NodePrx?` + /// + /// - parameter current: `Ice.Current` - The Current object for the dispatch. + func announceTopicWriter(topic: Swift.String, node: NodePrx?, current: Ice.Current) async throws + + /// + /// - parameter readers: `StringSeq` + /// + /// - parameter writers: `StringSeq` + /// + /// - parameter node: `NodePrx?` + /// + /// - parameter current: `Ice.Current` - The Current object for the dispatch. + func announceTopics(readers: StringSeq, writers: StringSeq, node: NodePrx?, current: Ice.Current) async throws + + /// + /// - parameter node: `NodePrx?` + /// + /// - parameter current: `Ice.Current` - The Current object for the dispatch. + /// + /// - returns: `NodePrx?` + func createSession(node: NodePrx?, current: Ice.Current) async throws -> NodePrx? +} + +/// Session overview. +/// +/// Session Methods: +/// +/// - announceTopics: +/// +/// - attachTopic: +/// +/// - detachTopic: +/// +/// - attachTags: +/// +/// - detachTags: +/// +/// - announceElements: +/// +/// - attachElements: +/// +/// - attachElementsAck: +/// +/// - detachElements: +/// +/// - initSamples: +/// +/// - disconnected: +extension Session { + public func _iceD_announceTopics(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + + let istr = request.inputStream + _ = try istr.startEncapsulation() + let iceP_topics: TopicInfoSeq = try TopicInfoSeqHelper.read(from: istr) + let iceP_initialize: Swift.Bool = try istr.read() + try await self.announceTopics(topics: iceP_topics, initialize: iceP_initialize, current: request.current) + return request.current.makeEmptyOutgoingResponse() + } + + public func _iceD_attachTopic(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + + let istr = request.inputStream + _ = try istr.startEncapsulation() + let iceP_topic: TopicSpec = try istr.read() + try await self.attachTopic(topic: iceP_topic, current: request.current) + return request.current.makeEmptyOutgoingResponse() + } + + public func _iceD_detachTopic(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + + let istr = request.inputStream + _ = try istr.startEncapsulation() + let iceP_topic: Swift.Int64 = try istr.read() + try await self.detachTopic(topic: iceP_topic, current: request.current) + return request.current.makeEmptyOutgoingResponse() + } + + public func _iceD_attachTags(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + + let istr = request.inputStream + _ = try istr.startEncapsulation() + let iceP_topic: Swift.Int64 = try istr.read() + let iceP_tags: ElementInfoSeq = try ElementInfoSeqHelper.read(from: istr) + let iceP_initialize: Swift.Bool = try istr.read() + try await self.attachTags(topic: iceP_topic, tags: iceP_tags, initialize: iceP_initialize, current: request.current) + return request.current.makeEmptyOutgoingResponse() + } + + public func _iceD_detachTags(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + + let istr = request.inputStream + _ = try istr.startEncapsulation() + let iceP_topic: Swift.Int64 = try istr.read() + let iceP_tags: LongSeq = try istr.read() + try await self.detachTags(topic: iceP_topic, tags: iceP_tags, current: request.current) + return request.current.makeEmptyOutgoingResponse() + } + + public func _iceD_announceElements(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + + let istr = request.inputStream + _ = try istr.startEncapsulation() + let iceP_topic: Swift.Int64 = try istr.read() + let iceP_keys: ElementInfoSeq = try ElementInfoSeqHelper.read(from: istr) + try await self.announceElements(topic: iceP_topic, keys: iceP_keys, current: request.current) + return request.current.makeEmptyOutgoingResponse() + } + + public func _iceD_attachElements(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + + let istr = request.inputStream + _ = try istr.startEncapsulation() + let iceP_topic: Swift.Int64 = try istr.read() + let iceP_elements: ElementSpecSeq = try ElementSpecSeqHelper.read(from: istr) + let iceP_initialize: Swift.Bool = try istr.read() + try istr.readPendingValues() + try await self.attachElements(topic: iceP_topic, elements: iceP_elements, initialize: iceP_initialize, current: request.current) + return request.current.makeEmptyOutgoingResponse() + } + + public func _iceD_attachElementsAck(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + + let istr = request.inputStream + _ = try istr.startEncapsulation() + let iceP_topic: Swift.Int64 = try istr.read() + let iceP_elements: ElementSpecAckSeq = try ElementSpecAckSeqHelper.read(from: istr) + try istr.readPendingValues() + try await self.attachElementsAck(topic: iceP_topic, elements: iceP_elements, current: request.current) + return request.current.makeEmptyOutgoingResponse() + } + + public func _iceD_detachElements(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + + let istr = request.inputStream + _ = try istr.startEncapsulation() + let iceP_topic: Swift.Int64 = try istr.read() + let iceP_keys: LongSeq = try istr.read() + try await self.detachElements(topic: iceP_topic, keys: iceP_keys, current: request.current) + return request.current.makeEmptyOutgoingResponse() + } + + public func _iceD_initSamples(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + + let istr = request.inputStream + _ = try istr.startEncapsulation() + let iceP_topic: Swift.Int64 = try istr.read() + let iceP_samples: DataSamplesSeq = try DataSamplesSeqHelper.read(from: istr) + try await self.initSamples(topic: iceP_topic, samples: iceP_samples, current: request.current) + return request.current.makeEmptyOutgoingResponse() + } + + public func _iceD_disconnected(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + + _ = try request.inputStream.skipEmptyEncapsulation() + try await self.disconnected(current: request.current) + return request.current.makeEmptyOutgoingResponse() + } +} + +/// PublisherSession overview. +extension PublisherSession {} + +/// SubscriberSession overview. +/// +/// SubscriberSession Methods: +/// +/// - s: +extension SubscriberSession { + public func _iceD_s(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + + let istr = request.inputStream + _ = try istr.startEncapsulation() + let iceP_topicId: Swift.Int64 = try istr.read() + let iceP_elementId: Swift.Int64 = try istr.read() + let iceP_sample: DataSample = try istr.read() + try await self.s(topicId: iceP_topicId, elementId: iceP_elementId, sample: iceP_sample, current: request.current) + return request.current.makeEmptyOutgoingResponse() + } +} + +/// Node overview. +/// +/// Node Methods: +/// +/// - initiateCreateSession: +/// +/// - createSession: +/// +/// - confirmCreateSession: +extension Node { + public func _iceD_initiateCreateSession(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + + let istr = request.inputStream + _ = try istr.startEncapsulation() + let iceP_publisher: NodePrx? = try istr.read(NodePrx.self) + try await self.initiateCreateSession(publisher: iceP_publisher, current: request.current) + return request.current.makeEmptyOutgoingResponse() + } + + public func _iceD_createSession(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + + let istr = request.inputStream + _ = try istr.startEncapsulation() + let iceP_subscriber: NodePrx? = try istr.read(NodePrx.self) + let iceP_session: SubscriberSessionPrx? = try istr.read(SubscriberSessionPrx.self) + let iceP_fromRelay: Swift.Bool = try istr.read() + try await self.createSession(subscriber: iceP_subscriber, session: iceP_session, fromRelay: iceP_fromRelay, current: request.current) + return request.current.makeEmptyOutgoingResponse() + } + + public func _iceD_confirmCreateSession(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + + let istr = request.inputStream + _ = try istr.startEncapsulation() + let iceP_publisher: NodePrx? = try istr.read(NodePrx.self) + let iceP_session: PublisherSessionPrx? = try istr.read(PublisherSessionPrx.self) + try await self.confirmCreateSession(publisher: iceP_publisher, session: iceP_session, current: request.current) + return request.current.makeEmptyOutgoingResponse() + } +} + +/// Lookup overview. +/// +/// Lookup Methods: +/// +/// - announceTopicReader: +/// +/// - announceTopicWriter: +/// +/// - announceTopics: +/// +/// - createSession: +extension Lookup { + public func _iceD_announceTopicReader(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + + let istr = request.inputStream + _ = try istr.startEncapsulation() + let iceP_topic: Swift.String = try istr.read() + let iceP_node: NodePrx? = try istr.read(NodePrx.self) + try await self.announceTopicReader(topic: iceP_topic, node: iceP_node, current: request.current) + return request.current.makeEmptyOutgoingResponse() + } + + public func _iceD_announceTopicWriter(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + + let istr = request.inputStream + _ = try istr.startEncapsulation() + let iceP_topic: Swift.String = try istr.read() + let iceP_node: NodePrx? = try istr.read(NodePrx.self) + try await self.announceTopicWriter(topic: iceP_topic, node: iceP_node, current: request.current) + return request.current.makeEmptyOutgoingResponse() + } + + public func _iceD_announceTopics(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + + let istr = request.inputStream + _ = try istr.startEncapsulation() + let iceP_readers: StringSeq = try istr.read() + let iceP_writers: StringSeq = try istr.read() + let iceP_node: NodePrx? = try istr.read(NodePrx.self) + try await self.announceTopics(readers: iceP_readers, writers: iceP_writers, node: iceP_node, current: request.current) + return request.current.makeEmptyOutgoingResponse() + } + + public func _iceD_createSession(_ request: Ice.IncomingRequest) async throws -> Ice.OutgoingResponse { + + let istr = request.inputStream + _ = try istr.startEncapsulation() + let iceP_node: NodePrx? = try istr.read(NodePrx.self) + let result = try await self.createSession(node: iceP_node, current: request.current) + return request.current.makeOutgoingResponse(result, formatType: nil) { ostr, value in + let iceP_returnValue = value + ostr.write(iceP_returnValue) + } + } +} diff --git a/slice2swift/cpp/src/IceGrid/Internal.swift b/slice2swift/cpp/src/IceGrid/Internal.swift index 4f0a6f758b1e..aded3bfaad71 100644 --- a/slice2swift/cpp/src/IceGrid/Internal.swift +++ b/slice2swift/cpp/src/IceGrid/Internal.swift @@ -2682,10 +2682,10 @@ public extension ReplicaSessionPrx { userException:{ ex in do { throw ex - } catch let error as AdapterExistsException { - throw error } catch let error as AdapterNotExistException { throw error + } catch let error as AdapterExistsException { + throw error } catch is Ice.UserException {} }, context: context) @@ -2921,10 +2921,10 @@ public extension InternalRegistryPrx { userException:{ ex in do { throw ex - } catch let error as NodeActiveException { - throw error } catch let error as PermissionDeniedException { throw error + } catch let error as NodeActiveException { + throw error } catch is Ice.UserException {} }, context: context) diff --git a/slice2swift/cpp/test/DataStorm/api/Test.swift b/slice2swift/cpp/test/DataStorm/api/Test.swift new file mode 100644 index 000000000000..5d5afae6992d --- /dev/null +++ b/slice2swift/cpp/test/DataStorm/api/Test.swift @@ -0,0 +1,116 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +import Foundation +import Ice + +public struct StructKey: Swift.Hashable { + public var value: Swift.Int32 = 0 + + public init() {} + + public init(value: Swift.Int32) { + self.value = value + } +} + +/// An `Ice.InputStream` extension to read `StructKey` structured values from the stream. +public extension Ice.InputStream { + /// Read a `StructKey` structured value from the stream. + /// + /// - returns: `StructKey` - The structured value read from the stream. + func read() throws -> StructKey { + var v = StructKey() + v.value = try self.read() + return v + } + + /// Read an optional `StructKey?` structured value from the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `StructKey?` - The structured value read from the stream. + func read(tag: Swift.Int32) throws -> StructKey? { + guard try readOptional(tag: tag, expectedFormat: .VSize) else { + return nil + } + try skipSize() + return try read() as StructKey + } +} + +/// An `Ice.OutputStream` extension to write `StructKey` structured values from the stream. +public extension Ice.OutputStream { + /// Write a `StructKey` structured value to the stream. + /// + /// - parameter _: `StructKey` - The value to write to the stream. + func write(_ v: StructKey) { + self.write(v.value) + } + + /// Write an optional `StructKey?` structured value to the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `StructKey?` - The value to write to the stream. + func write(tag: Swift.Int32, value: StructKey?) { + if let v = value { + if writeOptional(tag: tag, format: .VSize) { + write(size: 4) + write(v) + } + } + } +} + +/// :nodoc: +public class ClassKey_TypeResolver: Ice.ValueTypeResolver { + public override func type() -> Ice.Value.Type { + return ClassKey.self + } +} + +public extension Ice.ClassResolver { + @objc static func Test_ClassKey() -> Ice.ValueTypeResolver { + return ClassKey_TypeResolver() + } +} + +open class ClassKey: Ice.Value { + public var value: Swift.Int32 = 0 + + public required init() {} + + public init(value: Swift.Int32) { + self.value = value + } + + /// Returns the Slice type ID of the interface supported by this object. + /// + /// - returns: `String` - The Slice type ID of the interface supported by this object. + open override class func ice_staticId() -> Swift.String { "::Test::ClassKey" } + + open override func _iceReadImpl(from istr: Ice.InputStream) throws { + _ = try istr.startSlice() + self.value = try istr.read() + try istr.endSlice() + } + + open override func _iceWriteImpl(to ostr: Ice.OutputStream) { + ostr.startSlice(typeId: ClassKey.ice_staticId(), compactId: -1, last: true) + ostr.write(self.value) + ostr.endSlice() + } +} diff --git a/slice2swift/cpp/test/DataStorm/events/Test.swift b/slice2swift/cpp/test/DataStorm/events/Test.swift new file mode 100644 index 000000000000..d41fbc3d9748 --- /dev/null +++ b/slice2swift/cpp/test/DataStorm/events/Test.swift @@ -0,0 +1,170 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +import Foundation +import Ice + +public struct StructValue: Swift.Hashable { + public var firstName: Swift.String = "" + public var lastName: Swift.String = "" + public var age: Swift.Int32 = 0 + + public init() {} + + public init(firstName: Swift.String, lastName: Swift.String, age: Swift.Int32) { + self.firstName = firstName + self.lastName = lastName + self.age = age + } +} + +/// An `Ice.InputStream` extension to read `StructValue` structured values from the stream. +public extension Ice.InputStream { + /// Read a `StructValue` structured value from the stream. + /// + /// - returns: `StructValue` - The structured value read from the stream. + func read() throws -> StructValue { + var v = StructValue() + v.firstName = try self.read() + v.lastName = try self.read() + v.age = try self.read() + return v + } + + /// Read an optional `StructValue?` structured value from the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `StructValue?` - The structured value read from the stream. + func read(tag: Swift.Int32) throws -> StructValue? { + guard try readOptional(tag: tag, expectedFormat: .FSize) else { + return nil + } + try skip(4) + return try read() as StructValue + } +} + +/// An `Ice.OutputStream` extension to write `StructValue` structured values from the stream. +public extension Ice.OutputStream { + /// Write a `StructValue` structured value to the stream. + /// + /// - parameter _: `StructValue` - The value to write to the stream. + func write(_ v: StructValue) { + self.write(v.firstName) + self.write(v.lastName) + self.write(v.age) + } + + /// Write an optional `StructValue?` structured value to the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `StructValue?` - The value to write to the stream. + func write(tag: Swift.Int32, value: StructValue?) { + if let v = value { + if writeOptional(tag: tag, format: .FSize) { + let pos = startSize() + write(v) + endSize(position: pos) + } + } + } +} + +/// :nodoc: +public class Base_TypeResolver: Ice.ValueTypeResolver { + public override func type() -> Ice.Value.Type { + return Base.self + } +} + +public extension Ice.ClassResolver { + @objc static func Test_Base() -> Ice.ValueTypeResolver { + return Base_TypeResolver() + } +} + +open class Base: Ice.Value { + public var b: Swift.String = "" + + public required init() {} + + public init(b: Swift.String) { + self.b = b + } + + /// Returns the Slice type ID of the interface supported by this object. + /// + /// - returns: `String` - The Slice type ID of the interface supported by this object. + open override class func ice_staticId() -> Swift.String { "::Test::Base" } + + open override func _iceReadImpl(from istr: Ice.InputStream) throws { + _ = try istr.startSlice() + self.b = try istr.read() + try istr.endSlice() + } + + open override func _iceWriteImpl(to ostr: Ice.OutputStream) { + ostr.startSlice(typeId: Base.ice_staticId(), compactId: -1, last: true) + ostr.write(self.b) + ostr.endSlice() + } +} + +/// :nodoc: +public class Extended_TypeResolver: Ice.ValueTypeResolver { + public override func type() -> Ice.Value.Type { + return Extended.self + } +} + +public extension Ice.ClassResolver { + @objc static func Test_Extended() -> Ice.ValueTypeResolver { + return Extended_TypeResolver() + } +} + +open class Extended: Base { + public var e: Swift.Int32 = 0 + + public required init() { + super.init() + } + + public init(b: Swift.String, e: Swift.Int32) { + self.e = e + super.init(b: b) + } + + /// Returns the Slice type ID of the interface supported by this object. + /// + /// - returns: `String` - The Slice type ID of the interface supported by this object. + open override class func ice_staticId() -> Swift.String { "::Test::Extended" } + + open override func _iceReadImpl(from istr: Ice.InputStream) throws { + _ = try istr.startSlice() + self.e = try istr.read() + try istr.endSlice() + try super._iceReadImpl(from: istr); + } + + open override func _iceWriteImpl(to ostr: Ice.OutputStream) { + ostr.startSlice(typeId: Extended.ice_staticId(), compactId: -1, last: false) + ostr.write(self.e) + ostr.endSlice() + super._iceWriteImpl(to: ostr); + } +} diff --git a/slice2swift/cpp/test/DataStorm/partial/Test.swift b/slice2swift/cpp/test/DataStorm/partial/Test.swift new file mode 100644 index 000000000000..e36c01a8f73e --- /dev/null +++ b/slice2swift/cpp/test/DataStorm/partial/Test.swift @@ -0,0 +1,84 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +import Foundation +import Ice + +public struct Stock { + public var price: Swift.Float = 0.0 + public var lastBid: Swift.Float = 0.0 + public var laskAsk: Swift.Float = 0.0 + + public init() {} + + public init(price: Swift.Float, lastBid: Swift.Float, laskAsk: Swift.Float) { + self.price = price + self.lastBid = lastBid + self.laskAsk = laskAsk + } +} + +/// An `Ice.InputStream` extension to read `Stock` structured values from the stream. +public extension Ice.InputStream { + /// Read a `Stock` structured value from the stream. + /// + /// - returns: `Stock` - The structured value read from the stream. + func read() throws -> Stock { + var v = Stock() + v.price = try self.read() + v.lastBid = try self.read() + v.laskAsk = try self.read() + return v + } + + /// Read an optional `Stock?` structured value from the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `Stock?` - The structured value read from the stream. + func read(tag: Swift.Int32) throws -> Stock? { + guard try readOptional(tag: tag, expectedFormat: .VSize) else { + return nil + } + try skipSize() + return try read() as Stock + } +} + +/// An `Ice.OutputStream` extension to write `Stock` structured values from the stream. +public extension Ice.OutputStream { + /// Write a `Stock` structured value to the stream. + /// + /// - parameter _: `Stock` - The value to write to the stream. + func write(_ v: Stock) { + self.write(v.price) + self.write(v.lastBid) + self.write(v.laskAsk) + } + + /// Write an optional `Stock?` structured value to the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `Stock?` - The value to write to the stream. + func write(tag: Swift.Int32, value: Stock?) { + if let v = value { + if writeOptional(tag: tag, format: .VSize) { + write(size: 12) + write(v) + } + } + } +} diff --git a/slice2swift/cpp/test/DataStorm/types/Test.swift b/slice2swift/cpp/test/DataStorm/types/Test.swift new file mode 100644 index 000000000000..d41fbc3d9748 --- /dev/null +++ b/slice2swift/cpp/test/DataStorm/types/Test.swift @@ -0,0 +1,170 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Test.ice' +// +// Warning: do not edit this file. +// +// +// + +import Foundation +import Ice + +public struct StructValue: Swift.Hashable { + public var firstName: Swift.String = "" + public var lastName: Swift.String = "" + public var age: Swift.Int32 = 0 + + public init() {} + + public init(firstName: Swift.String, lastName: Swift.String, age: Swift.Int32) { + self.firstName = firstName + self.lastName = lastName + self.age = age + } +} + +/// An `Ice.InputStream` extension to read `StructValue` structured values from the stream. +public extension Ice.InputStream { + /// Read a `StructValue` structured value from the stream. + /// + /// - returns: `StructValue` - The structured value read from the stream. + func read() throws -> StructValue { + var v = StructValue() + v.firstName = try self.read() + v.lastName = try self.read() + v.age = try self.read() + return v + } + + /// Read an optional `StructValue?` structured value from the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `StructValue?` - The structured value read from the stream. + func read(tag: Swift.Int32) throws -> StructValue? { + guard try readOptional(tag: tag, expectedFormat: .FSize) else { + return nil + } + try skip(4) + return try read() as StructValue + } +} + +/// An `Ice.OutputStream` extension to write `StructValue` structured values from the stream. +public extension Ice.OutputStream { + /// Write a `StructValue` structured value to the stream. + /// + /// - parameter _: `StructValue` - The value to write to the stream. + func write(_ v: StructValue) { + self.write(v.firstName) + self.write(v.lastName) + self.write(v.age) + } + + /// Write an optional `StructValue?` structured value to the stream. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `StructValue?` - The value to write to the stream. + func write(tag: Swift.Int32, value: StructValue?) { + if let v = value { + if writeOptional(tag: tag, format: .FSize) { + let pos = startSize() + write(v) + endSize(position: pos) + } + } + } +} + +/// :nodoc: +public class Base_TypeResolver: Ice.ValueTypeResolver { + public override func type() -> Ice.Value.Type { + return Base.self + } +} + +public extension Ice.ClassResolver { + @objc static func Test_Base() -> Ice.ValueTypeResolver { + return Base_TypeResolver() + } +} + +open class Base: Ice.Value { + public var b: Swift.String = "" + + public required init() {} + + public init(b: Swift.String) { + self.b = b + } + + /// Returns the Slice type ID of the interface supported by this object. + /// + /// - returns: `String` - The Slice type ID of the interface supported by this object. + open override class func ice_staticId() -> Swift.String { "::Test::Base" } + + open override func _iceReadImpl(from istr: Ice.InputStream) throws { + _ = try istr.startSlice() + self.b = try istr.read() + try istr.endSlice() + } + + open override func _iceWriteImpl(to ostr: Ice.OutputStream) { + ostr.startSlice(typeId: Base.ice_staticId(), compactId: -1, last: true) + ostr.write(self.b) + ostr.endSlice() + } +} + +/// :nodoc: +public class Extended_TypeResolver: Ice.ValueTypeResolver { + public override func type() -> Ice.Value.Type { + return Extended.self + } +} + +public extension Ice.ClassResolver { + @objc static func Test_Extended() -> Ice.ValueTypeResolver { + return Extended_TypeResolver() + } +} + +open class Extended: Base { + public var e: Swift.Int32 = 0 + + public required init() { + super.init() + } + + public init(b: Swift.String, e: Swift.Int32) { + self.e = e + super.init(b: b) + } + + /// Returns the Slice type ID of the interface supported by this object. + /// + /// - returns: `String` - The Slice type ID of the interface supported by this object. + open override class func ice_staticId() -> Swift.String { "::Test::Extended" } + + open override func _iceReadImpl(from istr: Ice.InputStream) throws { + _ = try istr.startSlice() + self.e = try istr.read() + try istr.endSlice() + try super._iceReadImpl(from: istr); + } + + open override func _iceWriteImpl(to ostr: Ice.OutputStream) { + ostr.startSlice(typeId: Extended.ice_staticId(), compactId: -1, last: false) + ostr.write(self.e) + ostr.endSlice() + super._iceWriteImpl(to: ostr); + } +} diff --git a/slice2swift/cpp/test/Ice/exceptions/Test.swift b/slice2swift/cpp/test/Ice/exceptions/Test.swift index 2a236e00f027..129ba174502a 100644 --- a/slice2swift/cpp/test/Ice/exceptions/Test.swift +++ b/slice2swift/cpp/test/Ice/exceptions/Test.swift @@ -751,10 +751,10 @@ public extension ThrowerPrx { userException:{ ex in do { throw ex - } catch let error as A { - throw error } catch let error as D { throw error + } catch let error as A { + throw error } catch is Ice.UserException {} }, context: context) diff --git a/slice2swift/slice/DataStorm/Sample.swift b/slice2swift/slice/DataStorm/Sample.swift new file mode 100644 index 000000000000..dd1c73d36ad8 --- /dev/null +++ b/slice2swift/slice/DataStorm/Sample.swift @@ -0,0 +1,152 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// +// +// Ice version 3.8.0-alpha.0 +// +// +// +// Generated from file `Sample.ice' +// +// Warning: do not edit this file. +// +// +// + +import Foundation +import Ice + +/// The sample event. +/// +/// The sample event matches the operation used by the DataWriter to update +/// the data element. It also provides information on what to expect from +/// the sample. A sample with the Add or Update event always provide a value +/// while a sample with the Remove type doesn't. +public enum SampleEvent: Swift.UInt8 { + /// Add The element has been added. + case Add = 0 + /// Update The element has been updated. + case Update = 1 + /// PartialUpdate The element has been partially updated. + case PartialUpdate = 2 + /// Remove The element has been removed. + case Remove = 3 + public init() { + self = .Add + } +} + +/// An `Ice.InputStream` extension to read `SampleEvent` enumerated values from the stream. +public extension Ice.InputStream { + /// Read an enumerated value. + /// + /// - returns: `SampleEvent` - The enumarated value. + func read() throws -> SampleEvent { + let rawValue: Swift.UInt8 = try read(enumMaxValue: 3) + guard let val = SampleEvent(rawValue: rawValue) else { + throw Ice.MarshalException("invalid enum value") + } + return val + } + + /// Read an optional enumerated value from the stream. + /// + /// - parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// - returns: `SampleEvent` - The enumerated value. + func read(tag: Swift.Int32) throws -> SampleEvent? { + guard try readOptional(tag: tag, expectedFormat: .Size) else { + return nil + } + return try read() as SampleEvent + } +} + +/// An `Ice.OutputStream` extension to write `SampleEvent` enumerated values to the stream. +public extension Ice.OutputStream { + /// Writes an enumerated value to the stream. + /// + /// parameter _: `SampleEvent` - The enumerator to write. + func write(_ v: SampleEvent) { + write(enum: v.rawValue, maxValue: 3) + } + + /// Writes an optional enumerated value to the stream. + /// + /// parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// parameter _: `SampleEvent` - The enumerator to write. + func write(tag: Swift.Int32, value: SampleEvent?) { + guard let v = value else { + return + } + write(tag: tag, val: v.rawValue, maxValue: 3) + } +} + +/// A sequence of sample type enumeration. +public typealias SampleEventSeq = [SampleEvent] + +/// Helper class to read and write `SampleEventSeq` sequence values from +/// `Ice.InputStream` and `Ice.OutputStream`. +public struct SampleEventSeqHelper { + /// Read a `SampleEventSeq` sequence from the stream. + /// + /// - parameter istr: `Ice.InputStream` - The stream to read from. + /// + /// - returns: `SampleEventSeq` - The sequence read from the stream. + public static func read(from istr: Ice.InputStream) throws -> SampleEventSeq { + let sz = try istr.readAndCheckSeqSize(minSize: 1) + var v = SampleEventSeq() + v.reserveCapacity(sz) + for _ in 0 ..< sz { + let j: SampleEvent = try istr.read() + v.append(j) + } + return v + } + /// Read an optional `SampleEventSeq?` sequence from the stream. + /// + /// - parameter istr: `Ice.InputStream` - The stream to read from. + /// + /// - parameter tag: `Swift.Int32` - The numeric tag associated with the value. + /// + /// - returns: `SampleEventSeq` - The sequence read from the stream. + public static func read(from istr: Ice.InputStream, tag: Swift.Int32) throws -> SampleEventSeq? { + guard try istr.readOptional(tag: tag, expectedFormat: .FSize) else { + return nil + } + try istr.skip(4) + return try read(from: istr) + } + + /// Wite a `SampleEventSeq` sequence to the stream. + /// + /// - parameter ostr: `Ice.OuputStream` - The stream to write to. + /// + /// - parameter value: `SampleEventSeq` - The sequence value to write to the stream. + public static func write(to ostr: Ice.OutputStream, value v: SampleEventSeq) { + ostr.write(size: v.count) + for item in v { + ostr.write(item) + } + } + + /// Wite an optional `SampleEventSeq?` sequence to the stream. + /// + /// - parameter ostr: `Ice.OuputStream` - The stream to write to. + /// + /// - parameter tag: `Int32` - The numeric tag associated with the value. + /// + /// - parameter value: `SampleEventSeq` The sequence value to write to the stream. + public static func write(to ostr: Ice.OutputStream, tag: Swift.Int32, value v: SampleEventSeq?) { + guard let val = v else { + return + } + if ostr.writeOptional(tag: tag, format: .FSize) { + let pos = ostr.startSize() + write(to: ostr, value: val) + ostr.endSize(position: pos) + } + } +} diff --git a/slice2swift/slice/Glacier2/Router.swift b/slice2swift/slice/Glacier2/Router.swift index c14038eca5a8..41bc1121d181 100644 --- a/slice2swift/slice/Glacier2/Router.swift +++ b/slice2swift/slice/Glacier2/Router.swift @@ -256,10 +256,10 @@ public extension RouterPrx { userException:{ ex in do { throw ex - } catch let error as PermissionDeniedException { - throw error } catch let error as CannotCreateSessionException { throw error + } catch let error as PermissionDeniedException { + throw error } catch is Ice.UserException {} }, context: context) @@ -293,10 +293,10 @@ public extension RouterPrx { userException:{ ex in do { throw ex - } catch let error as PermissionDeniedException { - throw error } catch let error as CannotCreateSessionException { throw error + } catch let error as PermissionDeniedException { + throw error } catch is Ice.UserException {} }, context: context)