Skip to content

Commit e1a53d3

Browse files
authored
Use HttpClientTests in annotation-processor (Azure#44914)
1 parent 19fec92 commit e1a53d3

File tree

9 files changed

+1604
-280
lines changed

9 files changed

+1604
-280
lines changed

eng/versioning/version_client.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,8 @@ io.clientcore:annotation-processor-test;1.0.0-beta.1;1.0.0-beta.1
496496
# In the pom, the version update tag after the version should name the unreleased package and the dependency version:
497497
# <!-- {x-version-update;unreleased_com.azure:azure-core;dependency} -->
498498

499-
unreleased_io.clientcore:annotation-processor;1.0.0-beta.2
499+
unreleased_io.clientcore:core;1.0.0-beta.9
500+
unreleased_io.clientcore:annotation-processor;1.0.0-beta.3
500501
unreleased_com.azure.v2:azure-core;2.0.0-beta.1
501502

502503
# Released Beta dependencies: Copy the entry from above, prepend "beta_", remove the current

sdk/clientcore/annotation-processor-test/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>io.clientcore</groupId>
5757
<artifactId>core</artifactId>
58-
<version>1.0.0-beta.8</version> <!-- {x-version-update;io.clientcore:core;dependency} -->
58+
<version>1.0.0-beta.9</version> <!-- {x-version-update;unreleased_io.clientcore:core;dependency} -->
5959
</dependency>
6060
<dependency>
6161
<groupId>io.clientcore</groupId>
@@ -67,7 +67,7 @@
6767
<dependency>
6868
<groupId>io.clientcore</groupId>
6969
<artifactId>core</artifactId>
70-
<version>1.0.0-beta.8</version> <!-- {x-version-update;io.clientcore:core;dependency} -->
70+
<version>1.0.0-beta.9</version> <!-- {x-version-update;unreleased_io.clientcore:core;dependency} -->
7171
<type>test-jar</type>
7272
<scope>test</scope>
7373
</dependency>
@@ -131,7 +131,7 @@
131131
<annotationProcessorPath>
132132
<groupId>io.clientcore</groupId>
133133
<artifactId>annotation-processor</artifactId>
134-
<version>1.0.0-beta.2</version> <!-- {x-version-update;unreleased_io.clientcore:annotation-processor;dependency} -->
134+
<version>1.0.0-beta.3</version> <!-- {x-version-update;unreleased_io.clientcore:annotation-processor;dependency} -->
135135
</annotationProcessorPath>
136136
</annotationProcessorPaths>
137137
<annotationProcessors>
@@ -152,7 +152,7 @@
152152
<dependency>
153153
<groupId>io.clientcore</groupId>
154154
<artifactId>annotation-processor</artifactId>
155-
<version>1.0.0-beta.2</version> <!-- {x-version-update;unreleased_io.clientcore:annotation-processor;dependency} -->
155+
<version>1.0.0-beta.3</version> <!-- {x-version-update;unreleased_io.clientcore:annotation-processor;dependency} -->
156156
</dependency>
157157
</dependencies>
158158
</plugin>

sdk/clientcore/annotation-processor-test/src/main/java/io/clientcore/annotation/processor/test/implementation/TestInterfaceClientImpl.java

Lines changed: 217 additions & 20 deletions
Large diffs are not rendered by default.

sdk/clientcore/annotation-processor-test/src/main/java/io/clientcore/annotation/processor/test/implementation/models/HttpBinJSON.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,4 +176,8 @@ public static HttpBinJSON fromJson(JsonReader jsonReader) throws IOException {
176176
public String getHeaderValue(String name) {
177177
return headers == null ? null : headers.containsKey(name) ? headers.get(name).get(0) : null;
178178
}
179+
180+
public List<String> getHeaderValues(String name) {
181+
return headers == null ? null : headers.containsKey(name) ? headers.get(name) : null;
182+
}
179183
}

sdk/clientcore/annotation-processor-test/src/test/java/io/clientcore/annotation/processor/test/TestInterfaceServiceClientGenerationTests.java

Lines changed: 1363 additions & 249 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The quick brown fox jumps over the lazy dog

sdk/clientcore/annotation-processor/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
<dependency>
114114
<groupId>io.clientcore</groupId>
115115
<artifactId>core</artifactId>
116-
<version>1.0.0-beta.8</version> <!-- {x-version-update;io.clientcore:core;dependency} -->
116+
<version>1.0.0-beta.9</version> <!-- {x-version-update;unreleased_io.clientcore:core;dependency} -->
117117
</dependency>
118118

119119
<!-- Unit Test -->

sdk/clientcore/annotation-processor/src/main/java/io/clientcore/annotation/processor/templating/JavaParserTemplateProcessor.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import java.util.Map;
4747
import java.util.stream.Collectors;
4848
import javax.annotation.processing.ProcessingEnvironment;
49+
import javax.lang.model.type.TypeKind;
4950
import javax.lang.model.type.TypeMirror;
5051

5152
import static io.clientcore.annotation.processor.utils.ResponseHandler.generateResponseHandling;
@@ -244,10 +245,16 @@ private void configureInternalMethod(MethodDeclaration internalMethod, HttpReque
244245
new NodeList<>(new StringLiteralExpr("unchecked"), new StringLiteralExpr("cast")))))
245246
.addMarkerAnnotation(Override.class)
246247
.setType(TypeConverter.getAstType(method.getMethodReturnType()));
247-
method.getParameters()
248-
.forEach(param -> internalMethod
249-
.addParameter(new Parameter(StaticJavaParser.parseType(param.getShortTypeName()), param.getName())));
250248

249+
method.getParameters().forEach(param -> {
250+
if (param.getTypeMirror().getKind() == TypeKind.DECLARED) {
251+
internalMethod
252+
.addParameter(new Parameter(StaticJavaParser.parseType(param.getShortTypeName()), param.getName()));
253+
} else {
254+
internalMethod.addParameter(
255+
new Parameter(StaticJavaParser.parseType(param.getTypeMirror().toString()), param.getName()));
256+
}
257+
});
251258
BlockStmt body = internalMethod.getBody().get();
252259

253260
initializeHttpRequest(body, method);

sdk/clientcore/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<module>core</module>
1414
<module>http-okhttp3</module>
1515
<module>http-netty4</module>
16-
<module>optional-dependency-tests</module>
17-
<module>http-stress</module>
1816
<module>annotation-processor</module>
1917
<module>annotation-processor-test</module>
18+
<module>optional-dependency-tests</module>
19+
<module>http-stress</module>
2020
</modules>
2121
</project>

0 commit comments

Comments
 (0)