Reduce duplicate code

common/src/main/java/jy95/fhir/common/translators/AbstractBoundsDuration.java

@@ -3,9 +3,9 @@
 import com.ibm.icu.text.MessageFormat;
 
 import jy95.fhir.common.config.FDSConfig;
-import jy95.fhir.common.types.AbstractTranslator;
+import jy95.fhir.common.types.AbstractTranslatorTiming;
 
-public abstract class AbstractBoundsDuration<C extends FDSConfig, D> extends AbstractTranslator<C, D> {
+public abstract class AbstractBoundsDuration<C extends FDSConfig, D> extends AbstractTranslatorTiming<C, D> {
 
     // Translations
     protected final MessageFormat boundsDurationMsg;

common/src/main/java/jy95/fhir/common/translators/AbstractBoundsPeriod.java

@@ -3,9 +3,9 @@
 import com.ibm.icu.text.MessageFormat;
 
 import jy95.fhir.common.config.FDSConfig;
-import jy95.fhir.common.types.AbstractTranslator;
+import jy95.fhir.common.types.AbstractTranslatorTiming;
 
-public abstract class AbstractBoundsPeriod<C extends FDSConfig, D> extends AbstractTranslator<C, D> {
+public abstract class AbstractBoundsPeriod<C extends FDSConfig, D> extends AbstractTranslatorTiming<C, D> {
 
     // Translations
     protected final MessageFormat boundsPeriodMsg;

common/src/main/java/jy95/fhir/common/translators/AbstractBoundsRange.java

@@ -3,9 +3,9 @@
 import com.ibm.icu.text.MessageFormat;
 
 import jy95.fhir.common.config.FDSConfig;
-import jy95.fhir.common.types.AbstractTranslator;
+import jy95.fhir.common.types.AbstractTranslatorTiming;
 
-public abstract class AbstractBoundsRange<C extends FDSConfig, D> extends AbstractTranslator<C, D> {
+public abstract class AbstractBoundsRange<C extends FDSConfig, D> extends AbstractTranslatorTiming<C, D> {
 
     // Translations
     protected final MessageFormat boundsRangeMsg;

common/src/main/java/jy95/fhir/common/translators/AbstractCountCountMax.java

@@ -3,11 +3,11 @@
 import com.ibm.icu.text.MessageFormat;
 
 import jy95.fhir.common.config.FDSConfig;
-import jy95.fhir.common.types.AbstractTranslator;
+import jy95.fhir.common.types.AbstractTranslatorTiming;
 
 import java.util.Map;
 
-public abstract class AbstractCountCountMax<C extends FDSConfig, D> extends AbstractTranslator<C, D> {
+public abstract class AbstractCountCountMax<C extends FDSConfig, D> extends AbstractTranslatorTiming<C, D> {
 
     // Translations
     protected final MessageFormat countMaxMsg;

common/src/main/java/jy95/fhir/common/translators/AbstractDayOfWeek.java

@@ -4,12 +4,12 @@
 
 import jy95.fhir.common.config.FDSConfig;
 import jy95.fhir.common.functions.ListToString;
-import jy95.fhir.common.types.AbstractTranslator;
+import jy95.fhir.common.types.AbstractTranslatorTiming;
 
 import java.util.List;
 import java.util.Map;
 
-public abstract class AbstractDayOfWeek<C extends FDSConfig, D> extends AbstractTranslator<C, D> {
+public abstract class AbstractDayOfWeek<C extends FDSConfig, D> extends AbstractTranslatorTiming<C, D> {
 
     // Translations
     protected final MessageFormat dayOfWeekMsg;

common/src/main/java/jy95/fhir/common/translators/AbstractDurationDurationMax.java

@@ -3,14 +3,14 @@
 import com.ibm.icu.text.MessageFormat;
 
 import jy95.fhir.common.config.FDSConfig;
-import jy95.fhir.common.types.AbstractTranslator;
+import jy95.fhir.common.types.AbstractTranslatorTiming;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.concurrent.CompletableFuture;
 import java.util.List;
 
-public abstract class AbstractDurationDurationMax<C extends FDSConfig, D> extends AbstractTranslator<C, D> {
+public abstract class AbstractDurationDurationMax<C extends FDSConfig, D> extends AbstractTranslatorTiming<C, D> {
 
     // Translations
     protected final MessageFormat durationMsg;

common/src/main/java/jy95/fhir/common/translators/AbstractFrequencyFrequencyMax.java

@@ -3,12 +3,12 @@
 import com.ibm.icu.text.MessageFormat;
 
 import jy95.fhir.common.config.FDSConfig;
-import jy95.fhir.common.types.AbstractTranslator;
+import jy95.fhir.common.types.AbstractTranslatorTiming;
 
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
-public abstract class AbstractFrequencyFrequencyMax<C extends FDSConfig, D> extends AbstractTranslator<C, D> {
+public abstract class AbstractFrequencyFrequencyMax<C extends FDSConfig, D> extends AbstractTranslatorTiming<C, D> {
 
     // Translations
     protected final MessageFormat frequencyAndFrequencyMaxMsg;

common/src/main/java/jy95/fhir/common/translators/AbstractOffsetWhen.java

@@ -8,9 +8,9 @@
 
 import jy95.fhir.common.config.FDSConfig;
 import jy95.fhir.common.functions.ListToString;
-import jy95.fhir.common.types.AbstractTranslator;
+import jy95.fhir.common.types.AbstractTranslatorTiming;
 
-public abstract class AbstractOffsetWhen<C extends FDSConfig, D> extends AbstractTranslator<C, D> {
+public abstract class AbstractOffsetWhen<C extends FDSConfig, D> extends AbstractTranslatorTiming<C, D> {
 
     public AbstractOffsetWhen(C config) {
         super(config);

common/src/main/java/jy95/fhir/common/translators/AbstractPeriodPeriodMax.java

@@ -3,13 +3,13 @@
 import com.ibm.icu.text.MessageFormat;
 
 import jy95.fhir.common.config.FDSConfig;
-import jy95.fhir.common.types.AbstractTranslator;
+import jy95.fhir.common.types.AbstractTranslatorTiming;
 
 import java.math.BigDecimal;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
-public abstract class AbstractPeriodPeriodMax<C extends FDSConfig, D> extends AbstractTranslator<C, D> {
+public abstract class AbstractPeriodPeriodMax<C extends FDSConfig, D> extends AbstractTranslatorTiming<C, D> {
 
     // Translations
     protected final MessageFormat periodMaxMsg;

common/src/main/java/jy95/fhir/common/translators/AbstractTimeOfDay.java

@@ -4,13 +4,13 @@
 
 import jy95.fhir.common.config.FDSConfig;
 import jy95.fhir.common.functions.ListToString;
-import jy95.fhir.common.types.AbstractTranslator;
+import jy95.fhir.common.types.AbstractTranslatorTiming;
 
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
-public abstract class AbstractTimeOfDay<C extends FDSConfig, D> extends AbstractTranslator<C, D> {
+public abstract class AbstractTimeOfDay<C extends FDSConfig, D> extends AbstractTranslatorTiming<C, D> {
 
     // Translations
     protected final MessageFormat timeOfDayMsg;

common/src/main/java/jy95/fhir/common/translators/AbstractTimingEvent.java

@@ -4,13 +4,13 @@
 
 import jy95.fhir.common.config.FDSConfig;
 import jy95.fhir.common.functions.ListToString;
-import jy95.fhir.common.types.AbstractTranslator;
+import jy95.fhir.common.types.AbstractTranslatorTiming;
 
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
-public abstract class AbstractTimingEvent<C extends FDSConfig, D> extends AbstractTranslator<C, D> {
+public abstract class AbstractTimingEvent<C extends FDSConfig, D> extends AbstractTranslatorTiming<C, D> {
 
     // Translations
     protected final MessageFormat timingEventMsg;

common/src/main/java/jy95/fhir/common/types/AbstractTranslatorTiming.java

@@ -0,0 +1,21 @@
+package jy95.fhir.common.types;
+
+import jy95.fhir.common.config.FDSConfig;
+
+public abstract class AbstractTranslatorTiming<C extends FDSConfig, D> extends AbstractTranslator<C, D>{
+
+    public AbstractTranslatorTiming(C config) {
+        super(config);
+    }
+
+    // To check if dosage object truly has a "Timing" object
+    protected abstract boolean hasTiming(D dosage);
+
+    // To check if timing object truly has the required condition for this translator
+    protected abstract boolean hasRequiredElements(D dosage);
+
+    @Override
+    public boolean isPresent(D dosage) {
+        return hasTiming(dosage) && hasRequiredElements(dosage);
+    }
+}

common/src/test/java/jy95/fhir/common/AbstractTranslatorTest.java

@@ -0,0 +1,47 @@
+package jy95.fhir.common;
+
+import jy95.fhir.common.types.AbstractTranslator;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.concurrent.CompletableFuture;
+
+import jy95.fhir.common.config.FDSConfig;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class AbstractTranslatorTest {
+
+    // Concrete implementation of AbstractTranslator
+    private static class TestTranslator extends AbstractTranslator<FDSConfig, String> {
+
+        public TestTranslator(FDSConfig config) {
+            super(config);
+        }
+
+        @Override
+        public CompletableFuture<String> convert(String dosage) {
+            return CompletableFuture.completedFuture("Converted: " + dosage);
+        }
+    }
+
+    private AbstractTranslator<FDSConfig, String> translator;
+
+    @BeforeEach
+    void setUp() {
+        translator = new TestTranslator(FDSConfig.builder().build());
+    }
+
+    @Test
+    void testConvert() {
+        String input = "dosage123";
+        CompletableFuture<String> result = translator.convert(input);
+
+        assertNotNull(result);
+        assertEquals("Converted: dosage123", result.join());
+    }
+
+    @Test
+    void testIsPresent() {
+        assertFalse(translator.isPresent("dosage123"));
+    }
+}

r4/src/main/java/jy95/fhir/r4/translators/BoundsDurationR4.java

@@ -16,6 +16,11 @@ public BoundsDurationR4(FDSConfigR4 config) {
         quantityToStringR4 = new QuantityToStringR4();
     }
 
+    @Override
+    protected boolean hasTiming(Dosage dosage) {
+        return dosage.hasTiming();
+    }
+
     @Override
     public CompletableFuture<String> convert(Dosage dosage) {
         var bundle = getResources();
@@ -26,8 +31,7 @@ public CompletableFuture<String> convert(Dosage dosage) {
     }
 
     @Override
-    public boolean isPresent(Dosage dosage) {
-        return dosage.hasTiming() && dosage.getTiming().hasRepeat()
-                && dosage.getTiming().getRepeat().hasBoundsDuration();
+    protected boolean hasRequiredElements(Dosage dosage) {
+        return dosage.getTiming().hasRepeat() && dosage.getTiming().getRepeat().hasBoundsDuration();
     }
 }

r4/src/main/java/jy95/fhir/r4/translators/BoundsPeriodR4.java

@@ -46,7 +46,12 @@ public CompletableFuture<String> convert(Dosage dosage) {
     }
 
     @Override
-    public boolean isPresent(Dosage dosage) {
-        return dosage.hasTiming() && dosage.getTiming().hasRepeat() && dosage.getTiming().getRepeat().hasBoundsPeriod();
+    protected boolean hasRequiredElements(Dosage dosage) {
+        return dosage.getTiming().hasRepeat() && dosage.getTiming().getRepeat().hasBoundsPeriod();
+    }
+
+    @Override
+    protected boolean hasTiming(Dosage dosage) {
+        return dosage.hasTiming();
     }
 }

r4/src/main/java/jy95/fhir/r4/translators/BoundsRangeR4.java

@@ -16,6 +16,11 @@ public BoundsRangeR4(FDSConfigR4 config) {
         rangeToStringR4 = new RangeToStringR4();
     }
 
+    @Override
+    protected boolean hasTiming(Dosage dosage) {
+        return dosage.hasTiming();
+    }
+
     @Override
     public CompletableFuture<String> convert(Dosage dosage) {
         var boundsRange = dosage.getTiming().getRepeat().getBoundsRange();
@@ -27,7 +32,7 @@ public CompletableFuture<String> convert(Dosage dosage) {
     }
 
     @Override
-    public boolean isPresent(Dosage dosage) {
-        return dosage.hasTiming() && dosage.getTiming().hasRepeat() && dosage.getTiming().getRepeat().hasBoundsRange();
+    protected boolean hasRequiredElements(Dosage dosage) {
+        return dosage.getTiming().hasRepeat() && dosage.getTiming().getRepeat().hasBoundsRange();
     }
 }

r4/src/main/java/jy95/fhir/r4/translators/CountCountMaxR4.java

@@ -26,9 +26,14 @@ public CompletableFuture<String> convert(Dosage dosage) {
     }
 
     @Override
-    public boolean isPresent(Dosage dosage) {
-        return dosage.hasTiming() && dosage.getTiming().hasRepeat()
-                && (dosage.getTiming().getRepeat().hasCount() ||
-                dosage.getTiming().getRepeat().hasCountMax());
+    protected boolean hasRequiredElements(Dosage dosage) {
+        return dosage.getTiming().hasRepeat()
+                && (dosage.getTiming().getRepeat().hasCount()
+                || dosage.getTiming().getRepeat().hasCountMax());
+    }
+
+    @Override
+    protected boolean hasTiming(Dosage dosage) {
+        return dosage.hasTiming();
     }
 }

r4/src/main/java/jy95/fhir/r4/translators/DayOfWeekR4.java

@@ -12,6 +12,16 @@ public DayOfWeekR4(FDSConfigR4 config) {
         super(config);
     }
 
+    @Override
+    protected boolean hasTiming(Dosage dosage) {
+        return dosage.hasTiming();
+    }
+
+    @Override
+    protected boolean hasRequiredElements(Dosage dosage) {
+        return dosage.getTiming().hasRepeat() && dosage.getTiming().getRepeat().hasDayOfWeek();
+    }
+
     @Override
     public CompletableFuture<String> convert(Dosage dosage) {
         return CompletableFuture.supplyAsync(() -> {
@@ -27,9 +37,4 @@ public CompletableFuture<String> convert(Dosage dosage) {
             return daysToText(dayOfWeeksCodes);
         });
     }
-
-    @Override
-    public boolean isPresent(Dosage dosage) {
-        return dosage.hasTiming() && dosage.getTiming().hasRepeat() && dosage.getTiming().getRepeat().hasDayOfWeek();
-    }
 }

r4/src/main/java/jy95/fhir/r4/translators/DurationDurationMaxR4.java

@@ -20,6 +20,18 @@ protected boolean hasDurationMax(Dosage dosage) {
         return dosage.getTiming().getRepeat().hasDurationMax();
     }
 
+    @Override
+    protected boolean hasRequiredElements(Dosage dosage) {
+        return dosage.getTiming().hasRepeat()
+                && dosage.getTiming().getRepeat().hasDurationUnit()
+                && (hasDuration(dosage) || hasDurationMax(dosage));
+    }
+
+    @Override
+    protected boolean hasTiming(Dosage dosage) {
+        return dosage.hasTiming();
+    }
+
     @Override
     protected String turnDurationToString(Dosage dosage) {
         var repeat = dosage.getTiming().getRepeat();
@@ -39,11 +51,4 @@ protected String turnDurationMaxToString(Dosage dosage) {
         var durationText = quantityToString(durationUnit, durationQuantity);
         return durationMaxMsg.format(new Object[]{durationText});
     }
-
-    @Override
-    public boolean isPresent(Dosage dosage) {
-        return dosage.hasTiming() && dosage.getTiming().hasRepeat()
-                && dosage.getTiming().getRepeat().hasDurationUnit()
-                && (hasDuration(dosage) || hasDurationMax(dosage));
-    }
 }

r4/src/main/java/jy95/fhir/r4/translators/FrequencyFrequencyMaxR4.java

@@ -10,6 +10,11 @@ public FrequencyFrequencyMaxR4(FDSConfigR4 config) {
         super(config);
     }
 
+    @Override
+    protected boolean hasTiming(Dosage dosage) {
+        return dosage.hasTiming();
+    }
+
     @Override
     protected boolean hasFrequency(Dosage dosage) {
         return dosage.getTiming().getRepeat().hasFrequency();
@@ -20,6 +25,11 @@ protected boolean hasFrequencyMax(Dosage dosage) {
         return dosage.getTiming().getRepeat().hasFrequencyMax();
     }
 
+    @Override
+    protected boolean hasRequiredElements(Dosage dosage) {
+        return dosage.getTiming().hasRepeat() && (hasFrequency(dosage) || hasFrequencyMax(dosage));
+    }
+
     @Override
     protected String turnFrequencyAndFrequencyMaxToString(Dosage dosage) {
         var repeat = dosage.getTiming().getRepeat();
@@ -41,10 +51,4 @@ protected String turnFrequencyToString(Dosage dosage) {
         var frequency = repeat.getFrequency();
         return formatFrequencyText(frequency);
     }
-
-    @Override
-    public boolean isPresent(Dosage dosage) {
-        return dosage.hasTiming() && dosage.getTiming().hasRepeat()
-                && (hasFrequency(dosage) || hasFrequencyMax(dosage));
-    }
 }