Skip to content

Change folder structure to better separate generated code. #14441

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
azabbasi merged 1 commit into from
Aug 25, 2020
Merged

Change folder structure to better separate generated code. #14441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions sdk/digitaltwins/azure-digitaltwins-core/autorest.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,9 @@ java:
namespace: com.azure.digitaltwins.core
add-credentials: true
sync-methods: none
generate-client-as-impl: true
implementation-subpackage: implementation
models-subpackage: implementation.models
custom-types-subpackage: models
custom-types: ModelData
```
6 changes: 4 additions & 2 deletions ...-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/DigitalTwinsAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import com.azure.core.http.rest.SimpleResponse;
import com.azure.core.util.FluxUtil;
import com.azure.core.util.logging.ClientLogger;
import com.azure.digitaltwins.core.implementation.AzureDigitalTwinsAPIImpl;
import com.azure.digitaltwins.core.implementation.AzureDigitalTwinsAPIImplBuilder;
import reactor.core.publisher.Mono;


Expand All @@ -31,10 +33,10 @@
public class DigitalTwinsAsyncClient {
private final ClientLogger logger = new ClientLogger(DigitalTwinsAsyncClient.class);
private final DigitalTwinsServiceVersion serviceVersion;
private final AzureDigitalTwinsAPI protocolLayer;
private final AzureDigitalTwinsAPIImpl protocolLayer;

DigitalTwinsAsyncClient(HttpPipeline pipeline, DigitalTwinsServiceVersion serviceVersion, String host) {
this.protocolLayer = new AzureDigitalTwinsAPIBuilder().host(host).pipeline(pipeline).buildClient();
this.protocolLayer = new AzureDigitalTwinsAPIImplBuilder().host(host).pipeline(pipeline).buildClient();
this.serviceVersion = serviceVersion;
}

Expand Down
78 changes: 0 additions & 78 deletions ...igitaltwins/azure-digitaltwins-core/src/main/java/com/azure/digitaltwins/core/Querys.java
View file
Open in desktop

This file was deleted.

58 changes: 29 additions & 29 deletions ...gitaltwins/core/AzureDigitalTwinsAPI.java → ...lementation/AzureDigitalTwinsAPIImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.
// Code generated by Microsoft (R) AutoRest Code Generator.

package com.azure.digitaltwins.core;
package com.azure.digitaltwins.core.implementation;

import com.azure.core.http.HttpPipeline;
import com.azure.core.http.HttpPipelineBuilder;
Expand All @@ -13,7 +13,7 @@
import com.azure.core.util.serializer.SerializerAdapter;

/** Initializes a new instance of the AzureDigitalTwinsAPI type. */
public final class AzureDigitalTwinsAPI {
public final class AzureDigitalTwinsAPIImpl {
/** server parameter. */
private final String host;

Expand Down Expand Up @@ -62,56 +62,56 @@ public SerializerAdapter getSerializerAdapter() {
return this.serializerAdapter;
}

/** The DigitalTwinModels object to access its operations. */
private final DigitalTwinModels digitalTwinModels;
/** The DigitalTwinModelsImpl object to access its operations. */
private final DigitalTwinModelsImpl digitalTwinModels;

/**
* Gets the DigitalTwinModels object to access its operations.
* Gets the DigitalTwinModelsImpl object to access its operations.
*
* @return the DigitalTwinModels object.
* @return the DigitalTwinModelsImpl object.
*/
public DigitalTwinModels getDigitalTwinModels() {
public DigitalTwinModelsImpl getDigitalTwinModels() {
return this.digitalTwinModels;
}

/** The Queries object to access its operations. */
private final Queries queries;
/** The QueriesImpl object to access its operations. */
private final QueriesImpl queries;

/**
* Gets the Queries object to access its operations.
* Gets the QueriesImpl object to access its operations.
*
* @return the Queries object.
* @return the QueriesImpl object.
*/
public Queries getQueries() {
public QueriesImpl getQueries() {
return this.queries;
}

/** The DigitalTwins object to access its operations. */
private final DigitalTwins digitalTwins;
/** The DigitalTwinsImpl object to access its operations. */
private final DigitalTwinsImpl digitalTwins;

/**
* Gets the DigitalTwins object to access its operations.
* Gets the DigitalTwinsImpl object to access its operations.
*
* @return the DigitalTwins object.
* @return the DigitalTwinsImpl object.
*/
public DigitalTwins getDigitalTwins() {
public DigitalTwinsImpl getDigitalTwins() {
return this.digitalTwins;
}

/** The EventRoutes object to access its operations. */
private final EventRoutes eventRoutes;
/** The EventRoutesImpl object to access its operations. */
private final EventRoutesImpl eventRoutes;

/**
* Gets the EventRoutes object to access its operations.
* Gets the EventRoutesImpl object to access its operations.
*
* @return the EventRoutes object.
* @return the EventRoutesImpl object.
*/
public EventRoutes getEventRoutes() {
public EventRoutesImpl getEventRoutes() {
return this.eventRoutes;
}

/** Initializes an instance of AzureDigitalTwinsAPI client. */
AzureDigitalTwinsAPI(String host) {
AzureDigitalTwinsAPIImpl(String host) {
this(
new HttpPipelineBuilder()
.policies(new UserAgentPolicy(), new RetryPolicy(), new CookiePolicy())
Expand All @@ -125,7 +125,7 @@ public EventRoutes getEventRoutes() {
*
* @param httpPipeline The HTTP pipeline to send requests through.
*/
AzureDigitalTwinsAPI(HttpPipeline httpPipeline, String host) {
AzureDigitalTwinsAPIImpl(HttpPipeline httpPipeline, String host) {
this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), host);
}

Expand All @@ -135,14 +135,14 @@ public EventRoutes getEventRoutes() {
* @param httpPipeline The HTTP pipeline to send requests through.
* @param serializerAdapter The serializer to serialize an object into a string.
*/
AzureDigitalTwinsAPI(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String host) {
AzureDigitalTwinsAPIImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String host) {
this.httpPipeline = httpPipeline;
this.serializerAdapter = serializerAdapter;
this.host = host;
this.apiVersion = "2020-05-31-preview";
this.digitalTwinModels = new DigitalTwinModels(this);
this.queries = new Queries(this);
this.digitalTwins = new DigitalTwins(this);
this.eventRoutes = new EventRoutes(this);
this.digitalTwinModels = new DigitalTwinModelsImpl(this);
this.queries = new QueriesImpl(this);
this.digitalTwins = new DigitalTwinsImpl(this);
this.eventRoutes = new EventRoutesImpl(this);
}
}
26 changes: 13 additions & 13 deletions ...ins/core/AzureDigitalTwinsAPIBuilder.java → ...tion/AzureDigitalTwinsAPIImplBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.
// Code generated by Microsoft (R) AutoRest Code Generator.

package com.azure.digitaltwins.core;
package com.azure.digitaltwins.core.implementation;

import com.azure.core.annotation.ServiceClientBuilder;
import com.azure.core.http.HttpPipeline;
Expand All @@ -14,8 +14,8 @@
import com.azure.core.util.serializer.SerializerAdapter;

/** A builder for creating a new instance of the AzureDigitalTwinsAPI type. */
@ServiceClientBuilder(serviceClients = {AzureDigitalTwinsAPI.class})
public final class AzureDigitalTwinsAPIBuilder {
@ServiceClientBuilder(serviceClients = {AzureDigitalTwinsAPIImpl.class})
public final class AzureDigitalTwinsAPIImplBuilder {
/*
* server parameter
*/
Expand All @@ -25,9 +25,9 @@ public final class AzureDigitalTwinsAPIBuilder {
* Sets server parameter.
*
* @param host the host value.
* @return the AzureDigitalTwinsAPIBuilder.
* @return the AzureDigitalTwinsAPIImplBuilder.
*/
public AzureDigitalTwinsAPIBuilder host(String host) {
public AzureDigitalTwinsAPIImplBuilder host(String host) {
this.host = host;
return this;
}
Expand All @@ -41,9 +41,9 @@ public AzureDigitalTwinsAPIBuilder host(String host) {
* Sets The HTTP pipeline to send requests through.
*
* @param pipeline the pipeline value.
* @return the AzureDigitalTwinsAPIBuilder.
* @return the AzureDigitalTwinsAPIImplBuilder.
*/
public AzureDigitalTwinsAPIBuilder pipeline(HttpPipeline pipeline) {
public AzureDigitalTwinsAPIImplBuilder pipeline(HttpPipeline pipeline) {
this.pipeline = pipeline;
return this;
}
Expand All @@ -57,19 +57,19 @@ public AzureDigitalTwinsAPIBuilder pipeline(HttpPipeline pipeline) {
* Sets The serializer to serialize an object into a string.
*
* @param serializerAdapter the serializerAdapter value.
* @return the AzureDigitalTwinsAPIBuilder.
* @return the AzureDigitalTwinsAPIImplBuilder.
*/
public AzureDigitalTwinsAPIBuilder serializerAdapter(SerializerAdapter serializerAdapter) {
public AzureDigitalTwinsAPIImplBuilder serializerAdapter(SerializerAdapter serializerAdapter) {
this.serializerAdapter = serializerAdapter;
return this;
}

/**
* Builds an instance of AzureDigitalTwinsAPI with the provided parameters.
* Builds an instance of AzureDigitalTwinsAPIImpl with the provided parameters.
*
* @return an instance of AzureDigitalTwinsAPI.
* @return an instance of AzureDigitalTwinsAPIImpl.
*/
public AzureDigitalTwinsAPI buildClient() {
public AzureDigitalTwinsAPIImpl buildClient() {
if (host == null) {
this.host = "https://digitaltwins-name.digitaltwins.azure.net";
}
Expand All @@ -82,7 +82,7 @@ public AzureDigitalTwinsAPI buildClient() {
if (serializerAdapter == null) {
this.serializerAdapter = JacksonAdapter.createDefaultSerializerAdapter();
}
AzureDigitalTwinsAPI client = new AzureDigitalTwinsAPI(pipeline, serializerAdapter, host);
AzureDigitalTwinsAPIImpl client = new AzureDigitalTwinsAPIImpl(pipeline, serializerAdapter, host);
return client;
}
}
16 changes: 8 additions & 8 deletions .../digitaltwins/core/DigitalTwinModels.java → ...implementation/DigitalTwinModelsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.
// Code generated by Microsoft (R) AutoRest Code Generator.

package com.azure.digitaltwins.core;
package com.azure.digitaltwins.core.implementation;

import com.azure.core.annotation.BodyParam;
import com.azure.core.annotation.Delete;
Expand All @@ -27,27 +27,27 @@
import com.azure.core.util.FluxUtil;
import com.azure.core.util.serializer.CollectionFormat;
import com.azure.core.util.serializer.JacksonAdapter;
import com.azure.digitaltwins.core.models.DigitalTwinModelsListOptions;
import com.azure.digitaltwins.core.models.ErrorResponseException;
import com.azure.digitaltwins.core.implementation.models.DigitalTwinModelsListOptions;
import com.azure.digitaltwins.core.implementation.models.ErrorResponseException;
import com.azure.digitaltwins.core.implementation.models.PagedModelDataCollection;
import com.azure.digitaltwins.core.models.ModelData;
import com.azure.digitaltwins.core.models.PagedModelDataCollection;
import java.util.List;
import reactor.core.publisher.Mono;

/** An instance of this class provides access to all the operations defined in DigitalTwinModels. */
public final class DigitalTwinModels {
public final class DigitalTwinModelsImpl {
/** The proxy service used to perform REST calls. */
private final DigitalTwinModelsService service;

/** The service client containing this operation class. */
private final AzureDigitalTwinsAPI client;
private final AzureDigitalTwinsAPIImpl client;

/**
* Initializes an instance of DigitalTwinModels.
* Initializes an instance of DigitalTwinModelsImpl.
*
* @param client the instance of the service client containing this operation class.
*/
DigitalTwinModels(AzureDigitalTwinsAPI client) {
DigitalTwinModelsImpl(AzureDigitalTwinsAPIImpl client) {
this.service =
RestProxy.create(
DigitalTwinModelsService.class, client.getHttpPipeline(), client.getSerializerAdapter());
Expand Down
Loading