-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
GH-30 adding a `createOrUpdateProvider()` method to the ProviderService
- Loading branch information
Showing
8 changed files
with
373 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
events_mgmt/src/main/java/com/adobe/event/management/ConflictErrorDecoder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* | ||
| * Copyright 2017 Adobe. All rights reserved. | ||
| * This file is licensed to you under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. You may obtain a copy | ||
| * of the License at http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under | ||
| * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS | ||
| * OF ANY KIND, either express or implied. See the License for the specific language | ||
| * governing permissions and limitations under the License. | ||
| */ | ||
| package com.adobe.event.management; | ||
|
|
||
| import feign.FeignException; | ||
| import feign.Response; | ||
| import feign.codec.ErrorDecoder; | ||
|
|
||
| public class ConflictErrorDecoder implements ErrorDecoder { | ||
|
|
||
| @Override | ||
| public Exception decode(String methodKey, Response response) { | ||
| FeignException exception = FeignException.errorStatus(methodKey, response); | ||
| return (response.status()==409) ? new ConflictException(response, exception) : exception; | ||
| } | ||
| } |
53 changes: 53 additions & 0 deletions
53
events_mgmt/src/main/java/com/adobe/event/management/ConflictException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * Copyright 2017 Adobe. All rights reserved. | ||
| * This file is licensed to you under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. You may obtain a copy | ||
| * of the License at http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under | ||
| * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS | ||
| * OF ANY KIND, either express or implied. See the License for the specific language | ||
| * governing permissions and limitations under the License. | ||
| */ | ||
| package com.adobe.event.management; | ||
|
|
||
| import static com.adobe.util.JacksonUtil.DEFAULT_OBJECT_MAPPER; | ||
|
|
||
| import com.adobe.event.management.model.ErrorResponse; | ||
| import com.fasterxml.jackson.core.JsonProcessingException; | ||
| import feign.FeignException; | ||
| import feign.Response; | ||
| import java.util.Optional; | ||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public class ConflictException extends FeignException { | ||
|
|
||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | ||
| private final String conflictingId; | ||
|
|
||
| public ConflictException(Response response, FeignException exception) { | ||
| super(response.status(), exception.getMessage(), response.request(), exception); | ||
| conflictingId = getConflictingId(exception.contentUTF8()); | ||
| } | ||
|
|
||
| public Optional<String> getConflictingId(){ | ||
| return Optional.ofNullable(conflictingId); | ||
| } | ||
|
|
||
| private String getConflictingId(String body){ | ||
| try { | ||
| String conflictingId = DEFAULT_OBJECT_MAPPER.readValue(body, ErrorResponse.class).getMessage(); | ||
| if (!StringUtils.isEmpty(conflictingId) && !conflictingId.contains(" ")) { | ||
| return conflictingId; | ||
| } else { | ||
| logger.warn("The Conflict/409 Error response does not hold a valid conflicting id: `{}`",conflictingId); | ||
| return null; | ||
| } | ||
| } catch (JsonProcessingException e) { | ||
| logger.warn("The Conflict/409 Error response is not of the expected format",e.getMessage()); | ||
| return null; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
events_mgmt/src/main/java/com/adobe/event/management/model/ErrorResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * Copyright 2017 Adobe. All rights reserved. | ||
| * This file is licensed to you under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. You may obtain a copy | ||
| * of the License at http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under | ||
| * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS | ||
| * OF ANY KIND, either express or implied. See the License for the specific language | ||
| * governing permissions and limitations under the License. | ||
| */ | ||
| package com.adobe.event.management.model; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import com.fasterxml.jackson.annotation.JsonInclude.Include; | ||
| import java.util.Objects; | ||
|
|
||
| @JsonInclude(Include.NON_NULL) | ||
| @JsonIgnoreProperties(ignoreUnknown = true) | ||
| public class ErrorResponse { | ||
|
|
||
| private String reason; | ||
| private String message; | ||
|
|
||
| public String getReason() { | ||
| return reason; | ||
| } | ||
|
|
||
| public void setReason(String reason) { | ||
| this.reason = reason; | ||
| } | ||
|
|
||
| public String getMessage() { | ||
| return message; | ||
| } | ||
|
|
||
| public void setMessage(String message) { | ||
| this.message = message; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
| ErrorResponse that = (ErrorResponse) o; | ||
| return Objects.equals(reason, that.reason) && | ||
| Objects.equals(message, that.message); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(reason, message); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "ErrorResponse{" + | ||
| "reason='" + reason + '\'' + | ||
| ", message='" + message + '\'' + | ||
| '}'; | ||
| } | ||
| } |
Oops, something went wrong.