Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

message rosa #31

Open
wants to merge 1 commit into
base: graal-migration
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/messagerosa/core/model/MessageMediaError.java
Original file line number Diff line number Diff line change
@@ -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");
Comment on lines -4 to +5
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this changed?

private String name;

MessageMediaError(String name) {
Expand Down
27 changes: 20 additions & 7 deletions src/main/java/messagerosa/utils/XMessageStylesParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Comment on lines +80 to +102
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes are not relevant to GraalVM migration please revert these back.

}


private static int seekEndBlock(CharSequence text, char needle, int start, int end) {
for (int i = start; i <= end; ++i) {
char c = text.charAt(i);
Expand Down
Loading