From 48c4f47b17dfbfa5c1b85db485c104d412117c94 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk@ethz.ch>
Date: Thu, 30 May 2024 14:40:13 +0200
Subject: [PATCH] BIS-736 : external data table for AFS : leave AFS data store
server urls empty for AS not to try to invoke DSS specific session cleanup
methods on AFS
---
.../openbis/generic/server/AfsRegistrator.java | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AfsRegistrator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AfsRegistrator.java
index fff034c4d26..b0d3ff806f4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AfsRegistrator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AfsRegistrator.java
@@ -1,7 +1,5 @@
package ch.systemsx.cisd.openbis.generic.server;
-import javax.annotation.Resource;
-
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEvent;
@@ -14,7 +12,6 @@ import org.springframework.transaction.annotation.Transactional;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
-import ch.systemsx.cisd.common.spring.ExposablePropertyPlaceholderConfigurer;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDataStoreDAO;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataStorePE;
@@ -27,14 +24,9 @@ public class AfsRegistrator implements IAfsRegistrator, ApplicationListener<Appl
private static final String AFS_DATA_STORE_CODE = "AFS";
- private static final String AFS_URL_PROPERTY_NAME = ComponentNames.SERVER_PUBLIC_INFORMATION + "afs-server.url";
-
@Autowired
private IDAOFactory daoFactory;
- @Resource(name = ExposablePropertyPlaceholderConfigurer.PROPERTY_CONFIGURER_BEAN_NAME)
- private ExposablePropertyPlaceholderConfigurer configurer;
-
@Autowired IAfsRegistrator self;
private boolean registered;
@@ -75,12 +67,10 @@ public class AfsRegistrator implements IAfsRegistrator, ApplicationListener<Appl
return;
}
- String afsUrl = configurer.getResolvedProps().getProperty(AFS_URL_PROPERTY_NAME, "");
-
DataStorePE dataStore = new DataStorePE();
dataStore.setCode(AFS_DATA_STORE_CODE);
- dataStore.setDownloadUrl(afsUrl);
- dataStore.setRemoteUrl(afsUrl);
+ dataStore.setDownloadUrl("");
+ dataStore.setRemoteUrl("");
dataStore.setDatabaseInstanceUUID("");
dataStore.setSessionToken("");
dataStore.setArchiverConfigured(false);
--
GitLab