Skip to content

Commit 1094af8

Browse files
jo-elimujo-elimu
authored
refactor(wordgson): use tostring (#2342)
2 parents cfbe867 + cbcbc8c commit 1094af8

File tree

5 files changed

+42
-46
lines changed

5 files changed

+42
-46
lines changed

‎pom-dependency-tree.txt‎

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ai.elimu:webapp:war:2.6.129-SNAPSHOT
2-
+- ai.elimu:model:jar:model-2.0.120:compile
1+
ai.elimu:webapp:war:2.6.134-SNAPSHOT
2+
+- ai.elimu:model:jar:model-2.0.122:compile
33
| \- com.google.code.gson:gson:jar:2.13.1:compile
44
| \- com.google.errorprone:error_prone_annotations:jar:2.38.0:compile
55
+- org.springframework:spring-context:jar:6.0.11:compile
@@ -113,43 +113,38 @@ ai.elimu:webapp:war:2.6.129-SNAPSHOT
113113
| +- net.bytebuddy:byte-buddy-agent:jar:1.14.15:test
114114
| \- org.objenesis:objenesis:jar:3.3:test
115115
+- org.springframework:spring-test:jar:6.0.11:test
116-
+- org.seleniumhq.selenium:selenium-java:jar:4.23.1:compile
117-
| +- org.seleniumhq.selenium:selenium-api:jar:4.23.1:compile
118-
| +- org.seleniumhq.selenium:selenium-chrome-driver:jar:4.23.1:compile
116+
+- org.seleniumhq.selenium:selenium-java:jar:4.34.0:compile
117+
| +- org.seleniumhq.selenium:selenium-api:jar:4.34.0:compile
118+
| | \- org.jspecify:jspecify:jar:1.0.0:compile
119+
| +- org.seleniumhq.selenium:selenium-chrome-driver:jar:4.34.0:compile
119120
| | +- com.google.auto.service:auto-service-annotations:jar:1.1.1:compile
120-
| | +- org.seleniumhq.selenium:selenium-chromium-driver:jar:4.23.1:compile
121-
| | +- org.seleniumhq.selenium:selenium-json:jar:4.23.1:compile
122-
| | \- org.seleniumhq.selenium:selenium-manager:jar:4.23.1:compile
123-
| +- org.seleniumhq.selenium:selenium-devtools-v125:jar:4.23.1:compile
124-
| +- org.seleniumhq.selenium:selenium-devtools-v126:jar:4.23.1:compile
125-
| +- org.seleniumhq.selenium:selenium-devtools-v127:jar:4.23.1:compile
126-
| +- org.seleniumhq.selenium:selenium-devtools-v85:jar:4.23.1:compile
127-
| +- org.seleniumhq.selenium:selenium-edge-driver:jar:4.23.1:compile
128-
| +- org.seleniumhq.selenium:selenium-firefox-driver:jar:4.23.1:compile
129-
| | \- org.seleniumhq.selenium:selenium-http:jar:4.23.1:compile
130-
| | \- dev.failsafe:failsafe:jar:3.3.2:compile
131-
| +- org.seleniumhq.selenium:selenium-ie-driver:jar:4.23.1:compile
132-
| +- org.seleniumhq.selenium:selenium-remote-driver:jar:4.23.1:compile
133-
| | +- com.google.guava:guava:jar:33.2.1-jre:compile
134-
| | | +- com.google.guava:failureaccess:jar:1.0.2:compile
121+
| | +- org.seleniumhq.selenium:selenium-chromium-driver:jar:4.34.0:compile
122+
| | +- org.seleniumhq.selenium:selenium-json:jar:4.34.0:compile
123+
| | \- org.seleniumhq.selenium:selenium-manager:jar:4.34.0:compile
124+
| +- org.seleniumhq.selenium:selenium-devtools-v136:jar:4.34.0:compile
125+
| +- org.seleniumhq.selenium:selenium-devtools-v137:jar:4.34.0:compile
126+
| +- org.seleniumhq.selenium:selenium-devtools-v138:jar:4.34.0:compile
127+
| +- org.seleniumhq.selenium:selenium-edge-driver:jar:4.34.0:compile
128+
| +- org.seleniumhq.selenium:selenium-firefox-driver:jar:4.34.0:compile
129+
| | \- org.seleniumhq.selenium:selenium-http:jar:4.34.0:compile
130+
| +- org.seleniumhq.selenium:selenium-ie-driver:jar:4.34.0:compile
131+
| +- org.seleniumhq.selenium:selenium-remote-driver:jar:4.34.0:compile
132+
| | +- com.google.guava:guava:jar:33.4.8-jre:compile
133+
| | | +- com.google.guava:failureaccess:jar:1.0.3:compile
135134
| | | +- com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava:compile
136-
| | | +- com.google.code.findbugs:jsr305:jar:3.0.2:compile
137-
| | | +- org.checkerframework:checker-qual:jar:3.42.0:compile
138135
| | | \- com.google.j2objc:j2objc-annotations:jar:3.0.0:compile
139-
| | +- io.opentelemetry.semconv:opentelemetry-semconv:jar:1.25.0-alpha:compile
140-
| | +- io.opentelemetry:opentelemetry-api:jar:1.40.0:compile
141-
| | +- io.opentelemetry:opentelemetry-context:jar:1.40.0:compile
142-
| | +- io.opentelemetry:opentelemetry-exporter-logging:jar:1.40.0:compile
143-
| | +- io.opentelemetry:opentelemetry-sdk-common:jar:1.40.0:compile
144-
| | +- io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:jar:1.40.0:compile
145-
| | +- io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:jar:1.40.0:compile
146-
| | | \- io.opentelemetry:opentelemetry-api-incubator:jar:1.40.0-alpha:runtime
147-
| | +- io.opentelemetry:opentelemetry-sdk-trace:jar:1.40.0:compile
148-
| | +- io.opentelemetry:opentelemetry-sdk:jar:1.40.0:compile
149-
| | | +- io.opentelemetry:opentelemetry-sdk-metrics:jar:1.40.0:compile
150-
| | | \- io.opentelemetry:opentelemetry-sdk-logs:jar:1.40.0:compile
151-
| | \- org.seleniumhq.selenium:selenium-os:jar:4.23.1:compile
152-
| | \- org.apache.commons:commons-exec:jar:1.4.0:compile
153-
| +- org.seleniumhq.selenium:selenium-safari-driver:jar:4.23.1:compile
154-
| \- org.seleniumhq.selenium:selenium-support:jar:4.23.1:compile
136+
| | +- io.opentelemetry:opentelemetry-api:jar:1.51.0:compile
137+
| | +- io.opentelemetry:opentelemetry-context:jar:1.51.0:compile
138+
| | +- io.opentelemetry:opentelemetry-exporter-logging:jar:1.51.0:compile
139+
| | +- io.opentelemetry:opentelemetry-sdk-common:jar:1.51.0:compile
140+
| | +- io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:jar:1.51.0:compile
141+
| | +- io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:jar:1.51.0:compile
142+
| | +- io.opentelemetry:opentelemetry-sdk-trace:jar:1.51.0:compile
143+
| | +- io.opentelemetry:opentelemetry-sdk:jar:1.51.0:compile
144+
| | | +- io.opentelemetry:opentelemetry-sdk-metrics:jar:1.51.0:compile
145+
| | | \- io.opentelemetry:opentelemetry-sdk-logs:jar:1.51.0:compile
146+
| | \- org.seleniumhq.selenium:selenium-os:jar:4.34.0:compile
147+
| | \- org.apache.commons:commons-exec:jar:1.5.0:runtime
148+
| +- org.seleniumhq.selenium:selenium-safari-driver:jar:4.34.0:compile
149+
| \- org.seleniumhq.selenium:selenium-support:jar:4.34.0:compile
155150
\- org.projectlombok:lombok:jar:1.18.38:provided

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<properties>
1010
<java.version>17</java.version>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12-
<model.version>2.0.120</model.version>
12+
<model.version>2.0.122</model.version>
1313
<hibernate.version>6.1.7.Final</hibernate.version>
1414
<jetty.version>11.0.24</jetty.version>
1515
<spring.version>6.0.11</spring.version>

‎src/main/java/ai/elimu/entity/content/Word.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import ai.elimu.model.v2.enums.content.SpellingConsistency;
44
import ai.elimu.model.v2.enums.content.WordType;
5+
import ai.elimu.model.v2.gson.content.WordGson;
6+
import ai.elimu.rest.v2.JpaToGsonConverter;
57
import jakarta.persistence.Entity;
68
import jakarta.persistence.EnumType;
79
import jakarta.persistence.Enumerated;
@@ -45,10 +47,7 @@ public class Word extends Content {
4547
private SpellingConsistency spellingConsistency;
4648

4749
public String toString() {
48-
String letters = "";
49-
for (LetterSound letterSound : letterSounds) {
50-
letters += letterSound.getLetters().stream().map(Letter::getText).collect(Collectors.joining());
51-
}
52-
return letters;
50+
WordGson wordGson = JpaToGsonConverter.getWordGson(this);
51+
return wordGson.toString();
5352
}
5453
}

‎src/main/java/ai/elimu/web/servlet/CustomDispatcherServlet.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ private void populateDatabase(WebApplicationContext webApplicationContext) {
178178
letterDao.create(letterM);
179179

180180
Letter letterAA = new Letter();
181-
letterAA.setText("า");
181+
letterAA.setText("◌า");
182182
letterDao.create(letterAA);
183183

184184
Letter letterS = new Letter();

‎src/main/webapp/WEB-INF/jsp/content/word/list.jsp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@
8484

8585
<label>word.toString()</label>
8686
<div style="font-size: 2em;">
87-
<a class="editLink" href="<spring:url value='/content/word/edit/${word.id}' />">"${word}"</a>
87+
<a class="editLink" href="<spring:url value='/content/word/edit/${word.id}' />"
88+
<c:if test="${word.toString() != word.getText()}">style="color: #bf360c; background-color: #ffccbc;"</c:if>
89+
>"${word}"</a>
8890
</div>
8991

9092
<div id="letterSoundsContainer">

0 commit comments

Comments
 (0)