chore: remove J2ME related code [DHIS2-18213] (#19801)

* chore: remove J2ME related code * chore: remove unused code and fix linting errors * chore: remove parsertype and migrate to store name
dhis2 · Jan 31, 2025 · f717088 · f717088
1 parent cc67b78
commit f717088
Show file tree

Hide file tree

Showing 11 changed files with 63 additions and 473 deletions.
diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/parse/ParserType.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/parse/ParserType.java
@@ -29,10 +29,9 @@
 
 public enum ParserType {
   KEY_VALUE_PARSER,
-  J2ME_PARSER,
   ALERT_PARSER,
   UNREGISTERED_PARSER,
   TRACKED_ENTITY_REGISTRATION_PARSER,
   PROGRAM_STAGE_DATAENTRY_PARSER,
-  EVENT_REGISTRATION_PARSER;
+  EVENT_REGISTRATION_PARSER
 }
diff --git a/...s/dhis-service-core/src/main/java/org/hisp/dhis/sms/command/DefaultSMSCommandService.java b/...s/dhis-service-core/src/main/java/org/hisp/dhis/sms/command/DefaultSMSCommandService.java
@@ -84,12 +84,6 @@ public void delete(SMSCommand cmd) {
     smsCommandStore.delete(cmd);
   }
 
-  @Override
-  @Transactional(readOnly = true)
-  public List<SMSCommand> getJ2MESMSCommands() {
-    return smsCommandStore.getJ2MESMSCommands();
-  }
-
   @Override
   @Transactional(readOnly = true)
   public SMSCommand getSMSCommand(String commandName, ParserType parserType) {

diff --git a/...services/dhis-service-core/src/main/java/org/hisp/dhis/sms/command/SMSCommandService.java b/...services/dhis-service-core/src/main/java/org/hisp/dhis/sms/command/SMSCommandService.java
@@ -42,8 +42,6 @@ public interface SMSCommandService {
 
   void delete(SMSCommand cmd);
 
-  List<SMSCommand> getJ2MESMSCommands();
-
   SMSCommand getSMSCommand(String commandName, ParserType parserType);
 
   void addSpecialCharacterSet(Set<SMSSpecialCharacter> specialCharacters, long commandId);

diff --git a/...vice-core/src/main/java/org/hisp/dhis/sms/command/hibernate/HibernateSMSCommandStore.java b/...vice-core/src/main/java/org/hisp/dhis/sms/command/hibernate/HibernateSMSCommandStore.java
@@ -57,16 +57,6 @@ public HibernateSMSCommandStore(
     super(entityManager, jdbcTemplate, publisher, SMSCommand.class, aclService, true);
   }
 
-  @Override
-  public List<SMSCommand> getJ2MESMSCommands() {
-    CriteriaBuilder builder = getCriteriaBuilder();
-
-    return getList(
-        builder,
-        newJpaParameters()
-            .addPredicate(root -> builder.equal(root.get("parserType"), ParserType.J2ME_PARSER)));
-  }
-
   @Override
   public SMSCommand getSMSCommand(String commandName, ParserType parserType) {
     CriteriaBuilder builder = getCriteriaBuilder();

diff --git a/.../dhis-service-core/src/main/java/org/hisp/dhis/sms/command/hibernate/SMSCommandStore.java b/.../dhis-service-core/src/main/java/org/hisp/dhis/sms/command/hibernate/SMSCommandStore.java
@@ -39,8 +39,6 @@
 import org.hisp.dhis.sms.parse.ParserType;
 
 public interface SMSCommandStore extends IdentifiableObjectStore<SMSCommand> {
-  List<SMSCommand> getJ2MESMSCommands();
-
   SMSCommand getSMSCommand(String commandName, ParserType parserType);
 
   int countDataSetSmsCommands(DataSet dataSet);

diff --git a/...-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/listener/BaseSMSListener.java b/...-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/listener/BaseSMSListener.java
@@ -87,7 +87,7 @@ protected void sendSMSResponse(SmsResponse resp, IncomingSms sms, int messageID)
     update(sms, status, true);
 
     if (smsMessageSender.isConfigured()) {
-      String msg = String.format("%d:%s", messageID, resp.toString());
+      String msg = String.format("%d:%s", messageID, resp);
       smsMessageSender.sendMessage(null, msg, sms.getOriginator());
       return;
     }