Skip to content

Commit

Permalink
Fix LinkedHashMap missing usage issue (#5053)
Browse files Browse the repository at this point in the history 
Fixes an issue where the import was changed to `LinkedHashMap` but
corresponding code handling header collections didn't update their
instantiation to `LinkedHashMap` rather than `HashMap`.
  • Loading branch information
@alzimmermsft
alzimmermsft authored Nov 12, 2024
1 parent e10bab8 commit 731ff59
Showing 1 changed file with 32 additions and 34 deletions.
66 changes: 32 additions & 34 deletions ...icrosoft/typespec/http/client/generator/core/template/util/ModelTemplateHeaderHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ public static void addCustomStronglyTypedHeadersConstructor(JavaClass classBlock

classBlock.lineComment("HttpHeaders containing the raw property values.");
classBlock.javadocComment(comment -> {
comment.description(String.format("Creates an instance of %1$s class.", model.getName()));
comment.description("Creates an instance of " + model.getName() + " class.");
comment.param("rawHeaders", "The raw HttpHeaders that will be used to create the property values.");
});
classBlock.publicConstructor(String.format("%s(HttpHeaders rawHeaders)", model.getName()), constructor -> {
classBlock.publicConstructor(model.getName() + "(HttpHeaders rawHeaders)", constructor -> {
// HeaderCollections need special handling as they may have multiple values that need to be retrieved from
// the raw headers.
List<ClientModelProperty> collectionProperties = new ArrayList<>();
Expand Down Expand Up @@ -106,9 +106,9 @@ public static String getHttpHeaderNameInstanceExpression(String headerName) {

if (HEADER_TO_KNOWN_HTTPHEADERNAME.containsKey(caseInsensitiveName)) {
// known name
return String.format("HttpHeaderName.%s", HEADER_TO_KNOWN_HTTPHEADERNAME.get(caseInsensitiveName));
return "HttpHeaderName." + HEADER_TO_KNOWN_HTTPHEADERNAME.get(caseInsensitiveName);
} else {
return String.format("HttpHeaderName.fromString(%s)", ClassType.STRING.defaultValueExpression(headerName));
return "HttpHeaderName.fromString(" + ClassType.STRING.defaultValueExpression(headerName) + ")";
}
}

Expand All @@ -134,7 +134,7 @@ private static void addHttpHeaderNameConstants(JavaClass classBlock, ClientModel
String headerName = property.getSerializedName();
String constantName = CodeNamer.getEnumMemberName(headerName);
classBlock.variable(
String.format("HttpHeaderName %s = HttpHeaderName.fromString(\"%s\")", constantName, headerName),
"HttpHeaderName " + constantName + " = HttpHeaderName.fromString(\"" + headerName + "\")",
JavaVisibility.Private, JavaModifier.Static, JavaModifier.Final);
}
}
Expand All @@ -153,50 +153,49 @@ private static void generateHeaderDeserializationFunction(ClientModelProperty pr
? "HttpHeaderName." + knownHttpHeaderNameConstant
: CodeNamer.getEnumMemberName(property.getSerializedName());

String rawHeaderAccess = String.format("rawHeaders.getValue(%s)", httpHeaderName);
String rawHeaderAccess = "rawHeaders.getValue(" + httpHeaderName + ")";
if (needsNullGuarding) {
javaBlock.line("String %s = %s;", property.getName(), rawHeaderAccess);
javaBlock.line("String " + property.getName() + " = " + rawHeaderAccess + ";");
rawHeaderAccess = property.getName();
}

boolean needsTryCatch = false;
String setter;
if (wireType == PrimitiveType.BOOLEAN || wireType == ClassType.BOOLEAN) {
setter = String.format("Boolean.parseBoolean(%s)", rawHeaderAccess);
setter = "Boolean.parseBoolean(" + rawHeaderAccess + ")";
} else if (wireType == PrimitiveType.DOUBLE || wireType == ClassType.DOUBLE) {
setter = String.format("Double.parseDouble(%s)", rawHeaderAccess);
setter = "Double.parseDouble(" + rawHeaderAccess + ")";
} else if (wireType == PrimitiveType.FLOAT || wireType == ClassType.FLOAT) {
setter = String.format("Float.parseFloat(%s)", rawHeaderAccess);
setter = "Float.parseFloat(" + rawHeaderAccess + ")";
} else if (wireType == PrimitiveType.INT || wireType == ClassType.INTEGER) {
setter = String.format("Integer.parseInt(%s)", rawHeaderAccess);
setter = "Integer.parseInt(" + rawHeaderAccess + ")";
} else if (wireType == PrimitiveType.LONG || wireType == ClassType.LONG) {
setter = String.format("Long.parseLong(%s)", rawHeaderAccess);
setter = "Long.parseLong(" + rawHeaderAccess + ")";
} else if (wireType == ArrayType.BYTE_ARRAY) {
setter = String.format("Base64.getDecoder().decode(%s)", rawHeaderAccess);
setter = "Base64.getDecoder().decode(" + rawHeaderAccess + ")";
} else if (wireType == ClassType.STRING) {
setter = rawHeaderAccess;
} else if (wireType == ClassType.DATE_TIME_RFC_1123) {
setter = String.format("new DateTimeRfc1123(%s)", rawHeaderAccess);
setter = "new DateTimeRfc1123(" + rawHeaderAccess + ")";
} else if (wireType == ClassType.DATE_TIME) {
setter = String.format("OffsetDateTime.parse(%s)", rawHeaderAccess);
setter = "OffsetDateTime.parse(" + rawHeaderAccess + ")";
} else if (wireType == ClassType.LOCAL_DATE) {
setter = String.format("LocalDate.parse(%s)", rawHeaderAccess);
setter = "LocalDate.parse(" + rawHeaderAccess + ")";
} else if (wireType == ClassType.DURATION) {
setter = String.format("Duration.parse(%s)", rawHeaderAccess);
setter = "Duration.parse(" + rawHeaderAccess + ")";
} else if (wireType == ClassType.UUID) {
setter = "UUID.fromString(" + rawHeaderAccess + ")";
} else if (wireType == ClassType.URL) {
needsTryCatch = true;
setter = "new URL(" + rawHeaderAccess + ")";
} else if (wireType instanceof EnumType) {
EnumType enumType = (EnumType) wireType;
setter = String.format("%s.%s(%s)", enumType.getName(), enumType.getFromMethodName(), rawHeaderAccess);
setter = enumType.getName() + "." + enumType.getFromMethodName() + "(" + rawHeaderAccess + ")";
} else {
// TODO (alzimmer): Check if the wire type is a Swagger type that could use stream-style serialization.
needsTryCatch = true;
setter = String.format(
"JacksonAdapter.createDefaultSerializerAdapter().deserializeHeader(rawHeaders.get(\"%s\"), %s)",
property.getSerializedName(), getWireTypeJavaType(wireType));
setter = "JacksonAdapter.createDefaultSerializerAdapter().deserializeHeader(" + "rawHeaders.get(\""
+ property.getSerializedName() + "\"), " + getWireTypeJavaType(wireType) + ")";
}

if (needsTryCatch) {
Expand All @@ -206,10 +205,10 @@ private static void generateHeaderDeserializationFunction(ClientModelProperty pr

// String is special as the setter is null safe for it, unlike other nullable types.
if (needsNullGuarding) {
javaBlock.ifBlock(String.format("%s != null", property.getName()),
ifBlock -> ifBlock.line("this.%s = %s;", property.getName(), setter));
javaBlock.ifBlock(property.getName() + " != null",
ifBlock -> ifBlock.line("this." + property.getName() + " = " + setter + ";"));
} else {
javaBlock.line("this.%s = %s;", property.getName(), setter);
javaBlock.line("this." + property.getName() + " = " + setter + ";");
}

if (needsTryCatch) {
Expand Down Expand Up @@ -241,7 +240,7 @@ private static void generateHeaderCollectionDeserialization(List<ClientModelProp
MapType wireType = (MapType) property.getWireType();

// Prefix the map with the property name for the cases where multiple header collections exist.
block.line("%s %sHeaderCollection = new HashMap<>();", wireType, property.getName());
block.line(wireType + " " + property.getName() + "HeaderCollection = new LinkedHashMap<>();");
}

block.line();
Expand All @@ -252,21 +251,20 @@ private static void generateHeaderCollectionDeserialization(List<ClientModelProp
for (int i = 0; i < propertiesSize; i++) {
ClientModelProperty property = properties.get(i);
boolean needsContinue = i < propertiesSize - 1;
body.ifBlock(String.format("headerName.startsWith(\"%s\")", property.getHeaderCollectionPrefix()),
ifBlock -> {
ifBlock.line("%sHeaderCollection.put(headerName.substring(%d), header.getValue());",
property.getName(), property.getHeaderCollectionPrefix().length());
if (needsContinue) {
ifBlock.line("continue;");
}
});
body.ifBlock("headerName.startsWith(\"" + property.getHeaderCollectionPrefix() + "\")", ifBlock -> {
ifBlock.line("%sHeaderCollection.put(headerName.substring(%d), header.getValue());",
property.getName(), property.getHeaderCollectionPrefix().length());
if (needsContinue) {
ifBlock.line("continue;");
}
});
}
});

block.line();

for (ClientModelProperty property : properties) {
block.line("this.%s = %sHeaderCollection;", property.getName(), property.getName());
block.line("this." + property.getName() + " = " + property.getName() + "HeaderCollection;");
}
}

Expand Down

0 comments on commit 731ff59

Please sign in to comment.