From 085b2fdf2c58f71bbf6ed5fb36f916efb9026058 Mon Sep 17 00:00:00 2001 From: Thomas <> Date: Mon, 11 Sep 2023 12:12:18 +0200 Subject: chore(core): remove some deprecated API methods --- eaaf_core/pom.xml | 5 +++++ .../eaaf/core/impl/idp/controller/protocols/RequestImpl.java | 12 +++++------- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'eaaf_core') diff --git a/eaaf_core/pom.xml b/eaaf_core/pom.xml index ad0ab63c..e93e4d38 100644 --- a/eaaf_core/pom.xml +++ b/eaaf_core/pom.xml @@ -41,6 +41,11 @@ spring-webmvc provided + + org.springframework + spring-context + provided + com.fasterxml.jackson.dataformat diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/protocols/RequestImpl.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/protocols/RequestImpl.java index 92bf8af3..3b3e7cd8 100644 --- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/protocols/RequestImpl.java +++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/protocols/RequestImpl.java @@ -29,11 +29,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.UUID; -import javax.annotation.Nonnull; - import org.apache.commons.lang3.StringUtils; -import org.springframework.lang.NonNull; -import org.springframework.lang.Nullable; import org.springframework.util.Assert; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -56,6 +52,8 @@ import at.gv.egiz.eaaf.core.impl.json.EscapedJsonDeserializer; import at.gv.egiz.eaaf.core.impl.json.EscapedJsonSerializer; import at.gv.egiz.eaaf.core.impl.utils.DefaultJsonMapper; import at.gv.egiz.eaaf.core.impl.utils.TransactionIdUtils; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import jakarta.servlet.http.HttpServletRequest; import lombok.AllArgsConstructor; import lombok.Builder; @@ -156,8 +154,8 @@ public abstract class RequestImpl implements IRequest, Serializable { * @throws EaafException * */ - public final void initialize(@NonNull final HttpServletRequest req, - @NonNull final IConfigurationWithSP authConfig, @Nullable final String transactionId, + public final void initialize(@Nonnull final HttpServletRequest req, + @Nonnull final IConfigurationWithSP authConfig, @Nullable final String transactionId, @Nullable final String piiTransactionId) throws EaafException { // use external transactionId or create new one if empty or null @@ -275,7 +273,7 @@ public abstract class RequestImpl implements IRequest, Serializable { } @Override - @NonNull + @Nonnull public final String getPendingRequestId() { if (pendingRequestId == null) { throw new IllegalStateException("No PendingRequestId set!!!"); -- cgit v1.2.3