From 7f2a5f157558e674b94e90af6ca9b7552686b9ef Mon Sep 17 00:00:00 2001 From: Ryan D. Brooks Date: Mon, 7 Aug 2017 12:18:21 -0700 Subject: refactor: Use shared location for ds admin keys Change-Id: I12bae6f67cb740f01781794703052a7f57b3f532 --- .../eclipse/osee/orcs/core/ds/DataStoreAdmin.java | 4 ++++ .../eclipse/osee/orcs/db/internal/AdminModule.java | 8 +++---- .../orcs/db/internal/DataStoreConfigConstants.java | 26 ---------------------- .../META-INF/MANIFEST.MF | 1 + .../orcs/rest/internal/DatastoreEndpointImpl.java | 8 ++++--- 5 files changed, 14 insertions(+), 33 deletions(-) delete mode 100644 plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/DataStoreConfigConstants.java diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/DataStoreAdmin.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/DataStoreAdmin.java index ebd4d9f2d66..a12ad948510 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/DataStoreAdmin.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/DataStoreAdmin.java @@ -19,6 +19,10 @@ import org.eclipse.osee.orcs.OrcsSession; */ public interface DataStoreAdmin { + public static final String SCHEMA_TABLE_DATA_NAMESPACE = "schema.table.data.namespace"; + public static final String SCHEMA_INDEX_DATA_NAMESPACE = "schema.index.data.namespace"; + public static final String SCHEMA_USER_FILE_SPECIFIED_NAMESPACE = "schema.user.file.specified.schema.names"; + Callable createDataStore(OrcsSession session, Map parameters); Callable getDataStoreInfo(OrcsSession session); diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/AdminModule.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/AdminModule.java index 3d862947c1e..99d6c1505b5 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/AdminModule.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/AdminModule.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.orcs.db.internal; +import com.google.common.base.Supplier; import java.util.Map; import java.util.concurrent.Callable; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -27,7 +28,6 @@ import org.eclipse.osee.orcs.db.internal.callable.FetchDatastoreInfoCallable; import org.eclipse.osee.orcs.db.internal.callable.InitializeDatastoreCallable; import org.eclipse.osee.orcs.db.internal.callable.MigrateDatastoreCallable; import org.eclipse.osee.orcs.db.internal.util.DynamicSchemaResourceProvider; -import com.google.common.base.Supplier; /** * @author Roberto E. Escobar @@ -53,9 +53,9 @@ public class AdminModule { return new DataStoreAdmin() { @Override public Callable createDataStore(OrcsSession session, Map parameters) { - getOption(parameters, DataStoreConfigConstants.SCHEMA_TABLE_DATA_NAMESPACE, ""); - getOption(parameters, DataStoreConfigConstants.SCHEMA_INDEX_DATA_NAMESPACE, ""); - getOption(parameters, DataStoreConfigConstants.SCHEMA_USER_FILE_SPECIFIED_NAMESPACE, false); + getOption(parameters, DataStoreAdmin.SCHEMA_TABLE_DATA_NAMESPACE, ""); + getOption(parameters, DataStoreAdmin.SCHEMA_INDEX_DATA_NAMESPACE, ""); + getOption(parameters, DataStoreAdmin.SCHEMA_USER_FILE_SPECIFIED_NAMESPACE, false); Supplier> schemaProvider = new DynamicSchemaResourceProvider(logger); diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/DataStoreConfigConstants.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/DataStoreConfigConstants.java deleted file mode 100644 index 60662e75512..00000000000 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/DataStoreConfigConstants.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.orcs.db.internal; - -/** - * @author Roberto E. Escobar - */ -public final class DataStoreConfigConstants { - - private DataStoreConfigConstants() { - // Constants class - } - - public static final String SCHEMA_TABLE_DATA_NAMESPACE = "schema.table.data.namespace"; - public static final String SCHEMA_INDEX_DATA_NAMESPACE = "schema.index.data.namespace"; - public static final String SCHEMA_USER_FILE_SPECIFIED_NAMESPACE = "schema.user.file.specified.schema.names"; - -} diff --git a/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF index c8964b3cce4..f6370d5509e 100644 --- a/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF @@ -40,6 +40,7 @@ Import-Package: com.google.common.base;version="15.0.0", org.eclipse.osee.jaxrs.mvc, org.eclipse.osee.jdbc, org.eclipse.osee.orcs, + org.eclipse.osee.orcs.core.ds, org.eclipse.osee.orcs.data, org.eclipse.osee.orcs.rest.model, org.eclipse.osee.orcs.rest.model.search.artifact, diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/DatastoreEndpointImpl.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/DatastoreEndpointImpl.java index 410e35d76f5..a190d2ed44f 100644 --- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/DatastoreEndpointImpl.java +++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/DatastoreEndpointImpl.java @@ -22,6 +22,7 @@ import org.eclipse.osee.activity.api.ActivityLog; import org.eclipse.osee.orcs.OrcsAdmin; import org.eclipse.osee.orcs.OrcsApi; import org.eclipse.osee.orcs.OrcsMetaData; +import org.eclipse.osee.orcs.core.ds.DataStoreAdmin; import org.eclipse.osee.orcs.rest.model.DatastoreEndpoint; import org.eclipse.osee.orcs.rest.model.DatastoreInfo; import org.eclipse.osee.orcs.rest.model.DatastoreInitOptions; @@ -69,9 +70,10 @@ public class DatastoreEndpointImpl implements DatastoreEndpoint { OrcsAdmin adminOps = getOrcsAdmin(); Map parameters = new HashMap<>(); - parameters.put("schema.table.data.namespace", options.getTableDataSpace()); - parameters.put("schema.index.data.namespace", options.getIndexDataSpace()); - parameters.put("schema.user.file.specified.schema.names", Boolean.toString(options.isUseFileSpecifiedSchemas())); + parameters.put(DataStoreAdmin.SCHEMA_TABLE_DATA_NAMESPACE, options.getTableDataSpace()); + parameters.put(DataStoreAdmin.SCHEMA_INDEX_DATA_NAMESPACE, options.getIndexDataSpace()); + parameters.put(DataStoreAdmin.SCHEMA_USER_FILE_SPECIFIED_NAMESPACE, + Boolean.toString(options.isUseFileSpecifiedSchemas())); Callable callable = adminOps.createDatastore(parameters); OrcsMetaData metaData = executeCallable(callable); -- cgit v1.2.3