message rosa

samagra-comms · Aug 1, 2023 · 940fbca · 940fbca
1 parent fbb517a
commit 940fbca
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.7</version>
+        <version>3.0.4</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.uci</groupId>
@@ -15,7 +15,7 @@
     <name>message-rosa</name>
     <description>message-rosa for messages</description>
     <properties>
-        <java.version>11</java.version>
+        <java.version>18</java.version>
     </properties>
     <profiles>
         <profile>
@@ -38,7 +38,9 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
+            <artifactId>spring-boot-properties-migrator</artifactId>
+            <version>3.0.3</version>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -70,6 +72,12 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.2.1</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>

diff --git a/src/main/java/messagerosa/core/model/MessageMediaError.java b/src/main/java/messagerosa/core/model/MessageMediaError.java
@@ -1,8 +1,8 @@
 package messagerosa.core.model;
 
 public enum MessageMediaError {
-    PAYLOAD_TO_LARGE("payloadTooLarge"),
-    EMPTY_RESPONSE("emptyResponse");
+    PAYLOAD_TO_LARGE("pay load Too Large"),
+    EMPTY_RESPONSE("empty Response");
     private String name;
 
     MessageMediaError(String name) {

diff --git a/src/main/java/messagerosa/utils/XMessageStylesParser.java b/src/main/java/messagerosa/utils/XMessageStylesParser.java
@@ -77,19 +77,32 @@ private static int seekEnd(CharSequence text, char needle, int start, int end) {
     }
 
     private static int seekHigherOrderEndWithoutNewBeginning(CharSequence text, char needle, int start, int end) {
+        int result = -1;
         for (int i = start; i <= end; ++i) {
             char c = text.charAt(i);
-            if (c == needle && precededByWhiteSpace(text, i, start) && !followedByWhitespace(text, i, end)) {
-                return -1; // new beginning
-            } else if (c == needle && !Character.isWhitespace(text.charAt(i - 1)) && followedByWhitespace(text, i, end)) {
-                return i;
-            } else if (c == '\n') {
-                return -1;
+
+            if (c == '\n') {
+                result = -1;
+                break;
+            }
+
+            boolean isNeedleChar = (c == needle);
+            boolean precededByWhitespace = precededByWhitespace(text, i, start);
+            boolean followedByWhitespace = followedByWhitespace(text, i, end);
+
+            if (isNeedleChar && precededByWhitespace && !followedByWhitespace) {
+                result = -1; // New beginning
+                break;
+            } else if (isNeedleChar && !Character.isWhitespace(text.charAt(i - 1)) && followedByWhitespace) {
+                result = i;
+                break;
             }
         }
-        return -1;
+
+        return result;
     }
 
+
     private static int seekEndBlock(CharSequence text, char needle, int start, int end) {
         for (int i = start; i <= end; ++i) {
             char c = text.charAt(i);