X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=search-data-service%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fsa%2FApplication.java;fp=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fsa%2FApplication.java;h=ad52dfd65d8afeb07b3840028df25f99fc151728;hb=e07d5b8dc0801583518b4f27ce6b8f3b56bcf206;hp=059ca224b777fd2d04ca8e5318e69723b4bed820;hpb=5ea47abeeb1713b56006fd69b1564cbd4c4220c7;p=aai%2Fsearch-data-service.git

diff --git a/src/main/java/org/onap/aai/sa/Application.java b/search-data-service/src/main/java/org/onap/aai/sa/Application.java
similarity index 98%
rename from src/main/java/org/onap/aai/sa/Application.java
rename to search-data-service/src/main/java/org/onap/aai/sa/Application.java
index 059ca22..ad52dfd 100644
--- a/src/main/java/org/onap/aai/sa/Application.java
+++ b/search-data-service/src/main/java/org/onap/aai/sa/Application.java
@@ -1,58 +1,58 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.aai
- * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 Amdocs
- * ================================================================================
- * 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://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.
- * ============LICENSE_END=========================================================
- */
-package org.onap.aai.sa;
-
-import java.util.HashMap;
-import org.eclipse.jetty.util.security.Password;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
-
-@SpringBootApplication
-public class Application extends SpringBootServletInitializer {
-
-    public static void main(String[] args) {
-        String keyStorePassword = System.getProperty("KEY_STORE_PASSWORD");
-        if (keyStorePassword == null || keyStorePassword.isEmpty()) {
-            throw new RuntimeException("Env property KEY_STORE_PASSWORD not set");
-        }
-        HashMap<String, Object> props = new HashMap<>();
-        String deobfuscatedKeyStorePassword = keyStorePassword.startsWith("OBF:") ? Password.deobfuscate(keyStorePassword) : keyStorePassword;
-        props.put("server.ssl.key-store-password", deobfuscatedKeyStorePassword);
-
-        String trustStoreLocation = System.getProperty("TRUST_STORE_LOCATION");
-        String trustStorePassword = System.getProperty("TRUST_STORE_PASSWORD");
-        if (trustStoreLocation != null && trustStorePassword != null) {
-            trustStorePassword = trustStorePassword.startsWith("OBF:") ? Password.deobfuscate(trustStorePassword) : trustStorePassword;
-            props.put("server.ssl.trust-store", trustStoreLocation);
-            props.put("server.ssl.trust-store-password", trustStorePassword);
-        }
-
-        String requireClientAuth = System.getenv("REQUIRE_CLIENT_AUTH");
-        if (requireClientAuth == null || requireClientAuth.isEmpty()) {
-            props.put("server.ssl.client-auth", "need");
-        }else {
-            props.put("server.ssl.client-auth", Boolean.valueOf(requireClientAuth)? "need" : "want");
-        }
-		
-        new Application().configure(new SpringApplicationBuilder(Application.class).properties(props)).run(args);
-    }
-}
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 Amdocs
+ * ================================================================================
+ * 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://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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.sa;
+
+import java.util.HashMap;
+import org.eclipse.jetty.util.security.Password;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
+
+@SpringBootApplication
+public class Application extends SpringBootServletInitializer {
+
+    public static void main(String[] args) {
+        String keyStorePassword = System.getProperty("KEY_STORE_PASSWORD");
+        if (keyStorePassword == null || keyStorePassword.isEmpty()) {
+            throw new RuntimeException("Env property KEY_STORE_PASSWORD not set");
+        }
+        HashMap<String, Object> props = new HashMap<>();
+        String deobfuscatedKeyStorePassword = keyStorePassword.startsWith("OBF:") ? Password.deobfuscate(keyStorePassword) : keyStorePassword;
+        props.put("server.ssl.key-store-password", deobfuscatedKeyStorePassword);
+
+        String trustStoreLocation = System.getProperty("TRUST_STORE_LOCATION");
+        String trustStorePassword = System.getProperty("TRUST_STORE_PASSWORD");
+        if (trustStoreLocation != null && trustStorePassword != null) {
+            trustStorePassword = trustStorePassword.startsWith("OBF:") ? Password.deobfuscate(trustStorePassword) : trustStorePassword;
+            props.put("server.ssl.trust-store", trustStoreLocation);
+            props.put("server.ssl.trust-store-password", trustStorePassword);
+        }
+
+        String requireClientAuth = System.getenv("REQUIRE_CLIENT_AUTH");
+        if (requireClientAuth == null || requireClientAuth.isEmpty()) {
+            props.put("server.ssl.client-auth", "need");
+        }else {
+            props.put("server.ssl.client-auth", Boolean.valueOf(requireClientAuth)? "need" : "want");
+        }
+		
+        new Application().configure(new SpringApplicationBuilder(Application.class).properties(props)).run(args);
+    }
+}