SO-1708 Wired in identifier service factory.

snomed/com.b2international.snowowl.snomed.datastore/src/com/b2international/snowowl/snomed/datastore/config/SnomedCoreConfiguration.java

@@ -30,6 +30,11 @@
  * @since 3.4
  */
 public class SnomedCoreConfiguration {
+
+ public enum IdGenerationStrategy {
+ MEMORY, // Snow Owl's internal random id generator
+ CIS // IHTSDO's external id generator
+ }
 
  public static final String ELK_REASONER_ID = "org.semanticweb.elk.elk.reasoner.factory"; //$NON-NLS-1$
  private static final String DEFAULT_REASONER = ELK_REASONER_ID;
@@ -59,6 +64,22 @@ public class SnomedCoreConfiguration {
  @NotEmpty
  private String defaultModule = DEFAULT_MODULE;
 
+ @JsonProperty(value = "idGenerationStrategy", required = false)
+ private IdGenerationStrategy idGenerationStrategy = IdGenerationStrategy.MEMORY;
+ @JsonProperty(value = "cisUrl", required = false)
+ private String cisUrl;
+ @JsonProperty(value = "cisPort", required = false)
+ private String cisPort;
+ @JsonProperty(value = "cisContextRoot", required = false)
+ private String cisContextRoot;
+ @JsonProperty(value = "cisUserName", required = false)
+ private String cisUserName;
+ @JsonProperty(value = "cisPassword", required = false)
+ private String cisPassword;
+ // the key to associate the client software within the external CIS service
+ @JsonProperty(value = "cisClientSoftwareKey", required = false)
+ private String cisClientSoftwareKey = "Snow Owl";
+
  private boolean concreteDomainSupport;
  private boolean showReasonerUsageWarning = true;
 
@@ -177,5 +198,61 @@ public boolean isShowReasonerUsageWarningEnabled() {
  public void setShowReasonerUsageWarningEnabled(boolean showReasonerUsageWarning) {
  this.showReasonerUsageWarning = showReasonerUsageWarning;
  }
+
+ public IdGenerationStrategy getIdGenerationStrategy() {
+ return idGenerationStrategy;
+ }
+
+ public void setIdGenerationStrategy(IdGenerationStrategy idGenerationStrategy) {
+ this.idGenerationStrategy = idGenerationStrategy;
+ }
+
+ public String getCisUrl() {
+ return cisUrl;
+ }
+
+ public void setCisUrl(String cisUrl) {
+ this.cisUrl = cisUrl;
+ }
+
+ public String getCisPort() {
+ return cisPort;
+ }
+
+ public void setCisPort(String cisPort) {
+ this.cisPort = cisPort;
+ }
+
+ public String getCisContextRoot() {
+ return cisContextRoot;
+ }
+
+ public void setCisContextRoot(String cisContextRoot) {
+ this.cisContextRoot = cisContextRoot;
+ }
+
+ public String getCisUserName() {
+ return cisUserName;
+ }
+
+ public void setCisUserName(String cisUserName) {
+ this.cisUserName = cisUserName;
+ }
+
+ public String getCisPassword() {
+ return cisPassword;
+ }
+
+ public void setCisPassword(String cisPassword) {
+ this.cisPassword = cisPassword;
+ }
+
+ public String getCisClientSoftwareKey() {
+ return cisClientSoftwareKey;
+ }
+
+ public void setCisClientSoftwareKey(String cisClientSoftwareKey) {
+ this.cisClientSoftwareKey = cisClientSoftwareKey;
+ }
 
 }

snomed/com.b2international.snowowl.snomed.datastore/src/com/b2international/snowowl/snomed/datastore/id/SnomedIdentifierServiceFactory.java

@@ -0,0 +1,96 @@
+/*
+ * Copyright 2011-2015 B2i Healthcare Pte Ltd, http:https://b2i.sg
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http:https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.b2international.snowowl.snomed.datastore.id;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.b2international.snowowl.core.ApplicationContext;
+import com.b2international.snowowl.core.config.SnowOwlConfiguration;
+import com.b2international.snowowl.core.setup.Environment;
+import com.b2international.snowowl.snomed.datastore.SnomedTerminologyBrowser;
+import com.b2international.snowowl.snomed.datastore.config.SnomedCoreConfiguration;
+import com.b2international.snowowl.snomed.datastore.config.SnomedCoreConfiguration.IdGenerationStrategy;
+import com.b2international.snowowl.snomed.datastore.id.cis.CisSnomedIdentfierServiceImpl;
+import com.b2international.snowowl.snomed.datastore.id.gen.ItemIdGenerationStrategy;
+import com.b2international.snowowl.snomed.datastore.id.memory.InMemorySnomedIdentifierServiceImpl;
+import com.b2international.snowowl.snomed.datastore.id.reservations.ISnomedIdentiferReservationService;
+import com.b2international.snowowl.snomed.datastore.id.reservations.Reservations;
+import com.b2international.snowowl.snomed.datastore.internal.id.reservations.SnomedIdentifierReservationServiceImpl;
+import com.google.inject.Provider;
+
+/**
+ * Factory to create a Snomed CT identifier generator
+ * 
+ * @since 4.5
+ */
+public class SnomedIdentifierServiceFactory {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SnomedIdentifierServiceFactory.class);
+
+ private static final String STORE_RESERVATIONS = "internal_store_reservations";
+ private static final String IDENTIFIER_SERVICE_RESERVATIONS = "identifier_service_reservations";
+
+ public static void registerService(final SnowOwlConfiguration configuration, final Environment env) {
+ checkIdGenerationSource(configuration);
+
+ final SnomedCoreConfiguration coreConfiguration = configuration.getModuleConfig(SnomedCoreConfiguration.class);
+ final ISnomedIdentiferReservationService reservationService = new SnomedIdentifierReservationServiceImpl();
+
+ registerBrowser(reservationService);
+ registerSnomedIdentifierService(coreConfiguration, env, reservationService);
+ }
+
+ private static void checkIdGenerationSource(SnowOwlConfiguration configuration) {
+ final SnomedCoreConfiguration coreConfiguration = configuration.getModuleConfig(SnomedCoreConfiguration.class);
+ final IdGenerationStrategy idGenerationSource = coreConfiguration.getIdGenerationStrategy();
+
+ if (null == idGenerationSource) {
+ throw new IllegalStateException("ID generation source is not configured.");
+ }
+ }
+
+ private static void registerBrowser(final ISnomedIdentiferReservationService reservationService) {
+ final Provider<SnomedTerminologyBrowser> provider = new Provider<SnomedTerminologyBrowser>() {
+ @Override
+ public SnomedTerminologyBrowser get() {
+ return ApplicationContext.getInstance().getService(SnomedTerminologyBrowser.class);
+ }
+ };
+
+ reservationService.create(STORE_RESERVATIONS, Reservations.uniqueInStore(provider));
+ }
+
+ private static void registerSnomedIdentifierService(final SnomedCoreConfiguration conf, final Environment env,
+ final ISnomedIdentiferReservationService reservationService) {
+ ISnomedIdentifierService identifierService = null;
+
+ switch (conf.getIdGenerationStrategy()) {
+ case MEMORY:
+ LOGGER.info("Snow Owl is configured to use memory based identifier serivce.");
+ identifierService = new InMemorySnomedIdentifierServiceImpl(reservationService, ItemIdGenerationStrategy.RANDOM);
+ break;
+ case CIS:
+ LOGGER.info("Snow Owl is configured to use CIS based identifier serivce.");
+ identifierService = new CisSnomedIdentfierServiceImpl(conf);
+ break;
+ default:
+ throw new IllegalStateException(String.format("Unknown ID generation source configured: %s. ", conf.getIdGenerationStrategy()));
+ }
+
+ reservationService.create(IDENTIFIER_SERVICE_RESERVATIONS, identifierService);
+ env.services().registerService(ISnomedIdentifierService.class, identifierService);
+ }
+}

snomed/com.b2international.snowowl.snomed.datastore/src/com/b2international/snowowl/snomed/datastore/internal/boot/SnomedCoreBootstrap.java

@@ -25,30 +25,20 @@
 import com.b2international.snowowl.snomed.datastore.SnomedTerminologyBrowser;
 import com.b2international.snowowl.snomed.datastore.config.SnomedCoreConfiguration;
 import com.b2international.snowowl.snomed.datastore.id.ISnomedIdentifierService;
-import com.b2international.snowowl.snomed.datastore.id.reservations.ISnomedIdentiferReservationService;
-import com.b2international.snowowl.snomed.datastore.id.reservations.Reservations;
-import com.b2international.snowowl.snomed.datastore.internal.id.SnomedIdentifierServiceImpl;
-import com.b2international.snowowl.snomed.datastore.internal.id.reservations.SnomedIdentifierReservationServiceImpl;
+import com.b2international.snowowl.snomed.datastore.id.SnomedIdentifierServiceFactory;
 import com.b2international.snowowl.snomed.metadata.SnomedMetadata;
 import com.b2international.snowowl.snomed.metadata.SnomedMetadataImpl;
-import com.google.inject.Provider;
 
 /**
  * @since 3.4
  */
 @ModuleConfig(fieldName = "snomed", type = SnomedCoreConfiguration.class)
 public class SnomedCoreBootstrap extends DefaultBootstrapFragment {
 
- private static final String STORE_RESERVATIONS = "internal_store_reservations";
-
  @Override
  public void init(SnowOwlConfiguration configuration, Environment env) throws Exception {
- final Provider<SnomedTerminologyBrowser> browser = env.provider(SnomedTerminologyBrowser.class);
- final ISnomedIdentiferReservationService reservationService = new SnomedIdentifierReservationServiceImpl();
- reservationService.create(STORE_RESERVATIONS, Reservations.uniqueInStore(browser));
- final ISnomedIdentifierService idService = new SnomedIdentifierServiceImpl(reservationService);
- env.services().registerService(ISnomedIdentiferReservationService.class, reservationService);
- env.services().registerService(ISnomedIdentifierService.class, idService);
+ SnomedIdentifierServiceFactory.registerService(configuration, env);
+
  env.services().registerService(SnomedCoreConfiguration.class, configuration.getModuleConfig(SnomedCoreConfiguration.class));
  env.services().registerService(SnomedMetadata.class, new SnomedMetadataImpl(env.provider(SnomedTerminologyBrowser.class)));
  }