From 9faf43a6c4b933b5f97be4348d461bf91f5bf2e2 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Mon, 24 Oct 2022 01:09:32 +0300 Subject: Spring Boot 3 --- src/main/java/com/juick/util/adapters/SimpleDateAdapter.java | 3 ++- src/main/java/com/juick/util/xmpp/JidConverter.java | 4 +--- src/main/java/com/juick/util/xmpp/iq/MessageQuery.java | 2 +- src/main/java/com/juick/util/xmpp/iq/package-info.java | 8 ++++---- 4 files changed, 8 insertions(+), 9 deletions(-) (limited to 'src/main/java/com/juick/util') diff --git a/src/main/java/com/juick/util/adapters/SimpleDateAdapter.java b/src/main/java/com/juick/util/adapters/SimpleDateAdapter.java index 46d4cc47..664a37a0 100644 --- a/src/main/java/com/juick/util/adapters/SimpleDateAdapter.java +++ b/src/main/java/com/juick/util/adapters/SimpleDateAdapter.java @@ -19,7 +19,8 @@ package com.juick.util.adapters; import com.juick.util.DateFormattersHolder; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; + import java.time.Instant; /** diff --git a/src/main/java/com/juick/util/xmpp/JidConverter.java b/src/main/java/com/juick/util/xmpp/JidConverter.java index f2add967..4f457164 100644 --- a/src/main/java/com/juick/util/xmpp/JidConverter.java +++ b/src/main/java/com/juick/util/xmpp/JidConverter.java @@ -21,12 +21,10 @@ import org.springframework.core.convert.converter.Converter; import org.springframework.lang.Nullable; import rocks.xmpp.addr.Jid; -import javax.annotation.Nonnull; - public class JidConverter implements Converter { @Nullable @Override - public Jid convert(@Nonnull String jidStr) { + public Jid convert(String jidStr) { return Jid.of(jidStr); } } diff --git a/src/main/java/com/juick/util/xmpp/iq/MessageQuery.java b/src/main/java/com/juick/util/xmpp/iq/MessageQuery.java index 8a8d5614..aa1c1573 100644 --- a/src/main/java/com/juick/util/xmpp/iq/MessageQuery.java +++ b/src/main/java/com/juick/util/xmpp/iq/MessageQuery.java @@ -17,7 +17,7 @@ package com.juick.util.xmpp.iq; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "query") public class MessageQuery { diff --git a/src/main/java/com/juick/util/xmpp/iq/package-info.java b/src/main/java/com/juick/util/xmpp/iq/package-info.java index 6d0395b1..cf8dcd4d 100644 --- a/src/main/java/com/juick/util/xmpp/iq/package-info.java +++ b/src/main/java/com/juick/util/xmpp/iq/package-info.java @@ -19,7 +19,7 @@ @XmlSchema(namespace = "http://juick.com/", elementFormDefault = XmlNsForm.QUALIFIED) package com.juick.util.xmpp.iq; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; \ No newline at end of file +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; \ No newline at end of file -- cgit v1.2.3