[GitHub] [jackrabbit-oak] anchela commented on a diff in pull request #896: OAK-10186: switch oak-store-spi to shaded guava

["anchela (via GitHub)" <gi...@apache.org>]

anchela commented on code in PR #896:
URL: https://github.com/apache/jackrabbit-oak/pull/896#discussion_r1165062968


##########
oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java:
##########
@@ -88,6 +86,9 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;

Review Comment:
   shouldn't those 2 imports also be replaced by org.apache.jackrabbit.guava.common.* ?



##########
oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java:
##########
@@ -18,9 +18,9 @@
  */
 package org.apache.jackrabbit.oak.composite;
 
-import static com.google.common.base.Predicates.compose;
-import static com.google.common.collect.Iterables.filter;
 import static com.google.common.collect.Lists.newArrayList;

Review Comment:
   imho that static import of com.google.common.collect.Lists.newArrayList should also be replaced, no?



##########
oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java:
##########
@@ -18,9 +18,9 @@
  */
 package org.apache.jackrabbit.oak.composite;
 
-import static com.google.common.base.Predicates.compose;
-import static com.google.common.collect.Iterables.filter;
 import static com.google.common.collect.Lists.newArrayList;
+import static org.apache.jackrabbit.guava.common.base.Predicates.compose;
+import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;

Review Comment:
   for the sake of easy review it would be preferable if the imports would remain on the same line (even if that makes the order a bit off.



##########
oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/BinaryImpl.java:
##########
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.oak.plugins.value.jcr;
 
-import static com.google.common.base.Objects.toStringHelper;
+import static org.apache.jackrabbit.guava.common.base.MoreObjects.toStringHelper;

Review Comment:
   why does Objects become MoreObjects? that looks like a mistake.



##########
oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java:
##########
@@ -46,12 +46,10 @@
 
 import javax.sql.DataSource;
 
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
 import org.apache.commons.io.FileUtils;
+import org.apache.jackrabbit.guava.common.base.Predicate;
+import org.apache.jackrabbit.guava.common.base.Predicates;
+import org.apache.jackrabbit.guava.common.collect.Iterables;

Review Comment:
   same here... if the imports were on the same lines as before it would be easier to review (and see that some imports didn't get adjusted.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscribe@jackrabbit.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org