Added property to parametrize the application instance

EBIvariation · Aug 30, 2018 · 66cc9ef · 66cc9ef
1 parent 74cef2b
commit 66cc9ef
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 17 deletions.
diff --git a/src/main/java/uk/ac/ebi/ega/accession/configuration/AnalysisServiceConfiguration.java b/src/main/java/uk/ac/ebi/ega/accession/configuration/AnalysisServiceConfiguration.java
@@ -19,6 +19,7 @@
 package uk.ac.ebi.ega.accession.configuration;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -56,6 +57,9 @@ public class AnalysisServiceConfiguration {
 
     private final String CATEGORY_ID = "analysis";
 
+    @Value("${accessioning.instanceId}")
+    private String applicationInstanceId;
+
     @Autowired
     private ContiguousIdBlockService blockService;
 
@@ -77,7 +81,7 @@ public AccessioningService<Analysis, String, String> prefixAnalysisAccessionServ
     @Bean
     public AccessioningService<Analysis, String, Long> analysisAccessionService() {
         return new BasicAccessioningService<>(
-                new MonotonicAccessionGenerator<>(CATEGORY_ID, "ega-accession-01", blockService,
+                new MonotonicAccessionGenerator<>(CATEGORY_ID, applicationInstanceId, blockService,
                         monotonicDatabaseService()),
                 analysisAccessioningDatabaseService(),
                 analysis -> analysis.getSubmissionAccount() + "_" + analysis.getAlias(),

diff --git a/src/main/java/uk/ac/ebi/ega/accession/configuration/ArrayServiceConfiguration.java b/src/main/java/uk/ac/ebi/ega/accession/configuration/ArrayServiceConfiguration.java
@@ -19,6 +19,7 @@
 package uk.ac.ebi.ega.accession.configuration;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -56,6 +57,9 @@ public class ArrayServiceConfiguration {
 
     private final String CATEGORY_ID = "array";
 
+    @Value("${accessioning.instanceId}")
+    private String applicationInstanceId;
+
     @Autowired
     private ContiguousIdBlockService blockService;
 
@@ -77,7 +81,7 @@ public AccessioningService<Array, String, String> prefixArrayAccessionService()
     @Bean
     public AccessioningService<Array, String, Long> arrayAccessionService() {
         return new BasicAccessioningService<>(
-                new MonotonicAccessionGenerator<>(CATEGORY_ID, "ega-accession-01", blockService,
+                new MonotonicAccessionGenerator<>(CATEGORY_ID, applicationInstanceId, blockService,
                         monotonicDatabaseService()),
                 arrayAccessioningDatabaseService(),
                 array -> array.getSubmissionAccount() + "_" + array.getAlias(),

diff --git a/src/main/java/uk/ac/ebi/ega/accession/configuration/DacServiceConfiguration.java b/src/main/java/uk/ac/ebi/ega/accession/configuration/DacServiceConfiguration.java
@@ -19,6 +19,7 @@
 package uk.ac.ebi.ega.accession.configuration;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -56,6 +57,9 @@ public class DacServiceConfiguration {
 
     private final String CATEGORY_ID = "dac";
 
+    @Value("${accessioning.instanceId}")
+    private String applicationInstanceId;
+
     @Autowired
     private ContiguousIdBlockService blockService;
 
@@ -77,7 +81,7 @@ public AccessioningService<Dac, String, String> prefixDacAccessionService() {
     @Bean
     public AccessioningService<Dac, String, Long> dacAccessionService() {
         return new BasicAccessioningService<>(
-                new MonotonicAccessionGenerator<>(CATEGORY_ID, "ega-accession-01", blockService,
+                new MonotonicAccessionGenerator<>(CATEGORY_ID, applicationInstanceId, blockService,
                         monotonicDatabaseService()),
                 dacAccessioningDatabaseService(),
                 dac -> dac.getSubmissionAccount() + "_" + dac.getAlias(),

diff --git a/src/main/java/uk/ac/ebi/ega/accession/configuration/DatasetServiceConfiguration.java b/src/main/java/uk/ac/ebi/ega/accession/configuration/DatasetServiceConfiguration.java
@@ -19,6 +19,7 @@
 package uk.ac.ebi.ega.accession.configuration;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -56,6 +57,9 @@ public class DatasetServiceConfiguration {
 
     private final String CATEGORY_ID = "dataset";
 
+    @Value("${accessioning.instanceId}")
+    private String applicationInstanceId;
+
     @Autowired
     private ContiguousIdBlockService blockService;
 
@@ -77,7 +81,7 @@ public AccessioningService<Dataset, String, String> prefixDatasetAccessionServic
     @Bean
     public AccessioningService<Dataset, String, Long> datasetAccessionService() {
         return new BasicAccessioningService<>(
-                new MonotonicAccessionGenerator<>(CATEGORY_ID, "ega-accession-01", blockService,
+                new MonotonicAccessionGenerator<>(CATEGORY_ID, applicationInstanceId, blockService,
                         monotonicDatabaseService()),
                 datasetAccessioningDatabaseService(),
                 dataset -> dataset.getSubmissionAccount() + "_" + dataset.getAlias(),

diff --git a/src/main/java/uk/ac/ebi/ega/accession/configuration/ExperimentServiceConfiguration.java b/src/main/java/uk/ac/ebi/ega/accession/configuration/ExperimentServiceConfiguration.java
@@ -19,6 +19,7 @@
 package uk.ac.ebi.ega.accession.configuration;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -56,6 +57,9 @@ public class ExperimentServiceConfiguration {
 
     private final String CATEGORY_ID = "experiment";
 
+    @Value("${accessioning.instanceId}")
+    private String applicationInstanceId;
+
     @Autowired
     private ContiguousIdBlockService blockService;
 
@@ -77,7 +81,7 @@ public AccessioningService<Experiment, String, String> prefixExperimentAccession
     @Bean
     public AccessioningService<Experiment, String, Long> experimentAccessionService() {
         return new BasicAccessioningService<>(
-                new MonotonicAccessionGenerator<>(CATEGORY_ID, "ega-accession-01", blockService,
+                new MonotonicAccessionGenerator<>(CATEGORY_ID, applicationInstanceId, blockService,
                         monotonicDatabaseService()),
                 experimentAccessioningDatabaseService(),
                 experiment -> experiment.getSubmissionAccount() + "_" + experiment.getAlias(),

diff --git a/src/main/java/uk/ac/ebi/ega/accession/configuration/FileServiceConfiguration.java b/src/main/java/uk/ac/ebi/ega/accession/configuration/FileServiceConfiguration.java
@@ -19,6 +19,7 @@
 package uk.ac.ebi.ega.accession.configuration;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -55,6 +56,9 @@ public class FileServiceConfiguration {
 
     private final String CATEGORY_ID = "file";
 
+    @Value("${accessioning.instanceId}")
+    private String applicationInstanceId;
+
     @Autowired
     private ContiguousIdBlockService blockService;
 
@@ -76,7 +80,7 @@ public AccessioningService<FileModel, String, String> prefixFileAccessionService
     @Bean
     public AccessioningService<FileModel, String, Long> fileAccessionService() {
         return new BasicAccessioningService<>(
-                new MonotonicAccessionGenerator<>(CATEGORY_ID, "ega-accession-01", blockService, monotonicDatabaseService()),
+                new MonotonicAccessionGenerator<>(CATEGORY_ID, applicationInstanceId, blockService, monotonicDatabaseService()),
                 fileAccessioningDatabaseService(),
                 fileModel -> fileModel.getHash(),
                 message -> message);

diff --git a/src/main/java/uk/ac/ebi/ega/accession/configuration/PolicyServiceConfiguration.java b/src/main/java/uk/ac/ebi/ega/accession/configuration/PolicyServiceConfiguration.java
@@ -19,6 +19,7 @@
 package uk.ac.ebi.ega.accession.configuration;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -56,6 +57,9 @@ public class PolicyServiceConfiguration {
 
     private final String CATEGORY_ID = "policy";
 
+    @Value("${accessioning.instanceId}")
+    private String applicationInstanceId;
+
     @Autowired
     private ContiguousIdBlockService blockService;
 
@@ -77,7 +81,7 @@ public AccessioningService<Policy, String, String> prefixPolicyAccessionService(
     @Bean
     public AccessioningService<Policy, String, Long> policyAccessionService() {
         return new BasicAccessioningService<>(
-                new MonotonicAccessionGenerator<>(CATEGORY_ID, "ega-accession-01", blockService,
+                new MonotonicAccessionGenerator<>(CATEGORY_ID, applicationInstanceId, blockService,
                         monotonicDatabaseService()),
                 policyAccessioningDatabaseService(),
                 policy -> policy.getSubmissionAccount() + "_" + policy.getAlias(),

diff --git a/src/main/java/uk/ac/ebi/ega/accession/configuration/RestConfiguration.java b/src/main/java/uk/ac/ebi/ega/accession/configuration/RestConfiguration.java
@@ -24,6 +24,4 @@
 @EnableBasicRestControllerAdvice
 public class RestConfiguration {
 
-
-
 }
diff --git a/src/main/java/uk/ac/ebi/ega/accession/configuration/RunServiceConfiguration.java b/src/main/java/uk/ac/ebi/ega/accession/configuration/RunServiceConfiguration.java
@@ -19,6 +19,7 @@
 package uk.ac.ebi.ega.accession.configuration;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -56,6 +57,9 @@ public class RunServiceConfiguration {
 
     private final String CATEGORY_ID = "run";
 
+    @Value("${accessioning.instanceId}")
+    private String applicationInstanceId;
+
     @Autowired
     private ContiguousIdBlockService blockService;
 
@@ -77,7 +81,7 @@ public AccessioningService<Run, String, String> prefixRunAccessionService() {
     @Bean
     public AccessioningService<Run, String, Long> runAccessionService() {
         return new BasicAccessioningService<>(
-                new MonotonicAccessionGenerator<>(CATEGORY_ID, "ega-accession-01", blockService,
+                new MonotonicAccessionGenerator<>(CATEGORY_ID, applicationInstanceId, blockService,
                         monotonicDatabaseService()),
                 runAccessioningDatabaseService(),
                 run -> run.getSubmissionAccount() + "_" + run.getAlias(),

diff --git a/...main/java/uk/ac/ebi/ega/accession/configuration/SampleControlledServiceConfiguration.java b/...main/java/uk/ac/ebi/ega/accession/configuration/SampleControlledServiceConfiguration.java
@@ -19,6 +19,7 @@
 package uk.ac.ebi.ega.accession.configuration;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -65,6 +66,9 @@ public class SampleControlledServiceConfiguration {
 
     private final String CATEGORY_ID = "sample";
 
+    @Value("${accessioning.instanceId}")
+    private String applicationInstanceId;
+
     @Autowired
     private ContiguousIdBlockService blockService;
 
@@ -95,7 +99,8 @@ public AccessioningService<SampleControlled, String, String> prefixSampleControl
     @Bean
     public AccessioningService<SampleControlled, String, Long> sampleControlledAccessionService() {
         return new BasicAccessioningService<>(
-                new MonotonicAccessionGenerator<>(CATEGORY_ID, "ega-accession-01-sample-open", blockService,
+                new MonotonicAccessionGenerator<>(CATEGORY_ID, applicationInstanceId + "-controlled-sample",
+                        blockService,
                         monotonicDatabaseService()),
                 sampleControlledAccessioningDatabaseService(),
                 sampleControlled -> sampleControlled.getSubmissionAccount() + "_" + sampleControlled.getAlias(),
@@ -137,7 +142,7 @@ public AccessioningService<SampleOpen, String, String> prefixSampleOpenAccession
     @Bean
     public AccessioningService<SampleOpen, String, Long> sampleOpenAccessionService() {
         return new BasicAccessioningService<>(
-                new MonotonicAccessionGenerator<>(CATEGORY_ID, "ega-accession-01-sample-open", blockService,
+                new MonotonicAccessionGenerator<>(CATEGORY_ID, applicationInstanceId + "-open-sample", blockService,
                         monotonicDatabaseService()),
                 sampleOpenAccessioningDatabaseService(),
                 sampleOpen -> sampleOpen.getBiosampleAccession(),

diff --git a/src/main/java/uk/ac/ebi/ega/accession/configuration/StudyServiceConfiguration.java b/src/main/java/uk/ac/ebi/ega/accession/configuration/StudyServiceConfiguration.java
@@ -19,6 +19,7 @@
 package uk.ac.ebi.ega.accession.configuration;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -56,6 +57,9 @@ public class StudyServiceConfiguration {
 
     private final String CATEGORY_ID = "study";
 
+    @Value("${accessioning.instanceId}")
+    private String applicationInstanceId;
+
     @Autowired
     private ContiguousIdBlockService blockService;
 
@@ -77,7 +81,7 @@ public AccessioningService<Study, String, String> prefixStudyAccessionService()
     @Bean
     public AccessioningService<Study, String, Long> studyAccessionService() {
         return new BasicAccessioningService<>(
-                new MonotonicAccessionGenerator<>(CATEGORY_ID, "ega-accession-01", blockService,
+                new MonotonicAccessionGenerator<>(CATEGORY_ID, applicationInstanceId, blockService,
                         monotonicDatabaseService()),
                 studyAccessioningDatabaseService(),
                 study -> study.getSubmissionAccount() + "_" + study.getAlias(),

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -43,8 +43,7 @@ endpoints.health.sensitive=false
 # APPLICATION
 #####################################################################################
 
-accessioning.namespace=EGA
-accessioning.variant.instanceId=@instance.id@;
+accessioning.instanceId=@instance.id@
 
 accessioning.monotonic.file.blockSize=1000
 accessioning.monotonic.file.blockStartValue=0

diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
@@ -15,8 +15,7 @@
 # limitations under the License.
 #
 #
-accessioning.namespace=EGA
-accessioning.variant.instanceId=instance-01;
+accessioning.instanceId=instance-01;
 
 accessioning.monotonic.file.blockSize=1000
 accessioning.monotonic.file.blockStartValue=0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,6 +24,4 @@
		@EnableBasicRestControllerAdvice
		public class RestConfiguration {



		}