Clean up a lot of dangling imports

stickfigure · stickfigure · commit 5dd33941e0a3 · 2023-11-15T11:47:59.000-08:00
diff --git a/src/main/java/com/googlecode/objectify/cmd/DeferredDeleteIds.java b/src/main/java/com/googlecode/objectify/cmd/DeferredDeleteIds.java
@@ -1,8 +1,5 @@
 package com.googlecode.objectify.cmd;
 
-import com.googlecode.objectify.Result;
-
-
 /**
  * <p>Terminator methods for a delete-by-key command chain which constructs the key implicitly from
  * type, id, and (optionally) parent.</p>
diff --git a/src/main/java/com/googlecode/objectify/cmd/Loader.java b/src/main/java/com/googlecode/objectify/cmd/Loader.java
@@ -12,7 +12,6 @@
 import java.util.Date;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 
 
 /**
diff --git a/src/main/java/com/googlecode/objectify/cmd/SimpleQuery.java b/src/main/java/com/googlecode/objectify/cmd/SimpleQuery.java
@@ -1,15 +1,9 @@
 package com.googlecode.objectify.cmd;
 
-import com.google.cloud.datastore.AggregationQuery;
 import com.google.cloud.datastore.AggregationResult;
-import com.google.cloud.datastore.AggregationResults;
 import com.google.cloud.datastore.Cursor;
-import com.google.cloud.datastore.Query;
 import com.google.cloud.datastore.aggregation.Aggregation;
 import com.google.cloud.datastore.aggregation.AggregationBuilder;
-import com.google.common.collect.Iterables;
-
-import static com.google.cloud.datastore.aggregation.Aggregation.count;
 
 
 /**
diff --git a/src/main/java/com/googlecode/objectify/impl/LoadConditions.java b/src/main/java/com/googlecode/objectify/impl/LoadConditions.java
@@ -2,6 +2,7 @@
 
 import com.googlecode.objectify.annotation.Load;
 import com.googlecode.objectify.annotation.Parent;
+
 import java.util.Set;
 
 /** 
diff --git a/src/main/java/com/googlecode/objectify/impl/QueryEngine.java b/src/main/java/com/googlecode/objectify/impl/QueryEngine.java
@@ -18,8 +18,6 @@
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
-import static com.google.cloud.datastore.aggregation.Aggregation.count;
-
 /**
  * Logic for dealing with queries.
  *
diff --git a/src/main/java/com/googlecode/objectify/impl/translate/InstantTranslatorFactory.java b/src/main/java/com/googlecode/objectify/impl/translate/InstantTranslatorFactory.java
@@ -1,7 +1,6 @@
 package com.googlecode.objectify.impl.translate;
 
 import com.google.cloud.Timestamp;
-import com.google.cloud.datastore.BooleanValue;
 import com.google.cloud.datastore.TimestampValue;
 import com.google.cloud.datastore.Value;
 import com.google.cloud.datastore.ValueType;
diff --git a/src/test/java/com/googlecode/objectify/test/BasicCacheTests.java b/src/test/java/com/googlecode/objectify/test/BasicCacheTests.java
@@ -12,22 +12,17 @@
 import com.googlecode.objectify.cache.spymemcached.SpyMemcacheService;
 import com.googlecode.objectify.impl.AsyncDatastore;
 import com.googlecode.objectify.test.entity.Trivial;
-import com.googlecode.objectify.test.util.LocalDatastoreExtension;
-import com.googlecode.objectify.test.util.TestBase;
 import com.googlecode.objectify.util.Closeable;
 import net.spy.memcached.MemcachedClient;
-import org.junit.After;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.googlecode.objectify.ObjectifyService.factory;
-import static com.googlecode.objectify.ObjectifyService.init;
 import static com.googlecode.objectify.ObjectifyService.ofy;
 
 /**
diff --git a/src/test/java/com/googlecode/objectify/test/LifecycleTests2.java b/src/test/java/com/googlecode/objectify/test/LifecycleTests2.java
@@ -1,15 +1,14 @@
 package com.googlecode.objectify.test;
 
-import lombok.Data;
-import org.junit.jupiter.api.Test;
-
 import com.googlecode.objectify.Ref;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.Load;
 import com.googlecode.objectify.annotation.OnLoad;
 import com.googlecode.objectify.annotation.Parent;
 import com.googlecode.objectify.test.util.TestBase;
+import lombok.Data;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.googlecode.objectify.ObjectifyService.factory;
diff --git a/src/test/java/com/googlecode/objectify/test/LifecycleTests3.java b/src/test/java/com/googlecode/objectify/test/LifecycleTests3.java
@@ -1,15 +1,14 @@
 package com.googlecode.objectify.test;
 
-import lombok.Data;
-import org.junit.jupiter.api.Test;
-
 import com.googlecode.objectify.Ref;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.Load;
 import com.googlecode.objectify.annotation.OnLoad;
 import com.googlecode.objectify.annotation.Parent;
 import com.googlecode.objectify.test.util.TestBase;
+import lombok.Data;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.googlecode.objectify.ObjectifyService.factory;
diff --git a/src/test/java/com/googlecode/objectify/test/LoadCyclesComplexTest.java b/src/test/java/com/googlecode/objectify/test/LoadCyclesComplexTest.java
@@ -13,8 +13,8 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.googlecode.objectify.ObjectifyService.ofy;
 import static com.googlecode.objectify.ObjectifyService.factory;
+import static com.googlecode.objectify.ObjectifyService.ofy;
 
 /**
  * This test was contributed: https://code.google.com/p/objectify-appengine/issues/detail?id=144
diff --git a/src/test/java/com/googlecode/objectify/test/LoadCyclesDeeperTest.java b/src/test/java/com/googlecode/objectify/test/LoadCyclesDeeperTest.java
@@ -1,18 +1,17 @@
 package com.googlecode.objectify.test;
 
-import lombok.Data;
-import org.junit.jupiter.api.Test;
-
 import com.googlecode.objectify.Ref;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.Load;
 import com.googlecode.objectify.annotation.Parent;
 import com.googlecode.objectify.test.util.TestBase;
+import lombok.Data;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.googlecode.objectify.ObjectifyService.ofy;
 import static com.googlecode.objectify.ObjectifyService.factory;
+import static com.googlecode.objectify.ObjectifyService.ofy;
 
 /**
  * This test was contributed: https://code.google.com/p/objectify-appengine/issues/detail?id=144
diff --git a/src/test/java/com/googlecode/objectify/test/LoadCyclesParentTest.java b/src/test/java/com/googlecode/objectify/test/LoadCyclesParentTest.java
@@ -1,18 +1,17 @@
 package com.googlecode.objectify.test;
 
-import lombok.Data;
-import org.junit.jupiter.api.Test;
-
 import com.googlecode.objectify.Ref;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.Load;
 import com.googlecode.objectify.annotation.Parent;
 import com.googlecode.objectify.test.util.TestBase;
+import lombok.Data;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.googlecode.objectify.ObjectifyService.ofy;
 import static com.googlecode.objectify.ObjectifyService.factory;
+import static com.googlecode.objectify.ObjectifyService.ofy;
 
 /**
  * This test was contributed: https://code.google.com/p/objectify-appengine/issues/detail?id=144
diff --git a/src/test/java/com/googlecode/objectify/test/LoadCyclesTest.java b/src/test/java/com/googlecode/objectify/test/LoadCyclesTest.java
@@ -1,16 +1,15 @@
 package com.googlecode.objectify.test;
 
-import org.junit.jupiter.api.Test;
-
 import com.googlecode.objectify.Ref;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.Load;
 import com.googlecode.objectify.test.util.TestBase;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.googlecode.objectify.ObjectifyService.ofy;
 import static com.googlecode.objectify.ObjectifyService.factory;
+import static com.googlecode.objectify.ObjectifyService.ofy;
 
 /**
  * This test was contributed: https://code.google.com/p/objectify-appengine/issues/detail?id=144
diff --git a/src/test/java/com/googlecode/objectify/test/LoadGroupTransitiveTest.java b/src/test/java/com/googlecode/objectify/test/LoadGroupTransitiveTest.java
@@ -1,18 +1,17 @@
 package com.googlecode.objectify.test;
 
-import lombok.Data;
-import org.junit.jupiter.api.Test;
-
 import com.googlecode.objectify.Ref;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.Index;
 import com.googlecode.objectify.annotation.Load;
 import com.googlecode.objectify.test.util.TestBase;
+import lombok.Data;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.googlecode.objectify.ObjectifyService.ofy;
 import static com.googlecode.objectify.ObjectifyService.factory;
+import static com.googlecode.objectify.ObjectifyService.ofy;
 
 /**
  * This test was contributed: https://code.google.com/p/objectify-appengine/issues/detail?id=144
diff --git a/src/test/java/com/googlecode/objectify/test/LotsOfKeysTests.java b/src/test/java/com/googlecode/objectify/test/LotsOfKeysTests.java
@@ -12,7 +12,6 @@
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 import java.util.stream.LongStream;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/src/test/java/com/googlecode/objectify/test/MapifyTests.java b/src/test/java/com/googlecode/objectify/test/MapifyTests.java
@@ -10,7 +10,6 @@
 import com.googlecode.objectify.mapper.Mapper;
 import com.googlecode.objectify.test.entity.Trivial;
 import com.googlecode.objectify.test.util.TestBase;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
diff --git a/src/test/java/com/googlecode/objectify/test/QueryCollectionTests.java b/src/test/java/com/googlecode/objectify/test/QueryCollectionTests.java
@@ -9,6 +9,7 @@
 import com.googlecode.objectify.test.util.TestBase;
 import lombok.Data;
 import org.junit.jupiter.api.Test;
+
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/src/test/java/com/googlecode/objectify/test/QueryTests.java b/src/test/java/com/googlecode/objectify/test/QueryTests.java
@@ -18,12 +18,9 @@
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.googlecode.objectify.ObjectifyService.factory;
diff --git a/src/test/java/com/googlecode/objectify/test/RefTests.java b/src/test/java/com/googlecode/objectify/test/RefTests.java
@@ -6,22 +6,11 @@
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.LoadResult;
 import com.googlecode.objectify.Ref;
-import com.googlecode.objectify.annotation.Entity;
-import com.googlecode.objectify.annotation.Id;
-import com.googlecode.objectify.annotation.Load;
 import com.googlecode.objectify.test.entity.Trivial;
 import com.googlecode.objectify.test.util.TestBase;
-import lombok.Data;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-
 import static com.google.common.truth.Truth.assertThat;
 import static com.googlecode.objectify.ObjectifyService.factory;
 import static com.googlecode.objectify.ObjectifyService.ofy;
diff --git a/src/test/java/com/googlecode/objectify/test/RegisterTests.java b/src/test/java/com/googlecode/objectify/test/RegisterTests.java
@@ -1,13 +1,12 @@
 package com.googlecode.objectify.test;
 
-import lombok.Data;
-import org.junit.jupiter.api.Test;
-
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.Cache;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.test.util.TestBase;
+import lombok.Data;
+import org.junit.jupiter.api.Test;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.googlecode.objectify.ObjectifyService.factory;
diff --git a/src/test/java/com/googlecode/objectify/test/RemoteQueryTests.java b/src/test/java/com/googlecode/objectify/test/RemoteQueryTests.java
@@ -24,12 +24,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static com.googlecode.objectify.ObjectifyService.factory;
 import static com.googlecode.objectify.ObjectifyService.ofy;
-import static com.googlecode.objectify.cmd.Filter.equalTo;
-import static com.googlecode.objectify.cmd.Filter.greaterThan;
-import static com.googlecode.objectify.cmd.Filter.greaterThanOrEqualTo;
 import static com.googlecode.objectify.cmd.Filter.in;
-import static com.googlecode.objectify.cmd.Filter.lessThan;
-import static com.googlecode.objectify.cmd.Filter.lessThanOrEqualTo;
 import static com.googlecode.objectify.cmd.Filter.notEqualTo;
 import static com.googlecode.objectify.cmd.Filter.notIn;
 
diff --git a/src/test/java/com/googlecode/objectify/test/SerializeTests.java b/src/test/java/com/googlecode/objectify/test/SerializeTests.java
@@ -5,7 +5,6 @@
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.Serialize;
-import com.googlecode.objectify.impl.ObjectifyImpl;
 import com.googlecode.objectify.test.util.TestBase;
 import com.googlecode.objectify.util.Closeable;
 import lombok.Data;
diff --git a/src/test/java/com/googlecode/objectify/test/entity/Trivial.java b/src/test/java/com/googlecode/objectify/test/entity/Trivial.java
@@ -10,6 +10,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+
 import java.io.Serializable;
 
 /**
diff --git a/src/test/java/com/googlecode/objectify/test/util/RemoteObjectifyExtension.java b/src/test/java/com/googlecode/objectify/test/util/RemoteObjectifyExtension.java
@@ -1,7 +1,6 @@
 package com.googlecode.objectify.test.util;
 
 import com.google.cloud.datastore.Datastore;
-import com.google.cloud.datastore.testing.LocalDatastoreHelper;
 import com.google.cloud.datastore.testing.RemoteDatastoreHelper;
 import com.google.common.base.Preconditions;
 import com.googlecode.objectify.ObjectifyFactory;

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@`
`18`	`18`	`import lombok.SneakyThrows;`
`19`	`19`	`import lombok.extern.slf4j.Slf4j;`
`20`	`20`
`21`		`-import static com.google.cloud.datastore.aggregation.Aggregation.count;`
`22`		`-`
`23`	`21`	`/**`
`24`	`22`	`* Logic for dealing with queries.`
`25`	`23`	`*`