Skip to content

Use LinkedHashMap for deterministic iteration order #12230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 4 commits into from
Apr 25, 2022
Merged

Use LinkedHashMap for deterministic iteration order #12230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba3d9cd
to LinkedHashMap
Yilinwang Nov 1, 2020
e14ffd4
LinkedHashMap
Yilinwang Nov 16, 2020
7db6dbd
allModels to LinkedHaskMap
Yilinwang Nov 16, 2020
46ff58d
use LinkedHashMap for deterministic iteration order
wing328 Apr 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ apiTemplateFiles are for API outputs only (controllers/handlers).
// How to encode special characters like $
// They are translated to words like "Dollar" and prefixed with '
// Then translated back during JSON encoding and decoding
protected Map<String, String> specialCharReplacements = new HashMap<>();
protected Map<String, String> specialCharReplacements = new LinkedHashMap<>();
// When a model is an alias for a simple type
protected Map<String, String> typeAliases = null;
protected Boolean prependFormOrBodyParameters = false;
Expand Down Expand Up @@ -512,7 +512,7 @@ protected Map<String, Schema> getModelNameToSchemaCache() {
* @return map of all models indexed by names
*/
public Map<String, CodegenModel> getAllModels(Map<String, ModelsMap> objs) {
Map<String, CodegenModel> allModels = new HashMap<>();
Map<String, CodegenModel> allModels = new LinkedHashMap<>();
for (Entry<String, ModelsMap> entry : objs.entrySet()) {
String modelName = toModelName(entry.getKey());
List<ModelMap> models = entry.getValue().getModels();
Expand Down
9 changes: 3 additions & 6 deletions modules/openapi-generator/src/test/resources/3_0/protobuf-schema/pet.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,18 @@ syntax = "proto3";

package openapitools;

import public "models/lizard_all_of.proto";
import public "models/snake_all_of.proto";
import public "models/cat_all_of.proto";
import public "models/dog_all_of.proto";
import public "models/lizard_all_of.proto";

message Pet {

string petType = 140636936;

bool hasLegs = 159828448;

bool lovesRocks = 499337491;

string name = 3373707;

string bark = 3016376;

bool lovesRocks = 499337491;

}
2 changes: 1 addition & 1 deletion samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ namespace Org.OpenAPITools.Model
/// </summary>
[DataContract]
[JsonConverter(typeof(JsonSubtypes), "className")]
[JsonSubtypes.KnownSubType(typeof(Dog), "Dog")]
[JsonSubtypes.KnownSubType(typeof(Cat), "Cat")]
[JsonSubtypes.KnownSubType(typeof(Dog), "Dog")]
public partial class Animal : IEquatable<Animal>, IValidatableObject
{
/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/python-asyncio/petstore_api/models/animal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ class Animal(object):
}

discriminator_value_class_map = {
'Dog': 'Dog',
'BigCat': 'BigCat',
'Cat': 'Cat',
'BigCat': 'BigCat'
'Dog': 'Dog'
}

def __init__(self, class_name=None, color='red', local_vars_configuration=None): # noqa: E501
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/python-legacy/petstore_api/models/animal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ class Animal(object):
}

discriminator_value_class_map = {
'Dog': 'Dog',
'BigCat': 'BigCat',
'Cat': 'Cat',
'BigCat': 'BigCat'
'Dog': 'Dog'
}

def __init__(self, class_name=None, color='red', local_vars_configuration=None): # noqa: E501
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/python-tornado/petstore_api/models/animal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ class Animal(object):
}

discriminator_value_class_map = {
'Dog': 'Dog',
'BigCat': 'BigCat',
'Cat': 'Cat',
'BigCat': 'BigCat'
'Dog': 'Dog'
}

def __init__(self, class_name=None, color='red', local_vars_configuration=None): # noqa: E501
Expand Down
4 changes: 2 additions & 2 deletions samples/openapi3/client/petstore/python-legacy/petstore_api/models/animal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ class Animal(object):
}

discriminator_value_class_map = {
'Dog': 'Dog',
'Cat': 'Cat'
'Cat': 'Cat',
'Dog': 'Dog'
}

def __init__(self, class_name=None, color='red', local_vars_configuration=None): # noqa: E501
Expand Down
52 changes: 26 additions & 26 deletions samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/Types.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,42 +160,42 @@ removeFieldLabelPrefix forParsing prefix =
where
replaceSpecialChars field = foldl (&) field (map mkCharReplacement specialChars)
specialChars =
[ ("@", "'At")
, ("\\", "'Back_Slash")
, ("<=", "'Less_Than_Or_Equal_To")
, ("\"", "'Double_Quote")
, ("[", "'Left_Square_Bracket")
, ("]", "'Right_Square_Bracket")
[ ("$", "'Dollar")
, ("^", "'Caret")
, ("_", "'Underscore")
, ("`", "'Backtick")
, ("!", "'Exclamation")
, ("#", "'Hash")
, ("$", "'Dollar")
, ("%", "'Percent")
, ("&", "'Ampersand")
, ("'", "'Quote")
, ("(", "'Left_Parenthesis")
, (")", "'Right_Parenthesis")
, ("|", "'Pipe")
, ("=", "'Equal")
, ("*", "'Star")
, ("+", "'Plus")
, (",", "'Comma")
, ("-", "'Dash")
, (".", "'Period")
, ("/", "'Slash")
, ("&", "'Ampersand")
, ("%", "'Percent")
, ("#", "'Hash")
, ("@", "'At")
, ("!", "'Exclamation")
, ("+", "'Plus")
, (":", "'Colon")
, (";", "'Semicolon")
, ("{", "'Left_Curly_Bracket")
, ("|", "'Pipe")
, (">", "'GreaterThan")
, ("<", "'LessThan")
, ("!=", "'Not_Equal")
, ("=", "'Equal")
, (".", "'Period")
, ("_", "'Underscore")
, ("?", "'Question_Mark")
, (",", "'Comma")
, ("'", "'Quote")
, ("/", "'Slash")
, ("(", "'Left_Parenthesis")
, (")", "'Right_Parenthesis")
, ("{", "'Left_Curly_Bracket")
, ("}", "'Right_Curly_Bracket")
, (">", "'GreaterThan")
, ("[", "'Left_Square_Bracket")
, ("]", "'Right_Square_Bracket")
, ("~", "'Tilde")
, ("?", "'Question_Mark")
, ("`", "'Backtick")
, ("<=", "'Less_Than_Or_Equal_To")
, (">=", "'Greater_Than_Or_Equal_To")
, ("!=", "'Not_Equal")
, ("~=", "'Tilde_Equal")
, ("\\", "'Back_Slash")
, ("\"", "'Double_Quote")
]
mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack
replacer =
Expand Down
52 changes: 26 additions & 26 deletions samples/server/petstore/haskell-yesod/src/OpenAPIPetstore/Types.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,42 +130,42 @@ removeFieldLabelPrefix forParsing prefix =
where
replaceSpecialChars field = foldl (&) field (map mkCharReplacement specialChars)
specialChars =
[ ("@", "'At")
, ("\\", "'Back_Slash")
, ("<=", "'Less_Than_Or_Equal_To")
, ("\"", "'Double_Quote")
, ("[", "'Left_Square_Bracket")
, ("]", "'Right_Square_Bracket")
[ ("$", "'Dollar")
, ("^", "'Caret")
, ("_", "'Underscore")
, ("`", "'Backtick")
, ("!", "'Exclamation")
, ("#", "'Hash")
, ("$", "'Dollar")
, ("%", "'Percent")
, ("&", "'Ampersand")
, ("'", "'Quote")
, ("(", "'Left_Parenthesis")
, (")", "'Right_Parenthesis")
, ("|", "'Pipe")
, ("=", "'Equal")
, ("*", "'Star")
, ("+", "'Plus")
, (",", "'Comma")
, ("-", "'Dash")
, (".", "'Period")
, ("/", "'Slash")
, ("&", "'Ampersand")
, ("%", "'Percent")
, ("#", "'Hash")
, ("@", "'At")
, ("!", "'Exclamation")
, ("+", "'Plus")
, (":", "'Colon")
, (";", "'Semicolon")
, ("{", "'Left_Curly_Bracket")
, ("|", "'Pipe")
, (">", "'GreaterThan")
, ("<", "'LessThan")
, ("!=", "'Not_Equal")
, ("=", "'Equal")
, (".", "'Period")
, ("_", "'Underscore")
, ("?", "'Question_Mark")
, (",", "'Comma")
, ("'", "'Quote")
, ("/", "'Slash")
, ("(", "'Left_Parenthesis")
, (")", "'Right_Parenthesis")
, ("{", "'Left_Curly_Bracket")
, ("}", "'Right_Curly_Bracket")
, (">", "'GreaterThan")
, ("[", "'Left_Square_Bracket")
, ("]", "'Right_Square_Bracket")
, ("~", "'Tilde")
, ("?", "'Question_Mark")
, ("`", "'Backtick")
, ("<=", "'Less_Than_Or_Equal_To")
, (">=", "'Greater_Than_Or_Equal_To")
, ("!=", "'Not_Equal")
, ("~=", "'Tilde_Equal")
, ("\\", "'Back_Slash")
, ("\"", "'Double_Quote")
]
mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack
replacer =
Expand Down