Removed unused fields and imports

ActiveJpa · Jul 12, 2019 · 1f47a63 · 1f47a63
1 parent 99d17e1
commit 1f47a63
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 14 deletions.
diff --git a/activejpa-core/src/main/java/org/activejpa/enhancer/ModelClassLoader.java b/activejpa-core/src/main/java/org/activejpa/enhancer/ModelClassLoader.java
@@ -5,8 +5,8 @@
 
 import java.util.HashMap;
 
-import net.bytebuddy.dynamic.loading.ByteArrayClassLoader.ChildFirst;
 import net.bytebuddy.agent.ByteBuddyAgent;
+import net.bytebuddy.dynamic.loading.ByteArrayClassLoader.ChildFirst;
 import net.bytebuddy.dynamic.loading.ClassLoadingStrategy;
 import net.bytebuddy.dynamic.loading.PackageDefinitionStrategy;
 

diff --git a/activejpa-core/src/main/java/org/activejpa/entity/Condition.java b/activejpa-core/src/main/java/org/activejpa/entity/Condition.java
@@ -18,7 +18,6 @@
 import org.activejpa.util.ConvertUtil;
 
 import lombok.AccessLevel;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 

diff --git a/activejpa-core/src/main/java/org/activejpa/entity/Filter.java b/activejpa-core/src/main/java/org/activejpa/entity/Filter.java
@@ -38,9 +38,6 @@ public class Filter {
 
 	private boolean cacheable;
 
-	@Getter(AccessLevel.NONE)
-	private boolean shouldPage;
-
 	@Setter(AccessLevel.NONE)
 	private Class entityClass;
 
@@ -156,7 +153,6 @@ public Filter clone(boolean paginate) {
 		filter.sortFields = sortFields;
 		if (paginate) {
 			filter.page(pageNo, perPage);
-			filter.shouldPage = shouldPage;
 		}
 		return filter;
 	}

diff --git a/activejpa-core/src/main/java/org/activejpa/entity/Model.java b/activejpa-core/src/main/java/org/activejpa/entity/Model.java
@@ -21,7 +21,6 @@
 import javax.persistence.metamodel.ManagedType;
 import javax.persistence.metamodel.PluralAttribute;
 
-import org.activejpa.ActiveJpaException;
 import org.activejpa.jpa.JPA;
 import org.activejpa.jpa.JPAContext;
 import org.activejpa.util.BeanUtil;

diff --git a/activejpa-core/src/main/java/org/activejpa/entity/SortField.java b/activejpa-core/src/main/java/org/activejpa/entity/SortField.java
@@ -8,7 +8,6 @@
 import javax.persistence.criteria.Path;
 import javax.persistence.criteria.Root;
 
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 

diff --git a/activejpa-core/src/main/java/org/activejpa/jpa/JPAConfig.java b/activejpa-core/src/main/java/org/activejpa/jpa/JPAConfig.java
@@ -3,8 +3,6 @@
  */
 package org.activejpa.jpa;
 
-import javax.persistence.EntityManagerFactory;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/activejpa-core/src/test/java/org/activejpa/entity/EntityCollectionTest.java b/activejpa-core/src/test/java/org/activejpa/entity/EntityCollectionTest.java
@@ -12,8 +12,8 @@
 import java.util.List;
 import java.util.Set;
 
-import org.activejpa.entity.testng.BaseModelTest;
 import org.activejpa.entity.testng.ActiveJpaAgentObjectFactory;
+import org.activejpa.entity.testng.BaseModelTest;
 import org.activejpa.jpa.JPA;
 import org.testng.IObjectFactory;
 import org.testng.ITestContext;

diff --git a/activejpa-core/src/test/java/org/activejpa/entity/FilterTest.java b/activejpa-core/src/test/java/org/activejpa/entity/FilterTest.java
@@ -9,8 +9,8 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
 
 import java.util.Arrays;
 import java.util.List;

diff --git a/activejpa-core/src/test/java/org/activejpa/entity/ModelInterceptorTest.java b/activejpa-core/src/test/java/org/activejpa/entity/ModelInterceptorTest.java
@@ -10,8 +10,8 @@
 import java.io.Serializable;
 import java.util.List;
 
-import org.activejpa.entity.testng.BaseModelTest;
 import org.activejpa.entity.testng.ActiveJpaAgentObjectFactory;
+import org.activejpa.entity.testng.BaseModelTest;
 import org.activejpa.jpa.JPA;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.testng.IObjectFactory;

diff --git a/activejpa-core/src/test/java/org/activejpa/jpa/JPATest.java b/activejpa-core/src/test/java/org/activejpa/jpa/JPATest.java
@@ -4,11 +4,11 @@
 package org.activejpa.jpa;
 
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotEquals;
 import static org.testng.Assert.assertNotNull;