From d6f76229d1162918d1e6ee60164eaccc279bf29a Mon Sep 17 00:00:00 2001 From: Jose Date: Mon, 28 Oct 2024 21:10:21 +0100 Subject: [PATCH] HEAD:(zeroc-ice/ice@379e2b1642) Simplify ConnectionI.checkState in JavaScript (zeroc-ice/ice#2989) --- slice2cpp/cpp/src/IceGrid/Internal.cpp | 4 +- slice2cpp/ruby/test/Ice/exceptions/Test.cpp | 4 +- slice2cs/cpp/test/Ice/location/Test.cs | 4 +- slice2cs/csharp/test/Ice/operations/Test.cs | 16 +- .../csharp/test/Ice/operations/TestAMD.cs | 104 +++---- .../main/java/test/Ice/operations/TestAMD.cs | 140 +++++----- slice2cs/js/test/Ice/location/Test.cs | 4 +- slice2cs/js/test/Ice/operations/Test.cs | 184 ++++++------ slice2cs/matlab/test/Ice/inheritance/Test.cs | 4 +- slice2cs/php/test/Ice/facets/Test.cs | 4 +- slice2cs/python/test/Ice/operations/Test.cs | 40 +-- slice2cs/ruby/test/Ice/operations/Test.cs | 216 +++++++------- slice2cs/slice/Glacier2/Router.cs | 8 +- slice2cs/slice/IceGrid/Admin.cs | 28 +- slice2cs/swift/test/Ice/operations/Test.cs | 264 +++++++++--------- slice2cs/swift/test/Slice/escape/Key.cs | 4 +- .../DataStormContract/DataSample.java | 2 +- .../DataStormContract/DataSamples.java | 2 +- .../DataStormContract/ElementConfig.java | 2 +- .../DataStormContract/ElementData.java | 2 +- .../DataStormContract/ElementDataAck.java | 2 +- .../DataStormContract/ElementInfo.java | 2 +- .../DataStormContract/ElementSpec.java | 2 +- .../DataStormContract/ElementSpecAck.java | 2 +- .../DataStormContract/FilterInfo.java | 2 +- .../DataStormContract/TopicInfo.java | 2 +- .../DataStormContract/TopicSpec.java | 2 +- .../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 | 2 +- .../test/DataStorm/api/Test/StructKey.java | 2 +- .../cpp/test/DataStorm/events/Test/Base.java | 2 +- .../test/DataStorm/events/Test/Extended.java | 2 +- .../DataStorm/events/Test/StructValue.java | 2 +- .../test/DataStorm/partial/Test/Stock.java | 2 +- .../cpp/test/DataStorm/types/Test/Base.java | 2 +- .../test/DataStorm/types/Test/Extended.java | 2 +- .../DataStorm/types/Test/StructValue.java | 2 +- .../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 +- .../router/Test/CallbackException.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 +- .../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/IceGrid/Internal.js | 12 +- slice2js/slice/IceStorm/Metrics.js | 2 + slice2swift/cpp/src/IceGrid/Internal.swift | 4 +- slice2swift/slice/Ice/Locator.swift | 8 +- slice2swift/slice/IceStorm/IceStorm.swift | 4 +- 1517 files changed, 2026 insertions(+), 2024 deletions(-) diff --git a/slice2cpp/cpp/src/IceGrid/Internal.cpp b/slice2cpp/cpp/src/IceGrid/Internal.cpp index a9d7a24dc678..fe70832e5585 100644 --- a/slice2cpp/cpp/src/IceGrid/Internal.cpp +++ b/slice2cpp/cpp/src/IceGrid/Internal.cpp @@ -1585,11 +1585,11 @@ IceGrid::ReplicaSessionPrx::_iceI_setAdapterDirectProxy(const ::std::shared_ptr< { ex.ice_throw(); } - catch(const AdapterNotExistException&) + catch(const AdapterExistsException&) { throw; } - catch(const AdapterExistsException&) + catch(const AdapterNotExistException&) { throw; } diff --git a/slice2cpp/ruby/test/Ice/exceptions/Test.cpp b/slice2cpp/ruby/test/Ice/exceptions/Test.cpp index e48f30869d34..a77cac81b419 100644 --- a/slice2cpp/ruby/test/Ice/exceptions/Test.cpp +++ b/slice2cpp/ruby/test/Ice/exceptions/Test.cpp @@ -218,11 +218,11 @@ Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::O { ex.ice_throw(); } - catch(const A&) + catch(const D&) { throw; } - catch(const D&) + catch(const A&) { throw; } diff --git a/slice2cs/cpp/test/Ice/location/Test.cs b/slice2cs/cpp/test/Ice/location/Test.cs index c15b31fc483d..22fbf70df828 100644 --- a/slice2cs/cpp/test/Ice/location/Test.cs +++ b/slice2cs/cpp/test/Ice/location/Test.cs @@ -1089,10 +1089,10 @@ public abstract class TestLocatorRegistryDisp_ : Ice.ObjectImpl, TestLocatorRegi { public abstract void addObject(global::Ice.ObjectPrx? obj, Ice.Current current); - public abstract global::System.Threading.Tasks.Task setReplicatedAdapterDirectProxyAsync(string adapterId, string replicaGroupId, global::Ice.ObjectPrx? proxy, Ice.Current current); - public abstract global::System.Threading.Tasks.Task setAdapterDirectProxyAsync(string id, global::Ice.ObjectPrx? proxy, Ice.Current current); + public abstract global::System.Threading.Tasks.Task setReplicatedAdapterDirectProxyAsync(string adapterId, string replicaGroupId, global::Ice.ObjectPrx? proxy, Ice.Current current); + public abstract global::System.Threading.Tasks.Task setServerProcessProxyAsync(string id, global::Ice.ProcessPrx? proxy, Ice.Current current); public override string ice_id(Ice.Current current) => ice_staticId(); diff --git a/slice2cs/csharp/test/Ice/operations/Test.cs b/slice2cs/csharp/test/Ice/operations/Test.cs index 7be4a6c7ce5c..65097a9ccb89 100644 --- a/slice2cs/csharp/test/Ice/operations/Test.cs +++ b/slice2cs/csharp/test/Ice/operations/Test.cs @@ -13440,6 +13440,10 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, 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 void shutdown(Ice.Current current); public abstract bool supportsCompress(Ice.Current current); @@ -13576,10 +13580,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, 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 override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -13674,6 +13674,10 @@ namespace Test2 { public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { + public abstract global::Ice.operations.Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); + + public abstract global::Ice.operations.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); @@ -13810,10 +13814,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::Ice.operations.Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current); - public abstract global::Ice.operations.Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current); - - public abstract global::Ice.operations.Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary p1, 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/operations/TestAMD.cs b/slice2cs/csharp/test/Ice/operations/TestAMD.cs index 17df5d7cd722..6fe9efb541d9 100644 --- a/slice2cs/csharp/test/Ice/operations/TestAMD.cs +++ b/slice2cs/csharp/test/Ice/operations/TestAMD.cs @@ -9894,22 +9894,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass 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); @@ -9922,42 +9906,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract global::System.Threading.Tasks.Task opStringMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyEnumStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opByteBoolDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opShortIntDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opLongFloatDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opStringMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opMyEnumStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opByteByteSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - public abstract global::System.Threading.Tasks.Task opBoolBoolSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - - 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); @@ -10008,6 +9956,58 @@ 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 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 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 opMyEnumStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opByteBoolDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opShortIntDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opLongFloatDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opStringMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMyEnumStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opByteByteSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + public abstract global::System.Threading.Tasks.Task opBoolBoolSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + + 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 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/operations/TestAMD.cs b/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs index 0033e8b1af61..222fc5f26a4e 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,145 +9854,145 @@ 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 opBoolSAsync(bool[] p1, bool[] 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 opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, 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 opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task shutdownAsync(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 supportsCompressAsync(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 opVoidAsync(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 opByteAsync(byte p1, byte 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 opMyEnumMyEnumSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, 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 opIntSAsync(int[] s, 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 opByteSOnewayAsync(byte[] s, 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 opByteSOnewayCallCountAsync(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> opContextAsync(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 opDoubleMarshalingAsync(double p1, double[] 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 opIdempotentAsync(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); + public abstract global::System.Threading.Tasks.Task opByte1Async(byte opByte1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opShort1Async(short opShort1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyEnumStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opInt1Async(int opInt1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opLong1Async(long opLong1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opByteBoolDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opFloat1Async(float opFloat1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opShortIntDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opDouble1Async(double opDouble1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opLongFloatDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opString1Async(string opString1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringS1Async(string[] opStringS1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opStringMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task> opByteBoolD1Async(global::System.Collections.Generic.Dictionary opByteBoolD1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyEnumStringDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringS2Async(string[] stringS, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task> opByteBoolD2Async(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opByteByteSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opStringLiteralsAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task opBoolBoolSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opWStringLiteralsAsync(Ice.Current current); - public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMStruct1Async(Ice.Current current); - public abstract global::System.Threading.Tasks.Task supportsCompressAsync(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMStruct2Async(Structure p1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMSeq1Async(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 opMSeq2Async(string[] p1, 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 opMDict1Async(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 opMDict2Async(global::System.Collections.Generic.Dictionary p1, 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 opStringStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary 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 opStringMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyEnumAsync(MyEnum p1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMyEnumStringDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opMyClassAsync(MyClassPrx? p1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMyStructMyEnumDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, 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 opByteBoolDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] 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 opShortIntDSAsync(global::System.Collections.Generic.Dictionary[] p1, global::System.Collections.Generic.Dictionary[] p2, Ice.Current current); - 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 opLongFloatDSAsync(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 opStringStringDSAsync(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 opStringMyEnumDSAsync(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 opMyEnumStringDSAsync(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 opMyStructMyEnumDSAsync(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 opByteByteSDAsync(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 opBoolBoolSDAsync(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 opShortShortSDAsync(global::System.Collections.Generic.Dictionary p1, global::System.Collections.Generic.Dictionary p2, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opByteSOnewayAsync(byte[] s, 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 opByteSOnewayCallCountAsync(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> opContextAsync(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 opDoubleMarshalingAsync(double p1, double[] 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 opIdempotentAsync(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 opByte1Async(byte opByte1, 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 opShort1Async(short opShort1, 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 opInt1Async(int opInt1, 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 opLong1Async(long opLong1, 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 opFloat1Async(float opFloat1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMyEnumAsync(MyEnum p1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opDouble1Async(double opDouble1, Ice.Current current); + public abstract global::System.Threading.Tasks.Task opMyClassAsync(MyClassPrx? p1, Ice.Current current); - public abstract global::System.Threading.Tasks.Task opString1Async(string opString1, 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 opStringS1Async(string[] opStringS1, 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> opByteBoolD1Async(global::System.Collections.Generic.Dictionary opByteBoolD1, 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 opStringS2Async(string[] stringS, 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> opByteBoolD2Async(global::System.Collections.Generic.Dictionary byteBoolD, 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 opStringLiteralsAsync(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 opWStringLiteralsAsync(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 opMStruct1Async(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 opMStruct2Async(Structure p1, 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 opMSeq1Async(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 opMSeq2Async(string[] p1, 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 opMDict1Async(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 opMDict2Async(global::System.Collections.Generic.Dictionary p1, 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 override string ice_id(Ice.Current current) => ice_staticId(); diff --git a/slice2cs/js/test/Ice/location/Test.cs b/slice2cs/js/test/Ice/location/Test.cs index 22fbf70df828..569876bb0fcd 100644 --- a/slice2cs/js/test/Ice/location/Test.cs +++ b/slice2cs/js/test/Ice/location/Test.cs @@ -1089,12 +1089,12 @@ public abstract class TestLocatorRegistryDisp_ : Ice.ObjectImpl, TestLocatorRegi { public abstract void addObject(global::Ice.ObjectPrx? obj, Ice.Current current); - public abstract global::System.Threading.Tasks.Task setAdapterDirectProxyAsync(string id, global::Ice.ObjectPrx? proxy, Ice.Current current); - public abstract global::System.Threading.Tasks.Task setReplicatedAdapterDirectProxyAsync(string adapterId, string replicaGroupId, global::Ice.ObjectPrx? proxy, Ice.Current current); public abstract global::System.Threading.Tasks.Task setServerProcessProxyAsync(string id, global::Ice.ProcessPrx? proxy, Ice.Current current); + public abstract global::System.Threading.Tasks.Task setAdapterDirectProxyAsync(string id, global::Ice.ObjectPrx? proxy, Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::TestLocatorRegistry"; diff --git a/slice2cs/js/test/Ice/operations/Test.cs b/slice2cs/js/test/Ice/operations/Test.cs index dd633a9c3450..e4cbd8ad8ce9 100644 --- a/slice2cs/js/test/Ice/operations/Test.cs +++ b/slice2cs/js/test/Ice/operations/Test.cs @@ -13702,6 +13702,38 @@ 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); @@ -13726,6 +13758,20 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass 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 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); @@ -13796,52 +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 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 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 override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -13967,6 +13967,38 @@ 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); @@ -13991,6 +14023,20 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass 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 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); @@ -14061,52 +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 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 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 override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2cs/matlab/test/Ice/inheritance/Test.cs b/slice2cs/matlab/test/Ice/inheritance/Test.cs index 3791adaee094..d3bc505abb4b 100644 --- a/slice2cs/matlab/test/Ice/inheritance/Test.cs +++ b/slice2cs/matlab/test/Ice/inheritance/Test.cs @@ -1161,12 +1161,12 @@ public abstract class ICDisp_ : Ice.ObjectImpl, IC { public abstract ICPrx? icop(ICPrx? p, Ice.Current current); + public abstract IAPrx? iaop(IAPrx? p, Ice.Current current); + public abstract global::Test.MB.IB1Prx? ib1op(global::Test.MB.IB1Prx? p, Ice.Current current); public abstract global::Test.MB.IB2Prx? ib2op(global::Test.MB.IB2Prx? p, Ice.Current current); - public abstract IAPrx? iaop(IAPrx? p, Ice.Current current); - public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MA::IC"; diff --git a/slice2cs/php/test/Ice/facets/Test.cs b/slice2cs/php/test/Ice/facets/Test.cs index 21989ce43e62..29a86e6cf89f 100644 --- a/slice2cs/php/test/Ice/facets/Test.cs +++ b/slice2cs/php/test/Ice/facets/Test.cs @@ -1421,12 +1421,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/python/test/Ice/operations/Test.cs b/slice2cs/python/test/Ice/operations/Test.cs index 2ff1123f3769..3e5356403217 100644 --- a/slice2cs/python/test/Ice/operations/Test.cs +++ b/slice2cs/python/test/Ice/operations/Test.cs @@ -13375,16 +13375,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); @@ -13515,6 +13505,16 @@ 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 override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -13608,16 +13608,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); @@ -13748,6 +13738,16 @@ 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 override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2cs/ruby/test/Ice/operations/Test.cs b/slice2cs/ruby/test/Ice/operations/Test.cs index 21117d3826eb..553c993dc5c5 100644 --- a/slice2cs/ruby/test/Ice/operations/Test.cs +++ b/slice2cs/ruby/test/Ice/operations/Test.cs @@ -13066,6 +13066,60 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, 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 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); + + public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); + + public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current); + + public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + + public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, 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 void shutdown(Ice.Current current); public abstract bool supportsCompress(Ice.Current current); @@ -13148,60 +13202,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass 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 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); - - public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); - - public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current); - - public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); - - public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, 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 override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -13293,6 +13293,60 @@ namespace Test2 { public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass { + 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 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); + + public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); + + public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current); + + public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + + public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, 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 void shutdown(Ice.Current current); public abstract bool supportsCompress(Ice.Current current); @@ -13375,60 +13429,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass 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 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); - - public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); - - public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current); - - public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); - - public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, 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 override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2cs/slice/Glacier2/Router.cs b/slice2cs/slice/Glacier2/Router.cs index de3f3ba9f916..3c41d5d80304 100644 --- a/slice2cs/slice/Glacier2/Router.cs +++ b/slice2cs/slice/Glacier2/Router.cs @@ -585,11 +585,11 @@ private void _iceI_createSession(string iceP_userId, string iceP_password, globa { throw ex; } - catch(CannotCreateSessionException) + catch(PermissionDeniedException) { throw; } - catch(PermissionDeniedException) + catch(CannotCreateSessionException) { throw; } @@ -635,11 +635,11 @@ private void _iceI_createSessionFromSecureConnection(global::System.Collections. { throw ex; } - catch(CannotCreateSessionException) + catch(PermissionDeniedException) { throw; } - catch(PermissionDeniedException) + catch(CannotCreateSessionException) { throw; } diff --git a/slice2cs/slice/IceGrid/Admin.cs b/slice2cs/slice/IceGrid/Admin.cs index 9c3e51b978af..6abfcaa2f27c 100644 --- a/slice2cs/slice/IceGrid/Admin.cs +++ b/slice2cs/slice/IceGrid/Admin.cs @@ -8661,11 +8661,11 @@ private void _iceI_openServerLog(string iceP_id, string iceP_path, int iceP_coun { throw; } - catch(FileNotAvailableException) + catch(NodeUnreachableException) { throw; } - catch(NodeUnreachableException) + catch(FileNotAvailableException) { throw; } @@ -8724,11 +8724,11 @@ private void _iceI_openServerStdErr(string iceP_id, int iceP_count, global::Syst { throw; } - catch(FileNotAvailableException) + catch(NodeUnreachableException) { throw; } - catch(NodeUnreachableException) + catch(FileNotAvailableException) { throw; } @@ -8787,11 +8787,11 @@ private void _iceI_openServerStdOut(string iceP_id, int iceP_count, global::Syst { throw; } - catch(FileNotAvailableException) + catch(NodeUnreachableException) { throw; } - catch(NodeUnreachableException) + catch(FileNotAvailableException) { throw; } @@ -8846,11 +8846,11 @@ private void _iceI_openNodeStdErr(string iceP_name, int iceP_count, global::Syst { throw; } - catch(FileNotAvailableException) + catch(NodeUnreachableException) { throw; } - catch(NodeUnreachableException) + catch(FileNotAvailableException) { throw; } @@ -8905,11 +8905,11 @@ private void _iceI_openNodeStdOut(string iceP_name, int iceP_count, global::Syst { throw; } - catch(FileNotAvailableException) + catch(NodeUnreachableException) { throw; } - catch(NodeUnreachableException) + catch(FileNotAvailableException) { throw; } @@ -8964,11 +8964,11 @@ private void _iceI_openRegistryStdErr(string iceP_name, int iceP_count, global:: { throw; } - catch(FileNotAvailableException) + catch(RegistryUnreachableException) { throw; } - catch(RegistryUnreachableException) + catch(FileNotAvailableException) { throw; } @@ -9023,11 +9023,11 @@ private void _iceI_openRegistryStdOut(string iceP_name, int iceP_count, global:: { throw; } - catch(FileNotAvailableException) + catch(RegistryUnreachableException) { throw; } - catch(RegistryUnreachableException) + catch(FileNotAvailableException) { throw; } diff --git a/slice2cs/swift/test/Ice/operations/Test.cs b/slice2cs/swift/test/Ice/operations/Test.cs index 9782b44acb54..996bade29490 100644 --- a/slice2cs/swift/test/Ice/operations/Test.cs +++ b/slice2cs/swift/test/Ice/operations/Test.cs @@ -13606,68 +13606,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 global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - - public abstract string[] opStringLiterals(Ice.Current current); - - public abstract string[] opWStringLiterals(Ice.Current current); - - public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); - - public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current); - - public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); - - public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, 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 void shutdown(Ice.Current current); public abstract bool supportsCompress(Ice.Current current); @@ -13690,10 +13628,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass 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); @@ -13746,6 +13680,72 @@ 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); + + public abstract string[] opWStringLiterals(Ice.Current current); + + public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); + + public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current); + + public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + + public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, 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 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 override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test::MyDerivedClass"; @@ -13839,68 +13839,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 global::System.Collections.Generic.Dictionary opByteBoolD2(global::System.Collections.Generic.Dictionary byteBoolD, Ice.Current current); - - public abstract string[] opStringLiterals(Ice.Current current); - - public abstract string[] opWStringLiterals(Ice.Current current); - - public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); - - public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current); - - public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); - - public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, 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 void shutdown(Ice.Current current); public abstract bool supportsCompress(Ice.Current current); @@ -13923,10 +13861,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass 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); @@ -13979,6 +13913,72 @@ 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); + + public abstract string[] opWStringLiterals(Ice.Current current); + + public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current); + + public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current); + + public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current); + + public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, 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 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 override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::Test2::MyDerivedClass"; diff --git a/slice2cs/swift/test/Slice/escape/Key.cs b/slice2cs/swift/test/Slice/escape/Key.cs index 09dc5a1a8c47..6a4c4b7fc78e 100644 --- a/slice2cs/swift/test/Slice/escape/Key.cs +++ b/slice2cs/swift/test/Slice/escape/Key.cs @@ -883,10 +883,10 @@ public abstract class funcDisp_ : Ice.ObjectImpl, func public abstract class doDisp_ : Ice.ObjectImpl, @do { - public abstract void @public(Ice.Current current); - public abstract global::System.Threading.Tasks.Task caseAsync(int @catch, Ice.Current current); + public abstract void @public(Ice.Current current); + public override string ice_id(Ice.Current current) => ice_staticId(); public static new string ice_staticId() => "::and::do"; diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java b/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java index 1464a6b57b15..6c2a842d671a 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java @@ -224,5 +224,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final DataSample _nullMarshalValue = new DataSample(); /** @hidden */ - private static final long serialVersionUID = 5940162257279561632L; + private static final long serialVersionUID = 1708007069780202282L; } diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java b/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java index a20b52794d6a..f62b7c33bd42 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java @@ -155,5 +155,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final DataSamples _nullMarshalValue = new DataSamples(); /** @hidden */ - private static final long serialVersionUID = -2762013661955226107L; + private static final long serialVersionUID = -5861659402866715847L; } diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java index 7bb782276ec0..d60aa8f64ce4 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java @@ -424,7 +424,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 6043732992552165143L; + private static final long serialVersionUID = -5601626708900099827L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java index c2f6b126e6b2..fe8e9c3380b5 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java @@ -174,5 +174,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final ElementData _nullMarshalValue = new ElementData(); /** @hidden */ - private static final long serialVersionUID = 5880628232608285283L; + private static final long serialVersionUID = -3139010176693396436L; } diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java index b7082745e1c0..324cdc8ae354 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java @@ -200,5 +200,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ElementDataAck _nullMarshalValue = new ElementDataAck(); /** @hidden */ - private static final long serialVersionUID = 6779036163477651958L; + private static final long serialVersionUID = -5118699096377832059L; } diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java index 8f572282ad5a..1480e9f3df4f 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java @@ -172,5 +172,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final ElementInfo _nullMarshalValue = new ElementInfo(); /** @hidden */ - private static final long serialVersionUID = -282616216277241508L; + private static final long serialVersionUID = -8948908795436469000L; } diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java index 02360bb34d41..def5c300b7f7 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java @@ -215,5 +215,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final ElementSpec _nullMarshalValue = new ElementSpec(); /** @hidden */ - private static final long serialVersionUID = 4478484581142203410L; + private static final long serialVersionUID = -308818233355707984L; } diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java index 993e8405975b..03240be16ba4 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java @@ -215,5 +215,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStr private static final ElementSpecAck _nullMarshalValue = new ElementSpecAck(); /** @hidden */ - private static final long serialVersionUID = 2481678708579028022L; + private static final long serialVersionUID = -4529712789536111368L; } diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java b/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java index f175e17eb127..fd4bce4cbeaf 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java @@ -153,5 +153,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final FilterInfo _nullMarshalValue = new FilterInfo(); /** @hidden */ - private static final long serialVersionUID = -6149542734699197129L; + private static final long serialVersionUID = -1927058027351050152L; } diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java b/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java index 29e6933f3c08..ce67c0461278 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java @@ -159,5 +159,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final TopicInfo _nullMarshalValue = new TopicInfo(); /** @hidden */ - private static final long serialVersionUID = -7140865714904315436L; + private static final long serialVersionUID = 4281045005797276153L; } diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java b/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java index b02853de0d46..6f37346805b2 100644 --- a/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java +++ b/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java @@ -185,5 +185,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream i private static final TopicSpec _nullMarshalValue = new TopicSpec(); /** @hidden */ - private static final long serialVersionUID = 7981093092464712205L; + private static final long serialVersionUID = -5172717710211046951L; } diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java index f68f591d02c7..011f747a71eb 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 = 3774322154472359933L; + private static final long serialVersionUID = 3774318397570305314L; } diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java index 785cac2ccdc8..dcbca31e9691 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 = 7872703161148990828L; + private static final long serialVersionUID = 7872704859365311105L; } diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java index fded08c674ce..7e51ffd3584f 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 = 6979113705256631646L; + private static final long serialVersionUID = -8212535198767710100L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java index a7c1c818e8bb..cb3474c4827d 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 = 4354657901895768705L; + private static final long serialVersionUID = 2413654574711915384L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java index 0cf6c83bfe6b..d226dff61b3e 100644 --- a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java +++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java @@ -196,7 +196,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -7814831620360004737L; + private static final long serialVersionUID = 1008672680854347L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java index bcefb86b47be..442f97217875 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 = -4368887136205812996L; + private static final long serialVersionUID = -802919786378142468L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java index 9ba0ca120266..f0066321aaf7 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 = -9082234170426531364L; + private static final long serialVersionUID = -9048957040876407423L; /** @hidden */ @Override diff --git a/slice2java/cpp/src/IceStorm/IceStorm/AllData.java b/slice2java/cpp/src/IceStorm/IceStorm/AllData.java index c09daf9bd687..7fd09601344b 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 = -2450430510377908744L; + private static final long serialVersionUID = 3662777720425356582L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/EventData.java b/slice2java/cpp/src/IceStorm/IceStorm/EventData.java index 517988fbbcf0..8eec58c99448 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 = 1746783769941292547L; + private static final long serialVersionUID = 4633148602628616419L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java index 9b792b6358f0..2b00a20957bb 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 = 7227254834728078869L; + private static final long serialVersionUID = -6111377743735549019L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java index c10cab9b547f..f632f4c93c9f 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 = 8388371394572119096L; + private static final long serialVersionUID = -4796775803810298420L; } diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java index 0142db8c80f3..ff4904d63ed3 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 = 1833913007930776735L; + private static final long serialVersionUID = 1502703122184772191L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java index 1fbf6df08ac5..2c743b0937c8 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 = -4704745150435651816L; + private static final long serialVersionUID = -6987912087968202092L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java b/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java index e48b42a79ba8..7496b725fe75 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 = -6735386279814345244L; + private static final long serialVersionUID = 1980231469880954916L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java index 45c1598e43e9..e97ca55baab0 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 = -7892739561334124592L; + private static final long serialVersionUID = 2498256410619403103L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java b/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java index e32bdcca9028..4bc8c3aa104e 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 = 938918858643949451L; + private static final long serialVersionUID = 938916553464125681L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java index 2d182e5c1800..a7b78574659e 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 = 2331389266607013233L; + private static final long serialVersionUID = -5432441996728907225L; } diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java b/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java index 351f81391308..4181b0f5295f 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 = -6927429799150445370L; + private static final long serialVersionUID = -2473047112970838015L; } diff --git a/slice2java/cpp/src/icegriddb/IceGrid/AllData.java b/slice2java/cpp/src/icegriddb/IceGrid/AllData.java index bf10239fd328..c136c9ee7234 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 = -451302307108144285L; + private static final long serialVersionUID = -6992646510705798107L; } diff --git a/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java b/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java index f4152061aa22..8f062fb07e30 100644 --- a/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java +++ b/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java @@ -45,7 +45,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 1632400853396143849L; + private static final long serialVersionUID = 1632404156957299264L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/DataStorm/api/Test/StructKey.java b/slice2java/cpp/test/DataStorm/api/Test/StructKey.java index c41e6e1f0e92..6b1c2bcddd7f 100644 --- a/slice2java/cpp/test/DataStorm/api/Test/StructKey.java +++ b/slice2java/cpp/test/DataStorm/api/Test/StructKey.java @@ -138,5 +138,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 = -8144779074783768775L; + private static final long serialVersionUID = -8144779738612214128L; } diff --git a/slice2java/cpp/test/DataStorm/events/Test/Base.java b/slice2java/cpp/test/DataStorm/events/Test/Base.java index bc72ec806515..25a37c0fc997 100644 --- a/slice2java/cpp/test/DataStorm/events/Test/Base.java +++ b/slice2java/cpp/test/DataStorm/events/Test/Base.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2623901688304810795L; + private static final long serialVersionUID = -2623897612438937952L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/DataStorm/events/Test/Extended.java b/slice2java/cpp/test/DataStorm/events/Test/Extended.java index 7beb5a3137b7..013ab74d03ac 100644 --- a/slice2java/cpp/test/DataStorm/events/Test/Extended.java +++ b/slice2java/cpp/test/DataStorm/events/Test/Extended.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2516993452821921828L; + private static final long serialVersionUID = 2516997887887418833L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/DataStorm/events/Test/StructValue.java b/slice2java/cpp/test/DataStorm/events/Test/StructValue.java index a7874bc64b6b..b46030467a68 100644 --- a/slice2java/cpp/test/DataStorm/events/Test/StructValue.java +++ b/slice2java/cpp/test/DataStorm/events/Test/StructValue.java @@ -167,5 +167,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final StructValue _nullMarshalValue = new StructValue(); /** @hidden */ - private static final long serialVersionUID = 7007692046524609347L; + private static final long serialVersionUID = -7491456569384426570L; } diff --git a/slice2java/cpp/test/DataStorm/partial/Test/Stock.java b/slice2java/cpp/test/DataStorm/partial/Test/Stock.java index 7dd8d0a330e5..838198233821 100644 --- a/slice2java/cpp/test/DataStorm/partial/Test/Stock.java +++ b/slice2java/cpp/test/DataStorm/partial/Test/Stock.java @@ -158,5 +158,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream istr, private static final Stock _nullMarshalValue = new Stock(); /** @hidden */ - private static final long serialVersionUID = 726915482695767512L; + private static final long serialVersionUID = 7490640920995190795L; } diff --git a/slice2java/cpp/test/DataStorm/types/Test/Base.java b/slice2java/cpp/test/DataStorm/types/Test/Base.java index 4fa6848f6b14..c0b988c02005 100644 --- a/slice2java/cpp/test/DataStorm/types/Test/Base.java +++ b/slice2java/cpp/test/DataStorm/types/Test/Base.java @@ -46,7 +46,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = -2623901584980328793L; + private static final long serialVersionUID = -2623894884858587296L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/DataStorm/types/Test/Extended.java b/slice2java/cpp/test/DataStorm/types/Test/Extended.java index e2e93415788d..fc877aa679cb 100644 --- a/slice2java/cpp/test/DataStorm/types/Test/Extended.java +++ b/slice2java/cpp/test/DataStorm/types/Test/Extended.java @@ -47,7 +47,7 @@ public String ice_id() } /** @hidden */ - private static final long serialVersionUID = 2516993595052723305L; + private static final long serialVersionUID = 2516995160311807505L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/DataStorm/types/Test/StructValue.java b/slice2java/cpp/test/DataStorm/types/Test/StructValue.java index 759e0eeaf66f..4d5b5b79a86b 100644 --- a/slice2java/cpp/test/DataStorm/types/Test/StructValue.java +++ b/slice2java/cpp/test/DataStorm/types/Test/StructValue.java @@ -167,5 +167,5 @@ static public java.util.Optional ice_read(com.zeroc.Ice.InputStream private static final StructValue _nullMarshalValue = new StructValue(); /** @hidden */ - private static final long serialVersionUID = 847815138512835150L; + private static final long serialVersionUID = 2198268915537177078L; } diff --git a/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java b/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java index e568740d3b17..a4f77b896833 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 = -4553194172747965513L; + private static final long serialVersionUID = 2779402524276570423L; } diff --git a/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java b/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java index 49c3aac8a6e2..9547f3f2c046 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 = -5530289868618672261L; + private static final long serialVersionUID = 2034554785886119820L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java b/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java index 5687396608aa..115808e79488 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 = 4174668602858208993L; + private static final long serialVersionUID = 1024161263917485543L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/DictClass.java b/slice2java/cpp/test/Ice/custom/Test/DictClass.java index f1d946381cd7..4361e933416d 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 = 6545927814655972167L; + private static final long serialVersionUID = 6545926709172778804L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/custom/Test/Fixed.java b/slice2java/cpp/test/Ice/custom/Test/Fixed.java index cd6e8f12a371..7e2bf3f1d40b 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 = -5072314278639869812L; + private static final long serialVersionUID = -5072322001571420119L; } diff --git a/slice2java/cpp/test/Ice/custom/Test/Variable.java b/slice2java/cpp/test/Ice/custom/Test/Variable.java index b4a690036970..fca2fb56e17b 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 = 3830319071933592758L; + private static final long serialVersionUID = 2957036191647497260L; } diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringException.java b/slice2java/cpp/test/Ice/custom/Test1/WstringException.java index 425aa7322539..3c942e300d59 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 = 1345708480230260224L; + private static final long serialVersionUID = 1345708082465380447L; } diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java index d96dede4735d..73fc5a000a38 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 = -6616020978569405481L; + private static final long serialVersionUID = -6616020580785551992L; } diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringException.java b/slice2java/cpp/test/Ice/custom/Test2/WstringException.java index 4e60a754ed01..68df96f5c44e 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 = 4583041486244939651L; + private static final long serialVersionUID = 4583035465594124764L; } diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java index 893798e5600a..f227d92b9046 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 = 5997323414383652052L; + private static final long serialVersionUID = 5997329435053440651L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Base.java b/slice2java/cpp/test/Ice/defaultValue/Test/Base.java index 9d5bf108c08e..5dbb76384c89 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 = -2982377474929008797L; + private static final long serialVersionUID = -6359736895063329245L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java index 4cfe520f0588..b0ee9fc47573 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 = 6300741467388663831L; + private static final long serialVersionUID = 6737533348399327063L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java b/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java index a40589c02ce6..e05beabac059 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 = 6080934722199135374L; + private static final long serialVersionUID = 1262035442757115918L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java index c5653668a71d..ec6abf13f816 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 = 7341877296094073913L; + private static final long serialVersionUID = 3945948869906560441L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java index 86ec07698649..d460d4bb5666 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 = 3425363686470069997L; + private static final long serialVersionUID = -993439265131627923L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java index df7f08653e65..99dea54f8e48 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 = 8848569160618092826L; + private static final long serialVersionUID = -7804850355933467622L; } diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java index 31afdb1147c1..33d8e25280d5 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 = 2152677827841895919L; + private static final long serialVersionUID = 705695718949460079L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/A.java b/slice2java/cpp/test/Ice/exceptions/Test/A.java index 8530b9e2cb9b..7319b5eaa014 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 = 7823746609834528242L; + private static final long serialVersionUID = 7823745123272025009L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/B.java b/slice2java/cpp/test/Ice/exceptions/Test/B.java index 197fff064e06..5ee92d0c13c9 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 = -3861409123521385294L; + private static final long serialVersionUID = -3861410610083888271L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/C.java b/slice2java/cpp/test/Ice/exceptions/Test/C.java index c82ad8561e40..fa46be364c3e 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 = 1080700301037313522L; + private static final long serialVersionUID = 1080698814474810289L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/D.java b/slice2java/cpp/test/Ice/exceptions/Test/D.java index 88f51923c300..73116f3a4724 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 = 4780383144580692914L; + private static final long serialVersionUID = 4780381658018189937L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/E.java b/slice2java/cpp/test/Ice/exceptions/Test/E.java index 79cd0f96a26f..d5df8fe8321d 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 = -1876972013677293827L; + private static final long serialVersionUID = -1876968050079154306L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/F.java b/slice2java/cpp/test/Ice/exceptions/Test/F.java index db7a3a2d1129..20b011c8ac7c 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 = 733479393236942782L; + private static final long serialVersionUID = 733475429648003133L; } diff --git a/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java b/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java index 9d7d8783d7d0..db97acca756b 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 = -4641412216669749658L; + private static final long serialVersionUID = -4641413703232252891L; } diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java index ddc64526fc1a..38eb4fcb4c40 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 = 954232976686019642L; + private static final long serialVersionUID = 954225254773414109L; /** @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 e8b32cccad70..17ac23a326f0 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 = 1339629747333543712L; + private static final long serialVersionUID = 1339628963187155143L; /** @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 154ccca2d5f0..ba8b710ca3ce 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 = -2729304918645792862L; + private static final long serialVersionUID = -2729311318095198139L; /** @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 bf59fb4bc34e..3069a0c83c0c 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 = -3435402432266036700L; + private static final long serialVersionUID = -3435402896128351549L; /** @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 b95272dd2816..f829e0aacd3e 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 = -836177914305324803L; + private static final long serialVersionUID = -836176970320216230L; /** @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 720c6c34447d..1cb90d4884f3 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 = 1132523999843572032L; + private static final long serialVersionUID = 1132523381308679143L; /** @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 7e1dbb2ca293..0e2b78156a1e 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 = -6335559216611133758L; + private static final long serialVersionUID = -6335554540127641243L; /** @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 fa4d5410782e..362b12585259 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 = -4007408683374548156L; + private static final long serialVersionUID = -4007408981625367325L; /** @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 22e3dcd097c8..b403af98f13d 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 = 991426484348786364L; + private static final long serialVersionUID = 991424698023271259L; /** @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 e1011cba04d9..67a2c9c963b6 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 = -2880332579326802080L; + private static final long serialVersionUID = -2880338983637917433L; /** @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 de671dab1f8d..1d44692be8ec 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 = -8808271371020964126L; + private static final long serialVersionUID = -8808272480313694075L; /** @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 9583210f8b48..3e3175d6ebeb 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 = -771851558368937116L; + private static final long serialVersionUID = -771857642395978749L; /** @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 4c1325471e74..8477ed6d9d56 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 = 6566352516837166975L; + private static final long serialVersionUID = 6566358755840660952L; /** @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 1be1ddb1318a..3ed18faa6d96 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 = 6983795624815666560L; + private static final long serialVersionUID = 6983800296133574695L; /** @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 b09e7991e7d6..4c6f8388f1cc 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 = -1175217775681328894L; + private static final long serialVersionUID = -1175218719666437467L; /** @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 15544e8bc76a..fd946b433b54 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 = -3279722271419430268L; + private static final long serialVersionUID = -3279717279817448413L; /** @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 d23b77b5582e..7390e0c2d058 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 = -4359168433706578626L; + private static final long serialVersionUID = -4359175835335110439L; /** @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 9ae1482ff636..97d3a8ab7527 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 = 5904686534884931744L; + private static final long serialVersionUID = 5904685750738543175L; /** @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 4bc9a0d87c9b..e29a8c88d306 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 = 1835751868905595170L; + private static final long serialVersionUID = 1835745469456189893L; /** @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 7f275574f215..250f188203bc 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 = -2252403085496353884L; + private static final long serialVersionUID = -2252403549358668733L; /** @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 dc53b1625558..58874fb5f0cb 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 = -1203536346959275535L; + private static final long serialVersionUID = -1203535723258240682L; /** @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 f8b193b63667..0c924e56c761 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 = -7537768031743713088L; + private static final long serialVersionUID = -7537768650278605977L; /** @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 2b2e9cfdcf19..592582358512 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 = 3440892825511132738L; + private static final long serialVersionUID = 3440897501994625253L; /** @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 a2cc354ad719..1109a2548227 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 = 9151100799529423556L; + private static final long serialVersionUID = 9151100501278604387L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/library/Test/UserError.java b/slice2java/cpp/test/Ice/library/Test/UserError.java index 924a49d11bc8..a16464fa2151 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 = -1126958029207093375L; + private static final long serialVersionUID = -1126955977140853291L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/A.java b/slice2java/cpp/test/Ice/objects/Test/A.java index b3eb5350383a..4131ca9fca1a 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 = -2975837358626193001L; + private static final long serialVersionUID = 2301726620165406880L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/A1.java b/slice2java/cpp/test/Ice/objects/Test/A1.java index 3b2858d75402..fad709024891 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 = -5926738848165035849L; + private static final long serialVersionUID = -5926751996668835253L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/B.java b/slice2java/cpp/test/Ice/objects/Test/B.java index 800cea1cb91a..ca1b6f9fbcdb 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 = -8890911890800281771L; + private static final long serialVersionUID = -8890917915357900381L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/B1.java b/slice2java/cpp/test/Ice/objects/Test/B1.java index afd215ac9833..7958999fbbc5 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 = -8682260622363751804L; + private static final long serialVersionUID = 3868620127487864324L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Base.java b/slice2java/cpp/test/Ice/objects/Test/Base.java index 8e4e93a3ebdb..f88df9373f54 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 = 1195598829483223432L; + private static final long serialVersionUID = -4745065723554768375L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/BaseEx.java b/slice2java/cpp/test/Ice/objects/Test/BaseEx.java index 81213b0471f2..78fca39d0f33 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 = 3897776482320736997L; + private static final long serialVersionUID = 3897764325664509721L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/C.java b/slice2java/cpp/test/Ice/objects/Test/C.java index 81347502bab1..d997f0e1be23 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 = -6763229219148114542L; + private static final long serialVersionUID = 5381027431666397261L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/COneMember.java b/slice2java/cpp/test/Ice/objects/Test/COneMember.java index 548a21c9291c..aa69c9b06ec4 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 = 3050965291669810957L; + private static final long serialVersionUID = 3050971145975065246L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java index 01e5866c9761..82a631d44fc5 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 = -6882135844891044005L; + private static final long serialVersionUID = -1242210132962425445L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/D.java b/slice2java/cpp/test/Ice/objects/Test/D.java index d3c5f25a3c0f..6b58f2394933 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 = 2553801388616069446L; + private static final long serialVersionUID = 1370022299775137479L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/D1.java b/slice2java/cpp/test/Ice/objects/Test/D1.java index b179d9d5c9a6..3d016d234753 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 = -9028783804073175997L; + private static final long serialVersionUID = -2062444953225640253L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Derived.java b/slice2java/cpp/test/Ice/objects/Test/Derived.java index 42602fcb2083..5b9d038d3fb0 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 = -1587931748729702293L; + private static final long serialVersionUID = -1587923928971582895L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/E.java b/slice2java/cpp/test/Ice/objects/Test/E.java index e809bb9d907a..861d6201f4aa 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 = -3035712268994207631L; + private static final long serialVersionUID = 5955116946152570253L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/EBase.java b/slice2java/cpp/test/Ice/objects/Test/EBase.java index 789b0137c4b9..5e770a6df174 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 = -6265913741568639922L; + private static final long serialVersionUID = -2492281799313997618L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/EDerived.java b/slice2java/cpp/test/Ice/objects/Test/EDerived.java index e4361c2128d1..687fec664a98 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 = -6682413543749458478L; + private static final long serialVersionUID = 2705201276131291218L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/EOneMember.java b/slice2java/cpp/test/Ice/objects/Test/EOneMember.java index 46137dcb6d9b..dc49721b51f0 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 = -6225280104389968894L; + private static final long serialVersionUID = -6225292901627131119L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java index 9bc026d19123..c91d61cecf00 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 = -2477293264687677100L; + private static final long serialVersionUID = 8650785581961520148L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/F.java b/slice2java/cpp/test/Ice/objects/Test/F.java index f2b7a75f09fd..ca015fc2fc75 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 = 2835186231206153809L; + private static final long serialVersionUID = -7415811097403378607L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/F1.java b/slice2java/cpp/test/Ice/objects/Test/F1.java index 833ee449763a..8d3a1d9deaea 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 = 6192369600075714924L; + private static final long serialVersionUID = 6192373307963684839L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/F3.java b/slice2java/cpp/test/Ice/objects/Test/F3.java index 55a010d3b052..d3919b782247 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 = -1056393324150534502L; + private static final long serialVersionUID = -2134456476257360076L; /** @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 907dd2fef315..0161c26fc20e 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 = -1425253840800039041L; + private static final long serialVersionUID = -1425265666944565431L; /** @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 ee825bd17c49..78c1b47425bb 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 = -2337225575843290482L; + private static final long serialVersionUID = -2337233912352420878L; } 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 a3c2ddfc5f20..4fe889b0a006 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 = -1298688760742246103L; + private static final long serialVersionUID = -1298684226495097966L; /** @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 75f7fe645fde..986252abfd53 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 = 1842225698742623274L; + private static final long serialVersionUID = 1842233557393761174L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/K.java b/slice2java/cpp/test/Ice/objects/Test/K.java index 2a6ddfa34dfe..99bdb61caad8 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 = 4645160605571130716L; + private static final long serialVersionUID = 4645167787428593400L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/L.java b/slice2java/cpp/test/Ice/objects/Test/L.java index 5b48c947a07a..4724d83b9013 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 = 6629743245273198908L; + private static final long serialVersionUID = 6629744161001990016L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/M.java b/slice2java/cpp/test/Ice/objects/Test/M.java index e21e8d8e7dd4..2de5c77ceaae 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 = -8088101719493050051L; + private static final long serialVersionUID = -8088097986008586246L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/Recursive.java b/slice2java/cpp/test/Ice/objects/Test/Recursive.java index a09e82ccb480..fe949b93d290 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 = 3617886919104370815L; + private static final long serialVersionUID = 3617883872522846332L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/objects/Test/S.java b/slice2java/cpp/test/Ice/objects/Test/S.java index e196af088235..868620e226c0 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 = 481773000835070479L; + private static final long serialVersionUID = 481772596678818867L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/SOneMember.java b/slice2java/cpp/test/Ice/objects/Test/SOneMember.java index 75ec11cc8a1f..813c56f4ac7b 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 = 6227748867103388180L; + private static final long serialVersionUID = 6227753923128879623L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java index 7684ad85847d..15304c94d127 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 = -8483564919601072446L; + private static final long serialVersionUID = 6095885011346227842L; } diff --git a/slice2java/cpp/test/Ice/objects/Test/StructKey.java b/slice2java/cpp/test/Ice/objects/Test/StructKey.java index 2f01a803de3e..cffd9ff5f5a5 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 = -1490077966375815619L; + private static final long serialVersionUID = 8790111727229277889L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java index c7abe62882b6..68f52d01829a 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 = 2723843590081197728L; + private static final long serialVersionUID = 2723847611714892757L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/MyClass1.java b/slice2java/cpp/test/Ice/operations/Test/MyClass1.java index dd3fe479abdc..64ac17e82532 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 = 3578614464129656665L; + private static final long serialVersionUID = -79705606931047668L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct.java index ba4c27af5c25..366b80a196ee 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 = 403292112518427805L; + private static final long serialVersionUID = 3577674793318005565L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java index 6a70e8489021..aebe49a7df3a 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 = 6525772155223226736L; + private static final long serialVersionUID = -21262841685764955L; } diff --git a/slice2java/cpp/test/Ice/operations/Test/Structure.java b/slice2java/cpp/test/Ice/operations/Test/Structure.java index 983546db6c18..5cfd805bd0ec 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 = -5998614908864117053L; + private static final long serialVersionUID = 2854469023032348566L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/A.java b/slice2java/cpp/test/Ice/optional/Test/A.java index b0a8ac7f737a..4f75883eb07d 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 = 2794630598980151312L; + private static final long serialVersionUID = 3841506826212668688L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/B.java b/slice2java/cpp/test/Ice/optional/Test/B.java index dec01b692f51..a56280777537 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 = 6696857198381690147L; + private static final long serialVersionUID = -814568074209009501L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/C.java b/slice2java/cpp/test/Ice/optional/Test/C.java index 405cb0e66a90..67e0bbff3579 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 = 3736900795931332093L; + private static final long serialVersionUID = 2577957907018766589L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/DerivedException.java b/slice2java/cpp/test/Ice/optional/Test/DerivedException.java index b568134d70cf..c091ad605761 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 = 5054158004231668500L; + private static final long serialVersionUID = 8956331809649452098L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/E.java b/slice2java/cpp/test/Ice/optional/Test/E.java index dceb75e62877..456fcee6c793 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 = -1850744082371412763L; + private static final long serialVersionUID = -1850742820720110285L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/F.java b/slice2java/cpp/test/Ice/optional/Test/F.java index 69c0a9a77d3f..997cea09796a 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 = -6430498792823706090L; + private static final long serialVersionUID = -6430489464438220352L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java b/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java index 8f713910b38b..988753587a25 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 = 1569603683234980126L; + private static final long serialVersionUID = 1569604740871278152L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/G.java b/slice2java/cpp/test/Ice/optional/Test/G.java index 9c110ce0d5df..fbf610118d1a 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 = -2503906387882602797L; + private static final long serialVersionUID = 5665676906212225875L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/G1.java b/slice2java/cpp/test/Ice/optional/Test/G1.java index 0b0b0d93fab4..53cfd177e1e8 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 = 7339782624956218010L; + private static final long serialVersionUID = 7339781246843317708L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/G2.java b/slice2java/cpp/test/Ice/optional/Test/G2.java index bf67e206df9a..7ac59d0a6ad2 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 = 3824546530965053054L; + private static final long serialVersionUID = 3824547792621057704L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java b/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java index 681a4f8e9b33..f0cd85391860 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 = 3579281344402217993L; + private static final long serialVersionUID = -558530578663821281L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/OneOptional.java b/slice2java/cpp/test/Ice/optional/Test/OneOptional.java index 06fb138d7cdb..5434ceba046b 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 = -7219602685080301392L; + private static final long serialVersionUID = -7219601301994075162L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalException.java b/slice2java/cpp/test/Ice/optional/Test/OptionalException.java index 86457f707e69..a1ea6e06678c 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 = 4507485540777864340L; + private static final long serialVersionUID = 6039580041042942978L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java index df7a28954fef..1c7dc2857c37 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 = 4756982807795859899L; + private static final long serialVersionUID = -7965729720389004997L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/optional/Test/RequiredException.java b/slice2java/cpp/test/Ice/optional/Test/RequiredException.java index 0c70442cb03c..45dfaa0e583a 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 = 2894244991147719123L; + private static final long serialVersionUID = 2894235182635512709L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java b/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java index a2cad9c6f480..7fbac8f00140 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 = 6700981786064842920L; + private static final long serialVersionUID = 6700991274287678718L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/VarStruct.java b/slice2java/cpp/test/Ice/optional/Test/VarStruct.java index 2aad8a6c90d8..62d864be955a 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 = -1912286242627943406L; + private static final long serialVersionUID = -1912287620740843708L; } diff --git a/slice2java/cpp/test/Ice/optional/Test/WD.java b/slice2java/cpp/test/Ice/optional/Test/WD.java index 84668e695190..e04b5a2db7ef 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 = -6408337826311166486L; + private static final long serialVersionUID = 6189393141186768298L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/C.java b/slice2java/cpp/test/Ice/scope/Test/C.java index a24235b86f99..dfd7c985bed7 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 = -5190247342343484853L; + private static final long serialVersionUID = -5190248791370721460L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/C1.java b/slice2java/cpp/test/Ice/scope/Test/C1.java index fac39a7dc085..381222c8c235 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 = 8893233089780347018L; + private static final long serialVersionUID = 8893234373347454477L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/scope/Test/C2.java b/slice2java/cpp/test/Ice/scope/Test/C2.java index 9b235c50143e..eff61032e128 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 = 6667810578961416274L; + private static final long serialVersionUID = -8097118939586709535L; /** @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 6e5ef32f71bb..967da8324a2e 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 = 4615622992387563054L; + private static final long serialVersionUID = 4615627168843069165L; /** @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 b0428e4acd78..6cc716d6761b 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 = 672588680937907856L; + private static final long serialVersionUID = 672592857396097201L; /** @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 52648bf8c78c..55d552579ae2 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 = 8654439544927407783L; + private static final long serialVersionUID = 8654438095899810832L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/Inner/S.java b/slice2java/cpp/test/Ice/scope/Test/Inner/S.java index 88ae2f699007..587111c9ba89 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 = 3694621371644977899L; + private static final long serialVersionUID = 3694619922622250972L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/S.java b/slice2java/cpp/test/Ice/scope/Test/S.java index d81932166aa8..a91ee6a94e88 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 = 2159697433301788117L; + private static final long serialVersionUID = 2159701609902776738L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/S1.java b/slice2java/cpp/test/Ice/scope/Test/S1.java index 0f6742e69542..8fa1d3a98de5 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 = 1241674690228959283L; + private static final long serialVersionUID = 1241678866840647604L; } diff --git a/slice2java/cpp/test/Ice/scope/Test/S2.java b/slice2java/cpp/test/Ice/scope/Test/S2.java index 3dc8625352db..965c6775957f 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 = -3656344939011074261L; + private static final long serialVersionUID = 1987913354971357720L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java index 9e96ed6ee8bb..3bef37e4bfd3 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 = -477021350890282728L; + private static final long serialVersionUID = -477021917773165676L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java index d5b54f556ff4..04ff529a2c95 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 = 3485211254229779006L; + private static final long serialVersionUID = 3485211012659118002L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index bb7b8ccff03e..6318e2b0aa2b 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 = 1717374947235586127L; + private static final long serialVersionUID = 1717376196012965315L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index f0994b843557..f1c1bafd448e 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 = -7384920878757882090L; + private static final long serialVersionUID = -7384921807227769702L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java index 0b26f724b26f..c2cb5951776f 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 = 3424370121572859258L; + private static final long serialVersionUID = 3424382390532503900L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index 0f8691d6233a..0f108e497c5d 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 = -1172598579044147349L; + private static final long serialVersionUID = -1172594487820828275L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index 4680b629a773..80ccd1fe161d 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 = -1126113985666857198L; + private static final long serialVersionUID = -1126112456564329868L; } diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index 956edce6f677..6521844eb847 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 = -2097583615844833422L; + private static final long serialVersionUID = -2097571346885188780L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/B.java b/slice2java/cpp/test/Ice/slicing/objects/Test/B.java index 5d6114eee840..a66d4323d295 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 = -6545541302247702043L; + private static final long serialVersionUID = 1884797925161178268L; /** @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 67ad516bb9a6..111d9b67ce5a 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 = -5686614526946614871L; + private static final long serialVersionUID = -7886775377903541296L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java index e59a0cf4c1e5..a3bbff507674 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 = -6396997002585411053L; + private static final long serialVersionUID = -6397001998205417465L; /** @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 74f207d35c94..186577b45323 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 = -9066880640995538532L; + private static final long serialVersionUID = -9066883287284214882L; /** @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 28c44229929e..5f01f914c634 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 = 3062817633353058246L; + private static final long serialVersionUID = -5514500706363128001L; /** @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 bc311533107f..5ce9bc3bf018 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 = -2965794550886794640L; + private static final long serialVersionUID = -7071449879801251280L; /** @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 b3ec5f289fd7..eed1f331c272 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 = -3534543578642135805L; + private static final long serialVersionUID = 7884460293380773201L; /** @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 63aab42dc15f..b6c81156511a 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 = 1624117638966919411L; + private static final long serialVersionUID = 5676723162199614707L; /** @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 29b625cd4f83..fbaa7b82c84f 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 = 8814290849384008134L; + private static final long serialVersionUID = -4071444658788098189L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java index d7736b11809b..add248e38c92 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 = -7655923769006969933L; + private static final long serialVersionUID = -7655926413008318235L; /** @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 14780a3ec85f..a1e817608716 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 = -2271128090854951237L; + private static final long serialVersionUID = -2271125447141788135L; /** @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 36f7a2ec9532..8a43e14460a8 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 = 4147524848392633962L; + private static final long serialVersionUID = 4147525248600506784L; /** @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 84aa91a8928c..7229c52632db 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 = 481713835129052911L; + private static final long serialVersionUID = 481705568459522601L; /** @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 eec33b3fa827..0c597000ce70 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 = -4426887650041465261L; + private static final long serialVersionUID = -4426887025031872825L; /** @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 223132fd8a20..ea14a75cc329 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 = 850544485111857986L; + private static final long serialVersionUID = 850538409959811538L; /** @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 6a2bfdd61c36..23065b12c66f 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 = -4328899385648690043L; + private static final long serialVersionUID = -4328898683090021198L; /** @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 fe8e812ff509..720ad28f6651 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 = -5081817813561166326L; + private static final long serialVersionUID = -5081818598783220729L; /** @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 3e2a782af250..5e20bb35e86c 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 = 643085598053439899L; + private static final long serialVersionUID = 643077334026568601L; /** @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 c877704d59c2..a788cd2dc7ba 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 = -2438013740660303977L; + private static final long serialVersionUID = -2438005794396442600L; /** @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 d6ebb4127daf..4331bfc0ae22 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 = -5997536990373069416L; + private static final long serialVersionUID = -3576754092601856366L; /** @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 7eb79740cb7d..1e162f6aaf29 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 = -8813708599995542262L; + private static final long serialVersionUID = -8813706190268688704L; /** @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 dabe20cf2741..842ec8e0b503 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 = 3651529342549460065L; + private static final long serialVersionUID = 3651531986254647265L; /** @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 b054c8ecd8ff..f26d52cd632f 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 = 8804382392006242372L; + private static final long serialVersionUID = 8804374448257583812L; /** @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 044f1631efe0..b9a37fa042e6 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 = -4989057092784717308L; + private static final long serialVersionUID = -4989069085337581874L; /** @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 dc3214bec382..76f7d748c050 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 = -5353761805976238094L; + private static final long serialVersionUID = -5353764769994344462L; /** @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 992e97a94c37..e0fb0f813119 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 = -6522139850074215616L; + private static final long serialVersionUID = -6522131585992237648L; /** @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 fa94281cac6b..58bf0cc0e63e 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 = 7620287909266529859L; + private static final long serialVersionUID = 7620290875758409715L; /** @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 9063b1dcd8a0..1e45a62dc807 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 = 6834706776542971077L; + private static final long serialVersionUID = -5330002670648569068L; } diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java index c032ba08ad10..7c6abf63b567 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 = -4643745689982928876L; + private static final long serialVersionUID = 4372692820142028756L; /** @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 462b33f1d107..c92533d876a5 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 = 2459130733250496566L; + private static final long serialVersionUID = 2608064775363167350L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java b/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java index 4c50e7529731..2507b5195a75 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 = 4995617499695096873L; + private static final long serialVersionUID = 4995622214856667852L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java b/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java index 61d74bcec358..4bf4ba7f7ef1 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 = -4418511668746297906L; + private static final long serialVersionUID = 4932974039439792885L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/MyClass.java b/slice2java/cpp/test/Ice/stream/Test/MyClass.java index 98ed21195cbc..943dd14665f0 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 = -6567852868696864286L; + private static final long serialVersionUID = 4256805469207139862L; /** @hidden */ @Override diff --git a/slice2java/cpp/test/Ice/stream/Test/MyException.java b/slice2java/cpp/test/Ice/stream/Test/MyException.java index 63556ee0e38b..462eb70f9897 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 = 5734225397786421337L; + private static final long serialVersionUID = 5734228790458311800L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java b/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java index 78036d104512..7d99695ceb78 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 = -9154672682651521326L; + private static final long serialVersionUID = 4503250321530568424L; /** @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 b1d2c535dd96..5616a8dc3e8d 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 = -1404702236440971135L; + private static final long serialVersionUID = -1404701661603803932L; } diff --git a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java index e18512bfd468..dbe5abc00011 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 = -6651748129173029210L; + private static final long serialVersionUID = 8495408652264905800L; } diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java index 93642624aee4..2ac320e9e199 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 = -8562123955471746701L; + private static final long serialVersionUID = -8562121887972492842L; } diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java index 9031ea626cf7..8df012b6c4a6 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 = -3207582118941727685L; + private static final long serialVersionUID = 5716137323419965060L; } diff --git a/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java b/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java index 5e76087213a2..7e4794bc46f6 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 = 4293916871411213795L; + private static final long serialVersionUID = -2672439028356061329L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Base.java b/slice2java/csharp/test/Ice/defaultValue/Test/Base.java index 7c0d500264d5..c351f11f00b0 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 = 7603344672471409990L; + private static final long serialVersionUID = 15432517716628710L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java index 083dd5910ef8..bae47b1f6d21 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 = 4620218623239779442L; + private static final long serialVersionUID = -1428785218727141614L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java index 06aa39f1100b..834e4824074d 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 = 891849070354612640L; + private static final long serialVersionUID = -6857446759724053517L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 554f8a8c8f82..857a144d016d 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 = -329300787905770372L; + private static final long serialVersionUID = -1697952698141653425L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java index ceac3adcdabb..50be31a7167e 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 = 2535588566651073242L; + private static final long serialVersionUID = 8057834866042351226L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java b/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java index 6f5a9d625cb5..04a7ed4344a0 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 = 790674031049276559L; + private static final long serialVersionUID = 6995810441853317647L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java index 289ef487e4b3..774bac7636ed 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 = 5094050281465379384L; + private static final long serialVersionUID = 254628408937161912L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index 298cd62e7685..d0f45a149796 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 = 1905590787019078852L; + private static final long serialVersionUID = 8309406441632601751L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 6af8a5b0cbba..3cf262d7e0f9 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 = -2474930190063320564L; + private static final long serialVersionUID = -3861941766828454529L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java index fcfba929fe60..3de956131158 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 = -352161587618691830L; + private static final long serialVersionUID = 2703631295546950058L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java index cb7d4841506c..07bef22811d7 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 = 5127386711861320641L; + private static final long serialVersionUID = 5127388801646032690L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java index bf0865b92366..e2dbf9e0a81a 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 = -7135058936935845280L; + private static final long serialVersionUID = -7135061111498595437L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java index f09fc333a1a0..08111c669dc1 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 = 4907986878364710089L; + private static final long serialVersionUID = -4955130691773581047L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java index 092f9f016afe..e669b0b2e9d0 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 = 8071019511949290572L; + private static final long serialVersionUID = -4331780124480369556L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java index 9833de127edd..fbb9af7f665b 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 = 438492266618213332L; + private static final long serialVersionUID = -5589578218616449196L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java index fffbe22134db..5531fa626573 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 = -4281586296348879533L; + private static final long serialVersionUID = -3476824726312294317L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java index f2abd2ec1fcf..8cb798173ed3 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 = -6350234760954415088L; + private static final long serialVersionUID = -4771582097218161136L; } diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java index 22d444b4448b..57ec05c0cee4 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 = 1484048245405357482L; + private static final long serialVersionUID = 6471734643383796810L; } diff --git a/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java b/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java index 4dd38e89592c..af6403feec6c 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 = -618649990569528601L; + private static final long serialVersionUID = -4923012127302975417L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/A.java b/slice2java/csharp/test/Ice/exceptions/Test/A.java index a3971640a383..47f2e2faf40b 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 = 7823744500691575461L; + private static final long serialVersionUID = 7823738752448474922L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/B.java b/slice2java/csharp/test/Ice/exceptions/Test/B.java index 2e5384f97a5b..c0f03184e7cd 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 = -3861405942659738907L; + private static final long serialVersionUID = -3861417311371440534L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/C.java b/slice2java/csharp/test/Ice/exceptions/Test/C.java index 45fd81e7330a..a256a0be1858 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 = 1080698191894360741L; + private static final long serialVersionUID = 1080692443651260202L; } diff --git a/slice2java/csharp/test/Ice/exceptions/Test/D.java b/slice2java/csharp/test/Ice/exceptions/Test/D.java index 147d882b815a..142ab0e91b09 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 = 4780386325442339301L; + private static final long serialVersionUID = 4780374956730637674L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Color.java b/slice2java/csharp/test/Ice/hash/Test/Color.java index 203a08a64f15..4f9254a064e8 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 = 1859503363088019446L; + private static final long serialVersionUID = -3284986253997650954L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java b/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java index f28e9e36e3f5..5ec2224aa86d 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 = -2820073395469105514L; + private static final long serialVersionUID = -2820070030998396698L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Draw.java b/slice2java/csharp/test/Ice/hash/Test/Draw.java index 87f31f433be2..5b1f1195107d 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 = 2707897916095509516L; + private static final long serialVersionUID = 2195864343961867324L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java index ae3b03778805..6ec9b2ae8dfd 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 = -1224580570872524465L; + private static final long serialVersionUID = -1224582661526795585L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java index adf497a2b6c9..36e4904e60fe 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 = -8727123772784649411L; + private static final long serialVersionUID = -8727127385252929523L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/OtherException.java b/slice2java/csharp/test/Ice/hash/Test/OtherException.java index 7cce0f36cef3..8c18d3ecd77b 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 = -7795699427481685022L; + private static final long serialVersionUID = -3071165739998928990L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Pen.java b/slice2java/csharp/test/Ice/hash/Test/Pen.java index e17aa27a3a55..f967cbe38830 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 = -8798073381084191486L; + private static final long serialVersionUID = 7151224890051276994L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/hash/Test/Point.java b/slice2java/csharp/test/Ice/hash/Test/Point.java index 3b72c7324e59..9019784716ef 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 = -2378571055908176784L; + private static final long serialVersionUID = 39293032899031600L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/PointD.java b/slice2java/csharp/test/Ice/hash/Test/PointD.java index 0bdfe2b4dd44..3efaa38dd551 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 = -4814260576102570557L; + private static final long serialVersionUID = -6428055077715916173L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/PointF.java b/slice2java/csharp/test/Ice/hash/Test/PointF.java index b458d65417e9..d1ae81b83e1c 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 = -393622242757757272L; + private static final long serialVersionUID = -2243220837434579944L; } diff --git a/slice2java/csharp/test/Ice/hash/Test/Polyline.java b/slice2java/csharp/test/Ice/hash/Test/Polyline.java index bbc966b6cfd1..7031797e3d7d 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 = -345030643430346322L; + private static final long serialVersionUID = -345032315809997346L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java index d2c7beb55409..388a4a03ca33 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 = 2568818157963089986L; + private static final long serialVersionUID = 2568824929212559203L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java index 37b1075e57d6..6a907fae73b7 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 = -6709847450305091702L; + private static final long serialVersionUID = -6709851413903483165L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java index e6675a65e810..b6ae332dacdf 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 = 244433016138923437L; + private static final long serialVersionUID = 244431695045424908L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java index fbcf03b9f759..d7d371bd1ead 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 = -1207063450565971819L; + private static final long serialVersionUID = -1207059486976919492L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java index 178dc3b5b0d2..24b22cd4eec5 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 = 7599601111488961498L; + private static final long serialVersionUID = 7599607882738430715L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java index 7e78448f33bc..e23e17aded55 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 = 9211536057891484222L; + private static final long serialVersionUID = 9211528293576575930L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java index 11ffd73dac75..999e0c86ba4f 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 = 770570210423124429L; + private static final long serialVersionUID = 770572519577061577L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java index d24159d46e25..f5da32598759 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 = -4823065671868750031L; + private static final long serialVersionUID = -4823059230017041995L; } diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java index 4bae8c7d54eb..57198dd037df 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 = 2279078318881760721L; + private static final long serialVersionUID = 2279078985270024149L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/A.java b/slice2java/csharp/test/Ice/objects/Test/A.java index da30266c3088..dfe94e08527b 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 = 4476659922805551705L; + private static final long serialVersionUID = -5685486726103791271L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/A1.java b/slice2java/csharp/test/Ice/objects/Test/A1.java index a4f057de5bb0..4b5b55c5e7d9 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 = -5926745922963898320L; + private static final long serialVersionUID = -5926741831436830894L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/B.java b/slice2java/csharp/test/Ice/objects/Test/B.java index 207a4f8af764..d3d7d5e6914c 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 = -8890918288574670288L; + private static final long serialVersionUID = -8890919817829138990L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/B1.java b/slice2java/csharp/test/Ice/objects/Test/B1.java index 7f6b1d42160a..f61ca1a72ca6 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 = 3768418662545407172L; + private static final long serialVersionUID = 6555202353586127748L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/Base.java b/slice2java/csharp/test/Ice/objects/Test/Base.java index 0dae23143ee1..61bd8d53a412 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 = 6045253261290139220L; + private static final long serialVersionUID = -9135073881037442156L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/C.java b/slice2java/csharp/test/Ice/objects/Test/C.java index d73544c1c985..3c2fd2e36549 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 = 5346508879606087882L; + private static final long serialVersionUID = 5146167205558128552L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/COneMember.java b/slice2java/csharp/test/Ice/objects/Test/COneMember.java index 77ca9db722a0..2d0ba21e266f 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 = 3050977139599283184L; + private static final long serialVersionUID = 3050973218545992018L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java index e1bdb162cb7d..a959afa59b29 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 = 8871008579192952987L; + private static final long serialVersionUID = -2278773792918490085L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/D.java b/slice2java/csharp/test/Ice/objects/Test/D.java index 5db1f9c3d8b6..45e417db0388 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 = 4689199303280126733L; + private static final long serialVersionUID = 5023684063557036783L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/D1.java b/slice2java/csharp/test/Ice/objects/Test/D1.java index 982909cec1ea..43319d2f41a2 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 = -5226205191495268989L; + private static final long serialVersionUID = 3750952702799573059L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/E.java b/slice2java/csharp/test/Ice/objects/Test/E.java index ab6aabb7380c..d4296defd71a 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 = -4772212507490289637L; + private static final long serialVersionUID = -5120900476469597989L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/EBase.java b/slice2java/csharp/test/Ice/objects/Test/EBase.java index 249fa15b02bd..71d585a83ebd 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 = -4989495376757670002L; + private static final long serialVersionUID = -8770321659066635954L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/EDerived.java b/slice2java/csharp/test/Ice/objects/Test/EDerived.java index baff52c592cc..3ceb27d8cad6 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 = 561950097388584466L; + private static final long serialVersionUID = -163308446119037230L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/EOneMember.java b/slice2java/csharp/test/Ice/objects/Test/EOneMember.java index 2aa020d6c70a..d82d6384954c 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 = -6225292283087284929L; + private static final long serialVersionUID = -6225288031266256291L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java index 983c8a5d5694..abf76c84cd18 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 = -5399432454121358316L; + private static final long serialVersionUID = 8221229997609679892L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/F.java b/slice2java/csharp/test/Ice/objects/Test/F.java index 8737d5c304ea..27e531540240 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 = 6866615056267835985L; + private static final long serialVersionUID = 7929541516603147153L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/F1.java b/slice2java/csharp/test/Ice/objects/Test/F1.java index a7b712c016e7..b5372faaff36 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 = 6192372464549905851L; + private static final long serialVersionUID = 6192366007222340868L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/F3.java b/slice2java/csharp/test/Ice/objects/Test/F3.java index 58b6c2212e48..529e2d48c562 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 = -6820660566137907513L; + private static final long serialVersionUID = 5900224620562476295L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/IBase.java b/slice2java/csharp/test/Ice/objects/Test/IBase.java index aa0c4af88bc8..39ca00cf1e1f 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 = 4060269548692877302L; + private static final long serialVersionUID = 4060273800361972628L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/IDerived.java b/slice2java/csharp/test/Ice/objects/Test/IDerived.java index 8049369d5599..d0162f193fcb 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 = 7299534471791445486L; + private static final long serialVersionUID = 7299538723460540812L; /** @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 531a763b48ca..be0868f7d997 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 = -1425260915772266022L; + private static final long serialVersionUID = -1425256824093548808L; /** @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 ee2ab6687f2c..54adae9bf4ec 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 = -2337229075745020791L; + private static final long serialVersionUID = -2337227877258141205L; } 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 dbfe1df0a5ff..2e6b5fb9b24c 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 = -1298679475083801167L; + private static final long serialVersionUID = -1298680833708248109L; /** @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 c836bfbc5319..67746afdca8a 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 = 1842238228550384557L; + private static final long serialVersionUID = 1842234307649026447L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/K.java b/slice2java/csharp/test/Ice/objects/Test/K.java index dd087f0a8233..c2ad24e04166 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 = 4645161878806368595L; + private static final long serialVersionUID = 4645162906971273905L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/L.java b/slice2java/csharp/test/Ice/objects/Test/L.java index b6269ffcf906..3aa1050c4325 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 = 6629739409599148859L; + private static final long serialVersionUID = 6629735318224018841L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/M.java b/slice2java/csharp/test/Ice/objects/Test/M.java index fea16f505353..3adcf634d456 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 = -8088097532555468102L; + private static final long serialVersionUID = -8088093110573602728L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/Recursive.java b/slice2java/csharp/test/Ice/objects/Test/Recursive.java index 42caf827bd07..9b93b07524b4 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 = 3617877963909883788L; + private static final long serialVersionUID = 3617878992070189550L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/objects/Test/S.java b/slice2java/csharp/test/Ice/objects/Test/S.java index a8a4d7d7958e..d0b751da0015 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 = 481772058201136392L; + private static final long serialVersionUID = 481770699420291498L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/S1.java b/slice2java/csharp/test/Ice/objects/Test/S1.java index e02e74697718..971233a07583 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 = 7211339793753829425L; + private static final long serialVersionUID = 7211335872852471315L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/SC1.java b/slice2java/csharp/test/Ice/objects/Test/SC1.java index 04d88f5de491..e7929763dd76 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 = 186202588960554658L; + private static final long serialVersionUID = 186206510013850176L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/SOneMember.java b/slice2java/csharp/test/Ice/objects/Test/SOneMember.java index 11bb5cb74226..9a909b2900fc 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 = 6227753053892890537L; + private static final long serialVersionUID = 6227757475874616651L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java index f7467dca998e..d60b37d655b8 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 = 1379839123609533570L; + private static final long serialVersionUID = 5543083207637580162L; } diff --git a/slice2java/csharp/test/Ice/objects/Test/StructKey.java b/slice2java/csharp/test/Ice/objects/Test/StructKey.java index 589618134902..453b1ebe2a78 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 = 4318057569739064791L; + private static final long serialVersionUID = 3259717196065445015L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java index 640cf201f18e..d71eeb46c756 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 = 2723841315715897013L; + private static final long serialVersionUID = 2723843640529171228L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/MyClass1.java b/slice2java/csharp/test/Ice/operations/Test/MyClass1.java index 5900cfce2bd8..f42a9928bca3 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 = -761199133522964338L; + private static final long serialVersionUID = -4150824818105197411L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct.java index 90e67825e2fe..61e2bcb70cd0 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 = 3920598627105786461L; + private static final long serialVersionUID = -2088112528305864035L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java index 35cd68d0c1ea..78a71b73b62b 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 = -1507675817227325593L; + private static final long serialVersionUID = -7180016718103815756L; } diff --git a/slice2java/csharp/test/Ice/operations/Test/Structure.java b/slice2java/csharp/test/Ice/operations/Test/Structure.java index e0daba4111dc..19f5a88d808f 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 = 9012669423685975027L; + private static final long serialVersionUID = -3779631383524609050L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/A.java b/slice2java/csharp/test/Ice/optional/Test/A.java index da10296ab480..f3b413bef94f 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 = -1620058312355059312L; + private static final long serialVersionUID = 5486250862774758672L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/B.java b/slice2java/csharp/test/Ice/optional/Test/B.java index 73cd496209a0..b6355ddaab63 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 = -649660624965515357L; + private static final long serialVersionUID = 8820840465253875939L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/C.java b/slice2java/csharp/test/Ice/optional/Test/C.java index 7ce945744b51..e9daba921fec 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 = -7596250213553358979L; + private static final long serialVersionUID = -7321192413587024259L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/DerivedException.java b/slice2java/csharp/test/Ice/optional/Test/DerivedException.java index ca0ef8da3998..07a54acf4e50 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 = -7537934439600633691L; + private static final long serialVersionUID = -1553151618022202105L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/E.java b/slice2java/csharp/test/Ice/optional/Test/E.java index 2caa28126729..82328a00c06f 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 = -1850732510912692939L; + private static final long serialVersionUID = -1850739169560399401L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/F.java b/slice2java/csharp/test/Ice/optional/Test/F.java index e9da8463bafb..1945f5a799b5 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 = -6430493998795722810L; + private static final long serialVersionUID = -6430492800313451996L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java b/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java index da3314c3fe74..73fbba8f97ce 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 = 1569613767010531670L; + private static final long serialVersionUID = 1569601492742552180L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/G.java b/slice2java/csharp/test/Ice/optional/Test/G.java index 3d90d501b568..a45dc2ead99d 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 = 1556134406383620627L; + private static final long serialVersionUID = 7865421011629534931L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/G1.java b/slice2java/csharp/test/Ice/optional/Test/G1.java index e722cd7caf2c..ada2c1eb09df 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 = 7339783451402830763L; + private static final long serialVersionUID = 7339784649885241097L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/G2.java b/slice2java/csharp/test/Ice/optional/Test/G2.java index 3b1098292035..139ec2f272d6 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 = 3824558102418819521L; + private static final long serialVersionUID = 3824551443761917283L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java b/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java index cb3763dd868d..e32dcbf9bd4a 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 = 7721701411284231163L; + private static final long serialVersionUID = -4564404854956023493L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/OneOptional.java b/slice2java/csharp/test/Ice/optional/Test/OneOptional.java index 2446a8797dbf..e3d24ed43093 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 = -7219608801469876104L; + private static final long serialVersionUID = -7219599254777507942L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalException.java b/slice2java/csharp/test/Ice/optional/Test/OptionalException.java index f84092a530dc..bcecb2d37017 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 = -2152587908101725165L; + private static final long serialVersionUID = 424643479268047985L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java index 318afc95370d..4a48efd35200 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 = -765664598968295237L; + private static final long serialVersionUID = 1747264458564442747L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/optional/Test/RequiredException.java b/slice2java/csharp/test/Ice/optional/Test/RequiredException.java index 5a64d0cde63f..341b30b75ba6 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 = 2894245652445131682L; + private static final long serialVersionUID = 2894238673191225152L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java b/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java index 8db260ee17aa..62b8882498c7 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 = 6700992035102074713L; + private static final long serialVersionUID = 6700987938570424891L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/VarStruct.java b/slice2java/csharp/test/Ice/optional/Test/VarStruct.java index 88dd8cf48410..7e61be3f2b40 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 = -1912285416181330653L; + private static final long serialVersionUID = -1912284217698920319L; } diff --git a/slice2java/csharp/test/Ice/optional/Test/WD.java b/slice2java/csharp/test/Ice/optional/Test/WD.java index 8441173e1345..fee240f22e94 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 = 360373390313459923L; + private static final long serialVersionUID = -7184132238438754797L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/C.java b/slice2java/csharp/test/Ice/scope/Test/C.java index 581e9984d59e..c7b57ab87b99 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 = -5190247547765686647L; + private static final long serialVersionUID = -5190250678134871709L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/C1.java b/slice2java/csharp/test/Ice/scope/Test/C1.java index fd4a494209c2..657e0c54566a 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 = 8893232969600648050L; + private static final long serialVersionUID = 8893236580386048482L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/scope/Test/C2.java b/slice2java/csharp/test/Ice/scope/Test/C2.java index 6d2ae6787a35..8ac3cba360ec 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 = -5755699501954780910L; + private static final long serialVersionUID = -3717399595921946287L; /** @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 a520616f7d55..3803edd86e15 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 = 4615623112501217240L; + private static final long serialVersionUID = 4615626245416824655L; /** @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 1c4ea52f69ec..88893db131da 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 = 672588801049239280L; + private static final long serialVersionUID = 672586799254566226L; /** @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 f47a1e4e2425..b47e97765270 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 = 8654439499647245283L; + private static final long serialVersionUID = 8654435888861287283L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/Inner/S.java b/slice2java/csharp/test/Ice/scope/Test/Inner/S.java index 70f09f6e8a7a..05c087bb0d20 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 = 3694621326369545775L; + private static final long serialVersionUID = 3694623491019711551L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/S.java b/slice2java/csharp/test/Ice/scope/Test/S.java index 5e65aceb86ea..b867bc692a16 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 = 2159697393342914961L; + private static final long serialVersionUID = 2159695231270943617L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/S1.java b/slice2java/csharp/test/Ice/scope/Test/S1.java index 82afe7be0236..c5f48581b8e3 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 = 1241674650275682251L; + private static final long serialVersionUID = 1241676980091010651L; } diff --git a/slice2java/csharp/test/Ice/scope/Test/S2.java b/slice2java/csharp/test/Ice/scope/Test/S2.java index d75bbef83872..c28bf7c58eaf 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 = 3302711488333730795L; + private static final long serialVersionUID = 3968686466882937384L; } diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CR.java b/slice2java/csharp/test/Ice/seqMapping/Test/CR.java index 0219730b5ea7..62343d0a127e 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 = 2039941046633267780L; + private static final long serialVersionUID = 2039943149308862822L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CV.java b/slice2java/csharp/test/Ice/seqMapping/Test/CV.java index 2a97b570f30c..f7a81f024986 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 = -3369460700614557980L; + private static final long serialVersionUID = -3369457352977640762L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/S.java b/slice2java/csharp/test/Ice/seqMapping/Test/S.java index 1a6d7df0870e..7a06c65e9365 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 = -691303122574118325L; + private static final long serialVersionUID = -691305318065061399L; } diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/SD.java b/slice2java/csharp/test/Ice/seqMapping/Test/SD.java index 5df092d93f68..9070d8fd4683 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 = 9219740800228088495L; + private static final long serialVersionUID = 9219744395532312013L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java index 90bfe08fd86f..ae21f29fddfb 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 = -477016985728104925L; + private static final long serialVersionUID = -477021655533917900L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java index 302fa4eddc3b..d128e4eceb23 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 = 3485210334861277509L; + private static final long serialVersionUID = 3485210954605105234L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index c7c2a03ad8de..11b632a44277 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 = 1717370933200306484L; + private static final long serialVersionUID = 1717375933755178275L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 3b1fdbaa0ebb..dbaef13c2bce 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 = -7384917355627776851L; + private static final long serialVersionUID = -7384921865263526470L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java index 131a9a971566..a34633119dbc 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 = 3424371961843480271L; + private static final long serialVersionUID = 3424380613467842361L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index 24fde2e44b8e..5c6ee0bf0334 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 = -1172606200077069282L; + private static final long serialVersionUID = -1172597840315268184L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index d9260ece1ac4..fbff95a3ae7a 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 = -1126117430092648217L; + private static final long serialVersionUID = -1126108948932579119L; } diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index 77c1167eec10..bcb2b81af5b7 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 = -2097581775574212409L; + private static final long serialVersionUID = -2097573123949850319L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/B.java b/slice2java/csharp/test/Ice/slicing/objects/Test/B.java index 60f82c11fd91..01eaff33ba63 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 = 4135165200038670268L; + private static final long serialVersionUID = 2200539470791318588L; /** @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 f8e4d8665fa4..0e46745745bf 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 = 2215412258296652528L; + private static final long serialVersionUID = -2347612860412286096L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java index c2d24a5fe490..70f4036e5ef9 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 = -6397006188832839545L; + private static final long serialVersionUID = -6396997041490665109L; /** @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 b0867f6ec48a..8d933788d415 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 = -9066881282814917413L; + private static final long serialVersionUID = -9066888044894156178L; /** @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 5f86bee78f51..2a4dae7641ac 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 = -7964090095793722049L; + private static final long serialVersionUID = 6695545259339692703L; /** @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 19c64362238b..f6cf142b5f40 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 = -8421539215501235890L; + private static final long serialVersionUID = 638168986237206638L; /** @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 c3bde88fdda0..a3b394eff8b9 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 = -6797764695646219185L; + private static final long serialVersionUID = -7303880225903935133L; /** @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 209a2c611058..04600af75445 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 = -6842944443560563981L; + private static final long serialVersionUID = -5703175713356041357L; /** @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 73c578cdf120..d7f12fb263e4 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 = 9033120964143131647L; + private static final long serialVersionUID = 6653796703519728863L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java index 89efcbc440a9..3c36ff2f5469 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 = -7655923127223129602L; + private static final long serialVersionUID = -7655927285749946293L; /** @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 a9bc1889076c..64a258bf1bdc 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 = -2271128732674284625L; + private static final long serialVersionUID = -2271124904734683814L; /** @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 dad5a1b3589b..7b226bb3c839 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 = 4147534890815580754L; + private static final long serialVersionUID = 4147520410757033415L; /** @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 e3d93119c656..4a9baf338174 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 = 481709021787677043L; + private static final long serialVersionUID = 481713053565315206L; /** @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 017b1cd7fcee..634842c2d922 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 = -4426891050664329913L; + private static final long serialVersionUID = -4426887688937380309L; /** @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 47dccb2672f1..3dba6c385b96 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 = 850542600881398529L; + private static final long serialVersionUID = 850544689172991397L; /** @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 27aaca9a8a6d..5243eb8809d3 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 = -4328900073805245692L; + private static final long serialVersionUID = -4328899341744986792L; /** @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 f09b741e7055..6a8525a57d13 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 = -5081814563022017114L; + private static final long serialVersionUID = -5081817940120567703L; /** @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 69c665524248..28d0cc75ba6e 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 = 643079501073353308L; + private static final long serialVersionUID = 643086224631579945L; /** @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 8ee7bd68d0b8..929be831ed64 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 = -2438007643716038832L; + private static final long serialVersionUID = -2438001046824376603L; /** @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 cc27e67619bd..c6c72626a8ab 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 = -1782493528030873389L; + private static final long serialVersionUID = -3810777367291378010L; /** @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 f4030bb991e9..ab9ccf253580 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 = -8813707662497198751L; + private static final long serialVersionUID = -8813712515878719180L; /** @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 18ffde0661a5..22ba7c9272e7 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 = 4410693123589348448L; + private static final long serialVersionUID = 4410699501012627765L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java index 8c64629402da..dcd91cea02a1 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 = 3651528700765904172L; + private static final long serialVersionUID = 3651532528527081049L; /** @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 7ba834a009ef..8a7327dddd2a 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 = 8804376295061991945L; + private static final long serialVersionUID = 8804372428404625660L; /** @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 18321fa7a140..32acebc566dd 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 = -4989067817118430066L; + private static final long serialVersionUID = -4989058797346939941L; /** @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 4a8c0cd2e937..b567d8773aa5 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 = -5353761164192535361L; + private static final long serialVersionUID = -5353754732684521846L; /** @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 8ea882ea5abf..057a73f1317c 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 = -6522135036732298392L; + private static final long serialVersionUID = -6522141633514966947L; /** @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 fbe52006a7cb..0134847f0bb1 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 = 7620287267447541035L; + private static final long serialVersionUID = 7620283565984261214L; /** @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 4b38d951f307..7d08dc5d7780 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 = -1567019619533668454L; + private static final long serialVersionUID = -8126142938366284966L; } diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java index 4823270c42bd..1cd7e1a26c39 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 = -8427314300238519303L; + private static final long serialVersionUID = -4860846652818821543L; /** @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 80f05241b136..b99152aef831 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 = -3794539832154112166L; + private static final long serialVersionUID = -1725973418894116550L; } diff --git a/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java b/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java index 395894b9033d..6f53b1c6e9f9 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 = -3212859853258006461L; + private static final long serialVersionUID = 1579671519440842461L; } diff --git a/slice2java/csharp/test/Ice/stream/Test/MyClass.java b/slice2java/csharp/test/Ice/stream/Test/MyClass.java index 6b822b12ec54..bec344aedb06 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 = 6151533060470295721L; + private static final long serialVersionUID = 7027982548641613895L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Ice/stream/Test/MyException.java b/slice2java/csharp/test/Ice/stream/Test/MyException.java index 60ab40f7c7b5..00d0d28c2a83 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 = 5734234682030027103L; + private static final long serialVersionUID = 5734228322904013874L; } diff --git a/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java b/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java index e4928af0769f..643d62a28176 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 = 6153633819935356232L; + private static final long serialVersionUID = -8226799044200444153L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/escape/Clash/Cls.java b/slice2java/csharp/test/Slice/escape/Clash/Cls.java index 844538006ef5..cf7253c8b107 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 = -6007955246540115189L; + private static final long serialVersionUID = 5718452251363449489L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/escape/Clash/Ex.java b/slice2java/csharp/test/Slice/escape/Clash/Ex.java index 6d2139e55d20..df2b7b3f9cec 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 = -5897675383015006099L; + private static final long serialVersionUID = -6233263394610408134L; } diff --git a/slice2java/csharp/test/Slice/escape/Clash/St.java b/slice2java/csharp/test/Slice/escape/Clash/St.java index 5047d6e288d7..824407436bf1 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 = 6604915770358166807L; + private static final long serialVersionUID = 8007525618197386850L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java b/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java index 801df8237988..a58f229bc0e8 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 = -2671656197902646056L; + private static final long serialVersionUID = -878271785253935985L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/_break.java b/slice2java/csharp/test/Slice/escape/_abstract/_break.java index 3edf43855b6b..12618f2d8512 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 = 3009638667577276279L; + private static final long serialVersionUID = 3009641575965553504L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/delegate.java b/slice2java/csharp/test/Slice/escape/_abstract/delegate.java index efb58b5a41a2..a10ead96248c 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 = 5201317907569399078L; + private static final long serialVersionUID = -6538728681876335951L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/escape/_abstract/fixed.java b/slice2java/csharp/test/Slice/escape/_abstract/fixed.java index b8e0511cdb55..e26c1cb00e1c 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 = -8293835587340645021L; + private static final long serialVersionUID = -8293822127829350028L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/foreach.java b/slice2java/csharp/test/Slice/escape/_abstract/foreach.java index a2c45e7e88a2..5337c6505b35 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 = -8303874453841015229L; + private static final long serialVersionUID = 2395498525822250115L; } diff --git a/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java b/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java index 61e64c3502ad..40998baae58b 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 = -994176540586889479L; + private static final long serialVersionUID = -2295351202390438610L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/macros/Test/Default.java b/slice2java/csharp/test/Slice/macros/Test/Default.java index 51ece0c6914f..c602bd820a94 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 = -229242771505109698L; + private static final long serialVersionUID = -606595342230188226L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/macros/Test/NoDefault.java b/slice2java/csharp/test/Slice/macros/Test/NoDefault.java index ad7040ec0396..f99603493e43 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 = 5105820280711806303L; + private static final long serialVersionUID = -5118796565303158689L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/structure/Test/C.java b/slice2java/csharp/test/Slice/structure/Test/C.java index f194cde7451a..20f8e73fc699 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 = -3172278220534687499L; + private static final long serialVersionUID = -3172279687653690335L; /** @hidden */ @Override diff --git a/slice2java/csharp/test/Slice/structure/Test/S1.java b/slice2java/csharp/test/Slice/structure/Test/S1.java index a035835ef7a8..24c3bf5a88e7 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 = -5542859876322446882L; + private static final long serialVersionUID = -5542850267660733324L; } diff --git a/slice2java/csharp/test/Slice/structure/Test/S2.java b/slice2java/csharp/test/Slice/structure/Test/S2.java index 95958a0eda0a..e113b4ce462f 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 = 2374312187058640713L; + private static final long serialVersionUID = -2708363228839641808L; } 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 64413c744229..6f1231bf24d6 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 = 733771103058105735L; + private static final long serialVersionUID = 3204280102433707551L; } 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 016b17bb6082..9193d48ada40 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 = 6434293250372620641L; + private static final long serialVersionUID = 6434300421991377791L; /** @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 518bee37ef8e..e5686860a335 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 = 6384638172247591585L; + private static final long serialVersionUID = 6384636263609875175L; } 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 7318ee1f565c..23d7421e0eed 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 = -2014565321908395113L; + private static final long serialVersionUID = -2014571363234268719L; } 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 69671baeb431..62564a6989dd 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 = 8462029072700839653L; + private static final long serialVersionUID = -6120290025006745691L; /** @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 959581b41e89..bd50d0216ac2 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 = -492070796668882927L; + private static final long serialVersionUID = 6670251677894464721L; } 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 439b5a33fe1d..5b24d9559e1e 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 = -8448549628383306430L; + private static final long serialVersionUID = -7290444627906092908L; /** @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 50a84879d43a..71b677a43fab 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 = 6825504013059864726L; + private static final long serialVersionUID = -2851376886819378758L; /** @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 842bcd312cdf..85d0e41ac7a6 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 = 1013400754776636874L; + private static final long serialVersionUID = 2091742658121330956L; /** @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 95a586307206..afab3f6c26e0 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 = 1200788653613794173L; + private static final long serialVersionUID = -1366000493795678277L; } 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 8d9e0ca0c9d0..ead641e604e0 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 = -1816632458085769562L; + private static final long serialVersionUID = 3618973755475390960L; } 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 f728559dbada..b6dd2615e8ff 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 = -5611219997574603226L; + private static final long serialVersionUID = 2613201387622010442L; } 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 d5db0a474007..2de601b2b616 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 = 5127395158163178068L; + private static final long serialVersionUID = 5127387432532082095L; } 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 d088a65c3511..1d9a06af4c38 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 = 6554634393092670959L; + private static final long serialVersionUID = 1209382688204734281L; } 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 e615ddd88772..962b618142f0 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 = -3091488460576684946L; + private static final long serialVersionUID = 7660581175249956834L; } 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 690a1336c951..dd9680e2b4ef 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 = -2178128138352026155L; + private static final long serialVersionUID = 1801471207606061898L; } 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 2e4bd86ea39e..e19bd8c71fcb 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 = 7823740490859363891L; + private static final long serialVersionUID = 7823744889508961759L; } 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 70ee0a9f1445..ea4a7d539c7d 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 = -3861420862965150477L; + private static final long serialVersionUID = -3861405719150252897L; } 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 9f01a572c106..6910f444d96a 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 = 1080694182062149171L; + private static final long serialVersionUID = 1080698580711747039L; } 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 49e455a9100e..092119643a2e 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 = 4780371405136927731L; + private static final long serialVersionUID = 4780386548951825311L; } 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 6230e38be3b1..86adce4a0d51 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 = 7823740610887591994L; + private static final long serialVersionUID = 7823737064414769001L; } 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 54c992ed198c..a3b1a1a541bd 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 = -3861420742936922374L; + private static final long serialVersionUID = -3861418999405146711L; } 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 f73f42d26044..a8815361f198 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 = 1080694302090377274L; + private static final long serialVersionUID = 1080690755617554281L; } 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 37b04c99a7b0..15f129eee0bd 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 = 4780371525165155834L; + private static final long serialVersionUID = 4780373268696931497L; } 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 caba4c6aa147..0ee6bed2f13a 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 = -5016798289216929418L; + private static final long serialVersionUID = -983456664232033802L; } 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 607fca069508..e7e376c4a547 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 = -2820065938416755380L; + private static final long serialVersionUID = -2820070321926690113L; } 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 ef8ef28c0ec5..8491999d9d3f 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 = -1083906857415310909L; + private static final long serialVersionUID = -2268588437037497555L; } 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 53b0bf7114a0..2459f2178c93 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 = -4957234618701288142L; + private static final long serialVersionUID = -8433838967627971212L; /** @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 56378ec3f74b..644cfe9aef1b 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 = 7709472427971406416L; + private static final long serialVersionUID = -6183759023489735216L; } 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 8f863aa481bd..dbe5945b5c84 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 = -361664145427879567L; + private static final long serialVersionUID = -6592940075112871673L; } 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 4e17759ccde7..dc7aa5f67dd6 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 = -8174729025098400654L; + private static final long serialVersionUID = 2075545892057620174L; } 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 10dd25aee6fd..d6bea89f8665 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 = -345025828788042155L; + private static final long serialVersionUID = -345033024963847884L; } 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 56149db67daf..8eb3a9dd923a 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 = -8679723097134489862L; + private static final long serialVersionUID = 5014040301336608438L; /** @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 cbba83915085..4ac10a9135c3 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 = -5926746641022883385L; + private static final long serialVersionUID = -5926743073831162585L; /** @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 0000f02738cc..a17c4cfbc575 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 = -8890912360772575633L; + private static final long serialVersionUID = -8890910475289198867L; /** @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 e7e847cff334..4aba116270dd 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 = -4785529694050807356L; + private static final long serialVersionUID = 1739247873287268356L; /** @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 48e61bb0fb42..9491960d4faa 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 = -8371598300913462144L; + private static final long serialVersionUID = -6648770045664578407L; /** @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 7b5f6da0d04b..3f0d3a54702f 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 = 4294593359475725513L; + private static final long serialVersionUID = -8922307153856680216L; /** @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 16e53a384729..95e689ca3b8c 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 = 3050965756447391863L; + private static final long serialVersionUID = 3050969000769255318L; /** @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 6c8877fc59d3..7de653b99662 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 = 6209643762420881307L; + private static final long serialVersionUID = -3224973537319365989L; /** @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 5352c0b2f96b..0728be6570e7 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 = -8254732955733361071L; + private static final long serialVersionUID = 6932748488581780191L; /** @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 c2e51667d72f..323606a8ed93 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 = -6389474946160780029L; + private static final long serialVersionUID = 2501464555351749187L; /** @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 919c1c1ea636..c001b4136414 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 = -706393429255008296L; + private static final long serialVersionUID = -2231038669787124601L; /** @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 db2a4d5a8e8e..d8d652610c85 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 = 2784850876162292366L; + private static final long serialVersionUID = 8124646672090606798L; } 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 3ea12ee7482b..c5d47e49cedc 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 = -8710905218813794926L; + private static final long serialVersionUID = 176087635772248530L; } 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 bf70e39e084f..361d528900b9 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 = -6225287385687640648L; + private static final long serialVersionUID = -6225284144105319911L; } 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 b497a944633a..a7bf73f6072d 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 = 4557246176325932052L; + private static final long serialVersionUID = 9167429742010555796L; } 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 c875e27cf048..c1eb688bafe9 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 = 2467452396619955281L; + private static final long serialVersionUID = -8263824965900826991L; /** @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 22d77f46f0d9..98d4fa0cd67d 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 = 6192372973396839283L; + private static final long serialVersionUID = 6192369136367363284L; /** @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 3db6744b5098..f54345fd122f 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 = 3951058676115344768L; + private static final long serialVersionUID = 2570385225218340731L; /** @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 3c20996fc6f9..74421c5f4a28 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 = -1425260272353952507L; + private static final long serialVersionUID = -1425258066572567161L; /** @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 f263ce1f6549..c8a59bf17041 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 = -2337228517828351106L; + private static final long serialVersionUID = -2337226309404686050L; } 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 bda08b6251ee..5d363d13c3ce 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 = -1298689742182181612L; + private static final long serialVersionUID = -1298687531434692733L; /** @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 4e084309d6be..f6bb40b151bb 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 = 1842228206913676826L; + private static final long serialVersionUID = 1842230089721249978L; } 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 a81212981a0b..6d159df87eae 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 = 4645162266476256242L; + private static final long serialVersionUID = 4645159024825095917L; /** @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 4cb951379736..f14365fa2846 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 = 6629749676772009228L; + private static final long serialVersionUID = 6629747470949886636L; /** @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 eb58e6c3dce0..a3994aee2979 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 = -8088103375389484982L; + private static final long serialVersionUID = -8088105593895585937L; /** @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 4acd5de602f1..50058d08688d 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 = 3617889261904709657L; + private static final long serialVersionUID = 3617886020237800714L; /** @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 6404a7151e0d..6bd4f0dd2a79 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 = 481778156510649279L; + private static final long serialVersionUID = 481774581588875295L; } 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 0b9e597404d4..7e058a26e4c0 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 = 6227748572490965422L; + private static final long serialVersionUID = 6227744992709847951L; } 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 41d83c1988df..4a6627dd245c 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 = -7044787304016219518L; + private static final long serialVersionUID = 4237411667553424642L; } 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 b2176bf4a40d..cc93e31c83e5 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 = 787611593902228628L; + private static final long serialVersionUID = -864828464414450741L; } 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 5b3e0414f250..e19efdd8cef4 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 = 2723841555938153981L; + private static final long serialVersionUID = 2723851106422193883L; } 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 1a26898e6605..9b35a10c295b 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 = 1717441698800678475L; + private static final long serialVersionUID = -1546037857695048887L; /** @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 5cb5f047a8ad..c2ae93406648 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 = 4655374030539180861L; + private static final long serialVersionUID = -4650367164833626403L; } 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 aa37efe3d219..101a62913a12 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 = 4031294343036302530L; + private static final long serialVersionUID = -8168079139890004928L; } 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 0f5b1e191703..6ff4730c440c 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 = -6091704374858877969L; + private static final long serialVersionUID = 3832312448089059206L; } 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 5b9704dc0df9..f67a98aca4be 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 = 2723850805568233923L; + private static final long serialVersionUID = 2723849725924577167L; } 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 df97985fcf42..18d0d235eda8 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 = 769900849881618129L; + private static final long serialVersionUID = -1677392206490830051L; /** @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 d12396552617..16a3325ec98f 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 = -8058512642945396643L; + private static final long serialVersionUID = -5168592223487177123L; } 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 898fd219c895..9ca8270687c2 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 = -2632639142250022568L; + private static final long serialVersionUID = 7308950909705183764L; } 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 526daadc6228..d9c77f551911 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 = -8657185724103343074L; + private static final long serialVersionUID = -2614551309120722734L; } 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 4fcc2e08225b..bc4d41ad64cf 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 = 1914418070321188368L; + private static final long serialVersionUID = 1576685372618655120L; /** @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 316181a08994..1968c2b575b8 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 = -3106586754001862813L; + private static final long serialVersionUID = -4153040239461639709L; /** @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 e8e73139690c..ba2b3d1b5bb4 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 = 5999744533565315773L; + private static final long serialVersionUID = 8604055407763431677L; /** @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 c8a978da7b62..23baaadf88d0 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 = -1622099002331250976L; + private static final long serialVersionUID = 841687295033498647L; } 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 d38706123acb..bdb191179c4c 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 = -1850740717959280362L; + private static final long serialVersionUID = -1850734455621372893L; /** @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 59b7a8661281..f83d4d727122 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 = -6430496707075546651L; + private static final long serialVersionUID = -6430497514266544176L; /** @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 5161e46a325b..ae7c1e7b709a 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 = 1569605360611898144L; + private static final long serialVersionUID = 1569602073907957624L; } 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 2ee04fdd0e8d..beb3e7369ad0 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 = -3922596771611496557L; + private static final long serialVersionUID = 7325085122306938963L; /** @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 59a196dfe011..99a618b16bdf 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 = 7339780616709549998L; + private static final long serialVersionUID = 7339783903512326809L; } 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 8426e7724965..2d07bc484a8c 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 = 3824549895368004089L; + private static final long serialVersionUID = 3824556157724425662L; } 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 fac48f5585e8..c4f6d9e0aefc 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 = 8017070550293370598L; + private static final long serialVersionUID = 5974787738138263724L; /** @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 2bd29aed223f..10b85dfc2112 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 = -7219600516618660146L; + private static final long serialVersionUID = -7219598513479713130L; /** @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 2777398cf512..1e304c864ec2 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 = 2112909366581667372L; + private static final long serialVersionUID = 8867571430945961676L; } 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 1b67a8b45d09..68a5801c5103 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 = 5702183710783397435L; + private static final long serialVersionUID = -3598787124694627013L; /** @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 8000c6ccdb1d..44ab448c7cc4 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 = 2894242740102703015L; + private static final long serialVersionUID = 2894237926820541136L; } 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 98b245aeedfb..3cd7bd48f544 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 = 6700983706351063733L; + private static final long serialVersionUID = 6700988519785022138L; } 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 e4903c3f2617..9d4f782948f7 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 = -1912288250874611418L; + private static final long serialVersionUID = -1912284964071834607L; } 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 49bf0c54517a..d3d49d45663b 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 = 8612443989372295392L; + private static final long serialVersionUID = 963025449683842447L; /** @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 b87c00eb8a69..f91ed66cd0f0 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 = -3491703344368133232L; + private static final long serialVersionUID = -106755534619081456L; /** @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 a2bb937080d1..aaa47c218d71 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 = 5473039148821900771L; + private static final long serialVersionUID = 8853973911103581347L; /** @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 f85923286357..1dfe925f987a 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 = -4677951791645821187L; + private static final long serialVersionUID = 2867519698546256381L; /** @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 6afac77277ed..5da9deede2a4 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 = 7511557453486877241L; + private static final long serialVersionUID = 164358794106429641L; } 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 46a4037a1512..06c24466212f 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 = -1850734455621500233L; + private static final long serialVersionUID = -1850732114195042448L; /** @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 43cb76196b61..cb5515eec0ab 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 = -6430497514266425532L; + private static final long serialVersionUID = -6430493718623028989L; /** @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 1e8f6995d60d..1825b1c47ea0 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 = 1569602073907885630L; + private static final long serialVersionUID = 1569613964376158236L; } 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 60a0e92cea16..1fca01bd637e 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 = -1968874838463165613L; + private static final long serialVersionUID = 5132089756960939411L; /** @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 64c8d123bb99..542de6e500dd 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 = 7339783903509077687L; + private static final long serialVersionUID = 7339782923271444551L; } 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 aec3013a289f..64c74ebacff8 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 = 3824556157724466970L; + private static final long serialVersionUID = 3824557817251451027L; } 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 86fcb31ac2ca..b7d486b42680 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 = 28755130190940156L; + private static final long serialVersionUID = 2496847631263903535L; /** @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 db46c739ed29..801b87119f69 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 = -7219598513479641136L; + private static final long serialVersionUID = -7219609120382957262L; /** @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 8ade35b095b5..a768e867b1c5 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 = -2166698550835661903L; + private static final long serialVersionUID = -3136513746372123420L; } 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 d655661f6e14..ab7b0c316af8 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 = -6440863961750392517L; + private static final long serialVersionUID = 2689417497741295227L; /** @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 cd8c5454cafa..e07181a7ef4d 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 = 2894237926817931326L; + private static final long serialVersionUID = 2894245728559616526L; } 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 901ed3bec844..7837219b0d9a 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 = 6700988519782991729L; + private static final long serialVersionUID = 6700991628215805685L; } 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 47cfcc786d2e..d560bb8da550 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 = -1912284964074509761L; + private static final long serialVersionUID = -1912285262417630257L; } 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 79d54c960a71..1f9872546295 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 = -8935951705605707481L; + private static final long serialVersionUID = 5845426427993423733L; /** @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 e3bdb0f291c5..6b217992e95f 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 = 1894606664288592494L; + private static final long serialVersionUID = 1894604543550998594L; /** @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 2dfff3fc5f58..b36ba3e2fd1d 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 = 2892576826493214121L; + private static final long serialVersionUID = 2892578420174027845L; /** @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 e889803f5a5f..f54f5666871f 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 = 5787330477123258401L; + private static final long serialVersionUID = 5787336730406694733L; } 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 7f9fe13e6a1f..eb3a7d12cb78 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 = 4908756372744809459L; + private static final long serialVersionUID = 4908757656473309343L; } 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 02c7d75f37bf..da8fe9a2808b 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 = 4322850864928212950L; + private static final long serialVersionUID = 4322856198861130682L; } 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 c69dd99169fd..bb1b3c9978be 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 = 5832353198827027891L; + private static final long serialVersionUID = 5832345333787113721L; /** @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 5f450153a61a..1ca91dab8633 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 = 2769380317566146232L; + private static final long serialVersionUID = 2769376585228320754L; /** @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 da5b7a06b6f1..1acea3bfd04f 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 = 5344584236403330108L; + private static final long serialVersionUID = 5344590778980044278L; } 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 32182400ff4f..d55d5e487c4d 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 = -8399047784412282400L; + private static final long serialVersionUID = -8399046536849620694L; } 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 780d8c4b171b..a133a5c419dd 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 = -860915494784963790L; + private static final long serialVersionUID = -860914929121976328L; /** @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 81756cd47ab5..c2b0d70ee9a4 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 = 954157432092388184L; + private static final long serialVersionUID = 954148244593861394L; /** @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 9ffea2684654..10f3d85fa39a 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 = 6934986519470017565L; + private static final long serialVersionUID = 6934990251812431191L; } 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 85e8bf3a8cab..3ee69b5e01a4 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 = 5414539431014648385L; + private static final long serialVersionUID = 5414537868343009547L; } 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 05cd8964af5c..188437277992 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 = -5190251194740803618L; + private static final long serialVersionUID = -5190250196502253648L; /** @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 122bc3355c29..af56d9255321 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 = 8893232008731792183L; + private static final long serialVersionUID = 8893230323290570544L; /** @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 856dfcee356d..fccbbf5eb35f 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 = -2514603098381973111L; + private static final long serialVersionUID = 7277490750396572949L; /** @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 1c6c6ddc3366..acdd675dc799 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 = 4615629489695154692L; + private static final long serialVersionUID = 4615625763752016131L; /** @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 a83f2c5785c3..3ca249123e9e 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 = 672584784510704749L; + private static final long serialVersionUID = 672580542123135594L; /** @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 8628004df2a5..ea9ebe467af5 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 = 8654440625975938735L; + private static final long serialVersionUID = 8654442145954655327L; } 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 630718664483..16644cc8faf7 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 = 3694612058925945827L; + private static final long serialVersionUID = 3694613062331988755L; } 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 ecb57b0bef36..3f573cc38baa 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 = 2159709390944990429L; + private static final long serialVersionUID = 2159705659958736237L; } 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 f780a33d2628..821a0b7678e5 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 = 1241675611144533390L; + private static final long serialVersionUID = 1241672006562756489L; } 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 8900bd530930..8d9b0bc039bd 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 = -2328654365366747792L; + private static final long serialVersionUID = -8130016190635581332L; } 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 3ceb6520f606..90d77f25c3ef 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 = -7784495944758281547L; + private static final long serialVersionUID = -5318252081645449583L; } 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 81e75c5e724a..9e45157935ae 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 = 794145730269912820L; + private static final long serialVersionUID = 3415489744817184144L; /** @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 ad2f8c816438..bce365e94788 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 = 8813545964814527746L; + private static final long serialVersionUID = -3095873104736311258L; } 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 b4051032c93f..97bf920f05bf 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 = 3909453229355383171L; + private static final long serialVersionUID = -7376689718681951101L; } 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 e28d8dd98fe7..703f196d45ad 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 = 979986736013406082L; + private static final long serialVersionUID = -492185363685217918L; /** @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 7e2c5d552463..e9c5978b7cbc 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 = -6201375424547103564L; + private static final long serialVersionUID = 8405739738738332468L; } 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 482736ff3207..efadd3a7b0b5 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 = -477023901470819120L; + private static final long serialVersionUID = -477017162752098320L; } 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 fd8a2ec5697e..051a162d1144 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 = 3485214484112817654L; + private static final long serialVersionUID = 3485210472969847318L; } 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 3b3e8f97e0ed..0dceb1ae5a6d 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 = 1717378179692219015L; + private static final long serialVersionUID = 1717371275513661031L; } 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 f30693fe5086..67b51bd4b940 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 = -7384918335760270242L; + private static final long serialVersionUID = -7384917052193050626L; } 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 9bbdbe187dbd..eae6818a45c8 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 = -2733707107660404965L; + private static final long serialVersionUID = -2733703101517560837L; } 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 cd932583bc46..d9b773ae2b87 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 = 4528095978941608274L; + private static final long serialVersionUID = 4528108172830230002L; } 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 e19fde9a5797..85952afb7e6d 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 = -477023680699638977L; + private static final long serialVersionUID = -477016984374212010L; } 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 c575671eb38c..47a7af049919 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 = 3485214384908132953L; + private static final long serialVersionUID = 3485210336063659888L; } 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 45718538cc4f..1ddab4df0410 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 = 1717377958788214568L; + private static final long serialVersionUID = 1717370931828013953L; } 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 e113d8c156f1..46cce434987d 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 = -7384918430126396367L; + private static final long serialVersionUID = -7384917359407125032L; } 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 f64dca03caa4..ea788b9894fa 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 = 3424372306753422396L; + private static final long serialVersionUID = 3424376190105424021L; } 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 e6b984f3d14b..5847aec12422 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 = -1172605894064151123L; + private static final long serialVersionUID = -1172593913051651260L; } 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 0aafb7ce5f61..44f84a2a666b 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 = -1126117250495205932L; + private static final long serialVersionUID = -1126107586347860035L; } 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 825807187705..8d48690ecb34 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 = -2097581430664270284L; + private static final long serialVersionUID = -2097577547293294947L; } 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 430742228e72..8a047d75e88f 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 = -477019604844410459L; + private static final long serialVersionUID = -477019748110821153L; } 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 b790a32f6aa2..805fe5928faf 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 = 3485213000294338627L; + private static final long serialVersionUID = 3485213017169820793L; } 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 e38dda6e5936..39289a28413d 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 = 1717373883065810226L; + private static final long serialVersionUID = 1717374026351194760L; } 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 6c70fe5c178c..b458457b45e0 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 = -7384914359408718037L; + private static final long serialVersionUID = -7384914342552213679L; } 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 46a3b5c324ac..b47de3a3640c 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 = 3424368192123611430L; + private static final long serialVersionUID = 3424368054013937820L; } 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 9a9380d7c825..600b38f87fca 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 = -1172601784476439625L; + private static final long serialVersionUID = -1172602126792433203L; } 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 8fc9322c5dba..2d4b4715efe2 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 = -1126115910097140018L; + private static final long serialVersionUID = -1126116048216591820L; } 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 8e51fd00cf9b..f31ac76a632b 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 = -2097585545275107538L; + private static final long serialVersionUID = -2097585683403754860L; } 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 13f2cf4dce3e..6097b62e3a6d 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 = 7404563553288962167L; + private static final long serialVersionUID = -7475511001170731222L; /** @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 fce314002e64..c966ce1ad5f8 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 = 3477550626479178939L; + private static final long serialVersionUID = 8955719436176276710L; } 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 3530aec46698..be31f0025af6 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 = -6397002079340965949L; + private static final long serialVersionUID = -6396997888482355314L; /** @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 24bb443abe2c..c90993b969c9 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 = -9066881158984905171L; + private static final long serialVersionUID = -9066888242573456773L; /** @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 a8ddbbf784a7..e1c2d6ad0586 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 = -4771641794668487916L; + private static final long serialVersionUID = -7317657248288246999L; /** @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 21801a1ef686..0f3cd5f57c14 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 = 1367614692745411542L; + private static final long serialVersionUID = -5082521269878774549L; /** @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 ae701371e441..6a26bcb0dd8e 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 = 507180556629592222L; + private static final long serialVersionUID = 16865105177446532L; } 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 bcdd481ec450..18cda032a0cb 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 = -7655923086202924493L; + private static final long serialVersionUID = -7655927238052907866L; /** @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 b66421e975a8..1770eb49c83a 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 = -2271128939307344184L; + private static final long serialVersionUID = -2271124621968977459L; /** @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 2a1c3db67867..3bef73955e9f 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 = 481708815056357984L; + private static final long serialVersionUID = 481713006013102761L; /** @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 9007eb867e45..7e3591d248cf 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 = -4426887106475477885L; + private static final long serialVersionUID = -4426882750309106354L; /** @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 8250ccdb16a1..94db3f058579 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 = 850538651490986493L; + private static final long serialVersionUID = 850539915856219060L; /** @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 6d43630f1e77..55b00aebf304 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 = -4328898606658675852L; + private static final long serialVersionUID = -4328908374093679735L; /** @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 fe603818c9d0..6790851189ff 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 = -5081818677637800550L; + private static final long serialVersionUID = -5081806347918473447L; /** @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 84173da775ae..1b97003d6acd 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 = 643079542551208170L; + private static final long serialVersionUID = 643086422013032636L; /** @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 717b43bd3743..3da9eb641993 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 = -2438007922699337929L; + private static final long serialVersionUID = -2438000678750338287L; /** @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 d314c6a8e645..5c0b8af3ab43 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 = 3651528494119752147L; + private static final long serialVersionUID = 3651532811429691472L; /** @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 bed5f05279e6..44c332c1d72e 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 = 8804376656827485558L; + private static final long serialVersionUID = 8804372305638599285L; /** @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 fcd8a61f9bc9..a85fd54c885f 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 = -5353761443318589824L; + private static final long serialVersionUID = -5353754364534928125L; /** @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 73e3318c498d..ad1bf1d7988e 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 = -6522134912650788897L; + private static final long serialVersionUID = -6522141831187880106L; /** @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 075f4f0c36cd..695bcf9aa449 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 = 7620287629164042204L; + private static final long serialVersionUID = 7620283112762032213L; /** @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 5ba55b66d213..efdd2318909f 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 = 1994021914559131163L; + private static final long serialVersionUID = 8445081122338488742L; } 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 87c3d60c4460..304a78e9d724 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 = -8178802309609156617L; + private static final long serialVersionUID = 3846339838978666039L; /** @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 6c497f1b9b19..089ffdf4b660 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 = 2870316677275365947L; + private static final long serialVersionUID = 2725125727903142523L; } 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 c20cbec7fa5f..86712b83824b 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 = -9066879880431476275L; + private static final long serialVersionUID = -9066887940407169684L; /** @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 3b9b2c4ebcb8..25d3a3b40eb8 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 = 1586417951691953684L; + private static final long serialVersionUID = 380113661081932404L; /** @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 84412ca001c7..3af9035589f5 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 = 4264770251215553271L; + private static final long serialVersionUID = 3462360245932586327L; /** @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 27e83c1f8e12..32079904da84 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 = 4948496125437011827L; + private static final long serialVersionUID = -2265997102892322637L; /** @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 fe39d9837390..63845df83b1d 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 = 6819897746016028318L; + private static final long serialVersionUID = -7727890025865310082L; } 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 e1a4bb78e21e..0b6bd05abc30 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 = -7655918914611714633L; + private static final long serialVersionUID = -7655927220118122218L; /** @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 328a07adde59..e1da2e3d8f92 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 = -2271132945298529688L; + private static final long serialVersionUID = -2271124805396509047L; /** @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 20b2821674fc..52c3238ab796 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 = 4147532846448514703L; + private static final long serialVersionUID = 4147524540939667758L; /** @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 bc243069df83..4a9032822dbb 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 = 481704808918118016L; + private static final long serialVersionUID = 481712948967127777L; /** @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 e29f46efd94f..14835a95766f 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 = 643078098690018762L; + private static final long serialVersionUID = 643086323973472683L; /** @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 e3f5e70b8c60..672ea6f7e52f 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 = -2438003751105860713L; + private static final long serialVersionUID = -2438001146290935882L; /** @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 0cb68027b182..8e5d0d6f5c1b 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 = -6105117812036336200L; + private static final long serialVersionUID = -657601122580252871L; /** @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 af4ae8566193..71ce5e6cf012 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 = -8813705375269064978L; + private static final long serialVersionUID = -8813708225614773681L; /** @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 bc602ced8d5e..013b729e9a64 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 = 4410695411162352627L; + private static final long serialVersionUID = 4410703471138048210L; } 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 b256732ba718..bc9b803a70e8 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 = 3651524487985972851L; + private static final long serialVersionUID = 3651532628030593682L; /** @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 2a470100a834..111d3c9feb0e 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 = 8804375212809898326L; + private static final long serialVersionUID = 8804372527917057207L; /** @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 709a69bcfa2a..e4f5245e403b 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 = -4989065777820848493L; + private static final long serialVersionUID = -4989057472316808398L; /** @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 ff7facaf854a..6786803b5109 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 = -5353757271725391264L; + private static final long serialVersionUID = -5353754666908029247L; /** @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 f237acb252e2..416ff2470fc7 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 = -6522133634097495297L; + private static final long serialVersionUID = -6522141694073119010L; /** @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 d4f5acdedb94..58a58fd7641c 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 = 7620286185150911164L; + private static final long serialVersionUID = 7620283500264970205L; /** @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 15f054ceced1..9b1ac434f8c6 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 = 8239235784327048347L; + private static final long serialVersionUID = -6389655480490740325L; } 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 67b0cd3342ae..1370dc96ac1e 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 = 2985015105440544896L; + private static final long serialVersionUID = 3137427553812703008L; /** @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 c4f9ee8db94a..79edb7c6ceb7 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 = 3019657111313515187L; + private static final long serialVersionUID = -2445640333056647469L; } 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 4394fd74f81b..31aed27e5c6e 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 = 5596955254884223003L; + private static final long serialVersionUID = -9003213716478299320L; /** @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 fd9a595cad61..3e419c210b18 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 = -8080362380713297577L; + private static final long serialVersionUID = 6473553131314776836L; } 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 ab7a7fb244fc..80cc3234abf5 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 = 6094162242056694936L; + private static final long serialVersionUID = 4847804894095504491L; /** @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 5c1917e99e50..3e375888313e 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 = 9176411637148409915L; + private static final long serialVersionUID = 3229946763842758408L; /** @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 8948d73a8842..63f4f1410901 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 = 145779919387395955L; + private static final long serialVersionUID = 3777378972815619251L; /** @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 82567eb4ed07..5eaa755f2b06 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 = -6053968934590979258L; + private static final long serialVersionUID = 6032190003871366790L; } 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 81cb9d125dcb..46ccfbd53a32 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 = -7655923087412135935L; + private static final long serialVersionUID = -7655916871353472351L; /** @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 91b727e10a79..c7298e348cae 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 = -2271128938098693509L; + private static final long serialVersionUID = -2271135153820974916L; /** @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 48758c983899..711287e447b9 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 = 4147528673573357952L; + private static final long serialVersionUID = 4147534889548650718L; /** @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 7b6056972445..c372b2ae2e5e 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 = 481708816369400591L; + private static final long serialVersionUID = 481706771951761617L; /** @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 8e7980ff1bc7..6e1b065f085a 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 = 643079546344747749L; + private static final long serialVersionUID = 643075975547314639L; /** @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 ad261a724117..3ff22424252c 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 = -2438007923969979807L; + private static final long serialVersionUID = -2438007163346325488L; /** @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 a3d451e3ba0b..80750e0ede74 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 = 3210432465941172311L; + private static final long serialVersionUID = -4410634758185174856L; /** @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 2dc94e282201..c1ed26000808 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 = -8813709548073310463L; + private static final long serialVersionUID = -8813707663719377429L; /** @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 2b4e5466c76c..8f8e1e2d451f 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 = 4410691238348825158L; + private static final long serialVersionUID = 4410693122377725321L; } 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 0cc96dcd50fa..a3a94c117945 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 = 3651528495347035934L; + private static final long serialVersionUID = 3651522279422023653L; /** @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 e6fa340001a1..0d39ce8ae036 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 = 8804376660619588667L; + private static final long serialVersionUID = 8804373089632618304L; /** @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 74cc1914905f..13bcae1593ec 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 = -4989067060161067202L; + private static final long serialVersionUID = -4989067820929839099L; /** @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 a806784dcf15..5ce39710bc33 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 = -5353761444517987507L; + private static final long serialVersionUID = -5353755228621288074L; /** @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 8528db0c8e78..d029079d7d94 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 = -6522134916399652511L; + private static final long serialVersionUID = -6522130061897030457L; /** @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 066d834c413d..c7fa988db723 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 = 7620287633009882018L; + private static final long serialVersionUID = 7620289517138192196L; /** @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 655ac4b4d815..869ffcf88427 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 = -8315761705866452863L; + private static final long serialVersionUID = 9201496434645191962L; } 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 eee8592229be..ed5b04655fa9 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 = -9173809110618103472L; + private static final long serialVersionUID = 9090998949250540478L; /** @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 a79204d26dd5..0e7ba63d5b82 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 = -8216069586288033692L; + private static final long serialVersionUID = -4651600726318162690L; } 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 fd6ad1ac2948..7dcb8d4c9674 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 = -412000409554965187L; + private static final long serialVersionUID = 8718165971276703908L; } 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 8afeeec27f28..822eadffe33b 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 = 4621242384519192082L; + private static final long serialVersionUID = 7625151887998125176L; /** @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 08dfe5c21e24..3e3d463c8998 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 = 5734226886775675172L; + private static final long serialVersionUID = 5734226544403434039L; } 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 dcb6494e4f8f..4e593b7206c9 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 = -3402243833726423543L; + private static final long serialVersionUID = 6493575506659231627L; /** @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 4949f103d23b..2805d3afd8f7 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 = 78224817939574384L; + private static final long serialVersionUID = -8869859752622589968L; } 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 6add7cc9cb4b..ba40205e038e 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 = -8371911333781613805L; + private static final long serialVersionUID = 2034100357754608977L; /** @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 fe430b3ce70a..36ea052e4a00 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 = 4836918660226946185L; + private static final long serialVersionUID = 6828499245573220154L; } 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 dc5861c036c8..51984230f952 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 = 7066800675817376838L; + private static final long serialVersionUID = 3475189176424262580L; } 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 26626ae91f14..eef2f0730ad1 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 = -943490909332945135L; + private static final long serialVersionUID = -943492963959215573L; } 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 fbc586228f82..e9f12de25cbd 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 = 1816595441175445517L; + private static final long serialVersionUID = 8483471230277250807L; /** @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 d13a5e46fd07..542ba328a8f0 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 = -2944662308990949782L; + private static final long serialVersionUID = -2944654804208704432L; } 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 1eedc0fc52e0..eb7132265845 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 = -8913426522382761097L; + private static final long serialVersionUID = -5615178302333646537L; } 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 783e0fbfc4db..aa0819f2f536 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 = -2790745227759924258L; + private static final long serialVersionUID = 8004770297989371390L; /** @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 17fb5cbb2b63..38fd6884d7d9 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 = -4047706605554883176L; + private static final long serialVersionUID = -451101746657826686L; /** @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 c476296f0ba9..9352f3c576eb 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 = 1849796475122007615L; + private static final long serialVersionUID = -4661983828474757601L; /** @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 910345cf272c..5e2e2ff0d959 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 = -3172278183148854226L; + private static final long serialVersionUID = -3172282750995511137L; /** @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 f8864ee0e69b..ad5770917947 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 = -5542859993782084571L; + private static final long serialVersionUID = -5542853981919539650L; } 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 d9b8646969d6..cd518b99c241 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 = 3073880476856820190L; + private static final long serialVersionUID = 5867089588441491413L; } diff --git a/slice2java/js/test/Glacier2/router/Test/CallbackException.java b/slice2java/js/test/Glacier2/router/Test/CallbackException.java index 4f6a784a6b21..0de5de327144 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 = 6253049965724038550L; + private static final long serialVersionUID = 5615481166212606639L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Base.java b/slice2java/js/test/Ice/defaultValue/Test/Base.java index b9aea355353e..3f276b4cbd21 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 = 2754679445207455331L; + private static final long serialVersionUID = 1834546550306422276L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java index 0336afa573aa..5460a8240dc0 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 = -1360986185925358569L; + private static final long serialVersionUID = -7567606224789564624L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java index d4cc72acfee4..84f644e4f86d 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 = -343574271450215351L; + private static final long serialVersionUID = -6138611290301845055L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 533bd336afc8..60d71fce03ae 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 = -1983815536318989862L; + private static final long serialVersionUID = -3011689291069661288L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/Derived.java b/slice2java/js/test/Ice/defaultValue/Test/Derived.java index bf9b21ea9e45..bd4b094af58a 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 = -435673137847620594L; + private static final long serialVersionUID = 3721684915183123975L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java index 25c5c1095af1..f3bdd09af8f3 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 = 4830319210847656249L; + private static final long serialVersionUID = -7979998252979666000L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index f83f3ef16948..dbaaaacc1c1c 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 = 5045087987236331309L; + private static final long serialVersionUID = 6349066546773050149L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index 87ed22284e8a..8d66b032757c 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 = -6550806905230596118L; + private static final long serialVersionUID = -1575759621466333656L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java index a7f31da4b977..9b218c247425 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 = 5127390288043175447L; + private static final long serialVersionUID = 5127388901066018205L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct1.java b/slice2java/js/test/Ice/defaultValue/Test/Struct1.java index a8e235a76cbf..8f7e954da72e 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 = -7646683316228506771L; + private static final long serialVersionUID = 766872829506144899L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct2.java b/slice2java/js/test/Ice/defaultValue/Test/Struct2.java index c8502a1bca60..fb7cd64ba257 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 = 441514834931502042L; + private static final long serialVersionUID = 3843807810887302163L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct3.java b/slice2java/js/test/Ice/defaultValue/Test/Struct3.java index 333e3b3643f4..19e9a1119631 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 = -8199487076802749841L; + private static final long serialVersionUID = -954237260061176959L; } diff --git a/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java index 88b6a8c37db2..07293671a6b9 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 = -1869222159161119072L; + private static final long serialVersionUID = 5262174566635659795L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/A.java b/slice2java/js/test/Ice/exceptions/Test/A.java index 27af26af85e5..32ba88f334a4 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 = 7823745373665013235L; + private static final long serialVersionUID = 7823742037848240135L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/B.java b/slice2java/js/test/Ice/exceptions/Test/B.java index eebc18570561..c183320a3a28 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 = -3861410690003104589L; + private static final long serialVersionUID = -3861419480980578489L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/C.java b/slice2java/js/test/Ice/exceptions/Test/C.java index 93cd58f326e1..f17413ec97d6 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 = 1080699064867798515L; + private static final long serialVersionUID = 1080695729051025415L; } diff --git a/slice2java/js/test/Ice/exceptions/Test/D.java b/slice2java/js/test/Ice/exceptions/Test/D.java index dacde1eb7eb5..81679b1cca33 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 = 4780381578098973619L; + private static final long serialVersionUID = 4780372787121499719L; } diff --git a/slice2java/js/test/Ice/inheritance/Test/MC/A.java b/slice2java/js/test/Ice/inheritance/Test/MC/A.java index c0290f26a0d8..7fdb133b3f96 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 = 954229321864404952L; + private static final long serialVersionUID = 954230123759743516L; /** @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 899aff01047d..7935813e3371 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 = 1339633074271794498L; + private static final long serialVersionUID = 1339643259889375110L; /** @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 d93c93f7e0ce..c877ba244e00 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 = -2729307212180747456L; + private static final long serialVersionUID = -2729307771572068988L; /** @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 6005276cd867..b8194fb35cc3 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 = -3435398785034521018L; + private static final long serialVersionUID = -3435399830031598718L; /** @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 47fea2772067..5838357d1c26 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 = -836181075935671073L; + private static final long serialVersionUID = -836185972003767909L; /** @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 eb0ab3d710e3..bb12f7ff9b95 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 = 1132521876630447714L; + private static final long serialVersionUID = 1132526932693797030L; /** @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 eb98885999ea..9cb94628d416 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 = -6335556049976061344L; + private static final long serialVersionUID = -6335550828600212060L; /** @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 0228c6816e2d..0c6b33c4c56d 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 = -4007410486294407578L; + private static final long serialVersionUID = -4007416660845716574L; /** @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 6b781b4a1081..074f35e0e669 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 = 991428770293641950L; + private static final long serialVersionUID = 991429086583224346L; /** @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 311169c56d01..ee1e957f1ec8 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 = -2880334707553573758L; + private static final long serialVersionUID = -2880329977092372794L; /** @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 0cf4c17b8db9..bad0846ecc59 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 = -8808268209390339200L; + private static final long serialVersionUID = -8808263313625838140L; /** @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 558bf8b528ce..e82304f37c6c 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 = -771853366302443898L; + private static final long serialVersionUID = -771859866455901246L; /** @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 6668079d6174..d9acc7c957c0 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 = 6566354645064217309L; + private static final long serialVersionUID = 6566349914299420569L; /** @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 b289a924f23b..2ff61de699e2 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 = 6983798956758643362L; + private static final long serialVersionUID = 6983809137674810854L; /** @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 2e06152228c5..5933a1c02b89 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 = -1175220064202357600L; + private static final long serialVersionUID = -1175220628304292124L; /** @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 d531395d89c8..77adad0e3742 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 = -3279718619183188570L; + private static final long serialVersionUID = -3279719668881679390L; /** @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 120d54b95eb6..de79b2bb20b6 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 = -4359171768234928420L; + private static final long serialVersionUID = -4359182196954248168L; /** @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 ba8c668ee8b2..c7b14982ab2d 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 = 5904689861823182530L; + private static final long serialVersionUID = 5904700047440763142L; /** @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 35e60da04487..4c31c2e0bbeb 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 = 1835749575370640576L; + private static final long serialVersionUID = 1835749015979319044L; /** @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 7a33fe70d38a..90273be76022 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 = -2252399438264838202L; + private static final long serialVersionUID = -2252400483261915902L; /** @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 fe80234bfaca..323a56b488be 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 = -1203539828882886701L; + private static final long serialVersionUID = -1203533494336325225L; /** @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 4e1eab082461..b01f93e16e8b 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 = -7537770154956837406L; + private static final long serialVersionUID = -7537765098893488090L; /** @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 d724806a0999..b9d92c2b8b35 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 = 3440895992146205152L; + private static final long serialVersionUID = 3440901213522054436L; /** @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 8146bc3b3ac6..a10606006d08 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 = 9151098996609564134L; + private static final long serialVersionUID = 9151092822058255138L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/A.java b/slice2java/js/test/Ice/objects/Test/A.java index 5442df2a779f..1d24145b5079 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 = -2649579222756189144L; + private static final long serialVersionUID = -3371434860608694823L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/A1.java b/slice2java/js/test/Ice/objects/Test/A1.java index 299eecbe4505..708a2685fc6d 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 = -5926746603643462088L; + private static final long serialVersionUID = -5926743214836455035L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/B.java b/slice2java/js/test/Ice/objects/Test/B.java index efeb7f407946..8a8b903e4cfa 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 = -8890912152769655240L; + private static final long serialVersionUID = -8890910251633336599L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/B1.java b/slice2java/js/test/Ice/objects/Test/B1.java index b83405bea876..cf8dedd1ff06 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 = -8697422624093483836L; + private static final long serialVersionUID = -6256035558501990268L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/Base.java b/slice2java/js/test/Ice/objects/Test/Base.java index 8bb81bee1f5d..5f434d402303 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 = -5259950441319330712L; + private static final long serialVersionUID = -3253840272310300658L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/C.java b/slice2java/js/test/Ice/objects/Test/C.java index 97bb53b511dc..60023ea530f2 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 = -4127461734817453001L; + private static final long serialVersionUID = -2237606763686327252L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/COneMember.java b/slice2java/js/test/Ice/objects/Test/COneMember.java index ce37a97199d1..aadf5623baee 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 = 3050965548603469811L; + private static final long serialVersionUID = 3050968937415028373L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/CTwoMembers.java b/slice2java/js/test/Ice/objects/Test/CTwoMembers.java index 01bcf97252d7..adbe5c75aae0 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 = 4061772630251898651L; + private static final long serialVersionUID = 6123875685827974363L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/D.java b/slice2java/js/test/Ice/objects/Test/D.java index 2c520311e6f2..e85d139c1fdf 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 = -7195528395173561612L; + private static final long serialVersionUID = -3734498332894185292L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/D1.java b/slice2java/js/test/Ice/objects/Test/D1.java index 5fcd688b9383..d86fda6793a9 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 = 1455972319980467459L; + private static final long serialVersionUID = 1218554951461087683L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/E.java b/slice2java/js/test/Ice/objects/Test/E.java index 163e8ac5bab1..6ed9efaf0172 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 = -5190477294981667436L; + private static final long serialVersionUID = -7818589241960851573L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/EBase.java b/slice2java/js/test/Ice/objects/Test/EBase.java index 8b2fa41b6c2e..b32e38f9c17f 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 = -927459965710659442L; + private static final long serialVersionUID = 3740380699141850190L; } diff --git a/slice2java/js/test/Ice/objects/Test/EDerived.java b/slice2java/js/test/Ice/objects/Test/EDerived.java index 4cab30b73aa4..090a7dc19e09 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 = 6191115436301831698L; + private static final long serialVersionUID = 7499579747962387154L; } diff --git a/slice2java/js/test/Ice/objects/Test/EOneMember.java b/slice2java/js/test/Ice/objects/Test/EOneMember.java index 95d3deb879d8..5fccaacb416d 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 = -6225287508607831748L; + private static final long serialVersionUID = -6225284119798695142L; } diff --git a/slice2java/js/test/Ice/objects/Test/ETwoMembers.java b/slice2java/js/test/Ice/objects/Test/ETwoMembers.java index dfe77c58038b..a48a0d5da6e9 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 = -7394886629019910764L; + private static final long serialVersionUID = -5705788593230980012L; } diff --git a/slice2java/js/test/Ice/objects/Test/F.java b/slice2java/js/test/Ice/objects/Test/F.java index 78c5d29b8b55..2286b372deb6 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 = 4028659757426613457L; + private static final long serialVersionUID = 7056458538953645393L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/F1.java b/slice2java/js/test/Ice/objects/Test/F1.java index 8bfede5a3567..8d7ceb703e47 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 = 6192371325474436787L; + private static final long serialVersionUID = 6192373548183160886L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/F3.java b/slice2java/js/test/Ice/objects/Test/F3.java index 31eed91aa5c4..01bfc39536bd 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 = 2607348270013400770L; + private static final long serialVersionUID = -6446395083167839893L; /** @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 c970fe595b56..25d2336ed170 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 = -1425260235128525998L; + private static final long serialVersionUID = -1425258168679711869L; /** @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 552011b5f058..9182fcc928e7 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 = -2337228395065457023L; + private static final long serialVersionUID = -2337226328702711236L; } 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 efcc9b10388b..e62a08958996 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 = -1298689704724912638L; + private static final long serialVersionUID = -1298687473129842912L; /** @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 c2747ca3af48..322e5e3899ea 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 = 1842227998908824997L; + private static final long serialVersionUID = 1842230065262519128L; } diff --git a/slice2java/js/test/Ice/objects/Test/K.java b/slice2java/js/test/Ice/objects/Test/K.java index d54f7271afa4..81e5b7e45e00 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 = 4645162559486813747L; + private static final long serialVersionUID = 4645159005372336826L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/L.java b/slice2java/js/test/Ice/objects/Test/L.java index 105e6912e68b..a3fdc4e20ed5 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 = 6629749639240831411L; + private static final long serialVersionUID = 6629747407598283086L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/M.java b/slice2java/js/test/Ice/objects/Test/M.java index 7b4a41bd5310..fdddf517a769 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 = -8088103668395606082L; + private static final long serialVersionUID = -8088105569431908849L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/Recursive.java b/slice2java/js/test/Ice/objects/Test/Recursive.java index 01ad7b7a89c0..8015776e8895 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 = 3617889554910757866L; + private static final long serialVersionUID = 3617886000786490141L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/objects/Test/S.java b/slice2java/js/test/Ice/objects/Test/S.java index 58e5fcd7a966..fa9e0512c38d 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 = 481778194041401216L; + private static final long serialVersionUID = 481774805243374205L; } diff --git a/slice2java/js/test/Ice/objects/Test/SOneMember.java b/slice2java/js/test/Ice/objects/Test/SOneMember.java index d78e34311f17..c70af1ee9686 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 = 6227748279411205034L; + private static final long serialVersionUID = 6227745055912551436L; } diff --git a/slice2java/js/test/Ice/objects/Test/STwoMembers.java b/slice2java/js/test/Ice/objects/Test/STwoMembers.java index a5800afa6342..f392f45d8498 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 = 57690336118000386L; + private static final long serialVersionUID = -5269286141188933694L; } diff --git a/slice2java/js/test/Ice/objects/Test/StructKey.java b/slice2java/js/test/Ice/objects/Test/StructKey.java index e9dd368a9d7a..803a5330a36e 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 = 1305973904485686872L; + private static final long serialVersionUID = 2516152457078176967L; } diff --git a/slice2java/js/test/Ice/operations/Test/AnotherStruct.java b/slice2java/js/test/Ice/operations/Test/AnotherStruct.java index 70361bf68ab2..1ae7c07d78e6 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 = 2723841618085582134L; + private static final long serialVersionUID = 2723846288038497300L; } diff --git a/slice2java/js/test/Ice/operations/Test/MyClass1.java b/slice2java/js/test/Ice/operations/Test/MyClass1.java index 7c14952dc5bf..d397b45a324a 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 = 3763367028374569231L; + private static final long serialVersionUID = 3219816932157989165L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct.java b/slice2java/js/test/Ice/operations/Test/MyStruct.java index 912986194346..9e1a76b4c257 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 = 976889043335510493L; + private static final long serialVersionUID = 2165277292433774365L; } diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct1.java b/slice2java/js/test/Ice/operations/Test/MyStruct1.java index d106827e36e8..3d758d308190 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 = -2418934483777540186L; + private static final long serialVersionUID = 5483421592730443652L; } diff --git a/slice2java/js/test/Ice/operations/Test/Structure.java b/slice2java/js/test/Ice/operations/Test/Structure.java index 65fab86c0815..73e2e0f6b960 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 = -653252847580035563L; + private static final long serialVersionUID = -4050199350165606473L; } diff --git a/slice2java/js/test/Ice/optional/Test/A.java b/slice2java/js/test/Ice/optional/Test/A.java index 9d71f09e6eff..862a05e1d13b 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 = -8398979271567969392L; + private static final long serialVersionUID = 4905649632491534608L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/B.java b/slice2java/js/test/Ice/optional/Test/B.java index 3113c529cef8..2c29b4363e96 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 = -3038130477856495133L; + private static final long serialVersionUID = -8740321327154931741L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/C.java b/slice2java/js/test/Ice/optional/Test/C.java index cc02ca310cf2..5a0ccbb0beb1 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 = -1061839746498449283L; + private static final long serialVersionUID = -3089897479739127491L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/DerivedException.java b/slice2java/js/test/Ice/optional/Test/DerivedException.java index 9887f4355219..2678df56b93c 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 = 277083248278542680L; + private static final long serialVersionUID = 3529349811901896122L; } diff --git a/slice2java/js/test/Ice/optional/Test/E.java b/slice2java/js/test/Ice/optional/Test/E.java index 16b8b868e741..7567ed984e0e 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 = -1850739245750355920L; + private static final long serialVersionUID = -1850742681202203374L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/F.java b/slice2java/js/test/Ice/optional/Test/F.java index 3a0f4d333409..fc5cb4183eba 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 = -6430492719123635133L; + private static final long serialVersionUID = -6430489288681113759L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/FixedStruct.java b/slice2java/js/test/Ice/optional/Test/FixedStruct.java index 63a5373c764a..07efe2163be9 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 = 1569601411464832825L; + private static final long serialVersionUID = 1569604758945347995L; } diff --git a/slice2java/js/test/Ice/optional/Test/G.java b/slice2java/js/test/Ice/optional/Test/G.java index cd638121082e..06e9f2b5dfdc 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 = -5995802810448860013L; + private static final long serialVersionUID = -6521198139312790893L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/G1.java b/slice2java/js/test/Ice/optional/Test/G1.java index 474ae83baa08..853d72ba6777 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 = 7339784731264460630L; + private static final long serialVersionUID = 7339781549082641396L; } diff --git a/slice2java/js/test/Ice/optional/Test/G2.java b/slice2java/js/test/Ice/optional/Test/G2.java index e596d6a947bd..6de0b2952425 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 = 3824551367593150158L; + private static final long serialVersionUID = 3824547932136694060L; } diff --git a/slice2java/js/test/Ice/optional/Test/MultiOptional.java b/slice2java/js/test/Ice/optional/Test/MultiOptional.java index 389207702c62..74f0e7902c2a 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 = -7096689273974059198L; + private static final long serialVersionUID = 1181140299892175840L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/OneOptional.java b/slice2java/js/test/Ice/optional/Test/OneOptional.java index d4f30b58e263..99dee18980fb 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 = -7219599170922711465L; + private static final long serialVersionUID = -7219601443901876555L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/OptionalException.java b/slice2java/js/test/Ice/optional/Test/OptionalException.java index 992a17150514..6f7a2eb70fe2 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 = 4411391764939087265L; + private static final long serialVersionUID = 7238488122838455043L; } diff --git a/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java index 03139993cbc7..866683ca3a08 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 = 8676204106568767035L; + private static final long serialVersionUID = -7043443591403578693L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/optional/Test/RequiredException.java b/slice2java/js/test/Ice/optional/Test/RequiredException.java index b3031d88a534..d300b0fee49e 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 = 2894238752141688223L; + private static final long serialVersionUID = 2894235327163751421L; } diff --git a/slice2java/js/test/Ice/optional/Test/SmallStruct.java b/slice2java/js/test/Ice/optional/Test/SmallStruct.java index 2f6f891030a9..e4fc97f0a0cd 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 = 6700987859765011773L; + private static final long serialVersionUID = 6700991450050709471L; } diff --git a/slice2java/js/test/Ice/optional/Test/VarStruct.java b/slice2java/js/test/Ice/optional/Test/VarStruct.java index 592b967cb428..2ad7898f809e 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 = -1912284136319684386L; + private static final long serialVersionUID = -1912287318501503620L; } diff --git a/slice2java/js/test/Ice/optional/Test/WD.java b/slice2java/js/test/Ice/optional/Test/WD.java index 6e5b40a0708c..82985d574bfc 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 = -5990326549119258847L; + private static final long serialVersionUID = 6058286980005614625L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/C.java b/slice2java/js/test/Ice/scope/Test/C.java index 43ab438df141..ee4557746000 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 = -5190250551568764641L; + private static final long serialVersionUID = -5190251976130589208L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/C1.java b/slice2java/js/test/Ice/scope/Test/C1.java index b0100122989c..01b8b24d6a76 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 = 8893236619289855326L; + private static final long serialVersionUID = 8893238043851512169L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/scope/Test/C2.java b/slice2java/js/test/Ice/scope/Test/C2.java index 271f6b848069..9e16b13d8eb6 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 = 2064330696497782022L; + private static final long serialVersionUID = -8758866866494520699L; /** @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 61f7f4a169a6..9cce900f7948 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 = 4615626201609390842L; + private static final long serialVersionUID = 4615624815940227465L; /** @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 e5adf6d618ae..1f8dfa3a8b67 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 = 672586755283197508L; + private static final long serialVersionUID = 672596445241313237L; /** @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 e6b208332b14..a5e9693c8d4a 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 = 8654436015417514355L; + private static final long serialVersionUID = 8654434590850990644L; } diff --git a/slice2java/js/test/Ice/scope/Test/Inner/S.java b/slice2java/js/test/Ice/scope/Test/Inner/S.java index 514f50873aee..2de6e13893ef 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 = 3694623617589877823L; + private static final long serialVersionUID = 3694622358326105592L; } diff --git a/slice2java/js/test/Ice/scope/Test/S.java b/slice2java/js/test/Ice/scope/Test/S.java index 09bf60c232cf..1c9848eba517 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 = 2159695187357166721L; + private static final long serialVersionUID = 2159704546705533894L; } diff --git a/slice2java/js/test/Ice/scope/Test/S1.java b/slice2java/js/test/Ice/scope/Test/S1.java index 4dd9bbb4ab85..7fa91ccc01fe 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 = 1241676936173408487L; + private static final long serialVersionUID = 1241675511602695504L; } diff --git a/slice2java/js/test/Ice/scope/Test/S2.java b/slice2java/js/test/Ice/scope/Test/S2.java index a7b59dc1ec29..4880553ca1f5 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 = 3148379181540878079L; + private static final long serialVersionUID = -6104958071660175748L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java index 0b50b4ff2056..bd8173eff51f 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 = -477021775718637935L; + private static final long serialVersionUID = -477021458002911447L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java index 71e453c69762..671d54e7c14e 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 = 3485211160022106807L; + private static final long serialVersionUID = 3485211482893939279L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 3a093f29cfe2..89e998e72cc8 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 = 1717375888480339910L; + private static final long serialVersionUID = 1717374723581174334L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 03626f976189..541fa0ce3292 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 = -7384921825306083297L; + private static final long serialVersionUID = -7384920985866607833L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java index 9ce8041857bd..453134688551 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 = -2733710682438704294L; + private static final long serialVersionUID = -2733698612383938910L; } diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index f3fc03c18088..5d2a45ecbf1b 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 = 4528092489395516435L; + private static final long serialVersionUID = 4528103877574677547L; } diff --git a/slice2java/js/test/Ice/slicing/objects/Test/B.java b/slice2java/js/test/Ice/slicing/objects/Test/B.java index f5a200028cd3..14db10574851 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 = 3458427460125810917L; + private static final long serialVersionUID = 6507283263936792466L; /** @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 f7dabc38288a..c60b9400fa05 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 = 707359271243957929L; + private static final long serialVersionUID = 8095137898503432926L; } diff --git a/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java index c15a1dbd2630..45d7d847c5fb 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 = -6396993770048185049L; + private static final long serialVersionUID = -6396993457542451012L; /** @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 7d8c24c6e5e0..42374c7ae6f8 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 = -9066889385475835894L; + private static final long serialVersionUID = -9066889783363499599L; /** @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 dc70555ad980..f27a38371687 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 = -772170707788315514L; + private static final long serialVersionUID = -2408254444601760815L; /** @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 e3d1b3874e94..c2d3cf2f7b15 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 = 5759164544545518916L; + private static final long serialVersionUID = 218965919499708179L; /** @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 2af832af2add..72299d9549ac 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 = 5826508345094425222L; + private static final long serialVersionUID = 3468350245352826333L; } diff --git a/slice2java/js/test/Ice/slicing/objects/Test/Forward.java b/slice2java/js/test/Ice/slicing/objects/Test/Forward.java index 8939cdc17e17..3f718d4f91e8 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 = -7655931230043890924L; + private static final long serialVersionUID = -7655930987237968450L; /** @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 9f665bc12103..d53dac4c82b3 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 = -2271120630013590739L; + private static final long serialVersionUID = -2271120872918486214L; /** @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 cfc7a86f20cc..15849b96c55e 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 = 481717124462039545L; + private static final long serialVersionUID = 481716755022320029L; /** @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 8950127e633d..e620d4d0ca88 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 = -4426878797178236185L; + private static final long serialVersionUID = -4426878319364602116L; /** @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 f1a234d5b329..fb7b5eff26e0 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 = 850535962710303844L; + private static final long serialVersionUID = 850536001382564672L; /** @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 b1792da62275..25019d689135 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 = -4328906910939299598L; + private static final long serialVersionUID = -4328906668049585303L; /** @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 0e6d6a7427d0..b8b154963ae3 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 = -5081810455999591938L; + private static final long serialVersionUID = -5081810613701421115L; /** @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 d8c9c82e68a5..a25902f62079 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 = 643087603734378125L; + private static final long serialVersionUID = 643087611523788918L; /** @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 2a48ecc0d617..be667258c83d 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 = -2438005156348965887L; + private static final long serialVersionUID = -2438004758483444105L; /** @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 18877fd66bdc..744bcecb591c 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 = 3651536803435741943L; + private static final long serialVersionUID = 3651537242377899660L; /** @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 e28e440e709a..b193d42506e0 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 = 8804373807695052370L; + private static final long serialVersionUID = 8804374177035227817L; /** @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 3adffa1e32ab..536d6c6e09e0 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 = -5353758676825749148L; + private static final long serialVersionUID = -5353758113749613729L; /** @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 9fd358346b45..cfea4d7034f0 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 = -6522143139407169450L; + private static final long serialVersionUID = -6522143020502584611L; /** @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 470e104d852b..e7014fd1fea0 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 = 7620284780084804053L; + private static final long serialVersionUID = 7620284984067446238L; /** @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 12b68395f05d..3c7f0b180506 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 = -7581080373790276283L; + private static final long serialVersionUID = -3182991728283281328L; } diff --git a/slice2java/js/test/Ice/stream/Test/LargeStruct.java b/slice2java/js/test/Ice/stream/Test/LargeStruct.java index c6e1e6011684..1a7797aaeeb8 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 = -3864753811197766815L; + private static final long serialVersionUID = 8289229329882751777L; } diff --git a/slice2java/js/test/Ice/stream/Test/MyClass.java b/slice2java/js/test/Ice/stream/Test/MyClass.java index 0aa33641c402..cf55f9c78439 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 = -8773810100427851913L; + private static final long serialVersionUID = -607698306200089161L; /** @hidden */ @Override diff --git a/slice2java/js/test/Ice/stream/Test/MyException.java b/slice2java/js/test/Ice/stream/Test/MyException.java index 7d6a380e60ed..b6d20f4d6d3a 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 = 5734234883542715875L; + private static final long serialVersionUID = 5734226437341980886L; } diff --git a/slice2java/js/test/Ice/stream/Test/OptionalClass.java b/slice2java/js/test/Ice/stream/Test/OptionalClass.java index 92347ab67732..e7e1e8a9ac24 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 = 3076020295105959871L; + private static final long serialVersionUID = -4555664139232356897L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/Clash/Cls.java b/slice2java/js/test/Slice/escape/Clash/Cls.java index aabdfbb1c57a..f7a22c93a9f4 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 = 1466702060573421365L; + private static final long serialVersionUID = 5271316035387775738L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/Clash/Ex.java b/slice2java/js/test/Slice/escape/Clash/Ex.java index f109f7a1a4e0..15e0b0f09e14 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 = -1722422644679402982L; + private static final long serialVersionUID = 7604570911047800112L; } diff --git a/slice2java/js/test/Slice/escape/Clash/St.java b/slice2java/js/test/Slice/escape/Clash/St.java index 2e639d2cea95..7dc84159520a 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 = 5328976447226169141L; + private static final long serialVersionUID = 2117941000909063991L; } diff --git a/slice2java/js/test/Slice/escape/await/BaseMethods.java b/slice2java/js/test/Slice/escape/await/BaseMethods.java index dec42589c370..242acd1d5de3 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 = -1371589771371905538L; + private static final long serialVersionUID = -8590652702498845320L; } diff --git a/slice2java/js/test/Slice/escape/await/_break.java b/slice2java/js/test/Slice/escape/await/_break.java index 7603b14210b3..099aa58d2e16 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 = 3933591160130825003L; + private static final long serialVersionUID = 8135188809436110765L; } diff --git a/slice2java/js/test/Slice/escape/await/_package.java b/slice2java/js/test/Slice/escape/await/_package.java index 89775e06b144..22e7e927a822 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 = -5655965269779194821L; + private static final long serialVersionUID = -5152736430692443076L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/await/delete.java b/slice2java/js/test/Slice/escape/await/delete.java index d8b3a72f83d1..e7af094469ab 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 = -7764731324180494977L; + private static final long serialVersionUID = -1379065881567443292L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/escape/await/fixed.java b/slice2java/js/test/Slice/escape/await/fixed.java index aa4a56aa37bc..1d377936cac2 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 = 3808654117259558405L; + private static final long serialVersionUID = 3808656084075388035L; } diff --git a/slice2java/js/test/Slice/escape/await/foreach.java b/slice2java/js/test/Slice/escape/await/foreach.java index ee3499d05760..5669bad3a8d8 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 = -8920263121879143607L; + private static final long serialVersionUID = 4050520680833726921L; } diff --git a/slice2java/js/test/Slice/macros/Test/Default.java b/slice2java/js/test/Slice/macros/Test/Default.java index a03af8d715b2..a9b119520b8c 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 = 3137235717091516830L; + private static final long serialVersionUID = -8130632778791105698L; /** @hidden */ @Override diff --git a/slice2java/js/test/Slice/macros/Test/NoDefault.java b/slice2java/js/test/Slice/macros/Test/NoDefault.java index 0da82708d3d7..853e0f85b960 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 = -8251698869861760001L; + private static final long serialVersionUID = -6387384746900890561L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Base.java b/slice2java/matlab/test/Ice/defaultValue/Test/Base.java index f00355fd6ad9..b8df5e03474c 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 = 7734947864386828004L; + private static final long serialVersionUID = 2446541878295351414L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java index 86a55be44e13..c5056b9f9b59 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 = -3177295935263898213L; + private static final long serialVersionUID = 5146878040719904013L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 9455e3a7bf5c..05feec25212d 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 = 5401618645024205033L; + private static final long serialVersionUID = 114718171084690373L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java b/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java index 1b709377b150..80a14a992fb1 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 = 2971102794024586420L; + private static final long serialVersionUID = -5598258778029218956L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java index 1442baf239df..cadc9932eefa 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 = 5127385353320652387L; + private static final long serialVersionUID = 5127389245716717531L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java index 29397126d852..c9b25dc87842 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 = 8652113839650747248L; + private static final long serialVersionUID = -9061083468430619390L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java index d2251c859480..c2b6541f6939 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 = 6233285298910226690L; + private static final long serialVersionUID = -8592689161338775914L; } diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java index c6408b28b94e..80eba2422588 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 = 7557116470004620795L; + private static final long serialVersionUID = -6249445143612053551L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/A.java b/slice2java/matlab/test/Ice/exceptions/Test/A.java index 794e2a133cc1..f339f9e4eac2 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 = 7823736979182583245L; + private static final long serialVersionUID = 7823744440130553502L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/B.java b/slice2java/matlab/test/Ice/exceptions/Test/B.java index 6cf760090de8..893a64692d51 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 = -3861418754021532403L; + private static final long serialVersionUID = -3861405838064798114L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/C.java b/slice2java/matlab/test/Ice/exceptions/Test/C.java index eaa387060720..23ccc7ced4f8 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 = 1080690670385368525L; + private static final long serialVersionUID = 1080698131333338782L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/D.java b/slice2java/matlab/test/Ice/exceptions/Test/D.java index 4ed57ec09c56..036bb1c435d7 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 = 4780373514080545805L; + private static final long serialVersionUID = 4780386430037280094L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/E.java b/slice2java/matlab/test/Ice/exceptions/Test/E.java index 465a0a0ec61a..1d43af050557 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 = -1876976188818939954L; + private static final long serialVersionUID = -1876975544359949987L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/F.java b/slice2java/matlab/test/Ice/exceptions/Test/F.java index a0ccef6f6dbe..da4f8f6017ce 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 = 733472658247006029L; + private static final long serialVersionUID = 733476107786148702L; } diff --git a/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java b/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java index d486ac5e3a02..795f1e71fc20 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 = -4641410936955366823L; + private static final long serialVersionUID = -4641415747661490934L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/C1.java b/slice2java/matlab/test/Ice/objects/LocalTest/C1.java index 1e21d4c165d2..7c781122e135 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 = -8471297675150985545L; + private static final long serialVersionUID = -8471306476581625105L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java index 2e2d71284d13..d4b8eb88484c 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 = 8898654537931913240L; + private static final long serialVersionUID = 8898645816717303365L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java index d6feef43e37f..c6876bbcc694 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 = 4040517489905053121L; + private static final long serialVersionUID = 4040526291131170856L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java index bbf11e9be8a4..d206438745b5 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 = 5383242967937881375L; + private static final long serialVersionUID = 5383245076895092975L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java index a1505e4c966e..98e3cab7c4fa 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 = 4057361193637462006L; + private static final long serialVersionUID = 4057368923054018071L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java index a22d9b0ff9d5..ab7cbbd990ea 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 = -1044058385128037097L; + private static final long serialVersionUID = -1044049749059800238L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java index 3615658801e1..2c526d12217a 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 = -1862554056737396686L; + private static final long serialVersionUID = -1862545004819148510L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java index 85f678efcbfc..00035b63e214 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 = -2187167332286226466L; + private static final long serialVersionUID = -2187160018720780646L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java index ab922afaa2f1..29d5941dae6b 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 = -6352024018857434400L; + private static final long serialVersionUID = 7194644460779560497L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S1.java b/slice2java/matlab/test/Ice/objects/LocalTest/S1.java index d0b833d44dfb..95bf67630203 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 = -5145816685042459466L; + private static final long serialVersionUID = -5145825651777814883L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S2.java b/slice2java/matlab/test/Ice/objects/LocalTest/S2.java index 8e8007978e47..6db94266daed 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 = 3347998273430237984L; + private static final long serialVersionUID = 3347990543921041277L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S3.java b/slice2java/matlab/test/Ice/objects/LocalTest/S3.java index f6b11762a93c..910dd15bbffa 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 = -9162152869050256037L; + private static final long serialVersionUID = -9162150845488479694L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S4.java b/slice2java/matlab/test/Ice/objects/LocalTest/S4.java index f2b865382ae4..ee547bc857fa 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 = -2752858353388595165L; + private static final long serialVersionUID = -2752865666959633005L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S5.java b/slice2java/matlab/test/Ice/objects/LocalTest/S5.java index c627b712b2d7..b7088ec0c6dd 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 = -6601225800337091988L; + private static final long serialVersionUID = -6601222203577055475L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S6.java b/slice2java/matlab/test/Ice/objects/LocalTest/S6.java index 1b5e5b77f737..ccf39185a39e 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 = 3216391610595549359L; + private static final long serialVersionUID = 3216393634310981226L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S7.java b/slice2java/matlab/test/Ice/objects/LocalTest/S7.java index b87678b5761d..8b2b5e65aed1 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 = -3218151512701143832L; + private static final long serialVersionUID = -3218143948433807240L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S8.java b/slice2java/matlab/test/Ice/objects/LocalTest/S8.java index 7e302cafc070..7e6fd09b35c0 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 = 4560081197360104106L; + private static final long serialVersionUID = 4560079253872712814L; } diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java b/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java index 632654bd9033..cad4a6bd3c8c 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 = 1880936682179945299L; + private static final long serialVersionUID = 3403486947533728723L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/A.java b/slice2java/matlab/test/Ice/objects/Test/A.java index 0653b0788904..6fc2ee83618f 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 = 7705876054214088281L; + private static final long serialVersionUID = -2151999862560336231L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/A1.java b/slice2java/matlab/test/Ice/objects/Test/A1.java index 8463ca4faaac..857f112a2cee 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 = -5926745942416805435L; + private static final long serialVersionUID = -5926746059876061216L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/B.java b/slice2java/matlab/test/Ice/objects/Test/B.java index 64294ea13554..fb7a2d5d4a53 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 = -8890918434378988247L; + private static final long serialVersionUID = -8890918717291259700L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/B1.java b/slice2java/matlab/test/Ice/objects/Test/B1.java index 638c59d0c45b..c91676c5f67f 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 = 8413317760299410692L; + private static final long serialVersionUID = -764202232494245948L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/Base.java b/slice2java/matlab/test/Ice/objects/Test/Base.java index 46e75c4dcf44..5ecffe7b1744 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 = -8544823475913412788L; + private static final long serialVersionUID = 4735810825530934764L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/C.java b/slice2java/matlab/test/Ice/objects/Test/C.java index 0969c753bb71..bc0218b8a788 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 = 126570370820799340L; + private static final long serialVersionUID = -8808838710540433751L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/COneMember.java b/slice2java/matlab/test/Ice/objects/Test/COneMember.java index d429b34a5c22..f3effdaae76f 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 = 3050977120156000387L; + private static final long serialVersionUID = 3050977403063386854L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java index c9ec53f4e167..fdab679959ed 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 = -6444378975308141477L; + private static final long serialVersionUID = -7295841745130129637L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/D.java b/slice2java/matlab/test/Ice/objects/Test/D.java index f2b445ed8f0e..4d4b33a6fafd 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 = 2033368962750391796L; + private static final long serialVersionUID = 1751484640953111153L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/D1.java b/slice2java/matlab/test/Ice/objects/Test/D1.java index 03196e9b0eec..a11ba6e1e78b 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 = 997863719405094979L; + private static final long serialVersionUID = 6525358032537866755L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/E.java b/slice2java/matlab/test/Ice/objects/Test/E.java index b74a8fe081a1..41a2634f0e2d 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 = 5733359305556480011L; + private static final long serialVersionUID = -7460878555844217429L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/EBase.java b/slice2java/matlab/test/Ice/objects/Test/EBase.java index 9a51fba45971..57bb587fceb3 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 = 6885768169898748110L; + private static final long serialVersionUID = -4080981770470703986L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/EDerived.java b/slice2java/matlab/test/Ice/objects/Test/EDerived.java index 25b92fad86d4..47e449d6f87b 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 = 6121231840910579922L; + private static final long serialVersionUID = -5063230093740535150L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/EOneMember.java b/slice2java/matlab/test/Ice/objects/Test/EOneMember.java index 067932271677..7690fad9053b 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 = -6225292302539839348L; + private static final long serialVersionUID = -6225292419987667159L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java index 7d2f3a137db7..401570a935e1 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 = -8439419168572609196L; + private static final long serialVersionUID = 2605682059055195028L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/F.java b/slice2java/matlab/test/Ice/objects/Test/F.java index 02a41eb9f17c..a9065947ef2d 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 = 5243529001073315793L; + private static final long serialVersionUID = 8775229694844186897L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/F1.java b/slice2java/matlab/test/Ice/objects/Test/F1.java index 111df82f23ab..66329ea05df5 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 = 6192372464549873700L; + private static final long serialVersionUID = 6192372066786370790L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/F3.java b/slice2java/matlab/test/Ice/objects/Test/F3.java index 98618536f4ee..01cf33870060 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 = -7218294028283109385L; + private static final long serialVersionUID = -4469943195561282377L; /** @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 5b2385fddf4b..4a58c55571ca 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 = -1425260896255462333L; + private static final long serialVersionUID = -1425261013717375258L; /** @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 b79fe7784e29..8d18fdda7424 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 = -2337229056283061636L; + private static final long serialVersionUID = -2337229259126261927L; } 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 3704a025b819..0c905407a145 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 = -1298679290227502604L; + private static final long serialVersionUID = -1298679253004434031L; /** @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 50cfe997c0fd..1c07e7a719c4 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 = 1842238248003570584L; + private static final long serialVersionUID = 1842238530922385021L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/K.java b/slice2java/matlab/test/Ice/objects/Test/K.java index c6dea39d20e0..4fde99a995be 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 = 4645161732952728102L; + private static final long serialVersionUID = 4645161850628189571L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/L.java b/slice2java/matlab/test/Ice/objects/Test/L.java index 50f8e4426f06..ff6a15856b1c 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 = 6629739224857231374L; + private static final long serialVersionUID = 6629739187473589739L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/M.java b/slice2java/matlab/test/Ice/objects/Test/M.java index bb4b65a486e7..41d80c76ff49 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 = -8088097386690857137L; + private static final long serialVersionUID = -8088097184084335766L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/Recursive.java b/slice2java/matlab/test/Ice/objects/Test/Recursive.java index eedaa282af2d..e0530c07f878 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 = 3617877818045491853L; + private static final long serialVersionUID = 3617877615438772264L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/objects/Test/S.java b/slice2java/matlab/test/Ice/objects/Test/S.java index 8f4fef405bf6..eff1768765a8 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 = 481772077663023549L; + private static final long serialVersionUID = 481771794744209368L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/SOneMember.java b/slice2java/matlab/test/Ice/objects/Test/SOneMember.java index 98624c97563b..b374913f7cee 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 = 6227753238653556250L; + private static final long serialVersionUID = 6227753441489784767L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java index 5529e1b85007..7f901880ebf4 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 = -3846610256503445822L; + private static final long serialVersionUID = 8796185889935004418L; } diff --git a/slice2java/matlab/test/Ice/objects/Test/StructKey.java b/slice2java/matlab/test/Ice/objects/Test/StructKey.java index d7ecb1e2d486..0fd1e880e6d6 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 = -8142967091658427577L; + private static final long serialVersionUID = 8570677219106528231L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java b/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java index e750b85982dd..0962462ab801 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 = 2723843600572238417L; + private static final long serialVersionUID = 2723843641740573091L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/MyClass1.java b/slice2java/matlab/test/Ice/operations/Test/MyClass1.java index cba6826ae165..99cf4ad3b384 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 = 3021263587350994775L; + private static final long serialVersionUID = -14028405389434755L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct.java index 0f80e4ca2659..a8a653ffc22a 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 = -2903738468848628899L; + private static final long serialVersionUID = -6544559806599956419L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java index ef3a32ff21b6..2a62e092ff87 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 = 6534698173896815070L; + private static final long serialVersionUID = -6144871546981974604L; } diff --git a/slice2java/matlab/test/Ice/operations/Test/Structure.java b/slice2java/matlab/test/Ice/operations/Test/Structure.java index 9dc6a64e71d7..58f27d086e9f 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 = 804042177849110795L; + private static final long serialVersionUID = 1980101966379003221L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/A.java b/slice2java/matlab/test/Ice/optional/Test/A.java index 25a32279fafc..37591ebf8ebc 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 = -3613339730046606576L; + private static final long serialVersionUID = -3156000097126895600L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/B.java b/slice2java/matlab/test/Ice/optional/Test/B.java index 5a9ff62613e7..6bf1a46a493d 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 = 6676782169890610659L; + private static final long serialVersionUID = -8396174990515181341L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/C.java b/slice2java/matlab/test/Ice/optional/Test/C.java index cd93b2911df5..74916f99d51a 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 = -554912227132693251L; + private static final long serialVersionUID = -3157358081839561475L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/DerivedException.java b/slice2java/matlab/test/Ice/optional/Test/DerivedException.java index b72b3a4804f7..960afd239c97 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 = 7132190610946096793L; + private static final long serialVersionUID = 2220311133372657575L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/E.java b/slice2java/matlab/test/Ice/optional/Test/E.java index 844cd551c720..95c2e24fe2b5 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 = -1850732150513367834L; + private static final long serialVersionUID = -1850744104287071741L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/F.java b/slice2java/matlab/test/Ice/optional/Test/F.java index 23732ac21ff3..5219f0eaf620 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 = -6430493677295660779L; + private static final long serialVersionUID = -6430499096201716752L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java b/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java index cf4cec7e5c49..6fc969aaaf59 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 = 1569614253816839018L; + private static final long serialVersionUID = 1569603296853838012L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/G.java b/slice2java/matlab/test/Ice/optional/Test/G.java index 3eeed554063f..25df3f22317b 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 = 6413549197288454611L; + private static final long serialVersionUID = 6365002223623734419L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/G1.java b/slice2java/matlab/test/Ice/optional/Test/G1.java index 48ed9ba837e3..9076e0083e7d 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 = 7339782964595404055L; + private static final long serialVersionUID = 7339782525396821417L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/G2.java b/slice2java/matlab/test/Ice/optional/Test/G2.java index 0687d794ea49..1ab55c323761 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 = 3824557780938131261L; + private static final long serialVersionUID = 3824546509053816383L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java b/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java index 4731ff14e7e3..04856a937130 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 = -307568455384272566L; + private static final long serialVersionUID = 3570886379627414493L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/OneOptional.java b/slice2java/matlab/test/Ice/optional/Test/OneOptional.java index 52aaff6cbf57..a2d0a83e82c4 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 = -7219609161866420604L; + private static final long serialVersionUID = -7219602585556952878L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalException.java b/slice2java/matlab/test/Ice/optional/Test/OptionalException.java index 998fb2fb7da3..455a824001c5 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 = 3298360886098789805L; + private static final long serialVersionUID = 5320538320837580744L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java index 6727f966f9b5..79863333eb65 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 = -297807875612939653L; + private static final long serialVersionUID = -1733980925353848517L; /** @hidden */ @Override diff --git a/slice2java/matlab/test/Ice/optional/Test/RequiredException.java b/slice2java/matlab/test/Ice/optional/Test/RequiredException.java index d6832d281379..f05f8fff0f58 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 = 2894246012840765662L; + private static final long serialVersionUID = 2894244648792202656L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java b/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java index 3662c939c826..d4ee0409321b 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 = 6700991674706652003L; + private static final long serialVersionUID = 6700981642524515423L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/VarStruct.java b/slice2java/matlab/test/Ice/optional/Test/VarStruct.java index 7fb4d5834608..2c2f674d5259 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 = -1912285221093670753L; + private static final long serialVersionUID = -1912286342187339999L; } diff --git a/slice2java/matlab/test/Ice/optional/Test/WD.java b/slice2java/matlab/test/Ice/optional/Test/WD.java index ae29bba2c5e4..7e4f2d00bb1a 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 = 6681658180113711443L; + private static final long serialVersionUID = 5655905275204720635L; /** @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 47f76a69635b..a25e84b99bf5 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 = -477019810258554624L; + private static final long serialVersionUID = -477014814703913114L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java index 367e8ad3a13b..b55ee4bca57d 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 = -8435632461392574140L; + private static final long serialVersionUID = -8435643986296749918L; /** @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 7dcc8e4d9123..f0d0f76b9f95 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 = 3485213120477316134L; + private static final long serialVersionUID = 3485212174966225536L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index cac7a85987d3..cec6c8b1c605 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 = 1717373923020256599L; + private static final long serialVersionUID = 1717369092925173745L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index aa5714eb966c..ccdb0dc5e584 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 = -7384914404685438322L; + private static final long serialVersionUID = -7384920644902405912L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java index 7c04a7735a8e..9bb1df7d3198 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 = -2733711364331563829L; + private static final long serialVersionUID = -2733706286283830931L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java index 2a3af5a5bc3a..20a208af9048 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 = 4528099910016161410L; + private static final long serialVersionUID = 4528104900405209828L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java index 107004f2e417..cfb6484b0967 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 = 6137353984787659861L; + private static final long serialVersionUID = 6137360385155729267L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java index b5bf9bc4fbb6..4c9624855f2d 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 = 751741828676277749L; + private static final long serialVersionUID = 751748058722791315L; } diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java index 1023d9ddf21d..47e1e8b7f2fc 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 = -4272735925977499718L; + private static final long serialVersionUID = -4272724318419374052L; /** @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 aa549be45467..14e82712f9fe 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 = -7594960945014995011L; + private static final long serialVersionUID = 8822124175210006309L; /** @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 155db4fe1abe..8b80c8ae16f1 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 = -6302055503178915855L; + private static final long serialVersionUID = -1617125654810185751L; } diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java index 98b4ef84c0cc..8293d78b3636 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 = -6397006586718500080L; + private static final long serialVersionUID = -6396993919731771870L; /** @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 46c350a582cb..42458476a43b 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 = -9066879214033464072L; + private static final long serialVersionUID = -9066889403675024719L; /** @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 380c88d8391b..546c6ad0020a 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 = -661560760178662434L; + private static final long serialVersionUID = -2205422988205753242L; /** @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 72ca65bb0a4b..197818928dbd 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 = 5477690272074670748L; + private static final long serialVersionUID = 3933828374516042660L; /** @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 cfc63aef2f99..7f3ee3a7a17e 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 = -2210405237183036334L; + private static final long serialVersionUID = 7416571390556279844L; } diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java b/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java index 09ab1c7c3771..d14594575df4 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 = -7655925025858615038L; + private static final long serialVersionUID = -7655931206804549639L; /** @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 d83b20ad7285..2cfa587df7d5 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 = -2271126834068908642L; + private static final long serialVersionUID = -2271120653217214120L; /** @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 95fb93382c7f..2e56cf533702 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 = 481704307833861526L; + private static final long serialVersionUID = 481716974774906112L; /** @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 9e610431e029..45af67310b87 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 = -4426886323701493680L; + private static final long serialVersionUID = -4426878781563262238L; /** @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 c8b8681cbf46..7f4b8895a304 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 = 850543158870163787L; + private static final long serialVersionUID = 850535947089815901L; /** @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 5ebf3e71ac02..465fdede4c69 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 = -4328900706901236454L; + private static final long serialVersionUID = -4328906892778183867L; /** @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 76980cb0f3fc..9e69d5358181 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 = -5081808229491503986L; + private static final long serialVersionUID = -5081810636963565873L; /** @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 37e8e108b4ac..ccc95e31cc0b 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 = 643084209910086079L; + private static final long serialVersionUID = 643087583108311542L; /** @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 67310f3e3fef..c9b7582aabde 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 = -2438004252189392388L; + private static final long serialVersionUID = -2438004967873019850L; /** @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 fa3ee2e42055..a75a11091716 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 = 3651530599221897159L; + private static final long serialVersionUID = 3651536780196118022L; /** @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 06d6bd73ef31..a04719e79bb6 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 = 8804381003743018082L; + private static final long serialVersionUID = 8804373787033272227L; /** @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 29115e7ba8cb..de57888d62b6 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 = -5353763062658302060L; + private static final long serialVersionUID = -5353758653586264747L; /** @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 66449f54f3bc..11b16e047919 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 = -6522138588181191442L; + private static final long serialVersionUID = -6522142992295893841L; /** @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 ee64a01581cf..5d18fa6481e9 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 = 7620286686230287789L; + private static final long serialVersionUID = 7620284594149215724L; /** @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 11d2bf7f2294..657b9d4c4dde 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 = 4625119678554981204L; + private static final long serialVersionUID = 307234680491803934L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java b/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java index c502e7c010e6..b97adddadcc5 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 = -1703016943832500691L; + private static final long serialVersionUID = 4258315150096012717L; /** @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 5173bdd9e6ec..4e770ef22d04 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 = -7834209237713420257L; + private static final long serialVersionUID = 1617778626261821215L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/global.java b/slice2java/matlab/test/Slice/escape/classdef/_break/global.java index 15f75b9da6c1..20008656004b 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 = 2421493942766319347L; + private static final long serialVersionUID = 2421486762360808891L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java b/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java index 228447b39eb5..6a3d8e5d3d9a 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 = -6421105817303598387L; + private static final long serialVersionUID = 3662393840386915845L; /** @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 3eecbd65a613..2c5172236759 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 = 4039200146933376401L; + private static final long serialVersionUID = -7619209041721741295L; } diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java b/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java index 66655f6a4e26..459dd25e2ab2 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 = -3746024626242767081L; + private static final long serialVersionUID = -4599371429657543145L; /** @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 a8a1d9c9215d..bf3d7c6093f5 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 = -1008943295550941230L; + private static final long serialVersionUID = -1008953286190752230L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/Base.java b/slice2java/php/test/Ice/defaultValue/Test/Base.java index 1be7bfe3ddc7..d8204fbfd2e2 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 = 356908148243202083L; + private static final long serialVersionUID = 6356047659306973988L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java index e559ef8b779b..f8161c0c60c7 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 = -6043050580603009194L; + private static final long serialVersionUID = 5255202084603833322L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 238e36b053e8..2758cf9d401d 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 = -8691317650964326627L; + private static final long serialVersionUID = -5994280507611114648L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/Derived.java b/slice2java/php/test/Ice/defaultValue/Test/Derived.java index fa01eb90eeb7..ca41a3ab4c04 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 = 3485113203480090254L; + private static final long serialVersionUID = 9170240945693135943L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java index 9f97e0b23b3a..d727a7cb448c 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 = 5127385450208767799L; + private static final long serialVersionUID = 5127387679194869544L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct1.java b/slice2java/php/test/Ice/defaultValue/Test/Struct1.java index 172d3d76eab6..463e3cb5f3ac 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 = 6280646847829635565L; + private static final long serialVersionUID = 780845747626340675L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct2.java b/slice2java/php/test/Ice/defaultValue/Test/Struct2.java index 1bb28c6f014a..10323bbecc16 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 = -158449353929873830L; + private static final long serialVersionUID = 6086538720076391091L; } diff --git a/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java index 123d2b993842..6a243c4945e6 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 = 3514121163403710165L; + private static final long serialVersionUID = 2382385799052375584L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/A.java b/slice2java/php/test/Ice/exceptions/Test/A.java index c65314acb80c..4e0f4df2d4c7 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 = 7823740716598241478L; + private static final long serialVersionUID = 7823745223977851042L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/B.java b/slice2java/php/test/Ice/exceptions/Test/B.java index b5db8555d109..92e969ba254f 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 = -3861420802230577402L; + private static final long serialVersionUID = -3861410674382366494L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/C.java b/slice2java/php/test/Ice/exceptions/Test/C.java index 6764d4911c74..fa2af6321d99 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 = 1080694407801026758L; + private static final long serialVersionUID = 1080698915180636322L; } diff --git a/slice2java/php/test/Ice/exceptions/Test/D.java b/slice2java/php/test/Ice/exceptions/Test/D.java index 82c3784c4093..d3d51c18f18e 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 = 4780371465871500806L; + private static final long serialVersionUID = 4780381593719711714L; } diff --git a/slice2java/php/test/Ice/objects/Test/A.java b/slice2java/php/test/Ice/objects/Test/A.java index 757ad876605e..019638876773 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 = -1098778225928966704L; + private static final long serialVersionUID = -1792188973604779376L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/A1.java b/slice2java/php/test/Ice/objects/Test/A1.java index fc09f0dfa320..90955339d6bb 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 = -5926737319200679384L; + private static final long serialVersionUID = -5926745324935306018L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/B.java b/slice2java/php/test/Ice/objects/Test/B.java index fea69b0a145f..0aca32ce1dc1 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 = -8890913822678179110L; + private static final long serialVersionUID = -8890916324367650580L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/B1.java b/slice2java/php/test/Ice/objects/Test/B1.java index 75a3d890cc88..d4013cc05f1f 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 = -5117680165301351164L; + private static final long serialVersionUID = -1107220022500022716L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/Base.java b/slice2java/php/test/Ice/objects/Test/Base.java index 97a22ed5d037..f6c2913c8263 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 = -445444235412848294L; + private static final long serialVersionUID = 5580341135901496474L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/C.java b/slice2java/php/test/Ice/objects/Test/C.java index b0b4c36b2371..363fc6736c15 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 = -974699878361826527L; + private static final long serialVersionUID = -8026328557248397801L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/COneMember.java b/slice2java/php/test/Ice/objects/Test/COneMember.java index 797899eabda0..36baa4fa0da9 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 = 3050967053108168698L; + private static final long serialVersionUID = 3050969725111339852L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/CTwoMembers.java b/slice2java/php/test/Ice/objects/Test/CTwoMembers.java index d9f643576deb..949a1dbe03ed 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 = -565294554627037925L; + private static final long serialVersionUID = 7335871552207084955L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/D.java b/slice2java/php/test/Ice/objects/Test/D.java index 510f4f2080b5..233a22324f8c 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 = -5386696564930394514L; + private static final long serialVersionUID = 1661187730354466456L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/D1.java b/slice2java/php/test/Ice/objects/Test/D1.java index d168137b1bf4..b5e2747a670f 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 = 2169728578832934467L; + private static final long serialVersionUID = 7075844365209229955L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/E.java b/slice2java/php/test/Ice/objects/Test/E.java index 86ddd8c7c3b4..b8faa2cea379 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 = -6638545778784227677L; + private static final long serialVersionUID = 1476996731900157667L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/EBase.java b/slice2java/php/test/Ice/objects/Test/EBase.java index 761e996c0ec4..7bf688ff66b5 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 = 4502502308193800398L; + private static final long serialVersionUID = 1464311140029976334L; } diff --git a/slice2java/php/test/Ice/objects/Test/EDerived.java b/slice2java/php/test/Ice/objects/Test/EDerived.java index 95b962a7c82d..4c21075e0bfb 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 = 4330874492947668434L; + private static final long serialVersionUID = -6170509471961332846L; } diff --git a/slice2java/php/test/Ice/objects/Test/EOneMember.java b/slice2java/php/test/Ice/objects/Test/EOneMember.java index de0ef6b52cd3..255f2b6ca8c7 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 = -6225278063930869195L; + private static final long serialVersionUID = -6225291354461880381L; } diff --git a/slice2java/php/test/Ice/objects/Test/ETwoMembers.java b/slice2java/php/test/Ice/objects/Test/ETwoMembers.java index 2c0c3f193317..fe0b3d2d7d5f 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 = -6517179343868862828L; + private static final long serialVersionUID = 3511912516079565332L; } diff --git a/slice2java/php/test/Ice/objects/Test/F.java b/slice2java/php/test/Ice/objects/Test/F.java index a00edd84a968..97b670ee146d 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 = 8313460440104783825L; + private static final long serialVersionUID = -3982121614283357103L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/F1.java b/slice2java/php/test/Ice/objects/Test/F1.java index 98c306c83719..70e42431e000 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 = 6192376007143670556L; + private static final long serialVersionUID = 6192369662068616735L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/F3.java b/slice2java/php/test/Ice/objects/Test/F3.java index a948d40d335d..fdb30aea1fef 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 = -1596297728265275375L; + private static final long serialVersionUID = 8017575360701947281L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/K.java b/slice2java/php/test/Ice/objects/Test/K.java index b8d96ffe67e4..bcf9b7e7f67c 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 = 4645164020069120016L; + private static final long serialVersionUID = 4645160945311053542L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/L.java b/slice2java/php/test/Ice/objects/Test/L.java index 174104b7e5df..5453ce13b3cb 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 = 6629739908102691491L; + private static final long serialVersionUID = 6629737450362226197L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/Recursive.java b/slice2java/php/test/Ice/objects/Test/Recursive.java index 5038d027a744..8bf0d0a0e0ae 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 = 3617890695195892940L; + private static final long serialVersionUID = 3617877030402342714L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/objects/Test/S.java b/slice2java/php/test/Ice/objects/Test/S.java index b31763f12f77..1f6314581d1f 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 = 481776529261155856L; + private static final long serialVersionUID = 481768567282059046L; } diff --git a/slice2java/php/test/Ice/objects/Test/SOneMember.java b/slice2java/php/test/Ice/objects/Test/SOneMember.java index 8e973f5e7dcc..9c81e9dc8351 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 = 6227747100209658915L; + private static final long serialVersionUID = 6227760798844827477L; } diff --git a/slice2java/php/test/Ice/objects/Test/STwoMembers.java b/slice2java/php/test/Ice/objects/Test/STwoMembers.java index 7e4ce7a0e5af..4444da6a6bfd 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 = 4786422083679742978L; + private static final long serialVersionUID = 7838415482928893826L; } diff --git a/slice2java/php/test/Ice/operations/Test/AnotherStruct.java b/slice2java/php/test/Ice/operations/Test/AnotherStruct.java index a4f832344c93..be3cd0d60b29 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 = 2723847872572987197L; + private static final long serialVersionUID = 2723846171785869921L; } diff --git a/slice2java/php/test/Ice/operations/Test/MyClass1.java b/slice2java/php/test/Ice/operations/Test/MyClass1.java index 799461a2054d..098725db5823 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 = -918930491523209395L; + private static final long serialVersionUID = 4781259590925853274L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/operations/Test/MyStruct1.java b/slice2java/php/test/Ice/operations/Test/MyStruct1.java index d55923500ce8..088166f8e4d6 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 = 421479889915145604L; + private static final long serialVersionUID = -177341186498189901L; } diff --git a/slice2java/php/test/Ice/operations/Test/Structure.java b/slice2java/php/test/Ice/operations/Test/Structure.java index a0738ee574c2..ba23daa71db9 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 = -7425965194807070578L; + private static final long serialVersionUID = 6274418065790477369L; } diff --git a/slice2java/php/test/Ice/optional/Test/A.java b/slice2java/php/test/Ice/optional/Test/A.java index a117b0297297..8c8f3f9e6cf4 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 = -4244170974241122416L; + private static final long serialVersionUID = -407863138728795888L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/B.java b/slice2java/php/test/Ice/optional/Test/B.java index 96b58759f9bf..21b04b4a8bd9 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 = -5567651058514558109L; + private static final long serialVersionUID = 2651363498455458787L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/C.java b/slice2java/php/test/Ice/optional/Test/C.java index 27d57384efcd..bd37493e4ece 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 = 6636977772096641405L; + private static final long serialVersionUID = 5401972804458104829L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/DerivedException.java b/slice2java/php/test/Ice/optional/Test/DerivedException.java index 190aff6025cf..8d990070f2cc 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 = -6968055825364803759L; + private static final long serialVersionUID = 6115295564517977381L; } diff --git a/slice2java/php/test/Ice/optional/Test/E.java b/slice2java/php/test/Ice/optional/Test/E.java index d74df34d2906..266a7be81342 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 = -1850743982938284766L; + private static final long serialVersionUID = -1850732528938063660L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/F.java b/slice2java/php/test/Ice/optional/Test/F.java index c2265f3957fd..494d445ef3b6 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 = -6430498892247908527L; + private static final long serialVersionUID = -6430494301059295833L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/FixedStruct.java b/slice2java/php/test/Ice/optional/Test/FixedStruct.java index 38912d6d3389..b8fb0e578dd7 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 = 1569603578542703097L; + private static final long serialVersionUID = 1569613544730281063L; } diff --git a/slice2java/php/test/Ice/optional/Test/G.java b/slice2java/php/test/Ice/optional/Test/G.java index cb09cdafa7c7..dd7228149b23 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 = 2244195044999314771L; + private static final long serialVersionUID = 5789705916574759827L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/G1.java b/slice2java/php/test/Ice/optional/Test/G1.java index c4f5e58a98dd..e2f56a746022 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 = 7339782729543631199L; + private static final long serialVersionUID = 7339783353151821995L; } diff --git a/slice2java/php/test/Ice/optional/Test/G2.java b/slice2java/php/test/Ice/optional/Test/G2.java index 57ecbfda2090..859f3659d463 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 = 3824546630384944641L; + private static final long serialVersionUID = 3824558084409801675L; } diff --git a/slice2java/php/test/Ice/optional/Test/MultiOptional.java b/slice2java/php/test/Ice/optional/Test/MultiOptional.java index 4ecf4d298c57..ca4cc144573f 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 = 7410079130687744355L; + private static final long serialVersionUID = -2728653559165368920L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/OneOptional.java b/slice2java/php/test/Ice/optional/Test/OneOptional.java index 41fd590ad93c..9378cda94f43 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 = -7219602784597654889L; + private static final long serialVersionUID = -7219608698157735671L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/OptionalException.java b/slice2java/php/test/Ice/optional/Test/OptionalException.java index 41e312f5b0e9..a52500e790b3 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 = 3955744890255615912L; + private static final long serialVersionUID = 2031013088547065925L; } diff --git a/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java index bf7192ffbe8e..a4bde96d5c0b 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 = -7153437077531938117L; + private static final long serialVersionUID = -7871994760923692229L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/optional/Test/RequiredException.java b/slice2java/php/test/Ice/optional/Test/RequiredException.java index b31340de6215..f2ca2f0da001 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 = 2894244930586005910L; + private static final long serialVersionUID = 2894245474116206754L; } diff --git a/slice2java/php/test/Ice/optional/Test/SmallStruct.java b/slice2java/php/test/Ice/optional/Test/SmallStruct.java index 36088a161024..40f65d89d7eb 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 = 6700981846640005039L; + private static final long serialVersionUID = 6700991892827517721L; } diff --git a/slice2java/php/test/Ice/optional/Test/VarStruct.java b/slice2java/php/test/Ice/optional/Test/VarStruct.java index b860d82b9119..3fe690036a96 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 = -1912286138040530217L; + private static final long serialVersionUID = -1912285514432339421L; } diff --git a/slice2java/php/test/Ice/optional/Test/WD.java b/slice2java/php/test/Ice/optional/Test/WD.java index 12ef84e3b050..a79b1296e825 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 = 5800187274355269096L; + private static final long serialVersionUID = 6660059189430490178L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/C.java b/slice2java/php/test/Ice/scope/Test/C.java index a32cf43f0648..02bc48462b3d 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 = -5190251438884370358L; + private static final long serialVersionUID = -5190251456821237661L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/C1.java b/slice2java/php/test/Ice/scope/Test/C1.java index 52b25b280019..1b9f56839842 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 = 8893231725843005451L; + private static final long serialVersionUID = 8893231754234395874L; /** @hidden */ @Override diff --git a/slice2java/php/test/Ice/scope/Test/C2.java b/slice2java/php/test/Ice/scope/Test/C2.java index 9d1d8a22d2c6..277f8ff69945 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 = 2273371610668180967L; + private static final long serialVersionUID = -8599324762140609199L; /** @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 6795476f4d31..c2e29c52a749 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 = 4615629816356870507L; + private static final long serialVersionUID = 4615629749257216457L; /** @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 ad325b1ea5eb..788583321a94 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 = 672584914868092215L; + private static final long serialVersionUID = 672584692637783202L; /** @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 7f09df8df074..a3e96ca70fa4 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 = 8654440743409142934L; + private static final long serialVersionUID = 8654440880472918269L; } diff --git a/slice2java/php/test/Ice/scope/Test/Inner/S.java b/slice2java/php/test/Ice/scope/Test/Inner/S.java index a879822a39a9..78c22ee3b05e 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 = 3694611980094254682L; + private static final long serialVersionUID = 3694611962153830577L; } diff --git a/slice2java/php/test/Ice/scope/Test/S.java b/slice2java/php/test/Ice/scope/Test/S.java index df300dc76896..aa455e2d6357 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 = 2159709552430773028L; + private static final long serialVersionUID = 2159709485138910991L; } diff --git a/slice2java/php/test/Ice/scope/Test/S1.java b/slice2java/php/test/Ice/scope/Test/S1.java index a1683154175e..ea33bb025d6b 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 = 1241676219326998706L; + private static final long serialVersionUID = 1241676035944946779L; } diff --git a/slice2java/php/test/Ice/scope/Test/S2.java b/slice2java/php/test/Ice/scope/Test/S2.java index a032c9537c4b..af4d88d46974 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 = -6088340168483303394L; + private static final long serialVersionUID = -720245061672959576L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java index db23e929e0b4..7f7651007386 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 = -477019768768586539L; + private static final long serialVersionUID = -477020269850549872L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java index 52a8600df466..8b17b6ffea9e 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 = 3485213161663840755L; + private static final long serialVersionUID = 3485217630131503798L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index a7a0d3c1babd..a1768efc212f 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 = 1717374047008943746L; + private static final long serialVersionUID = 1717374548090349511L; } diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index ce6a27a10a97..00b9520ff9c2 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 = -7384914203067507621L; + private static final long serialVersionUID = -7384915189755383906L; } diff --git a/slice2java/php/test/Ice/slicing/objects/Test/B.java b/slice2java/php/test/Ice/slicing/objects/Test/B.java index 8264ef965917..e099bef60266 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 = -6700474964329000996L; + private static final long serialVersionUID = -4325407143639923675L; /** @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 6be14dc24378..2ff5e180a4e5 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 = 1678813050552355088L; + private static final long serialVersionUID = 200098906659955945L; } diff --git a/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java index b1d159f8dcec..319b8336cb25 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 = -6396993759588334539L; + private static final long serialVersionUID = -6397006107436311004L; /** @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 ba324161cfc6..c9a379e5e493 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 = -9066887953436396935L; + private static final long serialVersionUID = -9066881818847882641L; /** @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 292933676e44..d175bea9efec 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 = -3982285867762650913L; + private static final long serialVersionUID = 4235381330164524774L; /** @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 84acf47b2cba..68be3f3ac229 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 = 4729981969072826833L; + private static final long serialVersionUID = -6050850426251172637L; /** @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 c9e7692286db..b068da065ad1 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 = 9008264037875403923L; + private static final long serialVersionUID = -6128408016475007130L; } diff --git a/slice2java/php/test/Ice/slicing/objects/Test/Forward.java b/slice2java/php/test/Ice/slicing/objects/Test/Forward.java index 71d98479acca..c86496e3464d 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 = -7655927196619541786L; + private static final long serialVersionUID = -7655916965861746405L; /** @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 32523894e2b7..4b83729b7251 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 = -2271124663298929858L; + private static final long serialVersionUID = -2271134894341348088L; /** @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 b2dae13394b9..49d5d4b9cefe 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 = 481712964616082190L; + private static final long serialVersionUID = 481706827514674396L; /** @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 af3fd286444f..2ef5ba7c688a 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 = -4426878621410485643L; + private static final long serialVersionUID = -4426891299731664156L; /** @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 88e2de124d4b..cdc92434a487 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 = 850535786953653408L; + private static final long serialVersionUID = 850542684659454645L; /** @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 9c8f6258189b..d5dd9783d2b1 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 = -4328907052912146826L; + private static final long serialVersionUID = -4328899829791942322L; /** @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 617822641771..fd61b7c4e5c4 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 = -5081810476821838859L; + private static final long serialVersionUID = -5081814809765696899L; /** @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 d2cec065c6a0..2ef3c40e1a75 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 = 643086463491772862L; + private static final long serialVersionUID = 643076235024584872L; /** @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 6565f9e39461..9eeaadf663a6 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 = -2438000968097839105L; + private static final long serialVersionUID = -2438007102593285916L; /** @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 ca332afe6d62..333c95e6f5bb 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 = 3651532770107053894L; + private static final long serialVersionUID = 3651522539098784722L; /** @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 74f50e208d17..eefc1faef8e2 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 = 8804372347107848803L; + private static final long serialVersionUID = 8804373029013106679L; /** @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 1f89b7d912c2..3ecd0e5504dd 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 = -5353754323373854571L; + private static final long serialVersionUID = -5353755002677221375L; /** @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 3bd381de8074..322c470e9317 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 = -6522141872465896873L; + private static final long serialVersionUID = -6522130282615980749L; /** @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 8b31451b6ce9..48e9f23c153d 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 = 7620283154135671892L; + private static final long serialVersionUID = 7620289291257900528L; /** @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 4f3c16003f66..f9006b514504 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 = -6664790605098233132L; + private static final long serialVersionUID = 4281430955098073093L; } diff --git a/slice2java/php/test/Slice/escape/Clash/Cls.java b/slice2java/php/test/Slice/escape/Clash/Cls.java index 00bab5246b64..80bbbedd4129 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 = 9115921625068395394L; + private static final long serialVersionUID = 1030849722574582530L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/escape/Clash/Ex.java b/slice2java/php/test/Slice/escape/Clash/Ex.java index 29963c47dc08..c64d5c274c72 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 = 1671740779078346723L; + private static final long serialVersionUID = 3052270784179460818L; } diff --git a/slice2java/php/test/Slice/escape/Clash/St.java b/slice2java/php/test/Slice/escape/Clash/St.java index b7fec9dc4a37..ee7b05c23aec 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 = 6985787605422597520L; + private static final long serialVersionUID = 6080437361216149727L; } diff --git a/slice2java/php/test/Slice/escape/and/echo.java b/slice2java/php/test/Slice/escape/and/echo.java index 534d41f4f6d2..76fabf50e16a 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 = -5163343476704836803L; + private static final long serialVersionUID = 273315998832269437L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/escape/and/endif.java b/slice2java/php/test/Slice/escape/and/endif.java index b4f7c3c20144..4c597ca623ba 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 = -3766561542629839110L; + private static final long serialVersionUID = -3766558581393083130L; } diff --git a/slice2java/php/test/Slice/escape/and/endwhile.java b/slice2java/php/test/Slice/escape/and/endwhile.java index 9909255cf7ba..2df9d54fb46f 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 = 999246224662795694L; + private static final long serialVersionUID = 589286243695094958L; } diff --git a/slice2java/php/test/Slice/escape/and/xor.java b/slice2java/php/test/Slice/escape/and/xor.java index 67e6f80471d6..4992b155d08d 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 = 1991910949777615705L; + private static final long serialVersionUID = 8957187259292128613L; } diff --git a/slice2java/php/test/Slice/macros/Test/Default.java b/slice2java/php/test/Slice/macros/Test/Default.java index b284b9f9e168..20b9d6a1fdc8 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 = 7324595488123285534L; + private static final long serialVersionUID = 27921734908182398L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/macros/Test/NoDefault.java b/slice2java/php/test/Slice/macros/Test/NoDefault.java index 1012fc190299..f2a516f477d8 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 = 4194459395640362111L; + private static final long serialVersionUID = 8015964733119510431L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/structure/Test/C.java b/slice2java/php/test/Slice/structure/Test/C.java index 2a948d724b9e..67766b49484c 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 = -3172281488095329170L; + private static final long serialVersionUID = -3172272703385512965L; /** @hidden */ @Override diff --git a/slice2java/php/test/Slice/structure/Test/S1.java b/slice2java/php/test/Slice/structure/Test/S1.java index be1590355dd2..6f72dc249f37 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 = -5542857848570434085L; + private static final long serialVersionUID = -5542865269343186482L; } diff --git a/slice2java/php/test/Slice/structure/Test/S2.java b/slice2java/php/test/Slice/structure/Test/S2.java index 3ec70de264ef..97b8557548f3 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 = -2478108021023561881L; + private static final long serialVersionUID = 6902622766313149874L; } diff --git a/slice2java/python/test/Glacier2/router/Test/CallbackException.java b/slice2java/python/test/Glacier2/router/Test/CallbackException.java index 33b7111b00b8..ee44021ec9b5 100644 --- a/slice2java/python/test/Glacier2/router/Test/CallbackException.java +++ b/slice2java/python/test/Glacier2/router/Test/CallbackException.java @@ -58,5 +58,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_) } /** @hidden */ - private static final long serialVersionUID = -136857338202940597L; + private static final long serialVersionUID = 8117908113363370595L; } diff --git a/slice2java/python/test/Ice/custom/Test/C.java b/slice2java/python/test/Ice/custom/Test/C.java index 1abf1e74675d..7a751b1d7c54 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 = -8411302894484563497L; + private static final long serialVersionUID = 1357388249505886103L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/custom/Test/D.java b/slice2java/python/test/Ice/custom/Test/D.java index 113d620525b3..60dd8bf45ded 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 = 991061675181278522L; + private static final long serialVersionUID = -3264403051263457338L; /** @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 e977ac6c2942..9baa1b43cf4d 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 = -4107863158799748749L; + private static final long serialVersionUID = 5611920291015187645L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/custom/Test/S.java b/slice2java/python/test/Ice/custom/Test/S.java index 3efbf899e5ca..360029ffe7b9 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 = 4708232385492759918L; + private static final long serialVersionUID = -2068505923555837650L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/Base.java b/slice2java/python/test/Ice/defaultValue/Test/Base.java index 91f954902276..b53248a91f2b 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 = -7953791431361743836L; + private static final long serialVersionUID = 4111886764468488310L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java index b8dba5bb7b6c..3f9760536300 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 = -6312254184983428272L; + private static final long serialVersionUID = -617237256165491838L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java index dab7b6caa950..7866966d64b6 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 = -2169174937768434405L; + private static final long serialVersionUID = -4326348121888128851L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index e2ff06d738f9..94ed90248e00 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 = -5484533857386499844L; + private static final long serialVersionUID = -4158329923651217669L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/Derived.java b/slice2java/python/test/Ice/defaultValue/Test/Derived.java index c722f591632c..9f79e6ee8479 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 = 4920440694460132660L; + private static final long serialVersionUID = -3819174128401124492L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java index e77e759d01cc..a94af004bc58 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 = 4436252593182847107L; + private static final long serialVersionUID = -4059778276316052029L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java index d5f7037691d8..074725b59b2f 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 = -8869298219153745793L; + private static final long serialVersionUID = 4351052667182462857L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java index e4f057abe00c..8657b5ce8bf4 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 = -8465743966539101044L; + private static final long serialVersionUID = -6455770108768213493L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java index a6c385e3d72f..0b2a33fe82e6 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 = 5127385392064830915L; + private static final long serialVersionUID = 5127390708909920847L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct1.java b/slice2java/python/test/Ice/defaultValue/Test/Struct1.java index e19c4b2b2285..955c6896d720 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 = 6125414174907182576L; + private static final long serialVersionUID = -6335962336010857086L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct2.java b/slice2java/python/test/Ice/defaultValue/Test/Struct2.java index 8f8befdf5594..c7fc9c3b4f92 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 = -178132822388286910L; + private static final long serialVersionUID = 8785581914927771670L; } diff --git a/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java index 68efa07a6d3c..525a06e9a2d3 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 = -4877242848419361303L; + private static final long serialVersionUID = -8082060809583536099L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/A.java b/slice2java/python/test/Ice/exceptions/Test/A.java index 05bb00c38f77..3f1e74138465 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 = 7823738463012530525L; + private static final long serialVersionUID = 7823744520049648814L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/B.java b/slice2java/python/test/Ice/exceptions/Test/B.java index beebc5163856..9e119d593c1e 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 = -3861417270191445731L; + private static final long serialVersionUID = -3861406088457767698L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/C.java b/slice2java/python/test/Ice/exceptions/Test/C.java index 5caeefe6857a..5d02573663e5 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 = 1080692154215315805L; + private static final long serialVersionUID = 1080698211252434094L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/D.java b/slice2java/python/test/Ice/exceptions/Test/D.java index 5abd3ea8ad8e..34f2e36a0f63 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 = 4780374997910632477L; + private static final long serialVersionUID = 4780386179644310510L; } diff --git a/slice2java/python/test/Ice/exceptions/Test/Mod/A.java b/slice2java/python/test/Ice/exceptions/Test/Mod/A.java index f81f1f3ad4a8..9b12a75fbd2d 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 = -4641409773427917111L; + private static final long serialVersionUID = -4641415667742362822L; } diff --git a/slice2java/python/test/Ice/objects/Test/A.java b/slice2java/python/test/Ice/objects/Test/A.java index f9a66b407511..e02d1cbeaebf 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 = -8907270984673372262L; + private static final long serialVersionUID = -6941280622763921639L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/A1.java b/slice2java/python/test/Ice/objects/Test/A1.java index f6401fc12464..3d47f5537feb 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 = -5926752016112280308L; + private static final long serialVersionUID = -5926738782362123217L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/B.java b/slice2java/python/test/Ice/objects/Test/B.java index 3923901d2e0d..a69e87ae4bae 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 = -8890917895854059960L; + private static final long serialVersionUID = -8890911956522853117L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/B1.java b/slice2java/python/test/Ice/objects/Test/B1.java index 209625107e4e..8e1207abe7bc 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 = -4918985775595165180L; + private static final long serialVersionUID = -6182153164178761852L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/Base.java b/slice2java/python/test/Ice/objects/Test/Base.java index 656372989c43..f1f7fe531462 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 = -6978134861382083158L; + private static final long serialVersionUID = -1075131871504344500L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/C.java b/slice2java/python/test/Ice/objects/Test/C.java index f5ecceabda04..d5cb1fa79f44 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 = 7893230378988373169L; + private static final long serialVersionUID = -9034802233214129850L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/COneMember.java b/slice2java/python/test/Ice/objects/Test/COneMember.java index 76687ec66cc6..8d0cfc26ab2b 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 = 3050971003696240526L; + private static final long serialVersionUID = 3050977848611639187L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/CTwoMembers.java b/slice2java/python/test/Ice/objects/Test/CTwoMembers.java index 5e3a2ab25f95..fa0d7ca0f857 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 = 7330421614428724507L; + private static final long serialVersionUID = -8748380582787385637L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/D.java b/slice2java/python/test/Ice/objects/Test/D.java index ec5e0269981d..64f9aaf903fb 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 = 6501829265186571126L; + private static final long serialVersionUID = 3001185648090812382L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/D1.java b/slice2java/python/test/Ice/objects/Test/D1.java index ca4cdb6f2185..14a4e47b6d00 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 = -6585785444629330109L; + private static final long serialVersionUID = 7545299715483849539L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/E.java b/slice2java/python/test/Ice/objects/Test/E.java index d550e3e7d2ee..7f6bb6234f17 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 = -2791949779623544233L; + private static final long serialVersionUID = -3078638531921582325L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/EBase.java b/slice2java/python/test/Ice/objects/Test/EBase.java index 5cb807555603..ea4e2aa1072d 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 = -9136481078055152946L; + private static final long serialVersionUID = -3527205269968146866L; } diff --git a/slice2java/python/test/Ice/objects/Test/EDerived.java b/slice2java/python/test/Ice/objects/Test/EDerived.java index f15e700cd6b1..16418d117148 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 = 4814210236176293586L; + private static final long serialVersionUID = 4061431148674475218L; } diff --git a/slice2java/python/test/Ice/objects/Test/EOneMember.java b/slice2java/python/test/Ice/objects/Test/EOneMember.java index 576a645c04dd..267ea0b88dc9 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 = -6225292963703980799L; + private static final long serialVersionUID = -6225292661331903716L; } diff --git a/slice2java/python/test/Ice/objects/Test/ETwoMembers.java b/slice2java/python/test/Ice/objects/Test/ETwoMembers.java index 8a39e99e9b1f..89b4460a059d 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 = -5194188414614946540L; + private static final long serialVersionUID = -3755907286230975916L; } diff --git a/slice2java/python/test/Ice/objects/Test/F.java b/slice2java/python/test/Ice/objects/Test/F.java index ebf9177ebb33..4e15901dcb86 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 = -4499969629751999535L; + private static final long serialVersionUID = -4934799398145598895L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/F1.java b/slice2java/python/test/Ice/objects/Test/F1.java index 3efcb501c735..e8a5ffbf3adc 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 = 6192373606211454280L; + private static final long serialVersionUID = 6192373948543327147L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/F3.java b/slice2java/python/test/Ice/objects/Test/F3.java index b1f9d2de53a6..70f5f593adb3 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 = -3623884385605441461L; + private static final long serialVersionUID = -1879430978030942089L; /** @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 7ddfc287eb44..c6a427a8a96d 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 = -1425265647597274398L; + private static final long serialVersionUID = -1425253736214444887L; /** @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 92d22339d27b..267330e510bd 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 = -2337233892918324171L; + private static final long serialVersionUID = -2337225471163375082L; } 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 f054b7d0cb5b..1d8222945ff9 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 = -1298684206946588931L; + private static final long serialVersionUID = -1298688656271040182L; /** @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 4abb01845e26..44f0f2b54264 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 = 1842233411529301841L; + private static final long serialVersionUID = 1842225638105438770L; } diff --git a/slice2java/python/test/Ice/objects/Test/K.java b/slice2java/python/test/Ice/objects/Test/K.java index 457f738a5ff8..a3f1dcd151f1 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 = 4645167972185231800L; + private static final long serialVersionUID = 4645160705100708624L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/L.java b/slice2java/python/test/Ice/objects/Test/L.java index 1b7a257167f2..1a922a71c230 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 = 6629744141540004039L; + private static final long serialVersionUID = 6629743140583509668L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/M.java b/slice2java/python/test/Ice/objects/Test/M.java index 0a25f7319e6d..bd458f44b9d4 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 = -8088098170776796616L; + private static final long serialVersionUID = -8088101819013526363L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/Recursive.java b/slice2java/python/test/Ice/objects/Test/Recursive.java index 6a2bc5d2a96a..00d3d5a492d6 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 = 3617884057286005726L; + private static final long serialVersionUID = 3617887018615196279L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/objects/Test/S.java b/slice2java/python/test/Ice/objects/Test/S.java index c591f844a294..800843ffeb93 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 = 481772450804874356L; + private static final long serialVersionUID = 481772940207085847L; } diff --git a/slice2java/python/test/Ice/objects/Test/SOneMember.java b/slice2java/python/test/Ice/objects/Test/SOneMember.java index 8c1e2f5f8e67..7092a9af7d18 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 = 6227753734488447895L; + private static final long serialVersionUID = 6227753166259050122L; } diff --git a/slice2java/python/test/Ice/objects/Test/STwoMembers.java b/slice2java/python/test/Ice/objects/Test/STwoMembers.java index 18dbde1367c4..0ce9f7c7b6f3 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 = 1994523778663680898L; + private static final long serialVersionUID = -2285006919403489854L; } diff --git a/slice2java/python/test/Ice/objects/Test/StructKey.java b/slice2java/python/test/Ice/objects/Test/StructKey.java index 65db8e897788..8fea6a62a876 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 = 6234086408776575515L; + private static final long serialVersionUID = 7143764572365847879L; } diff --git a/slice2java/python/test/Ice/operations/Test/AnotherStruct.java b/slice2java/python/test/Ice/operations/Test/AnotherStruct.java index 3ac53f144999..f2d5a3205bd4 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 = 2723846231199524437L; + private static final long serialVersionUID = 2723846331937347200L; } diff --git a/slice2java/python/test/Ice/operations/Test/MyClass1.java b/slice2java/python/test/Ice/operations/Test/MyClass1.java index 2e33dda74d1b..1aedc79b4c97 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 = -3103356849688548661L; + private static final long serialVersionUID = 4382243191133686910L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct.java b/slice2java/python/test/Ice/operations/Test/MyStruct.java index 1b0fd4d66a0d..9479e33a8189 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 = -5549923486814648643L; + private static final long serialVersionUID = 9004353170473616157L; } diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct1.java b/slice2java/python/test/Ice/operations/Test/MyStruct1.java index 73fd7d704b87..5446e1b1b1e7 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 = -164454017062121534L; + private static final long serialVersionUID = -8757845504786915657L; } diff --git a/slice2java/python/test/Ice/operations/Test/Structure.java b/slice2java/python/test/Ice/operations/Test/Structure.java index b6acc2084b40..123906b4102b 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 = -4724015213655998557L; + private static final long serialVersionUID = -5083425377913785770L; } diff --git a/slice2java/python/test/Ice/optional/Test/A.java b/slice2java/python/test/Ice/optional/Test/A.java index a19b1c1f847c..17729ef6ab5d 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 = -6598599339596666864L; + private static final long serialVersionUID = -3426023771867141616L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/B.java b/slice2java/python/test/Ice/optional/Test/B.java index 02c122a2543a..8bc1e3ef5067 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 = -2833084683995130781L; + private static final long serialVersionUID = 2453333128546797411L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/C.java b/slice2java/python/test/Ice/optional/Test/C.java index a1625c447f8a..1a62fba393ba 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 = 750845419711669117L; + private static final long serialVersionUID = -6594688717506644483L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/DerivedException.java b/slice2java/python/test/Ice/optional/Test/DerivedException.java index 2504f8c35cb4..62bf87b93a5a 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 = -7615541729547009739L; + private static final long serialVersionUID = -6529077921494482300L; } diff --git a/slice2java/python/test/Ice/optional/Test/E.java b/slice2java/python/test/Ice/optional/Test/E.java index f6d57e828435..194e62adb130 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 = -1850740814952834927L; + private static final long serialVersionUID = -1850731349813490309L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/F.java b/slice2java/python/test/Ice/optional/Test/F.java index 4dd28a41f360..e8cb3050cd70 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 = -6430496930375252510L; + private static final long serialVersionUID = -6430490030041673208L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/FixedStruct.java b/slice2java/python/test/Ice/optional/Test/FixedStruct.java index a1356fca8764..01c37b4ea07d 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 = 1569605302579390382L; + private static final long serialVersionUID = 1569609477957755063L; } diff --git a/slice2java/python/test/Ice/optional/Test/G.java b/slice2java/python/test/Ice/optional/Test/G.java index be7d3b6c9aae..0d5296d153cb 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 = 1058099883288848467L; + private static final long serialVersionUID = -966797535810884269L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/G1.java b/slice2java/python/test/Ice/optional/Test/G1.java index 592ee294a006..34efcb202487 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 = 7339780519711418299L; + private static final long serialVersionUID = 7339787420157672714L; } diff --git a/slice2java/python/test/Ice/optional/Test/G2.java b/slice2java/python/test/Ice/optional/Test/G2.java index f528f7f57bd8..cf9bd3c890e8 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 = 3824549798383420461L; + private static final long serialVersionUID = 3824559263524385440L; } diff --git a/slice2java/python/test/Ice/optional/Test/MultiOptional.java b/slice2java/python/test/Ice/optional/Test/MultiOptional.java index 299733c9b618..7ce981723779 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 = 4518331584239418481L; + private static final long serialVersionUID = 3968993361116551099L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/OneOptional.java b/slice2java/python/test/Ice/optional/Test/OneOptional.java index 3bd5564d92fa..28292303d746 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 = -7219600419689093568L; + private static final long serialVersionUID = -7219607320068398887L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/OptionalException.java b/slice2java/python/test/Ice/optional/Test/OptionalException.java index 0b865c58deef..3c7d9678c5e4 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 = 7125481413278893978L; + private static final long serialVersionUID = -5339827703331211056L; } diff --git a/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java index 4d631006226a..eeaeea1ec5af 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 = 1540247785245217531L; + private static final long serialVersionUID = 8424619996551913915L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/optional/Test/RequiredException.java b/slice2java/python/test/Ice/optional/Test/RequiredException.java index e94b63a4a3ee..66cd55f432a6 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 = 2894242643106799538L; + private static final long serialVersionUID = 2894241363387964483L; } diff --git a/slice2java/python/test/Ice/optional/Test/SmallStruct.java b/slice2java/python/test/Ice/optional/Test/SmallStruct.java index 77ba8caca4a6..26c150d405f6 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 = 6700983648214379085L; + private static final long serialVersionUID = 6700996003850084158L; } diff --git a/slice2java/python/test/Ice/optional/Test/VarStruct.java b/slice2java/python/test/Ice/optional/Test/VarStruct.java index add1490b92b9..9de168a9af88 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 = -1912288347872743117L; + private static final long serialVersionUID = -1912281447426488702L; } diff --git a/slice2java/python/test/Ice/optional/Test/WD.java b/slice2java/python/test/Ice/optional/Test/WD.java index bc797e779caa..88d0d1d1ea8c 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 = -1348856839054578757L; + private static final long serialVersionUID = -5142328836346365645L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test1/C1.java b/slice2java/python/test/Ice/packagemd/Test1/C1.java index d57b3ac99bd6..a1c017d8a64f 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 = 1894596701762166621L; + private static final long serialVersionUID = 1894609537732150121L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test1/C2.java b/slice2java/python/test/Ice/packagemd/Test1/C2.java index f5cc99329afa..8824e057014f 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 = 2892576033541362063L; + private static final long serialVersionUID = 2892573953052814715L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test1/E1.java b/slice2java/python/test/Ice/packagemd/Test1/E1.java index 04e34223651b..ce3bb94694d6 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 = 5787344572204619986L; + private static final long serialVersionUID = 5787338640420028838L; } diff --git a/slice2java/python/test/Ice/packagemd/Test1/E2.java b/slice2java/python/test/Ice/packagemd/Test1/E2.java index b9cbb0901355..f4ac5b4f8d40 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 = 4908749132784851797L; + private static final long serialVersionUID = 4908748335863527969L; } diff --git a/slice2java/python/test/Ice/packagemd/Test1/def.java b/slice2java/python/test/Ice/packagemd/Test1/def.java index 4ae9afdc8854..28b0cf8e3873 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 = 7298389016234427265L; + private static final long serialVersionUID = 7298384523460327733L; } diff --git a/slice2java/python/test/Ice/packagemd/Test2/C1.java b/slice2java/python/test/Ice/packagemd/Test2/C1.java index 7702676625c3..f70957ebfc5b 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 = -860914718672394247L; + private static final long serialVersionUID = -860915958497329282L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test2/C2.java b/slice2java/python/test/Ice/packagemd/Test2/C2.java index 23062ebb3336..0fe5069e9f3f 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 = 954148785803954921L; + private static final long serialVersionUID = 954153001058247215L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test2/E1.java b/slice2java/python/test/Ice/packagemd/Test2/E1.java index 85fb3abdc03f..0998489f03ec 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 = 6934989710747053270L; + private static final long serialVersionUID = 6934985826028058833L; } diff --git a/slice2java/python/test/Ice/packagemd/Test2/E2.java b/slice2java/python/test/Ice/packagemd/Test2/E2.java index 556cdb7e9597..f85e9bdea1fb 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 = 5414537647587035056L; + private static final long serialVersionUID = 5414539052635741814L; } diff --git a/slice2java/python/test/Ice/packagemd/Test3/C1.java b/slice2java/python/test/Ice/packagemd/Test3/C1.java index 56c7ccda636e..4283b037bae2 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 = 5832345794776807928L; + private static final long serialVersionUID = 5832352655038976511L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test3/C2.java b/slice2java/python/test/Ice/packagemd/Test3/C2.java index 1e3937dffb82..9a3e73aac86d 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 = 2769377126286755657L; + private static final long serialVersionUID = 2769375555911744783L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/packagemd/Test3/E1.java b/slice2java/python/test/Ice/packagemd/Test3/E1.java index c4b0b8374a86..dca0c1654f81 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 = 5344589987222752119L; + private static final long serialVersionUID = 5344583457577359344L; } diff --git a/slice2java/python/test/Ice/packagemd/Test3/E2.java b/slice2java/python/test/Ice/packagemd/Test3/E2.java index ac3477f044b9..ebf1480a9f88 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 = -8399047008301900271L; + private static final long serialVersionUID = -8399048248177363753L; } diff --git a/slice2java/python/test/Ice/scope/Test/C.java b/slice2java/python/test/Ice/scope/Test/C.java index 09ce69470ad5..21d113155ebb 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 = -5190247387623692244L; + private static final long serialVersionUID = -5190247308770427887L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/scope/Test/C1.java b/slice2java/python/test/Ice/scope/Test/C1.java index 4db5fac0477c..4b7e8785dd0e 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 = 8893233129739875169L; + private static final long serialVersionUID = 8893233211022329936L; /** @hidden */ @Override diff --git a/slice2java/python/test/Ice/scope/Test/C2.java b/slice2java/python/test/Ice/scope/Test/C2.java index 88848de31917..884c1c71ce2a 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 = -5684512405868218935L; + private static final long serialVersionUID = -5761511827394183913L; /** @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 424ec434f095..23bd30586787 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 = 4615622952358886345L; + private static final long serialVersionUID = 4615622876170399600L; /** @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 cdb95c039a82..4ff750a871df 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 = 672588961191514513L; + private static final long serialVersionUID = 672588884863799572L; /** @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 09127121e85d..8fac505edaf7 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 = 8654439339505176704L; + private static final long serialVersionUID = 8654439258225706505L; } diff --git a/slice2java/python/test/Ice/scope/Test/Inner/S.java b/slice2java/python/test/Ice/scope/Test/Inner/S.java index 8190b66ad3a1..c03f50bcf443 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 = 3694621486511821260L; + private static final long serialVersionUID = 3694621405222577221L; } diff --git a/slice2java/python/test/Ice/scope/Test/S.java b/slice2java/python/test/Ice/scope/Test/S.java index aef04e6fcd2b..a1b9988a35bb 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 = 2159697233200572082L; + private static final long serialVersionUID = 2159697317068147771L; } diff --git a/slice2java/python/test/Ice/scope/Test/S1.java b/slice2java/python/test/Ice/scope/Test/S1.java index 74cc0cfa8ad0..295ebbe6f3a0 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 = 1241674810411459544L; + private static final long serialVersionUID = 1241674894294446185L; } diff --git a/slice2java/python/test/Ice/scope/Test/S2.java b/slice2java/python/test/Ice/scope/Test/S2.java index ce527bd6ec3c..be3d82a7329c 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 = 8082002311768750768L; + private static final long serialVersionUID = -6086709576928478738L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java index 1ede68831af3..d48a81b18f9d 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 = -477014918009831200L; + private static final long serialVersionUID = -477021173892316751L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java index c6b496ad3ce2..0801d1104fdf 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 = 3485212402418701190L; + private static final long serialVersionUID = 3485211756530758487L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index f832581ce2d6..590d7bda0bc8 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 = 1717369030789654263L; + private static final long serialVersionUID = 1717375452113716518L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index efcc8aaab9e2..e96861e61b72 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 = -7384920582928167314L; + private static final long serialVersionUID = -7384921063337729601L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java index 6db8eb13235f..f90d05b9ddb9 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 = 3424376476978808568L; + private static final long serialVersionUID = 3424368128929856824L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index a74c1789fd6e..25adbdd2ece0 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 = -1172593703826234135L; + private static final long serialVersionUID = -1172601721259385815L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index af2d3f49bc08..f1bbaa69f0f8 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 = -1126107625256177520L; + private static final long serialVersionUID = -1126115973305129008L; } diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index f42d47f15d76..be524ca44135 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 = -2097577260438884112L; + private static final long serialVersionUID = -2097585608487835856L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/B.java b/slice2java/python/test/Ice/slicing/objects/Test/B.java index 2cb665c1a82f..0dd6d02baa59 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 = 3863331195141087207L; + private static final long serialVersionUID = 1950752555702525852L; /** @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 54436a0e6436..6fd8e3f4353f 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 = -3534293891693281109L; + private static final long serialVersionUID = -4722907941764818736L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java index c78c5f9475e5..af132f857854 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 = -6397002079424561490L; + private static final long serialVersionUID = -6397005344264643320L; /** @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 782a9310c517..a3ac22aca5b2 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 = -9066879757511132206L; + private static final long serialVersionUID = -9066880720002429606L; /** @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 fae1080037a4..140e8620d129 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 = 220574672645950628L; + private static final long serialVersionUID = 103442006217882431L; /** @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 bf16c2378f9d..eb2ad41672b2 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 = 8644070153066659786L; + private static final long serialVersionUID = 6097192463161496654L; /** @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 0dcadfce3ef3..24336bcc2c39 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 = -7623081628936829117L; + private static final long serialVersionUID = 6600805328371610755L; /** @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 8695cafdd0be..29ade216ab72 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 = 6630259478686696179L; + private static final long serialVersionUID = 4254843104162319219L; /** @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 179d962f0ab3..29407b2cc659 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 = 8030493649072443607L; + private static final long serialVersionUID = 3486037263664228979L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/Forward.java b/slice2java/python/test/Ice/slicing/objects/Test/Forward.java index e9277864f75a..5947e9125c76 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 = -7655919037166694345L; + private static final long serialVersionUID = -7655923845418475742L; /** @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 61c557b93a7f..51ffe09b96eb 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 = -2271132987987932668L; + private static final long serialVersionUID = -2271128014428033699L; /** @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 7f004a0503e0..a0ddce84dcaf 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 = 4147529095851206053L; + private static final long serialVersionUID = 4147522313169852742L; /** @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 32010d8b08a8..61edce982248 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 = 481704766224211954L; + private static final long serialVersionUID = 481713911338002541L; /** @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 3f82c8a6ff9c..ccb42ecec1fb 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 = -4426887106412154002L; + private static final long serialVersionUID = -4426884750774434872L; /** @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 e872c475b48d..7fc91e39faad 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 = 850538651486644064L; + private static final long serialVersionUID = 850536466470173318L; /** @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 a110a86cd373..14f39e9d2879 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 = -4328898606670117023L; + private static final long serialVersionUID = -4328902279747767033L; /** @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 883fcc396f43..340cdc2b560d 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 = -5081818677636048340L; + private static final long serialVersionUID = -5081815252497523126L; /** @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 43499e075b62..255090dcd04f 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 = 643078141375471829L; + private static final long serialVersionUID = 643085677056707037L; /** @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 30030060f294..a2f97ef3fc3e 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 = -2438003874016674965L; + private static final long serialVersionUID = -2438013816843807396L; /** @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 eae1af4d335b..1d69e40ed10a 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 = -5192868216502441207L; + private static final long serialVersionUID = 2387595845915876256L; /** @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 c352c754301b..7ffba326a34a 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 = -8813709967782894196L; + private static final long serialVersionUID = -8813714580860311691L; /** @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 d5d5cb196640..1988e7184d74 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 = 3651524445293965810L; + private static final long serialVersionUID = 3651529418821342885L; /** @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 1bf84e89856c..f2e55f85abcf 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 = 8804375255501901143L; + private static final long serialVersionUID = 8804382470851867776L; /** @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 2ccd7ca9af48..d91d06271eca 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 = -4989066795505790750L; + private static final long serialVersionUID = -4989055239435623782L; /** @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 b7697cdd37e5..19ca10814f93 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 = -5353757394493082143L; + private static final long serialVersionUID = -5353761882257747914L; /** @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 cab2825be084..a58cd3172a8a 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 = -6522133511333106011L; + private static final long serialVersionUID = -6522139928880204684L; /** @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 79514e72efe2..d7b855eb6873 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 = 7620286227842128230L; + private static final long serialVersionUID = 7620287988031143479L; /** @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 3a7eeadd92eb..8e9262d48d6b 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 = 7004056503509908902L; + private static final long serialVersionUID = -4866337997973080172L; } diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java index 99fb3d973250..f3538b628aef 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 = 7776675520502809476L; + private static final long serialVersionUID = 334522961894984811L; /** @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 9c22ee06a44d..95fdb229d09d 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 = 6450759542485535233L; + private static final long serialVersionUID = -5399165881014468539L; } diff --git a/slice2java/python/test/Slice/escape/Clash/Cls.java b/slice2java/python/test/Slice/escape/Clash/Cls.java index 0ac2b13209da..53cbe45b1af4 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 = -2527679451587467392L; + private static final long serialVersionUID = -1350640791606189676L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/escape/Clash/Ex.java b/slice2java/python/test/Slice/escape/Clash/Ex.java index 713ddd088c79..571ebd5f180a 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 = 7333904196353138746L; + private static final long serialVersionUID = -4897004543294866502L; } diff --git a/slice2java/python/test/Slice/escape/Clash/St.java b/slice2java/python/test/Slice/escape/Clash/St.java index c028f5556d0f..811c25efd8e5 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 = -8172948685651357911L; + private static final long serialVersionUID = 6595769224103119805L; } diff --git a/slice2java/python/test/Slice/escape/and/_continue.java b/slice2java/python/test/Slice/escape/and/_continue.java index 68778a88d7c0..3a85cd6db936 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 = 1201374017609562480L; + private static final long serialVersionUID = 1201383732041223553L; } diff --git a/slice2java/python/test/Slice/escape/and/_for.java b/slice2java/python/test/Slice/escape/and/_for.java index 21f9889657d0..58d7e34e1d5e 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 = 3374783158058384109L; + private static final long serialVersionUID = -6770435628475211315L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/escape/and/is.java b/slice2java/python/test/Slice/escape/and/is.java index d835d48ecadd..f9c490b90ee8 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 = -4585938770343552885L; + private static final long serialVersionUID = -4585937569136007046L; } diff --git a/slice2java/python/test/Slice/escape/and/not.java b/slice2java/python/test/Slice/escape/and/not.java index d43b5dc80c6a..a40bc940bad2 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 = 4412202356583605113L; + private static final long serialVersionUID = 1727542111216418169L; } diff --git a/slice2java/python/test/Slice/macros/Test/Default.java b/slice2java/python/test/Slice/macros/Test/Default.java index 0893d12eba46..3064e0be9968 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 = 5854198853647990334L; + private static final long serialVersionUID = -3378561328057305762L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/macros/Test/NoDefault.java b/slice2java/python/test/Slice/macros/Test/NoDefault.java index b737bb11eacc..dd2077f678d8 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 = -5327477053976088609L; + private static final long serialVersionUID = -1958709535064602945L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/structure/Test/C.java b/slice2java/python/test/Slice/structure/Test/C.java index 9d6aa49b88b7..0381b0b255af 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 = 1667160362214854853L; + private static final long serialVersionUID = 1667157017310250923L; /** @hidden */ @Override diff --git a/slice2java/python/test/Slice/structure/Test/S1.java b/slice2java/python/test/Slice/structure/Test/S1.java index c00bd7974c02..2a8e23dee160 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 = -5542857827901792595L; + private static final long serialVersionUID = -5542850267660361085L; } diff --git a/slice2java/python/test/Slice/structure/Test/S2.java b/slice2java/python/test/Slice/structure/Test/S2.java index 41d3f4ba340a..4673f86f313c 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 = -5411089111379710317L; + private static final long serialVersionUID = -6488193878356859039L; } diff --git a/slice2java/python/test/Slice/structure/Test/S3.java b/slice2java/python/test/Slice/structure/Test/S3.java index 83f316a2cb30..95eed3ba52ed 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 = -5928929281099314318L; + private static final long serialVersionUID = 5172315167711401072L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Base.java b/slice2java/ruby/test/Ice/defaultValue/Test/Base.java index 43aad47ac2a4..c6ef9502c52e 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 = -8512305296121555190L; + private static final long serialVersionUID = 2370589569536534506L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java index 2094232d656c..099dbb10d167 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 = -4050290560469889323L; + private static final long serialVersionUID = -5678660817304519147L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java index 09b6edc1234b..c5cfa4533978 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 = -4471658767727946933L; + private static final long serialVersionUID = 7308967010432792648L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java b/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java index e289c1a29caf..e7f8c6564c64 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 = -4918767935149567793L; + private static final long serialVersionUID = -7526735781651747505L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java index cea4ef47a40f..f090569473aa 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 = 5127388881565491729L; + private static final long serialVersionUID = 5127387565476553618L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java index c47c1d517f29..863919e9c45b 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 = 5382994225451932805L; + private static final long serialVersionUID = -7309933652496750203L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java index eb841799bcf1..9b35961d4bb0 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 = -6699834651864231228L; + private static final long serialVersionUID = -925273072140607644L; } diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java index 8053f7683a45..a64865433a7d 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 = -480161534844204917L; + private static final long serialVersionUID = -1968019847800611064L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/A.java b/slice2java/ruby/test/Ice/exceptions/Test/A.java index e7bdec9e66f0..3f6371e220b9 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 = 7823737064414732942L; + private static final long serialVersionUID = 7823744729357693436L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/B.java b/slice2java/ruby/test/Ice/exceptions/Test/B.java index bc050f8576a3..b5d10d97dfd6 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 = -3861418999405182514L; + private static final long serialVersionUID = -3861405879301521220L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/C.java b/slice2java/ruby/test/Ice/exceptions/Test/C.java index e87d2af280b4..e91d3352b0f9 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 = 1080690755617518222L; + private static final long serialVersionUID = 1080698420560478716L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/D.java b/slice2java/ruby/test/Ice/exceptions/Test/D.java index 8e69474c4d51..e734208c1f07 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 = 4780373268696895694L; + private static final long serialVersionUID = 4780386388800556988L; } diff --git a/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java b/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java index 75739fd31f36..e412494fd6d3 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 = -4641410851723217126L; + private static final long serialVersionUID = -4641415458460835480L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/A.java b/slice2java/ruby/test/Ice/objects/Test/A.java index 9c0e5a098c7b..9c2489242f3a 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 = 3033994598000748251L; + private static final long serialVersionUID = -276167465635185381L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/A1.java b/slice2java/ruby/test/Ice/objects/Test/A1.java index 19bbdfd3d8d6..7a49ce6bf4f4 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 = -5926744160043948576L; + private static final long serialVersionUID = -5926742133808836735L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/B.java b/slice2java/ruby/test/Ice/objects/Test/B.java index 776a8e47b3f4..75b0b771ab5a 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 = -8890915164534172722L; + private static final long serialVersionUID = -8890919915773673233L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/B1.java b/slice2java/ruby/test/Ice/objects/Test/B1.java index 6c8f065feaa2..ed5d7967027a 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 = 6418960799341591556L; + private static final long serialVersionUID = -6030599665028599804L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/Base.java b/slice2java/ruby/test/Ice/objects/Test/Base.java index 54b80721179c..58deb6fc2e9e 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 = 1586536441095696488L; + private static final long serialVersionUID = 7631366360353200072L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/C.java b/slice2java/ruby/test/Ice/objects/Test/C.java index 2391f1824bb7..3f48ecff77b3 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 = 6296288921048958441L; + private static final long serialVersionUID = -769501143386104728L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/COneMember.java b/slice2java/ruby/test/Ice/objects/Test/COneMember.java index f6e0b3a6befb..d4c379538f93 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 = 3050968795269486352L; + private static final long serialVersionUID = 3050969136217029656L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java index 28c8a862118a..9372e2875614 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 = -1150593311298521189L; + private static final long serialVersionUID = -6323665007761904229L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/D.java b/slice2java/ruby/test/Ice/objects/Test/D.java index 9ac34fe4b03a..dd76f7e2bcc9 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 = -6882890175913400079L; + private static final long serialVersionUID = -2348162897902845648L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/D1.java b/slice2java/ruby/test/Ice/objects/Test/D1.java index c4d9027006b8..0c89377605ca 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 = 5358952362730309443L; + private static final long serialVersionUID = 5472524541134744131L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/E.java b/slice2java/ruby/test/Ice/objects/Test/E.java index d43c800ff427..bdf13a7b57ac 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 = -3153858561983587543L; + private static final long serialVersionUID = 4189402347919211657L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/EBase.java b/slice2java/ruby/test/Ice/objects/Test/EBase.java index 63e67dd1cb1d..50ae56ab8e29 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 = -1133307095516987442L; + private static final long serialVersionUID = 1971041894573044686L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/EDerived.java b/slice2java/ruby/test/Ice/objects/Test/EDerived.java index 5ad8681c3c4b..5b9a72f1e303 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 = 6423778958074609106L; + private static final long serialVersionUID = 7725032166747396434L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/EOneMember.java b/slice2java/ruby/test/Ice/objects/Test/EOneMember.java index 7b2d00ac7dd7..5bc3da5ead95 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 = -6225283938757348833L; + private static final long serialVersionUID = -6225284279704892137L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java index 9712ad54c1ab..5ae4acef035b 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 = -4123330108817426284L; + private static final long serialVersionUID = 1049741587645956756L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/F.java b/slice2java/ruby/test/Ice/objects/Test/F.java index e358bd5a97e8..b4ea095ca286 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 = 5356173888152575441L; + private static final long serialVersionUID = -4142542163590536495L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/F1.java b/slice2java/ruby/test/Ice/objects/Test/F1.java index 72ddc983e180..62a6dfa5e6d5 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 = 6192369179057716007L; + private static final long serialVersionUID = 6192369272211736626L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/F3.java b/slice2java/ruby/test/Ice/objects/Test/F3.java index 32158d586425..7e79e5d29e3b 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 = 4696166500198982083L; + private static final long serialVersionUID = 3130952100569647811L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/K.java b/slice2java/ruby/test/Ice/objects/Test/K.java index 609b0cb1ea96..5241c5fab5c4 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 = 4645159780434377220L; + private static final long serialVersionUID = 4645163374513836133L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/L.java b/slice2java/ruby/test/Ice/objects/Test/L.java index 5d466b4edd8b..ff251031ed0a 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 = 6629735965178276843L; + private static final long serialVersionUID = 6629735095946806602L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/M.java b/slice2java/ruby/test/Ice/objects/Test/M.java index 82e579353675..481ca6c5367c 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 = -8088100574034172202L; + private static final long serialVersionUID = -8088093257875099721L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/Recursive.java b/slice2java/ruby/test/Ice/objects/Test/Recursive.java index 65ac15949975..2c7a960da9e3 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 = 3617875545228500954L; + private static final long serialVersionUID = 3617879139310189883L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/objects/Test/S.java b/slice2java/ruby/test/Ice/objects/Test/S.java index 03bdf6b8b744..3c2761b4116f 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 = 481769732191451608L; + private static final long serialVersionUID = 481770436115021817L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/SOneMember.java b/slice2java/ruby/test/Ice/objects/Test/SOneMember.java index 2ee91724ccf1..23aa3231b945 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 = 6227745037750193161L; + private static final long serialVersionUID = 6227744696802649857L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java index 65833d4c35e8..467367d3bcbd 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 = -7422481242042320382L; + private static final long serialVersionUID = -2249409545578937342L; } diff --git a/slice2java/ruby/test/Ice/objects/Test/StructKey.java b/slice2java/ruby/test/Ice/objects/Test/StructKey.java index 6dfb7a00ca56..0de346f0239f 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 = -1884000662784769435L; + private static final long serialVersionUID = 2166298269388104645L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java b/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java index 5ac8d3b006dc..4315163874c7 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 = 2723847429529864373L; + private static final long serialVersionUID = 2723843640529554622L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/MyClass1.java b/slice2java/ruby/test/Ice/operations/Test/MyClass1.java index 949d9330535e..2d9747fca9df 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 = 5017154235611556138L; + private static final long serialVersionUID = -5286604879511358694L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct.java index 0e965154f239..a73a001a491a 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 = 9168862584869786685L; + private static final long serialVersionUID = -2702867569375553955L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java index ffc0cb1dd3d9..a395e76681e6 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 = -3074146755213978813L; + private static final long serialVersionUID = 851273380315957715L; } diff --git a/slice2java/ruby/test/Ice/operations/Test/Structure.java b/slice2java/ruby/test/Ice/operations/Test/Structure.java index 8889204d6595..da65c1776322 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 = -2398355331435697377L; + private static final long serialVersionUID = -7193777378929025767L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/A.java b/slice2java/ruby/test/Ice/optional/Test/A.java index fa6ca483943d..b075f600584e 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 = 8479617031782446608L; + private static final long serialVersionUID = 4873725068058196112L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/B.java b/slice2java/ruby/test/Ice/optional/Test/B.java index 35162ea7c080..e872ed416eac 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 = 2244061136977011427L; + private static final long serialVersionUID = -7181511060386748061L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/C.java b/slice2java/ruby/test/Ice/optional/Test/C.java index b4e7077586fc..bfafaa8f8baa 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 = 7917563459390514429L; + private static final long serialVersionUID = 385961372486222205L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/DerivedException.java b/slice2java/ruby/test/Ice/optional/Test/DerivedException.java index 7afa7a5064c1..2e99531737f8 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 = -6701280115091766937L; + private static final long serialVersionUID = 6308252135578239363L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/E.java b/slice2java/ruby/test/Ice/optional/Test/E.java index 2b627acbf352..98f86c142d5c 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 = -1850744184206473576L; + private static final long serialVersionUID = -1850731189662263298L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/F.java b/slice2java/ruby/test/Ice/optional/Test/F.java index 334ad4994a13..888334593181 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 = -6430499016282294293L; + private static final long serialVersionUID = -6430489869890448371L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java b/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java index 7165d776539d..b9a4190b3e18 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 = 1569603216782589093L; + private static final long serialVersionUID = 1569609638109192811L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/G.java b/slice2java/ruby/test/Ice/optional/Test/G.java index cb687efdb952..d128878d860d 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 = -6255941943922106349L; + private static final long serialVersionUID = -6866923385197167405L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/G1.java b/slice2java/ruby/test/Ice/optional/Test/G1.java index 790496303789..fab5fc009629 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 = 7339782605624235625L; + private static final long serialVersionUID = 7339787580308895373L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/G2.java b/slice2java/ruby/test/Ice/optional/Test/G2.java index ea15ad0f984d..0ff68c05a977 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 = 3824546429129949067L; + private static final long serialVersionUID = 3824559423666607505L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java b/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java index 1801b3f9d9d6..446bc1f11581 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 = -7497377808311026066L; + private static final long serialVersionUID = 909892487505040501L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/OneOptional.java b/slice2java/ruby/test/Ice/optional/Test/OneOptional.java index 9c22239da356..597904055146 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 = -7219602505485738933L; + private static final long serialVersionUID = -7219607480219869435L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalException.java b/slice2java/ruby/test/Ice/optional/Test/OptionalException.java index 1a6c14bd459f..d85ef85f2c58 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 = -5941993069068075663L; + private static final long serialVersionUID = 8128634800627056974L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java index 9d34323c6b28..696afeb8ba6f 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 = -8186933147551374917L; + private static final long serialVersionUID = -2457335351064432773L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/optional/Test/RequiredException.java b/slice2java/ruby/test/Ice/optional/Test/RequiredException.java index 46551c14e0b7..467ee54e43d0 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 = 2894244729019616864L; + private static final long serialVersionUID = 2894241523539193540L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java b/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java index 6858903b00b9..ed1e4fe9507e 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 = 6700981562605161883L; + private static final long serialVersionUID = 6700996164001315389L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/VarStruct.java b/slice2java/ruby/test/Ice/optional/Test/VarStruct.java index 6565ad25516d..e0356aad762d 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 = -1912286261959925791L; + private static final long serialVersionUID = -1912281287275266043L; } diff --git a/slice2java/ruby/test/Ice/optional/Test/WD.java b/slice2java/ruby/test/Ice/optional/Test/WD.java index d71979ee6b2f..70246421b109 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 = -738323887850383230L; + private static final long serialVersionUID = -1322815993184047896L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/C.java b/slice2java/ruby/test/Ice/scope/Test/C.java index ab3a0e23bd7f..810648ecc8ba 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 = -5190251960484343586L; + private static final long serialVersionUID = -5190248135304534865L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/C1.java b/slice2java/ruby/test/Ice/scope/Test/C1.java index a9989439766b..a5ab54ca3f91 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 = 8893238028205573663L; + private static final long serialVersionUID = 8893228417097433006L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Ice/scope/Test/C2.java b/slice2java/ruby/test/Ice/scope/Test/C2.java index 37e46c40126c..e92a9c7ebd6f 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 = -484488715397079747L; + private static final long serialVersionUID = 6992831283300795660L; /** @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 b1408f85712e..dc1bbb57561b 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 = 4615624797785851626L; + private static final long serialVersionUID = 4615623537235052251L; /** @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 534452c6d19b..728a6c0c4847 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 = 672596261778065714L; + private static final long serialVersionUID = 672584256219446531L; /** @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 ba8066227efe..26ac356c3f8b 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 = 8654434606507313862L; + private static final long serialVersionUID = 8654444217457802039L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/Inner/S.java b/slice2java/ruby/test/Ice/scope/Test/Inner/S.java index d53b89c8dc46..719f95d1ddc2 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 = 3694622208674807306L; + private static final long serialVersionUID = 3694609833674312699L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/S.java b/slice2java/ruby/test/Ice/scope/Test/S.java index 5d9c4fffeb27..3554902c072a 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 = 2159704693778707316L; + private static final long serialVersionUID = 2159708723308303301L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/S1.java b/slice2java/ruby/test/Ice/scope/Test/S1.java index d0b09517a221..99206a2405bd 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 = 1241675532267294758L; + private static final long serialVersionUID = 1241668777893332247L; } diff --git a/slice2java/ruby/test/Ice/scope/Test/S2.java b/slice2java/ruby/test/Ice/scope/Test/S2.java index b5be7c09e74c..b7071dedf44d 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 = 228645801386137540L; + private static final long serialVersionUID = 48039151052054261L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java index 4267d383ab4d..a9e146890b71 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 = -477021393583788167L; + private static final long serialVersionUID = -477020831563318589L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java index 7340e0ac72b2..191ec6965ff0 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 = 3485211377000710687L; + private static final long serialVersionUID = 3485211618423901413L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 5af7e7a5dca2..6ca311b150fd 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 = 1717374824469672558L; + private static final long serialVersionUID = 1717375109803118228L; } diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index b3f776c65dbd..21939d58491e 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 = -7384920921447484553L; + private static final long serialVersionUID = -7384921201462990515L; } diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/B.java b/slice2java/ruby/test/Ice/slicing/objects/Test/B.java index b0b709a96d96..a12d918eb736 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 = 8842262153133999260L; + private static final long serialVersionUID = -1838831440838497892L; /** @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 663e2695369c..f47c9ddd2521 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 = 1838795859684522960L; + private static final long serialVersionUID = 9019361511007768272L; } diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java index 6f315a08d1f9..b0f6f28a3819 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 = -6397006208330662411L; + private static final long serialVersionUID = -6396993394441070845L; /** @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 913c029f82eb..e844239f7672 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 = -9066880141268242406L; + private static final long serialVersionUID = -9066887984470618302L; /** @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 736fedf25bbd..089ff1666b35 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 = 7281062404263959871L; + private static final long serialVersionUID = -8538785379818073793L; /** @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 e81dcd99375a..67943d79074b 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 = 1508986375915829315L; + private static final long serialVersionUID = 2939902823366411345L; /** @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 1517fc9ea32b..23961d09c621 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 = 5308362983926418035L; + private static final long serialVersionUID = -2228811281228034061L; } diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java b/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java index 777c9d03fef6..a58c04b732db 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 = -7655919134293074299L; + private static final long serialVersionUID = -7655926995350679843L; /** @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 0fc4a71dbad4..14ab0dbbc78b 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 = -2271132725854982627L; + private static final long serialVersionUID = -2271124864497405243L; /** @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 a53e877f28ef..958e92539f77 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 = 481704902062050605L; + private static final long serialVersionUID = 481712889728745845L; /** @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 2b97d7e5b1b9..319e740bb85d 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 = -4426891235308915915L; + private static final long serialVersionUID = -4426878421276726077L; /** @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 89744f25bddc..bdba216dc0e7 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 = 850542620245906276L; + private static final long serialVersionUID = 850536103398020570L; /** @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 ae87b63606b1..851152ecb999 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 = -4328899927914906465L; + private static final long serialVersionUID = -4328906604963735424L; /** @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 a2be205f839f..e1065f776736 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 = -5081814708876921172L; + private static final long serialVersionUID = -5081810676899578741L; /** @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 01b9a1f1df07..a1de8a7931ef 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 = 643078320708096925L; + private static final long serialVersionUID = 643086182059819845L; /** @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 64cd29bba0fa..c29bba71f1a2 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 = -2438003485251714020L; + private static final long serialVersionUID = -2438000931908739516L; /** @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 14a6a2ccc00d..e32ec980b579 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 = 3651524707550652645L; + private static final long serialVersionUID = 3651532589452290109L; /** @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 cdd842d061e4..bbb0356e9329 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 = 8804375114645577152L; + private static final long serialVersionUID = 8804372416850812440L; /** @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 af9387ddef13..a5bfa21a0e63 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 = -5353757170987336202L; + private static final long serialVersionUID = -5353754452519606610L; /** @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 94190d33d470..bf69b2a85a92 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 = -6522133729838553548L; + private static final long serialVersionUID = -6522141717486291220L; /** @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 409a4695b791..67a152e3bc95 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 = 7620285921677793271L; + private static final long serialVersionUID = 7620283389190756399L; /** @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 2539ae4fe4ef..eeea200b8d1a 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 = 5135692893111288724L; + private static final long serialVersionUID = 8294788212165691796L; } diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/and.java b/slice2java/ruby/test/Slice/escape/BEGIN/and.java index c915b7cf0547..973d7e48550e 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 = 1440101676865684375L; + private static final long serialVersionUID = 1440109136382203462L; } diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/display.java b/slice2java/ruby/test/Slice/escape/BEGIN/display.java index 5c3c18292d0e..44d6121b70d2 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 = -1676139213749344183L; + private static final long serialVersionUID = -8207238352368389815L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/next.java b/slice2java/ruby/test/Slice/escape/BEGIN/next.java index 4696f702e80d..6bfe1728826f 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 = 3375552940984689280L; + private static final long serialVersionUID = 3375550936628592721L; } diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/nil.java b/slice2java/ruby/test/Slice/escape/BEGIN/nil.java index 23b866ad9657..4efd14b73eff 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 = 3248424486959942959L; + private static final long serialVersionUID = -7149821260705659921L; } diff --git a/slice2java/ruby/test/Slice/escape/Clash/Cls.java b/slice2java/ruby/test/Slice/escape/Clash/Cls.java index ace2d2b56b52..75652f1ad0e5 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 = 7644211799136108894L; + private static final long serialVersionUID = -4151685320877115308L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/escape/Clash/Ex.java b/slice2java/ruby/test/Slice/escape/Clash/Ex.java index 98de0c0ba9c1..f620d57925c0 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 = 6503894838460512995L; + private static final long serialVersionUID = -6486759210572130222L; } diff --git a/slice2java/ruby/test/Slice/escape/Clash/St.java b/slice2java/ruby/test/Slice/escape/Clash/St.java index 4b975b4f653f..ffb64893484e 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 = 8468167064266237772L; + private static final long serialVersionUID = -5384812709702671735L; } diff --git a/slice2java/ruby/test/Slice/macros/Test/Default.java b/slice2java/ruby/test/Slice/macros/Test/Default.java index 136a5d3fa19f..a136f4f439bf 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 = -6360674306015655810L; + private static final long serialVersionUID = -1664600434610680290L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/macros/Test/NoDefault.java b/slice2java/ruby/test/Slice/macros/Test/NoDefault.java index 1f9401c013be..3405164e7afe 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 = 8715396616606005535L; + private static final long serialVersionUID = -5623576710688747521L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/structure/Test/C.java b/slice2java/ruby/test/Slice/structure/Test/C.java index 1c9a4794ff4b..509b3429ea8c 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 = -3172275252731294068L; + private static final long serialVersionUID = -3172274889907134619L; /** @hidden */ @Override diff --git a/slice2java/ruby/test/Slice/structure/Test/S1.java b/slice2java/ruby/test/Slice/structure/Test/S1.java index 447e55812442..677c28de0b3e 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 = -5542862844125079815L; + private static final long serialVersionUID = -5542862315841081008L; } diff --git a/slice2java/ruby/test/Slice/structure/Test/S2.java b/slice2java/ruby/test/Slice/structure/Test/S2.java index a5f09150a4f9..01560c925a4d 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 = -6740965900979699771L; + private static final long serialVersionUID = 3450314263313151660L; } diff --git a/slice2java/scripts/Test/Common/Config.java b/slice2java/scripts/Test/Common/Config.java index 71b50e325a3f..2d96e357225f 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 = 1785043397281951640L; + private static final long serialVersionUID = -8153782353497493439L; /** @hidden */ @Override diff --git a/slice2java/scripts/Test/Common/OptionOverrides.java b/slice2java/scripts/Test/Common/OptionOverrides.java index 91eaaff7be6c..02a9ad0a7f5c 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 = -3557755194811559101L; + private static final long serialVersionUID = 7374571192328997274L; /** @hidden */ @Override diff --git a/slice2java/scripts/Test/Common/ProcessFailedException.java b/slice2java/scripts/Test/Common/ProcessFailedException.java index 00730c2e5760..9399d4938d4b 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 = 5103746630204023258L; + private static final long serialVersionUID = 5103745409844147939L; } diff --git a/slice2java/scripts/Test/Common/TestCaseFailedException.java b/slice2java/scripts/Test/Common/TestCaseFailedException.java index e1f5bd228d88..7215f1eaf00f 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 = 7577601870101544392L; + private static final long serialVersionUID = 7577600688634160753L; } diff --git a/slice2java/scripts/Test/Common/TestCaseNotExistException.java b/slice2java/scripts/Test/Common/TestCaseNotExistException.java index 1321558e23e0..af330b002ce2 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 = -8656782527855994794L; + private static final long serialVersionUID = -8656783748206096273L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java index 6dbfabb481ba..250ee492a05f 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 = 8990436621760305661L; + private static final long serialVersionUID = 8990431707802952094L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java index f62b26ceb7b9..cee70fa628cf 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 = -7479600877937226444L; + private static final long serialVersionUID = 5507730069833145137L; /** @hidden */ @Override diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java index 148329949b68..09d7376c5293 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 = -5089368253350108156L; + private static final long serialVersionUID = -5089371686134114445L; } diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java index 483865fc8b94..5fc8494a46c2 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 = -3520760773826279447L; + private static final long serialVersionUID = 9212396210406398381L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java index 9b8432a4b967..1affbe561403 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 = -7827144756950578127L; + private static final long serialVersionUID = 4838785514452304753L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java index deb33fb3f237..d61997738ea0 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 = 354347157902166458L; + private static final long serialVersionUID = -5900388370767039238L; /** @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 d691fc493108..23336dde2a59 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 = 7182007186148884631L; + private static final long serialVersionUID = -4633114578161443369L; /** @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 388adbc25e2b..8fa70dab4d25 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 = 3232482684148184279L; + private static final long serialVersionUID = -6342055692875910051L; /** @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 4da8f468e033..ff2728a5ff82 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 = 1581347214795280687L; + private static final long serialVersionUID = -8017186023763272337L; /** @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 799ec136994b..9cd5da0f3c2d 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 = -7539026905926319262L; + private static final long serialVersionUID = -5740212695052500338L; /** @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 c9370f05f098..1d1b677e0789 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 = -5697119046845207009L; + private static final long serialVersionUID = 1867287006126651371L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java index 493686ea6485..6ef21ca87c77 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 = 2939346686375995249L; + private static final long serialVersionUID = 166108698602899195L; /** @hidden */ @Override diff --git a/slice2java/slice/Ice/com/zeroc/Ice/Identity.java b/slice2java/slice/Ice/com/zeroc/Ice/Identity.java index c97701ee1ea7..60ba18aab4a8 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 = -3545298119642151963L; + private static final long serialVersionUID = -5998412857364915675L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java b/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java index d66ad12afa68..b44d44c1ec64 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 = -8256947349034954423L; + private static final long serialVersionUID = 2822980962720663398L; } diff --git a/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java index edfddb95bc24..8dd7779cc7ae 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 = 5004641052270372260L; + private static final long serialVersionUID = 6933862081470673892L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java index 9f66ec198d6e..7c7043798a7c 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 = 5447249513049018820L; + private static final long serialVersionUID = 5447252820437184986L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java index 17a1b362ddd2..acb7c4aa07a7 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 = -3747161725922635922L; + private static final long serialVersionUID = 7569654912363353231L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java index 47140067f966..5a1e54ac7b1e 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 = -4971293864110525964L; + private static final long serialVersionUID = -828469213024650071L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java index 54ee4deb00b2..b1f3b1362792 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 = -4682790715863708955L; + private static final long serialVersionUID = 6920417294316388461L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java index 44d5f225c0bf..efaf45b07707 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 = -243185540081539380L; + private static final long serialVersionUID = -243182232712346926L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java index 5b4294961f73..7372082f9f6e 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 = 7644443203721614097L; + private static final long serialVersionUID = 7644439067237254032L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java index d703887433e6..ad3595503918 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 = 4699862712001817988L; + private static final long serialVersionUID = 4699860729532583194L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java index 4ebe27d9ad9b..367961f9e062 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 = -7117520354327959623L; + private static final long serialVersionUID = 3450331492806685752L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java index 3ff99c435def..b7ded1453a08 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 = -4364356505379561073L; + private static final long serialVersionUID = 2315034076898049770L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java index 5fea693a6ccf..e812f4c85ef4 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 = -7270586963281546933L; + private static final long serialVersionUID = -7270586303276594731L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java index 99451d49e7fc..db68e723e94f 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 = -8713250140494983837L; + private static final long serialVersionUID = -936336007757650686L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java index 558b01db6c7f..b6be2e1cc59f 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 = 2282239632102329564L; + private static final long serialVersionUID = -5423366514949011235L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java index 9b29e841fff2..3a5e8c3f2ad6 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 = 4463364698297548077L; + private static final long serialVersionUID = 4463365523467675955L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java index 7fd1811aeb12..e555d681958e 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 = -1971524891969909933L; + private static final long serialVersionUID = -1971531670880605422L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java index 71273c91fa8c..58655745a1f9 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 = -2108797897845347658L; + private static final long serialVersionUID = -2108804676682515913L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java index 92f9fac32e6b..ef01f904c51d 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 = -7067934775238228419L; + private static final long serialVersionUID = 2447776495380877501L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java index 75ff916fbc8d..bad0e96001d4 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 = -6801501178782848563L; + private static final long serialVersionUID = -6801500523934550957L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java index caa00ff0ebc0..1d0c916d196d 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 = 1516929102790817665L; + private static final long serialVersionUID = -6700586567355101535L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java index 6f9e8500fc9d..1e3a902c3065 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 = -8985152285573737090L; + private static final long serialVersionUID = -8985147655588329120L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java index 296aacd40ee2..cbb91692a7ac 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 = 2337758750014111629L; + private static final long serialVersionUID = 2337751970944648908L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java index a578e3848e77..be6b425ed43d 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 = -6003723457761771804L; + private static final long serialVersionUID = -6003724781438239003L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java index 5c12e2a5b92e..6262fabfafb3 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 = 7807843647922286244L; + private static final long serialVersionUID = 5134413464981422219L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java index c098049a9a96..fe43fee6f778 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 = 7575142152901406521L; + private static final long serialVersionUID = -4064056546285187815L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java index 2ee2cc47085d..5587d79baddc 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 = 6770374311344872030L; + private static final long serialVersionUID = 5986402236044387739L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java index 105d10716870..93948adff636 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 = 4073565384244094937L; + private static final long serialVersionUID = 3719774120749334913L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java index 95940e271d7d..c468d2103ba5 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 = -5774535665296532847L; + private static final long serialVersionUID = -5774528067500986481L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java index 5032a2f54593..febde5b7f073 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 = 5568732228237053988L; + private static final long serialVersionUID = -25573634546833884L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java index 7b46fb05ac3c..b7c5ad2479e9 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 = 4580029637329830342L; + private static final long serialVersionUID = 2758048601693163494L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java index 1466a4c42d59..5f2fbfcec977 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 = -7833437114495610568L; + private static final long serialVersionUID = -9205774401664989639L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java index 83c58ed386ce..257c29ebb2ff 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 = 6991425703384979626L; + private static final long serialVersionUID = 6991429005728173686L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java index 94f5a4ca918b..d8ec83da1218 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 = 8103768270858024566L; + private static final long serialVersionUID = -4790505327287025973L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java index 95b212edec60..ea68ba267c12 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 = 7672382130154995639L; + private static final long serialVersionUID = 7672378657328973803L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java index 0e8b3ced5ac7..ae06001d973b 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 = 2733098251099803513L; + private static final long serialVersionUID = 2733089493558526245L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java index 436e18695355..769fad60fb40 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 = -5694234220276964212L; + private static final long serialVersionUID = -5694243762948639454L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java index 7d89caa61aba..cd4e15479a92 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 = 7526791159997224920L; + private static final long serialVersionUID = 7526795789821491398L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java index 50ba8a37db79..6f1123d1f65f 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 = 6299793124024222276L; + private static final long serialVersionUID = 1973369020980119012L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java index b0ae88607320..0001daf993af 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 = -7773749746335782756L; + private static final long serialVersionUID = 3604619881906743900L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java index 067314823125..307f20b3f3e3 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 = 7466801702766007271L; + private static final long serialVersionUID = -7807683672372145881L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java index 0cdb2264565c..764e363f1ba9 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 = 8544196893559265124L; + private static final long serialVersionUID = 8544200195933501050L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java index eb4f86deea66..cd659cce55d1 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 = -3789407145913017871L; + private static final long serialVersionUID = -363003568323638031L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java index f1006e78523a..87edb2e6dc4c 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 = 2620126179442949131L; + private static final long serialVersionUID = 8553009487146139851L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java index 7cfa0112fee5..47965ee3cec3 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 = 8009698222184959251L; + private static final long serialVersionUID = 6026627221801123218L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java index b84d912ba385..fd486b26c53d 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 = 6477404335249787752L; + private static final long serialVersionUID = 5595175118102551851L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java index f2c4cf487abb..659879671dd1 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 = 5920670791735982342L; + private static final long serialVersionUID = 6820366839901004765L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java index 201857eaccc6..02e3a696d058 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 = -3589935189490281487L; + private static final long serialVersionUID = -2541555230615122127L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java index 9dcd5cbeb4cf..1f056717f92c 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 = -2699418659288920770L; + private static final long serialVersionUID = -2699419319160913760L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java index 475a99c8e2eb..9aba170431be 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 = -2645898991404012153L; + private static final long serialVersionUID = -4004008428679273849L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java index 01ab4b92df8d..437f5096a577 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 = 6975543729018861823L; + private static final long serialVersionUID = 3757569389103889919L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java index 0df17a4f3075..ae339d1303d3 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 = -2967774769979516831L; + private static final long serialVersionUID = 5774040444186383201L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java index 1e4827dea126..a55e6f2192a8 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 = 464425161083111577L; + private static final long serialVersionUID = -2411786723573934727L; /** @hidden */ @Override diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java index 0bb5bbdb7928..024d49c52dfc 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 = 1091152460186245939L; + private static final long serialVersionUID = 6926603497260023475L; } diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java index 7cc89f96a099..c7001d4f14e6 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 = -5552025150748322992L; + private static final long serialVersionUID = 2814527746673031761L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java index 460e3c9e50a4..fa9f961553f6 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 = 7896658495987993611L; + private static final long serialVersionUID = 7896660846473636461L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java index 8532976c33bf..eb3a3ff4b3e8 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 = -1232386117368275811L; + private static final long serialVersionUID = 6781976041140055228L; /** @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 e0e693816efb..2914acce4011 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 = -9125026724243976735L; + private static final long serialVersionUID = -501621737654069439L; /** @hidden */ @Override diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java index e11ba90183bc..b675a4a09229 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 = -1090053751341618262L; + private static final long serialVersionUID = -1090057104130185012L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java index 19ca31a0f60b..508e2ca061e3 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 = 243152294044571586L; + private static final long serialVersionUID = 243154722170229860L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java index 42aece6f5421..b38f55cd3f47 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 = -7853539872141341637L; + private static final long serialVersionUID = 7263196380012209437L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java index 26c4d5bc9944..bb85c176bdd6 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 = -8653879292937803794L; + private static final long serialVersionUID = -8653877345560783352L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java index eaab0e210e3c..71a8130324af 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 = -6283740130015045297L; + private static final long serialVersionUID = -6283743389685217367L; } diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java index 55f5e12666b0..6f2ecf9ea038 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 = 3979367461986423587L; + private static final long serialVersionUID = 3979364186837872261L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Base.java b/slice2java/swift/test/Ice/defaultValue/Test/Base.java index 7fa260fdb98e..17c331e9f5ef 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 = 7864162417687731446L; + private static final long serialVersionUID = 4725768377888802782L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java index d692ffa50b40..48b3e28b02fc 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 = 3394958457619786114L; + private static final long serialVersionUID = 6460987222371530346L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Derived.java b/slice2java/swift/test/Ice/defaultValue/Test/Derived.java index 0129b2238995..320f418dcd54 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 = 8113173430183616655L; + private static final long serialVersionUID = 7793925578758834383L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java index bfcaa7e74007..a4f769669004 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 = -8878954690139112904L; + private static final long serialVersionUID = 8104068678166351224L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java index 5211115f2677..6f54b0d3c756 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 = -6245853488043087143L; + private static final long serialVersionUID = 1230933681312276785L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java index ccfc3f4fc40a..baeaa98ca429 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 = -7255089043832521235L; + private static final long serialVersionUID = 792491593170133652L; } diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java index 99b077e064d3..ee11e05e3387 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 = -5552657988297688357L; + private static final long serialVersionUID = -1336696330116176589L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/A.java b/slice2java/swift/test/Ice/exceptions/Test/A.java index 0307a2ad377c..f92650feb52e 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 = 7823746769976615596L; + private static final long serialVersionUID = 7823737223137197326L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/B.java b/slice2java/swift/test/Ice/exceptions/Test/B.java index 791b6353905f..82d7928f3918 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 = -3861408963379437076L; + private static final long serialVersionUID = -3861418840531059634L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/C.java b/slice2java/swift/test/Ice/exceptions/Test/C.java index b83b11f4146f..8024726e4a5d 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 = 1080700461179400876L; + private static final long serialVersionUID = 1080690914339982606L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/D.java b/slice2java/swift/test/Ice/exceptions/Test/D.java index 7a9edc7814dc..2f07462abb6f 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 = 4780383304722641132L; + private static final long serialVersionUID = 4780373427571018574L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/E.java b/slice2java/swift/test/Ice/exceptions/Test/E.java index 76b2ed9b8ea2..645f8b5ab71a 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 = -1876971853535270540L; + private static final long serialVersionUID = -1876975949914982954L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/F.java b/slice2java/swift/test/Ice/exceptions/Test/F.java index abcb676f4e9b..e1063dff86a7 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 = 733479553378968119L; + private static final long serialVersionUID = 733473070053218005L; } diff --git a/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java b/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java index d3a16315fdf8..6030c311cf19 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 = -4641412376811685832L; + private static final long serialVersionUID = -4641411013329701990L; } diff --git a/slice2java/swift/test/Ice/inheritance/Test/MC/A.java b/slice2java/swift/test/Ice/inheritance/Test/MC/A.java index 4252885140b9..130e8d3676ae 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 = 954229303755493011L; + private static final long serialVersionUID = 954223249083305600L; /** @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 f63edacd8a06..e1c340caff0e 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 = 1339633012169664265L; + private static final long serialVersionUID = 1339630968877557274L; /** @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 75a6a849bfc5..ddb4cf07ee22 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 = -2729307269112545269L; + private static final long serialVersionUID = -2729314607423325160L; /** @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 a7a07e2fe9e2..5ef9ef91e055 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 = -3435398847145851123L; + private static final long serialVersionUID = -3435400890437958114L; /** @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 93fbabbdd1e9..0f9678298f04 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 = -836181019302590572L; + private static final long serialVersionUID = -836179136152511737L; /** @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 264d7ae3505a..ca5d9d78743b 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 = 1132521979831621801L; + private static final long serialVersionUID = 1132525386999077050L; /** @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 5648ee77351f..d875b0f332cb 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 = -6335555941604554837L; + private static final long serialVersionUID = -6335557829455772488L; /** @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 f2f7eb49b94f..8b6584369870 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 = -4007410383102433363L; + private static final long serialVersionUID = -4007406975934978114L; /** @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 aca6f185b4a5..e9ddc1448333 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 = 991428747005197717L; + private static final long serialVersionUID = 991427987351683206L; /** @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 d0ec4b788757..2a56e3ecf7d6 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 = -2880334934959282615L; + private static final long serialVersionUID = -2880342433108494886L; /** @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 5190be7f3f83..4a1e19284a88 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 = -8808268431634915509L; + private static final long serialVersionUID = -8808270314481398568L; /** @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 a225694ffb24..3fe41e9cf049 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 = -771853593717352627L; + private static final long serialVersionUID = -771861091866564898L; /** @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 59cf25007b69..5b09d112f604 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 = 6566354706858430358L; + private static final long serialVersionUID = 6566362205311238405L; /** @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 97ebbfb11bff..a6d241e994e8 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 = 6983798894959834601L; + private static final long serialVersionUID = 6983796846662993018L; /** @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 269fbafb10b4..a1e911bef26b 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 = -1175220120840033813L; + private static final long serialVersionUID = -1175216553834146184L; /** @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 c3ea632712d1..2ef2cbc838e3 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 = -3279718680991197203L; + private static final long serialVersionUID = -3279720729288038786L; /** @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 16fd4b746144..eaf7a4ea85de 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 = -4359171786353040233L; + private static final long serialVersionUID = -4359177841025227644L; /** @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 5ef33af21852..7c7815ce6b07 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 = 5904689799721052297L; + private static final long serialVersionUID = 5904687756428945306L; /** @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 a36bb8fdf590..8e0aea82054d 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 = 1835749518438842763L; + private static final long serialVersionUID = 1835742180128062872L; /** @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 e542abacce45..3e420c16ee7c 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 = -2252399500376168307L; + private static final long serialVersionUID = -2252401543668275298L; /** @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 dd0f69ea251c..33078bd381c2 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 = -1203539772240032360L; + private static final long serialVersionUID = -1203537889089953525L; /** @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 7697918c768a..8e159600f567 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 = -7537770051755663319L; + private static final long serialVersionUID = -7537766644588208070L; /** @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 89b127b1dc11..ce9bb7148854 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 = 3440896100517711659L; + private static final long serialVersionUID = 3440894212666494008L; /** @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 9c66763d5879..80e99828cad0 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 = 9151099099801538349L; + private static final long serialVersionUID = 9151102506968993598L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/A.java b/slice2java/swift/test/Ice/objects/Test/A.java index 5d477553d86a..01a780d23964 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 = -4838821192058701988L; + private static final long serialVersionUID = 5682493956303199057L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/A1.java b/slice2java/swift/test/Ice/objects/Test/A1.java index 5c4bfe2f7f31..3b11ef6fc259 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 = -5926752076741791726L; + private static final long serialVersionUID = -5926739123309120164L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/B.java b/slice2java/swift/test/Ice/objects/Test/B.java index 4c3260b71733..37b231d10768 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 = -8890917835282255673L; + private static final long serialVersionUID = -8890911615574854549L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/B1.java b/slice2java/swift/test/Ice/objects/Test/B1.java index 84e3ddd1487c..a82f475da952 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 = -7657031706897092220L; + private static final long serialVersionUID = -5747849458473841660L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Base.java b/slice2java/swift/test/Ice/objects/Test/Base.java index 6bea17de7630..4401c70c663e 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 = 370167985729923504L; + private static final long serialVersionUID = 2189799015663948950L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/BaseEx.java b/slice2java/swift/test/Ice/objects/Test/BaseEx.java index e54b4da1db74..5a0618645a40 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 = 3897764405732298688L; + private static final long serialVersionUID = 3897776075598972302L; } diff --git a/slice2java/swift/test/Ice/objects/Test/C.java b/slice2java/swift/test/Ice/objects/Test/C.java index 1a77bad31840..2b9c909a805b 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 = -123434495563421851L; + private static final long serialVersionUID = 7303633218856678923L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/COneMember.java b/slice2java/swift/test/Ice/objects/Test/COneMember.java index ecf59ab5aea3..89abd4551be3 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 = 3050971065752904055L; + private static final long serialVersionUID = 3050964851050162822L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java b/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java index cdce6567d01f..c078a09737dc 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 = -7060790799456987237L; + private static final long serialVersionUID = -3221930133237119205L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/D.java b/slice2java/swift/test/Ice/objects/Test/D.java index e8b74488d1da..2f1f347c7d5c 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 = -2050359617264394785L; + private static final long serialVersionUID = 3495132702761356414L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/D1.java b/slice2java/swift/test/Ice/objects/Test/D1.java index 2eba681e9a27..d4dff4985bd8 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 = 3728372359816169155L; + private static final long serialVersionUID = 1544749754939426115L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Derived.java b/slice2java/swift/test/Ice/objects/Test/Derived.java index c5a85a97e679..dff0b7a02031 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 = -1587931030684875886L; + private static final long serialVersionUID = -1587930406818518145L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/E.java b/slice2java/swift/test/Ice/objects/Test/E.java index 48f298f89cca..89e8872a79e5 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 = -2056328385209570001L; + private static final long serialVersionUID = -7421998848422260883L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/EBase.java b/slice2java/swift/test/Ice/objects/Test/EBase.java index b40db5aa1d91..d72c23fff954 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 = -3136503361261866162L; + private static final long serialVersionUID = 8002512825387913166L; } diff --git a/slice2java/swift/test/Ice/objects/Test/EDerived.java b/slice2java/swift/test/Ice/objects/Test/EDerived.java index 6d47b7bd47a2..daf22c156e5a 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 = 1019636762947075922L; + private static final long serialVersionUID = -6902035328790585902L; } diff --git a/slice2java/swift/test/Ice/objects/Test/EOneMember.java b/slice2java/swift/test/Ice/objects/Test/EOneMember.java index c7538bd9844c..3edf23afa4f7 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 = -6225292821405109192L; + private static final long serialVersionUID = -6225279867974303863L; } diff --git a/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java b/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java index 5a60647b42f4..e1362f1359c0 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 = -7892953611504118764L; + private static final long serialVersionUID = 2447346233412833684L; } diff --git a/slice2java/swift/test/Ice/objects/Test/F.java b/slice2java/swift/test/Ice/objects/Test/F.java index efc77de243a2..cd5e9124bc88 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 = -1299226502583784367L; + private static final long serialVersionUID = -2032261716709722159L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/F1.java b/slice2java/swift/test/Ice/objects/Test/F1.java index c7e4a47f27c5..ee2d33b2c141 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 = 6192372607831646598L; + private static final long serialVersionUID = 6192374072505819381L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/F3.java b/slice2java/swift/test/Ice/objects/Test/F3.java index cd28f86824d4..d2d7fee9c6d2 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 = 8678417709718476860L; + private static final long serialVersionUID = -6764676868220665727L; /** @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 04ef826ce2a6..aae335ab057a 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 = -1425265747020427795L; + private static final long serialVersionUID = -1425254077156658559L; /** @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 c28fc67b4092..ee5ccbeb76f7 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 = -2337233992425953493L; + private static final long serialVersionUID = -2337225130216103451L; } 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 8d12fa64f71b..41fd03c76b0b 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 = -1298684306415508713L; + private static final long serialVersionUID = -1298688997211811050L; /** @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 2cfb2e41ef56..ac1786b29028 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 = 1842233477319945807L; + private static final long serialVersionUID = 1842225979052710273L; } diff --git a/slice2java/swift/test/Ice/objects/Test/K.java b/slice2java/swift/test/Ice/objects/Test/K.java index f2eee4fe6a8b..84caed7ec1f4 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 = 4645167867498559219L; + private static final long serialVersionUID = 4645160364152998193L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/L.java b/slice2java/swift/test/Ice/objects/Test/L.java index 6fee0e0dd07b..0e7ce91ab895 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 = 6629744241076094425L; + private static final long serialVersionUID = 6629743481530957719L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/M.java b/slice2java/swift/test/Ice/objects/Test/M.java index 508801287cc9..4b3769f696a1 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 = -8088098066083046554L; + private static final long serialVersionUID = -8088101478063991288L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/Recursive.java b/slice2java/swift/test/Ice/objects/Test/Recursive.java index 642383a4f3ac..9611fd4c1eb8 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 = 3617883952592874664L; + private static final long serialVersionUID = 3617887359560911087L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/objects/Test/S.java b/slice2java/swift/test/Ice/objects/Test/S.java index 1947b2ed953b..c883bea1a2cd 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 = 481772516609605610L; + private static final long serialVersionUID = 481773281154568612L; } diff --git a/slice2java/swift/test/Ice/objects/Test/SOneMember.java b/slice2java/swift/test/Ice/objects/Test/SOneMember.java index 524e2e280ac2..00e3191687bb 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 = 6227753842900394542L; + private static final long serialVersionUID = 6227749147281733535L; } diff --git a/slice2java/swift/test/Ice/objects/Test/STwoMembers.java b/slice2java/swift/test/Ice/objects/Test/STwoMembers.java index 54cd192e9742..1985a71af1bf 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 = -8837542279990250878L; + private static final long serialVersionUID = -990228335943188222L; } diff --git a/slice2java/swift/test/Ice/objects/Test/StructKey.java b/slice2java/swift/test/Ice/objects/Test/StructKey.java index 9bffa2b30174..0b4057565709 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 = -2868760582839646877L; + private static final long serialVersionUID = -1868292677637670239L; } diff --git a/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java b/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java index f2f4c3a9be87..d9a4b47b6de1 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 = 2723843400316115537L; + private static final long serialVersionUID = 2723846129094070695L; } diff --git a/slice2java/swift/test/Ice/operations/Test/MyClass1.java b/slice2java/swift/test/Ice/operations/Test/MyClass1.java index 03317216ed08..5dd7ce77fcd1 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 = -5021125545360204584L; + private static final long serialVersionUID = -1608815241614871544L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct.java b/slice2java/swift/test/Ice/operations/Test/MyStruct.java index 739f9b490c10..2ded7fdb5336 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 = -6010504354275354243L; + private static final long serialVersionUID = -6173694930118794883L; } diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct1.java b/slice2java/swift/test/Ice/operations/Test/MyStruct1.java index 696820f1edb0..9b44b9de7939 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 = 8049629354110533233L; + private static final long serialVersionUID = 5497368319984196577L; } diff --git a/slice2java/swift/test/Ice/operations/Test/Structure.java b/slice2java/swift/test/Ice/operations/Test/Structure.java index 9c681d356d25..055746df0730 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 = 7366557114314833955L; + private static final long serialVersionUID = 6186682209238989130L; } diff --git a/slice2java/swift/test/Ice/optional/Test/A.java b/slice2java/swift/test/Ice/optional/Test/A.java index 25d4ecc9abc0..acd2847247aa 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 = 4553483876963970320L; + private static final long serialVersionUID = 3102191217820149392L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/B.java b/slice2java/swift/test/Ice/optional/Test/B.java index e39d7c6c052a..9036a7c0dc4a 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 = -6668012927245330013L; + private static final long serialVersionUID = -409649081774512477L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/C.java b/slice2java/swift/test/Ice/optional/Test/C.java index ef8e73a71d94..b13e7e71a4f4 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 = 6025582604501295165L; + private static final long serialVersionUID = -2007451893043080067L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/DerivedException.java b/slice2java/swift/test/Ice/optional/Test/DerivedException.java index 82e311efbb7d..1326bbbfaeb8 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 = -4533120483824482830L; + private static final long serialVersionUID = -6545495811475839488L; } diff --git a/slice2java/swift/test/Ice/optional/Test/E.java b/slice2java/swift/test/Ice/optional/Test/E.java index 1c153dd6e736..e5b1179dec53 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 = -1850742660577798989L; + private static final long serialVersionUID = -1850731041077433549L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/F.java b/slice2java/swift/test/Ice/optional/Test/F.java index 69a454e717be..d225951f96ea 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 = -6430489304295909056L; + private static final long serialVersionUID = -6430490333773294784L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/FixedStruct.java b/slice2java/swift/test/Ice/optional/Test/FixedStruct.java index 5589615ecc69..6cfa53e422c3 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 = 1569604901013302464L; + private static final long serialVersionUID = 1569609577323868368L; } diff --git a/slice2java/swift/test/Ice/optional/Test/G.java b/slice2java/swift/test/Ice/optional/Test/G.java index eaba8bc14048..35a05ae4bdd3 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 = 2076566196412034771L; + private static final long serialVersionUID = -1709458693467443117L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/G1.java b/slice2java/swift/test/Ice/optional/Test/G1.java index 0b32c155a170..f236441c2007 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 = 7339781406985538620L; + private static final long serialVersionUID = 7339787320629550094L; } diff --git a/slice2java/swift/test/Ice/optional/Test/G2.java b/slice2java/swift/test/Ice/optional/Test/G2.java index 85f3d51e1df9..26d1d1d08fb6 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 = 3824547952763369000L; + private static final long serialVersionUID = 3824559572261147616L; } diff --git a/slice2java/swift/test/Ice/optional/Test/MultiOptional.java b/slice2java/swift/test/Ice/optional/Test/MultiOptional.java index 701e7436b523..f9426d199900 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 = 5308770937128621387L; + private static final long serialVersionUID = 8677240015468565876L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/OneOptional.java b/slice2java/swift/test/Ice/optional/Test/OneOptional.java index 51eec8d26701..ae714145225b 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 = -7219601462136099474L; + private static final long serialVersionUID = -7219607375683333762L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalException.java b/slice2java/swift/test/Ice/optional/Test/OptionalException.java index 4ce9f6122942..ec8a4d293e76 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 = 2093252777445520762L; + private static final long serialVersionUID = 3596602795167600853L; } diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java index 31c9d4e9fd90..41ebfa7aa808 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 = 8911896245949776507L; + private static final long serialVersionUID = -1533544970057435909L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/optional/Test/RequiredException.java b/slice2java/swift/test/Ice/optional/Test/RequiredException.java index 00f5a10d9a94..c8daedbaf09a 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 = 2894235342777807669L; + private static final long serialVersionUID = 2894241341508991815L; } diff --git a/slice2java/swift/test/Ice/optional/Test/SmallStruct.java b/slice2java/swift/test/Ice/optional/Test/SmallStruct.java index 3d2ace88aa5c..50a1bfc1ea8a 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 = 6700991434430077964L; + private static final long serialVersionUID = 6700996025581518534L; } diff --git a/slice2java/swift/test/Ice/optional/Test/VarStruct.java b/slice2java/swift/test/Ice/optional/Test/VarStruct.java index ecc12e84b489..047e89d6fb5c 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 = -1912287460598622796L; + private static final long serialVersionUID = -1912281546954611322L; } diff --git a/slice2java/swift/test/Ice/optional/Test/WD.java b/slice2java/swift/test/Ice/optional/Test/WD.java index cabbac4215b8..71b4108d3c14 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 = 7330914140651366290L; + private static final long serialVersionUID = 6757965959647436144L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/C.java b/slice2java/swift/test/Ice/scope/Test/C.java index 5cd1c7989b80..b6c004b9a13f 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 = -5190248190776873278L; + private static final long serialVersionUID = -5190248068009147741L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/C1.java b/slice2java/swift/test/Ice/scope/Test/C1.java index 4a3d936d89e4..bbe955e26307 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 = 8893228157422572803L; + private static final long serialVersionUID = 8893228200114545058L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/scope/Test/C2.java b/slice2java/swift/test/Ice/scope/Test/C2.java index 5926b8072d42..bd4066305cc8 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 = -1281110224467545395L; + private static final long serialVersionUID = 10387194979026892L; /** @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 4051be0837e9..e8f52c5bbc93 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 = 4615623758002756751L; + private static final long serialVersionUID = 4615623715538344110L; /** @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 f2ca6ab42e59..bbab8ba26850 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 = 672583991389225175L; + private static final long serialVersionUID = 672583948929412470L; /** @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 53b351a36e93..4068f60016ff 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 = 8654444311825182684L; + private static final long serialVersionUID = 8654444434592768829L; } diff --git a/slice2java/swift/test/Ice/scope/Test/Inner/S.java b/slice2java/swift/test/Ice/scope/Test/Inner/S.java index 2e3656cf2f54..6ad5bd4794fb 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 = 3694609773037493904L; + private static final long serialVersionUID = 3694609895805080305L; } diff --git a/slice2java/swift/test/Ice/scope/Test/S.java b/slice2java/swift/test/Ice/scope/Test/S.java index 7db4ee3e8411..e4c789f3f7da 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 = 2159708949253233262L; + private static final long serialVersionUID = 2159708906561261007L; } diff --git a/slice2java/swift/test/Ice/scope/Test/S1.java b/slice2java/swift/test/Ice/scope/Test/S1.java index e8c9e5d5fcf7..8b9fd44ea362 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 = 1241668557127467450L; + private static final long serialVersionUID = 1241668514435495195L; } diff --git a/slice2java/swift/test/Ice/scope/Test/S2.java b/slice2java/swift/test/Ice/scope/Test/S2.java index 7dd96692f3d3..561d5b1c15dc 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 = -8867691542199816012L; + private static final long serialVersionUID = -8619735842231300811L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java index 77962fe6974d..3daa9323c870 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 = -477024521533623788L; + private static final long serialVersionUID = -477023884604486849L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java index 27b1c360ac08..5c3cd21a252a 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 = 3485213864362956722L; + private static final long serialVersionUID = 3485214340846461145L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java index 34e712af9814..cd84d07ac62e 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 = 1717378799603225795L; + private static final long serialVersionUID = 1717378162844860328L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java index 66396b8e133b..ccb4b8d78209 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 = -7384918950652598758L; + private static final long serialVersionUID = -7384918479036400719L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java index 1988cd8debc7..161ce5a2bc5d 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 = 3424370096954186146L; + private static final long serialVersionUID = 3424367672954377607L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java index 9ba303c2c4bb..2a2c584cf74e 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 = -1172598399458943949L; + private static final long serialVersionUID = -1172602427775153194L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java index 34f0dc1437a1..cd3a1f78a227 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 = -1126114010266556342L; + private static final long serialVersionUID = -1126115747233863249L; } diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java index a4da8939f8e1..42445d99e6b2 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 = -2097583640444532822L; + private static final long serialVersionUID = -2097585382568228465L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/B.java b/slice2java/swift/test/Ice/slicing/objects/Test/B.java index d31ae37cf155..9a1b51315089 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 = 4156060363391608615L; + private static final long serialVersionUID = 3056159685687809575L; /** @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 f6a5545333af..b4ee35a8ace9 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 = 6872559183720999147L; + private static final long serialVersionUID = -474736038636085013L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java index 2e138dddc060..124e6aac13c4 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 = -6397001952937669262L; + private static final long serialVersionUID = -6396997680788916027L; /** @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 d48c47db8efc..efe87a51583c 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 = -9066881201680778228L; + private static final long serialVersionUID = -9066888158857863656L; /** @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 30e79715fa99..0fdee796c63f 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 = 8519092391765095620L; + private static final long serialVersionUID = -1480410911772411452L; /** @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 c31d36e0606a..4f0deaa0bd90 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 = -7954822773549034555L; + private static final long serialVersionUID = -6621853058806161387L; /** @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 1fee284170a6..6d81b9359c6c 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 = 813697105956656372L; + private static final long serialVersionUID = 1964694645146633684L; /** @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 e0d3a4463b34..f337add0ab63 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 = -7381024291348051341L; + private static final long serialVersionUID = -7091611870787966349L; /** @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 07bdef4e9b93..3ec7854aff61 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 = -1033535938310860233L; + private static final long serialVersionUID = -6558221941851059529L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java b/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java index 79b46f908420..d899c7d511b8 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 = -7655923043456772108L; + private static final long serialVersionUID = -7655927151576408736L; /** @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 cb496bf54881..e40df9d9bb96 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 = -2271128816389889273L; + private static final long serialVersionUID = -2271124708270522733L; /** @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 5f3db7834da8..a5125ba19375 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 = 4147534889544134636L; + private static final long serialVersionUID = 4147520351459987546L; /** @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 ae3c5d478fdd..1e856a22f6a9 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 = 481708937817874619L; + private static final long serialVersionUID = 481713250106474159L; /** @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 4676d5d5bac5..13941fae90a3 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 = -4426886979763985486L; + private static final long serialVersionUID = -4426882872923132283L; /** @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 0a3817744183..d4a707bf87ea 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 = 850538690440664636L; + private static final long serialVersionUID = 850539878319728075L; /** @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 20c992146186..a4702f8895c5 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 = -4328898728362542234L; + private static final long serialVersionUID = -4328908251537088687L; /** @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 526e5d4c56d5..543ece8efc19 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 = -5081818638740618089L; + private static final long serialVersionUID = -5081806385446551968L; /** @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 ab79714cb659..25ec0345824e 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 = 643079419933744779L; + private static final long serialVersionUID = 643086338288518303L; /** @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 39796cca590b..f48f0fea66ae 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 = -2438007880007747919L; + private static final long serialVersionUID = -2438000922830662491L; /** @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 1827002f9d90..2cbef535e137 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 = -7383495767518017846L; + private static final long serialVersionUID = 6270103655867654003L; /** @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 8aa9250f3917..34176765f7ed 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 = -8813707663822051168L; + private static final long serialVersionUID = -8813712619160744607L; /** @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 74231ebbe591..dd4b22d2c0d9 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 = 3651528616887271923L; + private static final long serialVersionUID = 3651532724979276135L; /** @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 1fd1c4ea85e6..cf102358bfc3 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 = 8804376534060109398L; + private static final long serialVersionUID = 8804372221761998402L; /** @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 6ac289ef0eca..3052f29e6b78 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 = -4989067820924017371L; + private static final long serialVersionUID = -4989058732932446454L; /** @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 a5520d7fa8bb..8b7633c554b7 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 = -5353761400626969120L; + private static final long serialVersionUID = -5353754278094557580L; /** @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 4aa8fb405d56..ebec9bf93a0a 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 = -6522134955350729050L; + private static final long serialVersionUID = -6522142077882829006L; /** @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 02e6a95178e7..aede4f410d20 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 = 7620287506400053349L; + private static final long serialVersionUID = 7620283359410153969L; /** @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 563a0ef3cde2..3f2c558d3205 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 = -8344353741121844436L; + private static final long serialVersionUID = -6318061948061168724L; } diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java index 6dbfe10dc512..ff0dcbd232c0 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 = 5569148957554136716L; + private static final long serialVersionUID = -7449532881549249547L; /** @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 f58d62e0399e..8d378a74adf4 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 = 4137247019262483913L; + private static final long serialVersionUID = 7319885096118878501L; } diff --git a/slice2java/swift/test/Ice/stream/Test/LargeStruct.java b/slice2java/swift/test/Ice/stream/Test/LargeStruct.java index f721290ba3ca..cb8983723fbb 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 = -7980257621538852788L; + private static final long serialVersionUID = 4255824573972331543L; } diff --git a/slice2java/swift/test/Ice/stream/Test/MyClass.java b/slice2java/swift/test/Ice/stream/Test/MyClass.java index e004ee8f6255..bbb49a7b7746 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 = 4661643360804146945L; + private static final long serialVersionUID = 3264850194989623286L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Ice/stream/Test/MyException.java b/slice2java/swift/test/Ice/stream/Test/MyException.java index 2731d4b16f3d..b04a2f74eb03 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 = 5734226939749188466L; + private static final long serialVersionUID = 5734228583761825310L; } diff --git a/slice2java/swift/test/Ice/stream/Test/OptionalClass.java b/slice2java/swift/test/Ice/stream/Test/OptionalClass.java index fd0efcfc0a27..76f896580c59 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 = -1730593946340108686L; + private static final long serialVersionUID = 3007606813725575474L; /** @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 ec93837e01e6..a4faffffde87 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 = -1404700015025793393L; + private static final long serialVersionUID = -1404701940784581210L; } diff --git a/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java index 55cb146248f6..5ccb882a8fe6 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 = -2309567556694747582L; + private static final long serialVersionUID = -4351896235218379392L; } diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java index b5b519fcacab..8bc4d0bef695 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 = -8562125497581610499L; + private static final long serialVersionUID = -8562121846433191276L; } diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java index de4400286a3b..44587668e7ea 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 = 7811079757307916457L; + private static final long serialVersionUID = -4216857640450458005L; } diff --git a/slice2java/swift/test/Slice/escape/Clash/Cls.java b/slice2java/swift/test/Slice/escape/Clash/Cls.java index 49b335854f76..28e6fbe56b56 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 = 1301442269582569168L; + private static final long serialVersionUID = 424857978510145668L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Slice/escape/Clash/Ex.java b/slice2java/swift/test/Slice/escape/Clash/Ex.java index b300abe6dcf3..6453e11ac5b6 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 = 7084007182530854356L; + private static final long serialVersionUID = -3040594305057372588L; } diff --git a/slice2java/swift/test/Slice/escape/Clash/St.java b/slice2java/swift/test/Slice/escape/Clash/St.java index c457b0bb636b..bc7005af32e6 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 = 6395201120980893357L; + private static final long serialVersionUID = 4530987533616714029L; } diff --git a/slice2java/swift/test/Slice/escape/and/_return.java b/slice2java/swift/test/Slice/escape/and/_return.java index e239c28d878e..4168b017f3de 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 = -8206178877082641473L; + private static final long serialVersionUID = -8206187523377619510L; } diff --git a/slice2java/swift/test/Slice/escape/and/_switch.java b/slice2java/swift/test/Slice/escape/and/_switch.java index d961f9c5cd3e..309302eae81b 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 = 5611344527177808900L; + private static final long serialVersionUID = 2906838691626035516L; /** @hidden */ @Override diff --git a/slice2java/swift/test/Slice/escape/and/as.java b/slice2java/swift/test/Slice/escape/and/as.java index 73a804064f63..e68469a0efc3 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 = -1268354242733580168L; + private static final long serialVersionUID = 6959187361023432376L; } diff --git a/slice2java/swift/test/Slice/escape/and/defer.java b/slice2java/swift/test/Slice/escape/and/defer.java index 209f9b44dad9..3cb476ecc431 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 = 8824790997769899665L; + private static final long serialVersionUID = 8824788733736676572L; } diff --git a/slice2java/swift/test/Slice/escape/and/guard.java b/slice2java/swift/test/Slice/escape/and/guard.java index 556755cb42d4..9a45b1759ec2 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 = 6403709890582729033L; + private static final long serialVersionUID = 6403721096562765564L; } diff --git a/slice2js/cpp/src/IceGrid/Internal.js b/slice2js/cpp/src/IceGrid/Internal.js index 899ba3576330..cd7964eee83e 100644 --- a/slice2js/cpp/src/IceGrid/Internal.js +++ b/slice2js/cpp/src/IceGrid/Internal.js @@ -630,8 +630,8 @@ Ice.defineOperations( "registerWellKnownObjects": [, 2, , , [[IceGrid.ObjectInfoSeqHelper]], , , , ], "setAdapterDirectProxy": [, 2, , , [[7], [7], [9]], , [ - IceGrid.AdapterNotExistException, - IceGrid.AdapterExistsException + IceGrid.AdapterExistsException, + IceGrid.AdapterNotExistException ], , ], "receivedUpdate": [, , , , [[IceGrid.TopicName._helper], [3], [7]], , , , ], "destroy": [, , , , , , , , ] @@ -748,13 +748,13 @@ Ice.defineOperations( { "registerNode": [, , , ["IceGrid.NodeSessionPrx"], [["IceGrid.InternalNodeInfo", true], ["IceGrid.NodePrx"], [IceGrid.LoadInfo]], , [ - IceGrid.PermissionDeniedException, - IceGrid.NodeActiveException + IceGrid.NodeActiveException, + IceGrid.PermissionDeniedException ], true, ], "registerReplica": [, , , ["IceGrid.ReplicaSessionPrx"], [["IceGrid.InternalReplicaInfo", true], ["IceGrid.InternalRegistryPrx"]], , [ - IceGrid.PermissionDeniedException, - IceGrid.ReplicaActiveException + IceGrid.ReplicaActiveException, + IceGrid.PermissionDeniedException ], true, ], "registerWithReplica": [, , , , [["IceGrid.InternalRegistryPrx"]], , , , ], "getNodes": [, 2, , [IceGrid.NodePrxSeqHelper], , , , , ], diff --git a/slice2js/slice/IceStorm/Metrics.js b/slice2js/slice/IceStorm/Metrics.js index 9f2b6feb8a2a..1f3d18343868 100644 --- a/slice2js/slice/IceStorm/Metrics.js +++ b/slice2js/slice/IceStorm/Metrics.js @@ -18,6 +18,7 @@ import * as Ice_Long from "../Ice/Long.js"; import * as Ice_Object from "../Ice/Object.js"; +import * as Ice_ObjectPrx from "../Ice/ObjectPrx.js"; import * as Ice_StreamHelpers from "../Ice/StreamHelpers.js"; import * as Ice_TypeRegistry from "../Ice/TypeRegistry.js"; import * as Ice_Value from "../Ice/Value.js"; @@ -25,6 +26,7 @@ import * as Ice_Value from "../Ice/Value.js"; const Ice = { ...Ice_Long, ...Ice_Object, + ...Ice_ObjectPrx, ...Ice_StreamHelpers, ...Ice_TypeRegistry, ...Ice_Value, diff --git a/slice2swift/cpp/src/IceGrid/Internal.swift b/slice2swift/cpp/src/IceGrid/Internal.swift index 865b0f6beb5f..ef44318c5722 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) diff --git a/slice2swift/slice/Ice/Locator.swift b/slice2swift/slice/Ice/Locator.swift index a036413645f8..228729e537bc 100644 --- a/slice2swift/slice/Ice/Locator.swift +++ b/slice2swift/slice/Ice/Locator.swift @@ -540,10 +540,10 @@ public extension LocatorRegistryPrx { userException:{ ex in do { throw ex - } catch let error as AdapterNotFoundException { - throw error } catch let error as AdapterAlreadyActiveException { throw error + } catch let error as AdapterNotFoundException { + throw error } catch is UserException {} }, context: context) @@ -580,12 +580,12 @@ public extension LocatorRegistryPrx { userException:{ ex in do { throw ex - } catch let error as AdapterNotFoundException { - throw error } catch let error as InvalidReplicaGroupIdException { throw error } catch let error as AdapterAlreadyActiveException { throw error + } catch let error as AdapterNotFoundException { + throw error } catch is UserException {} }, context: context) diff --git a/slice2swift/slice/IceStorm/IceStorm.swift b/slice2swift/slice/IceStorm/IceStorm.swift index 93e3ce4f907d..adccddee934a 100644 --- a/slice2swift/slice/IceStorm/IceStorm.swift +++ b/slice2swift/slice/IceStorm/IceStorm.swift @@ -846,12 +846,12 @@ public extension TopicPrx { userException:{ ex in do { throw ex + } catch let error as AlreadySubscribed { + throw error } catch let error as InvalidSubscriber { throw error } catch let error as BadQoS { throw error - } catch let error as AlreadySubscribed { - throw error } catch is Ice.UserException {} }, context: context)