Replace Java EE 8 with Jakarta EE 9 bits.

Replace all javax package namespace imports with jakarta packages.

Declare the jakarta.annotations:jakarta.annotations-api dependency in the spring-geode-autoconfigure module.
This commit is contained in:
John Blum
2022-01-12 12:10:58 -08:00
parent ed1aa69a39
commit a069263ca5
40 changed files with 59 additions and 57 deletions

View File

@@ -10,6 +10,8 @@ dependencies {
implementation project(":spring-geode")
implementation "jakarta.annotation:jakarta.annotation-api"
compileOnly "com.google.code.findbugs:jsr305:$findbugsVersion"
optional project(':apache-geode-extensions')

View File

@@ -20,7 +20,7 @@ import static org.springframework.data.gemfire.util.CollectionUtils.asSet;
import java.util.Optional;
import java.util.Set;
import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;
import org.apache.geode.cache.GemFireCache;

View File

@@ -17,7 +17,7 @@ package org.springframework.geode.boot.autoconfigure.caching;
import static org.assertj.core.api.Assertions.assertThat;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.FixMethodOrder;
import org.junit.Test;

View File

@@ -17,7 +17,7 @@ package org.springframework.geode.boot.autoconfigure.caching;
import static org.assertj.core.api.Assertions.assertThat;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.Before;
import org.junit.Test;

View File

@@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.Before;
import org.junit.BeforeClass;

View File

@@ -17,7 +17,7 @@ package org.springframework.geode.boot.autoconfigure.repository;
import static org.assertj.core.api.Assertions.assertThat;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.FixMethodOrder;
import org.junit.Test;

View File

@@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.net.URI;
import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.Resource;
import javax.servlet.http.HttpSession;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpSession;
import org.junit.AfterClass;
import org.junit.Before;

View File

@@ -21,8 +21,8 @@ import java.io.IOException;
import java.net.URI;
import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.Resource;
import javax.servlet.http.HttpSession;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpSession;
import org.junit.Before;
import org.junit.BeforeClass;

View File

@@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.concurrent.TimeUnit;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.Before;
import org.junit.Test;

View File

@@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.Before;
import org.junit.Test;

View File

@@ -17,7 +17,7 @@ package org.springframework.geode.boot.autoconfigure.template;
import static org.assertj.core.api.Assertions.assertThat;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.Test;
import org.junit.runner.RunWith;

View File

@@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.Before;
import org.junit.Test;

View File

@@ -17,7 +17,7 @@ package org.springframework.geode.boot.autoconfigure.template;
import static org.assertj.core.api.Assertions.assertThat;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.Test;
import org.junit.runner.RunWith;

View File

@@ -17,7 +17,7 @@ package org.springframework.geode.boot.autoconfigure.template;
import static org.assertj.core.api.Assertions.assertThat;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.Test;
import org.junit.runner.RunWith;

View File

@@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.AfterClass;
import org.junit.Before;

View File

@@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.AfterClass;
import org.junit.Before;

View File

@@ -17,7 +17,7 @@ package example.app.crm;
import static org.assertj.core.api.Assertions.assertThat;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.Before;
import org.junit.Test;

View File

@@ -21,7 +21,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import javax.servlet.http.HttpSession;
import jakarta.servlet.http.HttpSession;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;

View File

@@ -19,8 +19,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.time.Instant;
import javax.annotation.Resource;
import javax.servlet.http.HttpSession;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpSession;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;

View File

@@ -15,8 +15,8 @@
*/
package example.app.caching.inline.async.client.model;
import javax.persistence.Entity;
import javax.persistence.Table;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;
import org.springframework.data.annotation.Id;
import org.springframework.util.Assert;

View File

@@ -22,7 +22,7 @@ import java.util.Random;
import java.util.Set;
import java.util.function.Function;
import javax.annotation.PreDestroy;
import jakarta.annotation.PreDestroy;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable;

View File

@@ -21,7 +21,7 @@ import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newI
import java.time.Duration;
import java.util.Optional;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.Before;
import org.junit.Test;

View File

@@ -21,7 +21,7 @@ import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newI
import java.time.Duration;
import java.util.Optional;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.Before;
import org.junit.Test;

View File

@@ -17,12 +17,12 @@ package example.app.caching.inline.model;
import java.io.Serializable;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.Id;
import javax.persistence.IdClass;
import javax.persistence.Table;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.Id;
import jakarta.persistence.IdClass;
import jakarta.persistence.Table;
import lombok.EqualsAndHashCode;
import lombok.Getter;

View File

@@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.Before;
import org.junit.Test;

View File

@@ -17,7 +17,7 @@ package example.app.caching.lookaside;
import static org.assertj.core.api.Assertions.assertThat;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.apache.geode.cache.Region;

View File

@@ -19,9 +19,9 @@ import java.time.Duration;
import java.util.Collections;
import java.util.Enumeration;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionContext;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpSession;
import jakarta.servlet.http.HttpSessionContext;
import org.springframework.lang.NonNull;
import org.springframework.session.Session;

View File

@@ -15,8 +15,8 @@
*/
package org.springframework.session.web.servlet.http;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession;
import org.springframework.geode.core.util.ObjectUtils;
import org.springframework.lang.Nullable;

View File

@@ -20,7 +20,7 @@ import static org.mockito.Mockito.spy;
import java.util.concurrent.atomic.AtomicReference;
import javax.servlet.http.HttpSession;
import jakarta.servlet.http.HttpSession;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpSession;

View File

@@ -20,8 +20,8 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Objects;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionContext;
import jakarta.servlet.http.HttpSession;
import jakarta.servlet.http.HttpSessionContext;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable;

View File

@@ -17,9 +17,9 @@ package org.springframework.web.servlet.http;
import java.util.Enumeration;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionContext;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpSession;
import jakarta.servlet.http.HttpSessionContext;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable;

View File

@@ -24,7 +24,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import javax.servlet.http.HttpSession;
import jakarta.servlet.http.HttpSession;
import org.junit.Test;
import org.junit.runner.RunWith;

View File

@@ -15,9 +15,9 @@
*/
package example.app.model;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;
import org.springframework.data.annotation.Id;
import org.springframework.lang.NonNull;

View File

@@ -15,8 +15,8 @@
*/
package example.app.crm.model;
import javax.persistence.Entity;
import javax.persistence.Table;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;
import org.springframework.data.annotation.Id;
import org.springframework.data.cassandra.core.mapping.Indexed;

View File

@@ -32,7 +32,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.Before;
import org.junit.Test;

View File

@@ -31,7 +31,7 @@ import java.util.Collections;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.Before;
import org.junit.Test;

View File

@@ -17,7 +17,7 @@ package org.springframework.geode.config.annotation;
import static org.assertj.core.api.Assertions.assertThat;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.AfterClass;
import org.junit.Before;

View File

@@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.AfterClass;
import org.junit.Before;

View File

@@ -17,7 +17,7 @@ package org.springframework.geode.config.annotation;
import static org.assertj.core.api.Assertions.assertThat;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.AfterClass;
import org.junit.Before;

View File

@@ -17,7 +17,7 @@ package org.springframework.geode.config.annotation;
import static org.assertj.core.api.Assertions.assertThat;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import org.junit.AfterClass;
import org.junit.Before;