Skip to content

Commit

Permalink
avoid breaking change on fluent code
Browse files Browse the repository at this point in the history
  • Loading branch information
weidongxu-microsoft committed Jul 6, 2021
1 parent daf6814 commit 4e0f8f0
Show file tree
Hide file tree
Showing 10 changed files with 84 additions and 87 deletions.
2 changes: 1 addition & 1 deletion sdk/resourcemanager/api-specs.json
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
"dir": "azure-resourcemanager-monitor",
"source": "specification/monitor/resource-manager/readme.md",
"package": "com.azure.resourcemanager.monitor",
"args": "--payload-flattening-threshold=1 --tag=package-2021-04 --add-inner=AutoscaleProfile,ScaleRule,LocalizableString"
"args": "--payload-flattening-threshold=1 --tag=package-2021-04 --add-inner=AutoscaleProfile,ScaleRule,LocalizableString --rename-model=MetricUnit:Unit"
},
"network": {
"dir": "azure-resourcemanager-network",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.azure.resourcemanager.monitor.models.AggregationType;
import com.azure.resourcemanager.monitor.models.MetricAvailability;
import com.azure.resourcemanager.monitor.models.MetricClass;
import com.azure.resourcemanager.monitor.models.MetricUnit;
import com.azure.resourcemanager.monitor.models.Unit;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List;
Expand Down Expand Up @@ -66,7 +66,7 @@ public final class MetricDefinitionInner {
* The unit of the metric.
*/
@JsonProperty(value = "unit")
private MetricUnit unit;
private Unit unit;

/*
* the primary aggregation type value defining how to use the values for
Expand Down Expand Up @@ -246,7 +246,7 @@ public MetricDefinitionInner withMetricClass(MetricClass metricClass) {
*
* @return the unit value.
*/
public MetricUnit unit() {
public Unit unit() {
return this.unit;
}

Expand All @@ -256,7 +256,7 @@ public MetricUnit unit() {
* @param unit the unit value to set.
* @return the MetricDefinitionInner object itself.
*/
public MetricDefinitionInner withUnit(MetricUnit unit) {
public MetricDefinitionInner withUnit(Unit unit) {
this.unit = unit;
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

import com.azure.core.annotation.Fluent;
import com.azure.core.util.logging.ClientLogger;
import com.azure.resourcemanager.monitor.models.MetricUnit;
import com.azure.resourcemanager.monitor.models.TimeSeriesElement;
import com.azure.resourcemanager.monitor.models.Unit;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List;
Expand Down Expand Up @@ -58,7 +58,7 @@ public final class MetricInner {
* The unit of the metric.
*/
@JsonProperty(value = "unit", required = true)
private MetricUnit unit;
private Unit unit;

/*
* the time series returned when a data query is performed.
Expand Down Expand Up @@ -191,7 +191,7 @@ public MetricInner withErrorMessage(String errorMessage) {
*
* @return the unit value.
*/
public MetricUnit unit() {
public Unit unit() {
return this.unit;
}

Expand All @@ -201,7 +201,7 @@ public MetricUnit unit() {
* @param unit the unit value to set.
* @return the MetricInner object itself.
*/
public MetricInner withUnit(MetricUnit unit) {
public MetricInner withUnit(Unit unit) {
this.unit = unit;
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
import com.azure.resourcemanager.monitor.models.MetricAvailability;
import com.azure.resourcemanager.monitor.models.MetricCollection;
import com.azure.resourcemanager.monitor.models.MetricDefinition;
import com.azure.resourcemanager.monitor.models.MetricUnit;
import com.azure.resourcemanager.monitor.models.ResultType;
import com.azure.resourcemanager.monitor.fluent.models.LocalizableStringInner;
import com.azure.resourcemanager.monitor.fluent.models.MetricDefinitionInner;
import com.azure.resourcemanager.monitor.models.Unit;
import com.azure.resourcemanager.resources.fluentcore.model.implementation.WrapperImpl;
import java.time.Duration;
import java.time.OffsetDateTime;
Expand Down Expand Up @@ -87,8 +87,8 @@ public List<AggregationType> supportedAggregationTypes() {
return this.inner.supportedAggregationTypes();
}

public MetricUnit unit() {
return this.inner.unit();
public Unit unit() {
return this.innerModel().unit();
}

public AggregationType primaryAggregationType() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import com.azure.resourcemanager.monitor.models.LocalizableString;
import com.azure.resourcemanager.monitor.models.Metric;
import com.azure.resourcemanager.monitor.models.MetricUnit;
import com.azure.resourcemanager.monitor.models.Unit;
import com.azure.resourcemanager.monitor.models.TimeSeriesElement;
import com.azure.resourcemanager.monitor.fluent.models.MetricInner;
import com.azure.resourcemanager.resources.fluentcore.model.implementation.WrapperImpl;
Expand Down Expand Up @@ -36,7 +36,7 @@ public LocalizableString name() {
}

@Override
public MetricUnit unit() {
public Unit unit() {
return this.innerModel().unit();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,11 @@ public interface Metric extends HasInnerModel<MetricInner> {
LocalizableString name();

/**
* Get the unit of the metric. Possible values include: 'Count', 'Bytes', 'Seconds', 'CountPerSecond',
* 'BytesPerSecond', 'Percent', 'MilliSeconds', 'ByteSeconds', 'Unspecified'.
* Get the unit of the metric.
*
* @return the unit value
*/
MetricUnit unit();
Unit unit();

/**
* Get the time series returned when a data query is performed.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public interface MetricDefinition extends HasManager<MonitorManager>, HasInnerMo
*
* @return the unit value
*/
MetricUnit unit();
Unit unit();

/**
* Get the primaryAggregationType value.
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
// Code generated by Microsoft (R) AutoRest Code Generator.

package com.azure.resourcemanager.monitor.models;

import com.azure.core.util.ExpandableStringEnum;
import com.fasterxml.jackson.annotation.JsonCreator;
import java.util.Collection;

/** Defines values for Unit. */
public final class Unit extends ExpandableStringEnum<Unit> {
/** Static value Count for Unit. */
public static final Unit COUNT = fromString("Count");

/** Static value Bytes for Unit. */
public static final Unit BYTES = fromString("Bytes");

/** Static value Seconds for Unit. */
public static final Unit SECONDS = fromString("Seconds");

/** Static value CountPerSecond for Unit. */
public static final Unit COUNT_PER_SECOND = fromString("CountPerSecond");

/** Static value BytesPerSecond for Unit. */
public static final Unit BYTES_PER_SECOND = fromString("BytesPerSecond");

/** Static value Percent for Unit. */
public static final Unit PERCENT = fromString("Percent");

/** Static value MilliSeconds for Unit. */
public static final Unit MILLI_SECONDS = fromString("MilliSeconds");

/** Static value ByteSeconds for Unit. */
public static final Unit BYTE_SECONDS = fromString("ByteSeconds");

/** Static value Unspecified for Unit. */
public static final Unit UNSPECIFIED = fromString("Unspecified");

/** Static value Cores for Unit. */
public static final Unit CORES = fromString("Cores");

/** Static value MilliCores for Unit. */
public static final Unit MILLI_CORES = fromString("MilliCores");

/** Static value NanoCores for Unit. */
public static final Unit NANO_CORES = fromString("NanoCores");

/** Static value BitsPerSecond for Unit. */
public static final Unit BITS_PER_SECOND = fromString("BitsPerSecond");

/**
* Creates or finds a Unit from its string representation.
*
* @param name a name to look for.
* @return the corresponding Unit.
*/
@JsonCreator
public static Unit fromString(String name) {
return fromString(name, Unit.class);
}

/** @return known Unit values. */
public static Collection<Unit> values() {
return values(Unit.class);
}
}
2 changes: 0 additions & 2 deletions sdk/resourcemanager/azure-resourcemanager/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,6 @@
<artifactId>revapi-maven-plugin</artifactId>
<version>0.11.2</version> <!-- {x-version-update;org.revapi:revapi-maven-plugin;external_dependency} -->
<configuration>
<skip>true</skip>

<analysisConfiguration>
<revapi.ignore>
<item>
Expand Down

0 comments on commit 4e0f8f0

Please sign in to comment.