wip

Author: hmiguim

roda-core/roda-core-tests/src/main/java/org/roda/core/model/ModelServiceTest.java

@@ -35,6 +35,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
+import com.google.common.collect.Lists;
 import org.apache.commons.io.IOUtils;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
@@ -86,7 +87,6 @@
 import gov.loc.premis.v3.EventComplexType;
 import gov.loc.premis.v3.ObjectCharacteristicsComplexType;
 import gov.loc.premis.v3.ObjectIdentifierComplexType;
-import jersey.repackaged.com.google.common.collect.Lists;
 
 /**
  * Unit tests for ModelService

roda-core/roda-core-tests/src/main/java/org/roda/core/plugins/BagitSIPPluginsTest.java

@@ -18,6 +18,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.google.common.collect.Lists;
 import org.roda.core.CorporaConstants;
 import org.roda.core.RodaCoreFactory;
 import org.roda.core.TestsHelper;
@@ -58,8 +59,6 @@
 
 import com.google.common.collect.Iterables;
 
-import jersey.repackaged.com.google.common.collect.Lists;
-
 @Test(groups = {RodaConstants.TEST_GROUP_ALL, RodaConstants.TEST_GROUP_DEV, RodaConstants.TEST_GROUP_TRAVIS})
 public class BagitSIPPluginsTest {
 

roda-core/roda-core-tests/src/main/java/org/roda/core/plugins/EARKSIPPluginsTest.java

@@ -20,6 +20,7 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import com.google.common.collect.Lists;
 import org.roda.core.CorporaConstants;
 import org.roda.core.RodaCoreFactory;
 import org.roda.core.TestsHelper;
@@ -70,8 +71,6 @@
 
 import com.google.common.collect.Iterables;
 
-import jersey.repackaged.com.google.common.collect.Lists;
-
 @Test(groups = {RodaConstants.TEST_GROUP_ALL, RodaConstants.TEST_GROUP_DEV, RodaConstants.TEST_GROUP_TRAVIS})
 public class EARKSIPPluginsTest {
   private static final Logger LOGGER = LoggerFactory.getLogger(EARKSIPPluginsTest.class);

roda-core/roda-core-tests/src/main/java/org/roda/core/plugins/FailureIngestPluginTest.java

@@ -17,6 +17,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.google.common.collect.Lists;
 import org.roda.core.RodaCoreFactory;
 import org.roda.core.TestsHelper;
 import org.roda.core.common.iterables.CloseableIterable;
@@ -61,8 +62,6 @@
 
 import com.google.common.collect.Iterables;
 
-import jersey.repackaged.com.google.common.collect.Lists;
-
 @Test(groups = {RodaConstants.TEST_GROUP_ALL, RodaConstants.TEST_GROUP_DEV, RodaConstants.TEST_GROUP_TRAVIS})
 public class FailureIngestPluginTest {
   private static final Logger LOGGER = LoggerFactory.getLogger(FailureIngestPluginTest.class);

roda-core/roda-core-tests/src/main/java/org/roda/core/plugins/InternalPluginsTest.java

@@ -2,7 +2,7 @@
  * The contents of this file are subject to the license and copyright
  * detailed in the LICENSE file at the root of the source
  * tree and available online at
- *
+ * <p>
  * https://github.com/keeps/roda
  */
 package org.roda.core.plugins;
@@ -29,6 +29,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.google.common.collect.Lists;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.core.Is;
@@ -96,7 +97,6 @@
 import gov.loc.premis.v3.LinkingAgentIdentifierComplexType;
 import gov.loc.premis.v3.ObjectCharacteristicsComplexType;
 import gov.loc.premis.v3.Representation;
-import jersey.repackaged.com.google.common.collect.Lists;
 
 @Test(groups = {RodaConstants.TEST_GROUP_ALL, RodaConstants.TEST_GROUP_DEV, RodaConstants.TEST_GROUP_TRAVIS})
 public class InternalPluginsTest {

roda-core/roda-core-tests/src/main/java/org/roda/core/plugins/MinimalIngestPluginTest.java

@@ -17,6 +17,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.google.common.collect.Lists;
 import org.roda.core.RodaCoreFactory;
 import org.roda.core.TestsHelper;
 import org.roda.core.common.PremisV3Utils;
@@ -67,7 +68,6 @@
 import com.google.common.collect.Iterables;
 
 import gov.loc.premis.v3.EventComplexType;
-import jersey.repackaged.com.google.common.collect.Lists;
 
 @Test(groups = {RodaConstants.TEST_GROUP_ALL, RodaConstants.TEST_GROUP_DEV, RodaConstants.TEST_GROUP_TRAVIS})
 public class MinimalIngestPluginTest {

roda-core/roda-core-tests/src/main/java/org/roda/core/plugins/PartialSuccessIngestPluginTest.java

@@ -17,6 +17,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.google.common.collect.Lists;
 import org.roda.core.RodaCoreFactory;
 import org.roda.core.TestsHelper;
 import org.roda.core.common.iterables.CloseableIterable;
@@ -61,8 +62,6 @@
 
 import com.google.common.collect.Iterables;
 
-import jersey.repackaged.com.google.common.collect.Lists;
-
 @Test(groups = {RodaConstants.TEST_GROUP_ALL, RodaConstants.TEST_GROUP_DEV, RodaConstants.TEST_GROUP_TRAVIS})
 public class PartialSuccessIngestPluginTest {
   private static final Logger LOGGER = LoggerFactory.getLogger(PartialSuccessIngestPluginTest.class);

roda-core/roda-core-tests/src/main/java/org/roda/core/storage/AbstractStorageServiceTest.java

@@ -41,8 +41,6 @@
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 
-import jersey.repackaged.com.google.common.collect.Iterables;
-
 /**
  *
  * @author Luis Faria <[email protected]>
@@ -913,7 +911,9 @@ public void testBinaryVersions() throws RODAException, IOException {
     // 6) list binary versions
     CloseableIterable<BinaryVersion> binaryVersions = getStorage().listBinaryVersions(binaryStoragePath);
     List<BinaryVersion> reusableBinaryVersions = new ArrayList<>();
-    Iterables.addAll(reusableBinaryVersions, binaryVersions);
+    //Iterables.addAll(reusableBinaryVersions, binaryVersions);
+
+    binaryVersions.forEach(reusableBinaryVersions::add);
 
     assertEquals(3, reusableBinaryVersions.size());