Skip to content
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.

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

[AutoPR azure-resourcemanager-datafactory] [ADF] Java Mgmt, discriminator property must be required #9869

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Release History

## 1.0.0-beta.3 (Unreleased)
## 1.0.0-beta.1 (2021-07-28)

- Azure Resource Manager DataFactory client library for Java. This package contains Microsoft Azure SDK for DataFactory Management SDK. The Azure Data Factory V2 management API provides a RESTful set of web services that interact with Azure Data Factory V2 services. Package tag package-2018-06. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).

## 1.0.0-beta.2 (2021-06-16)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Various documentation is available to help you get started
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-datafactory</artifactId>
<version>1.0.0-beta.2</version>
<version>1.0.0-beta.3</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ public DataFactoryManager authenticate(TokenCredential credential, AzureProfile
.append("-")
.append("com.azure.resourcemanager.datafactory")
.append("/")
.append("1.0.0-beta.2");
.append("1.0.0-beta.1");
if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
userAgentBuilder
.append(" (")
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@ public class AvroDataset extends Dataset {
private DatasetLocation location;

/*
* The avroCompressionCodec property.
* The data avroCompressionCodec. Type: string (or Expression with
* resultType string).
*/
@JsonProperty(value = "typeProperties.avroCompressionCodec")
private AvroCompressionCodec avroCompressionCodec;
private Object avroCompressionCodec;

/*
* The avroCompressionLevel property.
Expand Down Expand Up @@ -61,21 +62,23 @@ public AvroDataset withLocation(DatasetLocation location) {
}

/**
* Get the avroCompressionCodec property: The avroCompressionCodec property.
* Get the avroCompressionCodec property: The data avroCompressionCodec. Type: string (or Expression with resultType
* string).
*
* @return the avroCompressionCodec value.
*/
public AvroCompressionCodec avroCompressionCodec() {
public Object avroCompressionCodec() {
return this.avroCompressionCodec;
}

/**
* Set the avroCompressionCodec property: The avroCompressionCodec property.
* Set the avroCompressionCodec property: The data avroCompressionCodec. Type: string (or Expression with resultType
* string).
*
* @param avroCompressionCodec the avroCompressionCodec value to set.
* @return the AvroDataset object itself.
*/
public AvroDataset withAvroCompressionCodec(AvroCompressionCodec avroCompressionCodec) {
public AvroDataset withAvroCompressionCodec(Object avroCompressionCodec) {
this.avroCompressionCodec = avroCompressionCodec;
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

package com.azure.resourcemanager.datafactory.models;

import com.azure.core.annotation.Immutable;
import com.azure.core.annotation.Fluent;
import com.azure.core.util.logging.ClientLogger;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
Expand All @@ -13,7 +13,7 @@
/** The data stored in Avro format. */
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
@JsonTypeName("AvroFormat")
@Immutable
@Fluent
public final class AvroFormat extends DatasetStorageFormat {
@JsonIgnore private final ClientLogger logger = new ClientLogger(AvroFormat.class);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@ public class AzureBatchLinkedService extends LinkedService {
@JsonProperty(value = "typeProperties.encryptedCredential")
private Object encryptedCredential;

/*
* The credential reference containing authentication information.
*/
@JsonProperty(value = "typeProperties.credential")
private CredentialReference credential;

/**
* Get the accountName property: The Azure Batch account name. Type: string (or Expression with resultType string).
*
Expand Down Expand Up @@ -185,6 +191,26 @@ public AzureBatchLinkedService withEncryptedCredential(Object encryptedCredentia
return this;
}

/**
* Get the credential property: The credential reference containing authentication information.
*
* @return the credential value.
*/
public CredentialReference credential() {
return this.credential;
}

/**
* Set the credential property: The credential reference containing authentication information.
*
* @param credential the credential value to set.
* @return the AzureBatchLinkedService object itself.
*/
public AzureBatchLinkedService withCredential(CredentialReference credential) {
this.credential = credential;
return this;
}

/** {@inheritDoc} */
@Override
public AzureBatchLinkedService withConnectVia(IntegrationRuntimeReference connectVia) {
Expand Down Expand Up @@ -250,5 +276,8 @@ public void validate() {
} else {
linkedServiceName().validate();
}
if (credential() != null) {
credential().validate();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@ public class AzureBlobFSLinkedService extends LinkedService {
@JsonProperty(value = "typeProperties.encryptedCredential")
private Object encryptedCredential;

/*
* The credential reference containing authentication information.
*/
@JsonProperty(value = "typeProperties.credential")
private CredentialReference credential;

/**
* Get the url property: Endpoint for the Azure Data Lake Storage Gen2 service. Type: string (or Expression with
* resultType string).
Expand Down Expand Up @@ -231,6 +237,26 @@ public AzureBlobFSLinkedService withEncryptedCredential(Object encryptedCredenti
return this;
}

/**
* Get the credential property: The credential reference containing authentication information.
*
* @return the credential value.
*/
public CredentialReference credential() {
return this.credential;
}

/**
* Set the credential property: The credential reference containing authentication information.
*
* @param credential the credential value to set.
* @return the AzureBlobFSLinkedService object itself.
*/
public AzureBlobFSLinkedService withCredential(CredentialReference credential) {
this.credential = credential;
return this;
}

/** {@inheritDoc} */
@Override
public AzureBlobFSLinkedService withConnectVia(IntegrationRuntimeReference connectVia) {
Expand Down Expand Up @@ -275,5 +301,8 @@ public void validate() {
if (servicePrincipalKey() != null) {
servicePrincipalKey().validate();
}
if (credential() != null) {
credential().validate();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,12 @@ public class AzureBlobStorageLinkedService extends LinkedService {
@JsonProperty(value = "typeProperties.encryptedCredential")
private String encryptedCredential;

/*
* The credential reference containing authentication information.
*/
@JsonProperty(value = "typeProperties.credential")
private CredentialReference credential;

/**
* Get the connectionString property: The connection string. It is mutually exclusive with sasUri, serviceEndpoint
* property. Type: string, SecureString or AzureKeyVaultSecretReference.
Expand Down Expand Up @@ -345,6 +351,26 @@ public AzureBlobStorageLinkedService withEncryptedCredential(String encryptedCre
return this;
}

/**
* Get the credential property: The credential reference containing authentication information.
*
* @return the credential value.
*/
public CredentialReference credential() {
return this.credential;
}

/**
* Set the credential property: The credential reference containing authentication information.
*
* @param credential the credential value to set.
* @return the AzureBlobStorageLinkedService object itself.
*/
public AzureBlobStorageLinkedService withCredential(CredentialReference credential) {
this.credential = credential;
return this;
}

/** {@inheritDoc} */
@Override
public AzureBlobStorageLinkedService withConnectVia(IntegrationRuntimeReference connectVia) {
Expand Down Expand Up @@ -390,5 +416,8 @@ public void validate() {
if (servicePrincipalKey() != null) {
servicePrincipalKey().validate();
}
if (credential() != null) {
credential().validate();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ public class AzureDataExplorerLinkedService extends LinkedService {
@JsonProperty(value = "typeProperties.tenant")
private Object tenant;

/*
* The credential reference containing authentication information.
*/
@JsonProperty(value = "typeProperties.credential")
private CredentialReference credential;

/**
* Get the endpoint property: The endpoint of Azure Data Explorer (the engine's endpoint). URL will be in the format
* https://&lt;clusterName&gt;.&lt;regionName&gt;.kusto.windows.net. Type: string (or Expression with resultType
Expand Down Expand Up @@ -165,6 +171,26 @@ public AzureDataExplorerLinkedService withTenant(Object tenant) {
return this;
}

/**
* Get the credential property: The credential reference containing authentication information.
*
* @return the credential value.
*/
public CredentialReference credential() {
return this.credential;
}

/**
* Set the credential property: The credential reference containing authentication information.
*
* @param credential the credential value to set.
* @return the AzureDataExplorerLinkedService object itself.
*/
public AzureDataExplorerLinkedService withCredential(CredentialReference credential) {
this.credential = credential;
return this;
}

/** {@inheritDoc} */
@Override
public AzureDataExplorerLinkedService withConnectVia(IntegrationRuntimeReference connectVia) {
Expand Down Expand Up @@ -216,5 +242,8 @@ public void validate() {
new IllegalArgumentException(
"Missing required property database in model AzureDataExplorerLinkedService"));
}
if (credential() != null) {
credential().validate();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@ public class AzureDataLakeStoreLinkedService extends LinkedService {
@JsonProperty(value = "typeProperties.encryptedCredential")
private Object encryptedCredential;

/*
* The credential reference containing authentication information.
*/
@JsonProperty(value = "typeProperties.credential")
private CredentialReference credential;

/**
* Get the dataLakeStoreUri property: Data Lake Store service URI. Type: string (or Expression with resultType
* string).
Expand Down Expand Up @@ -286,6 +292,26 @@ public AzureDataLakeStoreLinkedService withEncryptedCredential(Object encryptedC
return this;
}

/**
* Get the credential property: The credential reference containing authentication information.
*
* @return the credential value.
*/
public CredentialReference credential() {
return this.credential;
}

/**
* Set the credential property: The credential reference containing authentication information.
*
* @param credential the credential value to set.
* @return the AzureDataLakeStoreLinkedService object itself.
*/
public AzureDataLakeStoreLinkedService withCredential(CredentialReference credential) {
this.credential = credential;
return this;
}

/** {@inheritDoc} */
@Override
public AzureDataLakeStoreLinkedService withConnectVia(IntegrationRuntimeReference connectVia) {
Expand Down Expand Up @@ -331,5 +357,8 @@ public void validate() {
if (servicePrincipalKey() != null) {
servicePrincipalKey().validate();
}
if (credential() != null) {
credential().validate();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

package com.azure.resourcemanager.datafactory.models;

import com.azure.core.annotation.Immutable;
import com.azure.core.annotation.Fluent;
import com.azure.core.util.logging.ClientLogger;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
Expand All @@ -13,7 +13,7 @@
/** The location of azure data lake store dataset. */
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
@JsonTypeName("AzureDataLakeStoreLocation")
@Immutable
@Fluent
public final class AzureDataLakeStoreLocation extends DatasetLocation {
@JsonIgnore private final ClientLogger logger = new ClientLogger(AzureDataLakeStoreLocation.class);

Expand Down
Loading