Commit c9aaf763 authored by R.W.Majeed's avatar R.W.Majeed
Browse files

use enum in annotation, more preference keys

parent 9fe37c06

src/main/java/org/aktin/Preference.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -7,6 +7,8 @@ import java.lang.annotation.Target; 




import javax.inject.Qualifier;

import javax.inject.Qualifier;





import org.aktin.dwh.PreferenceKey;



/**

/**

 * AKTIN preference. Can be used to inject preference values into any class.

 * AKTIN preference. Can be used to inject preference values into any class.

 * The preferences can not be changed during runtime.

 * The preferences can not be changed during runtime.
@@ -22,5 +24,5 @@ import javax.inject.Qualifier; 
public @interface Preference {

public @interface Preference {

	// no default meaning a value is mandatory

	// no default meaning a value is mandatory

	//@Nonbinding

	//@Nonbinding

	String key();

	PreferenceKey key();

}
 
}

src/main/java/org/aktin/dwh/PreferenceKey.java

+8 −2
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ package org.aktin.dwh; 
 */

 */

public enum PreferenceKey {

public enum PreferenceKey {





	keystorePath("tls.keystore.path"),

	keystorePath("tls.keystore.file"),

	keystorePass("tls.keystore.pass"),

	keystorePass("tls.keystore.pass"),

	commonName("local.cn"),

	commonName("local.cn"),

	organisationName("local.o"),

	organisationName("local.o"),
@@ -16,7 +16,13 @@ public enum PreferenceKey { 
	locality("local.l"),

	locality("local.l"),

	state("local.s"),

	state("local.s"),

	country("local.c"),

	country("local.c"),

	i2b2Project("i2b2.project"),

	i2b2ServicePM("i2b2.service.pm"),

	i2b2DatasourceCRC("i2b2.datasource.crc"),

	rScriptBinary("rscript.binary")

	

	;

	;



	private String key;

	private String key;

	private PreferenceKey(String key){

	private PreferenceKey(String key){

		this.key = key;

		this.key = key;