* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2021 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
if (obj == null) {
return null;
}
- String ret = obj.toString();
+ var ret = obj.toString();
if (ret.length() == 0) {
return "\"\"";
}
}
if ("doDescription".equals(format)) {
- String ret = obj.toString();
+ var ret = obj.toString();
if (ret.contains("\n") || ret.contains("\"")) {
ret = "LS" + "\n" + ret + "\n" + "LE";
} else {
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
* Modifications Copyright (C) 2019 Samsung Electronics Co., Ltd.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2021 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*/
public void addSchemaDeclaration(final String name, final String version, final String uuid,
final String description, final String flavour, final String schema) {
- final ST st = stg.getInstanceOf("schemaDecl");
+ final var st = stg.getInstanceOf("schemaDecl");
st.add(NAME, name);
st.add(VERSION, version);
st.add(UUID, uuid);
* @param codeGenCliEditorBuilder The parameters for the context album
*/
public void addContextAlbumDeclaration(CodeGenCliEditorBuilder codeGenCliEditorBuilder) {
- final ST st = stg.getInstanceOf("ctxAlbumDecl");
+ final var st = stg.getInstanceOf("ctxAlbumDecl");
st.add(NAME, codeGenCliEditorBuilder.getName());
st.add(VERSION, codeGenCliEditorBuilder.getVersion());
st.add(UUID, codeGenCliEditorBuilder.getUuid());
*/
public ST createEventFieldDefinition(final String eventName, final String version, final String fieldName,
final String fieldSchema, final String fieldSchemaVersion, final boolean optional) {
- final ST st = stg.getInstanceOf("eventDefField");
+ final var st = stg.getInstanceOf("eventDefField");
st.add(EVENT_NAME, eventName);
st.add(VERSION, version);
st.add(FIELD_NAME, fieldName);
*/
public ST createTaskDefLogic(final String taskName, final String version, final String flavour,
final String logic) {
- final ST st = stg.getInstanceOf("taskDefLogic");
+ final var st = stg.getInstanceOf("taskDefLogic");
st.add(TASK_NAME, taskName);
st.add(VERSION, version);
st.add(FLAVOUR, flavour);
* @param eventDeclarationBuilder param object for event declaration
*/
public void addEventDeclaration(EventDeclarationBuilder eventDeclarationBuilder) {
- final ST st = stg.getInstanceOf("eventDecl");
+ final var st = stg.getInstanceOf("eventDecl");
st.add(NAME, eventDeclarationBuilder.getName());
st.add(VERSION, eventDeclarationBuilder.getVersion());
st.add(UUID, eventDeclarationBuilder.getUuid());
* @param taskDeclarationBuilder builder for the task declaration parameters
*/
public void addTaskDeclaration(TaskDeclarationBuilder taskDeclarationBuilder) {
- final ST st = stg.getInstanceOf("taskDecl");
+ final var st = stg.getInstanceOf("taskDecl");
st.add(NAME, taskDeclarationBuilder.getName());
st.add(VERSION, taskDeclarationBuilder.getVersion());
st.add(UUID, taskDeclarationBuilder.getUuid());
*/
public void addPolicyDefinition(final String name, final String version, final String uuid,
final String description, final String template, final String firstState, final List<ST> states) {
- final ST st = stg.getInstanceOf("policyDef");
+ final var st = stg.getInstanceOf("policyDef");
st.add(NAME, name);
st.add(VERSION, version);
st.add(UUID, uuid);
*/
public ST createTaskDefinitionInfields(final String taskName, final String version, final String fieldName,
final String fieldSchema, final String fieldSchemaVersion) {
- final ST st = stg.getInstanceOf("taskDefInputFields");
+ final var st = stg.getInstanceOf("taskDefInputFields");
st.add(TASK_NAME, taskName);
st.add(VERSION, version);
st.add(FIELD_NAME, fieldName);
*/
public ST createTaskDefinitionOutfields(final String taskName, final String version, final String fieldName,
final String fieldSchema, final String fieldSchemaVersion) {
- final ST st = stg.getInstanceOf("taskDefOutputFields");
+ final var st = stg.getInstanceOf("taskDefOutputFields");
st.add(TASK_NAME, taskName);
st.add(VERSION, version);
st.add(FIELD_NAME, fieldName);
*/
public ST createTaskDefinitionParameters(final String name, final String version, final String parName,
final String defaultValue) {
- final ST st = stg.getInstanceOf("taskDefParameter");
+ final var st = stg.getInstanceOf("taskDefParameter");
st.add(NAME, name);
st.add(VERSION, version);
st.add(PAR_NAME, parName);
*/
public ST createTaskDefinitionContextRef(final String name, final String version, final String albumName,
final String albumVersion) {
- final ST st = stg.getInstanceOf("taskDefCtxRef");
+ final var st = stg.getInstanceOf("taskDefCtxRef");
st.add(NAME, name);
st.add(VERSION, version);
st.add(ALBUM_NAME, albumName);
* @return a CLI command for a policy state task definition
*/
public ST createPolicyStateTask(PolicyStateTaskBuilder policyStateTaskBuilder) {
- final ST st = stg.getInstanceOf("policyStateTask");
+ final var st = stg.getInstanceOf("policyStateTask");
st.add(POLICY_NAME, policyStateTaskBuilder.getPolicyName());
st.add(VERSION, policyStateTaskBuilder.getVersion());
st.add(STATE_NAME, policyStateTaskBuilder.getStateName());
public ST createPolicyStateOutput(final String policyName, final String version, final String stateName,
final String outputName, final String eventName, final String eventVersion,
final String nextState) {
- final ST st = stg.getInstanceOf("policyStateOutput");
+ final var st = stg.getInstanceOf("policyStateOutput");
st.add(POLICY_NAME, policyName);
st.add(VERSION, version);
st.add(STATE_NAME, stateName);
* @return a CLI command for a policy state definition
*/
public ST createPolicyStateDef(PolicyStateDefBuilder policyStateDefBuilder) {
- final ST st = stg.getInstanceOf("policyStateDef");
+ final var st = stg.getInstanceOf("policyStateDef");
st.add(POLICY_NAME, policyStateDefBuilder.getPolicyName());
st.add(VERSION, policyStateDefBuilder.getVersion());
st.add(STATE_NAME, policyStateDefBuilder.getStateName());
*/
public ST createPolicyStateDefTaskSelLogic(final String name, final String version, final String stateName,
final String logicFlavour, final String logic) {
- final ST st = stg.getInstanceOf("policyStateTaskSelectionLogic");
+ final var st = stg.getInstanceOf("policyStateTaskSelectionLogic");
st.add(NAME, name);
st.add(VERSION, version);
st.add(STATE_NAME, stateName);
*/
public ST createPolicyStateDefFinalizerLogic(final String name, final String version, final String stateName,
final String finalizerLogicName, final String logicFlavour, final String logic) {
- final ST st = stg.getInstanceOf("policyStateFinalizerLogic");
+ final var st = stg.getInstanceOf("policyStateFinalizerLogic");
st.add(NAME, name);
st.add(VERSION, version);
st.add(STATE_NAME, stateName);
*/
public ST createPolicyStateDefContextRef(final String name, final String version, final String stateName,
final String albumName, final String albumVersion) {
- final ST st = stg.getInstanceOf("policyStateContextRef");
+ final var st = stg.getInstanceOf("policyStateContextRef");
st.add(NAME, name);
st.add(VERSION, version);
st.add(STATE_NAME, stateName);
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2021 Nordix Foundation
* ================================================================================
* 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.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
*
* @author Sven van der Meer (sven.van.der.meer@ericsson.com)
*/
-public class SupportGenerationTester {
+public class SupportGenerationTest {
/**
* Get the chunks for the codegen.
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2021 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
LOGGER.info(startMessage);
try {
- final CommandLineParameterParser parser = new CommandLineParameterParser();
+ final var parser = new CommandLineParameterParser();
parameters = parser.parse(args);
if (parameters.isHelpSet()) {
return;
}
- String modelPropertiesString = "model properties are: " + apexModelProperties.toString();
+ var modelPropertiesString = "model properties are: " + apexModelProperties.toString();
LOGGER.debug(modelPropertiesString);
// Find the system commands
}
// Read in the command hierarchy, this builds a tree of commands
- final KeywordNode rootKeywordNode = new KeywordNode("root");
+ final var rootKeywordNode = new KeywordNode("root");
for (final CommandLineCommand command : commands.getCommandSet()) {
rootKeywordNode.processKeywords(command.getKeywordlist(), command);
}
return;
}
- final CommandLineEditorLoop cliEditorLoop = new CommandLineEditorLoop(apexModelProperties.getProperties(),
+ final var cliEditorLoop = new CommandLineEditorLoop(apexModelProperties.getProperties(),
modelHandler, rootKeywordNode);
try {
errorCount = cliEditorLoop.runLoop(parameters.getCommandInputStream(), parameters.getOutputStream(),
* @param args the arguments
*/
public static void main(final String[] args) {
- final ApexCommandLineEditorMain cliEditor = new ApexCommandLineEditorMain(args);
+ final var cliEditor = new ApexCommandLineEditorMain(args);
// Only call system.exit on errors as it brings the JVM down
if (cliEditor.getErrorCount() > 0) {
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2021 Nordix Foundation.
* ================================================================================
* 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.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
public Result executeCommand(final CommandLineCommand command,
final SortedMap<String, CommandLineArgumentValue> argumentValues, final PrintWriter writer) {
// Get the method
- final Method apiMethod = getCommandMethod(command);
+ final var apiMethod = getCommandMethod(command);
// Get the method arguments
final Object[] parameterArray = getParameterArray(command, argumentValues, apiMethod);
try {
- final Object returnObject = apiMethod.invoke(apexModel, parameterArray);
+ final var returnObject = apiMethod.invoke(apexModel, parameterArray);
if (returnObject instanceof ApexApiResult) {
final ApexApiResult result = (ApexApiResult) returnObject;
*/
private Object[] getParameterArray(final CommandLineCommand command,
final SortedMap<String, CommandLineArgumentValue> argumentValues, final Method apiMethod) {
- final Object[] parameterArray = new Object[argumentValues.size()];
+ final var parameterArray = new Object[argumentValues.size()];
- int item = 0;
+ var item = 0;
try {
for (final Class<?> parametertype : apiMethod.getParameterTypes()) {
final String parameterValue = argumentValues.get(command.getArgumentList().get(item).getArgumentName())
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2021 Nordix Foundation.
* ================================================================================
* 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.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
* @return the default properties
*/
public Properties getProperties() {
- final Properties properties = new Properties();
+ final var properties = new Properties();
// @formatter:off
properties.setProperty("DEFAULT_CONCEPT_VERSION", defaultConceptVersion);
properties.setProperty("DEFAULT_EVENT_NAMESPACE", defaultEventNamespace);
* @return the argument help
*/
public String getHelp() {
- final StringBuilder builder = new StringBuilder();
+ final var builder = new StringBuilder();
builder.append(argumentName);
builder.append(nullable ? ": (O) " : ": (M) ");
builder.append(description);
*/
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
+ final var prime = 31;
+ var result = 1;
result = prime * result + ((argumentName == null) ? 0 : argumentName.hashCode());
result = prime * result + ((description == null) ? 0 : description.hashCode());
result = prime * result + (nullable ? 1231 : 1237);
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2021 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* @return the help for this command
*/
public String getHelp() {
- final StringBuilder builder = new StringBuilder();
+ final var builder = new StringBuilder();
for (final String keyword : keywordlist) {
builder.append(keyword);
builder.append(' ');
*/
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
+ final var prime = 31;
+ var result = 1;
result = prime * result + ((apiMethod == null) ? 0 : apiMethod.hashCode());
result = prime * result + argumentList.hashCode();
result = prime * result + ((description == null) ? 0 : description.hashCode());
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019-2020 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2021 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
public int runLoop(final InputStream inputStream, final OutputStream outputStream,
final CommandLineParameters parameters) throws IOException {
// Readers and writers for input and output
- final BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
- final PrintWriter writer = new PrintWriter(new OutputStreamWriter(outputStream));
+ final var reader = new BufferedReader(new InputStreamReader(inputStream));
+ final var writer = new PrintWriter(new OutputStreamWriter(outputStream));
// The parser parses the input lines into commands and arguments
- final CommandLineParser parser = new CommandLineParser();
+ final var parser = new CommandLineParser();
// The execution status has the result of the latest command and a cumulative error count
MutablePair<Result, Integer> executionStatus = new MutablePair<>(Result.SUCCESS, 0);
// Get the output model
if (!parameters.isSuppressModelOutput()) {
- final String modelString = modelHandler.writeModelToString(writer);
+ final var modelString = modelHandler.writeModelToString(writer);
if (parameters.checkSetOutputModelFileName()) {
TextFileUtils.putStringAsTextFile(modelString, parameters.getOutputModelFileName());
if (!System.in.equals(inputStream)) {
reader.close();
}
-
if (!System.out.equals(outputStream) && !System.err.equals(outputStream)) {
writer.close();
}
*/
private String readLogicBlock(final CommandLineParameters parameters, final BufferedReader reader,
final PrintWriter writer, MutablePair<Result, Integer> executionStatus) {
- StringBuilder logicBlock = new StringBuilder();
+ var logicBlock = new StringBuilder();
while (true) {
try {
* @return A string with the prompt
*/
private String getPrompt() {
- final StringBuilder builder = new StringBuilder();
+ final var builder = new StringBuilder();
final Iterator<KeywordNode> keynodeDequeIter = keywordNodeDeque.descendingIterator();
while (keynodeDequeIter.hasNext()) {
private CommandLineCommand findCommand(final List<String> commandWords) {
CommandLineCommand command = null;
- final KeywordNode startKeywordNode = keywordNodeDeque.peek();
+ final var startKeywordNode = keywordNodeDeque.peek();
// Go down through the keywords searching for the command
- for (int i = 0; i < commandWords.size(); i++) {
- final KeywordNode searchKeywordNode = keywordNodeDeque.peek();
+ for (var i = 0; i < commandWords.size(); i++) {
+ final var searchKeywordNode = keywordNodeDeque.peek();
// We have got to the arguments, time to stop looking
if (commandWords.get(i).indexOf('=') >= 0) {
commandWords.set(i, foundNodeEntries.get(0).getKey());
// Check if there is a command
- final KeywordNode childKeywordNode = foundNodeEntries.get(0).getValue();
+ final var childKeywordNode = foundNodeEntries.get(0).getValue();
command = childKeywordNode.getCommand();
// If the command is null, we go into a sub mode, otherwise we unwind the stack of
* @return the string
*/
private String stringAL2String(final List<String> stringArrayList) {
- final StringBuilder builder = new StringBuilder();
- boolean first = true;
+ final var builder = new StringBuilder();
+ var first = true;
for (final String word : stringArrayList) {
if (first) {
first = false;
final int macroTagPos = line.indexOf(macroFileTag);
// Get the line before and after the macro tag
- final String lineBeforeMacroTag = line.substring(0, macroTagPos);
+ final var lineBeforeMacroTag = line.substring(0, macroTagPos);
final String lineAfterMacroTag = line.substring(macroTagPos + macroFileTag.length()).replaceAll("^\\s*", "");
// Get the file name that is the argument of the Macro tag
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2021 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* @return the CLI parameters
*/
public CommandLineParameters parse(final String[] args) {
- CommandLine commandLine = parseDefault(args);
- final CommandLineParameters parameters = new CommandLineParameters();
+ var commandLine = parseDefault(args);
+ final var parameters = new CommandLineParameters();
parseSingleLetterOptions(commandLine, parameters);
parseDoubleLetterOptions(commandLine, parameters);
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019-2020 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2021 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
if (logFileName == null) {
return System.out;
} else {
- File logFile = new File(logFileName);
+ var logFile = new File(logFileName);
if (!logFile.getParentFile().exists()) {
logFile.getParentFile().mkdirs();
}
private ArrayList<String> mergeQuotes(final ArrayList<String> wordsSplitOnQuotes) {
final ArrayList<String> wordsWithQuotesMerged = new ArrayList<>();
- int loopWordIndex;
- for (int wordIndex = 0; wordIndex < wordsSplitOnQuotes.size(); wordIndex = loopWordIndex) {
- loopWordIndex = mergeQuote(wordsSplitOnQuotes, wordsWithQuotesMerged, wordIndex);
+ var wordIndex = 0;
+ while (wordIndex < wordsSplitOnQuotes.size()) {
+ wordIndex = mergeQuote(wordsSplitOnQuotes, wordsWithQuotesMerged, wordIndex);
}
return wordsWithQuotesMerged;
int wordIndex) {
if ("\"".equals(wordsSplitOnQuotes.get(wordIndex))) {
- StringBuilder quotedWord = new StringBuilder(wordsSplitOnQuotes.get(wordIndex++));
+ var quotedWord = new StringBuilder(wordsSplitOnQuotes.get(wordIndex++));
for (; wordIndex < wordsSplitOnQuotes.size(); wordIndex++) {
quotedWord.append(wordsSplitOnQuotes.get(wordIndex));
break;
}
}
- String quotedWordToString = quotedWord.toString();
+ var quotedWordToString = quotedWord.toString();
if (quotedWordToString.matches("^\".*\"$")) {
wordsWithQuotesMerged.add(quotedWordToString);
} else {
private ArrayList<String> mergeEquals(final ArrayList<String> wordsSplitOnEquals) {
final ArrayList<String> wordsWithEqualsMerged = new ArrayList<>();
- int loopWordIndex;
- for (int wordIndex = 0; wordIndex < wordsSplitOnEquals.size(); wordIndex = loopWordIndex) {
- loopWordIndex = wordIndex;
+ var wordIndex = 0;
+ while (wordIndex < wordsSplitOnEquals.size()) {
// Is this a quoted word ?
- if (wordsSplitOnEquals.get(loopWordIndex).startsWith("\"")) {
- wordsWithEqualsMerged.add(wordsSplitOnEquals.get(loopWordIndex));
+ if (wordsSplitOnEquals.get(wordIndex).startsWith("\"")) {
+ wordsWithEqualsMerged.add(wordsSplitOnEquals.get(wordIndex));
continue;
}
- if ("=".equals(wordsSplitOnEquals.get(loopWordIndex))) {
- if (loopWordIndex < wordsSplitOnEquals.size() - 1
- && !wordsSplitOnEquals.get(loopWordIndex + 1).startsWith("=")) {
+ if ("=".equals(wordsSplitOnEquals.get(wordIndex))) {
+ if (wordIndex < wordsSplitOnEquals.size() - 1
+ && !wordsSplitOnEquals.get(wordIndex + 1).startsWith("=")) {
wordsWithEqualsMerged.add(
- wordsSplitOnEquals.get(loopWordIndex) + wordsSplitOnEquals.get(loopWordIndex + 1));
- loopWordIndex += 2;
+ wordsSplitOnEquals.get(wordIndex) + wordsSplitOnEquals.get(wordIndex + 1));
+ wordIndex += 2;
} else {
- wordsWithEqualsMerged.add(wordsSplitOnEquals.get(loopWordIndex++));
+ wordsWithEqualsMerged.add(wordsSplitOnEquals.get(wordIndex++));
}
} else {
- wordsWithEqualsMerged.add(wordsSplitOnEquals.get(loopWordIndex++));
+ wordsWithEqualsMerged.add(wordsSplitOnEquals.get(wordIndex++));
}
}
private ArrayList<String> mergeArguments(final ArrayList<String> words) {
final ArrayList<String> mergedArguments = new ArrayList<>();
- for (int i = 0; i < words.size(); i++) {
+ for (var i = 0; i < words.size(); i++) {
// Is this a quoted word ?
if (words.get(i).startsWith("\"")) {
mergedArguments.add(words.get(i));
private ArrayList<String> splitOnChar(final String line, final char splitChar) {
final ArrayList<String> wordsSplitOnQuotes = new ArrayList<>();
- int currentPos = 0;
+ var currentPos = 0;
while (currentPos != -1) {
final int quotePos = line.indexOf(splitChar, currentPos);
if (quotePos != -1) {
}
// Now check that we have a sequence of commands at the beginning
- int currentWordPos = 0;
+ var currentWordPos = 0;
for (; currentWordPos < commandWords.size(); currentWordPos++) {
if (!commandWords.get(currentWordPos).matches("^[a-zA-Z0-9]*$")) {
break;
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2021 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
return this.hashCode() - otherKeywordNode.hashCode();
}
- final KeywordNode other = otherKeywordNode;
+ final var other = otherKeywordNode;
if (!keyword.equals(other.keyword)) {
return keyword.compareTo(other.keyword);
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
+ final var prime = 31;
+ var result = 1;
result = prime * result + ((children == null) ? 0 : children.hashCode());
result = prime * result + ((command == null) ? 0 : command.hashCode());
result = prime * result + ((keyword == null) ? 0 : keyword.hashCode());
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019-2021 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* @param args the command line arguments
*/
public ApexCliToscaEditorMain(final String[] args) {
- final String argumentString = Arrays.toString(args);
+ final var argumentString = Arrays.toString(args);
LOGGER.info("Starting Apex CLI Tosca editor with arguments - {}", argumentString);
- final ApexCliToscaParameterParser parser = new ApexCliToscaParameterParser();
+ final var parser = new ApexCliToscaParameterParser();
parameters = parser.parse(args);
if (parameters.isHelpSet()) {
CliUtils.help(ApexCliToscaEditorMain.class.getName(), parser.getOptions());
String policyModelFilePath = null;
try {
- final File tempModelFile = File.createTempFile("policyModel", ".json");
+ final var tempModelFile = File.createTempFile("policyModel", ".json");
policyModelFilePath = tempModelFile.getAbsolutePath();
} catch (IOException e) {
LOGGER.error("Cannot create the policy model temp file.", e);
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019-2021 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.apex.auth.clieditor.tosca;
-import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.onap.policy.apex.auth.clieditor.CommandLineParameterParser;
*/
@Override
public ApexCliToscaParameters parse(final String[] args) {
- CommandLine commandLine = parseDefault(args);
- final ApexCliToscaParameters parameters = new ApexCliToscaParameters();
+ var commandLine = parseDefault(args);
+ final var parameters = new ApexCliToscaParameters();
parseSingleLetterOptions(commandLine, parameters);
parseDoubleLetterOptions(commandLine, parameters);
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019-2020 Nordix Foundation.
+ * Copyright (C) 2019-2021 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*/
public static void createToscaServiceTemplate(ApexCliToscaParameters parameters, String policyModelFilePath)
throws IOException, CoderException {
- final StandardCoder standardCoder = new StandardCoder();
- String apexConfig = TextFileUtils.getTextFileAsString(parameters.getApexConfigFileName());
+ final var standardCoder = new StandardCoder();
+ var apexConfig = TextFileUtils.getTextFileAsString(parameters.getApexConfigFileName());
JsonObject apexConfigJson = standardCoder.decode(apexConfig, JsonObject.class);
- String policyModel = TextFileUtils.getTextFileAsString(policyModelFilePath);
+ var policyModel = TextFileUtils.getTextFileAsString(policyModelFilePath);
JsonObject policyModelJson = standardCoder.decode(policyModel, JsonObject.class);
- String toscaTemplate = TextFileUtils.getTextFileAsString(parameters.getInputToscaTemplateFileName());
+ var toscaTemplate = TextFileUtils.getTextFileAsString(parameters.getInputToscaTemplateFileName());
JsonObject toscaTemplateJson = standardCoder.decode(toscaTemplate, JsonObject.class);
- JsonObject toscaPolicyProperties = toscaTemplateJson.get("topology_template").getAsJsonObject();
- JsonObject toscaPolicy = toscaPolicyProperties.get("policies").getAsJsonArray().get(0).getAsJsonObject();
- JsonObject toscaProperties = toscaPolicy.get(toscaPolicy.keySet().toArray()[0].toString()).getAsJsonObject()
+ var toscaPolicyProperties = toscaTemplateJson.get("topology_template").getAsJsonObject();
+ var toscaPolicy = toscaPolicyProperties.get("policies").getAsJsonArray().get(0).getAsJsonObject();
+ var toscaProperties = toscaPolicy.get(toscaPolicy.keySet().toArray()[0].toString()).getAsJsonObject()
.get("properties").getAsJsonObject();
apexConfigJson.entrySet().forEach(entry -> {
}
toscaProperties.add(entry.getKey(), entry.getValue());
});
- final String toscaPolicyString = standardCoder.encode(toscaTemplateJson);
+ final var toscaPolicyString = standardCoder.encode(toscaTemplateJson);
final String toscaPolicyFileName = parameters.getOutputToscaPolicyFileName();
if (StringUtils.isNotBlank(toscaPolicyFileName)) {
TextFileUtils.putStringAsTextFile(toscaPolicyString, toscaPolicyFileName);
if (fileName == null) {
return;
}
- final File theFile = new File(fileName);
+ final var theFile = new File(fileName);
final String prefixExceptionMessage = "File " + fileName + OF_TYPE_TAG + fileTag;
if (!theFile.exists()) {
if (fileName == null) {
return;
}
- final File theFile = new File(fileName);
+ final var theFile = new File(fileName);
final String prefixExceptionMessage = "File " + fileName + OF_TYPE_TAG + fileTag;
if (theFile.exists()) {
if (!theFile.isFile()) {
if (directoryName == null) {
return;
}
- final File theDirectory = new File(directoryName);
+ final var theDirectory = new File(directoryName);
final String prefixExceptionMessage = "directory " + directoryName + OF_TYPE_TAG + directoryTag;
if (theDirectory.exists()) {
* @param options the options for cli editor
*/
public static void help(final String mainClassName, Options options) {
- final HelpFormatter helpFormatter = new HelpFormatter();
+ final var helpFormatter = new HelpFormatter();
helpFormatter.printHelp(MAX_HELP_LINE_LENGTH, mainClassName + " [options...]", "options", options, "");
}
pd = new PropertyDescriptor(entry.getValue().toString(), class1);
getter = pd.getReadMethod();
argValue = getter.invoke(parameters);
- String key = entry.getKey().toString();
+ var key = entry.getKey().toString();
if (argValue instanceof String && !key.equals("o")) {
cliArgsList.add("-" + key);
/*-
* ============LICENSE_START=======================================================
- * Copyright (c) 2020 Nordix Foundation.
+ * Copyright (c) 2020-2021 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import java.util.List;
commandLineCommand.getApiMethodName();
}
- @Test(expected = CommandLineException.class)
+ @Test()
public void testInvalidApiMethod() {
commandLineCommand.setApiMethod("fail.");
assertEquals("fail.", commandLineCommand.getApiMethod());
- commandLineCommand.getApiMethodName();
+ assertThrows(CommandLineException.class, () -> commandLineCommand.getApiMethodName());
}
@Test
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019-2020 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2021 Nordix Foundation.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
}
@Test
- public void testSanity() throws ApexException {
+ public void testSanity() throws ApexException {
AxArtifactKey engineKey = new AxArtifactKey("Engine:0.0.1");
ApexEngineImpl engine = (ApexEngineImpl) new ApexEngineFactory().createApexEngine(engineKey);
assertNotNull(engine);
assertThatThrownBy(() -> engine.removeEventListener(null))
.hasMessage("removeEventListener()<-Engine:0.0.1,STOPPED, listenerName is null");
+ }
+
+ @Test
+ public void testListener() throws ApexException {
+ AxArtifactKey engineKey = new AxArtifactKey("Engine:0.0.1");
+ ApexEngineImpl engine = (ApexEngineImpl) new ApexEngineFactory().createApexEngine(engineKey);
engine.addEventListener("myListener", new DummyListener());
engine.removeEventListener("myListener");
assertEquals(AxEngineState.READY, engine.getState());
assertNull(engine.createEvent(null));
+ }
+
+ @Test
+ public void testEventKey() throws ApexException {
+ AxArtifactKey engineKey = new AxArtifactKey("Engine:0.0.1");
+ ApexEngineImpl engine = (ApexEngineImpl) new ApexEngineFactory().createApexEngine(engineKey);
+ engine.updateModel(policyModel, false);
+ engine.start();
AxArtifactKey eventKey = new AxArtifactKey("Event:0.0.1");
EnEvent event = engine.createEvent(eventKey);
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019-2020 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2021 Nordix Foundation.
* ================================================================================
* 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.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
/**
* Dummy engine event listener for unit test.
+ * Thread.sleep is used to simulate a slow event listener.
*
*/
public class DummySlowEnEventListener implements EnEventListener {
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020 Nordix Foundation
+ * Modifications Copyright (C) 2020-2021 Nordix Foundation
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
.hasMessage("null keys are illegal on method parameter \"key\"");
assertThatThrownBy(() -> event.put("NonField", null))
.hasMessage("parameter with key \"NonField\" not defined on event \"Event\"");
+ }
+
+ @Test
+ public void testAxEvent() {
+ AxArtifactKey eventKey = new AxArtifactKey("Event:0.0.1");
+ AxEvent axEvent = new AxEvent(eventKey, "a.name.space", "some source", "some target");
+ ModelService.getModel(AxEvents.class).getEventMap().put(eventKey, axEvent);
+ EnEvent event = new EnEvent(eventKey);
+
AxReferenceKey fieldKey = new AxReferenceKey("Parent", "0.0.1", "MyParent", "MyField");
AxArtifactKey fieldSchemaKey = new AxArtifactKey("FieldSchema:0.0.1");
AxField axField = new AxField(fieldKey, fieldSchemaKey);
Code Review / policy / apex-pdp.git / commitdiff