Skip to content

Commit a7b9c46

Browse files
alzimmermsftalzimmermsft
authored
Move and pluralize package names (Azure#44161)
Move and pluralize package names
1 parent 02c9b0f commit a7b9c46

File tree

343 files changed

+1199
-868
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

343 files changed

+1199
-868
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<dependency>
4949
<groupId>io.clientcore</groupId>
5050
<artifactId>core</artifactId>
51-
<version>1.0.0-beta.3</version> <!-- {x-version-update;io.clientcore:core;dependency} -->
51+
<version>1.0.0-beta.4</version> <!-- {x-version-update;unreleased_io.clientcore:core;dependency} -->
5252
</dependency>
5353

5454
<!-- Test dependencies -->

‎sdk/clientcore/annotation-processor-test/src/main/java/io/clientcore/annotation/processor/test/MockHttpResponse.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import io.clientcore.core.http.models.HttpHeaders;
77
import io.clientcore.core.http.models.HttpRequest;
88
import io.clientcore.core.http.models.HttpResponse;
9-
import io.clientcore.core.implementation.util.JsonSerializer;
10-
import io.clientcore.core.util.binarydata.BinaryData;
11-
import io.clientcore.core.util.serializer.ObjectSerializer;
9+
import io.clientcore.core.implementation.utils.JsonSerializer;
10+
import io.clientcore.core.utils.binarydata.BinaryData;
11+
import io.clientcore.core.utils.serializers.ObjectSerializer;
1212

1313
/**
1414
* A mock implementation of {@link HttpResponse} that can be used for testing.

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33

44
package io.clientcore.annotation.processor.test.implementation;
55

6-
import io.clientcore.core.annotation.ServiceInterface;
7-
import io.clientcore.core.http.annotation.BodyParam;
8-
import io.clientcore.core.http.annotation.HeaderParam;
9-
import io.clientcore.core.http.annotation.HttpRequestInformation;
10-
import io.clientcore.core.http.annotation.PathParam;
11-
import io.clientcore.core.http.annotation.QueryParam;
12-
import io.clientcore.core.http.annotation.UnexpectedResponseExceptionDetail;
6+
import io.clientcore.core.annotations.ServiceInterface;
7+
import io.clientcore.core.http.annotations.BodyParam;
8+
import io.clientcore.core.http.annotations.HeaderParam;
9+
import io.clientcore.core.http.annotations.HttpRequestInformation;
10+
import io.clientcore.core.http.annotations.PathParam;
11+
import io.clientcore.core.http.annotations.QueryParam;
12+
import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail;
1313
import io.clientcore.core.http.models.HttpMethod;
1414
import io.clientcore.core.http.models.Response;
1515
import io.clientcore.core.http.pipeline.HttpPipeline;
16-
import io.clientcore.core.util.binarydata.BinaryData;
17-
import io.clientcore.core.util.serializer.ObjectSerializer;
16+
import io.clientcore.core.utils.binarydata.BinaryData;
17+
import io.clientcore.core.utils.serializers.ObjectSerializer;
1818

1919
import java.io.InputStream;
2020
import java.lang.reflect.InvocationTargetException;

‎sdk/clientcore/annotation-processor-test/src/test/java/io/clientcore/annotation/processor/test/RestProxyTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import io.clientcore.core.http.models.Response;
1111
import io.clientcore.core.http.pipeline.HttpPipeline;
1212
import io.clientcore.core.http.pipeline.HttpPipelineBuilder;
13-
import io.clientcore.core.implementation.util.JsonSerializer;
14-
import io.clientcore.core.util.binarydata.BinaryData;
13+
import io.clientcore.core.implementation.utils.JsonSerializer;
14+
import io.clientcore.core.utils.binarydata.BinaryData;
1515
import org.junit.jupiter.api.Named;
1616
import org.junit.jupiter.api.Test;
1717
import org.junit.jupiter.params.ParameterizedTest;

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
<dependency>
111111
<groupId>io.clientcore</groupId>
112112
<artifactId>core</artifactId>
113-
<version>1.0.0-beta.3</version> <!-- {x-version-update;io.clientcore:core;dependency} -->
113+
<version>1.0.0-beta.4</version> <!-- {x-version-update;unreleased_io.clientcore:core;dependency} -->
114114
</dependency>
115115

116116
<!-- Unit Test -->
@@ -126,12 +126,6 @@
126126
<version>5.11.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
127127
<scope>test</scope>
128128
</dependency>
129-
<dependency>
130-
<groupId>org.mockito</groupId>
131-
<artifactId>mockito-core</artifactId>
132-
<version>4.11.0</version> <!-- {x-version-update;org.mockito:mockito-core;external_dependency} -->
133-
<scope>test</scope>
134-
</dependency>
135129
</dependencies>
136130

137131
<build>

‎sdk/clientcore/annotation-processor/spotbugs-exclude.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,8 @@
3030
<Class name="io.clientcore.annotation.processor.templating.JavaParserTemplateProcessor" />
3131
</Or>
3232
</Match>
33+
<Match>
34+
<Bug pattern="BC_UNCONFIRMED_CAST" />
35+
<Class name="io.clientcore.annotation.processor.models.TemplateInput" />
36+
</Match>
3337
</FindBugsFilter>

‎sdk/clientcore/annotation-processor/src/main/java/io/clientcore/annotation/processor/AnnotationProcessor.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88
import io.clientcore.annotation.processor.models.TemplateInput;
99
import io.clientcore.annotation.processor.templating.TemplateProcessor;
1010
import io.clientcore.annotation.processor.utils.PathBuilder;
11-
import io.clientcore.core.annotation.ServiceInterface;
12-
import io.clientcore.core.http.annotation.BodyParam;
13-
import io.clientcore.core.http.annotation.HeaderParam;
14-
import io.clientcore.core.http.annotation.HostParam;
15-
import io.clientcore.core.http.annotation.HttpRequestInformation;
16-
import io.clientcore.core.http.annotation.PathParam;
17-
import io.clientcore.core.http.annotation.QueryParam;
18-
import io.clientcore.core.http.annotation.UnexpectedResponseExceptionDetail;
11+
import io.clientcore.core.annotations.ServiceInterface;
12+
import io.clientcore.core.http.annotations.BodyParam;
13+
import io.clientcore.core.http.annotations.HeaderParam;
14+
import io.clientcore.core.http.annotations.HostParam;
15+
import io.clientcore.core.http.annotations.HttpRequestInformation;
16+
import io.clientcore.core.http.annotations.PathParam;
17+
import io.clientcore.core.http.annotations.QueryParam;
18+
import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail;
1919
import io.clientcore.core.http.models.HttpHeaderName;
2020
import io.clientcore.core.http.models.HttpHeaders;
2121
import io.clientcore.core.http.models.HttpMethod;
2222
import io.clientcore.core.http.models.HttpRequest;
2323
import io.clientcore.core.http.models.HttpResponse;
2424
import io.clientcore.core.http.models.Response;
2525
import io.clientcore.core.http.pipeline.HttpPipeline;
26-
import io.clientcore.core.util.Context;
27-
import io.clientcore.core.util.binarydata.BinaryData;
26+
import io.clientcore.core.utils.Context;
27+
import io.clientcore.core.utils.binarydata.BinaryData;
2828

2929
import javax.annotation.processing.AbstractProcessor;
3030
import javax.annotation.processing.RoundEnvironment;
@@ -50,7 +50,7 @@
5050
/**
5151
* Annotation processor that generates client code based on annotated interfaces.
5252
*/
53-
@SupportedAnnotationTypes("io.clientcore.core.annotation.*")
53+
@SupportedAnnotationTypes("io.clientcore.core.annotations.*")
5454
@SupportedSourceVersion(SourceVersion.RELEASE_8)
5555
public class AnnotationProcessor extends AbstractProcessor {
5656

‎sdk/clientcore/annotation-processor/src/main/java/io/clientcore/annotation/processor/models/TemplateInput.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
package io.clientcore.annotation.processor.models;
55

6-
import io.clientcore.core.http.annotation.UnexpectedResponseExceptionDetail;
6+
import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail;
77
import javax.lang.model.element.TypeElement;
88
import javax.lang.model.type.DeclaredType;
99
import javax.lang.model.type.TypeKind;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
import io.clientcore.core.http.models.HttpRequest;
2929
import io.clientcore.core.http.models.Response;
3030
import io.clientcore.core.http.pipeline.HttpPipeline;
31-
import io.clientcore.core.implementation.util.JsonSerializer;
31+
import io.clientcore.core.implementation.utils.JsonSerializer;
3232
import io.clientcore.core.instrumentation.logging.ClientLogger;
33-
import io.clientcore.core.util.binarydata.BinaryData;
34-
import io.clientcore.core.util.serializer.ObjectSerializer;
33+
import io.clientcore.core.utils.binarydata.BinaryData;
34+
import io.clientcore.core.utils.serializers.ObjectSerializer;
3535

3636
import javax.annotation.processing.ProcessingEnvironment;
3737
import java.io.IOException;
@@ -398,7 +398,7 @@ public void configureRequestWithBodyAndContentType(BlockStmt body, String parame
398398
if (!isContentTypeSetInHeaders) {
399399
setContentTypeHeader(body, contentType);
400400
}
401-
if ("io.clientcore.core.util.binarydata.BinaryData".equals(parameterType)) {
401+
if ("io.clientcore.core.utils.binarydata.BinaryData".equals(parameterType)) {
402402
body.tryAddImportToParentCompilationUnit(BinaryData.class);
403403
body.addStatement(
404404
StaticJavaParser.parseStatement("BinaryData binaryData = (BinaryData) " + parameterName + ";"));

‎sdk/clientcore/annotation-processor/src/main/java/io/clientcore/annotation/processor/utils/ResponseBodyModeGeneration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.clientcore.core.http.models.HttpResponse;
1111
import io.clientcore.core.http.models.ResponseBodyMode;
1212
import io.clientcore.core.implementation.http.HttpResponseAccessHelper;
13-
import io.clientcore.core.util.binarydata.BinaryData;
13+
import io.clientcore.core.utils.binarydata.BinaryData;
1414

1515
import java.io.IOException;
1616
import java.io.InputStream;

0 commit comments

Comments
 (0)