Author: davidb Date: Tue Jul 11 15:00:53 2017 New Revision: 1801622 URL: http://svn.apache.org/viewvc?rev=1801622&view=rev Log: Felix Converter - slight improvement on ConverterImpl.
Modified: felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java Modified: felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java URL: http://svn.apache.org/viewvc/felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java?rev=1801622&r1=1801621&r2=1801622&view=diff ============================================================================== --- felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java (original) +++ felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java Tue Jul 11 15:00:53 2017 @@ -29,7 +29,6 @@ import java.util.UUID; import java.util.regex.Pattern; import org.osgi.util.converter.ConverterBuilder; -import org.osgi.util.converter.Converters; import org.osgi.util.converter.Functioning; import org.osgi.util.converter.Rule; @@ -75,13 +74,13 @@ public class ConverterImpl implements In cb.rule(new Rule<String, ZonedDateTime>(ZonedDateTime::parse) {}); // Special conversions between character arrays and String - cb.rule(new Rule<char[], String>(ConverterImpl::charArrayToString) {}); - cb.rule(new Rule<Character[], String>(ConverterImpl::characterArrayToString) {}); - cb.rule(new Rule<String, char[]>(ConverterImpl::stringToCharArray) {}); - cb.rule(new Rule<String, Character[]>(ConverterImpl::stringToCharacterArray) {}); + cb.rule(new Rule<char[], String>(this::charArrayToString) {}); + cb.rule(new Rule<Character[], String>(this::characterArrayToString) {}); + cb.rule(new Rule<String, char[]>(this::stringToCharArray) {}); + cb.rule(new Rule<String, Character[]>(this::stringToCharacterArray) {}); } - private static String charArrayToString(char[] ca) { + private String charArrayToString(char[] ca) { StringBuilder sb = new StringBuilder(ca.length); for (char c : ca) { sb.append(c); @@ -89,11 +88,11 @@ public class ConverterImpl implements In return sb.toString(); } - private static String characterArrayToString(Character[] ca) { - return charArrayToString(Converters.standardConverter().convert(ca).to(char[].class)); + private String characterArrayToString(Character[] ca) { + return charArrayToString(convert(ca).to(char[].class)); } - private static char[] stringToCharArray(String s) { + private char[] stringToCharArray(String s) { char[] ca = new char[s.length()]; for (int i=0; i<s.length(); i++) { @@ -102,8 +101,8 @@ public class ConverterImpl implements In return ca; } - private static Character[] stringToCharacterArray(String s) { - return Converters.standardConverter().convert(stringToCharArray(s)).to(Character[].class); + private Character[] stringToCharacterArray(String s) { + return convert(stringToCharArray(s)).to(Character[].class); } private Class<?> loadClassUnchecked(String className) {