diff options
Diffstat (limited to 'catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaFloatConverter.java')
-rw-r--r-- | catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaFloatConverter.java | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaFloatConverter.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaFloatConverter.java index 5d7f98e438..ba765c92a0 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaFloatConverter.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaFloatConverter.java @@ -7,9 +7,9 @@ * 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. @@ -23,28 +23,29 @@ package org.openecomp.sdc.be.model.tosca.converters; import java.math.BigDecimal; import java.util.Map; +import org.apache.commons.lang.StringUtils; import org.openecomp.sdc.be.model.DataTypeDefinition; public class ToscaFloatConverter implements PropertyValueConverter { - private static ToscaFloatConverter numberConverter = new ToscaFloatConverter(); - - public static ToscaFloatConverter getInstance() { - return numberConverter; - } - - private ToscaFloatConverter() { - - } - - @Override - public String convert(String original, String innerType, Map<String, DataTypeDefinition> dataTypes) { - if (original == null) { - return null; - } - if (original.contains("f") || original.contains("F")) - original = original.toLowerCase().replaceFirst("f", ""); - return new BigDecimal(original).toPlainString(); - } + private static ToscaFloatConverter numberConverter = new ToscaFloatConverter(); + + private ToscaFloatConverter() {} + + public static ToscaFloatConverter getInstance() { + return numberConverter; + } + + @Override + public String convert(String original, String innerType, Map<String, DataTypeDefinition> dataTypes) { + if (StringUtils.isEmpty(original)) { + return null; + } + String convertedValue = original; + if (original.endsWith("f") || original.endsWith("F")) { + convertedValue = StringUtils.removeEndIgnoreCase(original, "f"); + } + return new BigDecimal(convertedValue).toPlainString(); + } } |