add @Friend annotation, remove @Private annotation in order to satisfy restriction checking.

SVN: 30115

datastore_server/source/java/ch/systemsx/cisd/etlserver/AbstractDelegatingStorageProcessor.java

@@ -64,7 +64,6 @@ abstract public class AbstractDelegatingStorageProcessor implements IStorageProc
         this.delegate = delegateStorageProcessor;
     }
 
-    @Private
     static IStorageProcessorTransactional createDelegateStorageProcessor(Properties properties)
     {
         String delegateClass =

datastore_server/source/java/ch/systemsx/cisd/etlserver/DelegatingStorageProcessorWithDropbox.java

@@ -19,7 +19,6 @@ package ch.systemsx.cisd.etlserver;
 import java.io.File;
 import java.util.Properties;
 
-import ch.rinn.restrictions.Private;
 import ch.systemsx.cisd.common.filesystem.FileOperations;
 import ch.systemsx.cisd.common.filesystem.IFileOperations;
 import ch.systemsx.cisd.common.mail.IMailClient;
@@ -54,7 +53,6 @@ public abstract class DelegatingStorageProcessorWithDropbox extends
                 .createDelegateStorageProcessor(properties), FileOperations.getInstance());
     }
 
-    @Private
     DelegatingStorageProcessorWithDropbox(Properties properties,
             IStorageProcessorTransactional delegateStorageProcessor, IFileOperations fileOperations)
     {

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/OpenbisServiceFacade.java

@@ -75,7 +75,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifierFa
 public class OpenbisServiceFacade implements IOpenbisServiceFacade
 {
 
-    @Private
     public static IOpenbisServiceFacade tryCreate(final String username, final String password,
             final String openbisUrl, final long timeoutInMillis)
     {
@@ -117,7 +116,6 @@ public class OpenbisServiceFacade implements IOpenbisServiceFacade
         return caller.callWithRetry();
     }
 
-    @Private
     public static IOpenbisServiceFacade tryCreate(final String sessionToken,
             final String openbisUrl, final long timeoutInMillis)
     {

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierForUsers.java

@@ -17,11 +17,11 @@
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import static ch.systemsx.cisd.openbis.generic.shared.Constants.USER_PARAMETER;
+
 import java.io.File;
 import java.util.Map;
 import java.util.Properties;
 
-import ch.rinn.restrictions.Private;
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
 import ch.systemsx.cisd.common.utilities.ITimeProvider;
 import ch.systemsx.cisd.common.utilities.SystemTimeProvider;
@@ -45,7 +45,6 @@ public class DataSetCopierForUsers extends DataSetCopier
                 new ImmutableCopierFactory(), SystemTimeProvider.SYSTEM_TIME_PROVIDER);
     }
 
-    @Private
     DataSetCopierForUsers(Properties properties, File storeRoot,
             IPathCopierFactory pathCopierFactory,
             ISshCommandExecutorFactory sshCommandExecutorFactory,

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ShareFactory.java

@@ -43,7 +43,6 @@ import ch.systemsx.cisd.openbis.generic.shared.Constants;
  * 
  * @author Kaloyan Enimanev
  */
-@Private
 public class ShareFactory
 {
     @Private

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/AbstractStorageProcessorWithDropboxTest.java

@@ -37,7 +37,7 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.utils.AbstractDatasetDropboxH
 /**
  * @author Tomasz Pylak
  */
-@Friend(toClasses = DelegatingStorageProcessorWithDropbox.class)
+@Friend(toClasses = {DelegatingStorageProcessorWithDropbox.class})
 public class AbstractStorageProcessorWithDropboxTest extends AbstractFileSystemTestCase
 {
     @Test

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SimpleShufflingTest.java

@@ -56,7 +56,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.SimpleDataSetInformationDTO;
 /**
  * @author Franz-Josef Elmer
  */
-@Friend(toClasses = SimpleShuffling.class)
+@Friend(toClasses = {SimpleShuffling.class, EagerShufflingTask.class})
 public class SimpleShufflingTest extends AbstractFileSystemTestCase
 {
     private static final String DSS_CODE = "dss1";

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatabaseBasedDataSetPathInfoProviderTest.java

@@ -39,7 +39,9 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetPathInfo;
 /**
  * @author Franz-Josef Elmer
  */
-@Friend(toClasses = DatabaseBasedDataSetPathInfoProvider.class)
+@Friend(toClasses = {DatabaseBasedDataSetPathInfoProvider.class, 
+        DatabaseBasedDataSetPathInfoProvider.IPathInfoDAO.class, 
+        DatabaseBasedDataSetPathInfoProvider.DataSetFileRecord.class})
 public class DatabaseBasedDataSetPathInfoProviderTest extends AssertJUnit
 {
     private static final Long DATA_SET_ID = 41L;

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServletTest.java

@@ -48,6 +48,7 @@ import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import ch.rinn.restrictions.Friend;
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
 import ch.systemsx.cisd.base.utilities.OSUtilities;
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
@@ -78,6 +79,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE;
  * @author Franz-Josef Elmer
  */
 @Test
+@Friend(toClasses = HierarchicalContentProvider.class)
 public class DatasetDownloadServletTest
 {
     private static final String REQUEST_URI_PREFIX = "/" + DATA_STORE_SERVER_WEB_APPLICATION_NAME

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java

@@ -40,6 +40,7 @@ import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import ch.rinn.restrictions.Friend;
 import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase;
 import ch.systemsx.cisd.common.filesystem.IFreeSpaceProvider;
 import ch.systemsx.cisd.common.filesystem.QueueingPathRemoverService;
@@ -98,6 +99,7 @@ import ch.systemsx.cisd.openbis.plugin.query.shared.api.v1.IQueryApiServer;
 /**
  * @author Chandrasekhar Ramakrishnan
  */
+@Friend(toClasses = HierarchicalContentProvider.class)
 public class DssServiceRpcV1Test extends AbstractFileSystemTestCase
 {
     private static final String SHARE_ID = "share-1";

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ProcessDatasetsCommandTest.java

@@ -33,6 +33,7 @@ import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import ch.rinn.restrictions.Friend;
 import ch.systemsx.cisd.common.exceptions.Status;
 import ch.systemsx.cisd.common.mail.From;
 import ch.systemsx.cisd.common.mail.IMailClient;
@@ -48,6 +49,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.DatasetDescription;
 /**
  * @author Franz-Josef Elmer
  */
+@Friend(toClasses = ProcessDatasetsCommand.ProxyMailClient.class)
 public class ProcessDatasetsCommandTest extends AssertJUnit
 {
     private static final String EXAMPLE_TASK_LABEL = "My task";

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/StreamRepositoryTest.java

@@ -22,12 +22,14 @@ import org.testng.AssertJUnit;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import ch.rinn.restrictions.Friend;
 import ch.systemsx.cisd.common.utilities.ITimeProvider;
 import ch.systemsx.cisd.openbis.dss.generic.server.StreamRepository.IUniqueIdGenerator;
 
 /**
  * @author Franz-Josef Elmer
  */
+@Friend(toClasses = StreamRepository.class)
 public class StreamRepositoryTest extends AssertJUnit
 {
     private IUniqueIdGenerator idGenerator;

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ZipDataSetPackagerTest.java

@@ -31,6 +31,7 @@ import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import ch.rinn.restrictions.Friend;
 import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase;
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
 import ch.systemsx.cisd.common.io.IOUtilities;
@@ -62,6 +63,7 @@ import de.schlichtherle.io.FileInputStream;
  *
  * @author Franz-Josef Elmer
  */
+@Friend(toClasses = HierarchicalContentProvider.class)
 public class ZipDataSetPackagerTest extends AbstractFileSystemTestCase
 {
     private static final String DATA_SET_CODE = "ds1";

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPluginTest.java

@@ -229,7 +229,8 @@ public class AbstractArchiverProcessingPluginTest extends AbstractFileSystemTest
                     : BooleanStatus.createFalse();
         }
     }
-
+    
+    @Friend(toClasses = AbstractArchiverProcessingPlugin.class)
     private static final class MockArchiver extends AbstractArchiverProcessingPlugin implements
             IAbstractArchiverMethods
     {

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierForUsersTest.java

@@ -54,7 +54,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.builders.DatasetDescriptionBu
 /**
  * @author Franz-Josef Elmer
  */
-@Friend(toClasses = DataSetCopier.class)
+@Friend(toClasses = DataSetCopierForUsers.class)
 public class DataSetCopierForUsersTest extends AbstractFileSystemTestCase
 {
     private static final String USER_ID = "test-user";

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/HierarchicalContentProviderTest.java

@@ -27,6 +27,7 @@ import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import ch.rinn.restrictions.Friend;
 import ch.systemsx.cisd.common.action.IDelegatedAction;
 import ch.systemsx.cisd.common.test.RecordingMatcher;
 import ch.systemsx.cisd.openbis.common.io.hierarchical_content.IHierarchicalContentFactory;
@@ -41,6 +42,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IDatasetLocation;
  * 
  * @author Piotr Buczek
  */
+@Friend(toClasses = HierarchicalContentProvider.class)
 public class HierarchicalContentProviderTest extends AssertJUnit
 {
 

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PluginUtilTest.java

@@ -26,7 +26,7 @@ import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.PluginTaskInfoP
 /**
  * @author Tomasz Pylak
  */
-@Friend(toClasses = DssPropertyParametersUtil.class)
+@Friend(toClasses = {DssPropertyParametersUtil.class, PluginTaskInfoProvider.class})
 public class PluginUtilTest
 {
     public static IPluginTaskInfoProvider createPluginTaskProviders(File storeRoot)

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ThumbnailTiming.java

@@ -25,11 +25,13 @@ import javax.imageio.ImageIO;
 
 import org.springframework.util.StopWatch;
 
+import ch.rinn.restrictions.Friend;
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
 
 /**
  * @author Chandrasekhar Ramakrishnan
  */
+@Friend(toClasses = ImageUtil.class)
 public class ThumbnailTiming
 {