Skip to content

Commit 110aa8f

Browse files
alzimmermsftalzimmermsft
authored
Fix references to generic-core (#2871)
1 parent e66eb91 commit 110aa8f

File tree

11 files changed

+82
-89
lines changed

11 files changed

+82
-89
lines changed

‎javagen/src/main/java/com/azure/autorest/mapper/PomMapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ private Pom createGenericPom(Project project) {
9393
List<String> dependencyIdentifiers = new ArrayList<>();
9494
// for generic pom, stream style is always true
9595
addDependencyIdentifier(dependencyIdentifiers, addedDependencyPrefixes,
96-
Project.Dependency.GENERIC_CORE, false);
96+
Project.Dependency.CLIENTCORE, false);
9797
addDependencyIdentifier(dependencyIdentifiers, addedDependencyPrefixes,
98-
Project.Dependency.GENERIC_JSON, false);
98+
Project.Dependency.CLIENTCORE_JSON, false);
9999

100100
// merge dependencies in POM and dependencies added above
101101
dependencyIdentifiers.addAll(project.getPomDependencyIdentifiers().stream()

‎javagen/src/main/java/com/azure/autorest/model/clientmodel/Annotation.java

Lines changed: 41 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -8,74 +8,60 @@
88
import java.util.Set;
99

1010
public class Annotation {
11+
private static final String CLIENTCORE_PACKAGE = "io.clientcore.core.http.annotation";
1112

12-
public static final Annotation GENERATED = new Annotation.Builder()
13-
.knownClass(com.azure.core.annotation.Generated.class)
14-
.build();
13+
public static final Annotation GENERATED = new Annotation.Builder().knownClass(
14+
com.azure.core.annotation.Generated.class).build();
1515

16-
public static final Annotation HOST = new Annotation.Builder()
17-
.knownClass(com.azure.core.annotation.Host.class)
18-
.build();
16+
public static final Annotation HOST = new Annotation.Builder().knownClass(com.azure.core.annotation.Host.class)
17+
.build();
1918

20-
public static final Annotation SERVICE_INTERFACE = new Annotation.Builder()
21-
.knownClass(com.azure.core.annotation.ServiceInterface.class)
22-
.build();
19+
public static final Annotation SERVICE_INTERFACE = new Annotation.Builder().knownClass(
20+
com.azure.core.annotation.ServiceInterface.class).build();
2321

24-
public static final Annotation SERVICE_CLIENT = new Annotation.Builder()
25-
.knownClass(com.azure.core.annotation.ServiceClient.class)
26-
.build();
22+
public static final Annotation SERVICE_CLIENT = new Annotation.Builder().knownClass(
23+
com.azure.core.annotation.ServiceClient.class).build();
2724

28-
public static final Annotation SERVICE_METHOD = new Annotation.Builder()
29-
.knownClass(com.azure.core.annotation.ServiceMethod.class)
30-
.build();
25+
public static final Annotation SERVICE_METHOD = new Annotation.Builder().knownClass(
26+
com.azure.core.annotation.ServiceMethod.class).build();
3127

32-
public static final Annotation SERVICE_CLIENT_BUILDER = new Annotation.Builder()
33-
.knownClass(com.azure.core.annotation.ServiceClientBuilder.class)
34-
.build();
28+
public static final Annotation SERVICE_CLIENT_BUILDER = new Annotation.Builder().knownClass(
29+
com.azure.core.annotation.ServiceClientBuilder.class).build();
3530

36-
public static final Annotation UNEXPECTED_RESPONSE_EXCEPTION_TYPE = new Annotation.Builder()
37-
.knownClass(com.azure.core.annotation.UnexpectedResponseExceptionType.class)
38-
.build();
31+
public static final Annotation UNEXPECTED_RESPONSE_EXCEPTION_TYPE = new Annotation.Builder().knownClass(
32+
com.azure.core.annotation.UnexpectedResponseExceptionType.class).build();
3933

40-
public static final Annotation EXPECTED_RESPONSE = new Annotation.Builder()
41-
.knownClass(com.azure.core.annotation.ExpectedResponses.class)
42-
.build();
34+
public static final Annotation EXPECTED_RESPONSE = new Annotation.Builder().knownClass(
35+
com.azure.core.annotation.ExpectedResponses.class).build();
4336

44-
public static final Annotation HEADERS = new Annotation.Builder()
45-
.knownClass(com.azure.core.annotation.Headers.class)
46-
.build();
37+
public static final Annotation HEADERS = new Annotation.Builder().knownClass(
38+
com.azure.core.annotation.Headers.class).build();
4739

48-
public static final Annotation FORM_PARAM = new Annotation.Builder()
49-
.knownClass(com.azure.core.annotation.FormParam.class)
50-
.build();
40+
public static final Annotation FORM_PARAM = new Annotation.Builder().knownClass(
41+
com.azure.core.annotation.FormParam.class).build();
5142

52-
public static final Annotation RETURN_VALUE_WIRE_TYPE = new Annotation.Builder()
53-
.knownClass(com.azure.core.annotation.ReturnValueWireType.class)
54-
.build();
43+
public static final Annotation RETURN_VALUE_WIRE_TYPE = new Annotation.Builder().knownClass(
44+
com.azure.core.annotation.ReturnValueWireType.class).build();
5545

56-
public static final Annotation RETURN_TYPE = new Annotation.Builder()
57-
.knownClass(com.azure.core.annotation.ReturnType.class)
58-
.build();
46+
public static final Annotation RETURN_TYPE = new Annotation.Builder().knownClass(
47+
com.azure.core.annotation.ReturnType.class).build();
5948

60-
public static final Annotation IMMUTABLE = new Annotation.Builder()
61-
.knownClass(com.azure.core.annotation.Immutable.class)
62-
.build();
49+
public static final Annotation IMMUTABLE = new Annotation.Builder().knownClass(
50+
com.azure.core.annotation.Immutable.class).build();
6351

64-
public static final Annotation FLUENT = new Annotation.Builder()
65-
.knownClass(com.azure.core.annotation.Fluent.class)
66-
.build();
52+
public static final Annotation FLUENT = new Annotation.Builder().knownClass(com.azure.core.annotation.Fluent.class)
53+
.build();
6754

68-
public static final Annotation HEADER_COLLECTION = new Annotation.Builder()
69-
.knownClass(com.azure.core.annotation.HeaderCollection.class)
70-
.build();
55+
public static final Annotation HEADER_COLLECTION = new Annotation.Builder().knownClass(
56+
com.azure.core.annotation.HeaderCollection.class).build();
7157

7258
public static final Annotation METADATA = new Annotation("io.clientcore.core.annotation", "Metadata");
7359

74-
public static final Annotation HTTP_REQUEST_INFORMATION
75-
= new Annotation("com.generic.core.http.annotation", "HttpRequestInformation");
76-
public static final Annotation UNEXPECTED_RESPONSE_EXCEPTION_INFORMATION
77-
= new Annotation("com.generic.core.http.annotation", "UnexpectedResponseExceptionDetail");
78-
public static final Annotation TYPE_CONDITIONS = new Annotation("com.generic.core.annotation", "TypeConditions");
60+
public static final Annotation HTTP_REQUEST_INFORMATION = new Annotation(CLIENTCORE_PACKAGE,
61+
"HttpRequestInformation");
62+
public static final Annotation UNEXPECTED_RESPONSE_EXCEPTION_INFORMATION = new Annotation(CLIENTCORE_PACKAGE,
63+
"UnexpectedResponseExceptionDetail");
64+
public static final Annotation TYPE_CONDITIONS = new Annotation(CLIENTCORE_PACKAGE, "TypeConditions");
7965

8066
private final String fullName;
8167
private final String packageName;
@@ -115,13 +101,13 @@ public Builder name(String name) {
115101
}
116102

117103
public Builder knownClass(Class<?> clazz) {
118-
this.packageName(clazz.getPackage().getName())
119-
.name(clazz.getSimpleName());
104+
this.packageName(clazz.getPackage().getName()).name(clazz.getSimpleName());
120105

121106
if (!JavaSettings.getInstance().isBranded()) {
122-
this.packageName(clazz.getPackage().getName()
123-
.replace(ExternalPackage.AZURE_CORE_PACKAGE_NAME, ExternalPackage.GENERIC_CORE_PACKAGE_NAME)
124-
.replace(ExternalPackage.AZURE_JSON_PACKAGE_NAME, ExternalPackage.GENERIC_JSON_PACKAGE_NAME));
107+
this.packageName(clazz.getPackage()
108+
.getName()
109+
.replace(ExternalPackage.AZURE_CORE_PACKAGE_NAME, ExternalPackage.CLIENTCORE_PACKAGE_NAME)
110+
.replace(ExternalPackage.AZURE_JSON_PACKAGE_NAME, ExternalPackage.CLIENTCORE_JSON_PACKAGE_NAME));
125111
}
126112

127113
return this;

‎javagen/src/main/java/com/azure/autorest/model/clientmodel/ClassType.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ private static ClassType.Builder getClassTypeBuilder(Class<?> classKey) {
140140
return new ClassType.Builder(false).knownClass(CLASS_TYPE_MAPPING.get(classKey).getGenericClass());
141141
} else {
142142
return new Builder(false).packageName(classKey.getPackage().getName()
143-
.replace(ExternalPackage.AZURE_CORE_PACKAGE_NAME, ExternalPackage.GENERIC_CORE_PACKAGE_NAME)
144-
.replace(ExternalPackage.AZURE_JSON_PACKAGE_NAME, ExternalPackage.GENERIC_JSON_PACKAGE_NAME))
143+
.replace(ExternalPackage.AZURE_CORE_PACKAGE_NAME, ExternalPackage.CLIENTCORE_PACKAGE_NAME)
144+
.replace(ExternalPackage.AZURE_JSON_PACKAGE_NAME, ExternalPackage.CLIENTCORE_JSON_PACKAGE_NAME))
145145
.name(classKey.getSimpleName());
146146
}
147147
} else {

‎javagen/src/main/java/com/azure/autorest/model/clientmodel/ClientModel.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ public class ClientModel {
152152
* @param implementationDetails The implementation details for the model.
153153
* @param usedInXml Whether the model is used in XML serialization.
154154
* @param crossLanguageDefinitionId The cross language definition id for the model.
155-
*
156155
*/
157156
protected ClientModel(String packageKeyword, String name, List<String> imports, String description,
158157
boolean isPolymorphic, ClientModelProperty polymorphicDiscriminator, String polymorphicDiscriminatorName,
@@ -476,8 +475,8 @@ protected void addJsonFlattenAnnotationImport(Set<String> imports) {
476475
*/
477476
protected void addImmutableAnnotationImport(Set<String> imports) {
478477
Annotation.IMMUTABLE.addImportsTo(imports);
479-
Annotation.TYPE_CONDITIONS.addImportsTo(imports);
480478
if (!JavaSettings.getInstance().isBranded()) {
479+
Annotation.TYPE_CONDITIONS.addImportsTo(imports);
481480
Annotation.METADATA.addImportsTo(imports);
482481
}
483482
}
@@ -489,7 +488,7 @@ protected void addImmutableAnnotationImport(Set<String> imports) {
489488
*/
490489
protected void addFluentAnnotationImport(Set<String> imports) {
491490
Annotation.FLUENT.addImportsTo(imports);
492-
if(!JavaSettings.getInstance().isBranded()) {
491+
if (!JavaSettings.getInstance().isBranded()) {
493492
Annotation.METADATA.addImportsTo(imports);
494493
}
495494
}

‎javagen/src/main/java/com/azure/autorest/model/clientmodel/ExternalPackage.java

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,21 @@
77

88
public class ExternalPackage {
99

10-
public static final String GENERIC_CORE_PACKAGE_NAME = "io.clientcore.core";
11-
public static final String GENERIC_JSON_PACKAGE_NAME = "io.clientcore.core.json";
10+
public static final String CLIENTCORE_PACKAGE_NAME = "io.clientcore.core";
11+
public static final String CLIENTCORE_JSON_PACKAGE_NAME = "io.clientcore.core.json";
1212

1313
public static final String AZURE_CORE_PACKAGE_NAME = "com.azure.core";
1414
public static final String AZURE_JSON_PACKAGE_NAME = "com.azure.json";
1515

16+
public static final ExternalPackage CORE = new Builder().packageName(CLIENTCORE_PACKAGE_NAME)
17+
.groupId("io.clientcore")
18+
.artifactId("core")
19+
.build();
1620

17-
public static final ExternalPackage CORE = new Builder()
18-
.packageName(GENERIC_CORE_PACKAGE_NAME)
19-
.groupId("io.clientcore")
20-
.artifactId("core")
21-
.build();
22-
23-
public static final ExternalPackage JSON = new Builder()
24-
.packageName(GENERIC_JSON_PACKAGE_NAME)
25-
.groupId("io.clientcore")
26-
.artifactId("core-json")
27-
.build();
21+
public static final ExternalPackage JSON = new Builder().packageName(CLIENTCORE_JSON_PACKAGE_NAME)
22+
.groupId("io.clientcore")
23+
.artifactId("core-json")
24+
.build();
2825

2926
private final String packageName;
3027
private final String groupId;
@@ -74,13 +71,13 @@ public Builder artifactId(String artifactId) {
7471
public ExternalPackage build() {
7572
if (JavaSettings.getInstance().isBranded()) {
7673
switch (packageName) {
77-
case GENERIC_CORE_PACKAGE_NAME:
74+
case CLIENTCORE_PACKAGE_NAME:
7875
packageName = AZURE_CORE_PACKAGE_NAME;
7976
groupId = "com.azure";
8077
artifactId = "azure-core";
8178
break;
8279

83-
case GENERIC_JSON_PACKAGE_NAME:
80+
case CLIENTCORE_JSON_PACKAGE_NAME:
8481
packageName = AZURE_JSON_PACKAGE_NAME;
8582
groupId = "com.azure";
8683
artifactId = "azure-json";

‎javagen/src/main/java/com/azure/autorest/model/clientmodel/GenericType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public GenericType(String packageKeyword, String name, String jsonToken, IType..
4545
packageKeyword = "io.clientcore.core.http";
4646
} else {
4747
packageKeyword = packageKeyword
48-
.replace(ExternalPackage.AZURE_CORE_PACKAGE_NAME, ExternalPackage.GENERIC_CORE_PACKAGE_NAME);
48+
.replace(ExternalPackage.AZURE_CORE_PACKAGE_NAME, ExternalPackage.CLIENTCORE_PACKAGE_NAME);
4949
}
5050
}
5151

‎javagen/src/main/java/com/azure/autorest/model/projectmodel/Project.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ public enum Dependency {
6666
AZURE_IDENTITY("com.azure", "azure-identity", "1.12.2"),
6767
AZURE_CORE_EXPERIMENTAL("com.azure", "azure-core-experimental", "1.0.0-beta.51"),
6868

69-
GENERIC_CORE("io.clientcore", "core", "1.0.0-beta.1"),
70-
GENERIC_JSON("io.clientcore", "core-json", "1.0.0-beta.1"),
69+
CLIENTCORE("io.clientcore", "core", "1.0.0-beta.1"),
70+
CLIENTCORE_JSON("io.clientcore", "core-json", "1.0.0-beta.1"),
7171

7272
// external
7373
JUNIT_JUPITER_API("org.junit.jupiter", "junit-jupiter-api", "5.9.3"),

‎javagen/src/main/java/com/azure/autorest/template/EnumTemplate.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,14 +298,16 @@ protected String createEnumJsonCreatorIfCheck(EnumType enumType) {
298298

299299
protected void addGeneratedImport(Set<String> imports) {
300300
if (JavaSettings.getInstance().isDataPlaneClient()) {
301-
Annotation.GENERATED.addImportsTo(imports);
302-
Annotation.METADATA.addImportsTo(imports);
301+
if (JavaSettings.getInstance().isBranded()) {
302+
Annotation.GENERATED.addImportsTo(imports);
303+
} else {
304+
Annotation.METADATA.addImportsTo(imports);
305+
}
303306
}
304307
}
305308

306309
protected void addGeneratedAnnotation(JavaContext classBlock) {
307310
if (JavaSettings.getInstance().isDataPlaneClient()) {
308-
309311
if (JavaSettings.getInstance().isBranded()) {
310312
classBlock.annotation(Annotation.GENERATED.getName());
311313
} else {

‎javagen/src/main/java/com/azure/autorest/template/ModelTemplate.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,8 +1248,11 @@ protected void writeStreamStyleSerialization(JavaClass classBlock, ClientModel m
12481248

12491249
protected void addGeneratedImport(Set<String> imports) {
12501250
if (JavaSettings.getInstance().isDataPlaneClient()) {
1251-
Annotation.GENERATED.addImportsTo(imports);
1252-
Annotation.METADATA.addImportsTo(imports);
1251+
if (JavaSettings.getInstance().isBranded()) {
1252+
Annotation.GENERATED.addImportsTo(imports);
1253+
} else {
1254+
Annotation.METADATA.addImportsTo(imports);
1255+
}
12531256
}
12541257
}
12551258

‎javagen/src/main/java/com/azure/autorest/template/ServiceClientBuilderTemplate.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,11 @@ protected String primaryBuildMethodName(JavaSettings settings) {
581581
}
582582

583583
protected void addGeneratedImport(Set<String> imports) {
584-
Annotation.GENERATED.addImportsTo(imports);
585-
Annotation.METADATA.addImportsTo(imports);
584+
if (JavaSettings.getInstance().isBranded()) {
585+
Annotation.GENERATED.addImportsTo(imports);
586+
} else {
587+
Annotation.METADATA.addImportsTo(imports);
588+
}
586589
}
587590

588591
protected void addGeneratedAnnotation(JavaContext classBlock) {

‎javagen/src/main/java/com/azure/autorest/template/ServiceSyncClientTemplate.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,11 @@ protected void writeMethod(ClientMethod clientMethod, JavaClass classBlock) {
170170

171171
protected void addServiceClientAnnotationImport(Set<String> imports) {
172172
Annotation.SERVICE_CLIENT.addImportsTo(imports);
173-
Annotation.GENERATED.addImportsTo(imports);
174-
Annotation.METADATA.addImportsTo(imports);
173+
if (JavaSettings.getInstance().isBranded()) {
174+
Annotation.GENERATED.addImportsTo(imports);
175+
} else {
176+
Annotation.METADATA.addImportsTo(imports);
177+
}
175178
}
176179

177180
protected void addGeneratedAnnotation(JavaContext classBlock) {

0 commit comments

Comments
 (0)