Skip to content

Commit bbc672e

Browse files
steve-fischer-200steve-fischer-200
committed
remove old iRODS user dataset service
1 parent f6f655c commit bbc672e

100 files changed

Lines changed: 3 additions & 11028 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Model/src/main/java/org/gusdb/wdk/jmx/mbeans/ModelConfig.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,11 @@ protected void init() {
2424
org.gusdb.wdk.model.config.QueryMonitor queryMonitor = modelConfig.getQueryMonitor();
2525
org.gusdb.wdk.model.config.ModelConfigUserDB modelConfigUserDB = modelConfig.getUserDB();
2626
org.gusdb.wdk.model.config.ModelConfigAppDB modelConfigAppDB = modelConfig.getAppDB();
27-
org.gusdb.wdk.model.config.ModelConfigUserDatasetStore
28-
modelConfigUserDatasetStore = modelConfig.getUserDatasetStoreConfig();
2927

3028
setValuesFromGetters("global", modelConfig);
3129
setValuesFromGetters("queryMonitor", queryMonitor);
3230
setValuesFromGetters("userDb", modelConfigUserDB);
3331
setValuesFromGetters("appDb", modelConfigAppDB);
34-
setValuesFromGetters("userDatasetStore", modelConfigUserDatasetStore);
3532
}
3633

3734
}

‎Model/src/main/java/org/gusdb/wdk/model/WdkModel.java‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import org.gusdb.wdk.model.config.ModelConfig;
4848
import org.gusdb.wdk.model.config.ModelConfigAppDB;
4949
import org.gusdb.wdk.model.config.ModelConfigUserDB;
50-
import org.gusdb.wdk.model.config.ModelConfigUserDatasetStore;
5150
import org.gusdb.wdk.model.config.QueryMonitor;
5251
import org.gusdb.wdk.model.dataset.DatasetFactory;
5352
import org.gusdb.wdk.model.dbms.ConnectionContainer;
@@ -73,8 +72,6 @@
7372
import org.gusdb.wdk.model.user.analysis.StepAnalysisFactory;
7473
import org.gusdb.wdk.model.user.analysis.StepAnalysisFactoryImpl;
7574
import org.gusdb.wdk.model.user.analysis.UnconfiguredStepAnalysisFactory;
76-
import org.gusdb.wdk.model.user.dataset.UserDatasetFactory;
77-
import org.gusdb.wdk.model.user.dataset.UserDatasetStore;
7875
import org.gusdb.wdk.model.xml.XmlQuestion;
7976
import org.gusdb.wdk.model.xml.XmlQuestionSet;
8077
import org.gusdb.wdk.model.xml.XmlRecordClassSet;
@@ -111,8 +108,6 @@ public static WdkModel construct(String projectId, String gusHome) throws WdkMod
111108
private DatabaseInstance appDb;
112109
private DatabaseInstance userDb;
113110

114-
private Optional<UserDatasetStore> _userDatasetStore;
115-
116111
private List<QuerySet> querySetList = new ArrayList<>();
117112
private Map<String, QuerySet> querySets = new LinkedHashMap<>();
118113

@@ -175,7 +170,6 @@ public static WdkModel construct(String projectId, String gusHome) throws WdkMod
175170
private BasketFactory basketFactory;
176171
private FavoriteFactory favoriteFactory;
177172
private StepAnalysisFactory stepAnalysisFactory;
178-
private Optional<UserDatasetFactory> userDatasetFactory;
179173

180174
private List<PropertyList> defaultPropertyLists = new ArrayList<>();
181175
private Map<String, String[]> defaultPropertyListMap = new LinkedHashMap<>();
@@ -535,25 +529,15 @@ public void configure(ModelConfig modelConfig) throws WdkModelException {
535529

536530
ModelConfigAppDB appDbConfig = modelConfig.getAppDB();
537531
ModelConfigUserDB userDbConfig = modelConfig.getUserDB();
538-
ModelConfigUserDatasetStore udsConfig = modelConfig.getUserDatasetStoreConfig();
539532

540533
QueryLogger.initialize(modelConfig.getQueryMonitor());
541534

542535
appDb = new DatabaseInstance(appDbConfig, DB_INSTANCE_APP, true);
543536
userDb = new DatabaseInstance(userDbConfig, DB_INSTANCE_USER, true);
544537

545-
// set true to avoid a broken dev irods at build time
546-
if ( udsConfig == null ) {
547-
_userDatasetStore = Optional.empty();
548-
}
549-
else {
550-
_userDatasetStore = Optional.of(udsConfig.getUserDatasetStore(modelConfig.getWdkTempDir()));
551-
}
552-
553538
datasetFactory = new DatasetFactory(this);
554539
basketFactory = new BasketFactory(this);
555540
favoriteFactory = new FavoriteFactory(this);
556-
userDatasetFactory = _userDatasetStore.isPresent() ? Optional.of(new UserDatasetFactory(this)) : Optional.empty();
557541

558542
// exclude resources that are not used by this project
559543
excludeResources();
@@ -690,10 +674,6 @@ public StepAnalysisFactory getStepAnalysisFactory() {
690674
return stepAnalysisFactory;
691675
}
692676

693-
public Optional<UserDatasetFactory> getUserDatasetFactory() {
694-
return userDatasetFactory;
695-
}
696-
697677
public Object resolveReference(String twoPartName) throws WdkModelException {
698678
String s = "Invalid reference '" + twoPartName + "'. ";
699679

@@ -1081,12 +1061,9 @@ public void addGeneratedQuestion(String questionName, SupplierWithException<Ques
10811061

10821062
@Override
10831063
public String toString() {
1084-
String userDatasetStoreStr = _userDatasetStore.isEmpty()
1085-
? "No user dataset store configured"
1086-
: _userDatasetStore.get().toString();
10871064
return new StringBuilder("WdkModel: ").append("projectId='").append(_projectId).append("'").append(NL).append(
10881065
"displayName='").append(displayName).append("'").append(NL).append("introduction='").append(
1089-
_introduction).append("'").append(NL).append(NL).append(userDatasetStoreStr).append(NL).append(uiConfig.toString()).append(
1066+
_introduction).append("'").append(NL).append(NL).append(NL).append(uiConfig.toString()).append(
10901067
showSet("Param", paramSets)).append(showSet("Query", querySets)).append(
10911068
showSet("RecordClass", recordClassSets)).append(showSet("XmlRecordClass", xmlRecordClassSets)).append(
10921069
showSet("Question", questionSets)).append(showSet("XmlQuestion", xmlQuestionSets)).toString();
@@ -1217,10 +1194,6 @@ public File getXmlDataDir() {
12171194
return xmlDataDir;
12181195
}
12191196

1220-
public Optional<UserDatasetStore> getUserDatasetStore() {
1221-
return _userDatasetStore;
1222-
}
1223-
12241197
public DatasetFactory getDatasetFactory() {
12251198
return datasetFactory;
12261199
}

‎Model/src/main/java/org/gusdb/wdk/model/config/ModelConfig.java‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ public String getName() {
9292
private final ModelConfigUserDB _userDB;
9393
private final ModelConfigAppDB _appDB;
9494

95-
private final ModelConfigUserDatasetStore _userDatasetStoreConfig;
96-
9795
private final QueryMonitor _queryMonitor;
9896

9997
/**
@@ -173,7 +171,7 @@ public ModelConfig(String modelName, String projectId, Path gusHome, boolean cac
173171
String paramRegex, Optional<Path> secretKeyFile, String secretKey, Path wdkTempDir, String webServiceUrl, String assetsUrl,
174172
String smtpServer, Optional<String> smtpUser, Optional<String> smtpPassword, Integer smtpPort, boolean smtpTlsEnabled, String supportEmail,
175173
List<String> adminEmails, String emailSubject, String emailContent, ModelConfigUserDB userDB, ModelConfigAppDB appDB,
176-
ModelConfigUserDatasetStore userDatasetStoreConfig, QueryMonitor queryMonitor,
174+
QueryMonitor queryMonitor,
177175
boolean monitorBlockedThreads, int blockedThreshold, AuthenticationMethod authenticationMethod,
178176
String oauthUrl, String oauthClientId, String oauthClientSecret, String changePasswordUrl,
179177
String keyStoreFile, String keyStorePassPhrase, Integer maxTableValueRows) {
@@ -213,9 +211,6 @@ public ModelConfig(String modelName, String projectId, Path gusHome, boolean cac
213211
_userDB = userDB;
214212
_appDB = appDB;
215213

216-
// user dataset config
217-
_userDatasetStoreConfig = userDatasetStoreConfig;
218-
219214
// query performance monitoring
220215
_queryMonitor = queryMonitor;
221216

@@ -479,14 +474,6 @@ public boolean isCaching() {
479474
return _caching;
480475
}
481476

482-
/**
483-
* The config for a user dataset store. Optional. Might be null.
484-
* @return
485-
*/
486-
public ModelConfigUserDatasetStore getUserDatasetStoreConfig() {
487-
return _userDatasetStoreConfig;
488-
}
489-
490477
public Path getWdkTempDir() {
491478
return _wdkTempDir;
492479
}

‎Model/src/main/java/org/gusdb/wdk/model/config/ModelConfigBuilder.java‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ public class ModelConfigBuilder {
5252
private ModelConfigUserDB _userDB;
5353
private ModelConfigAppDB _appDB;
5454

55-
// user dataset config
56-
private ModelConfigUserDatasetStore _userDatasetStoreConfig;
57-
5855
// query performance monitoring
5956
private QueryMonitor _queryMonitor = new QueryMonitor();
6057

@@ -99,8 +96,7 @@ public ModelConfig build() throws WdkModelException {
9996
assertNonNull("supportEmail", _supportEmail);
10097
assertNonNull("userDb", _userDB);
10198
assertNonNull("appDb", _appDB);
102-
// TODO: should probably have a default stub for this to avoid NPEs
103-
//assertNonNull("userDatasetStoreConfig", _userDatasetStoreConfig);
99+
104100
Optional<String> smtpUsername = Optional.ofNullable(_smtpUsername).filter(s -> !s.isBlank());
105101
Optional<String> smtpPassword = Optional.ofNullable(_smtpPassword).filter(s -> !s.isBlank());
106102
String smtpServer = _smtpServer == null ? "localhost" : _smtpServer;
@@ -142,9 +138,6 @@ public ModelConfig build() throws WdkModelException {
142138
_userDB,
143139
_appDB,
144140

145-
// user dataset config
146-
_userDatasetStoreConfig,
147-
148141
// query performance monitoring
149142
_queryMonitor,
150143

@@ -388,9 +381,6 @@ public void setCaching(boolean caching) {
388381
_caching = caching;
389382
}
390383

391-
public void setUserDatasetStore(ModelConfigUserDatasetStore udsConfig) {
392-
_userDatasetStoreConfig = udsConfig;
393-
}
394384

395385
public void setWdkTempDir(String wdkTempDir) {
396386
_wdkTempDir = wdkTempDir;

‎Model/src/main/java/org/gusdb/wdk/model/config/ModelConfigParser.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,6 @@ private static Digester configureDigester() {
6262
// load user db
6363
configureNode(digester, "modelConfig/userDb", ModelConfigUserDB.class, "setUserDB");
6464

65-
// userdatasetstore
66-
configureNode(digester, "modelConfig/userDatasetStore", ModelConfigUserDatasetStore.class, "setUserDatasetStore");
67-
configureNode(digester, "modelConfig/userDatasetStore/property", WdkModelText.class, "addProperty");
68-
digester.addCallMethod("modelConfig/userDatasetStore/property", "setText", 0);
69-
configureNode(digester, "modelConfig/userDatasetStore/typeHandler", ModelConfigUserDatasetTypeHandler.class, "addTypeHandler");
70-
7165
// query monitor
7266
configureNode(digester, "modelConfig/queryMonitor", QueryMonitor.class, "setQueryMonitor");
7367
digester.addCallMethod("modelConfig/queryMonitor/ignoreSlowQueryRegex", "addIgnoreSlowQueryRegex", 0);

‎Model/src/main/java/org/gusdb/wdk/model/config/ModelConfigUserDatasetStore.java‎

Lines changed: 0 additions & 110 deletions
This file was deleted.

‎Model/src/main/java/org/gusdb/wdk/model/config/ModelConfigUserDatasetTypeHandler.java‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)