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.

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

Add missing fields to API Gateway request context: #93

Closed
wants to merge 5 commits into from
Closed

Add missing fields to API Gateway request context: #93

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c37e8d
Add missing fields to API Gateway request context:
Jul 28, 2019
d29408f
Removed websocket related fields because it was addressed at
Aug 1, 2019
46135bc
Revert unwanted change
Aug 1, 2019
acc0679
Add domain prefix to equals
Aug 1, 2019
7fe0055
Add domain prefix to hashcode
Aug 1, 2019
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
199 changes: 196 additions & 3 deletions ...c/main/java/com/amazonaws/services/lambda/runtime/events/APIGatewayProxyRequestEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,18 @@ public static class ProxyRequestContext implements Serializable, Cloneable {

private Map<String, Object> authorizer;

private String extendedRequestId;

private String requestTime;

private Long requestTimeEpoch;

private String domainName;

private String domainPrefix;

private String protocol;

/**
* default constructor
*/
Expand Down Expand Up @@ -282,6 +294,145 @@ public ProxyRequestContext withPath(String path) {
return this;
}

/**
* @return The API Gateway Extended Request Id
*/
public String getExtendedRequestId() {
return extendedRequestId;
}

/**
* @param extendedRequestId The API Gateway Extended Request Id
*/
public void setExtendedRequestId(String extendedRequestId) {
this.extendedRequestId = extendedRequestId;
}

/**
* @param extendedRequestId The API Gateway Extended Request Id
* @return ProxyRequestContext object
*/
public ProxyRequestContext withExtendedRequestId(String extendedRequestId) {
this.setExtendedRequestId(extendedRequestId);
return this;
}

/**
* @return The CLF-formatted request time (dd/MMM/yyyy:HH:mm:ss +-hhmm).
*/
public String getRequestTime() {
return requestTime;
}

/**
* @param requestTime The CLF-formatted request time (dd/MMM/yyyy:HH:mm:ss +-hhmm).
*/
public void setRequestTime(String requestTime) {
this.requestTime = requestTime;
}

/**
* @param requestTime The CLF-formatted request time (dd/MMM/yyyy:HH:mm:ss +-hhmm).
* @return ProxyRequestContext object
*/
public ProxyRequestContext withRequestTime(String requestTime) {
this.setRequestTime(requestTime);
return this;
}

/**
* @return The Epoch-formatted request time (in millis)
*/
public Long getRequestTimeEpoch() {
return requestTimeEpoch;
}

/**
* @param requestTimeEpoch The Epoch-formatted request time (in millis)
*/
public void setRequestTimeEpoch(Long requestTimeEpoch) {
this.requestTimeEpoch = requestTimeEpoch;
}

/**
* @param requestTimeEpoch The Epoch-formatted request time (in millis)
* @return ProxyRequestContext object
*/
public ProxyRequestContext withRequestTimeEpoch(Long requestTimeEpoch) {
this.setRequestTimeEpoch(requestTimeEpoch);
return this;
}

/**
* @return The full domain name used to invoke the API. This should be the same as the incoming Host header.
*/
public String getDomainName() {
return domainName;
}

/**
* @param domainName The full domain name used to invoke the API.
* This should be the same as the incoming Host header.
*/
public void setDomainName(String domainName) {
this.domainName = domainName;
}

/**
* @param domainName The full domain name used to invoke the API.
* This should be the same as the incoming Host header.
* @return ProxyRequestContext object
*/
public ProxyRequestContext withDomainName(String domainName) {
this.setDomainName(domainName);
return this;
}

/**
* @return The first label of the domainName. This is often used as a caller/customer identifier.
*/
public String getDomainPrefix() {
return domainPrefix;
}

/**
* @param domainPrefix The first label of the domainName. This is often used as a caller/customer identifier.
*/
public void setDomainPrefix(String domainPrefix) {
this.domainPrefix = domainPrefix;
}

/**
* @param domainPrefix The first label of the domainName. This is often used as a caller/customer identifier.
* @return
*/
public ProxyRequestContext withDomainPrefix(String domainPrefix) {
this.setDomainPrefix(domainPrefix);
return this;
}
/**
* @return The request protocol, for example, HTTP/1.1.
*/
public String getProtocol() {
return protocol;
}

/**
* @param protocol The request protocol, for example, HTTP/1.1.
*/
public void setProtocol(String protocol) {
this.protocol = protocol;
}

/**
* @param protocol The request protocol, for example, HTTP/1.1.
* @return ProxyRequestContext object
*/
public ProxyRequestContext withProtocol(String protocol) {
this.setProtocol(protocol);
return this;
}

/**
* Returns a string representation of this object; useful for testing and debugging.
*
Expand All @@ -308,11 +459,23 @@ public String toString() {
if (getHttpMethod() != null)
sb.append("httpMethod: ").append(getHttpMethod()).append(",");
if (getApiId() != null)
sb.append("apiId: ").append(getApiId()).append(",");
sb.append("apiId: ").append(getApiId());
if (getPath() != null)
sb.append("path: ").append(getPath()).append(",");
if (getAuthorizer() != null)
sb.append("authorizer: ").append(getAuthorizer().toString());
sb.append("authorizer: ").append(getAuthorizer().toString()).append(",");
if (getExtendedRequestId() != null)
sb.append("extendedRequestId: ").append(getExtendedRequestId()).append(",");
if (getRequestTime() != null)
sb.append("requestTime: ").append(getRequestTime()).append(",");
if (getProtocol() != null)
sb.append("protocol: ").append(getProtocol()).append(",");
if (getRequestTimeEpoch() != null)
sb.append("requestTimeEpoch: ").append(getRequestTimeEpoch()).append(",");
if (getDomainPrefix() != null)
sb.append("domainPrefix: ").append(getDomainPrefix()).append(",");
if (getDomainName() != null)
sb.append("domainName: ").append(getDomainName());
sb.append("}");
return sb.toString();
}
Expand Down Expand Up @@ -367,6 +530,30 @@ public boolean equals(Object obj) {
return false;
if (other.getAuthorizer() != null && !other.getAuthorizer().equals(this.getAuthorizer()))
return false;
if (other.getExtendedRequestId() == null ^ this.getExtendedRequestId() == null)
return false;
if (other.getExtendedRequestId() != null && other.getExtendedRequestId().equals(this.getExtendedRequestId()) == false)
return false;
if (other.getRequestTime() == null ^ this.getRequestTime() == null)
return false;
if (other.getRequestTime() != null && other.getRequestTime().equals(this.getRequestTime()) == false)
return false;
if (other.getRequestTimeEpoch() == null ^ this.getRequestTimeEpoch() == null)
return false;
if (other.getRequestTimeEpoch() != null && other.getRequestTimeEpoch().equals(this.getRequestTimeEpoch()) == false)
return false;
if (other.getDomainName() == null ^ this.getDomainName() == null)
return false;
if (other.getDomainName() != null && other.getDomainName().equals(this.getDomainName()) == false)
return false;
if (other.getDomainPrefix() == null ^ this.getDomainPrefix() == null)
return false;
if (other.getDomainPrefix() != null && other.getDomainPrefix().equals(this.getDomainPrefix()) == false)
return false;
if (other.getProtocol() == null ^ this.getProtocol() == null)
return false;
if (other.getProtocol() != null && other.getProtocol().equals(this.getProtocol()) == false)
return false;
return true;
}

Expand All @@ -385,6 +572,12 @@ public int hashCode() {
hashCode = prime * hashCode + ((getApiId() == null) ? 0 : getApiId().hashCode());
hashCode = prime * hashCode + ((getPath() == null) ? 0 : getPath().hashCode());
hashCode = prime * hashCode + ((getAuthorizer() == null) ? 0 : getAuthorizer().hashCode());
hashCode = prime * hashCode + ((getExtendedRequestId() == null) ? 0 : getExtendedRequestId().hashCode());
hashCode = prime * hashCode + ((getRequestTime() == null) ? 0 : getRequestTime().hashCode());
hashCode = prime * hashCode + ((getRequestTimeEpoch() == null) ? 0 : getRequestTimeEpoch().hashCode());
hashCode = prime * hashCode + ((getDomainName() == null) ? 0 : getDomainName().hashCode());
hashCode = prime * hashCode + ((getDomainPrefix() == null) ? 0 : getDomainPrefix().hashCode());
hashCode = prime * hashCode + ((getProtocol() == null) ? 0 : getProtocol().hashCode());
return hashCode;
}

Expand Down Expand Up @@ -1135,7 +1328,7 @@ public APIGatewayProxyRequestEvent withIsBase64Encoded(Boolean isBase64Encoded)
this.setIsBase64Encoded(isBase64Encoded);
return this;
}

/**
* Returns a string representation of this object; useful for testing and debugging.
*
Expand Down