From fdbbe7dd51fbd2b7a953b734610634571072e7f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Dywicki?= Date: Fri, 28 Dec 2018 16:30:52 +0100 Subject: [PATCH] Fixes for #5 - removal of all non standard characters. --- .../wrapper/ip/OpenHabConfigurationVisitor.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/ip/src/main/java/org/code_house/bacnet4j/wrapper/ip/OpenHabConfigurationVisitor.java b/ip/src/main/java/org/code_house/bacnet4j/wrapper/ip/OpenHabConfigurationVisitor.java index 3b2c3b6..8a4bbb0 100644 --- a/ip/src/main/java/org/code_house/bacnet4j/wrapper/ip/OpenHabConfigurationVisitor.java +++ b/ip/src/main/java/org/code_house/bacnet4j/wrapper/ip/OpenHabConfigurationVisitor.java @@ -84,18 +84,9 @@ private static String openhabType(Property property) { } private static String openhabName(Property property) { - return property.getName() - .replace(" ", "_") - .replaceAll("\\)$", "") - .replaceAll("}$", "") - .replaceAll("]$", "") - .replace(":|;|\\.", "_") - .replace("(", "_") - .replace(")", "_") - .replace("{", "_") - .replace("}", "_") - .replace("[", "_") - .replace("]", "_") + return property.getName().trim() + .replaceAll("[^a-zA-Z0-9\\s]", "") + .replaceAll("\\s", "_") // in the end - we replace non ascii characters .replaceAll("[^\\x00-\\x7F]", "_"); }