disallow null time

autodyne · Jun 2, 2024 · ab7ff5b · ab7ff5b
1 parent cb361b8
commit ab7ff5b
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 25 deletions.
diff --git a/src/main/java/gaas/table/CTxtEncoder.java b/src/main/java/gaas/table/CTxtEncoder.java
@@ -94,7 +94,6 @@ public final void output(Item item) throws IOException {
 	 * @throws IOException 書き込みに失敗した場合
 	 */
 	private void time(Time date) throws IOException {
-		if(date == null) space(" ".repeat(10));
-		else space(tstamp.format(date.local()));
+		space(tstamp.format(date.local()));
 	}
 }
diff --git a/src/main/java/gaas/table/CqwwEncoder.java b/src/main/java/gaas/table/CqwwEncoder.java
@@ -98,9 +98,7 @@ public final void output(Item item) throws IOException {
 	 * @throws IOException 書き込みに失敗した場合
 	 */
 	private final void time(Time date) throws IOException {
-		final var format = tstamp.withZone(UTC);
-		if(date == null) space(" ".repeat(15));
-		else space(format.format(date.value()));
+		space(tstamp.withZone(UTC).format(date.value()));
 	}
 
 	/**

diff --git a/src/main/java/gaas/table/HBinDecoder.java b/src/main/java/gaas/table/HBinDecoder.java
@@ -30,7 +30,7 @@
 public final class HBinDecoder extends BasicDecoder {
 	private final Map<Column, Integer> widths;
 	private final DataInputStream source;
-	private final DateTime hDTime;
+	private final DateTime chrono;
 
 	/**
 	 * 指定された入力を読み込むデコーダを構築します。
@@ -41,7 +41,7 @@ public final class HBinDecoder extends BasicDecoder {
 	public HBinDecoder(InputStream stream) {
 		super("hbin");
 		this.source = new DataInputStream(stream);
-		this.hDTime = new DateTime();
+		this.chrono = new DateTime();
 		this.widths = new HashMap<>();
 	}
 
@@ -214,7 +214,7 @@ private final void time(Item item) throws IOException {
 		final int times = widths.get(Column.TIME);
 		final var bytes = new byte[dates + times];
 		source.readFully(bytes);
-		item.set(hDTime.decode(bytes));
+		item.set(chrono.decode(bytes));
 	}
 
 	/**

diff --git a/src/main/java/gaas/table/HBinEncoder.java b/src/main/java/gaas/table/HBinEncoder.java
@@ -31,7 +31,7 @@
  */
 public final class HBinEncoder extends BasicEncoder {
 	private final DataOutputStream target;
-	private final DateTime hDTime;
+	private final DateTime chrono;
 
 	/**
 	 * 指定された出力に書き込むエンコーダを構築します。
@@ -42,7 +42,7 @@ public final class HBinEncoder extends BasicEncoder {
 	public HBinEncoder(OutputStream stream) {
 		super("hbin");
 		this.target = new DataOutputStream(stream);
-		this.hDTime = new DateTime();
+		this.chrono = new DateTime();
 	}
 
 	/**
@@ -173,8 +173,7 @@ private final void head(Column col) throws IOException {
 	 * @throws IOException 書き込みに失敗した場合
 	 */
 	private final void time(Time time) throws IOException {
-		if(time == null) target.write(new byte[6]);
-		else target.write(hDTime.encode(time));
+		target.write(chrono.encode(time));
 	}
 
 	/**
@@ -186,10 +185,8 @@ private final void time(Time time) throws IOException {
 	 * @throws IOException 書き込みに失敗した場合
 	 */
 	private final void band(Band band) throws IOException {
-		if(band != null) {
-			final var val = band.toDecimalString(3);
-			final var any = new Any(Qxsl.BAND, val);
-			write(any, Column.FREQ);
-		} else write(null, Column.FREQ);
+		final var val = band.toDecimalString(3);
+		final var any = new Any(Qxsl.BAND, val);
+		write(any, Column.FREQ);
 	}
 }
diff --git a/src/main/java/gaas/table/JSwlEncoder.java b/src/main/java/gaas/table/JSwlEncoder.java
@@ -94,8 +94,7 @@ public final void output(Item item) throws IOException {
 	 * @throws IOException 書き込みに失敗した場合
 	 */
 	private final void time(Time date) throws IOException {
-		if(date == null) space(" ".repeat(16));
-		else space(tstamp.format(date.local()));
+		space(tstamp.format(date.local()));
 	}
 
 	/**

diff --git a/src/main/java/gaas/table/JarlEncoder.java b/src/main/java/gaas/table/JarlEncoder.java
@@ -95,8 +95,7 @@ public final void output(Item item) throws IOException {
 	 * @throws IOException 書き込みに失敗した場合
 	 */
 	private final void time(Time date) throws IOException {
-		if(date == null) space(" ".repeat(16));
-		else space(tstamp.format(date.local()));
+		space(tstamp.format(date.local()));
 	}
 
 	/**

diff --git a/src/main/java/gaas/table/ZAllEncoder.java b/src/main/java/gaas/table/ZAllEncoder.java
@@ -102,8 +102,7 @@ public final void output(Item item) throws IOException {
 	 * @throws IOException 書き込みに失敗した場合
 	 */
 	private final void time(Time date) throws IOException {
-		if(date == null) space(" ".repeat(16));
-		else space(tstamp.format(date.local()));
+		space(tstamp.format(date.local()));
 	}
 
 	/**

diff --git a/src/main/java/gaas/table/ZDosEncoder.java b/src/main/java/gaas/table/ZDosEncoder.java
@@ -100,8 +100,7 @@ public final void output(Item item) throws IOException {
 	 * @throws IOException 書き込みに失敗した場合
 	 */
 	private final void time(Time date) throws IOException {
-		if(date == null) space(" ".repeat(12));
-		else space(tstamp.format(date.local()));
+		space(tstamp.format(date.local()));
 	}
 
 	/**