Skip to content

Commit

Permalink
Make deprecated methods call renamed ones
Browse files Browse the repository at this point in the history
  • Loading branch information
@mziccard
mziccard committed Oct 20, 2016
1 parent 1eb89be commit 925063c
Show file tree
Hide file tree
Showing 12 changed files with 99 additions and 141 deletions.
12 changes: 5 additions & 7 deletions google-cloud-core/src/main/java/com/google/cloud/MonitoredResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@ public static class Builder {
*/
@Deprecated
public Builder type(String type) {
this.type = type;
return this;
return setType(type);
}

/**
Expand All @@ -89,8 +88,7 @@ public Builder setType(String type) {
*/
@Deprecated
public Builder labels(Map<String, String> labels) {
this.labels = new HashMap<>(checkNotNull(labels));
return this;
return setLabels(labels);
}

/**
Expand Down Expand Up @@ -136,7 +134,7 @@ public MonitoredResource build() {
*/
@Deprecated
public String type() {
return type;
return getType();
}

/**
Expand All @@ -155,7 +153,7 @@ public String getType() {
*/
@Deprecated
public Map<String, String> labels() {
return labels;
return getLabels();
}

/**
Expand Down Expand Up @@ -211,7 +209,7 @@ public Builder toBuilder() {
*/
@Deprecated
public static Builder builder(String type) {
return new Builder(type);
return newBuilder(type);
}

/**
Expand Down
16 changes: 8 additions & 8 deletions google-cloud-core/src/main/java/com/google/cloud/MonitoredResourceDescriptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ static ValueType fromPb(com.google.api.LabelDescriptor.ValueType typePb) {
*/
@Deprecated
public String key() {
return key;
return getKey();
}

/**
Expand All @@ -137,7 +137,7 @@ public String getKey() {
*/
@Deprecated
public ValueType valueType() {
return valueType;
return getValueType();
}

/**
Expand All @@ -153,7 +153,7 @@ public ValueType getValueType() {
*/
@Deprecated
public String description() {
return description;
return getDescription();
}

/**
Expand Down Expand Up @@ -263,7 +263,7 @@ MonitoredResourceDescriptor build() {
*/
@Deprecated
public String type() {
return type;
return getType();
}

/**
Expand All @@ -280,7 +280,7 @@ public String getType() {
*/
@Deprecated
public String name() {
return name;
return getName();
}

/**
Expand All @@ -298,7 +298,7 @@ public String getName() {
*/
@Deprecated
public String displayName() {
return displayName;
return getDisplayName();
}

/**
Expand All @@ -316,7 +316,7 @@ public String getDisplayName() {
*/
@Deprecated
public String description() {
return description;
return getDescription();
}

/**
Expand All @@ -334,7 +334,7 @@ public String getDescription() {
*/
@Deprecated
public List<LabelDescriptor> labels() {
return labels;
return getLabels();
}

/**
Expand Down
61 changes: 24 additions & 37 deletions google-cloud-logging/src/main/java/com/google/cloud/logging/HttpRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,7 @@ public static final class Builder {
*/
@Deprecated
public Builder requestMethod(RequestMethod requestMethod) {
this.requestMethod = requestMethod;
return this;
return setRequestMethod(requestMethod);
}

/**
Expand All @@ -118,8 +117,7 @@ public Builder setRequestMethod(RequestMethod requestMethod) {
*/
@Deprecated
public Builder requestUrl(String requestUrl) {
this.requestUrl = requestUrl;
return this;
return setRequestUrl(requestUrl);
}

/**
Expand All @@ -138,8 +136,7 @@ public Builder setRequestUrl(String requestUrl) {
*/
@Deprecated
public Builder requestSize(long requestSize) {
this.requestSize = requestSize;
return this;
return setRequestSize(requestSize);
}

/**
Expand All @@ -156,8 +153,7 @@ public Builder setRequestSize(long requestSize) {
*/
@Deprecated
public Builder status(int status) {
this.status = status;
return this;
return setStatus(status);
}

/**
Expand All @@ -174,8 +170,7 @@ public Builder setStatus(int status) {
*/
@Deprecated
public Builder responseSize(long responseSize) {
this.responseSize = responseSize;
return this;
return setResponseSize(responseSize);
}

/**
Expand All @@ -193,8 +188,7 @@ public Builder setResponseSize(long responseSize) {
*/
@Deprecated
public Builder userAgent(String userAgent) {
this.userAgent = userAgent;
return this;
return setUserAgent(userAgent);
}

/**
Expand All @@ -212,8 +206,7 @@ public Builder setUserAgent(String userAgent) {
*/
@Deprecated
public Builder remoteIp(String remoteIp) {
this.remoteIp = remoteIp;
return this;
return setRemoteIp(remoteIp);
}

/**
Expand All @@ -231,8 +224,7 @@ public Builder setRemoteIp(String remoteIp) {
*/
@Deprecated
public Builder serverIp(String serverIp) {
this.serverIp = serverIp;
return this;
return setServerIp(serverIp);
}

/**
Expand All @@ -252,8 +244,7 @@ public Builder setServerIp(String serverIp) {
*/
@Deprecated
public Builder referer(String referer) {
this.referer = referer;
return this;
return setReferer(referer);
}

/**
Expand All @@ -272,8 +263,7 @@ public Builder setReferer(String referer) {
*/
@Deprecated
public Builder cacheLookup(boolean cacheLookup) {
this.cacheLookup = cacheLookup;
return this;
return setCacheLookup(cacheLookup);
}

/**
Expand All @@ -290,8 +280,7 @@ public Builder setCacheLookup(boolean cacheLookup) {
*/
@Deprecated
public Builder cacheHit(boolean cacheHit) {
this.cacheHit = cacheHit;
return this;
return setCacheHit(cacheHit);
}

/**
Expand All @@ -310,8 +299,7 @@ public Builder setCacheHit(boolean cacheHit) {
*/
@Deprecated
public Builder cacheValidatedWithOriginServer(boolean cacheValidatedWithOriginServer) {
this.cacheValidatedWithOriginServer = cacheValidatedWithOriginServer;
return this;
return setCacheValidatedWithOriginServer(cacheValidatedWithOriginServer);
}

/**
Expand All @@ -330,8 +318,7 @@ public Builder setCacheValidatedWithOriginServer(boolean cacheValidatedWithOrigi
*/
@Deprecated
public Builder cacheFillBytes(long cacheFillBytes) {
this.cacheFillBytes = cacheFillBytes;
return this;
return setCacheFillBytes(cacheFillBytes);
}

/**
Expand Down Expand Up @@ -372,7 +359,7 @@ public HttpRequest build() {
*/
@Deprecated
public RequestMethod requestMethod() {
return requestMethod;
return getRequestMethod();
}

/**
Expand All @@ -389,7 +376,7 @@ public RequestMethod getRequestMethod() {
*/
@Deprecated
public String requestUrl() {
return requestUrl;
return getRequestUrl();
}

/**
Expand All @@ -407,7 +394,7 @@ public String getRequestUrl() {
*/
@Deprecated
public Long requestSize() {
return requestSize;
return getRequestSize();
}

/**
Expand All @@ -423,7 +410,7 @@ public Long getRequestSize() {
*/
@Deprecated
public Integer status() {
return status;
return getStatus();
}

/**
Expand All @@ -439,7 +426,7 @@ public Integer getStatus() {
*/
@Deprecated
public Long responseSize() {
return responseSize;
return getResponseSize();
}

/**
Expand All @@ -456,7 +443,7 @@ public Long getResponseSize() {
*/
@Deprecated
public String userAgent() {
return userAgent;
return getUserAgent();
}

/**
Expand All @@ -473,7 +460,7 @@ public String getUserAgent() {
*/
@Deprecated
public String remoteIp() {
return remoteIp;
return getRemoteIp();
}

/**
Expand All @@ -490,7 +477,7 @@ public String getRemoteIp() {
*/
@Deprecated
public String serverIp() {
return serverIp;
return getServerIp();
}

/**
Expand All @@ -509,7 +496,7 @@ public String getServerIp() {
*/
@Deprecated
public String referer() {
return referer;
return getReferer();
}

/**
Expand Down Expand Up @@ -553,7 +540,7 @@ public boolean cacheValidatedWithOriginServer() {
*/
@Deprecated
public Long cacheFillBytes() {
return cacheFillBytes;
return getCacheFillBytes();
}

/**
Expand Down Expand Up @@ -665,7 +652,7 @@ com.google.logging.type.HttpRequest toPb() {
*/
@Deprecated
public static Builder builder() {
return new Builder();
return newBuilder();
}

/**
Expand Down
Loading

0 comments on commit 925063c

Please sign in to comment.