Skip to content

refactor(wordgson): use tostring #2342

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.

Sign up for GitHub

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

Merged
jo-elimu merged 1 commit into from
Aug 23, 2025
Merged

refactor(wordgson): use tostring #2342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
71 changes: 33 additions & 38 deletions pom-dependency-tree.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ai.elimu:webapp:war:2.6.129-SNAPSHOT
+- ai.elimu:model:jar:model-2.0.120:compile
ai.elimu:webapp:war:2.6.134-SNAPSHOT
+- ai.elimu:model:jar:model-2.0.122:compile
| \- com.google.code.gson:gson:jar:2.13.1:compile
| \- com.google.errorprone:error_prone_annotations:jar:2.38.0:compile
+- org.springframework:spring-context:jar:6.0.11:compile
Expand Down Expand Up @@ -113,43 +113,38 @@ ai.elimu:webapp:war:2.6.129-SNAPSHOT
| +- net.bytebuddy:byte-buddy-agent:jar:1.14.15:test
| \- org.objenesis:objenesis:jar:3.3:test
+- org.springframework:spring-test:jar:6.0.11:test
+- org.seleniumhq.selenium:selenium-java:jar:4.23.1:compile
| +- org.seleniumhq.selenium:selenium-api:jar:4.23.1:compile
| +- org.seleniumhq.selenium:selenium-chrome-driver:jar:4.23.1:compile
+- org.seleniumhq.selenium:selenium-java:jar:4.34.0:compile
| +- org.seleniumhq.selenium:selenium-api:jar:4.34.0:compile
| | \- org.jspecify:jspecify:jar:1.0.0:compile
| +- org.seleniumhq.selenium:selenium-chrome-driver:jar:4.34.0:compile
| | +- com.google.auto.service:auto-service-annotations:jar:1.1.1:compile
| | +- org.seleniumhq.selenium:selenium-chromium-driver:jar:4.23.1:compile
| | +- org.seleniumhq.selenium:selenium-json:jar:4.23.1:compile
| | \- org.seleniumhq.selenium:selenium-manager:jar:4.23.1:compile
| +- org.seleniumhq.selenium:selenium-devtools-v125:jar:4.23.1:compile
| +- org.seleniumhq.selenium:selenium-devtools-v126:jar:4.23.1:compile
| +- org.seleniumhq.selenium:selenium-devtools-v127:jar:4.23.1:compile
| +- org.seleniumhq.selenium:selenium-devtools-v85:jar:4.23.1:compile
| +- org.seleniumhq.selenium:selenium-edge-driver:jar:4.23.1:compile
| +- org.seleniumhq.selenium:selenium-firefox-driver:jar:4.23.1:compile
| | \- org.seleniumhq.selenium:selenium-http:jar:4.23.1:compile
| | \- dev.failsafe:failsafe:jar:3.3.2:compile
| +- org.seleniumhq.selenium:selenium-ie-driver:jar:4.23.1:compile
| +- org.seleniumhq.selenium:selenium-remote-driver:jar:4.23.1:compile
| | +- com.google.guava:guava:jar:33.2.1-jre:compile
| | | +- com.google.guava:failureaccess:jar:1.0.2:compile
| | +- org.seleniumhq.selenium:selenium-chromium-driver:jar:4.34.0:compile
| | +- org.seleniumhq.selenium:selenium-json:jar:4.34.0:compile
| | \- org.seleniumhq.selenium:selenium-manager:jar:4.34.0:compile
| +- org.seleniumhq.selenium:selenium-devtools-v136:jar:4.34.0:compile
| +- org.seleniumhq.selenium:selenium-devtools-v137:jar:4.34.0:compile
| +- org.seleniumhq.selenium:selenium-devtools-v138:jar:4.34.0:compile
| +- org.seleniumhq.selenium:selenium-edge-driver:jar:4.34.0:compile
| +- org.seleniumhq.selenium:selenium-firefox-driver:jar:4.34.0:compile
| | \- org.seleniumhq.selenium:selenium-http:jar:4.34.0:compile
| +- org.seleniumhq.selenium:selenium-ie-driver:jar:4.34.0:compile
| +- org.seleniumhq.selenium:selenium-remote-driver:jar:4.34.0:compile
| | +- com.google.guava:guava:jar:33.4.8-jre:compile
| | | +- com.google.guava:failureaccess:jar:1.0.3:compile
| | | +- com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava:compile
| | | +- com.google.code.findbugs:jsr305:jar:3.0.2:compile
| | | +- org.checkerframework:checker-qual:jar:3.42.0:compile
| | | \- com.google.j2objc:j2objc-annotations:jar:3.0.0:compile
| | +- io.opentelemetry.semconv:opentelemetry-semconv:jar:1.25.0-alpha:compile
| | +- io.opentelemetry:opentelemetry-api:jar:1.40.0:compile
| | +- io.opentelemetry:opentelemetry-context:jar:1.40.0:compile
| | +- io.opentelemetry:opentelemetry-exporter-logging:jar:1.40.0:compile
| | +- io.opentelemetry:opentelemetry-sdk-common:jar:1.40.0:compile
| | +- io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:jar:1.40.0:compile
| | +- io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:jar:1.40.0:compile
| | | \- io.opentelemetry:opentelemetry-api-incubator:jar:1.40.0-alpha:runtime
| | +- io.opentelemetry:opentelemetry-sdk-trace:jar:1.40.0:compile
| | +- io.opentelemetry:opentelemetry-sdk:jar:1.40.0:compile
| | | +- io.opentelemetry:opentelemetry-sdk-metrics:jar:1.40.0:compile
| | | \- io.opentelemetry:opentelemetry-sdk-logs:jar:1.40.0:compile
| | \- org.seleniumhq.selenium:selenium-os:jar:4.23.1:compile
| | \- org.apache.commons:commons-exec:jar:1.4.0:compile
| +- org.seleniumhq.selenium:selenium-safari-driver:jar:4.23.1:compile
| \- org.seleniumhq.selenium:selenium-support:jar:4.23.1:compile
| | +- io.opentelemetry:opentelemetry-api:jar:1.51.0:compile
| | +- io.opentelemetry:opentelemetry-context:jar:1.51.0:compile
| | +- io.opentelemetry:opentelemetry-exporter-logging:jar:1.51.0:compile
| | +- io.opentelemetry:opentelemetry-sdk-common:jar:1.51.0:compile
| | +- io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:jar:1.51.0:compile
| | +- io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:jar:1.51.0:compile
| | +- io.opentelemetry:opentelemetry-sdk-trace:jar:1.51.0:compile
| | +- io.opentelemetry:opentelemetry-sdk:jar:1.51.0:compile
| | | +- io.opentelemetry:opentelemetry-sdk-metrics:jar:1.51.0:compile
| | | \- io.opentelemetry:opentelemetry-sdk-logs:jar:1.51.0:compile
| | \- org.seleniumhq.selenium:selenium-os:jar:4.34.0:compile
| | \- org.apache.commons:commons-exec:jar:1.5.0:runtime
| +- org.seleniumhq.selenium:selenium-safari-driver:jar:4.34.0:compile
| \- org.seleniumhq.selenium:selenium-support:jar:4.34.0:compile
\- org.projectlombok:lombok:jar:1.18.38:provided
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<properties>
<java.version>17</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<model.version>2.0.120</model.version>
<model.version>2.0.122</model.version>
<hibernate.version>6.1.7.Final</hibernate.version>
<jetty.version>11.0.24</jetty.version>
<spring.version>6.0.11</spring.version>
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/ai/elimu/entity/content/Word.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import ai.elimu.model.v2.enums.content.SpellingConsistency;
import ai.elimu.model.v2.enums.content.WordType;
import ai.elimu.model.v2.gson.content.WordGson;
import ai.elimu.rest.v2.JpaToGsonConverter;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
Expand Down Expand Up @@ -45,10 +47,7 @@ public class Word extends Content {
private SpellingConsistency spellingConsistency;

public String toString() {
String letters = "";
for (LetterSound letterSound : letterSounds) {
letters += letterSound.getLetters().stream().map(Letter::getText).collect(Collectors.joining());
}
return letters;
WordGson wordGson = JpaToGsonConverter.getWordGson(this);
return wordGson.toString();
}
}
2 changes: 1 addition & 1 deletion src/main/java/ai/elimu/web/servlet/CustomDispatcherServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ private void populateDatabase(WebApplicationContext webApplicationContext) {
letterDao.create(letterM);

Letter letterAA = new Letter();
letterAA.setText("า");
letterAA.setText("◌า");
letterDao.create(letterAA);

Letter letterS = new Letter();
Expand Down
4 changes: 3 additions & 1 deletion src/main/webapp/WEB-INF/jsp/content/word/list.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@

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

<div id="letterSoundsContainer">
Expand Down
Loading