summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeong Lim <keong.lim@huawei.com>2019-03-21 15:31:32 +1100
committerKeong Lim <keong.lim@huawei.com>2019-04-11 13:43:19 +1000
commit6ee599e6aa222f39e7aeaf0ec7b81b840e1b646d (patch)
tree38572c70afe91fffc98bed51dab2e74ebd33cbe7
parent86182472f813568d0eaeb6367f53bedc0120f7ee (diff)
AAI-1523 Batch reformat aai-utils
Use maven plugins from AAI-2198 to do batch reformat of aai-utils to consistent code style. Change-Id: Ia67b73b69427799bfb3198f1cded820840e9ee6d Issue-ID: AAI-1523 Signed-off-by: Keong Lim <keong.lim@huawei.com>
-rw-r--r--aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoader.java21
-rw-r--r--aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderConstants.java13
-rw-r--r--aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderMsgs.java14
-rw-r--r--aai-utils/src/test/java/org/onap/aaiutils/oxm/OxmModelLoaderTest.java7
4 files changed, 31 insertions, 24 deletions
diff --git a/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoader.java b/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoader.java
index f535509a..e9236476 100644
--- a/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoader.java
+++ b/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoader.java
@@ -10,7 +10,7 @@
* 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
+ * 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,
@@ -19,6 +19,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.aaiutils.oxm;
import java.io.File;
@@ -32,7 +33,9 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+
import javax.xml.bind.JAXBException;
+
import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContextFactory;
@@ -42,13 +45,11 @@ import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.core.io.support.ResourcePatternResolver;
-
public class OxmModelLoader {
private static final Pattern AAI_OXM_FILE_PATTERN = Pattern.compile("aai_oxm_(.*).xml");
private static Map<String, DynamicJAXBContext> versionContextMap = new ConcurrentHashMap<>();
- private static final Logger LOGGER = LoggerFactory.getInstance()
- .getLogger(OxmModelLoader.class.getName());
+ private static final Logger LOGGER = LoggerFactory.getInstance().getLogger(OxmModelLoader.class.getName());
public synchronized static void loadModels() throws Exception {
OxmModelLoader.loadModels("classpath*:/oxm/aai_oxm*.xml", AAI_OXM_FILE_PATTERN);
@@ -64,8 +65,8 @@ public class OxmModelLoader {
try {
OxmModelLoader.loadModel(matcher.group(1), resource);
} catch (Exception e) {
- LOGGER.error(OxmModelLoaderMsgs.OXM_LOAD_ERROR, "Failed to load " + resource.getFilename()
- + ": " + e.getMessage());
+ LOGGER.error(OxmModelLoaderMsgs.OXM_LOAD_ERROR,
+ "Failed to load " + resource.getFilename() + ": " + e.getMessage());
throw new Exception("Failed to load schema");
}
}
@@ -83,7 +84,6 @@ public class OxmModelLoader {
}
return resources;
-
}
public static DynamicJAXBContext getContextForVersion(String version) throws Exception {
@@ -114,20 +114,19 @@ public class OxmModelLoader {
loadModel(version, file.getName(), inputStream);
}
- private synchronized static void loadModel(String version, Resource resource)
- throws JAXBException, IOException {
+ private synchronized static void loadModel(String version, Resource resource) throws JAXBException, IOException {
InputStream inputStream = resource.getInputStream();
loadModel(version, resource.getFilename(), inputStream);
}
private synchronized static void loadModel(String version, String resourceName, InputStream inputStream)
- throws JAXBException, IOException {
+ throws JAXBException, IOException {
Map<String, Object> properties = new HashMap<>();
properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, inputStream);
final DynamicJAXBContext jaxbContext = DynamicJAXBContextFactory
- .createContextFromOXM(Thread.currentThread().getContextClassLoader(), properties);
+ .createContextFromOXM(Thread.currentThread().getContextClassLoader(), properties);
versionContextMap.put(version, jaxbContext);
diff --git a/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderConstants.java b/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderConstants.java
index 8f24edb7..f5494baf 100644
--- a/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderConstants.java
+++ b/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderConstants.java
@@ -10,7 +10,7 @@
* 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
+ * 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,
@@ -19,14 +19,17 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.aaiutils.oxm;
public class OxmModelLoaderConstants {
- public static final String AaiUtils_FILESEP = (System.getProperty ( "file.separator" ) == null) ? "/"
- : System.getProperty ( "file.separator" );
+ public static final String AaiUtils_FILESEP =
+ (System.getProperty("file.separator") == null) ? "/" : System.getProperty("file.separator");
- public static final String AaiUtils_SPECIFIC_CONFIG = System.getProperty ( "CONFIG_HOME" ) + AaiUtils_FILESEP;
+ public static final String AaiUtils_SPECIFIC_CONFIG =
+ System.getProperty("CONFIG_HOME") + AaiUtils_FILESEP;
- public static final String AaiUtils_HOME_MODEL = AaiUtils_SPECIFIC_CONFIG + "model" + AaiUtils_FILESEP;
+ public static final String AaiUtils_HOME_MODEL =
+ AaiUtils_SPECIFIC_CONFIG + "model" + AaiUtils_FILESEP;
}
diff --git a/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderMsgs.java b/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderMsgs.java
index 48eeac0e..c2794e24 100644
--- a/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderMsgs.java
+++ b/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderMsgs.java
@@ -10,7 +10,7 @@
* 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
+ * 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,
@@ -19,14 +19,15 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.aaiutils.oxm;
import com.att.eelf.i18n.EELFResourceManager;
+
import org.onap.aai.cl.eelf.LogMessageEnum;
public enum OxmModelLoaderMsgs implements LogMessageEnum {
-
/**
* Invalid Model File
* Arguments:
@@ -34,13 +35,13 @@ public enum OxmModelLoaderMsgs implements LogMessageEnum {
* {1} = error
*/
- INVALID_OXM_FILE,
- INVALID_OXM_DIR,
+ INVALID_OXM_FILE, INVALID_OXM_DIR,
/**
* Unable to load OXM schema: {0}
*
- * <p>Arguments:
+ * <p>
+ * Arguments:
* {0} = error
*/
OXM_LOAD_ERROR,
@@ -48,7 +49,8 @@ public enum OxmModelLoaderMsgs implements LogMessageEnum {
/**
* Successfully loaded schema: {0}
*
- * <p>Arguments:
+ * <p>
+ * Arguments:
* {0} = oxm filename
*/
LOADED_OXM_FILE;
diff --git a/aai-utils/src/test/java/org/onap/aaiutils/oxm/OxmModelLoaderTest.java b/aai-utils/src/test/java/org/onap/aaiutils/oxm/OxmModelLoaderTest.java
index 22a1673d..f3b9f621 100644
--- a/aai-utils/src/test/java/org/onap/aaiutils/oxm/OxmModelLoaderTest.java
+++ b/aai-utils/src/test/java/org/onap/aaiutils/oxm/OxmModelLoaderTest.java
@@ -17,9 +17,11 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.aaiutils.oxm;
import java.util.regex.Pattern;
+
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
@@ -45,7 +47,8 @@ public class OxmModelLoaderTest {
thrown.expect(Exception.class);
thrown.expectMessage("Failed to load schema");
- OxmModelLoader.loadModels("classpath*:non_existing_aai_oxm*.xml", Pattern.compile("non_existing_aai_oxm_(.*).xml"));
+ OxmModelLoader.loadModels("classpath*:non_existing_aai_oxm*.xml",
+ Pattern.compile("non_existing_aai_oxm_(.*).xml"));
}
-} \ No newline at end of file
+}