Code Review
/
aai
/
aai-common.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update the aai-common with the latest code
[aai/aai-common.git]
/
aai-core
/
src
/
main
/
java
/
org
/
openecomp
/
aai
/
util
/
AAIConfig.java
diff --git
a/aai-core/src/main/java/org/openecomp/aai/util/AAIConfig.java
b/aai-core/src/main/java/org/openecomp/aai/util/AAIConfig.java
index
bea50db
..
9fcb521
100644
(file)
--- a/
aai-core/src/main/java/org/openecomp/aai/util/AAIConfig.java
+++ b/
aai-core/src/main/java/org/openecomp/aai/util/AAIConfig.java
@@
-20,12
+20,6
@@
package org.openecomp.aai.util;
package org.openecomp.aai.util;
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import org.eclipse.jetty.util.security.Password;
-import org.openecomp.aai.exceptions.AAIException;
-import org.openecomp.aai.logging.ErrorLogHelper;
-
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
@@
-36,6
+30,13
@@
import java.util.HashMap;
import java.util.Properties;
import java.util.Timer;
import java.util.Properties;
import java.util.Timer;
+import org.eclipse.jetty.util.security.Password;
+
+import org.openecomp.aai.exceptions.AAIException;
+import org.openecomp.aai.logging.ErrorLogHelper;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
public class AAIConfig {
public class AAIConfig {
@@
-59,7
+60,7
@@
public class AAIConfig {
*
* @throws AAIException the AAI exception
*/
*
* @throws AAIException the AAI exception
*/
- public synchronized static void init() throws AAIException
{
+ public synchronized static void init() throws AAIException{
LOGGER.info("Initializing AAIConfig");
ArrayList<String> genericVnfBools = new ArrayList<String>();
LOGGER.info("Initializing AAIConfig");
ArrayList<String> genericVnfBools = new ArrayList<String>();
@@
-89,7
+90,7
@@
public class AAIConfig {
AAIConfig.getConfigFile();
AAIConfig.reloadConfig();
AAIConfig.getConfigFile();
AAIConfig.reloadConfig();
- if (AAIConstants.AAI_NODENAME == null || AAIConstants.AAI_NODENAME == "") {
+ if (AAIConstants.AAI_NODENAME == null || AAIConstants.AAI_NODENAME == "") {
ErrorLogHelper.logError("AAI_4005", " AAI_NODENAME is not defined");
} else {
LOGGER.info("A&AI Server Node Name = " + AAIConstants.AAI_NODENAME);
ErrorLogHelper.logError("AAI_4005", " AAI_NODENAME is not defined");
} else {
LOGGER.info("A&AI Server Node Name = " + AAIConstants.AAI_NODENAME);
@@
-217,7
+218,7
@@
public class AAIConfig {
* @return the int
* @throws AAIException the AAI exception
*/
* @return the int
* @throws AAIException the AAI exception
*/
- public static int getInt(String key) throws AAIException
{
+ public static int getInt(String key) throws AAIException{
return Integer.valueOf(AAIConfig.get(key));
}
return Integer.valueOf(AAIConfig.get(key));
}