/*
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 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=========================================================
*/
*/
private String fixForUnqualifiedBug(final String schemaString) {
// Fix the "entry" element
- String newSchemaString = schemaString.replaceAll(
+ String newSchemaString = schemaString.replace(
"<xs:element name=\"entry\" minOccurs=\"0\" maxOccurs=\"unbounded\">",
"<xs:element name=\"entry\" minOccurs=\"0\" maxOccurs=\"unbounded\" form=\"unqualified\">");
// Fix the "key" element
- newSchemaString = newSchemaString.replaceAll("<xs:element name=\"key\"",
+ newSchemaString = newSchemaString.replace("<xs:element name=\"key\"",
"<xs:element name=\"key\" form=\"unqualified\"");
// Fix the "value" element
- newSchemaString = newSchemaString.replaceAll("<xs:element name=\"value\"",
+ newSchemaString = newSchemaString.replace("<xs:element name=\"value\"",
"<xs:element name=\"value\" form=\"unqualified\"");
return newSchemaString;
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020 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 (!schemaFlavour.equals(other.schemaFlavour)) {
return false;
}
- final String thisSchema = CDataConditioner.clean(schemaDefinition).replaceAll("\n", "");
- final String otherSchema = CDataConditioner.clean(other.schemaDefinition).replaceAll("\n", "");
+ final String thisSchema = CDataConditioner.clean(schemaDefinition).replace("\n", "");
+ final String otherSchema = CDataConditioner.clean(other.schemaDefinition).replace("\n", "");
return thisSchema.equals(otherSchema);
}
if (!schemaFlavour.equals(other.schemaFlavour)) {
return schemaFlavour.compareTo(other.schemaFlavour);
}
- final String thisSchema = CDataConditioner.clean(schemaDefinition).replaceAll("\n", "");
- final String otherSchema = CDataConditioner.clean(other.schemaDefinition).replaceAll("\n", "");
+ final String thisSchema = CDataConditioner.clean(schemaDefinition).replace("\n", "");
+ final String otherSchema = CDataConditioner.clean(other.schemaDefinition).replace("\n", "");
return thisSchema.compareTo(otherSchema);
}
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
} else {
builder.append(",\n\"");
}
- builder.append(message.replaceAll("\"", "\\\\\""));
+ builder.append(message.replace("\"", "\\\\\""));
builder.append("\"");
}
builder.append("]\n");
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020 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 (!logicFlavour.equals(other.logicFlavour)) {
return false;
}
- final String thislogic = CDataConditioner.clean(logic).replaceAll("\n", "");
- final String otherlogic = CDataConditioner.clean(other.logic).replaceAll("\n", "");
+ final String thislogic = CDataConditioner.clean(logic).replace("\n", "");
+ final String otherlogic = CDataConditioner.clean(other.logic).replace("\n", "");
return thislogic.equals(otherlogic);
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 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=========================================================
*/
// Now, we read in the script
// Get the package name of the current package and convert dots to slashes for the file path
- String fullLogicFilePath = logicPackage.replaceAll("\\.", "/");
+ String fullLogicFilePath = logicPackage.replace(".", "/");
// Now, the logic should be in a sub directory for the logic executor type
fullLogicFilePath += "/" + axLogic.getLogicFlavour().toLowerCase();