import java.util.regex.Pattern;\r
import java.util.stream.Collectors;\r
\r
+import javax.annotation.PostConstruct;\r
import javax.ws.rs.core.Response.Status;\r
\r
import org.apache.commons.io.IOUtils;\r
import org.onap.aai.edges.EdgeIngestor;\r
import org.onap.aai.edges.EdgeRule;\r
import org.onap.aai.edges.exceptions.EdgeRuleNotFoundException;\r
-import org.onap.aai.setup.ConfigTranslator;\r
import org.onap.aai.setup.SchemaVersion;\r
+import org.onap.aai.setup.Translator;\r
import org.onap.crud.exception.CrudException;\r
import org.onap.crud.logging.CrudServiceMsgs;\r
import org.springframework.beans.factory.annotation.Autowired;\r
import com.google.common.collect.Multimap;\r
\r
public class EdgeRulesLoader {\r
- \r
- private static ConfigTranslator configTranslator;\r
+\r
+ private static Translator translator;\r
private static EdgeIngestor edgeIngestor;\r
\r
private static EdgePropsConfiguration edgePropsConfiguration;\r
LoggerFactory.getInstance ().getLogger ( EdgeRulesLoader.class.getName () );\r
\r
private EdgeRulesLoader () { }\r
- \r
+\r
@Autowired\r
- public EdgeRulesLoader(ConfigTranslator configTranslator, EdgeIngestor edgeIngestor, EdgePropsConfiguration edgePropsConfiguration) {\r
- EdgeRulesLoader.configTranslator = configTranslator;\r
+ public EdgeRulesLoader(Translator translator, EdgeIngestor edgeIngestor, EdgePropsConfiguration edgePropsConfiguration) {\r
+ EdgeRulesLoader.translator = translator;\r
EdgeRulesLoader.edgeIngestor = edgeIngestor;\r
EdgeRulesLoader.edgePropsConfiguration = edgePropsConfiguration;\r
}\r
\r
+ @PostConstruct\r
+ public void init() throws CrudException {\r
+ EdgeRulesLoader.loadModels();\r
+ }\r
+ \r
/**\r
* Finds all DB Edge Rules and Edge Properties files for all OXM models.\r
*\r
\r
for (String version : OxmModelLoader.getLoadedOXMVersions()) {\r
try {\r
- SchemaVersion schemaVersion = configTranslator.getSchemaVersions().getVersions().stream()\r
+ SchemaVersion schemaVersion = translator.getSchemaVersions().getVersions().stream()\r
.filter(s -> s.toString().equalsIgnoreCase(version)).findAny().orElse(null);\r
loadModel(schemaVersion, edgeIngestor, propFiles);\r
} catch (IOException | EdgeRuleNotFoundException e) {\r
}\r
\r
try {\r
- SchemaVersion schemaVersion = configTranslator.getSchemaVersions().getVersions().stream()\r
+ SchemaVersion schemaVersion = translator.getSchemaVersions().getVersions().stream()\r
.filter(s -> s.toString().equalsIgnoreCase(v)).findAny().orElse(null);\r
\r
loadModel(schemaVersion, edgeIngestor, propFiles);\r