<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>1.18.34</version>
<scope>provided</scope>
</dependency>
</dependencies>
<artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.onap.logging-analytics</groupId>
- <artifactId>logging-slf4j</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<artifactId>aai-failover</artifactId>
<dependencies>
- <!-- Common logging framework -->
- <dependency>
- <groupId>org.onap.aai.logging-service</groupId>
- <artifactId>common-logging</artifactId>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
</dependencies>
</project>
<plexus.utils.version>3.1.1</plexus.utils.version>
<reflections.version>0.9.10</reflections.version>
<snakeyaml.version>1.29</snakeyaml.version>
+ <lombok.version>1.18.34</lombok.version>
<javax.servlet.version>3.1.0</javax.servlet.version>
<javax.annotation.version>1.2</javax.annotation.version>
<version>${commons.io.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.onap.aai.logging-service</groupId>
- <artifactId>common-logging</artifactId>
- <version>${aai.common.logging.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.onap.aai.logging-service</groupId>
- <artifactId>logging-api</artifactId>
- <version>${aai.common.logging.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.onap.logging-analytics</groupId>
- <artifactId>logging-slf4j</artifactId>
- <version>${logging.analytics.version}</version>
- </dependency>
-
<dependency>
<groupId>org.onap.aai</groupId>
<artifactId>rest-client</artifactId>
<version>${commons.net.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
</dependencyManagement>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.onap.aai.logging-service</groupId>
- <artifactId>common-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.onap.aai.logging-service</groupId>
- <artifactId>logging-api</artifactId>
- </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>5.14.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import org.onap.aai.cl.api.Logger;
-import org.onap.aai.cl.eelf.LoggerFactory;
import org.onap.aai.schemaif.SchemaProvider;
import org.onap.aai.schemaif.SchemaProviderException;
import org.onap.aai.schemaif.SchemaProviderMsgs;
import org.springframework.http.ResponseEntity;
import org.springframework.web.client.RestTemplate;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
public class JsonSchemaProvider implements SchemaProvider {
- // Logger logger = LoggerFactory.getInstance().getLogger(JsonSchemaProvider.class.getName());
- Logger logger = LoggerFactory.getInstance().getLogger(SchemaProvider.class);
private JsonSchemaProviderConfig config;
private Map<String, SchemaInstance> schemaCache = new ConcurrentHashMap<>();
ResponseEntity<byte[]> response = restTemplate.exchange(url, HttpMethod.GET, entity, byte[].class);
if (response.getStatusCodeValue() == HttpStatus.NOT_FOUND.value()) {
- logger.warn(SchemaProviderMsgs.SCHEMA_LOAD_ERROR, "version " + version + " not found");
+ log.warn("PVD0500E | Unable to load schema: {}", "version " + version + " not found");
throw new SchemaProviderException("Schema version " + version + " not found");
} else if (response.getStatusCodeValue() != HttpStatus.OK.value()) {
- logger.error(SchemaProviderMsgs.SCHEMA_LOAD_ERROR,
- "failed to load version " + version + ": " + response.getBody());
+ log.error("PVD0500E | Unable to load schema: {}", "version " + version + " not found");
throw new SchemaProviderException("Error getting schema version " + version + ":" + response.getBody());
}
StringWriter writer = new StringWriter();
PrintWriter printWriter = new PrintWriter(writer);
ex.printStackTrace(printWriter);
- logger.error(SchemaProviderMsgs.SCHEMA_LOAD_ERROR,
- "failed to load version " + version + ": " + response.getBody() + "\n" + writer.toString());
+ log.error("PVD0500E | Unable to load schema: {}", "failed to load version: " + version + ": "+ response.getBody() + "\n" + writer.toString());
throw new SchemaProviderException("Error loading schema version " + version + ":" + ex.getMessage());
}
- logger.info(SchemaProviderMsgs.LOADED_SCHEMA_FILE, version);
+ log.info("PVD0001I|Successfully loaded schema: {}", version);
}
static final int BUFFER = 512;
import com.google.common.collect.Multimap;
+import lombok.extern.slf4j.Slf4j;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.util.stream.Collectors;
import org.apache.commons.io.IOUtils;
-import org.onap.aai.cl.api.Logger;
-import org.onap.aai.cl.eelf.LoggerFactory;
import org.onap.aai.edges.EdgeIngestor;
import org.onap.aai.edges.EdgeRule;
import org.onap.aai.edges.exceptions.EdgeRuleNotFoundException;
import org.onap.aai.schemaif.SchemaProviderException;
-import org.onap.aai.schemaif.SchemaProviderMsgs;
import org.onap.aai.setup.SchemaVersion;
import org.onap.aai.setup.Translator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+@Slf4j
@Component
public class OxmEdgeRulesLoader {
final static Pattern propsFilePattern = Pattern.compile(propsPrefix + "(.*)" + propsSuffix);
final static Pattern propsVersionPattern = Pattern.compile("(?i)v\\d*");
- private static Logger logger = LoggerFactory.getInstance().getLogger(OxmEdgeRulesLoader.class.getName());
-
private OxmEdgeRulesLoader() {
}
public static synchronized void loadModels() throws SchemaProviderException {
Map<String, File> propFiles = edgePropertyFiles(edgePropsConfiguration);
- if (logger.isDebugEnabled()) {
- logger.debug("Loading DB Edge Rules");
+ if (log.isDebugEnabled()) {
+ log.debug("Loading DB Edge Rules");
}
for (String version : OxmSchemaLoader.getLoadedOXMVersions()) {
public static synchronized void loadModels(String v) throws SchemaProviderException {
Map<String, File> propFiles = edgePropertyFiles(edgePropsConfiguration);
- if (logger.isDebugEnabled()) {
- logger.debug("Loading DB Edge Rules ");
+ if (log.isDebugEnabled()) {
+ log.debug("Loading DB Edge Rules ");
}
try {
if (versionContextMap == null || versionContextMap.isEmpty()) {
loadModels();
} else if (!versionContextMap.containsKey(version)) {
- logger.error(SchemaProviderMsgs.SCHEMA_LOAD_ERROR, "Error loading DB Edge Rules for: " + version);
+ log.error("PVD0500E | Unable to load schema: {}", "Error loading DB Edge Rules for: " + version);
throw new SchemaProviderException("Error loading DB Edge Rules for: " + version);
}
// If there are still no models available, then there's not much we can do...
if (versionContextMap.isEmpty()) {
- logger.error(SchemaProviderMsgs.SCHEMA_LOAD_ERROR, "No available DB Edge Rules to get latest version for.");
+ log.error("PVD0500E | Unable to load schema: {}", "No available DB Edge Rules to get latest version for.");
throw new SchemaProviderException("No available DB Edge Rules to get latest version for.");
}
if (edges != null) {
RelationshipSchema rs = new RelationshipSchema(edges, edgeProps);
versionContextMap.put(version.toString().toLowerCase(), rs);
- logger.info(SchemaProviderMsgs.LOADED_DB_RULE_FILE, version.toString());
+ log.info("PVD0002I|Successfully loaded DB Edge Rule and Edge Properties for: {}", version);
}
}
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import lombok.extern.slf4j.Slf4j;
+
/**
* This class contains all of the logic for importing OXM model schemas from the available OXM
* schema files.
*/
+@Slf4j
@Component
public class OxmSchemaLoader {
final static Pattern versionPattern = Pattern.compile("(?i)v(\\d*)");
- private static org.onap.aai.cl.api.Logger logger =
- LoggerFactory.getInstance().getLogger(OxmSchemaLoader.class.getName());
-
private OxmSchemaLoader() {
}
*
*/
public synchronized static void loadModels() throws SchemaProviderException {
- if (logger.isDebugEnabled()) {
- logger.debug("Loading OXM Models");
+ if (log.isDebugEnabled()) {
+ log.debug("Loading OXM Models");
}
for (SchemaVersion oxmVersion : translator.getSchemaVersions().getVersions()) {
versionContextMap.put(oxmVersion, jaxbContext);
loadXmlLookupMap(oxmVersion, jaxbContext);
loadVertexLookupMap(oxmVersion, jaxbContext);
- logger.info(SchemaProviderMsgs.LOADED_SCHEMA_FILE, oxmVersion);
+ log.info("PVD0001I|Successfully loaded schema: {}", oxmVersion);
}
/**
}
// If there are still no models available, then there's not much we can do...
if (versionContextMap.isEmpty()) {
- logger.error(SchemaProviderMsgs.SCHEMA_LOAD_ERROR, "No available OXM schemas to get versions for.");
+ log.error("PVD0500E|Unable to load schema: No available OXM schemas to get versions for.");
throw new SchemaProviderException("No available OXM schemas to get latest version for.");
}
List<String> versions = new ArrayList<String>();
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Multimap;
+import lombok.extern.slf4j.Slf4j;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Set;
import java.util.stream.Collectors;
-import org.onap.aai.cl.eelf.LoggerFactory;
import org.onap.aai.edges.EdgeRule;
import org.onap.aai.schemaif.SchemaProviderException;
-import org.onap.aai.schemaif.SchemaProviderMsgs;
+@Slf4j
public class RelationshipSchema {
public static final String SCHEMA_SOURCE_NODE_TYPE = "from";
public static final String SCHEMA_RELATIONSHIP_TYPE = "label";
public static final String SCHEMA_RULES_ARRAY = "rules";
- private static org.onap.aai.cl.api.Logger logger =
- LoggerFactory.getInstance().getLogger(RelationshipSchema.class.getName());
-
private Map<String, Map<String, Class<?>>> relations = new HashMap<>();
/**
* Hashmap of valid relationship types along with properties.
try {
return resolveClass(p.getValue());
} catch (SchemaProviderException | ClassNotFoundException e) {
- logger.error(SchemaProviderMsgs.SCHEMA_LOAD_ERROR, "Error in RelationshipSchema: " + e);
+ log.error("PVD0500E|Unable to load schema: {}", "Error in RelationshipSchema: " + e);
}
return null;
}));
try {
return resolveClass(p.getValue());
} catch (SchemaProviderException | ClassNotFoundException e) {
- logger.error(SchemaProviderMsgs.SCHEMA_LOAD_ERROR, "Error in RelationshipSchema: " + e);
+ log.error("PVD0500E|Unable to load schema: {}", "Error in RelationshipSchema: " + e);
}
return null;
}));
+++ /dev/null
-
-## Error Logs
-SCHEMA_LOAD_ERROR=\
- PVD0500E|\
- Unable to load schema: {0}
-
-## Info Logs
-LOADED_SCHEMA_FILE=\
- PVD0001I|\
- Successfully loaded schema: {0}
-
-LOADED_DB_RULE_FILE=\
- PVD0002I|\
- Successfully loaded DB Edge Rule and Edge Properties for: {0}
-
-
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
- <!-- Common logging framework -->
- <dependency>
- <groupId>org.onap.aai.logging-service</groupId>
- <artifactId>common-logging</artifactId>
- </dependency>
<!-- https://mvnrepository.com/artifact/org.springframework/spring-core -->
<dependency>
<groupId>org.springframework</groupId>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-junit</artifactId>
import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContextFactory;
-import org.onap.aai.cl.api.Logger;
-import org.onap.aai.cl.eelf.LoggerFactory;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.core.io.support.ResourcePatternResolver;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
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());
public synchronized static void loadModels() throws Exception {
OxmModelLoader.loadModels("classpath*:/oxm/aai_oxm*.xml", AAI_OXM_FILE_PATTERN);
try {
OxmModelLoader.loadModel(matcher.group(1), resource);
} catch (Exception e) {
- LOGGER.error(OxmModelLoaderMsgs.OXM_LOAD_ERROR,
- "Failed to load " + resource.getFilename() + ": " + e.getMessage());
+ log.error("CRD0503E|Unable to load OXM schema: {}", "Failed to load " + resource.getFilename() + ": " + e.getMessage());
throw new Exception("Failed to load schema");
}
}
Resource[] resources = resolver.getResources(oxmResourcesPattern);
if (resources.length == 0) {
- LOGGER.error(OxmModelLoaderMsgs.OXM_LOAD_ERROR, "No OXM schema files found on classpath");
+ log.error("CRD0503E|Unable to load OXM schema: {}", "No OXM schema files found on classpath");
throw new Exception("Failed to load schema");
}
return resources;
.createContextFromOXM(Thread.currentThread().getContextClassLoader(), properties);
versionContextMap.put(version, jaxbContext);
-
- LOGGER.info(OxmModelLoaderMsgs.LOADED_OXM_FILE, resourceName);
+ log.info("CRD0007I|Successfully loaded schema: {}", resourceName);
}
}
+++ /dev/null
-/**
- * ============LICENSE_START=======================================================
- * org.onap.aai
- * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Copyright © 2017-2018 Amdocs
- * All rights reserved.
- * ================================================================================
- * 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.aaiutils.oxm;
-
-import com.att.eelf.i18n.EELFResourceManager;
-
-import org.onap.aai.cl.eelf.LogMessageEnum;
-
-public enum OxmModelLoaderMsgs implements LogMessageEnum {
-
- /**
- * Invalid Model File
- * Arguments:
- * {0} = File/Dir
- * {1} = error
- */
-
- INVALID_OXM_FILE, INVALID_OXM_DIR,
-
- /**
- * Unable to load OXM schema: {0}
- *
- * <p>
- * Arguments:
- * {0} = error
- */
- OXM_LOAD_ERROR,
-
- /**
- * Successfully loaded schema: {0}
- *
- * <p>
- * Arguments:
- * {0} = oxm filename
- */
- LOADED_OXM_FILE;
-
- /**
- * Static initializer to ensure the resource bundles for this class are loaded...
- */
- static {
- EELFResourceManager.loadMessageBundle("oxm/OxmModelLoaderMsgs");
- }
-}
+++ /dev/null
-#Resource key=Error Code|Message text|Resolution text |Description text
-#######
-#Newlines can be utilized to add some clarity ensuring continuing line
-#has atleast one leading space
-#ResourceKey=\
-# CA0000E\
-# Sample error msg txt\
-# Sample resolution msg\
-# Sample description txt
-#
-######
-#Error code classification category
-#000 Info/Debug
-#100 Permission errors
-#200 Availability errors/Timeouts
-#300 Data errors
-#400 Schema Interface type/validation errors
-#500 Business process errors
-#900 Unknown errors
-#
-########################################################################
-
-INVALID_OXM_FILE=\
- CRD0002I|\
- Unable to parse schema file: {0} due to error : {1}\
-
-OXM_FILE_CHANGED=\
- CRD0003I|\
- OXM file change detected: {0}\
-
-INVALID_OXM_DIR=\
- CRD0005I|\
- Invalid OXM dir: {0}\
-
-LOADED_OXM_FILE=\
- CRD0007I|\
- Successfully loaded schema: {0}
-OXM_LOAD_ERROR=\
- CRD0503E|\
- Unable to load OXM schema: {0}
* 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.
public void shouldReportAnErrorWhenOxmModelsAreNotAvailable() {
Throwable exception = assertThrows(Exception.class, () ->
- OxmModelLoader.loadModels("classpath*:non_existing_aai_oxm*.xml",
+ OxmModelLoader.loadModels("classpath*:non_existing_aai_oxm*.xml",
Pattern.compile("non_existing_aai_oxm_(.*).xml")));
assertTrue(exception.getMessage().contains("Failed to load schema"));
}
Code Review / aai / aai-common.git / commitdiff