Merge tag 'MOA-ID-3.1.0' into development_preview

JoinUp Release

8 files changed, 0 insertions, 617 deletions

diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/AbstractPEPSException.java b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/AbstractPEPSException.java
deleted file mode 100644
index e9a96d7c2..000000000
--- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/AbstractPEPSException.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * This work is Open Source and licensed by the European Commission under the
- * conditions of the European Public License v1.1 
- *  
- * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); 
- * 
- * any use of this file implies acceptance of the conditions of this license. 
- * 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 CONDITIONS OF ANY KIND, either express or implied. See the 
- * License for the specific language governing permissions and limitations 
- * under the License.
- */
-package eu.stork.peps.auth.commons.exceptions;
-
-import java.io.Serializable;
-
-/**
- * Abstract class to represent the various PEPS exceptions.
- * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
- * @version $Revision: 1.13 $, $Date: 2010-11-17 05:15:28 $
- */
-public abstract class AbstractPEPSException extends RuntimeException implements
-  Serializable {
-  
-  /**
-   * Unique identifier.
-   */
-  private static final long serialVersionUID = -1884417567740138022L;
-  
-  /**
-   * Error code.
-   */
-  private String errorCode;
-  
-  /**
-   * Error message.
-   */
-  private String errorMessage;
-  
-  /**
-   * SAML token.
-   */
-  private String samlTokenFail;
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters.
-   * 
-   * @param code The error code value.
-   * @param message The error message value.
-   */
-  public AbstractPEPSException(final String code, final String message) {
-    
-    super(message);
-    this.errorCode = code;
-    this.errorMessage = message;
-  }
-  
-  /**
-   * Exception Constructor with the errorMessage as parameters and the Throwable
-   * cause.
-   * 
-   * @param message The error message value.
-   * @param cause The throwable object.
-   */
-  public AbstractPEPSException(final String message, final Throwable cause) {
-    
-    super(message, cause);
-    this.errorMessage = message;
-  }
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters and the Throwable cause.
-   * 
-   * @param code The error code value.
-   * @param message The error message value.
-   * @param cause The throwable object.
-   */
-  public AbstractPEPSException(final String code, final String message,
-    final Throwable cause) {
-    
-    super(message, cause);
-    this.errorCode = code;
-    this.errorMessage = message;
-  }
-  
-  /**
-   * Exception Constructor with three Strings representing the errorCode,
-   * errorMessage and encoded samlToken as parameters.
-   * 
-   * @param code The error code value.
-   * @param message The error message value.
-   * @param samlToken The error SAML Token.
-   */
-  public AbstractPEPSException(final String code, final String message,
-    final String samlToken) {
-    
-    super(message);
-    this.errorCode = code;
-    this.errorMessage = message;
-    this.samlTokenFail = samlToken;
-  }
-  
-  /**
-   * Constructor with SAML Token as argument. Error message and error code are
-   * embedded in the SAML.
-   * 
-   * @param samlToken The error SAML Token.
-   */
-  public AbstractPEPSException(final String samlToken) {
-    super();
-    this.samlTokenFail = samlToken;
-  }
-  
-  /**
-   * Getter for errorCode.
-   * 
-   * @return The errorCode value.
-   */
-  public final String getErrorCode() {
-    return errorCode;
-  }
-  
-  /**
-   * Setter for errorCode.
-   * 
-   * @param code The error code value.
-   */
-  public final void setErrorCode(final String code) {
-    this.errorCode = code;
-  }
-  
-  /**
-   * Getter for errorMessage.
-   * 
-   * @return The error Message value.
-   */
-  public final String getErrorMessage() {
-    return errorMessage;
-  }
-  
-  /**
-   * Setter for errorMessage.
-   * 
-   * @param message The error message value.
-   */
-  public final void setErrorMessage(final String message) {
-    this.errorMessage = message;
-  }
-  
-  /**
-   * Getter for SAMLTokenFail.
-   * 
-   * @return The error SAML Token.
-   */
-  public final String getSamlTokenFail() {
-    return samlTokenFail;
-  }
-  
-  /**
-   * Setter for SAMLTokenFail.
-   * 
-   * @param samlToken The error SAML token.
-   */
-  public final void setSamlTokenFail(final String samlToken) {
-    this.samlTokenFail = samlToken;
-  }
-}
diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/CPEPSException.java b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/CPEPSException.java
deleted file mode 100644
index 69cb20fdd..000000000
--- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/CPEPSException.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * This work is Open Source and licensed by the European Commission under the
- * conditions of the European Public License v1.1 
- *  
- * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); 
- * 
- * any use of this file implies acceptance of the conditions of this license. 
- * 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 CONDITIONS OF ANY KIND, either express or implied. See the 
- * License for the specific language governing permissions and limitations 
- * under the License.
- */
-package eu.stork.peps.auth.commons.exceptions;
-
-/**
- * This exception is thrown by the C-PEPS service and holds the relative
- * information to present to the citizen.
- * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
- * @version $Revision: 1.9 $, $Date: 2010-11-17 05:15:28 $
- */
-public final class CPEPSException extends RuntimeException {
-  
-  /**
-   * Serial id.
-   */
-  private static final long serialVersionUID = -4012295047127999362L;
-  
-  /**
-   * Error code.
-   */
-  private String errorCode;
-  
-  /**
-   * Error message.
-   */
-  private String errorMessage;
-  
-  /**
-   * SAML token.
-   */
-  private String samlTokenFail;
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters.
-   * 
-   * @param samlToken The SAML Token.
-   * @param code The error code value.
-   * @param message The error message value.
-   */
-  public CPEPSException(final String samlToken, final String code,
-    final String message) {
-    
-    super(message);
-    this.setErrorCode(code);
-    this.setErrorMessage(message);
-    this.setSamlTokenFail(samlToken);
-  }
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters.
-   * 
-   * @param samlToken The SAML Token.
-   * @param code The error code value.
-   * @param message The error message value.
-   * @param cause The original exception;
-   */
-  public CPEPSException(final String samlToken, final String code,
-    final String message, final Throwable cause) {
-    
-    super(message, cause);
-    this.setErrorCode(code);
-    this.setErrorMessage(message);
-    this.setSamlTokenFail(samlToken);
-  }
-  
-  /**
-   * {@inheritDoc}
-   */
-  public String getMessage() {
-    return this.getErrorMessage() + " (" + this.getErrorCode() + ")";
-  }
-  
-  /**
-   * Getter for the error code.
-   * 
-   * @return The errorCode value.
-   */
-  public String getErrorCode() {
-    return errorCode;
-  }
-  
-  /**
-   * Setter for the error code.
-   * 
-   * @param code The error code.
-   */
-  public void setErrorCode(final String code) {
-    this.errorCode = code;
-  }
-  
-  /**
-   * Getter for the error message.
-   * 
-   * @return The errorMessage value.
-   */
-  public String getErrorMessage() {
-    return errorMessage;
-  }
-  
-  /**
-   * Setter for the error message.
-   * 
-   * @param message The error message.
-   */
-  public void setErrorMessage(final String message) {
-    this.errorMessage = message;
-  }
-  
-  /**
-   * Getter for the samlTokenFail.
-   * 
-   * @return The samlTokenFail value.
-   */
-  public String getSamlTokenFail() {
-    return samlTokenFail;
-  }
-  
-  /**
-   * Setter for the samlTokenFail.
-   * 
-   * @param samlToken The error Saml Token.
-   */
-  public void setSamlTokenFail(final String samlToken) {
-    this.samlTokenFail = samlToken;
-  }
-  
-}
diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InternalErrorPEPSException.java b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InternalErrorPEPSException.java
deleted file mode 100644
index 67514d4fe..000000000
--- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InternalErrorPEPSException.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * This work is Open Source and licensed by the European Commission under the
- * conditions of the European Public License v1.1 
- *  
- * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); 
- * 
- * any use of this file implies acceptance of the conditions of this license. 
- * 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 CONDITIONS OF ANY KIND, either express or implied. See the 
- * License for the specific language governing permissions and limitations 
- * under the License.
- */
-package eu.stork.peps.auth.commons.exceptions;
-
-/**
- * Internal Error Exception class.
- * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
- * @version $Revision: 1.13 $, $Date: 2010-11-17 05:15:28 $
- * 
- * @see AbstractPEPSException
- */
-public final class InternalErrorPEPSException extends AbstractPEPSException {
-  
-  /**
-   * Unique identifier.
-   */
-  private static final long serialVersionUID = 1193001455410319795L;
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters and the Throwable cause.
-   * 
-   * @param errorCode The error code value.
-   * @param errorMessage The error message value.
-   * @param cause The throwable object.
-   */
-  public InternalErrorPEPSException(final String errorCode,
-    final String errorMessage, final Throwable cause) {
-    
-    super(errorCode, errorMessage, cause);
-  }
-  
-  /**
-   * Exception Constructor with three strings representing the errorCode,
-   * errorMessage and encoded samlToken as parameters.
-   * 
-   * @param errorCode The error code value.
-   * @param errorMessage The error message value.
-   * @param samlTokenFail The error SAML Token.
-   */
-  public InternalErrorPEPSException(final String errorCode,
-    final String errorMessage, final String samlTokenFail) {
-    
-    super(errorCode, errorMessage, samlTokenFail);
-  }
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters.
-   * 
-   * @param errorCode The error code value.
-   * @param errorMessage The error message value.
-   */
-  public InternalErrorPEPSException(final String errorCode,
-    final String errorMessage) {
-    
-    super(errorCode, errorMessage);
-  }
-   
-}
diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidParameterPEPSException.java b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidParameterPEPSException.java
deleted file mode 100644
index 12c83b589..000000000
--- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidParameterPEPSException.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * This work is Open Source and licensed by the European Commission under the
- * conditions of the European Public License v1.1 
- *  
- * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); 
- * 
- * any use of this file implies acceptance of the conditions of this license. 
- * 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 CONDITIONS OF ANY KIND, either express or implied. See the 
- * License for the specific language governing permissions and limitations 
- * under the License.
- */
-package eu.stork.peps.auth.commons.exceptions;
-
-/**
- * Invalid Parameter Exception class.
- * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
- * @version $Revision: 1.11 $, $Date: 2010-11-17 05:15:28 $
- * 
- * @see InvalidParameterPEPSException
- */
-public class InvalidParameterPEPSException extends AbstractPEPSException {
-  
-  /**
-   * Unique identifier.
-   */
-  private static final long serialVersionUID = 2046282148740524875L;
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters.
-   * 
-   * @param errorCode The error code value.
-   * @param errorMessage The error code message value.
-   */
-  public InvalidParameterPEPSException(final String errorCode,
-    final String errorMessage) {
-    super(errorCode, errorMessage);
-  }
-  
-  /**
-   * Exception Constructor with one String representing the encoded samlToken.
-   * 
-   * @param samlTokenFail The error SAML Token.
-   */
-  public InvalidParameterPEPSException(final String samlTokenFail) {
-    super(samlTokenFail);
-  }
-  
-}
diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidSessionPEPSException.java b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidSessionPEPSException.java
deleted file mode 100644
index 800525eee..000000000
--- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidSessionPEPSException.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * This work is Open Source and licensed by the European Commission under the
- * conditions of the European Public License v1.1 
- *  
- * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); 
- * 
- * any use of this file implies acceptance of the conditions of this license. 
- * 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 CONDITIONS OF ANY KIND, either express or implied. See the 
- * License for the specific language governing permissions and limitations 
- * under the License.
- */
-package eu.stork.peps.auth.commons.exceptions;
-
-/**
- * Invalid session Exception class.
- * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
- * @version $Revision: 1.14 $, $Date: 2010-11-17 05:15:28 $
- * 
- * @see InvalidParameterPEPSException
- */
-public class InvalidSessionPEPSException extends InvalidParameterPEPSException {
-  
-  /**
-   * Unique identifier.
-   */
-  private static final long serialVersionUID = 7147090160978319016L;
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters.
-   * 
-   * @param errorCode The error code value.
-   * @param errorMessage The error message value.
-   */
-  public InvalidSessionPEPSException(final String errorCode,
-    final String errorMessage) {
-    
-    super(errorCode, errorMessage);
-  }
-  
-}
diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/SecurityPEPSException.java b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/SecurityPEPSException.java
deleted file mode 100644
index fc27371d2..000000000
--- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/SecurityPEPSException.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * This work is Open Source and licensed by the European Commission under the
- * conditions of the European Public License v1.1 
- *  
- * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); 
- * 
- * any use of this file implies acceptance of the conditions of this license. 
- * 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 CONDITIONS OF ANY KIND, either express or implied. See the 
- * License for the specific language governing permissions and limitations 
- * under the License.
- */
-package eu.stork.peps.auth.commons.exceptions;
-
-/**
- * Security PEPS Exception class.
- * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
- * @version $Revision: 1.18 $, $Date: 2010-11-17 05:15:28 $
- * 
- * @see AbstractPEPSException
- */
-public final class SecurityPEPSException extends AbstractPEPSException {
-  
-  /**
-   * Unique identifier.
-   */
-  private static final long serialVersionUID = 5605743302478554967L;
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters.
-   * 
-   * @param errorCode The error code value.
-   * @param errorMsg The error message value.
-   */
-  public SecurityPEPSException(final String errorCode, final String errorMsg) {
-    super(errorCode, errorMsg);
-  }
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters and the Throwable cause.
-   * 
-   * @param errorCode The error code value.
-   * @param errorMessage The error message value.
-   * @param cause The throwable object.
-   */
-  public SecurityPEPSException(final String errorCode,
-    final String errorMessage, final Throwable cause) {
-    
-    super(errorCode, errorMessage, cause);
-  }
-  
-  /**
-   * Exception Constructor with one String representing the encoded samlToken.
-   * 
-   * @param samlTokenFail The error SAML Token.
-   */
-  public SecurityPEPSException(final String samlTokenFail) {
-    super(samlTokenFail);
-  }
-  
-}
diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/StorkPEPSException.java b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/StorkPEPSException.java
deleted file mode 100644
index a2da61a02..000000000
--- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/StorkPEPSException.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This work is Open Source and licensed by the European Commission under the
- * conditions of the European Public License v1.1 
- *  
- * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); 
- * 
- * any use of this file implies acceptance of the conditions of this license. 
- * 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 CONDITIONS OF ANY KIND, either express or implied. See the 
- * License for the specific language governing permissions and limitations 
- * under the License.
- */
-package eu.stork.peps.auth.commons.exceptions;
-
-/**
- * Security PEPS Exception class.
- * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
- * @version $Revision: 1.15 $, $Date: 2010-11-17 05:15:28 $
- * 
- * @see AbstractPEPSException
- */
-public final class StorkPEPSException extends AbstractPEPSException {
-  
-  /**
-   * Unique identifier.
-   */
-  private static final long serialVersionUID = 8048033129798427574L;
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters.
-   * 
-   * @param errorCode The error code value.
-   * @param errorMsg The error message value.
-   */
-  public StorkPEPSException(final String errorCode, final String errorMsg) {
-    super(errorCode, errorMsg);
-  }
-  
-  /**
-   * {@inheritDoc}
-   */
-  public String getMessage() {
-    
-    return "Security Error (" + this.getErrorCode() + ") processing request : "
-      + this.getErrorMessage();
-  }
-  
-}
diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/package-info.java b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/package-info.java
deleted file mode 100644
index 1a3c57329..000000000
--- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Package for the PEPS’ Exceptions handling.
- * 
- * @since 1.0
- */
-package eu.stork.peps.auth.commons.exceptions;
-