Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dd4t/dd4t-2-java
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: develop
Choose a base ref
...
head repository: RWS/dd4t-2-java
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 2 commits
  • 85 files changed
  • 1 contributor

Commits on Jul 23, 2024

  1. Copy the full SHA
    25fa559 View commit details

Commits on Jul 24, 2024

  1. Merge pull request #2 from RWS/subtask/UDP-11072

    UDP-11072: lib updates and moving to jakarta namespace
    Snoopman authored Jul 24, 2024
    Copy the full SHA
    c640a2f View commit details
Showing with 273 additions and 239 deletions.
  1. +2 −2 dd4t-api/pom.xml
  2. +1 −1 dd4t-api/src/main/java/org/dd4t/core/request/RequestContext.java
  3. +3 −2 dd4t-bom-2013SP1/pom.xml
  4. +1 −2 dd4t-bom-tridion-9/pom.xml
  5. +22 −17 dd4t-bom/pom.xml
  6. +19 −2 dd4t-caching/pom.xml
  7. +5 −5 dd4t-caching/src/main/java/org/dd4t/caching/jms/impl/JMSCacheMessageListener.java
  8. +1 −1 dd4t-caching/src/main/java/org/dd4t/caching/jms/impl/JMSCacheMonitor.java
  9. +1 −1 dd4t-caching/src/main/java/org/dd4t/caching/jms/impl/JMSErrorHandler.java
  10. +3 −3 dd4t-caching/src/main/java/org/dd4t/caching/jms/impl/JMSExceptionListener.java
  11. +1 −1 dd4t-caching/src/main/java/org/dd4t/caching/jms/impl/JMSTransportListener.java
  12. +1 −1 dd4t-caching/src/test/java/org/dd4t/caching/jms/impl/JMSCacheMessageListenerTest.java
  13. +2 −2 dd4t-compatibility/pom.xml
  14. +1 −1 dd4t-compatibility/src/main/java/org/dd4t/caching/impl/WrappingCacheProvider.java
  15. +1 −1 dd4t-compatibility/src/main/java/org/dd4t/core/factories/impl/GenericComponentFactory.java
  16. +1 −1 dd4t-compatibility/src/main/java/org/dd4t/core/request/impl/BasicRequestContext.java
  17. +2 −3 dd4t-core/pom.xml
  18. +1 −1 dd4t-core/src/main/java/org/dd4t/core/factories/impl/BaseFactory.java
  19. +1 −1 dd4t-core/src/main/java/org/dd4t/core/factories/impl/ComponentPresentationFactoryImpl.java
  20. +1 −1 dd4t-core/src/main/java/org/dd4t/core/factories/impl/PageFactoryImpl.java
  21. +1 −1 dd4t-core/src/main/java/org/dd4t/core/factories/impl/TaxonomyFactoryImpl.java
  22. +1 −2 dd4t-core/src/main/java/org/dd4t/core/processors/impl/DcpResolver.java
  23. +1 −1 dd4t-core/src/main/java/org/dd4t/core/processors/impl/LinkingProcessor.java
  24. +1 −1 dd4t-core/src/main/java/org/dd4t/core/processors/impl/RichTextWithLinksResolver.java
  25. +1 −1 dd4t-core/src/main/java/org/dd4t/core/request/impl/BasicRequestContext.java
  26. +1 −1 dd4t-core/src/main/java/org/dd4t/core/resolvers/impl/DefaultLinkResolver.java
  27. +2 −2 dd4t-core/src/main/java/org/dd4t/core/resolvers/impl/UrlPublicationResolver.java
  28. +1 −1 dd4t-core/src/main/java/org/dd4t/core/serializers/impl/BinaryBuilder.java
  29. +1 −1 dd4t-core/src/main/java/org/dd4t/core/util/HttpRequestContext.java
  30. +7 −7 dd4t-core/src/main/java/org/dd4t/core/util/HttpUtils.java
  31. +1 −1 dd4t-core/src/main/java/org/dd4t/core/util/TridionUtils.java
  32. +5 −5 dd4t-core/src/test/java/org/dd4t/databind/DataBindFactoryTest.java
  33. +2 −2 dd4t-databind/pom.xml
  34. +1 −1 dd4t-databind/src/main/java/org/dd4t/databind/builder/AbstractModelConverter.java
  35. +1 −1 dd4t-databind/src/main/java/org/dd4t/databind/builder/BaseDataBinder.java
  36. +1 −1 dd4t-databind/src/main/java/org/dd4t/databind/builder/json/JsonDataBinder.java
  37. +1 −1 dd4t-databind/src/main/java/org/dd4t/databind/builder/json/JsonModelConverter.java
  38. +34 −36 dd4t-example-site/pom.xml
  39. +8 −8 dd4t-example-site/src/main/java/org/dd4t/servlet/filters/ImageFilter.java
  40. +2 −2 dd4t-example-site/src/main/java/org/dd4t/springmvc/apps/listings/NewsList.java
  41. +2 −2 dd4t-example-site/src/main/java/org/dd4t/springmvc/controller/ContentController.java
  42. +4 −8 dd4t-example-site/src/main/java/org/dd4t/springmvc/controller/DynamicPageContentController.java
  43. +2 −2 dd4t-example-site/src/main/java/org/dd4t/springmvc/controller/DynamicPageController.java
  44. +1 −1 dd4t-example-site/src/main/java/org/dd4t/springmvc/siteedit/SiteEditService.java
  45. +4 −3 dd4t-example-site/src/main/java/org/dd4t/springmvc/view/BaseJSPViewHandler.java
  46. +2 −2 dd4t-example-site/src/main/java/org/dd4t/springmvc/view/BaseViewManager.java
  47. +2 −2 dd4t-example-site/src/main/java/org/dd4t/springmvc/view/IViewHandler.java
  48. +3 −3 dd4t-example-site/src/main/java/org/dd4t/springmvc/view/model/CharResponseWrapper.java
  49. +12 −1 dd4t-example-site/src/main/java/org/dd4t/springmvc/view/model/ServletOutputStreamWrapper.java
  50. +4 −4 dd4t-mvc-support/pom.xml
  51. +3 −2 dd4t-mvc-support/src/main/java/org/dd4t/mvc/controllers/AbstractBaseController.java
  52. +4 −4 dd4t-mvc-support/src/main/java/org/dd4t/mvc/controllers/AbstractBinaryController.java
  53. +2 −2 dd4t-mvc-support/src/main/java/org/dd4t/mvc/controllers/AbstractComponentPresentationController.java
  54. +4 −4 dd4t-mvc-support/src/main/java/org/dd4t/mvc/controllers/AbstractPageController.java
  55. +1 −1 dd4t-mvc-support/src/main/java/org/dd4t/mvc/controllers/SeBlankController.java
  56. +5 −5 dd4t-mvc-support/src/main/java/org/dd4t/mvc/tags/BaseComponentPresentationsTag.java
  57. +5 −5 dd4t-mvc-support/src/main/java/org/dd4t/mvc/tags/RenderDynamicComponentPresentationTag.java
  58. +6 −6 dd4t-mvc-support/src/main/java/org/dd4t/mvc/tags/SmartIncludeTag.java
  59. +4 −4 dd4t-mvc-support/src/main/java/org/dd4t/mvc/tags/XPMComponentFieldTag.java
  60. +3 −3 dd4t-mvc-support/src/main/java/org/dd4t/mvc/tags/XPMComponentPresentationTag.java
  61. +2 −2 dd4t-mvc-support/src/main/java/org/dd4t/mvc/tags/XPMPageInitTag.java
  62. +1 −1 dd4t-mvc-support/src/main/java/org/dd4t/mvc/utils/ComponentUtils.java
  63. +3 −3 dd4t-mvc-support/src/main/java/org/dd4t/mvc/utils/JspBeanContext.java
  64. +0 −2 dd4t-mvc-support/src/main/java/org/dd4t/mvc/utils/PropertiesServiceImpl.java
  65. +5 −5 dd4t-mvc-support/src/main/java/org/dd4t/mvc/utils/RenderUtils.java
  66. +0 −3 dd4t-mvc-support/src/main/java/org/dd4t/mvc/utils/XPMRenderer.java
  67. +1 −1 dd4t-providers-common/src/main/java/org/dd4t/providers/BaseBrokerProvider.java
  68. +1 −1 dd4t-spring-mvc-archetype/src/main/resources/archetype-resources/pom.xml
  69. +2 −2 ...-archetype/src/main/resources/archetype-resources/src/main/java/controllers/BinaryController.java
  70. +1 −1 ...main/resources/archetype-resources/src/main/java/controllers/ComponentPresentationController.java
  71. +2 −2 ...vc-archetype/src/main/resources/archetype-resources/src/main/java/controllers/PageController.java
  72. +20 −8 dd4t-test-spring-web/pom.xml
  73. +2 −2 dd4t-test-spring-web/src/main/java/org/dd4t/test/web/controller/SpringBinaryController.java
  74. +1 −1 ...-spring-web/src/main/java/org/dd4t/test/web/controller/SpringComponentPresentationController.java
  75. +2 −2 dd4t-test-spring-web/src/main/java/org/dd4t/test/web/controller/SpringPageController.java
  76. +1 −1 dd4t-thymeleaf-support/src/main/java/org/dd4t/thymeleaf/dialect/XpmDialect.java
  77. +1 −1 dd4t-web8-archetype/src/main/resources/archetype-resources/pom.xml
  78. +2 −2 ...-archetype/src/main/resources/archetype-resources/src/main/java/controllers/BinaryController.java
  79. +1 −1 ...main/resources/archetype-resources/src/main/java/controllers/ComponentPresentationController.java
  80. +2 −2 ...b8-archetype/src/main/resources/archetype-resources/src/main/java/controllers/PageController.java
  81. +1 −1 pom.xml
  82. +1 −1 spring-mvc-archetype/src/main/resources/archetype-resources/pom.xml
  83. +2 −2 ...-archetype/src/main/resources/archetype-resources/src/main/java/controllers/BinaryController.java
  84. +1 −1 ...main/resources/archetype-resources/src/main/java/controllers/ComponentPresentationController.java
  85. +2 −2 ...vc-archetype/src/main/resources/archetype-resources/src/main/java/controllers/PageController.java
4 changes: 2 additions & 2 deletions dd4t-api/pom.xml
Original file line number Diff line number Diff line change
@@ -129,8 +129,8 @@
<artifactId>joda-time</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@

package org.dd4t.core.request;

import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;

/**
* Bean Interface describes the request which is given to CWA for retrieval. It will at the
5 changes: 3 additions & 2 deletions dd4t-bom-2013SP1/pom.xml
Original file line number Diff line number Diff line change
@@ -39,7 +39,8 @@
</scm>

<properties>
<tridion.build.version>7.1.0</tridion.build.version>
<tridion.build.version>8.5.0-SNAPSHOT</tridion.build.version>
<tridion.cd_ambient.version>7.1.1-228</tridion.cd_ambient.version>
<java-version>1.7</java-version>

<guava.version>17.0</guava.version>
@@ -71,7 +72,7 @@
<dependency>
<groupId>com.tridion</groupId>
<artifactId>cd_ambient</artifactId>
<version>${tridion.build.version}</version>
<version>${tridion.cd_ambient.version}</version>
</dependency>
<dependency>
<groupId>com.tridion</groupId>
3 changes: 1 addition & 2 deletions dd4t-bom-tridion-9/pom.xml
Original file line number Diff line number Diff line change
@@ -77,7 +77,7 @@
<scala-parser-combinators_2.12.version>1.1.1</scala-parser-combinators_2.12.version>
<slf4j.version>1.7.30</slf4j.version>
<snakeyaml.version>1.28</snakeyaml.version>
<spring.version>5.3.18</spring.version>
<spring.version>6.1.10</spring.version>
<stax-ex.version>1.8.1</stax-ex.version>
<txw2.version>2.3.2</txw2.version>
<uap-java.version>1.5.2</uap-java.version>
@@ -260,7 +260,6 @@
</dependency>



<!-- Third party dependencies -->

<dependency>
39 changes: 22 additions & 17 deletions dd4t-bom/pom.xml
Original file line number Diff line number Diff line change
@@ -33,12 +33,13 @@
<jackson.version>2.10.5</jackson.version>
<jackson.databind.version>2.10.5.1</jackson.databind.version>
<javax.cache-api.version>1.1.1</javax.cache-api.version>
<javax.jms.version>1.1-rev-1</javax.jms.version>
<javax.servlet-api.version>4.0.1</javax.servlet-api.version>
<jakarta.jms-api.version>3.1.0</jakarta.jms-api.version>
<jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
<joda-time.version>2.10.3</joda-time.version>
<jsoup.version>1.14.3</jsoup.version>
<jsp-api.version>2.2</jsp-api.version>
<jstl.version>1.2</jstl.version>
<jakarta.jsp-api.version>4.0.0</jakarta.jsp-api.version>
<jakarta-annotation-api.version>3.0.0</jakarta-annotation-api.version>
<jakarta.jstl.version>3.0.0</jakarta.jstl.version>
<slf4j.version>1.7.30</slf4j.version>
<thymeleaf.version>3.0.2.RELEASE</thymeleaf.version>

@@ -70,19 +71,24 @@
<version>${httpcomponents.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet-api.version}</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.servlet-api.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>${jstl.version}</version>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>${jakarta.jstl.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>${jsp-api.version}</version>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<version>${jakarta.jsp-api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta-annotation-api.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -135,11 +141,10 @@
<artifactId>joda-time</artifactId>
<version>${joda-time.version}</version>
</dependency>

<dependency>
<groupId>javax.jms</groupId>
<artifactId>jms-api</artifactId>
<version>${javax.jms.version}</version>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
<version>${jakarta.jms-api.version}</version>
</dependency>

<!-- Only used for JMS cache invalidation -->
21 changes: 19 additions & 2 deletions dd4t-caching/pom.xml
Original file line number Diff line number Diff line change
@@ -162,8 +162,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.jms</groupId>
<artifactId>jms-api</artifactId>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -230,4 +230,21 @@
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration combine.children="append">
<argLine>
--add-opens java.base/java.lang=ALL-UNNAMED
--add-opens java.base/java.util=ALL-UNNAMED
--add-opens java.base/java.util.concurrent=ALL-UNNAMED
--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED
</argLine>
</configuration>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -17,15 +17,15 @@
package org.dd4t.caching.jms.impl;

import com.tridion.cache.CacheEvent;
import jakarta.annotation.Resource;
import org.dd4t.caching.CacheInvalidator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Resource;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageListener;
import javax.jms.ObjectMessage;
import jakarta.jms.JMSException;
import jakarta.jms.Message;
import jakarta.jms.MessageListener;
import jakarta.jms.ObjectMessage;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;

/**
* @author Mihai Cadariu
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.util.ErrorHandler;

import javax.annotation.Resource;
import jakarta.annotation.Resource;

/**
* Spring JMS error handler, alternative to the JMSExceptionListener which isn't always easy to hook up.
Original file line number Diff line number Diff line change
@@ -16,12 +16,12 @@

package org.dd4t.caching.jms.impl;

import jakarta.annotation.Resource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Resource;
import javax.jms.ExceptionListener;
import javax.jms.JMSException;
import jakarta.jms.ExceptionListener;
import jakarta.jms.JMSException;

/**
* @author Mihai Cadariu
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

import org.apache.activemq.transport.TransportListener;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.io.IOException;

/**
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ public void stripNamespaceIfRequired() {
JMSCacheMessageListener messageListener = (JMSCacheMessageListener) applicationContext.getBean
("cacheMessageListener");
assertNotNull(messageListener);
assertEquals("1:233:2222:64", messageListener.stripNamespaceIfRequired(key));
assertEquals("233:2222:64", messageListener.stripNamespaceIfRequired(key));

}
}
4 changes: 2 additions & 2 deletions dd4t-compatibility/pom.xml
Original file line number Diff line number Diff line change
@@ -132,8 +132,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@
*/
package org.dd4t.caching.impl;

import jakarta.annotation.Resource;
import org.dd4t.caching.Cachable;
import org.dd4t.caching.CacheDependency;
import org.dd4t.caching.CacheElement;
@@ -23,7 +24,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Resource;
import java.util.Collection;
import java.util.List;

Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Resource;
import jakarta.annotation.Resource;

/**
* Backwards compatibility class
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
import org.dd4t.core.request.RequestContext;
import org.dd4t.core.util.HttpUtils;

import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;


/**
5 changes: 2 additions & 3 deletions dd4t-core/pom.xml
Original file line number Diff line number Diff line change
@@ -208,11 +208,10 @@
<artifactId>jsoup</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@

package org.dd4t.core.factories.impl;

import jakarta.annotation.Resource;
import org.dd4t.contentmodel.Item;
import org.dd4t.core.databind.DataBinder;
import org.dd4t.core.exceptions.FactoryException;
@@ -25,7 +26,6 @@
import org.dd4t.core.request.RequestContext;
import org.dd4t.providers.PayloadCacheProvider;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;

Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@

package org.dd4t.core.factories.impl;

import jakarta.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.dd4t.caching.CacheElement;
import org.dd4t.contentmodel.ComponentPresentation;
@@ -31,7 +32,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Resource;
import java.text.ParseException;

public class ComponentPresentationFactoryImpl extends BaseFactory implements ComponentPresentationFactory {
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.io.IOException;
import java.text.ParseException;

Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.io.IOException;
import java.text.ParseException;

Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@

package org.dd4t.core.processors.impl;

import jakarta.annotation.Resource;
import org.dd4t.contentmodel.ComponentPresentation;
import org.dd4t.contentmodel.Item;
import org.dd4t.contentmodel.Page;
@@ -26,8 +27,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Resource;

/**
* Pagefactory processor intended to resolve DCP's on pages at the factory level. It checks the page
* being produced, finds the dynamic components (if any), and resolves these components through
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@

package org.dd4t.core.processors.impl;

import jakarta.annotation.Resource;
import org.dd4t.contentmodel.Component;
import org.dd4t.contentmodel.ComponentPresentation;
import org.dd4t.contentmodel.Field;
@@ -35,7 +36,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Resource;
import javax.xml.transform.TransformerException;
import java.util.Collection;
import java.util.HashMap;
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
import org.dd4t.core.resolvers.LinkResolver;
import org.dd4t.core.util.RichTextUtils;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import javax.xml.transform.TransformerException;

/**
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
import org.dd4t.core.request.RequestContext;
import org.dd4t.core.util.HttpUtils;

import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;


/**
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.text.ParseException;
Loading