diff options
Diffstat (limited to 'eaaf_core_api/src/main')
3 files changed, 17 insertions, 104 deletions
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExceptionContainer.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExceptionContainer.java deleted file mode 100644 index 80c7094c..00000000 --- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExceptionContainer.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright 2017 Graz University of Technology EAAF-Core Components has been developed in a - * cooperation between EGIZ, A-SIT Plus, A-SIT, and Graz University of Technology. - * - * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by the European - * Commission - subsequent versions of the EUPL (the "Licence"); You may not use this work except in - * compliance with the Licence. You may obtain a copy of the Licence at: - * https://joinup.ec.europa.eu/news/understanding-eupl-v12 - * - * Unless required by applicable law or agreed to in writing, software distributed under the Licence - * is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the Licence for the specific language governing permissions and limitations under - * the Licence. - * - * This product combines work with different licenses. See the "NOTICE" text file for details on the - * various modules and licenses. The "NOTICE" text file is part of the distribution. Any derivative - * works that you distribute must include a readable copy of the "NOTICE" text file. -*/ - -package at.gv.egiz.eaaf.core.api.data; - -import java.io.Serializable; - -import at.gv.egiz.eaaf.core.api.IRequest; - -/** - * AuthProcess exception containter for Front-Channel exception handling. - * - * @author tlenz - * - */ -public class ExceptionContainer implements Serializable { - - private static final long serialVersionUID = 5355860753609684995L; - private Throwable exceptionThrown = null; - private IRequest pendingReq = null; - - /** - * Create an exception container. - * - * @param pendingReq Pending request that has an exception - * @param exception error - */ - public ExceptionContainer(final IRequest pendingReq, final Throwable exception) { - this.pendingReq = pendingReq; - this.exceptionThrown = exception; - - } - - /** - * Get the error. - * - * @return the exceptionThrown - */ - public Throwable getExceptionThrown() { - return this.exceptionThrown; - } - - public IRequest getPendingRequest() { - return this.pendingReq; - - } - - /** - * Get the unique sessionId for this error. - * - * @return the uniqueSessionID - */ - public String getUniqueSessionID() { - if (this.pendingReq != null) { - return this.pendingReq.getUniqueSessionIdentifier(); - } else { - return null; - } - } - - /** - * Get the unique transactionId for this error. - * - * @return the uniqueTransactionID - */ - public String getUniqueTransactionID() { - if (this.pendingReq != null) { - return this.pendingReq.getUniqueTransactionIdentifier(); - } else { - return null; - } - } - - /** - * Get the service-provider identifier. - * - * @return the uniqueServiceProviderId - */ - public String getUniqueServiceProviderId() { - if (this.pendingReq != null && this.pendingReq.getServiceProviderConfiguration() != null) { - return this.pendingReq.getServiceProviderConfiguration().getUniqueIdentifier(); - } else { - return null; - } - } - -} diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/EaafAuthenticationException.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/EaafAuthenticationException.java index 22c8a8ca..732834e1 100644 --- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/EaafAuthenticationException.java +++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/EaafAuthenticationException.java @@ -19,10 +19,19 @@ package at.gv.egiz.eaaf.core.exceptions; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + public class EaafAuthenticationException extends EaafException { private static final long serialVersionUID = -4793625336456467005L; + @JsonCreator + public EaafAuthenticationException( + @JsonProperty("errorId") final String internalMsgId) { + super(internalMsgId); + } + public EaafAuthenticationException(final String internalMsgId, final Object[] params) { super(internalMsgId, params); diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/EaafException.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/EaafException.java index e1719abc..d2d42b31 100644 --- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/EaafException.java +++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/EaafException.java @@ -23,15 +23,22 @@ import java.util.Arrays; import javax.annotation.Nullable; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + import at.gv.egiz.eaaf.core.impl.logging.LogMessageProviderFactory; +import lombok.Setter; public class EaafException extends Exception { private static final long serialVersionUID = -4527097018108560426L; private String errorId = null; + + @Setter private Object[] params = null; - public EaafException(final String errorId) { + @JsonCreator + public EaafException(@JsonProperty("errorId") final String errorId) { super(LogMessageProviderFactory.getMessager().getMessage(errorId, null)); this.errorId = errorId; } |